From a48e40126426810a1af8347954ae2c82c69bbb27 Mon Sep 17 00:00:00 2001
From: 陆恒 <luheng@puchigames.com>
Date: Wed, 20 May 2020 10:04:53 +0800
Subject: [PATCH] 修复

---
 src/HttpServer/logic/function.go | 17 ++++++++++++++---
 src/HttpServer/logic/logic.go    |  4 ++--
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/HttpServer/logic/function.go b/src/HttpServer/logic/function.go
index 2b86ef0..8257636 100644
--- a/src/HttpServer/logic/function.go
+++ b/src/HttpServer/logic/function.go
@@ -562,6 +562,7 @@ func (u *UserData) HandlePassDay() {
 		} else {
 			u.ContinueLoginDay++
 		}
+
 	}
 
 	if isdiffday {
@@ -577,7 +578,7 @@ func (u *UserData) HandlePassDay() {
 		u.Task.UseItemCnt = 0
 
 		//任务也需要处理
-		tasklist, err := GetTaskInfo(u.Userid, 1)
+		/*tasklist, err := GetTaskInfo(u.Userid, 1)
 		if err == nil {
 			for k, _ := range tasklist.Taskdata {
 				tasklist.Taskdata[k].Taskstatus = 1
@@ -585,10 +586,20 @@ func (u *UserData) HandlePassDay() {
 			}
 		} else {
 			logger.Error("HandlePassDay GetTaskInfo failer err=%v", err)
+		}*/
+		tasklist := new(TaskList)
+		for _, val := range jsonconf.GetJsonConf().TaskConfig {
+			var tmp TaskListDesc
+			tmp.Taskstatus = 1
+			tmp.Taskid = val.Id
+			tmp.Taskprogress = 0
+			tasklist.Taskdata = append(tasklist.Taskdata, tmp)
 		}
 
-		//保存
-		SaveTaskInfo(u.Userid, 1, tasklist)
+		err := SaveTaskInfo(u.Userid, 1, tasklist)
+		if err != nil {
+			logger.Error("InitTaskAndAchievement err=%v", err)
+		}
 
 		//签到数据处理
 		u.IsSignToday = 0
diff --git a/src/HttpServer/logic/logic.go b/src/HttpServer/logic/logic.go
index e7f566e..29e832f 100644
--- a/src/HttpServer/logic/logic.go
+++ b/src/HttpServer/logic/logic.go
@@ -148,8 +148,8 @@ func HandlerGetcash(w http.ResponseWriter, data string, uuid int) {
 		}
 
 		if info.Preisfind == 0 {
-			logger.Error("AddWithDrawList failed err=%v", err)
-			resp.Message = "新人专享只能提取一次"
+			logger.Error("HandlerGetcash Preisfind err=%v", err)
+			resp.Message = "请先完成前一挡体现"
 			resp.Code = ERROR_PRENOTFINISH
 			break
 		}
--
libgit2 0.21.0