diff --git a/server/hallserver/player/playermgr.go b/server/hallserver/player/playermgr.go index d549d0db..f0fc7cf4 100644 --- a/server/hallserver/player/playermgr.go +++ b/server/hallserver/player/playermgr.go @@ -150,11 +150,11 @@ func (this *playerMgr) apiAuthCb(hdr *f5.MsgHdr, msg *cs.CMLogin, rsp f5.HttpCli hum := new(player) hum.init(pendingReq) - this.addPlayer(hum) - this.addSocketHash(hdr.GetSocket(), hum) + this.accountIdHash[hum.GetAccountId()] = hum + this.socketHash[pendingReq.hdr.GetSocket()] = hum - serverInfo := mt.Table.HallCluster.GetIp() + ":" + q5.ToString(mt.Table.HallCluster.GetListenPort()) - rspMsg.ServerInfo = &serverInfo + rspMsg.ServerInfo = proto.String( + mt.Table.HallCluster.GetIp() + ":" + q5.ToString(mt.Table.HallCluster.GetListenPort())) GetWspListener().SendProxyMsg(hdr.Conn, hdr.SocketHandle, &rspMsg) } @@ -182,10 +182,6 @@ func (this *playerMgr) GetPlayers() map[string]*player { return this.accountIdHash } -func (this *playerMgr) addPlayer(p *player) { - this.accountIdHash[p.accountId] = p -} - func (this *playerMgr) getPlayerByAccountId(accountId string) *player { player, ok := this.accountIdHash[accountId] if ok { @@ -202,10 +198,6 @@ func (this *playerMgr) getPlayerBySocket(socket f5.WspCliConn) *player { return nil } -func (this *playerMgr) addSocketHash(wsp f5.WspCliConn, p *player) { - this.socketHash[wsp] = p -} - func (this* playerMgr) ProcessCMMsg(handler *cs.CsNetMsgHandler, hdr *f5.MsgHdr) { switch handler.HandlerId { case constant.PLAYER_MGR_HANDLER_ID: