From e999a9cb1eeddb66ce2ccee9453b1852e79804f5 Mon Sep 17 00:00:00 2001
From: MrZ626 <1046101471@qq.com>
Date: Fri, 23 Apr 2021 16:19:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E8=8F=9C=E5=8D=95=E9=80=80=E5=87=BA?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=94=B9=E6=88=90=E8=BF=94=E5=9B=9E=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 parts/language/lang_en.lua     | 1 -
 parts/language/lang_fr.lua     | 1 -
 parts/language/lang_pt.lua     | 1 -
 parts/language/lang_sp.lua     | 1 -
 parts/language/lang_symbol.lua | 1 -
 parts/language/lang_zh.lua     | 1 -
 parts/scenes/intro.lua         | 4 +++-
 parts/scenes/main.lua          | 2 +-
 8 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua
index 0993749a..ec804dcb 100644
--- a/parts/language/lang_en.lua
+++ b/parts/language/lang_en.lua
@@ -220,7 +220,6 @@ return{
 			about="About",
 			dict="Zictionary",
 			manual="Manual",
-			quit="Exit",
 		},
 		main_simple={
 			sprint="Sprint",
diff --git a/parts/language/lang_fr.lua b/parts/language/lang_fr.lua
index d790e7c3..7b300040 100644
--- a/parts/language/lang_fr.lua
+++ b/parts/language/lang_fr.lua
@@ -197,7 +197,6 @@ return{
 			-- about="About",
 			dict="Zictionary",
 			manual="Manuel",
-			quit="Quitter",
 		},
 		mode={
 			mod="Mods (F1)",
diff --git a/parts/language/lang_pt.lua b/parts/language/lang_pt.lua
index c054bfed..dd62354a 100644
--- a/parts/language/lang_pt.lua
+++ b/parts/language/lang_pt.lua
@@ -221,7 +221,6 @@ return{
 			-- about="About",
 			dict="Zictionary",
 			manual="Manual",
-			quit="Saída",
 		},
 		main_simple={
 			sprint="Sprint",
diff --git a/parts/language/lang_sp.lua b/parts/language/lang_sp.lua
index f8898f61..9a0babd0 100644
--- a/parts/language/lang_sp.lua
+++ b/parts/language/lang_sp.lua
@@ -198,7 +198,6 @@ return{
 			about="Acerca del Juego",
 			dict="Zictionary",
 			manual="Manual",
-			quit="Salir",
 		},
 		main_simple={
 			sprint="Sprint",
diff --git a/parts/language/lang_symbol.lua b/parts/language/lang_symbol.lua
index ba7a7675..3d929bb4 100644
--- a/parts/language/lang_symbol.lua
+++ b/parts/language/lang_symbol.lua
@@ -102,7 +102,6 @@ return{
 			about="?",
 			dict="z",
 			manual="???",
-			quit="X",
 		},
 		mode={
 			mod="?!?!?!(F1)",
diff --git a/parts/language/lang_zh.lua b/parts/language/lang_zh.lua
index be462535..04522334 100644
--- a/parts/language/lang_zh.lua
+++ b/parts/language/lang_zh.lua
@@ -220,7 +220,6 @@ return{
 			about="关于",
 			dict="小Z词典",
 			manual="说明书",
-			quit="退出",
 		},
 		main_simple={
 			sprint="40行",
diff --git a/parts/scenes/intro.lua b/parts/scenes/intro.lua
index 5645473c..7acc6eff 100644
--- a/parts/scenes/intro.lua
+++ b/parts/scenes/intro.lua
@@ -22,6 +22,8 @@ function scene.mouseDown(_,_,k)
 		else
 			SCN.go(SETTING.simpMode and"main_simple"or"main")
 		end
+	else
+		SCN.swapTo("quit","slowFade")
 	end
 end
 function scene.touchDown()
@@ -30,7 +32,7 @@ end
 function scene.keyDown(key)
 	if key=="escape"then
 		VOC.play("bye")
-		SCN.back()
+		SCN.swapTo("quit","slowFade")
 	else
 		scene.mouseDown()
 	end
diff --git a/parts/scenes/main.lua b/parts/scenes/main.lua
index 1a7f1af0..9655cef2 100644
--- a/parts/scenes/main.lua
+++ b/parts/scenes/main.lua
@@ -193,7 +193,7 @@ scene.widgetList={
 		{"doArc",53,31,40,2.3,3.9},
 		}},
 	WIDGET.newButton{name="about",	x=-110,y=670,w=600,h=70,	color="lB",font=35,align="R",edge=30,code=pressKey"x"},
-	WIDGET.newButton{name="quit",	x=1390,y=670,w=600,h=70,	color="lR",font=40,align="L",edge=30,code=function()VOC.play("bye")SCN.swapTo("quit","slowFade")end},
+	WIDGET.newButton{name="back",	x=1390,y=670,w=600,h=70,	color="lR",font=40,align="L",edge=30,code=backScene},
 }
 
 return scene
\ No newline at end of file