From 8a6f99576c015b87de65b3bde9d903314f92ec3d Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Fri, 8 Mar 2024 16:50:37 +0800
Subject: [PATCH] 1

---
 server/matchserver/player/player.go     |  1 -
 server/matchserver/proto/cs_msgid.proto |  6 ----
 server/matchserver/proto/cs_proto.proto | 45 ++++++++++---------------
 server/matchserver/team/team.go         |  1 -
 4 files changed, 17 insertions(+), 36 deletions(-)

diff --git a/server/matchserver/player/player.go b/server/matchserver/player/player.go
index aa6cb185..39ccc54f 100644
--- a/server/matchserver/player/player.go
+++ b/server/matchserver/player/player.go
@@ -39,7 +39,6 @@ func (this *player) init(req *pendingLoginRequest, name string, avatarUrl string
 	this.avatarUrl = avatarUrl
 	this.heroId = heroId
 	this.headFrame = headFrame
-	this.internalSetPing(req.msg.GetPing())
 }
 
 func (this *player) onOffline(){
diff --git a/server/matchserver/proto/cs_msgid.proto b/server/matchserver/proto/cs_msgid.proto
index fef64d64..80be07b1 100644
--- a/server/matchserver/proto/cs_msgid.proto
+++ b/server/matchserver/proto/cs_msgid.proto
@@ -7,8 +7,6 @@ enum CMMessageId_e
     _CMPing = 101;
     _CMLogin = 103;
     _CMReconnect = 104;
-    _CMCreateTeam = 105;
-    _CMJoinTeam = 106;
     _CMLeaveTeam = 107;
     _CMDisbandTeam = 108;
     _CMKickOut = 109;
@@ -17,7 +15,6 @@ enum CMMessageId_e
     _CMCancel = 112;
     _CMSetReady = 113;
     _CMGrantInvitePermission = 114;
-    _CMSetCustomRoomInfo = 115;
 }
 
 enum SMMessageId_e
@@ -26,8 +23,6 @@ enum SMMessageId_e
     _SMRpcError = 102;
     _SMLogin = 103;
     _SMReconnect = 104;
-    _SMCreateTeam = 105;
-    _SMJoinTeam = 106;
     _SMLeaveTeam = 107;
     _SMDisbandTeam = 108;
     _SMKickOut = 109;
@@ -36,5 +31,4 @@ enum SMMessageId_e
     _SMCancel = 112;
     _SMSetReady = 113;
     _SMGrantInvitePermission = 114;
-    _SMSetCustomRoomInfo = 115;
 }
diff --git a/server/matchserver/proto/cs_proto.proto b/server/matchserver/proto/cs_proto.proto
index 5af1b956..ed17e59f 100644
--- a/server/matchserver/proto/cs_proto.proto
+++ b/server/matchserver/proto/cs_proto.proto
@@ -90,6 +90,18 @@ message MFPagination
     optional int32 total_page = 4; //总页数
 }
 
+//创建队伍参数
+message MFCreateTeamParams
+{
+    optional int32 map_id = 1; //地图id
+}
+
+//加入队伍参数
+message MFJoinTeamParams
+{
+    optional string team_uuid = 1; //队伍唯一id
+}
+
 //登录
 message CMLogin
 {
@@ -100,7 +112,10 @@ message CMLogin
     optional string session_id = 20; //账号id
     optional int32 zone_id = 21; //国家Id
     optional int32 node_id = 22; //节点id
-    optional int32 ping = 23; //节点id
+
+    //以下二者只能2选一赋值
+    optional MFCreateTeamParams create_team_param = 30;
+    optional MFJoinTeamParams join_team_param = 31;
 }
 
 //登录回复
@@ -109,6 +124,7 @@ message SMLogin
     optional int32 errcode = 7; //错误码 0：成功 1:重连失败
     optional string errmsg = 10; //错误描述
     optional string server_info = 9; //服务器信息（重连时使用）
+    optional string team_uuid = 20; //队伍唯一id
 }
 
 //断线重连
@@ -129,24 +145,6 @@ message SMReconnect
     optional string errmsg = 2; //错误描述
 }
 
-//创建队伍
-message CMCreateTeam
-{
-}
-
-message SMCreateTeam
-{
-}
-
-//加入队伍
-message CMJoinTeam
-{
-}
-
-message SMJoinTeam
-{
-}
-
 //离开队伍
 message CMLeaveTeam
 {
@@ -218,12 +216,3 @@ message CMGrantInvitePermission
 message SMGrantInvitePermission
 {
 }
-
-//设置自定义房间信息
-message CMSetCustomRoomInfo
-{
-}
-
-message SMSetCustomRoomInfo
-{
-}
diff --git a/server/matchserver/team/team.go b/server/matchserver/team/team.go
index 553d5785..503e9774 100644
--- a/server/matchserver/team/team.go
+++ b/server/matchserver/team/team.go
@@ -39,7 +39,6 @@ func (this *team) init(req *pendingLoginRequest, name string, avatarUrl string,
 	this.avatarUrl = avatarUrl
 	this.heroId = heroId
 	this.headFrame = headFrame
-	this.internalSetPing(req.msg.GetPing())
 }
 
 func (this *team) onOffline(){