From da7c5f50e775b5903aca0989fa8cd1794720d59b Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 5 Dec 2023 15:31:15 +0800 Subject: [PATCH] 1 --- server/hallserver/room/room.go | 11 +++++++---- third_party/q5 | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/server/hallserver/room/room.go b/server/hallserver/room/room.go index c15178d4..e8cca3d6 100644 --- a/server/hallserver/room/room.go +++ b/server/hallserver/room/room.go @@ -460,22 +460,25 @@ func (this *room) genGameStartNotifyMsg() { } q5.NewSlice(&startInfo.TeamList, 0, 10) for _, t := range this.teamUuidHash { - if t.hasAlreadMember() { + //if t.hasAlreadMember() { + { ele := q5.NewSliceElement(&startInfo.TeamList) ele.TeamUuid = t.teamUuid q5.NewSlice(&ele.Members, 0, 4) t.members.ForEach( func(data interface{}) bool { m := data.(*member) - if m.state == MEMBER_READY_STATE { + //if m.state == MEMBER_READY_STATE { ele2 := q5.NewSliceElement(&ele.Members) ele2.AccountId = m.hum.GetAccountId() - } + //} return true }) } } - this.gameStartNotifyMsg.CustomRoomPayload = proto.String(q5.EncodeJson(&startInfo)) + this.gameStartNotifyMsg.CustomRoomPayload = proto.String( + q5.Md5Str(q5.EncodeJson(&startInfo) + "520d8eAbB(8cf1^#$^&!@d833a42c820432PDAFE^^)") + "|" + + q5.EncodeJson(&startInfo)) } func (this *room) canStart() bool { diff --git a/third_party/q5 b/third_party/q5 index 50cb2699..3d4c6f69 160000 --- a/third_party/q5 +++ b/third_party/q5 @@ -1 +1 @@ -Subproject commit 50cb2699546045b67366e5ee68821bc0aa9e8484 +Subproject commit 3d4c6f692f684c1124fc76dd6bd46cdb28e98d87