From 36a30a63182a018beeb2e9e9d3ca5bd8ab6fad3c Mon Sep 17 00:00:00 2001
From: MrZ626 <1046101471@qq.com>
Date: Thu, 24 Jun 2021 14:26:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=88=BF=E9=97=B4=E5=87=86?=
 =?UTF-8?q?=E5=A4=87=E7=8A=B6=E6=80=81=E5=8F=98=E9=87=8F=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=EF=BC=8C=E5=87=8F=E5=B0=91=E5=87=BA=E7=8E=B0?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E7=8A=B6=E6=80=81=E7=9A=84=E5=8F=AF=E8=83=BD?=
 =?UTF-8?q?=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 parts/net.lua             | 25 +++++++++++--------------
 parts/netPlayer.lua       |  2 +-
 parts/scenes/net_game.lua |  6 +++---
 3 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/parts/net.lua b/parts/net.lua
index 70cb74f6..c20e20ff 100644
--- a/parts/net.lua
+++ b/parts/net.lua
@@ -25,9 +25,7 @@ local NET={
 	specSRID=false,--Cached SRID when enter playing room, for connect WS after scene swapped
 	seed=false,
 
-	allReady=false,
-	connectingStream=false,
-	waitingStream=false,
+	roomReadyState=false,
 
 	UserCount="_",
 	PlayCount="_",
@@ -535,16 +533,14 @@ function NET.updateWS_play()
 							NET.roomState.private=d.private
 							NET.roomState.start=d.start
 
-							NET.allReady=false
-							NET.connectingStream=false
-							NET.waitingStream=false
+							NET.roomReadyState=false
 
 							NET.spectate=false
 
 							if d.srid then
 								NET.spectate=true
 								NET.specSRID=d.srid
-								NET.connectingStream=true
+								NET.roomReadyState='connecting'
 							end
 							loadGame('netBattle',true,true)
 						else
@@ -557,7 +553,9 @@ function NET.updateWS_play()
 								config=d.config,
 							}
 							if SCN.cur=='net_game'then SCN.socketRead('join',d)end
-							NET.allReady=false
+							if NET.roomReadyState=='allReady'then
+								NET.roomReadyState=false
+							end
 						end
 					elseif res.action==3 then--Player leave
 						if not d.uid then
@@ -579,10 +577,9 @@ function NET.updateWS_play()
 						netPLY.setJoinMode(d.uid,d.mode)
 					elseif res.action==7 then--All Ready
 						SFX.play('reach',.6)
-						NET.allReady=true
+						NET.roomReadyState='allReady'
 					elseif res.action==8 then--Set
-						NET.allReady=false
-						NET.connectingStream=true
+						NET.roomReadyState='connecting'
 						NET.wsconn_stream(d.srid)
 					elseif res.action==9 then--Game finished
 						if SCN.cur=='net_game'then SCN.socketRead('finish',d)end
@@ -629,9 +626,9 @@ function NET.updateWS_stream()
 					local d=res.data
 					if res.type=='Connect'then
 						NET.unlock('wsc_stream')
-						NET.connectingStream=false
+						NET.roomReadyState=false
 					elseif res.action==0 then--Game start
-						NET.waitingStream=false
+						NET.roomReadyState=false
 						SCN.socketRead('go')
 					elseif res.action==1 then--Game finished
 						--?
@@ -655,7 +652,7 @@ function NET.updateWS_stream()
 									end
 								end
 							else
-								NET.waitingStream=true
+								NET.roomReadyState='waitConn'
 							end
 						else
 							if d.spectate then
diff --git a/parts/netPlayer.lua b/parts/netPlayer.lua
index c3299998..43f6a0e3 100644
--- a/parts/netPlayer.lua
+++ b/parts/netPlayer.lua
@@ -124,7 +124,7 @@ function netPLY.setJoinMode(uid,ready)
 		if p.uid==uid then
 			if p.mode~=ready then
 				p.mode=ready
-				if ready==0 then NET.allReady=false end
+				if ready==0 then NET.roomReadyState=false end
 				SFX.play('spin_0',.6)
 				if p.uid==USER.uid then
 					NET.unlock('ready')
diff --git a/parts/scenes/net_game.lua b/parts/scenes/net_game.lua
index b398cb68..950b4d33 100644
--- a/parts/scenes/net_game.lua
+++ b/parts/scenes/net_game.lua
@@ -287,13 +287,13 @@ function scene.draw()
 
 		--Ready & Set mark
 		setFont(50)
-		if NET.allReady then
+		if NET.roomReadyState=='allReady'then
 			gc_setColor(0,1,.5,.9)
 			mStr(text.ready,640,15)
-		elseif NET.connectingStream then
+		elseif NET.roomReadyState=='connecting'then
 			gc_setColor(.1,1,.8,.9)
 			mStr(text.connStream,640,15)
-		elseif NET.waitingStream then
+		elseif NET.roomReadyState=='waitConn'then
 			gc_setColor(0,.8,1,.9)
 			mStr(text.waitStream,640,15)
 		end