From e33fe64bca043249041dd646bb3e5f2b9c11dcf6 Mon Sep 17 00:00:00 2001
From: sk <123456@qq.com>
Date: Thu, 5 Sep 2024 14:20:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=BF=E9=97=B4=E5=88=97=E8=A1=A8=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 worldsrv/scenemgr.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/worldsrv/scenemgr.go b/worldsrv/scenemgr.go
index 702bc49..185f3f5 100644
--- a/worldsrv/scenemgr.go
+++ b/worldsrv/scenemgr.go
@@ -183,9 +183,9 @@ func (m *SceneMgr) MarshalAllRoom(platform string, groupId, gameId int, gameMode
 			((s.gameId == gameId && s.gameMode == gameMode) || gameId == 0) &&
 			(s.sceneId == sceneId || sceneId == 0) && (s.groupId == int32(groupId) || groupId == 0) &&
 			(s.dbGameFree.GetId() == gameFreeId || gameFreeId == 0) &&
-			(s.sceneMode == sceneMode || sceneMode == -1)) || isNeedFindAll &&
+			(s.sceneMode == sceneMode || sceneMode == -1) &&
 			((s.IsCustom() && isCustom) || !isCustom) &&
-			(s.GetRoomConfigId() == roomConfigId || roomConfigId == 0) {
+			(s.GetRoomConfigId() == roomConfigId || roomConfigId == 0)) || isNeedFindAll {
 			var platformName string
 			if s.limitPlatform != nil {
 				platformName = s.limitPlatform.IdStr