From 38b1823ea1bab9be9a19d27134247d686da5d7e9 Mon Sep 17 00:00:00 2001
From: 陆恒 <luheng@puchigames.com>
Date: Tue, 7 Jul 2020 11:06:31 +0800
Subject: [PATCH] 提交

---
 src/HttpServer/logic/function.go | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/HttpServer/logic/function.go b/src/HttpServer/logic/function.go
index 5048f9d..fe686ef 100644
--- a/src/HttpServer/logic/function.go
+++ b/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
+				}
+			}
 		}
 
 	}
--
libgit2 0.21.0