mirrors2/hk4e
1
0
Fork 0
mirror of https://github.com/FlourishingWorld/hk4e.git synced 2026-02-04 15:32:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

网关顶登录bug修复

Browse Source
This commit is contained in:
flswld
2023-03-14 20:08:06 +08:00
parent cd922d1a38
commit 2a3ce25898
1 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
gate/net/session.go
View File

@@ -288,6 +288,7 @@ func (k *KcpConnectManager) sendMsgHandle() {
// 唤醒存在的顶号登录流程
logger.Info("awake interrupt login, uid: %v", serverMsg.UserId)
kickFinishNotifyChan <- true
delete(reLoginRemoteKickRegMap, serverMsg.UserId)
}
}
}
@@ -373,13 +374,21 @@ func (k *KcpConnectManager) getPlayerToken(req *proto.GetPlayerTokenReq, session
ConvId: oldSession.conn.GetConv(),
EventId: KcpConnRelogin,
}
kickFinishNotifyChan := make(chan bool)
kickFinishNotifyChan := make(chan bool, 1)
k.reLoginRemoteKickRegChan <- &RemoteKick{
userId: uid,
kickFinishNotifyChan: kickFinishNotifyChan,
}
logger.Info("run local interrupt login wait, uid: %v", uid)
<-kickFinishNotifyChan
timer := time.NewTimer(time.Second * 10)
select {
case <-timer.C:
logger.Error("local interrupt login wait timeout, uid: %v", uid)
timer.Stop()
loginFailClose()
return nil
case <-kickFinishNotifyChan:
}
}
k.globalGsOnlineMapLock.RLock()
_, exist := k.globalGsOnlineMap[uid]
@@ -395,13 +404,21 @@ func (k *KcpConnectManager) getPlayerToken(req *proto.GetPlayerTokenReq, session
ConnCtrlMsg: connCtrlMsg,
})
// 注册回调通知
kickFinishNotifyChan := make(chan bool)
kickFinishNotifyChan := make(chan bool, 1)
k.reLoginRemoteKickRegChan <- &RemoteKick{
userId: uid,
kickFinishNotifyChan: kickFinishNotifyChan,
}
logger.Info("run global interrupt login wait, uid: %v", uid)
<-kickFinishNotifyChan
timer := time.NewTimer(time.Second * 10)
select {
case <-timer.C:
logger.Error("global interrupt login wait timeout, uid: %v", uid)
timer.Stop()
loginFailClose()
return nil
case <-kickFinishNotifyChan:
}
}
// 关联玩家uid和连接信息
session.userId = uid