This commit is contained in:
hahwu 2026-01-29 20:02:40 +08:00
parent 650bb1136f
commit 34126d990a
3 changed files with 48 additions and 6 deletions

View File

@ -112,6 +112,9 @@ func SendServerMsg(m *msg.Msg, serverId int) error {
if m.UniKey == "" { if m.UniKey == "" {
m.UniKey = GoUtil.UniKey(fmt.Sprintf("%v,Cluster Msg", m)) m.UniKey = GoUtil.UniKey(fmt.Sprintf("%v,Cluster Msg", m))
} }
if m.SendT == 0 {
m.SendT = GoUtil.Now()
}
if v, ok := serverAgent.Load(serverId); ok { if v, ok := serverAgent.Load(serverId); ok {
data, err := GoUtil.GobMarshal(m) data, err := GoUtil.GobMarshal(m)
if err != nil { if err != nil {
@ -128,6 +131,9 @@ func CallServerMsg(m *msg.Msg, serverId int) (*msg.Msg, error) {
if m.UniKey == "" { if m.UniKey == "" {
m.UniKey = GoUtil.UniKey(fmt.Sprintf("%v,Cluster Msg", m)) m.UniKey = GoUtil.UniKey(fmt.Sprintf("%v,Cluster Msg", m))
} }
if m.SendT == 0 {
m.SendT = GoUtil.Now()
}
v, ok := serverAgent.Load(serverId) v, ok := serverAgent.Load(serverId)
// 之后再发送消息 // 之后再发送消息
if !ok { if !ok {

View File

@ -894,7 +894,7 @@ func (ad *GameLogic) GetStartTime() int64 {
func NotifyPlayer(Uid int, m *MsgMod.Msg) { func NotifyPlayer(Uid int, m *MsgMod.Msg) {
m.To = Uid m.To = Uid
m.HandleType = MsgMod.HANDLE_MOD_PLAYER_MSG m.HandleType = MsgMod.HANDLE_MOD_PLAYER_MSG
CenterPlayerMsgHandler(m) NotifyPlayerMsgAsync(m)
} }
func Destroy() { func Destroy() {

View File

@ -124,6 +124,25 @@ func (m *MessageMgr) MessageMgrInit() {
m.Use(TimeoutMiddleware(5 * time.Second)) m.Use(TimeoutMiddleware(5 * time.Second))
m.NodeRegister() m.NodeRegister()
m.CenterRegister() m.CenterRegister()
FixBug()
}
func FixBug() {
messageMgrData := getMessageData()
// 先更新 PlayerList需要加锁
messageMgrData.mu.Lock()
defer messageMgrData.mu.Unlock()
for k, v := range messageMgrData.MessageList {
if k < 100000 {
delete(messageMgrData.MessageList, k)
}
for i, msgItem := range v.Messages {
if msgItem.Type == msg.HANDLE_TYPE_CHAMPSHIP_NOTIFY {
// 删除消息
v.Messages = append(v.Messages[:i], v.Messages[i+1:]...)
}
}
}
} }
// 注册处理器 // 注册处理器
@ -308,22 +327,39 @@ func ComsumerMsgHandler(data *msg.Msg) (interface{}, error) {
return nil, nil return nil, nil
} }
func NotifyPlayerMsgAsync(m *msg.Msg) {
messageMgrData := getMessageData()
// 检查玩家是否在线(需要加锁)
messageMgrData.mu.Lock()
node, ok := messageMgrData.PlayerList[int64(m.To)]
messageMgrData.mu.Unlock()
// 在线则直接发送消息
if ok {
SendMsgToNodeAsync(m, node)
}
}
// 处理玩家消息
func CenterPlayerMsgHandler(data *msg.Msg) (interface{}, error) { func CenterPlayerMsgHandler(data *msg.Msg) (interface{}, error) {
PlayerId := int64(data.To) PlayerId := int64(data.To)
messageMgrData := getMessageData() messageMgrData := getMessageData()
// 遍历消息列表,发送消息给在线玩家 // 遍历消息列表,发送消息给在线玩家
messages := getMessge(PlayerId)
messages.mu.Lock()
messages.Messages = append(messages.Messages, data)
messages.mu.Unlock()
// 检查玩家是否在线(需要加锁) // 检查玩家是否在线(需要加锁)
messageMgrData.mu.Lock() messageMgrData.mu.Lock()
node, ok := messageMgrData.PlayerList[int64(PlayerId)] node, ok := messageMgrData.PlayerList[int64(PlayerId)]
messageMgrData.mu.Unlock() messageMgrData.mu.Unlock()
// 在线则直接发送消息
if ok { if ok {
SendMsgToNodeAsync(data, node) SendMsgToNodeAsync(data, node)
} else {
// 不在线则存储消息
if !GoUtil.InArray(data.Type, notify_msg_type) {
messages := getMessge(PlayerId)
messages.mu.Lock()
messages.Messages = append(messages.Messages, data)
messages.mu.Unlock()
}
} }
return nil, nil return nil, nil
} }