From 33589caa1d790a11f3f02d665de43c3ea4e4a6ef Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Fri, 22 Mar 2024 20:58:17 +0800 Subject: [PATCH] 1 --- server/matchserver/team/team.go | 8 ++++---- server/matchserver/team/teammgr.go | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/server/matchserver/team/team.go b/server/matchserver/team/team.go index fe6b88ad..4480d57c 100644 --- a/server/matchserver/team/team.go +++ b/server/matchserver/team/team.go @@ -379,11 +379,11 @@ func (this *team) genStartGameInfo() { func (this *team) genNextCopyTeam() { nextCopyIdx := this.copyIdx + 1 - oldId := q5.ToString(this.zoneId) + "_" + - q5.ToString(this.nodeId) + "_" + + oldId := q5.ToString(this.nodeId) + "_" + + q5.ToString(this.zoneId) + "_" + q5.ToString(this.copyIdx) + "_"; - newId := q5.ToString(this.zoneId) + "_" + - q5.ToString(this.nodeId) + "_" + + newId := q5.ToString(this.nodeId) + "_" + + q5.ToString(this.zoneId) + "_" + q5.ToString(nextCopyIdx) + "_"; this.nextTeamUuid = strings.Replace(this.GetTeamUuid(), oldId, newId, 1) if this.nextTeamUuid == this.GetTeamUuid() { diff --git a/server/matchserver/team/teammgr.go b/server/matchserver/team/teammgr.go index 900f6a29..a529c4d6 100644 --- a/server/matchserver/team/teammgr.go +++ b/server/matchserver/team/teammgr.go @@ -49,7 +49,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(zoneId) + "_" + q5.ToString(nodeId) + "_" + 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.ToString(this.curIdx) + mt.Table.MatchCluster.GetIp() + "520d8eAbB(8cf1^#$^&!@d833a42c820432PDAFE^^)")