From f6838d7bb9fbe1a9bfecddc69b3138231f1749b7 Mon Sep 17 00:00:00 2001
From: hahwu <31872165+hahwu@users.noreply.github.com>
Date: Tue, 17 Jun 2025 11:35:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=A1=E7=89=8C=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/server/conf/server.json      | 2 +-
 src/server/game/mod/card/Card.go | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/server/conf/server.json b/src/server/conf/server.json
index b441b645..ad46593b 100644
--- a/src/server/conf/server.json
+++ b/src/server/conf/server.json
@@ -9,7 +9,7 @@
 	"MySqlUsr": "root",
 	"MySqlPwd": "IOagNEq3C84c-20CmHEin5iODVc=",
 	"MaxConnNum": 20000,
-	"DbName": "Merge_Pet",
+	"DbName": "Merge_Pet_1",
 	"HttpPort": ":8081",
 	"AppPath": "./app",
 	"TELOGDIR" : "./teLog/",
diff --git a/src/server/game/mod/card/Card.go b/src/server/game/mod/card/Card.go
index 09befcb9..fd5a1e1e 100644
--- a/src/server/game/mod/card/Card.go
+++ b/src/server/game/mod/card/Card.go
@@ -313,10 +313,10 @@ func (c *CardMod) AllCollectReward() ([]*item.Item, []*item.Item, error) {
 		if v == HANDBOOK_STATUS_GET {
 			continue
 		}
-		Round := cardCfg.GetRoundById(k)
-		if Round < c.Round {
-			continue
-		}
+		// Round := cardCfg.GetRoundById(k)
+		// if Round < c.Round {
+		// 	continue
+		// }
 		HandbookItemNum += cardCfg.GetStarById(k)
 	}
 	c.Round++