简化配置表读取

This commit is contained in:
flswld
2023-03-16 16:26:14 +08:00
parent 2a3ce25898
commit 5e5492943d
51 changed files with 418 additions and 2560 deletions

View File

@@ -162,7 +162,7 @@ func (k *KcpConnectManager) acceptHandle(listener *kcp.Listener) {
xorKey: k.dispatchKey,
changeXorKeyFin: false,
gsServerAppId: "",
fightServerAppId: "",
anticheatServerAppId: "",
pathfindingServerAppId: "",
changeGameServer: false,
joinHostUserId: 0,
@@ -278,7 +278,7 @@ type Session struct {
xorKey []byte
changeXorKeyFin bool
gsServerAppId string
fightServerAppId string
anticheatServerAppId string
pathfindingServerAppId string
changeGameServer bool
joinHostUserId uint32

View File

@@ -132,9 +132,9 @@ func (k *KcpConnectManager) recvMsgHandle(protoMsg *ProtoMsg, session *Session)
})
return
}
// 转发到战斗服务器
if session.fightServerAppId != "" && protoMsg.CmdId == cmd.CombatInvocationsNotify {
k.messageQueue.SendToFight(session.fightServerAppId, &mq.NetMsg{
// 转发到反作弊服务器
if session.anticheatServerAppId != "" && protoMsg.CmdId == cmd.CombatInvocationsNotify {
k.messageQueue.SendToAnticheat(session.anticheatServerAppId, &mq.NetMsg{
MsgType: mq.MsgTypeGame,
EventId: mq.NormalMsg,
GameMsg: gameMsg,
@@ -182,7 +182,7 @@ func (k *KcpConnectManager) sendMsgHandle() {
session.changeGameServer = false
session.joinHostUserId = 0
} else {
serverMsg.FightServerAppId = session.fightServerAppId
serverMsg.AnticheatServerAppId = session.anticheatServerAppId
}
k.messageQueue.SendToGs(session.gsServerAppId, &mq.NetMsg{
MsgType: mq.MsgTypeServer,
@@ -255,7 +255,7 @@ func (k *KcpConnectManager) sendMsgHandle() {
continue
}
session.gsServerAppId = serverMsg.GameServerAppId
session.fightServerAppId = ""
session.anticheatServerAppId = ""
session.changeGameServer = true
session.joinHostUserId = serverMsg.JoinHostUserId
// 网关代发登录请求到新的GS
@@ -434,13 +434,13 @@ func (k *KcpConnectManager) getPlayerToken(req *proto.GetPlayerTokenReq, session
return nil
}
session.gsServerAppId = gsServerAppId.AppId
fightServerAppId, err := k.discovery.GetServerAppId(context.TODO(), &api.GetServerAppIdReq{
ServerType: api.FIGHT,
anticheatServerAppId, err := k.discovery.GetServerAppId(context.TODO(), &api.GetServerAppIdReq{
ServerType: api.ANTICHEAT,
})
if err != nil {
logger.Error("get fight server appid error: %v, uid: %v", err, uid)
logger.Error("get anticheat server appid error: %v, uid: %v", err, uid)
}
session.fightServerAppId = fightServerAppId.AppId
session.anticheatServerAppId = anticheatServerAppId.AppId
pathfindingServerAppId, err := k.discovery.GetServerAppId(context.TODO(), &api.GetServerAppIdReq{
ServerType: api.PATHFINDING,
})
@@ -449,7 +449,7 @@ func (k *KcpConnectManager) getPlayerToken(req *proto.GetPlayerTokenReq, session
}
session.pathfindingServerAppId = pathfindingServerAppId.AppId
logger.Debug("session gs appid: %v, uid: %v", session.gsServerAppId, uid)
logger.Debug("session fight appid: %v, uid: %v", session.fightServerAppId, uid)
logger.Debug("session anticheat appid: %v, uid: %v", session.anticheatServerAppId, uid)
logger.Debug("session pathfinding appid: %v, uid: %v", session.pathfindingServerAppId, uid)
// 返回响应
rsp := new(proto.GetPlayerTokenRsp)