From 46b3ad8a707c5b06fbd4a79f5afed273d22c5804 Mon Sep 17 00:00:00 2001
From: MrZ626 <1046101471@qq.com>
Date: Sun, 9 May 2021 02:26:03 +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=E6=88=BF=E9=97=B4=E9=87=8C=E7=9A=84=E5=90=84?=
 =?UTF-8?q?=E5=B0=B1=E5=90=84=E4=BD=8D/=E9=A2=84=E5=A4=87=E6=A0=87?=
 =?UTF-8?q?=E8=AE=B0=E6=98=BE=E7=A4=BA=E6=97=B6=E6=9C=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 parts/net.lua              | 17 ++++++++---------
 parts/scenes/net_game.lua  | 12 ++++++------
 parts/scenes/net_rooms.lua |  2 ++
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/parts/net.lua b/parts/net.lua
index de4943ad..1a468f09 100644
--- a/parts/net.lua
+++ b/parts/net.lua
@@ -16,8 +16,8 @@ local NET={
 		capacity=false,
 	},
 	allReady=false,
-	streamRoomID=false,
 	connectingStream=false,
+	streamRoomID=false,
 	serverGaming=false,
 }
 
@@ -389,12 +389,11 @@ function NET.updateWS_play()
 									ready=d.ready,
 									config=d.config,
 								}
-								if SCN.socketRead then SCN.socketRead('Join',d)end
+								if SCN.socketRead then SCN.socketRead('join',d)end
 								NET.allReady=false
 							end
 						elseif res.action==3 then--Player leave
 							if not d.uid then
-								NET.allReady=false
 								NET.wsclose_stream()
 								NET.unlock('quit')
 								SCN.back()
@@ -412,10 +411,10 @@ function NET.updateWS_play()
 										break
 									end
 								end
-								if SCN.socketRead then SCN.socketRead('Leave',d)end
+								if SCN.socketRead then SCN.socketRead('leave',d)end
 							end
 						elseif res.action==4 then--Player talk
-							if SCN.socketRead then SCN.socketRead('Talk',d)end
+							if SCN.socketRead then SCN.socketRead('talk',d)end
 						elseif res.action==5 then--Player change settings
 							netPLY.setConf(d.uid,d.config)
 						elseif res.action==6 then--One ready
@@ -425,12 +424,12 @@ function NET.updateWS_play()
 							NET.allReady=true
 						elseif res.action==8 then--Set
 							NET.streamRoomID=d.rid
+							NET.allReady=false
 							NET.connectingStream=true
 							NET.wsconn_stream()
 						elseif res.action==9 then--Game finished
-							NET.allReady=false
 							NET.wsclose_stream()
-							if SCN.socketRead then SCN.socketRead('Finish',d)end
+							if SCN.socketRead then SCN.socketRead('finish',d)end
 						end
 					else
 						WS.alert('play')
@@ -460,7 +459,7 @@ function NET.updateWS_stream()
 							NET.unlock('wsc_stream')
 						elseif res.action==0 then--Game start
 							NET.connectingStream=false
-							SCN.socketRead('Go',d)
+							SCN.socketRead('go',d)
 						elseif res.action==1 then--Game finished
 							--?
 						elseif res.action==2 then--Player join
@@ -475,7 +474,7 @@ function NET.updateWS_stream()
 								end
 							end
 						elseif res.action==5 then--Receive stream
-							SCN.socketRead('Stream',d)
+							SCN.socketRead('stream',d)
 						end
 					else
 						WS.alert('stream')
diff --git a/parts/scenes/net_game.lua b/parts/scenes/net_game.lua
index c2c58c34..a810a5e6 100644
--- a/parts/scenes/net_game.lua
+++ b/parts/scenes/net_game.lua
@@ -136,26 +136,26 @@ function scene.gamepadUp(key)
 end
 
 function scene.socketRead(cmd,d)
-	if cmd=="Join"then
+	if cmd=='join'then
 		textBox:push{
 			COLOR.lR,d.username,
 			COLOR.dY,"#"..d.uid.." ",
 			COLOR.Y,text.joinRoom,
 		}
 		SFX.play('click')
-	elseif cmd=="Leave"then
+	elseif cmd=='leave'then
 		textBox:push{
 			COLOR.lR,d.username,
 			COLOR.dY,"#"..d.uid.." ",
 			COLOR.Y,text.leaveRoom,
 		}
-	elseif cmd=="Talk"then
+	elseif cmd=='talk'then
 		textBox:push{
 			COLOR.Z,d.username,
 			COLOR.dY,"#"..d.uid.." ",
 			COLOR.N,d.message or"[_]",
 		}
-	elseif cmd=="Go"then
+	elseif cmd=='go'then
 		if not playing then
 			playing=true
 			netPLY.resetReady()
@@ -166,7 +166,7 @@ function scene.socketRead(cmd,d)
 		else
 			LOG.print("Redundant [Go]",30,COLOR.G)
 		end
-	elseif cmd=="Finish"then
+	elseif cmd=='finish'then
 		playing=false
 		local winnerUID
 		for _,p in next,d.result do
@@ -178,7 +178,7 @@ function scene.socketRead(cmd,d)
 		if winnerUID then
 			TEXT.show(text.champion:gsub("$1",netPLY.getUsername(winnerUID)),640,260,80,'zoomout',.26)
 		end
-	elseif cmd=="Stream"then
+	elseif cmd=='stream'then
 		if d.uid~=USER.uid and playing then
 			for _,P in next,PLAYERS do
 				if P.uid==d.uid then
diff --git a/parts/scenes/net_rooms.lua b/parts/scenes/net_rooms.lua
index 0410b7fa..0e492261 100644
--- a/parts/scenes/net_rooms.lua
+++ b/parts/scenes/net_rooms.lua
@@ -17,6 +17,8 @@ local scene={}
 
 function scene.sceneInit()
 	BG.set()
+	NET.allReady=false
+	NET.connectingStream=false
 	scrollPos=0
 	selected=1
 	fetchRoom()