From f7c2d5f9e7c62eeda0ebb163a37be62666bd5032 Mon Sep 17 00:00:00 2001
From: MrZ626 <1046101471@qq.com>
Date: Sun, 6 Dec 2020 15:28:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=99=BB=E5=BD=95=E5=9C=BA?=
 =?UTF-8?q?=E6=99=AF=E8=BF=94=E5=9B=9E=E4=B9=B1=E8=B7=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 parts/scenes/intro.lua | 2 +-
 parts/scenes/main.lua  | 1 -
 parts/tick.lua         | 7 +------
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/parts/scenes/intro.lua b/parts/scenes/intro.lua
index f8b39f7b..83b95eac 100644
--- a/parts/scenes/intro.lua
+++ b/parts/scenes/intro.lua
@@ -27,7 +27,7 @@ function scene.mouseDown(_,_,k)
 			LOG.print("Old version detected & setting file deleted, please restart the game",600,COLOR.yellow)
 		else
 			if newVersionLaunch then
-				SCN.push("main","fade")
+				SCN.push("main")
 				SCN.swapTo("history","fade")
 				LOG.print(text.newVersion,"warn",COLOR.lBlue)
 			else
diff --git a/parts/scenes/main.lua b/parts/scenes/main.lua
index 863ce847..86dddf21 100644
--- a/parts/scenes/main.lua
+++ b/parts/scenes/main.lua
@@ -8,7 +8,6 @@ local function tick_httpREQ_checkAccessToken(task)
 		if response then
 			if response.code==200 then
 				LOG.print(text.accessSuccessed)
-				SCN.pop()
 				SCN.go("netgame")
 			elseif response.code==403 or response.code==401 then
 				httpRequest(
diff --git a/parts/tick.lua b/parts/tick.lua
index bc4c019e..6b45dcfa 100644
--- a/parts/tick.lua
+++ b/parts/tick.lua
@@ -11,12 +11,9 @@ function Tick.httpREQ_getAccessToken(task)
 					LOG.print(text.accessSuccessed)
 					ACCOUNT.access_token=res.access_token
 					FILE.save(ACCOUNT,"account","")
-					SCN.pop()
-					SCN.go("netgame")
+					SCN.swapTo("netgame")
 				else
 					LOG.print(text.netErrorCode..response.code..": "..res.message,"warn")
-					SCN.pop()
-					SCN.go("main")
 				end
 			else
 				LOGIN=false
@@ -28,8 +25,6 @@ function Tick.httpREQ_getAccessToken(task)
 				else
 					LOG.print(text.loginFailed..": "..text.netErrorCode,"warn")
 				end
-				SCN.pop()
-				SCN.go("main")
 			end
 			return
 		elseif request_error then