5

src/server/game/GameLogic.go

@@ -935,11 +935,8 @@ func (ad *GameLogic) GetStartTime() int64 {
 }
 
 func NotifyPlayer(Uid int, m *MsgMod.Msg) {
-	p := G_GameLogicPtr.GetPlayer(int64(Uid))
+	m.To = Uid
-	if p == nil || p.stop {
+	CenterPlayerMsgHandler(m)
-		return
-	}
-	p.Send(m)
 }
 
 func Destroy() {

src/server/game/champship_mgr.go

@@ -115,9 +115,8 @@ func (c *ChampshipMgr) Init() {
 }
 
 func (c *ChampshipMgr) NotifyAll(m *msg.Msg) (interface{}, error) {
-	G_GameLogicPtr.NotifyAll(&msg.Msg{
+	m.HandleType = msg.HANDLE_MOD_PLAYER_MSG
-		Type: msg.HANDLE_TYPE_CHAMPSHIP_NOTIFY,
+	NotifyAllPlayerMsg(m)
-	})
 	return nil, nil
 }
 

src/server/game/message_handler.go

@@ -704,7 +704,7 @@ func NotifyChampshipResult(Uid, Rank int) {
 			SendT: GoUtil.Now(),
 			Extra: []int{Rank, GoUtil.GetServerOpenDay()},
 		}
-		FriendMgrSend(Msg)
+		CenterPlayerMsgHandler(Msg)
 	}
 }
 

src/server/game/message_mgr.go

