From dc3b7c08257bc228ad776543f634e4f7385d9ab6 Mon Sep 17 00:00:00 2001
From: MrZ_26 <1046101471@qq.com>
Date: Mon, 24 Oct 2022 22:30:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=89=E7=8E=A9=E5=AE=B6=E9=80=80=E5=87=BA?=
 =?UTF-8?q?=E6=88=BF=E9=97=B4=E7=9A=84=E6=97=B6=E5=80=99=E4=B9=9F=E4=BC=9A?=
 =?UTF-8?q?=E5=88=B7=E6=96=B0=E6=88=BF=E9=97=B4allReady=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=20=E9=99=90=E5=88=B6=E5=82=AC=E4=BF=83=E5=87=86=E5=A4=87?=
 =?UTF-8?q?=E9=9F=B3=E6=95=88=E9=A2=91=E7=8E=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 parts/net.lua | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/parts/net.lua b/parts/net.lua
index 2e66de25..b006147f 100644
--- a/parts/net.lua
+++ b/parts/net.lua
@@ -43,14 +43,14 @@ function NET.freshRoomAllReady()
         if NETPLY.list[j].readyMode=='Ready' then readyCount=readyCount+1 end
     end
 
+    NET.roomAllReady=playCount>0 and playCount==readyCount
+
     if playCount>1 and playCount-readyCount==1 then
         local p=NETPLY.map[USER.uid]
-        if p.playMode=='Gamer' and p.readyMode~='Ready' then
+        if p.playMode=='Gamer' and p.readyMode~='Ready' and TASK.lock('urgeReady',1) then
             SFX.play('warn_2',.5)
         end
     end
-
-    NET.roomAllReady=playCount>0 and playCount==readyCount
 end
 
 --------------------------<NEW HTTP API>
@@ -650,6 +650,7 @@ function NET.wsCallBack.room_leave(body)
         NET.textBox:push{COLOR.Y,text.leaveRoom:repD(USERS.getUsername(uid).."#"..uid.." ")}
     end
     _playerLeaveRoom(uid)
+    NET.freshRoomAllReady()
 end
 function NET.wsCallBack.room_fetch(body)
     TASK.unlock('fetchRoom')