Commit 6d178237fff27292de15e39c95bf0072cf9266bd
1 parent
ce00eaaf
Exists in
master
提交部分代码
Showing
4 changed files
with
29 additions
and
108 deletions
Show diff stats
src/HttpServer/logic/constdef.go
| @@ -2,26 +2,19 @@ package logic | @@ -2,26 +2,19 @@ package logic | ||
| 2 | 2 | ||
| 3 | //任务成就类型枚举 协议上报用 | 3 | //任务成就类型枚举 协议上报用 |
| 4 | const ( | 4 | const ( |
| 5 | - TASKTYPE_PASSLEVEL = 1 //表示通过x关卡 | ||
| 6 | - TASKTYPE_GETREDBAG = 3 //3表示观看x次广告 | ||
| 7 | - TASKTYPE_WATCHADS = 2 //领取x次红包 | ||
| 8 | - TASKTYPE_KILLSTAR = 4 //4表示消除x颗星星 | ||
| 9 | - TASKTYPE_USEITEM = 5 //5表示使用x次道具 | ||
| 10 | - TASKTYPE_PLAYSMALLGAMES = 6 //6表示试玩15s小游戏 | ||
| 11 | - TASKTYPE_SHAKETIME = 7 //摇一摇次数 | 5 | + TASKTYPE_MERGE = 1 //表示合成 |
| 6 | + TASKTYPE_WATCHADS = 2 //表示管看广告次数 | ||
| 12 | 7 | ||
| 13 | ) | 8 | ) |
| 14 | 9 | ||
| 15 | //任务类型 对应表 | 10 | //任务类型 对应表 |
| 16 | const ( | 11 | const ( |
| 17 | - DAILY_TASKTYPE_LOGIN = 1 //1 每日登录 | ||
| 18 | - DAILY_TASKTYPE_GETGUANCNT = 2 //提取存钱罐 | ||
| 19 | - DAILY_TASKTYPE_PASSLEVEL = 3 //近日通过关 | ||
| 20 | - DAILY_TASKTYPE_USEITEM = 4 //使用道具数 | ||
| 21 | - DAILY_TASKTYPE_GETREDBAG = 5 //领取红包次数 | ||
| 22 | - DAILY_TASKTYPE_GETGUANGOLD = 6 //收取金币x枚 | ||
| 23 | - DAILY_TASKTYPE_ONLINEMIN = 7 //在线分钟数 | ||
| 24 | - DAILY_TASKTYPE_PLAYSMALLGAME = 8 //试玩小游戏15s | 12 | + //DAILY_TASKTYPE_LOGIN = 1 //1 每日登录 |
| 13 | + | ||
| 14 | + DAILY_TASKTYPE_ONLINEMIN = 1 //在线分钟数 | ||
| 15 | + DAILY_TASKTYPE_MERGE = 2 //合成次数 | ||
| 16 | + DAILY_TASKTYPE_WATCHADS = 3 //观看广告次数 | ||
| 17 | + | ||
| 25 | ) | 18 | ) |
| 26 | 19 | ||
| 27 | //成就类型 对应表 | 20 | //成就类型 对应表 |
src/HttpServer/logic/datadef.go
| @@ -177,7 +177,6 @@ type UpdatetaskResp struct { | @@ -177,7 +177,6 @@ type UpdatetaskResp struct { | ||
| 177 | } | 177 | } |
| 178 | 178 | ||
| 179 | type QuerytaskinfoReq struct { | 179 | type QuerytaskinfoReq struct { |
| 180 | - Tasktype int `json:"tasktype"` | ||
| 181 | Gameid string `json:"gameid"` | 180 | Gameid string `json:"gameid"` |
| 182 | Channel string `json:"channel"` | 181 | Channel string `json:"channel"` |
| 183 | } | 182 | } |
| @@ -384,11 +383,8 @@ type TaskList struct { | @@ -384,11 +383,8 @@ type TaskList struct { | ||
| 384 | //其中提取次数和当日登陆在userdata中记录 | 383 | //其中提取次数和当日登陆在userdata中记录 |
| 385 | type TaskInfo struct { | 384 | type TaskInfo struct { |
| 386 | OnlineMin int //在线分钟数 | 385 | OnlineMin int //在线分钟数 |
| 387 | - PassLevel int //通过关卡数 | ||
| 388 | - UseItemCnt int //使用道具次数 | ||
| 389 | - GetRedbagCnt int //领取红包次数 | ||
| 390 | - GetGuanGold int //收集金币数 | ||
| 391 | - PlaySmall int //当日是否试玩小游戏15s 次数 | 386 | + MergeCnt int //合成次数 |
| 387 | + WatchAds int //观看广告次数 | ||
| 392 | } | 388 | } |
| 393 | 389 | ||
| 394 | // | 390 | // |
src/HttpServer/logic/function.go
| @@ -95,7 +95,7 @@ func GetAchieveConfig(taskid int) *jsonconf.AchieveDesc { | @@ -95,7 +95,7 @@ func GetAchieveConfig(taskid int) *jsonconf.AchieveDesc { | ||
| 95 | func (uinfo *UserData) CalcTaskList(list *TaskList, uniqueid string) *TaskList { | 95 | func (uinfo *UserData) CalcTaskList(list *TaskList, uniqueid string) *TaskList { |
| 96 | 96 | ||
| 97 | newlist := new(TaskList) | 97 | newlist := new(TaskList) |
| 98 | - curtype := -1 //记录当前类型 | 98 | + //curtype := -1 //记录当前类型 |
| 99 | 99 | ||
| 100 | for k, val := range list.Taskdata { | 100 | for k, val := range list.Taskdata { |
| 101 | //未完成的才做判断 | 101 | //未完成的才做判断 |
| @@ -108,56 +108,26 @@ func (uinfo *UserData) CalcTaskList(list *TaskList, uniqueid string) *TaskList { | @@ -108,56 +108,26 @@ func (uinfo *UserData) CalcTaskList(list *TaskList, uniqueid string) *TaskList { | ||
| 108 | continue | 108 | continue |
| 109 | } | 109 | } |
| 110 | 110 | ||
| 111 | - if cfg.TaskType == DAILY_TASKTYPE_LOGIN { | ||
| 112 | - nowloginday := time.Now().Day() | ||
| 113 | - lasttime := time.Unix(int64(uinfo.LastLoginTime), 0) | ||
| 114 | - lastloginday := lasttime.Day() | ||
| 115 | - | ||
| 116 | - if nowloginday == lastloginday && val.Taskstatus == 1 { | ||
| 117 | - list.Taskdata[k].Taskprogress = 1 | ||
| 118 | - list.Taskdata[k].Taskstatus = 2 | ||
| 119 | - } | ||
| 120 | - } else if cfg.TaskType == DAILY_TASKTYPE_GETGUANCNT { | ||
| 121 | - list.Taskdata[k].Taskprogress = uinfo.GetFromGuanCnt | ||
| 122 | - //当日提取存钱罐次数 | ||
| 123 | - if uinfo.GetFromGuanCnt >= cfg.Num { | ||
| 124 | - list.Taskdata[k].Taskstatus = 2 | ||
| 125 | - } | ||
| 126 | - } else if cfg.TaskType == DAILY_TASKTYPE_PASSLEVEL { | ||
| 127 | - list.Taskdata[k].Taskprogress = uinfo.Task.PassLevel | ||
| 128 | - if uinfo.Task.PassLevel >= cfg.Num { | ||
| 129 | - list.Taskdata[k].Taskstatus = 2 | ||
| 130 | - } | ||
| 131 | - } else if cfg.TaskType == DAILY_TASKTYPE_USEITEM { | ||
| 132 | - list.Taskdata[k].Taskprogress = uinfo.Task.UseItemCnt | ||
| 133 | - if uinfo.Task.UseItemCnt >= cfg.Num { | 111 | + if cfg.TaskType == DAILY_TASKTYPE_MERGE { |
| 112 | + list.Taskdata[k].Taskprogress = uinfo.Task.MergeCnt | ||
| 113 | + if uinfo.Task.MergeCnt >= cfg.Num { | ||
| 134 | list.Taskdata[k].Taskstatus = 2 | 114 | list.Taskdata[k].Taskstatus = 2 |
| 135 | } | 115 | } |
| 136 | - } else if cfg.TaskType == DAILY_TASKTYPE_GETREDBAG { | ||
| 137 | - list.Taskdata[k].Taskprogress = uinfo.Task.GetRedbagCnt | ||
| 138 | - if uinfo.Task.GetRedbagCnt >= cfg.Num { | ||
| 139 | - list.Taskdata[k].Taskstatus = 2 | ||
| 140 | - } | ||
| 141 | - } else if cfg.TaskType == DAILY_TASKTYPE_GETGUANGOLD { | ||
| 142 | - list.Taskdata[k].Taskprogress = uinfo.Task.GetGuanGold | ||
| 143 | - if uinfo.Task.GetGuanGold >= cfg.Num { | ||
| 144 | - list.Taskdata[k].Taskstatus = 2 | ||
| 145 | - } | ||
| 146 | - } else if cfg.TaskType == DAILY_TASKTYPE_ONLINEMIN { | 116 | + } else if cfg.TaskType == DAILY_TASKTYPE_ONLINEMIN { |
| 147 | list.Taskdata[k].Taskprogress = uinfo.Task.OnlineMin | 117 | list.Taskdata[k].Taskprogress = uinfo.Task.OnlineMin |
| 148 | if uinfo.Task.OnlineMin >= cfg.Num { | 118 | if uinfo.Task.OnlineMin >= cfg.Num { |
| 149 | list.Taskdata[k].Taskstatus = 2 | 119 | list.Taskdata[k].Taskstatus = 2 |
| 150 | } | 120 | } |
| 151 | - } else if cfg.TaskType == DAILY_TASKTYPE_PLAYSMALLGAME { | ||
| 152 | - list.Taskdata[k].Taskprogress = uinfo.Task.PlaySmall | ||
| 153 | - if uinfo.Task.PlaySmall > 0 { | 121 | + } else if cfg.TaskType == DAILY_TASKTYPE_WATCHADS { |
| 122 | + list.Taskdata[k].Taskprogress = uinfo.Task.WatchAds | ||
| 123 | + if uinfo.Task.WatchAds >= cfg.Num { | ||
| 154 | list.Taskdata[k].Taskstatus = 2 | 124 | list.Taskdata[k].Taskstatus = 2 |
| 155 | } | 125 | } |
| 156 | } | 126 | } |
| 157 | 127 | ||
| 158 | } | 128 | } |
| 159 | 129 | ||
| 160 | - for k, val := range list.Taskdata { | 130 | + /*for k, val := range list.Taskdata { |
| 161 | 131 | ||
| 162 | cfg := GetTaskConfig(val.Taskid) | 132 | cfg := GetTaskConfig(val.Taskid) |
| 163 | if cfg == nil { | 133 | if cfg == nil { |
| @@ -203,7 +173,7 @@ func (uinfo *UserData) CalcTaskList(list *TaskList, uniqueid string) *TaskList { | @@ -203,7 +173,7 @@ func (uinfo *UserData) CalcTaskList(list *TaskList, uniqueid string) *TaskList { | ||
| 203 | } | 173 | } |
| 204 | } | 174 | } |
| 205 | 175 | ||
| 206 | - } | 176 | + }*/ |
| 207 | 177 | ||
| 208 | //需要保存到redis | 178 | //需要保存到redis |
| 209 | SaveTaskInfo(uniqueid, 1, list) | 179 | SaveTaskInfo(uniqueid, 1, list) |
| @@ -906,12 +876,9 @@ func (u *UserData) HandlePassDay(uuid int, channel string) { | @@ -906,12 +876,9 @@ func (u *UserData) HandlePassDay(uuid int, channel string) { | ||
| 906 | u.GetFromGuanCnt = 0 | 876 | u.GetFromGuanCnt = 0 |
| 907 | u.GetCashCnt = 0 | 877 | u.GetCashCnt = 0 |
| 908 | 878 | ||
| 909 | - u.Task.GetGuanGold = 0 | ||
| 910 | - u.Task.GetRedbagCnt = 0 | ||
| 911 | u.Task.OnlineMin = 0 | 879 | u.Task.OnlineMin = 0 |
| 912 | - u.Task.PassLevel = 0 | ||
| 913 | - u.Task.UseItemCnt = 0 | ||
| 914 | - u.Task.PlaySmall = 0 | 880 | + u.Task.MergeCnt = 0 |
| 881 | + u.Task.WatchAds = 0 | ||
| 915 | u.ShakeTime = SHAKELIMIT | 882 | u.ShakeTime = SHAKELIMIT |
| 916 | u.FetchRdBagNum = 0 | 883 | u.FetchRdBagNum = 0 |
| 917 | u.Hfen = 0 | 884 | u.Hfen = 0 |
src/HttpServer/logic/logic.go
| @@ -939,7 +939,7 @@ func HandlerQuerytaskinfo(w http.ResponseWriter, data string, uuid int) { | @@ -939,7 +939,7 @@ func HandlerQuerytaskinfo(w http.ResponseWriter, data string, uuid int) { | ||
| 939 | //需要先计算出任务或者成就 | 939 | //需要先计算出任务或者成就 |
| 940 | var tasklist *TaskList | 940 | var tasklist *TaskList |
| 941 | //先查询一下当前的任务数据 | 941 | //先查询一下当前的任务数据 |
| 942 | - tasklist, err = GetTaskInfo(uuid, rdata.Tasktype, rdata.Channel) | 942 | + tasklist, err = GetTaskInfo(uuid, 1, rdata.Channel) |
| 943 | if err != nil || tasklist == nil { | 943 | if err != nil || tasklist == nil { |
| 944 | logger.Error("redis failed err=%v", err) | 944 | logger.Error("redis failed err=%v", err) |
| 945 | resp.Message = "服务器错误" | 945 | resp.Message = "服务器错误" |
| @@ -947,13 +947,8 @@ func HandlerQuerytaskinfo(w http.ResponseWriter, data string, uuid int) { | @@ -947,13 +947,8 @@ func HandlerQuerytaskinfo(w http.ResponseWriter, data string, uuid int) { | ||
| 947 | break | 947 | break |
| 948 | } | 948 | } |
| 949 | 949 | ||
| 950 | - if rdata.Tasktype == 1 { | ||
| 951 | - tasklist = uinfo.CalcTaskList(tasklist, uniqueuuid) | ||
| 952 | - } else if rdata.Tasktype == 2 { | ||
| 953 | - tasklist = uinfo.CalcAchieveList(tasklist, uniqueuuid) | ||
| 954 | - } else { | ||
| 955 | - tasklist = uinfo.CalcTaskList(tasklist, uniqueuuid) | ||
| 956 | - } | 950 | + tasklist = uinfo.CalcTaskList(tasklist, uniqueuuid) |
| 951 | + | ||
| 957 | 952 | ||
| 958 | if tasklist == nil { | 953 | if tasklist == nil { |
| 959 | logger.Error("redis failed err=%v", err) | 954 | logger.Error("redis failed err=%v", err) |
| @@ -1003,40 +998,10 @@ func HandlerUpdatetaskandachieve(w http.ResponseWriter, data string, uuid int) { | @@ -1003,40 +998,10 @@ func HandlerUpdatetaskandachieve(w http.ResponseWriter, data string, uuid int) { | ||
| 1003 | } | 998 | } |
| 1004 | 999 | ||
| 1005 | switch rdata.Tasktype { | 1000 | switch rdata.Tasktype { |
| 1006 | - case TASKTYPE_PASSLEVEL: | ||
| 1007 | - uinfo.Task.PassLevel += rdata.Value | ||
| 1008 | - case TASKTYPE_GETREDBAG: | ||
| 1009 | - uinfo.Task.GetRedbagCnt += rdata.Value | ||
| 1010 | - if uinfo.LeftFreeRB > 0 { | ||
| 1011 | - uinfo.LeftFreeRB-- | ||
| 1012 | - } | ||
| 1013 | - if uinfo.WatchAddsTime > 0 { | ||
| 1014 | - uinfo.WatchAddsTime-- | ||
| 1015 | - } | ||
| 1016 | - case TASKTYPE_WATCHADS: | ||
| 1017 | - uinfo.Achieve.WatchAdsCnt += rdata.Value | ||
| 1018 | - /*case TASKTYPE_GETREDBAG: | ||
| 1019 | - uinfo.Task.GetRedbagCnt += rdata.Value | 1001 | + case TASKTYPE_MERGE: |
| 1002 | + uinfo.Task.MergeCnt += rdata.Value | ||
| 1020 | case TASKTYPE_WATCHADS: | 1003 | case TASKTYPE_WATCHADS: |
| 1021 | - uinfo.Achieve.WatchAdsCnt += rdata.Value | ||
| 1022 | - if uinfo.LeftFreeRB > 0 { | ||
| 1023 | - uinfo.LeftFreeRB-- | ||
| 1024 | - } | ||
| 1025 | - if uinfo.WatchAddsTime > 0 { | ||
| 1026 | - uinfo.WatchAddsTime-- | ||
| 1027 | - }*/ | ||
| 1028 | - case TASKTYPE_KILLSTAR: | ||
| 1029 | - uinfo.Achieve.KillStar += rdata.Value | ||
| 1030 | - case TASKTYPE_USEITEM: | ||
| 1031 | - uinfo.Task.UseItemCnt += rdata.Value | ||
| 1032 | - uinfo.Achieve.SumUseItemCnt += rdata.Value | ||
| 1033 | - case TASKTYPE_PLAYSMALLGAMES: | ||
| 1034 | - uinfo.Task.PlaySmall += 1 | ||
| 1035 | - case TASKTYPE_SHAKETIME: | ||
| 1036 | - uinfo.ShakeTime -= rdata.Value | ||
| 1037 | - if uinfo.ShakeTime < 0 { | ||
| 1038 | - uinfo.ShakeTime = 0 | ||
| 1039 | - } | 1004 | + uinfo.Task.WatchAds += rdata.Value |
| 1040 | } | 1005 | } |
| 1041 | logger.Info("HandlerUpdatetaskandachieve uinfo=%v rdata=%v", uinfo, rdata) | 1006 | logger.Info("HandlerUpdatetaskandachieve uinfo=%v rdata=%v", uinfo, rdata) |
| 1042 | SaveUserInfo(uinfo, uniqueuuid) | 1007 | SaveUserInfo(uinfo, uniqueuuid) |
| @@ -1294,7 +1259,7 @@ func HandlerGetguangold(w http.ResponseWriter, data string, uuid int) { | @@ -1294,7 +1259,7 @@ func HandlerGetguangold(w http.ResponseWriter, data string, uuid int) { | ||
| 1294 | 1259 | ||
| 1295 | resp.Data.Guangold = uinfo.GuanGold | 1260 | resp.Data.Guangold = uinfo.GuanGold |
| 1296 | //uinfo.Task.GetGuanGold += rdata.Goldnum | 1261 | //uinfo.Task.GetGuanGold += rdata.Goldnum |
| 1297 | - uinfo.Task.GetGuanGold++ | 1262 | + //uinfo.Task.GetGuanGold++ |
| 1298 | 1263 | ||
| 1299 | SaveUserInfo(uinfo, uniqueuuid) | 1264 | SaveUserInfo(uinfo, uniqueuuid) |
| 1300 | 1265 |