@@ -76,6 +76,24 @@ func (m *MessageMgr) MessageMgrInit() {
 	m.Use(RecoveryMiddleware())
 	m.Use(LoggingMiddleware())
 	m.Use(TimeoutMiddleware(5 * time.Second))
+	m.NodeRegister()
+	m.CenterRegister()
+}
+
+// 注册处理器
+func (s *MessageMgr) RegisterHandler(HandlerType int, fun MessageHandlerFunc) {
+	s.handler[HandlerType] = fun
+}
+
+func (m *MessageMgr) NodeRegister() {
+	if conf.Server.ServerType == "node" {
+		m.RegisterHandler(msg.HANDLE_MOD_PLAYER_MSG, MessageHandlerFunc(PlayerMsgHandler))
+		m.RegisterHandler(msg.HANDLE_MOD_REPLY_PLAYER_MSG, MessageHandlerFunc(PlayerReplyMsgHandler))
+		m.RegisterHandler(msg.HANDLE_MOD_CLUSTER_SYNC, MessageHandlerFunc(ClusterSyncHandler))
+	}
+}
+
+func (m *MessageMgr) CenterRegister() {
 	if conf.Server.ServerType == "center" {
 		m.RegisterHandler(msg.HANDLE_MOD_PLAYER_LOGIN, MessageHandlerFunc(PlayerLoginHandler))
 		m.RegisterHandler(msg.HANDLE_MDO_PLAYER_LOGOUT, MessageHandlerFunc(PlayerLogoutHandler))
@@ -86,23 +104,28 @@ func (m *MessageMgr) MessageMgrInit() {
 		m.RegisterHandler(msg.HANDLE_MOD_USER_VAR_SET, MessageHandlerFunc(SetUserVarDataHandler))
 		m.RegisterHandler(msg.HANDLE_MOD_USER_VAR_GET, MessageHandlerFunc(GetUserVarDataHandler))
 		m.RegisterHandler(msg.HANDLE_MOD_CATNIP_PARTNER, MessageHandlerFunc(CatnipPartnerHandler))
-	} else {
+		m.RegisterHandler(msg.HANDLE_MDO_CHAMPSHIP_INRANK, MessageHandlerFunc(ChampshipInRankHandler))
-		m.RegisterHandler(msg.HANDLE_MOD_PLAYER_MSG, MessageHandlerFunc(PlayerMsgHandler))
-		m.RegisterHandler(msg.HANDLE_MOD_REPLY_PLAYER_MSG, MessageHandlerFunc(PlayerReplyMsgHandler))
-		m.RegisterHandler(msg.HANDLE_MOD_CLUSTER_SYNC, MessageHandlerFunc(ClusterSyncHandler))
 	}
 }
 
-// 注册处理器
-func (s *MessageMgr) RegisterHandler(HandlerType int, fun MessageHandlerFunc) {
-	s.handler[HandlerType] = fun
-}
-
 func getMessageData() *MessageData {
 	return G_GameLogicPtr.MessageMgr.data.(*MessageData)
 }
 
 // ----------------------------------- 处理函数实现 ---------------------------
+func NotifyAllPlayerMsg(m *msg.Msg) {
+	messageMgrData := getMessageData()
+	for PlayerId, node := range messageMgrData.PlayerList {
+		m.To = int(PlayerId)
+		go SendMsgToNodeAsync(m, node)
+	}
+}
+
+func ChampshipInRankHandler(data *msg.Msg) (interface{}, error) {
+	G_GameLogicPtr.ChampshipMgr.inRank(data)
+	return nil, nil
+}
+
 func CatnipPartnerHandler(data *msg.Msg) (interface{}, error) {
 	m, ok := data.Extra.(*CatnipPartner)
 	if !ok {

src/server/game/mod/msg/Msg.go

@@ -32,18 +32,20 @@ var MSG_ZERO_UPDATE = &Msg{Type: SERVER_ZERO_UPDATE}
 var MSG_NOON_UPDATE = &Msg{Type: SERVER_NOON_UPDATE}
 
 const (
-	HANDLE_MOD_PLAYER_MSG       = 20001 // 玩家消息
+	HANDLE_MOD_PLAYER_MSG          = 20001 // 玩家消息
-	HANDLE_MOD_CLUSTER_MSG      = 20002 // 集群消息
+	HANDLE_MOD_CLUSTER_MSG         = 20002 // 集群消息
-	HANDLE_MOD_PLAYER_LOGIN     = 20003 // 玩家登录消息
+	HANDLE_MOD_PLAYER_LOGIN        = 20003 // 玩家登录消息
-	HANDLE_MOD_COMSUME_MSG      = 20004 // 消费消息
+	HANDLE_MOD_COMSUME_MSG         = 20004 // 消费消息
-	HANDLE_MOD_CLUSTER_SYNC     = 20005 // 集群同步消息
+	HANDLE_MOD_CLUSTER_SYNC        = 20005 // 集群同步消息
-	HANDLE_MDO_PLAYER_LOGOUT    = 20006 // 玩家登出消息
+	HANDLE_MDO_PLAYER_LOGOUT       = 20006 // 玩家登出消息
-	HANDLE_MOD_VAR_GET          = 20007 // 获取变量
+	HANDLE_MOD_VAR_GET             = 20007 // 获取变量
-	HANDLE_MOD_VAR_SET          = 20008 // 设置变量
+	HANDLE_MOD_VAR_SET             = 20008 // 设置变量
-	HANDLE_MOD_CATNIP_PARTNER   = 20009 // 猫薄荷伙伴
+	HANDLE_MOD_CATNIP_PARTNER      = 20009 // 猫薄荷伙伴
-	HANDLE_MOD_USER_VAR_GET     = 20010 // 获取玩家变量
+	HANDLE_MOD_USER_VAR_GET        = 20010 // 获取玩家变量
-	HANDLE_MOD_USER_VAR_SET     = 20011 // 设置玩家变量
+	HANDLE_MOD_USER_VAR_SET        = 20011 // 设置玩家变量
-	HANDLE_MOD_REPLY_PLAYER_MSG = 20012 // 回复玩家消息
+	HANDLE_MOD_REPLY_PLAYER_MSG    = 20012 // 回复玩家消息
+	HANDLE_MDO_CHAMPSHIP_INRANK    = 20013 // 锦标赛入榜
+	HANDLE_MOD_CHAMPSHIP_RANK_INFO = 20014 // 锦标赛排名信息
 )
 
 const (