diff --git a/server/hallserver/common/types.go b/server/hallserver/common/types.go index e69efd90..c202ff40 100644 --- a/server/hallserver/common/types.go +++ b/server/hallserver/common/types.go @@ -28,7 +28,6 @@ type Player interface { GetAvatarUrl() string GetHeroId() string GetPing() int32 - GetTeamUuid() string GetZoneId() int32 GetNodeId() int32 SendMsg(proto.Message) diff --git a/server/hallserver/player/player.go b/server/hallserver/player/player.go index 9ea66a22..c7141aeb 100644 --- a/server/hallserver/player/player.go +++ b/server/hallserver/player/player.go @@ -14,7 +14,6 @@ type player struct { room common.Room accountId string sessionId string - teamUuid string zoneId int32 nodeId int32 name string @@ -23,10 +22,6 @@ type player struct { ping int32 } -func (this *player) GetAccountId() string { - return this.accountId -} - func (this *player) SendMsg(rspMsg proto.Message) { if this.socket.IsValid() { GetWspListener().SendProxyMsg(this.socket.Conn, this.socket.SocketHandle, rspMsg) @@ -45,7 +40,6 @@ func (this *player) init(req *pendingLoginRequest, name string, avatarUrl string this.socket = req.hdr.GetSocket() this.accountId = req.msg.GetAccountId() this.sessionId = req.msg.GetSessionId() - //this.teamUuid = req.msg.GetTeamUuid() this.zoneId = req.msg.GetZoneId() this.nodeId = req.msg.GetNodeId() this.name = name @@ -68,6 +62,14 @@ func (this *player) reBind(socket f5.WspCliConn) { _playerMgr.socketHash[this.socket] = this } +func (this *player) GetAccountId() string { + return this.accountId +} + +func (this *player) GetSessionId() string { + return this.sessionId +} + func (this *player) GetName() string { return this.name } @@ -84,10 +86,6 @@ func (this *player) GetPing() int32 { return this.ping } -func (this *player) GetTeamUuid() string { - return this.teamUuid -} - func (this *player) GetZoneId() int32 { return this.zoneId } @@ -96,10 +94,6 @@ func (this *player) GetNodeId() int32 { return this.nodeId } -func (this *player) GetSessionId() string { - return this.sessionId -} - func (this *player) IsOnline() bool { return this.socket.IsValid() }