From bbbc3d64010bb87fd2bddfb7714b8b20b86b3588 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Fri, 2 Feb 2024 13:55:38 +0800 Subject: [PATCH] 1 --- server/hallserver/room/room.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/hallserver/room/room.go b/server/hallserver/room/room.go index b90188b7..8695d140 100644 --- a/server/hallserver/room/room.go +++ b/server/hallserver/room/room.go @@ -210,7 +210,6 @@ func (this *room) join(hum common.Player, msg *cs.CMJoinRoom) bool { m := newMember(this, hum) this.addMember(m) t = newTeam(this, this.genTeamId(), msg.GetTeamUuid(), m) - t.addMember(m) if msg.GetIsObserver() != 0 { this.addObTeam(t) } else { @@ -295,11 +294,12 @@ func (this *room) fillMFCurrentRoom(hum common.Player, pb *cs.MFCurrentRoom) { sort.Slice(pb.TeamList, func(i, j int) bool { return pb.TeamList[i].GetSortIdx() < pb.TeamList[j].GetSortIdx() }) + q5.NewSlice(&pb.ObserverTeamList, 0, 10) for _, t := range this.obTeamUuidHash { pbT := &cs.MFTeam{} t.fillMFTeam(pbT) pbT.SortIdx = proto.Int32(t.obSortIdx) - q5.AppendSlice(&pb.TeamList, pbT) + q5.AppendSlice(&pb.ObserverTeamList, pbT) } sort.Slice(pb.ObserverTeamList, func(i, j int) bool { return pb.ObserverTeamList[i].GetSortIdx() < pb.ObserverTeamList[j].GetSortIdx()