From 1545d30eddc5864d874f652eb5c5bc89857d31aa Mon Sep 17 00:00:00 2001
From: MrZ_26 <MrZ626@users.github.com>
Date: Thu, 30 Jul 2020 01:07:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=90=8E=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Zframework/init.lua  |  7 +++----
 Zframework/scene.lua | 11 +++++++++--
 Zframework/timer.lua |  7 ++++++-
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/Zframework/init.lua b/Zframework/init.lua
index 854d81da..179715cf 100644
--- a/Zframework/init.lua
+++ b/Zframework/init.lua
@@ -150,14 +150,13 @@ function mouseDown.intro(x,y,k)
 	end
 end
 function touchDown.intro(id,x,y)
-	SCN.goto("main")
+	mouseDown.intro()
 end
 function keyDown.intro(key)
 	if key=="escape"then
-		VOC.play("bye")
-		SCN.back()
+		mouseDown.intro(nil,nil,2)
 	else
-		SCN.goto("main")
+		mouseDown.intro()
 	end
 end
 
diff --git a/Zframework/scene.lua b/Zframework/scene.lua
index b1b72ce5..21e93305 100644
--- a/Zframework/scene.lua
+++ b/Zframework/scene.lua
@@ -266,7 +266,14 @@ function sceneInit.stat()
 end
 function sceneInit.history()
 	BG.set("game3")
-	sceneTemp={require("parts/updateLog"),1}--scroll pos
+	sceneTemp={
+		require("parts/updateLog"),
+		1--scroll pos
+	}
+	if newVersionLaunch then
+		newVersionLaunch=nil
+		sceneTemp[2]=4
+	end
 end
 function sceneInit.debug()
 	sceneTemp={
@@ -342,7 +349,7 @@ function SCN.push(tar,style)
 end
 function SCN.pop()
 	local _=SCN.seq
-	_[#_-1]=nil
+	_[#_],_[#_-1]=nil
 end
 function SCN.swapTo(tar,style)
 	local S=SCN.swap
diff --git a/Zframework/timer.lua b/Zframework/timer.lua
index 0f1307fd..f35dbc05 100644
--- a/Zframework/timer.lua
+++ b/Zframework/timer.lua
@@ -38,7 +38,12 @@ function Tmr.load()
 			S.cur=S.cur+1
 			S.tar=S.cur
 			if S.cur>62.6 then
-				SCN.swapTo("intro","none")
+				if newVersionLaunch then
+					SCN.push("intro","fade")
+					SCN.swapTo("history","fade")
+				else
+					SCN.swapTo("intro","none")
+				end
 			end
 			return
 		end