From 88a9f45c4633f2d8c660ae52b718563135ddc5c9 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Tue, 16 Apr 2024 14:51:27 +0800
Subject: [PATCH] 1

---
 server/matchserver/proto/cs_proto.proto | 3 +++
 server/matchserver/team/teammgr.go      | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/server/matchserver/proto/cs_proto.proto b/server/matchserver/proto/cs_proto.proto
index 801f9f9c..b30d39d2 100644
--- a/server/matchserver/proto/cs_proto.proto
+++ b/server/matchserver/proto/cs_proto.proto
@@ -96,6 +96,7 @@ message MFPagination
 message MFCreateTeamParams
 {
     optional int32 map_id = 1; //地图id
+    optional int32 mode_id = 2; //地图mapMode表.id
 }
 
 //加入队伍参数
@@ -139,6 +140,7 @@ message MFTeam
     optional string team_uuid = 1; //队伍唯一id
     repeated MFTeamMember members = 2; //成员信息
     optional int32 map_id = 4; //地图id
+    optional int32 mode_id = 5; //地图mapMode表.id
 }
 
 //登录
@@ -294,6 +296,7 @@ message SMChooseHero
 message CMChooseMap
 {
     optional int32 map_id = 1; //地图id
+    optional int32 mode_id = 2; //地图mapMode表.id
 }
 
 message SMChooseMap
diff --git a/server/matchserver/team/teammgr.go b/server/matchserver/team/teammgr.go
index a529c4d6..0860dec5 100644
--- a/server/matchserver/team/teammgr.go
+++ b/server/matchserver/team/teammgr.go
@@ -50,7 +50,7 @@ func (this *teamMgr) genTeamUuid(zoneId int32, nodeId int32, copyIdx int32) stri
 func (this *teamMgr) internalGenTeamUuid(zoneId int32, nodeId int32, copyIdx int32) string {
 	this.curIdx++
 	teamUuid := q5.ToString(nodeId) + "_" + q5.ToString(zoneId) + "_" + q5.ToString(copyIdx) + "_" +
-		q5.Md5Str(q5.ToString(f5.GetApp().NewUuid()) + q5.ToString(f5.GetApp().GetPid()) +
+		q5.Md5Str(q5.ToString(f5.GetApp().NewGlobalUuid()) + q5.ToString(f5.GetApp().GetPid()) +
 			q5.ToString(this.curIdx) +
 			mt.Table.MatchCluster.GetIp() + "520d8eAbB(8cf1^#$^&!@d833a42c820432PDAFE^^)")
 	return teamUuid