From b9c5599f958e165c3bcc6ff17473b46e28a8e2e9 Mon Sep 17 00:00:00 2001
From: MrZ626 <1046101471@qq.com>
Date: Sun, 16 May 2021 03:16:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AF=B9=E6=88=98=E6=88=BF?=
 =?UTF-8?q?=E9=97=B4=E5=86=85=E6=8C=89=E9=92=AE=E4=BC=9A=E8=A7=A6=E5=8F=91?=
 =?UTF-8?q?=E8=81=8A=E5=A4=A9=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 parts/scenes/net_game.lua | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/parts/scenes/net_game.lua b/parts/scenes/net_game.lua
index ea14e621..204137a9 100644
--- a/parts/scenes/net_game.lua
+++ b/parts/scenes/net_game.lua
@@ -1,5 +1,7 @@
-local gc,tc,kb=love.graphics,love.touch,love.keyboard
+local gc,tc=love.graphics,love.touch
+
 local ins=table.insert
+
 local SCR,VK,NET,netPLY=SCR,VK,NET,netPLY
 local PLAYERS,GAME=PLAYERS,GAME
 
@@ -13,6 +15,15 @@ local lastBackTime=0
 local noTouch,noKey=false,false
 local touchMoveLastFrame=false
 
+local function _switchReady()
+	NET.signal_ready(not netPLY.getSelfReady())
+end
+local function _gotoSetting()
+	if not(netPLY.getSelfReady()or NET.getlock('ready'))then
+		SCN.go('setting_game')
+	end
+end
+
 local scene={}
 
 function scene.sceneInit(org)
@@ -112,11 +123,9 @@ function scene.keyDown(key)
 		end
 	else
 		if key=="space"then
-			NET.signal_ready(not netPLY.getSelfReady())
+			_switchReady()
 		elseif key=="s"then
-			if not(netPLY.getSelfReady()or NET.getlock('ready'))then
-				SCN.go('setting_game')
-			end
+			_gotoSetting()
 		end
 	end
 end
@@ -301,8 +310,8 @@ end
 scene.widgetList={
 	textBox,
 	inputBox,
-	WIDGET.newKey{name="setting",fText=TEXTURE.setting,x=1200,y=160,w=90,h=90,code=pressKey"s",hideF=function()return playing or netPLY.getSelfReady()or NET.getlock('ready')end},
-	WIDGET.newKey{name="ready",x=1060,y=630,w=300,h=80,color='lB',font=40,code=pressKey"space",
+	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=630,w=300,h=80,color='lB',font=40,code=_switchReady,
 		hideF=function()
 			return
 				playing or
@@ -310,7 +319,7 @@ scene.widgetList={
 				netPLY.getSelfReady()or
 				NET.getlock('ready')
 		end},
-	WIDGET.newKey{name="cancel",x=1060,y=630,w=300,h=80,color='H',font=40,code=pressKey"space",
+	WIDGET.newKey{name="cancel",x=1060,y=630,w=300,h=80,color='H',font=40,code=_switchReady,
 		hideF=function()
 			return
 				playing or