From 8c0b66f8914e10ffbbfb3ff6b9abc239cd00b99f Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 19 Mar 2024 19:21:16 +0800 Subject: [PATCH] 1 --- server/matchserver/team/teammgr.go | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/server/matchserver/team/teammgr.go b/server/matchserver/team/teammgr.go index 82a3b4b0..7753a093 100644 --- a/server/matchserver/team/teammgr.go +++ b/server/matchserver/team/teammgr.go @@ -23,17 +23,18 @@ func (this *teamMgr) UnInit() { } func (this *teamMgr) CreateTeam(hum common.Player, msg *cs.CMLogin, mapInfo* common.MapInfoRsp) common.Team { - teamUuid := this.genTeamUuid(hum.GetZoneId(), hum.GetNodeId()) + var copyIdx int32 = 0 + teamUuid := this.genTeamUuid(copyIdx, hum.GetZoneId(), hum.GetNodeId()) team := newTeam() - team.init(0, teamUuid, hum, msg, mapInfo) + team.init(copyIdx, teamUuid, hum, msg, mapInfo) this.teamUuidHash[team.teamUuid] = team return team } -func (this *teamMgr) genTeamUuid(zoneId int32, nodeId int32) string { +func (this *teamMgr) genTeamUuid(zoneId int32, nodeId int32, copyIdx int32) string { teamUuid := "" for true { - teamUuid = this.internalGenTeamUuid(zoneId, nodeId) + teamUuid = this.internalGenTeamUuid(zoneId, nodeId, copyIdx) if this.GetTeamByUuid(teamUuid) == nil { return teamUuid } @@ -41,9 +42,9 @@ func (this *teamMgr) genTeamUuid(zoneId int32, nodeId int32) string { panic("genTeamUuid error") } -func (this *teamMgr) internalGenTeamUuid(zoneId int32, nodeId int32) string { +func (this *teamMgr) internalGenTeamUuid(zoneId int32, nodeId int32, copyIdx int32) string { this.curIdx++ - teamUuid := q5.ToString(zoneId) + "_" + q5.ToString(nodeId) + "_" + + teamUuid := q5.ToString(zoneId) + "_" + q5.ToString(nodeId) + "_" + 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^^)")