From 7248af35de17a406e9cf87387dd8ecb2d4b815cd Mon Sep 17 00:00:00 2001
From: MrZ626 <1046101471@qq.com>
Date: Thu, 8 Jul 2021 23:34:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=88=BF=E9=97=B4=E5=86=85?=
 =?UTF-8?q?=E5=87=86=E5=A4=87=E6=8C=89=E9=92=AE=E7=8A=B6=E6=80=81=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 parts/scenes/net_game.lua | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/parts/scenes/net_game.lua b/parts/scenes/net_game.lua
index f67dcc47..692d3752 100644
--- a/parts/scenes/net_game.lua
+++ b/parts/scenes/net_game.lua
@@ -21,14 +21,19 @@ local noTouch,noKey=false,false
 local touchMoveLastFrame=false
 local newMessageTimer
 
+local function hideReadyUI()
+	return
+		playing or
+		NET.roomState.start or
+		NET.getlock('ready')
+end
+
 local function _setCancel()NET.signal_setMode(0)end
 local function _setReady()NET.signal_setMode(1)end
 local function _setSpectate()NET.signal_setMode(2)end
 local function _gotoSetting()
-	if not(netPLY.getSelfReady()or NET.getlock('ready'))then
-		GAME.prevBG=BG.cur
-		SCN.go('setting_game')
-	end
+	GAME.prevBG=BG.cur
+	SCN.go('setting_game')
 end
 local function _quit()
 	if TIME()-lastBackTime<1 then
@@ -49,13 +54,6 @@ local function _switchChat()
 		WIDGET.unFocus(true)
 	end
 end
-local function hideReadyUI()
-	return
-		playing or
-		NET.roomState.start or
-		not netPLY.getSelfReady()or
-		NET.getlock('ready')
-end
 
 local scene={}
 
@@ -332,10 +330,10 @@ end
 scene.widgetList={
 	textBox,
 	inputBox,
-	WIDGET.newKey{name="setting",fText=TEXTURE.setting,x=1200,y=160,w=90,h=90,	code=_gotoSetting,hideF=hideReadyUI},
-	WIDGET.newKey{name="ready",x=1060,y=510,w=360,h=90,color='lG',font=35,		code=_setReady,hideF=hideReadyUI},
-	WIDGET.newKey{name="spectate",x=1060,y=610,w=360,h=90,color='lO',font=35,	code=_setSpectate,hideF=hideReadyUI},
-	WIDGET.newKey{name="cancel",x=1060,y=560,w=360,h=120,color='lH',font=40,	code=_setCancel,hideF=hideReadyUI},
+	WIDGET.newKey{name="setting",fText=TEXTURE.setting,x=1200,y=160,w=90,h=90,	code=_gotoSetting,hideF=function()return hideReadyUI()or netPLY.getSelfReady()end},
+	WIDGET.newKey{name="ready",x=1060,y=510,w=360,h=90,color='lG',font=35,		code=_setReady,hideF=function()return hideReadyUI()or netPLY.getSelfReady()end},
+	WIDGET.newKey{name="spectate",x=1060,y=610,w=360,h=90,color='lO',font=35,	code=_setSpectate,hideF=function()return hideReadyUI()or netPLY.getSelfReady()end},
+	WIDGET.newKey{name="cancel",x=1060,y=560,w=360,h=120,color='lH',font=40,	code=_setCancel,hideF=function()return hideReadyUI()or not netPLY.getSelfReady()end},
 	WIDGET.newKey{name="hideChat",fText="...",x=380,y=35,w=60,font=35,			code=_switchChat},
 	WIDGET.newKey{name="quit",fText=TEXTURE.quit_small,x=900,y=35,w=60,code=_quit},
 }