From d34627fab6841dce767c0b3ee5f1dcf665a6b217 Mon Sep 17 00:00:00 2001
From: MrZ626 <1046101471@qq.com>
Date: Sun, 28 Mar 2021 02:40:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=E7=BD=91=E7=BB=9C=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E5=85=A8=E5=B1=80=E5=8F=98=E9=87=8F=E6=94=BE=E5=85=A5?=
 =?UTF-8?q?NET=EF=BC=8C=E5=88=A0=E9=99=A4WSCONN=EF=BC=8C=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E8=BF=9B=E5=85=A5=E8=81=94=E7=BD=91=E8=8F=9C=E5=8D=95=E7=9A=84?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Zframework/websocket.lua  |  2 ++
 main.lua                  |  6 ++++--
 parts/gametoolfunc.lua    |  9 +++++++--
 parts/scenes/main.lua     | 27 +++++++++++++--------------
 parts/scenes/net_chat.lua |  1 -
 parts/scenes/net_game.lua |  4 +---
 6 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/Zframework/websocket.lua b/Zframework/websocket.lua
index 594adeec..907c800b 100644
--- a/Zframework/websocket.lua
+++ b/Zframework/websocket.lua
@@ -1,3 +1,5 @@
+-- local host="192.168.114.102"
+-- local host="127.0.0.1"
 local host="hdustea.3322.org"
 local port="10026"
 local path="/tech/socket/v1"
diff --git a/main.lua b/main.lua
index d0ac8f48..1f74bb39 100644
--- a/main.lua
+++ b/main.lua
@@ -25,8 +25,10 @@ LOADED=false
 DAILYLAUNCH=false
 LOGIN=false
 EDITING=""
-WSCONN=false
-ALLOW_ONLINE=false
+NET={
+	allow_online=false,
+	try_enter_netmenu=false,
+}
 ERRDATA={}
 
 --System setting
diff --git a/parts/gametoolfunc.lua b/parts/gametoolfunc.lua
index faa0ce0e..814ac235 100644
--- a/parts/gametoolfunc.lua
+++ b/parts/gametoolfunc.lua
@@ -1130,7 +1130,7 @@ do
 					else
 						local res=JSON.decode(message)
 						if VERSION_CODE>=res.lowest then
-							ALLOW_ONLINE=true
+							NET.allow_online=true
 						end
 						if VERSION_CODE<res.newestCode then
 							LOG.print(text.oldVersion:gsub("$1",res.newestName),180,COLOR.sky)
@@ -1168,7 +1168,8 @@ do
 							if res.id then
 								USER.id=res.id
 								USER.authToken=res.authToken
-								SCN.go("net_menu")
+								NET.try_enter_netmenu=true
+								WS.send("user",JSON.encode{action=0})
 							end
 							FILE.save(USER,"conf/user","q")
 							LOG.print(text.loginSuccessed)
@@ -1183,6 +1184,10 @@ do
 						elseif res.action==0 then
 							USER.accessToken=res.accessToken
 							LOG.print(text.accessSuccessed)
+							if NET.try_enter_netmenu then
+								NET.try_enter_netmenu=false
+								SCN.go("net_menu")
+							end
 						elseif res.action==1 then
 							USER.name=res.username
 							USER.motto=res.motto
diff --git a/parts/scenes/main.lua b/parts/scenes/main.lua
index 296b34bb..6ea1db7a 100644
--- a/parts/scenes/main.lua
+++ b/parts/scenes/main.lua
@@ -77,14 +77,13 @@ function scene.keyDown(key)
 		end
 	elseif key=="a"then
 		if testButton(3)then
-			if not ALLOW_ONLINE then
-				TEXT.show(text.notFinished,640,450,60,"flicker")
-				SFX.play("finesseError")
-			elseif LOGIN then
-				SCN.go("net_menu")
-				WS.send("user",JSON.encode{
-					action=0,
-				})
+			if LOGIN then
+				if not NET.allow_online then
+					TEXT.show(text.needUpdate,640,450,60,"flicker")
+					SFX.play("finesseError")
+				else
+					WS.send("user",JSON.encode{action=0})
+				end
 			else
 				SCN.go("login")
 			end
@@ -109,18 +108,18 @@ function scene.keyDown(key)
 		if testButton(8)then
 			SCN.go("manual")
 		end
-	elseif key=="f1"then
-		if testButton(11)then
-			SCN.go("about")
-		end
-	elseif key=="f2"then
+	elseif key=="2"then
 		if testButton(9)then
 			SCN.go("music")
 		end
-	elseif key=="f3"then
+	elseif key=="0"then
 		if testButton(10)then
 			SCN.go("lang")
 		end
+	elseif key=="x"then
+		if testButton(11)then
+			SCN.go("about")
+		end
 	elseif key=="escape"then
 		if testButton(12)then
 			SCN.back()
diff --git a/parts/scenes/net_chat.lua b/parts/scenes/net_chat.lua
index 3dccf940..9c2242e2 100644
--- a/parts/scenes/net_chat.lua
+++ b/parts/scenes/net_chat.lua
@@ -31,7 +31,6 @@ function scene.sceneInit()
 end
 function scene.sceneBack()
 	WS.send("chat","Q")
-	WSCONN=false
 	LOG.print(text.wsDisconnected,"warn")
 end
 
diff --git a/parts/scenes/net_game.lua b/parts/scenes/net_game.lua
index e75c88ce..f1d46441 100644
--- a/parts/scenes/net_game.lua
+++ b/parts/scenes/net_game.lua
@@ -31,7 +31,6 @@ local scene={}
 
 function scene.sceneBack()
 	WS.send("play","Q")
-	WSCONN=false
 	LOG.print(text.wsDisconnected,"warn")
 	love.keyboard.setKeyRepeat(true)
 end
@@ -123,7 +122,6 @@ end
 function scene.gamepadDown(key)
 	if key=="back"then
 		if TIME()-lastBackTime<1 then
-			WSCONN=false
 			SCN.back()
 		else
 			lastBackTime=TIME()
@@ -263,7 +261,7 @@ function scene.update(dt)
 	local _
 	local GAME=GAME
 
-	if not WSCONN and not SCN.swapping then SCN.back()end
+	if WS.status("play")~="running"and not SCN.swapping then SCN.back()end
 	if not playing then
 		heartBeatTimer=heartBeatTimer+dt
 		if heartBeatTimer>42 then