diff --git a/src/server/game/champship_mgr.go b/src/server/game/champship_mgr.go index fe777854..e1cf33a6 100644 --- a/src/server/game/champship_mgr.go +++ b/src/server/game/champship_mgr.go @@ -850,6 +850,7 @@ func (c *ChampshipMgr) SetRankCache(Uid int) { PreGroupId := c.getData().PreGroupInfo[Uid] GroupId := c.getData().GroupInfo[Uid] key := fmt.Sprintf("champship_rank_cache_%d", Uid) + log.Debug("GetRankCache key:%s; data:%s", key, fmt.Sprintf("%d_%d_%d_%d", PreRank, Rank, PreGroupId, GroupId)) db.RedisSetKey(key, fmt.Sprintf("%d_%d_%d_%d", PreRank, Rank, PreGroupId, GroupId), 86400*2) } diff --git a/src/server/game/gm_handler.go b/src/server/game/gm_handler.go index f7ce991e..8288afe0 100644 --- a/src/server/game/gm_handler.go +++ b/src/server/game/gm_handler.go @@ -252,8 +252,8 @@ func ReqGmCommand_(player *Player, Command string) error { } player.PushClientRes(LimitedTimeEventMod.ProgressBackData()) case "champshipGroup": - G_GameLogicPtr.ChampshipMgrSend(&MsgMod.Msg{ - Type: MsgMod.HANDLE_TYPE_CHAMPSHIP_GROUP, + SendMsgToCenterAsync(&MsgMod.Msg{ + HandleType: MsgMod.HANDLE_MOD_CHAMPSHIP_GROUP, }) case "clearRank": num, _ := strconv.Atoi(arg[1]) diff --git a/src/server/game/message_mgr.go b/src/server/game/message_mgr.go index e333c952..dea2036f 100644 --- a/src/server/game/message_mgr.go +++ b/src/server/game/message_mgr.go @@ -175,6 +175,7 @@ func (m *MessageMgr) CenterRegister() { m.RegisterHandler(msg.HANDLE_MOD_CHAMPSHIP_RANK_INFO, MessageHandlerFunc(ChampshipRankInfoHandler)) m.RegisterHandler(msg.HANDLE_MOD_CHAMPSHIP_RANK_LIST, MessageHandlerFunc(ChampshipRankListHandler)) m.RegisterHandler(msg.HANDLE_MOD_CHAMPSHIP_PRE_RANK, MessageHandlerFunc(ChampshipRankPreHandler)) + m.RegisterHandler(msg.HANDLE_MOD_CHAMPSHIP_GROUP, MessageHandlerFunc(ChampshipInRankHandler)) } } @@ -222,6 +223,11 @@ func NotifyAllPlayerMsg(m *msg.Msg) { } } +func ChampshipGroupHandler(data *msg.Msg) (interface{}, error) { + G_GameLogicPtr.ChampshipMgr.group() + return nil, nil +} + func ChampshipInRankHandler(data *msg.Msg) (interface{}, error) { G_GameLogicPtr.ChampshipMgr.inRank(data) return nil, nil diff --git a/src/server/game/mod/msg/Msg.go b/src/server/game/mod/msg/Msg.go index 02c7077b..665791b8 100644 --- a/src/server/game/mod/msg/Msg.go +++ b/src/server/game/mod/msg/Msg.go @@ -48,6 +48,7 @@ const ( HANDLE_MOD_CHAMPSHIP_RANK_INFO = 20014 // 锦标赛排名信息 HANDLE_MOD_CHAMPSHIP_RANK_LIST = 20015 // 锦标赛排行榜 HANDLE_MOD_CHAMPSHIP_PRE_RANK = 20016 // 锦标赛上期排名 + HANDLE_MOD_CHAMPSHIP_GROUP = 20017 // 锦标赛分组 ) const ( diff --git a/src/server/test/order_test.go b/src/server/test/order_test.go index e3a53681..6f300dd5 100644 --- a/src/server/test/order_test.go +++ b/src/server/test/order_test.go @@ -34,9 +34,9 @@ func TestOrderFinish(t *testing.T) { func TestChestRain(t *testing.T) { p1 := new(game.Player) - p1.InitPlayer("GSTTEST011") + p1.InitPlayer("3625212") ChessMod := p1.GetChessMod() LimitEventMod := p1.GetLimitEventMod() - f := LimitEventMod.GetChestReward([]int{928}, ChessMod.GetStarEmitList()) + f := LimitEventMod.GetMeteorReward([]int{928, 286}, ChessMod.GetStarEmitList()) fmt.Printf("chest rain reward:%v", f) }