From 3a39abe9c6f9dd52c7913043fc02ac565d5bc85b Mon Sep 17 00:00:00 2001
From: xinian <eBCmZThyqEBRX6cZZseEVK+xinian@noreply.cnb.cool>
Date: Sat, 14 Mar 2026 12:09:30 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E9=87=8D=E6=9E=84=E6=AF=8F?=
 =?UTF-8?q?=E6=97=A5=E9=87=8D=E7=BD=AE=E9=80=BB=E8=BE=91=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/player/service/info.go | 74 +++++++++++++++++-----------------
 1 file changed, 38 insertions(+), 36 deletions(-)

diff --git a/modules/player/service/info.go b/modules/player/service/info.go
index e58aa727..c283717a 100644
--- a/modules/player/service/info.go
+++ b/modules/player/service/info.go
@@ -93,52 +93,54 @@ func (s *InfoService) GetLogin() *model.PlayerInfo {
 		}
 
 	}
+	if cool.Config.ServerInfo.IsVip == 0 {
+		if !utils.IsToday(tt.LastResetTime)  { //判断是否是今天
 
-	if !utils.IsToday(tt.LastResetTime) && cool.Config.ServerInfo.IsVip == 0 { //判断是否是今天
+			//每天login时候检查重置时间，然后把电池，任务，挖矿重置
+			//挖矿需要单独存，因为防止多开挖矿
+			tt.LastResetTime = gtime.Now()
+			//每天login时候检查重置时间，然后把电池，任务，挖矿重置
+			//挖矿需要单独存，因为防止多开挖矿
+			tt.Data.TimeToday = 0 //重置电池
+			//tt.Data.FightTime = 60 * 60 * 2 //重置战斗次数
 
-		//每天login时候检查重置时间，然后把电池，任务，挖矿重置
-		//挖矿需要单独存，因为防止多开挖矿
-		tt.LastResetTime = gtime.Now()
-		//每天login时候检查重置时间，然后把电池，任务，挖矿重置
-		//挖矿需要单独存，因为防止多开挖矿
-		tt.Data.TimeToday = 0 //重置电池
-		//tt.Data.FightTime = 60 * 60 * 2 //重置战斗次数
+			for _, v := range service.NewTaskService().GetDaily() {
+				if v.IsAcceptable == 1 {
+					tt.Data.SetTask(int(v.TaskId), model.Unaccepted)
+				} else {
+					tt.Data.SetTask(int(v.TaskId), model.Reserved)
+				}
 
-		for _, v := range service.NewTaskService().GetDaily() {
-			if v.IsAcceptable == 1 {
-				tt.Data.SetTask(int(v.TaskId), model.Unaccepted)
-			} else {
-				tt.Data.SetTask(int(v.TaskId), model.Reserved)
 			}
 
-		}
+			// for i := 0; i < 50; i++ { //每日任务区段
+			// 	tt.Data.DailyResArr[i] = 0 //重置每日任务
 
-		// for i := 0; i < 50; i++ { //每日任务区段
-		// 	tt.Data.DailyResArr[i] = 0 //重置每日任务
-
-		// }
-		// //defer t.Service.Talk_Reset()
-		_, err := s.dbm_fix(s.Model).Data("last_reset_time", gtime.Now()).Update()
-		if err != nil {
-			panic(err)
-		}
-	}
-	if !IsWEEK(tt.WeekLastResetTime) && cool.Config.ServerInfo.IsVip == 0 {
-
-		for _, v := range service.NewTaskService().GetWeek() {
-
-			if v.IsAcceptable == 1 {
-				tt.Data.SetTask(int(v.TaskId), model.Unaccepted)
-			} else {
-				tt.Data.SetTask(int(v.TaskId), model.Reserved)
+			// }
+			// //defer t.Service.Talk_Reset()
+			_, err := s.dbm_fix(s.Model).Data("last_reset_time", gtime.Now()).Update()
+			if err != nil {
+				panic(err)
 			}
-
 		}
-		_, err := s.dbm_fix(s.Model).Data("week_last_reset_time", gtime.Now()).Update()
-		if err != nil {
-			panic(err)
+		if !IsWEEK(tt.WeekLastResetTime)  {
+
+			for _, v := range service.NewTaskService().GetWeek() {
+
+				if v.IsAcceptable == 1 {
+					tt.Data.SetTask(int(v.TaskId), model.Unaccepted)
+				} else {
+					tt.Data.SetTask(int(v.TaskId), model.Reserved)
+				}
+
+			}
+			_, err := s.dbm_fix(s.Model).Data("week_last_reset_time", gtime.Now()).Update()
+			if err != nil {
+				panic(err)
+			}
 		}
 	}
+
 	ret := tt.Data
 
 	return &ret