软件锁场景层次更改,可以从设置进入

This commit is contained in:
MrZ626
2020-09-18 12:29:22 +08:00
parent 1e68993e7c
commit b2922cb871
3 changed files with 15 additions and 2 deletions

View File

@@ -267,6 +267,7 @@ local langList={
swap="组合键切换攻击模式", swap="组合键切换攻击模式",
fine="极简操作提示音", fine="极简操作提示音",
appLock="软件锁(密码626)", appLock="软件锁(密码626)",
calc="软件锁",
back="返回", back="返回",
}, },
setting_video={ setting_video={
@@ -751,6 +752,7 @@ local langList={
swap="组合键切换攻击模式", swap="组合键切换攻击模式",
fine="极简操作提示音", fine="极简操作提示音",
appLock="软件锁(密码626)", appLock="软件锁(密码626)",
calc="软件锁",
back="返回", back="返回",
}, },
setting_video={ setting_video={
@@ -1225,6 +1227,7 @@ local langList={
swap="Key Combination (Change Atk. Mode)", swap="Key Combination (Change Atk. Mode)",
fine="Finesse Error Sound", fine="Finesse Error Sound",
appLock="App Lock (Password: 626)", appLock="App Lock (Password: 626)",
calc="App Lock",
back="Back", back="Back",
}, },
setting_video={ setting_video={
@@ -1698,6 +1701,7 @@ local langList={
swap="=+=+=", swap="=+=+=",
fine="12 X 21", fine="12 X 21",
appLock="?XX(=626)", appLock="?XX(=626)",
calc="?XX",
back="X", back="X",
}, },
setting_video={ setting_video={
@@ -2184,6 +2188,7 @@ local langList={
swap="组合键切换攻击模式", swap="组合键切换攻击模式",
fine="极简操作提示音", fine="极简操作提示音",
appLock="家长锁(密码626)", appLock="家长锁(密码626)",
calc="家长锁",
back="返回", back="返回",
}, },
setting_video={ setting_video={

View File

@@ -302,6 +302,7 @@ local Widgets={
newSwitch({name="swap", x=1080, y=380, font=20,disp=SETval("swap"), code=SETrev("swap")}), 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="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")}), 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}), newButton({name="back", x=1140, y=640, w=180,h=80,color="white", font=35,code=BACK}),
}, },
setting_video={ setting_video={

View File

@@ -36,6 +36,7 @@ end
--ALL SCENES & FUNCTIONS --ALL SCENES & FUNCTIONS
do--calculator do--calculator
function sceneInit.calculator() function sceneInit.calculator()
BG.set("none")
sceneTemp={ sceneTemp={
reg=false, reg=false,
val=0, val=0,
@@ -45,6 +46,7 @@ do--calculator
} }
end end
mouseDown.calculator=NULL
function keyDown.calculator(k) function keyDown.calculator(k)
local S=sceneTemp local S=sceneTemp
if byte(k)>=48 and byte(k)<=57 then if byte(k)>=48 and byte(k)<=57 then
@@ -121,7 +123,7 @@ do--calculator
elseif k=="delete"then elseif k=="delete"then
S.val=0 S.val=0
elseif k=="space"and S.pass then elseif k=="space"and S.pass then
SCN.swapTo("intro") SCN.back()
end end
end end
@@ -696,7 +698,12 @@ do--load
S.cur=S.cur+1 S.cur=S.cur+1
S.tar=S.cur S.tar=S.cur
if S.cur>62.6 then 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 end
loadingFinished=true loadingFinished=true
return return