1

server/hallserver/player/player.go

@@ -14,6 +14,7 @@ type player struct {
 	room common.Room
 	accountId string
 	sessionId string
+	teamUuid string
 	zoneId int32
 	nodeId int32
 	name string
@@ -44,6 +45,7 @@ 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
@@ -83,7 +85,7 @@ func (this *player) GetPing() int32 {
 }
 
 func (this *player) GetTeamUuid() string {
-	return ""
+	return this.teamUuid
 }
 
 func (this *player) GetZoneId() int32 {

server/hallserver/proto/cs_proto.proto

@@ -145,8 +145,8 @@ message MFCurrentRoom
 //登录
 message CMLogin
 {
-    optional int32 server_id = 1; //保留
-    optional string team_uuid = 2; //保留
+    optional int32 reserverd0 = 1; //保留
+    optional string reserved1 = 2; //保留
     optional string account_id = 3; //账号id
     optional int32 proto_version = 5; //协议版本号Constant_e.ProtoVersion
     optional string session_id = 20; //账号id
@@ -165,13 +165,12 @@ message SMLogin
 //断线重连
 message CMReconnect
 {
-    optional int32 server_id = 1; //保留
-    optional string team_uuid = 2; //保留
+    optional int32 reserved0 = 1; //保留
+    optional string reserved1 = 2; //保留
     optional string account_id = 3; //账号id
     optional string session_id = 4; //session_id
-    optional string room_uuid = 5; //房间唯一id
+    optional string reserverd2 = 5; //保留
     optional string server_info = 6; //服务器信息
-
 }
 
 //断线重连回复
@@ -188,6 +187,7 @@ message CMCreateRoom
     optional int32 zone_id = 2; //区id
     optional int32 node_id = 3; //节点id
     optional string passwd = 4; //密码，空：无密码
+    optional string team_uuid = 5; //保留
 }
 
 message SMCreateRoom