server/game2006go
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
aozhiwei 2024-04-16 14:51:27 +08:00
parent 879287447a
commit 88a9f45c46
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/matchserver/proto/cs_proto.proto
View File

@ -96,6 +96,7 @@ message MFPagination
message MFCreateTeamParams message MFCreateTeamParams
{ {
optional int32 map_id = 1; //地图id 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 optional string team_uuid = 1; //队伍唯一id
repeated MFTeamMember members = 2; //成员信息 repeated MFTeamMember members = 2; //成员信息
optional int32 map_id = 4; //地图id optional int32 map_id = 4; //地图id
optional int32 mode_id = 5; //地图mapMode表.id
} }
//登录 //登录
@ -294,6 +296,7 @@ message SMChooseHero
message CMChooseMap message CMChooseMap
{ {
optional int32 map_id = 1; //地图id optional int32 map_id = 1; //地图id
optional int32 mode_id = 2; //地图mapMode表.id
} }
message SMChooseMap message SMChooseMap

2
server/matchserver/team/teammgr.go
View File

@ -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 { func (this *teamMgr) internalGenTeamUuid(zoneId int32, nodeId int32, copyIdx int32) string {
this.curIdx++ this.curIdx++
teamUuid := q5.ToString(nodeId) + "_" + q5.ToString(zoneId) + "_" + q5.ToString(copyIdx) + "_" + 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) + q5.ToString(this.curIdx) +
mt.Table.MatchCluster.GetIp() + "520d8eAbB(8cf1^#$^&!@d833a42c820432PDAFE^^)") mt.Table.MatchCluster.GetIp() + "520d8eAbB(8cf1^#$^&!@d833a42c820432PDAFE^^)")
return teamUuid return teamUuid