From 82749e9e19ce54b5c0dbfde7c82e1c9661edb35c Mon Sep 17 00:00:00 2001
From: MrZ626 <1046101471@qq.com>
Date: Mon, 5 Jul 2021 14:30:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=E4=BB=A3=E7=A0=81=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=9D=9E=E6=B8=B8=E6=88=8F=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E4=B8=8B=E8=AE=BE=E7=BD=AE=E6=8C=89=E9=92=AE=E5=8F=AF=E8=A7=81?=
 =?UTF-8?q?=E6=80=A7=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 parts/scenes/main_simple.lua |  8 +++----
 parts/scenes/net_game.lua    | 43 +++++++++++++-----------------------
 2 files changed, 19 insertions(+), 32 deletions(-)

diff --git a/parts/scenes/main_simple.lua b/parts/scenes/main_simple.lua
index 48e71246..6d36a7af 100644
--- a/parts/scenes/main_simple.lua
+++ b/parts/scenes/main_simple.lua
@@ -20,10 +20,10 @@ scene.widgetList={
 	WIDGET.newText{name="version",	x=950,y=280,color='Z',align='L',fText=VERSION.string},
 	WIDGET.newButton{name="sprint",	x=260,y=480,w=260,font=50,code=function()loadGame('sprint_40l',true)end},
 	WIDGET.newButton{name="marathon",x=640,y=480,w=260,font=50,code=function()loadGame('marathon_n',true)end},
-	WIDGET.newButton{name="setting",x=1000,y=400,w=120,fText=TEXTURE.setting,font=50,code=goScene'setting_game'},
-	WIDGET.newButton{name="lang",	x=1000,y=560,w=120,fText=TEXTURE.language,font=40,code=goScene'lang'},
-	WIDGET.newButton{name="manual",	x=1160,y=400,w=120,fText=TEXTURE.sure,font=80,code=goScene'manual'},
-	WIDGET.newButton{name="quit",	x=1160,y=560,w=120,fText=TEXTURE.quit,font=70,code=function()VOC.play('bye')SCN.swapTo('quit','slowFade')end},
+	WIDGET.newButton{name="setting",x=1000,y=400,w=120,fText=TEXTURE.setting,code=goScene'setting_game'},
+	WIDGET.newButton{name="lang",	x=1000,y=560,w=120,fText=TEXTURE.language,code=goScene'lang'},
+	WIDGET.newButton{name="manual",	x=1160,y=400,w=120,fText=TEXTURE.sure,code=goScene'manual'},
+	WIDGET.newButton{name="quit",	x=1160,y=560,w=120,fText=TEXTURE.quit,code=function()VOC.play('bye')SCN.swapTo('quit','slowFade')end},
 }
 
 return scene
\ No newline at end of file
diff --git a/parts/scenes/net_game.lua b/parts/scenes/net_game.lua
index 832f2e2e..f67dcc47 100644
--- a/parts/scenes/net_game.lua
+++ b/parts/scenes/net_game.lua
@@ -49,6 +49,13 @@ 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={}
 
@@ -142,7 +149,7 @@ function scene.keyDown(key,isRep)
 			PLAYERS[1]:pressKey(k)
 			VK.press(k)
 		end
-	else
+	elseif not hideReadyUI()then
 		if key=="space"then
 			if netPLY.getSelfJoinMode()==0 then
 				(kb.isDown("lctrl","rctrl","lalt","ralt")and _setSpectate or _setReady)()
@@ -321,36 +328,16 @@ function scene.draw()
 		gc_print("M",430,10)
 	end
 end
+
 scene.widgetList={
 	textBox,
 	inputBox,
-	WIDGET.newKey{name="setting",fText=TEXTURE.setting,x=1200,y=160,w=90,h=90,code=_gotoSetting,hideF=function()return playing or netPLY.getSelfReady()or NET.getlock('ready')end},
-	WIDGET.newKey{name="ready",x=1060,y=510,w=360,h=90,color='lG',font=35,code=_setReady,
-		hideF=function()
-			return
-				playing or
-				NET.roomState.start or
-				netPLY.getSelfReady() or
-				NET.getlock('ready')
-		end},
-	WIDGET.newKey{name="spectate",x=1060,y=610,w=360,h=90,color='lO',font=35,code=_setSpectate,
-		hideF=function()
-			return
-				playing or
-				NET.roomState.start or
-				netPLY.getSelfReady() or
-				NET.getlock('ready')
-		end},
-	WIDGET.newKey{name="cancel",x=1060,y=560,w=360,h=120,color='lH',font=40,code=_setCancel,
-		hideF=function()
-			return
-				playing or
-				NET.roomState.start or
-				not netPLY.getSelfReady() or
-				NET.getlock('ready')
-		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,font=40,code=_quit},
+	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="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},
 }
 
 return scene
\ No newline at end of file