Commit 38b1823ea1bab9be9a19d27134247d686da5d7e9
1 parent
35254f71
Exists in
master
提交
Showing
1 changed file
with
10 additions
and
2 deletions
Show diff stats
src/HttpServer/logic/function.go
| ... | ... | @@ -310,14 +310,22 @@ func (uinfo *UserData) CalcTaskList(list *TaskList, uniqueid string) { |
| 310 | 310 | } |
| 311 | 311 | } else if cfg.Day_type == DAILY_TASKTYPE_RELIVE { |
| 312 | 312 | list.Taskdata[k].Taskprogress = uinfo.Task.RelivegCnt |
| 313 | - if uinfo.Task.RelivegCnt > cfg.Aims { | |
| 313 | + if uinfo.Task.RelivegCnt >= cfg.Aims { | |
| 314 | 314 | list.Taskdata[k].Taskstatus = 2 |
| 315 | 315 | } |
| 316 | 316 | } else if cfg.Day_type == DAILY_TASKTYPE_USEITEME { |
| 317 | 317 | list.Taskdata[k].Taskprogress = uinfo.Task.UseItemCnt |
| 318 | - if uinfo.Task.UseItemCnt > cfg.Aims { | |
| 318 | + if uinfo.Task.UseItemCnt >= cfg.Aims { | |
| 319 | 319 | list.Taskdata[k].Taskstatus = 2 |
| 320 | 320 | } |
| 321 | + } else { | |
| 322 | + //如果是活跃任务做一下处理 | |
| 323 | + if cfg.Type == 2 { | |
| 324 | + list.Taskdata[k].Taskprogress = uinfo.Task.HuoYue | |
| 325 | + if uinfo.Task.HuoYue >= cfg.Active { | |
| 326 | + list.Taskdata[k].Taskstatus = 2 | |
| 327 | + } | |
| 328 | + } | |
| 321 | 329 | } |
| 322 | 330 | |
| 323 | 331 | } | ... | ... |