From 4546bd66cf8ca1ef1b874a80cdd00907ec7b7648 Mon Sep 17 00:00:00 2001
From: hahwu <31872165+hahwu@users.noreply.github.com>
Date: Thu, 16 Apr 2026 11:25:40 +0800
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/champship_mgr.go | 14 ++++----------
 src/server/game/message_mgr.go   |  2 +-
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/server/game/champship_mgr.go b/src/server/game/champship_mgr.go
index 50db70d0..591435b7 100644
--- a/src/server/game/champship_mgr.go
+++ b/src/server/game/champship_mgr.go
@@ -114,7 +114,7 @@ func (c *ChampshipMgr) Init() {
 	remain1 := 1800 - remain%1800
 
 	c.mDispatr.AfterFunc(time.Duration(remain1)*time.Second, func() { // 30分钟后重新分组
-		c.group(false)
+		c.group()
 	})
 
 	c.mDispatr.AfterFunc(time.Duration(60)*time.Second, func() {
@@ -174,7 +174,6 @@ func (c *ChampshipMgr) ZeroNotifyAll() (interface{}, error) {
 }
 
 func (c *ChampshipMgr) ZeroUpdate() (interface{}, error) {
-	c.group(true)
 	log.Debug("ChampshipMgr ZeroUpdate")
 	data := c.getData()
 	data.mu.Lock()
@@ -494,14 +493,9 @@ func (c *ChampshipMgr) GetRankMsg(uid int) *proto.ResChampshipRank {
 }
 
 // 分组
-func (c *ChampshipMgr) group(iszero bool) (interface{}, error) {
-	now := GoUtil.Now()
-	zero := GoUtil.ZeroTimestamp()
-	if now-zero < 1800 && !iszero { // 0点30分钟内不分组
-		return nil, nil
-	}
+func (c *ChampshipMgr) group() (interface{}, error) {
 	c.mDispatr.AfterFunc(time.Duration(1800)*time.Second, func() { // 30分钟后重新分组
-		c.group(false)
+		c.group()
 	})
 	ChampshipData := c.getData()
 	ChampshipData.mu.Lock()
@@ -1053,7 +1047,7 @@ func (c *ChampshipMgr) Debug() {
 			H:     GoUtil.RandNum(1, 99),
 		}
 	}
-	c.group(true)
+	c.group()
 	var i int
 	for _, v := range ChampshipData.Rank {
 		for _, v1 := range v {
diff --git a/src/server/game/message_mgr.go b/src/server/game/message_mgr.go
index 4e7a6323..62f0d61d 100644
--- a/src/server/game/message_mgr.go
+++ b/src/server/game/message_mgr.go
@@ -221,7 +221,7 @@ func NotifyAllPlayerMsg(m *msg.Msg) {
 }
 
 func ChampshipGroupHandler(data *msg.Msg) (interface{}, error) {
-	G_GameLogicPtr.ChampshipMgr.group(true)
+	G_GameLogicPtr.ChampshipMgr.group()
 	return nil, nil
 }