From 3dd292a486395643d80e29a1eb713b2a654576dd Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 19 Mar 2024 19:09:43 +0800 Subject: [PATCH] 1 --- server/matchserver/proto/cs_proto.proto | 2 +- server/matchserver/team/team.go | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/server/matchserver/proto/cs_proto.proto b/server/matchserver/proto/cs_proto.proto index fa0c4226..64415829 100644 --- a/server/matchserver/proto/cs_proto.proto +++ b/server/matchserver/proto/cs_proto.proto @@ -138,7 +138,6 @@ message MFTeam { optional string team_uuid = 1; //队伍唯一id repeated MFTeamMember members = 2; //成员信息 - optional string next_team_uuid = 3; //下一次队伍唯一id optional int32 map_id = 4; //地图id } @@ -326,6 +325,7 @@ message SMTeamStateNotify { optional int32 state = 1; //0：已取消 1：已开始 2：正在匹配(moba模式) optional MFJoinMsg join_msg = 2; //进入房间传的字段(只有一开始才生效) + optional string next_team_uuid = 3; //下一次队伍唯一id(当state=1是才有效) } //队伍解散通知 diff --git a/server/matchserver/team/team.go b/server/matchserver/team/team.go index e6268502..ade769cc 100644 --- a/server/matchserver/team/team.go +++ b/server/matchserver/team/team.go @@ -376,7 +376,6 @@ func (this *team) SendUpdateNotify() { notifyMsg := &cs.SMTeamUpdateNotify{} notifyMsg.TeamInfo = &cs.MFTeam{} notifyMsg.TeamInfo.TeamUuid = proto.String(this.teamUuid) - notifyMsg.TeamInfo.NextTeamUuid = proto.String(this.nextTeamUuid) notifyMsg.TeamInfo.MapId = proto.Int32(this.mapInfo.MapId) q5.NewSlice(¬ifyMsg.TeamInfo.Members, 0, 1) for _, m := range this.accountIdHash {