diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua index dcf2faff..a7dad797 100644 --- a/parts/language/lang_en.lua +++ b/parts/language/lang_en.lua @@ -275,7 +275,7 @@ return{ autoPause="Pause when focus is lost", swap="Key Combination (Change Atk. Mode)", fine="Finesse Error Sound", - appLock="App Lock (Password: 2+6)", + appLock="App Lock (Password: 6+26)", simpMode="Simple mode", }, setting_video={ diff --git a/parts/language/lang_fr.lua b/parts/language/lang_fr.lua index 57841181..5404fd15 100644 --- a/parts/language/lang_fr.lua +++ b/parts/language/lang_fr.lua @@ -250,7 +250,7 @@ return{ autoPause="Mettre en pause en cas de perte de focus", swap="Combinaison de touches (changer le mode d'attaque)", fine="Son d'erreur de Finesse", - appLock="Verrouillage d'appli (MDP : 2+6)", + appLock="Verrouillage d'appli (MDP : 6+26)", -- simpMode="Simple mode", }, setting_video={ diff --git a/parts/language/lang_pt.lua b/parts/language/lang_pt.lua index 028ab00d..b9c3c472 100644 --- a/parts/language/lang_pt.lua +++ b/parts/language/lang_pt.lua @@ -275,7 +275,7 @@ return{ autoPause="Pausar quando foco for perco", swap="Combinação de tecla(Mudar modo de atk)", fine="Som Falha de destreza", - appLock="App Lock (Senha: 2+6)", + appLock="App Lock (Senha: 6+26)", -- simpMode="Simple mode", }, setting_video={ diff --git a/parts/language/lang_sp.lua b/parts/language/lang_sp.lua index 783593e5..81d6967e 100644 --- a/parts/language/lang_sp.lua +++ b/parts/language/lang_sp.lua @@ -255,7 +255,7 @@ return{ autoPause="Pausar cuando la ventana no está enfocada", swap="Combinación de Teclas (Cambiar Modo de Ataque)", fine="Sonido de Error de Finesse", - appLock="Bloqueo de App (Contraseña: 2+6)", + appLock="Bloqueo de App (Contraseña: 6+26)", -- simpMode="Simple mode", }, setting_video={ diff --git a/parts/language/lang_symbol.lua b/parts/language/lang_symbol.lua index d049b481..0a0113f1 100644 --- a/parts/language/lang_symbol.lua +++ b/parts/language/lang_symbol.lua @@ -135,7 +135,7 @@ return{ autoPause="A||", swap="=+=+=", fine="12 X 21", - appLock="?XX(=2+6)", + appLock="?XX(=6+26)", simpMode=".", }, setting_video={ diff --git a/parts/language/lang_zh.lua b/parts/language/lang_zh.lua index 345a16ca..08d58d63 100644 --- a/parts/language/lang_zh.lua +++ b/parts/language/lang_zh.lua @@ -276,7 +276,7 @@ return{ autoPause="失去焦点自动暂停", swap="组合键切换攻击模式", fine="极简操作提示音", - appLock="软件锁(密码2+6)", + appLock="软件锁(密码6+26)", simpMode="简洁模式", }, setting_video={ diff --git a/parts/scenes/load.lua b/parts/scenes/load.lua index 8c083637..98a6036a 100644 --- a/parts/scenes/load.lua +++ b/parts/scenes/load.lua @@ -18,9 +18,16 @@ for i=0,26 do table.insert(light,660-i%9*60) table.insert(light,false) end -light[math.random(10,18)*3]=true -light[math.random(19,25)*3]=true -light[26*3]=true +for _=1,3 do + light[math.random(7,25)*3]=true +end +local function switchLight(i) + light[3*i]=not light[3*i] + if light[6*3]and light[26*3]then + locked=false + skip=0 + end +end local function upFloor() progress=progress+1 @@ -201,6 +208,7 @@ function scene.sceneInit() skip=0--Skip time locked=SETTING.appLock cmdLaunchKey=0 + if not locked then light[6*3],light[26*3]=true,true end kb.setKeyRepeat(false) end function scene.sceneBack() @@ -214,13 +222,8 @@ function scene.keyDown(key) skip=999 elseif key=="r"then cmdLaunchKey=cmdLaunchKey+1 - elseif locked and("12345679"):match(key,nil,false)then - key=tonumber(key) - light[3*key]=not light[3*key] - if light[6]and light[18]then - locked=false - skip=0 - end + elseif locked and key:byte()>=97 and key:byte()<=122 then + switchLight(key:byte()-96) else skip=skip+1 end @@ -229,10 +232,7 @@ function scene.mouseDown(x,y) if locked then for i=1,27 do if(x-light[3*i-2])^2+(y-light[3*i-1])^2<=626 then - light[3*i]=not light[3*i] - if light[6]and light[18]then - locked=false - end + switchLight(i) return end end