提交

陆恒
1 parent 35254f71
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) {
 			}
 		} else if cfg.Day_type == DAILY_TASKTYPE_RELIVE {
 			list.Taskdata[k].Taskprogress = uinfo.Task.RelivegCnt
-			if uinfo.Task.RelivegCnt > cfg.Aims {
+			if uinfo.Task.RelivegCnt >= cfg.Aims {
 				list.Taskdata[k].Taskstatus = 2
 			}
 		} else if cfg.Day_type == DAILY_TASKTYPE_USEITEME {
 			list.Taskdata[k].Taskprogress = uinfo.Task.UseItemCnt
-			if uinfo.Task.UseItemCnt > cfg.Aims {
+			if uinfo.Task.UseItemCnt >= cfg.Aims {
 				list.Taskdata[k].Taskstatus = 2
 			}
+		} else {
+			//如果是活跃任务做一下处理
+			if cfg.Type == 2 {
+				list.Taskdata[k].Taskprogress = uinfo.Task.HuoYue
+				if uinfo.Task.HuoYue >= cfg.Active {
+					list.Taskdata[k].Taskstatus = 2
+				}
+			}
 		}
 	}