Commit 6ed659944b900611188856e0c48aa7f93909db78
1 parent
4713681d
Exists in
master
增加摇一摇次数
Showing
4 changed files
with
16 additions
and
0 deletions
Show diff stats
src/HttpServer/logic/constdef.go
| @@ -8,6 +8,7 @@ const ( | @@ -8,6 +8,7 @@ const ( | ||
| 8 | TASKTYPE_KILLSTAR = 4 //4表示消除x颗星星 | 8 | TASKTYPE_KILLSTAR = 4 //4表示消除x颗星星 |
| 9 | TASKTYPE_USEITEM = 5 //5表示使用x次道具 | 9 | TASKTYPE_USEITEM = 5 //5表示使用x次道具 |
| 10 | TASKTYPE_PLAYSMALLGAMES = 6 //6表示试玩15s小游戏 | 10 | TASKTYPE_PLAYSMALLGAMES = 6 //6表示试玩15s小游戏 |
| 11 | + TASKTYPE_SHAKE = 7 //表示摇一摇 | ||
| 11 | 12 | ||
| 12 | ) | 13 | ) |
| 13 | 14 | ||
| @@ -57,4 +58,5 @@ const ( | @@ -57,4 +58,5 @@ const ( | ||
| 57 | FREE_REDBAG_NUM = 3 //玩家免费红包次数 | 58 | FREE_REDBAG_NUM = 3 //玩家免费红包次数 |
| 58 | READGOLDMULTI = 10 //阅读量到金币转化倍数 | 59 | READGOLDMULTI = 10 //阅读量到金币转化倍数 |
| 59 | SDKOPGOLD_TYPEWE = 302 //微转发金币类型 | 60 | SDKOPGOLD_TYPEWE = 302 //微转发金币类型 |
| 61 | + SHAKETIMELIMIT = 20 //每日摇一摇上限 | ||
| 60 | ) | 62 | ) |
src/HttpServer/logic/datadef.go
| @@ -22,6 +22,7 @@ type UserLoginData struct { | @@ -22,6 +22,7 @@ type UserLoginData struct { | ||
| 22 | Userlv int `json:"userlv"` | 22 | Userlv int `json:"userlv"` |
| 23 | Userexp int `json:"userexp"` | 23 | Userexp int `json:"userexp"` |
| 24 | Sumloginday int `json:"sumloginday"` | 24 | Sumloginday int `json:"sumloginday"` |
| 25 | + Shakeleftcnt int `json:"shakeleftcnt"` | ||
| 25 | } | 26 | } |
| 26 | 27 | ||
| 27 | type UserLoginResp struct { | 28 | type UserLoginResp struct { |
| @@ -347,6 +348,7 @@ type UserData struct { | @@ -347,6 +348,7 @@ type UserData struct { | ||
| 347 | LastLoginTime int //上次登陆时间 | 348 | LastLoginTime int //上次登陆时间 |
| 348 | ContinueLoginDay int //连续登录天数 | 349 | ContinueLoginDay int //连续登录天数 |
| 349 | SumLoginDay int //累计登陆天数 | 350 | SumLoginDay int //累计登陆天数 |
| 351 | + ShakeTime int //剩余抽奖次数 | ||
| 350 | GetFromGuanCnt int //当天从存钱款提取金币次数 | 352 | GetFromGuanCnt int //当天从存钱款提取金币次数 |
| 351 | SignRound int //签到轮数 | 353 | SignRound int //签到轮数 |
| 352 | SignSum int //累计签到天数 | 354 | SignSum int //累计签到天数 |
src/HttpServer/logic/function.go
| @@ -487,6 +487,7 @@ func InitUserInfo(data *UserLoginReq, resp *UserLoginResp, uuid int, uniqueuid s | @@ -487,6 +487,7 @@ func InitUserInfo(data *UserLoginReq, resp *UserLoginResp, uuid int, uniqueuid s | ||
| 487 | initdata.LeftFreeRB = FREE_REDBAG_NUM | 487 | initdata.LeftFreeRB = FREE_REDBAG_NUM |
| 488 | initdata.UpLvCostTime = 0 | 488 | initdata.UpLvCostTime = 0 |
| 489 | initdata.UpLvCostTimeSec = int(time.Now().Unix()) | 489 | initdata.UpLvCostTimeSec = int(time.Now().Unix()) |
| 490 | + initdata.ShakeTime = SHAKETIMELIMIT | ||
| 490 | 491 | ||
| 491 | for _, val := range jsonconf.GetJsonConf().WithDrawConfig { | 492 | for _, val := range jsonconf.GetJsonConf().WithDrawConfig { |
| 492 | var tmp WithDrawDesc | 493 | var tmp WithDrawDesc |
| @@ -512,6 +513,7 @@ func InitUserInfo(data *UserLoginReq, resp *UserLoginResp, uuid int, uniqueuid s | @@ -512,6 +513,7 @@ func InitUserInfo(data *UserLoginReq, resp *UserLoginResp, uuid int, uniqueuid s | ||
| 512 | resp.Data.Userlv = initdata.Lv | 513 | resp.Data.Userlv = initdata.Lv |
| 513 | resp.Data.Userexp = initdata.Exp | 514 | resp.Data.Userexp = initdata.Exp |
| 514 | resp.Data.Sumloginday = initdata.SumLoginDay | 515 | resp.Data.Sumloginday = initdata.SumLoginDay |
| 516 | + resp.Data.Shakeleftcnt = initdata.ShakeTime | ||
| 515 | 517 | ||
| 516 | err := SaveUserInfo(&initdata, uniqueuid) | 518 | err := SaveUserInfo(&initdata, uniqueuid) |
| 517 | if err != nil { | 519 | if err != nil { |
| @@ -670,6 +672,7 @@ func (u *UserData) HandlePassDay(uuid int, channel string) { | @@ -670,6 +672,7 @@ func (u *UserData) HandlePassDay(uuid int, channel string) { | ||
| 670 | //跨天了 | 672 | //跨天了 |
| 671 | u.SumLoginDay++ | 673 | u.SumLoginDay++ |
| 672 | u.WatchAddsTime = WATCH_ADD_DAY_LIMIT | 674 | u.WatchAddsTime = WATCH_ADD_DAY_LIMIT |
| 675 | + u.ShakeTime = SHAKETIMELIMIT | ||
| 673 | //todo 重置任务相关的数据 | 676 | //todo 重置任务相关的数据 |
| 674 | u.GetFromGuanCnt = 0 | 677 | u.GetFromGuanCnt = 0 |
| 675 | u.GetCashCnt = 0 | 678 | u.GetCashCnt = 0 |
| @@ -765,6 +768,7 @@ func GetUserData(uuid int, uniqueuid string, req *UserLoginReq, resp *UserLoginR | @@ -765,6 +768,7 @@ func GetUserData(uuid int, uniqueuid string, req *UserLoginReq, resp *UserLoginR | ||
| 765 | resp.Data.Userlv = data.Lv | 768 | resp.Data.Userlv = data.Lv |
| 766 | resp.Data.Userexp = data.Exp | 769 | resp.Data.Userexp = data.Exp |
| 767 | resp.Data.Sumloginday = data.SumLoginDay | 770 | resp.Data.Sumloginday = data.SumLoginDay |
| 771 | + resp.Data.Shakeleftcnt = data.ShakeTime | ||
| 768 | return nil | 772 | return nil |
| 769 | } | 773 | } |
| 770 | 774 |
src/HttpServer/logic/logic.go
| @@ -738,6 +738,14 @@ func HandlerUpdatetaskandachieve(w http.ResponseWriter, data string, uuid int) { | @@ -738,6 +738,14 @@ func HandlerUpdatetaskandachieve(w http.ResponseWriter, data string, uuid int) { | ||
| 738 | uinfo.Achieve.SumUseItemCnt += rdata.Value | 738 | uinfo.Achieve.SumUseItemCnt += rdata.Value |
| 739 | case TASKTYPE_PLAYSMALLGAMES: | 739 | case TASKTYPE_PLAYSMALLGAMES: |
| 740 | uinfo.Task.PlaySmall += 1 | 740 | uinfo.Task.PlaySmall += 1 |
| 741 | + case TASKTYPE_SHAKE: | ||
| 742 | + if uinfo.ShakeTime > 0 { | ||
| 743 | + uinfo.ShakeTime -= rdata.Value | ||
| 744 | + if uinfo.ShakeTime < 0 { | ||
| 745 | + uinfo.ShakeTime = 0 | ||
| 746 | + } | ||
| 747 | + } | ||
| 748 | + | ||
| 741 | } | 749 | } |
| 742 | logger.Info("HandlerUpdatetaskandachieve uinfo=%v rdata=%v", uinfo, rdata) | 750 | logger.Info("HandlerUpdatetaskandachieve uinfo=%v rdata=%v", uinfo, rdata) |
| 743 | SaveUserInfo(uinfo, uniqueuuid) | 751 | SaveUserInfo(uinfo, uniqueuuid) |