From b2922cb871814f2b37be80a3a3b817cd79ba6355 Mon Sep 17 00:00:00 2001
From: MrZ626 <1046101471@qq.com>
Date: Fri, 18 Sep 2020 12:29:22 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=AF=E4=BB=B6=E9=94=81=E5=9C=BA=E6=99=AF?=
 =?UTF-8?q?=E5=B1=82=E6=AC=A1=E6=9B=B4=E6=94=B9=EF=BC=8C=E5=8F=AF=E4=BB=A5?=
 =?UTF-8?q?=E4=BB=8E=E8=AE=BE=E7=BD=AE=E8=BF=9B=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Zframework/languages.lua  |  5 +++++
 Zframework/widgetList.lua |  1 +
 parts/scenes.lua          | 11 +++++++++--
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/Zframework/languages.lua b/Zframework/languages.lua
index b354ced8..b93d5eed 100644
--- a/Zframework/languages.lua
+++ b/Zframework/languages.lua
@@ -267,6 +267,7 @@ local langList={
 				swap="组合键切换攻击模式",
 				fine="极简操作提示音",
 				appLock="软件锁(密码626)",
+				calc="软件锁",
 				back="返回",
 			},
 			setting_video={
@@ -751,6 +752,7 @@ local langList={
 				swap="组合键切换攻击模式",
 				fine="极简操作提示音",
 				appLock="软件锁(密码626)",
+				calc="软件锁",
 				back="返回",
 			},
 			setting_video={
@@ -1225,6 +1227,7 @@ local langList={
 				swap="Key Combination (Change Atk. Mode)",
 				fine="Finesse Error Sound",
 				appLock="App Lock (Password: 626)",
+				calc="App Lock",
 				back="Back",
 			},
 			setting_video={
@@ -1698,6 +1701,7 @@ local langList={
 				swap="=+=+=",
 				fine="12 X 21",
 				appLock="?XX(=626)",
+				calc="?XX",
 				back="X",
 			},
 			setting_video={
@@ -2184,6 +2188,7 @@ local langList={
 				swap="组合键切换攻击模式",
 				fine="极简操作提示音",
 				appLock="家长锁(密码626)",
+				calc="家长锁",
 				back="返回",
 			},
 			setting_video={
diff --git a/Zframework/widgetList.lua b/Zframework/widgetList.lua
index fe0e1441..562cd47c 100644
--- a/Zframework/widgetList.lua
+++ b/Zframework/widgetList.lua
@@ -302,6 +302,7 @@ local Widgets={
 		newSwitch({name="swap",		x=1080,	y=380,	font=20,disp=SETval("swap"),		code=SETrev("swap")}),
 		newSwitch({name="fine",		x=1080,	y=440,	font=20,disp=SETval("fine"),		code=SETrev("fine")}),
 		newSwitch({name="appLock",	x=1080,	y=500,	font=20,disp=SETval("appLock"),		code=SETrev("appLock")}),
+		newButton({name="calc",		x=970,	y=550,	w=150,h=60,color="dGrey",	font=25,code=goScene("calculator"),hide=function()return not setting.appLock end}),
 		newButton({name="back",		x=1140,	y=640,	w=180,h=80,color="white",	font=35,code=BACK}),
 	},
 	setting_video={
diff --git a/parts/scenes.lua b/parts/scenes.lua
index 5094d6db..d6a96b06 100644
--- a/parts/scenes.lua
+++ b/parts/scenes.lua
@@ -36,6 +36,7 @@ end
 --ALL SCENES & FUNCTIONS
 do--calculator
 	function sceneInit.calculator()
+		BG.set("none")
 		sceneTemp={
 			reg=false,
 			val=0,
@@ -45,6 +46,7 @@ do--calculator
 		}
 	end
 
+	mouseDown.calculator=NULL
 	function keyDown.calculator(k)
 		local S=sceneTemp
 		if byte(k)>=48 and byte(k)<=57 then
@@ -121,7 +123,7 @@ do--calculator
 		elseif k=="delete"then
 			S.val=0
 		elseif k=="space"and S.pass then
-			SCN.swapTo("intro")
+			SCN.back()
 		end
 	end
 
@@ -696,7 +698,12 @@ do--load
 				S.cur=S.cur+1
 				S.tar=S.cur
 				if S.cur>62.6 then
-					SCN.swapTo(setting.appLock and "calculator"or"intro","none")
+					if setting.appLock then
+						SCN.push("intro","fade")
+						SCN.swapTo("calculator","none")
+					else
+						SCN.swapTo("intro","none")
+					end
 				end
 				loadingFinished=true
 				return