Commit db937d383b4b7415efbe05899522fdae16879e60
1 parent
59cafb12
Exists in
master
and in
4 other branches
提交
Showing
1 changed file
with
27 additions
and
24 deletions
Show diff stats
src/HttpServer/logic/function.go
| ... | ... | @@ -185,30 +185,33 @@ func (uinfo *UserData) CalcAchieveList(list *TaskList) *TaskList { |
| 185 | 185 | } |
| 186 | 186 | |
| 187 | 187 | list.Taskdata[k].Taskprogress = uinfo.CalcAchieveProgress(cfg.TaskType) |
| 188 | - switch cfg.TaskType { | |
| 189 | - case ACHIEVETYPE_WATCHADDS: | |
| 190 | - if uinfo.Achieve.WatchAdsCnt >= cfg.Num { | |
| 191 | - list.Taskdata[k].Taskstatus = 2 | |
| 192 | - } | |
| 193 | - case ACHIEVETYPE_USERLV: | |
| 194 | - if uinfo.Lv >= cfg.Num { | |
| 195 | - list.Taskdata[k].Taskstatus = 2 | |
| 196 | - } | |
| 197 | - case ACHIEVETYPE_KILLSTAR: | |
| 198 | - if uinfo.Achieve.KillStar >= cfg.Num { | |
| 199 | - list.Taskdata[k].Taskstatus = 2 | |
| 200 | - } | |
| 201 | - case ACHIEVETYPE_GETGUANCNT: | |
| 202 | - if uinfo.Achieve.SumGetGuan >= cfg.Num { | |
| 203 | - list.Taskdata[k].Taskstatus = 2 | |
| 204 | - } | |
| 205 | - case ACHIEVETYPE_USEITEMCNT: | |
| 206 | - if uinfo.Achieve.SumUseItemCnt >= cfg.Num { | |
| 207 | - list.Taskdata[k].Taskstatus = 2 | |
| 188 | + if val.Taskstatus == 1 { | |
| 189 | + switch cfg.TaskType { | |
| 190 | + case ACHIEVETYPE_WATCHADDS: | |
| 191 | + if uinfo.Achieve.WatchAdsCnt >= cfg.Num { | |
| 192 | + list.Taskdata[k].Taskstatus = 2 | |
| 193 | + } | |
| 194 | + case ACHIEVETYPE_USERLV: | |
| 195 | + if uinfo.Lv >= cfg.Num { | |
| 196 | + list.Taskdata[k].Taskstatus = 2 | |
| 197 | + } | |
| 198 | + case ACHIEVETYPE_KILLSTAR: | |
| 199 | + if uinfo.Achieve.KillStar >= cfg.Num { | |
| 200 | + list.Taskdata[k].Taskstatus = 2 | |
| 201 | + } | |
| 202 | + case ACHIEVETYPE_GETGUANCNT: | |
| 203 | + if uinfo.Achieve.SumGetGuan >= cfg.Num { | |
| 204 | + list.Taskdata[k].Taskstatus = 2 | |
| 205 | + } | |
| 206 | + case ACHIEVETYPE_USEITEMCNT: | |
| 207 | + if uinfo.Achieve.SumUseItemCnt >= cfg.Num { | |
| 208 | + list.Taskdata[k].Taskstatus = 2 | |
| 209 | + } | |
| 210 | + default: | |
| 211 | + logger.Error("CalcAchieveProgress type wrong ttype=%v", cfg.TaskType) | |
| 208 | 212 | } |
| 209 | - default: | |
| 210 | - logger.Error("CalcAchieveProgress type wrong ttype=%v", cfg.TaskType) | |
| 211 | 213 | } |
| 214 | + | |
| 212 | 215 | } |
| 213 | 216 | |
| 214 | 217 | for k, val := range list.Taskdata { |
| ... | ... | @@ -279,7 +282,7 @@ func SaveTaskInfo(uuid, tasktype int, list *TaskList) error { |
| 279 | 282 | err = redishandler.GetRedisClient().HSet(redis.USER_TASKINFO_LIST, strconv.Itoa(uuid), string(savestr)) |
| 280 | 283 | } else if tasktype == 2 { |
| 281 | 284 | err = redishandler.GetRedisClient().HSet(redis.USER_ACHIEVEMENTINFO_LIST, strconv.Itoa(uuid), string(savestr)) |
| 282 | - logger.Info("SaveTaskInfo savestr=%v", string(savestr)) | |
| 285 | + //logger.Info("SaveTaskInfo savestr=%v", string(savestr)) | |
| 283 | 286 | } else { |
| 284 | 287 | logger.Error("tasktype invalid") |
| 285 | 288 | return errors.New("tasktype invalid") |
| ... | ... | @@ -346,7 +349,7 @@ func (uinfo *UserData) HandleGetTaskReward(req *GettaskrewardReq, resp *Gettaskr |
| 346 | 349 | return errors.New("当前任务id错误") |
| 347 | 350 | } |
| 348 | 351 | |
| 349 | - cfg := GetTaskConfig(taskdesc.Taskid) | |
| 352 | + cfg := GetAchieveConfig(taskdesc.Taskid) | |
| 350 | 353 | if cfg == nil || len(cfg.Reward) < 2 { |
| 351 | 354 | resp.Code = ERROR_SRV_ERROR |
| 352 | 355 | resp.Message = "网络错误" | ... | ... |