修复网关本地顶登录问题

gate/net/session.go

@@ -398,15 +398,24 @@ func (k *KcpConnectManager) getPlayerToken(req *proto.GetPlayerTokenReq, session
 			return nil
 		case <-regFinishNotifyChan:
 		}
-		// 顶号
+		oldSession := k.GetSessionByUserId(uid)
-		connCtrlMsg := new(mq.ConnCtrlMsg)
+		if oldSession != nil {
-		connCtrlMsg.KickUserId = uid
+			// 本地顶号
-		connCtrlMsg.KickReason = kcp.EnetServerRelogin
+			k.kcpEventInput <- &KcpEvent{
-		k.messageQueue.SendToAll(&mq.NetMsg{
+				ConvId:  oldSession.conn.GetConv(),
-			MsgType:     mq.MsgTypeConnCtrl,
+				EventId: KcpConnRelogin,
-			EventId:     mq.KickPlayerNotify,
+			}
-			ConnCtrlMsg: connCtrlMsg,
+		} else {
-		})
+			// 远程顶号
+			connCtrlMsg := new(mq.ConnCtrlMsg)
+			connCtrlMsg.KickUserId = uid
+			connCtrlMsg.KickReason = kcp.EnetServerRelogin
+			k.messageQueue.SendToAll(&mq.NetMsg{
+				MsgType:     mq.MsgTypeConnCtrl,
+				EventId:     mq.KickPlayerNotify,
+				ConnCtrlMsg: connCtrlMsg,
+			})
+		}
 		// 顶号等待
 		logger.Info("run global interrupt login kick wait, uid: %v", uid)
 		timer = time.NewTimer(time.Second * 10)