From 77ff2416988037286fa47c3f1fe02aebe1ca23b4 Mon Sep 17 00:00:00 2001
From: hahwu <31872165+hahwu@users.noreply.github.com>
Date: Thu, 12 Mar 2026 11:20:24 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"=E6=B4=BB=E5=8A=A8=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=EF=BC=8C=E6=B4=BB=E5=8A=A8=E7=B1=BB=E5=9E=8B=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E4=BB=A5=E6=97=B6=E9=97=B4=E6=AE=B5=E4=B8=BA=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 37ef7dd4341452cafb391202ae03eb1f33ee0370.
---
 src/server/game/GameLogic.go     |  1 -
 src/server/game/activity_func.go | 17 +++++------------
 src/server/test/activity_test.go | 15 ---------------
 3 files changed, 5 insertions(+), 28 deletions(-)

diff --git a/src/server/game/GameLogic.go b/src/server/game/GameLogic.go
index d5651b23..561e8ae6 100644
--- a/src/server/game/GameLogic.go
+++ b/src/server/game/GameLogic.go
@@ -514,7 +514,6 @@ func (ad *GameLogic) ClearData(args []interface{}) {
 	if player != nil && player.M_DwUin != 0 {
 		player.agent = nil
 		log.Debug("player %d 断开连接", player.M_DwUin)
-		player.AutoSaveData()
 		player.CallEvent(120*time.Second, func() {
 			player.lock.Lock()
 			defer player.lock.Unlock()
diff --git a/src/server/game/activity_func.go b/src/server/game/activity_func.go
index d2595885..14e8a79f 100644
--- a/src/server/game/activity_func.go
+++ b/src/server/game/activity_func.go
@@ -462,8 +462,7 @@ func (p *Player) GetChampshipActivityId() (int, int) {
 	var yesterdayActivityId int
 	activiyCfgList := activityCfg.GetActivityListOrigin()
 	Now := GoUtil.Now()
-	YesterDayEnd := GoUtil.ZeroTimestamp() - 1
-	YesterDayStart := GoUtil.ZeroTimestamp() - 24*3600
+	YesterDay := GoUtil.ZeroTimestamp() - 1
 	level := p.GetBaseMod().GetLevel()
 	champshipActivityIds := champshipCfg.GetChampshipActivityId()
 	for _, v := range activiyCfgList {
@@ -476,10 +475,7 @@ func (p *Player) GetChampshipActivityId() (int, int) {
 		if v.StartTime <= Now && v.EndTime >= Now {
 			todayActivityId = v.Id
 		}
-		if v.StartTime <= YesterDayStart && v.EndTime >= YesterDayStart {
-			yesterdayActivityId = v.Id
-		}
-		if v.StartTime <= YesterDayEnd && v.EndTime >= YesterDayEnd {
+		if v.StartTime <= YesterDay && v.EndTime >= YesterDay {
 			yesterdayActivityId = v.Id
 		}
 	}
@@ -489,9 +485,8 @@ func (p *Player) GetChampshipActivityId() (int, int) {
 func (p *Player) GetDailyTaskActivityId() int {
 	var activityId int
 	activiyCfgList := activityCfg.GetActivityListOrigin()
+	Now := GoUtil.Now()
 	level := p.GetBaseMod().GetLevel()
-	todayZeroStart := GoUtil.ZeroTimestamp()
-	todayZeroEnd := GoUtil.ZeroTimestamp() + 24*3600 - 1
 	activityIds := dailyTaskCfg.GetActivityIds()
 	for _, v := range activiyCfgList {
 		if !GoUtil.InArray(v.Type, activityIds) {
@@ -500,11 +495,9 @@ func (p *Player) GetDailyTaskActivityId() int {
 		if v.Level > level {
 			continue
 		}
-		if v.StartTime <= todayZeroStart && v.EndTime >= todayZeroStart {
-			activityId = v.Id
-		}
-		if v.StartTime <= todayZeroEnd && v.EndTime >= todayZeroEnd {
+		if v.StartTime <= Now && v.EndTime >= Now {
 			activityId = v.Id
+			break
 		}
 	}
 	return activityId
diff --git a/src/server/test/activity_test.go b/src/server/test/activity_test.go
index 1b723262..03dd8307 100644
--- a/src/server/test/activity_test.go
+++ b/src/server/test/activity_test.go
@@ -11,18 +11,3 @@ func TestActivityOpenEnd(t *testing.T) {
 	p.InitActivity()
 	p.ActivityLogin()
 }
-
-func TestChampionshipActivityId(t *testing.T) {
-	p := new(game.Player)
-	p.InitPlayer("3625212")
-	todayActivityId, yesterdayActivityId := p.GetChampshipActivityId()
-	t.Logf("Current championship activity ID: %d", todayActivityId)
-	t.Logf("Yesterday's championship activity ID: %d", yesterdayActivityId)
-}
-
-func TestDailyTaskActivityId(t *testing.T) {
-	p := new(game.Player)
-	p.InitPlayer("3625212")
-	activityId := p.GetDailyTaskActivityId()
-	t.Logf("Current daily task activity ID: %d", activityId)
-}