Commit 34650faa4451922bcdd4ce5e217fe265ebe66af3

Authored by 陆恒
1 parent 71e559b0
Exists in ver2.3.0 and in 1 other branch ver2.2.8

提交

src/HttpServer/logic/constdef.go
... ... @@ -8,6 +8,7 @@ const (
8 8 TASKTYPE_KILLSTAR = 4 //4表示消除x颗星星
9 9 TASKTYPE_USEITEM = 5 //5表示使用x次道具
10 10 TASKTYPE_PLAYSMALLGAMES = 6 //6表示试玩15s小游戏
  11 + TASKTYPE_SHAKETIME = 7 //摇一摇次数
11 12  
12 13 )
13 14  
... ... @@ -61,4 +62,5 @@ const (
61 62 FREE_REDBAG_NUM = 3 //玩家免费红包次数
62 63 READGOLDMULTI = 700 //阅读量到金币转化倍数
63 64 SDKOPGOLD_TYPEWE = 302 //微转发金币类型
  65 + SHAKELIMIT = 20 //摇一摇限制次数
64 66 )
... ...
src/HttpServer/logic/datadef.go
... ... @@ -22,6 +22,7 @@ type UserLoginData struct {
22 22 Userlv int `json:"userlv"`
23 23 Userexp int `json:"userexp"`
24 24 Sumloginday int `json:"sumloginday"`
  25 + Shakeleftcnt int `json:"shakeleftcnt"`
25 26 }
26 27  
27 28 type UserLoginResp struct {
... ... @@ -43,6 +44,7 @@ type GetuserdataData struct {
43 44 Userexp int `json:"userexp"`
44 45 Leftfreeredbag int `json:"leftfreeredbag"`
45 46 Sumloginday int `json:"sumloginday"`
  47 + Shakeleftcnt int `json:"shakeleftcnt"`
46 48 }
47 49  
48 50 type GetuserdataResp struct {
... ... @@ -375,6 +377,7 @@ type UserData struct {
375 377 UpLvCostTimeSec int //上一个等级升级的时间点时刻
376 378 ReadNum int //玩家微转发阅读量
377 379 GetCashCnt int //当天提现次数
  380 + ShakeTime int //摇一摇
378 381 WithDraw WithDrawInfo //提现记录信息
379 382 //SpecialWithDraw WithDrawInfo //活跃提现记录信息
380 383 Task TaskInfo //玩家任务完成相关信息
... ...
src/HttpServer/logic/function.go
... ... @@ -588,6 +588,7 @@ func InitUserInfo(data *UserLoginReq, resp *UserLoginResp, uuid int, uniqueuid s
588 588 initdata.LeftFreeRB = FREE_REDBAG_NUM
589 589 initdata.UpLvCostTime = 0
590 590 initdata.UpLvCostTimeSec = int(time.Now().Unix())
  591 + initdata.ShakeTime = SHAKELIMIT
591 592  
592 593 for _, val := range jsonconf.GetJsonConf().WithDrawConfig {
593 594 var tmp WithDrawDesc
... ... @@ -631,6 +632,7 @@ func InitUserInfo(data *UserLoginReq, resp *UserLoginResp, uuid int, uniqueuid s
631 632 resp.Data.Userlv = initdata.Lv
632 633 resp.Data.Userexp = initdata.Exp
633 634 resp.Data.Sumloginday = initdata.SumLoginDay
  635 + resp.Data.Shakeleftcnt = initdata.ShakeTime
634 636  
635 637 err := SaveUserInfo(&initdata, uniqueuid)
636 638 logger.Info("InitUserInfoddddd uinfo=%+v", initdata)
... ... @@ -818,6 +820,7 @@ func (u *UserData) HandlePassDay(uuid int, channel string) {
818 820 u.Task.PassLevel = 0
819 821 u.Task.UseItemCnt = 0
820 822 u.Task.PlaySmall = 0
  823 + u.ShakeTime = SHAKELIMIT
821 824  
822 825 //任务也需要处理
823 826 /*tasklist, err := GetTaskInfo(u.Userid, 1)
... ... @@ -909,6 +912,7 @@ func GetUserData(uuid int, uniqueuid string, req *UserLoginReq, resp *UserLoginR
909 912 resp.Data.Userlv = data.Lv
910 913 resp.Data.Userexp = data.Exp
911 914 resp.Data.Sumloginday = data.SumLoginDay
  915 + resp.Data.Shakeleftcnt = data.ShakeTime
912 916 return nil
913 917 }
914 918  
... ...
src/HttpServer/logic/logic.go
... ... @@ -772,6 +772,11 @@ func HandlerUpdatetaskandachieve(w http.ResponseWriter, data string, uuid int) {
772 772 uinfo.Achieve.SumUseItemCnt += rdata.Value
773 773 case TASKTYPE_PLAYSMALLGAMES:
774 774 uinfo.Task.PlaySmall += 1
  775 + case TASKTYPE_SHAKETIME:
  776 + uinfo.ShakeTime -= rdata.Value
  777 + if uinfo.ShakeTime < 0 {
  778 + uinfo.ShakeTime = 0
  779 + }
775 780 }
776 781 logger.Info("HandlerUpdatetaskandachieve uinfo=%v rdata=%v", uinfo, rdata)
777 782 SaveUserInfo(uinfo, uniqueuuid)
... ... @@ -1080,6 +1085,7 @@ func HandlerGetuserdata(w http.ResponseWriter, data string, uuid int) {
1080 1085 resp.Data.Userlv = data.Lv
1081 1086 resp.Data.Leftfreeredbag = data.LeftFreeRB
1082 1087 resp.Data.Sumloginday = data.SumLoginDay
  1088 + resp.Data.Shakeleftcnt = data.ShakeTime
1083 1089 SaveUserInfo(data, uniqueuuid)
1084 1090  
1085 1091 resp.Code = ERROR_OK
... ...