From acbfd823e0bdfbd9663689d8085f42d90332857a Mon Sep 17 00:00:00 2001
From: hahwu <31872165+hahwu@users.noreply.github.com>
Date: Sun, 19 Apr 2026 01:40:38 -0400
Subject: [PATCH] =?UTF-8?q?=E9=94=A6=E6=A0=87=E8=B5=9B=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/server/game/activity_func.go | 3 +--
 src/server/game/champship_mgr.go | 8 ++++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/server/game/activity_func.go b/src/server/game/activity_func.go
index 4abfaca5..feffdf5a 100644
--- a/src/server/game/activity_func.go
+++ b/src/server/game/activity_func.go
@@ -597,9 +597,8 @@ func (p *Player) ChampionshipZeroUpdate() {
 	if activityCfg.AId != 0 && activityCfg.AId == ChampionshipMod.AId {
 		return
 	}
-	aid := ChampionshipMod.AId
 	var items []*item.Item
-	items = p.GetChampshipReward(aid)
+	items = p.GetChampshipReward(ChampionshipMod.Id)
 	if len(items) > 0 {
 		p.SendActivityMail2(items, "backend_championship_mail_title", "backend_championship_mail_content")
 		p.PushClientRes(p.GetMailMod().BackData())
diff --git a/src/server/game/champship_mgr.go b/src/server/game/champship_mgr.go
index 6ca2623d..380c11c0 100644
--- a/src/server/game/champship_mgr.go
+++ b/src/server/game/champship_mgr.go
@@ -142,6 +142,14 @@ func (c *ChampshipMgr) version() {
 			}
 		}
 	}
+	if c.data.(*ChampshipData).Version == 1 {
+		c.data.(*ChampshipData).Version = 2
+		activityCfg := G_GameLogicPtr.ActivityMgr.GetActivityListByType(activity.ACT_TYPE_CHAMPION)
+		// 如果活动ID没有变化，说明没有新的活动，不需要重置数据
+		if activityCfg.AId != 0 && c.data.(*ChampshipData).Aid == 0 {
+			c.data.(*ChampshipData).Aid = activityCfg.AId
+		}
+	}
 }
 
 func sortChampionshipRank(rankList []*ChampshipRank) {