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++