From 557dec4612e8639735bf0a62f765444c669efa63 Mon Sep 17 00:00:00 2001
From: hahwu <31872165+hahwu@users.noreply.github.com>
Date: Thu, 2 Apr 2026 10:42:53 +0800
Subject: [PATCH] 1

---
 src/server/game/activity_mgr.go  | 10 ++++++++++
 src/server/game_util/timeUtil.go |  5 +++++
 2 files changed, 15 insertions(+)

diff --git a/src/server/game/activity_mgr.go b/src/server/game/activity_mgr.go
index ef3ca268..3aed7178 100644
--- a/src/server/game/activity_mgr.go
+++ b/src/server/game/activity_mgr.go
@@ -75,6 +75,10 @@ func (r *ActivityMgr) GetActivityList() []ActivityCfg {
 				interval := (now - v.Startime) / v.Interval
 				v.Startime += interval * v.Interval
 				v.Endtime += interval * v.Interval
+				if now > v.Endtime {
+					v.Startime += v.Interval
+					v.Endtime += v.Interval
+				}
 			}
 			v.Id = int(v.Startime) //活动id用开始时间表示，方便客户端排序
 		}
@@ -130,6 +134,12 @@ func (r *ActivityMgr) Reload() error {
 		log.Debug("load activity cfg: %v", cfg)
 		data.List[v.Id] = cfg
 	}
+	go func() {
+		actList := r.GetActivityList()
+		for _, v := range actList {
+			log.Debug("activity load success: type :%d, id :%d, startTime :%s, endTime :%s", v.Type, v.Id, GoUtil.FormatTime(v.Startime), GoUtil.FormatTime(v.Endtime))
+		}
+	}()
 	G_GameLogicPtr.NotifyAll(&Msg.Msg{Type: Msg.HANDLE_TYPE_ACTIVITY_RELOAD})
 	return nil
 }
diff --git a/src/server/game_util/timeUtil.go b/src/server/game_util/timeUtil.go
index 083a5c81..54f5404b 100644
--- a/src/server/game_util/timeUtil.go
+++ b/src/server/game_util/timeUtil.go
@@ -178,3 +178,8 @@ func IsFirstDayOfMonth() bool {
 func NowMonth() int {
 	return int(time.Now().Month())
 }
+
+func FormatTime(timestamp int64) string {
+	t := time.Unix(timestamp, 0)
+	return t.Format("2006-01-02 15:04:05")
+}