diff --git a/src/server/game/mod/champship/Champship.go b/src/server/game/mod/champship/Champship.go index 40864c7f..e997b827 100644 --- a/src/server/game/mod/champship/Champship.go +++ b/src/server/game/mod/champship/Champship.go @@ -84,7 +84,6 @@ func (c *ChampshipMod) BackData(myRank, myPreRank, todayActivityId, yesterdayAct return &msg.ResChampship{ Score: int32(c.Score), Reward: int32(c.Reward), - EndTime: int32(GoUtil.ZeroTimestamp() + 86400), Period: int32(GoUtil.GetServerOpenDay()), Rank: int32(myRank), RankReward: int32(rankReward), diff --git a/src/server/game/player_back.go b/src/server/game/player_back.go index 0af655a2..7713b6d8 100644 --- a/src/server/game/player_back.go +++ b/src/server/game/player_back.go @@ -3,6 +3,7 @@ package game import ( chargeCfg "server/conf/charge" playroomCfg "server/conf/playroom" + "server/game/mod/activity" "server/game/mod/item" limitedTimeEvent "server/game/mod/limited_time_event" GoUtil "server/game_util" @@ -310,11 +311,16 @@ func (p *Player) BackChampship() { ChampshipMod := p.PlayMod.getChampshipMod() rank, preRank := p.GetChampshipRank() todayActivityId, yesterdayActivityId := p.GetChampshipActivityId() + activityInfo := p.GetActivityInfo(activity.ACT_TYPE_CHAMPION) res := ChampshipMod.BackData(rank, preRank, todayActivityId, yesterdayActivityId) cfg := G_GameLogicPtr.ActivityMgr.GetChampshipCfg(todayActivityId) + res.EndTime = int32(GoUtil.ZeroTimestamp() + 86400) if cfg != nil && GoUtil.Now()-GoUtil.ZeroTimestamp() >= int64(cfg.ClearTime) { res.Status = 1 } + if activityInfo != nil { + res.EndTime = int32(activityInfo.EndT) + } res.Cfg = cfg p.PushClientRes(res) }