From 1133d256ee92443aa3cc7363f4e5b87ab3b096e5 Mon Sep 17 00:00:00 2001
From: MrZ626 <1046101471@qq.com>
Date: Sat, 22 May 2021 07:31:01 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=82=E6=88=98=E7=BB=93=E6=9D=9F=E5=90=8E?=
 =?UTF-8?q?=E4=BF=9D=E7=95=99=E8=A7=82=E6=88=98=E7=8A=B6=E6=80=81=EF=BC=8C?=
 =?UTF-8?q?=E6=95=B4=E7=90=86=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 parts/net.lua             | 7 ++++---
 parts/scenes/net_game.lua | 8 ++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/parts/net.lua b/parts/net.lua
index 62dbc386..14aeef67 100644
--- a/parts/net.lua
+++ b/parts/net.lua
@@ -269,9 +269,9 @@ end
 function NET.changeConfig()
 	WS.send('play','{"action":5,"data":'..JSON.encode({config=dumpBasicConfig()})..'}')
 end
-function NET.signal_joinMode(ready)
-	if NET.lock('ready',3)and not NET.roomState.start then
-		WS.send('play','{"action":6,"data":'..JSON.encode{mode=ready}..'}')
+function NET.signal_setMode(mode)
+	if not NET.roomState.start and NET.lock('ready',3)then
+		WS.send('play','{"action":6,"data":'..JSON.encode{mode=mode}..'}')
 	end
 end
 function NET.signal_die()
@@ -491,6 +491,7 @@ function NET.updateWS_play()
 							NET.wsconn_stream()
 						elseif res.action==9 then--Game finished
 							NET.roomState.start=false
+							if NET.spectate then NET.signal_setMode(2) end
 							NET.spectate=false
 							if SCN.socketRead then SCN.socketRead('finish',d)end
 							NET.wsclose_stream()
diff --git a/parts/scenes/net_game.lua b/parts/scenes/net_game.lua
index 8b7b9452..9d581270 100644
--- a/parts/scenes/net_game.lua
+++ b/parts/scenes/net_game.lua
@@ -18,9 +18,9 @@ local lastBackTime=0
 local noTouch,noKey=false,false
 local touchMoveLastFrame=false
 
-local function _setReady()NET.signal_joinMode(1)end
-local function _setSpectate()NET.signal_joinMode(2)end
-local function _setCancel()NET.signal_joinMode(0)end
+local function _setReady()NET.signal_setMode(1)end
+local function _setSpectate()NET.signal_setMode(2)end
+local function _setCancel()NET.signal_setMode(0)end
 local function _gotoSetting()
 	if not(netPLY.getSelfReady()or NET.getlock('ready'))then
 		SCN.go('setting_game')
@@ -131,7 +131,6 @@ function scene.keyDown(key)
 			_switchChat()
 		end
 	elseif not inputBox.hide then
-		print(1)
 		WIDGET.focus(inputBox)
 		inputBox:keypress(key)
 	elseif playing then
@@ -148,6 +147,7 @@ function scene.keyDown(key)
 			else
 				_setCancel()
 			end
+		elseif key=="s"then
 			_gotoSetting()
 		end
 	end