SweetSea/Techmino
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

计算器地位改为小游戏，软件锁功能取消，未来准备与加载动画合并

Browse Source
This commit is contained in:
MrZ626
2021-03-07 15:19:04 +08:00
parent 7509420d72
commit c68df20847
13 changed files with 30 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Zframework/init.lua
View File

@@ -464,7 +464,7 @@ function love.run()
love.resize(gc.getWidth(),gc.getHeight())
--Scene Launch
SCN.init(SETTING.appLock and"calculator"or"load")
SCN.init("load")
return function()
local _

2
parts/language/dict_en.lua
View File

@@ -768,7 +768,7 @@ return{
{"Minigame",
"minigame",
"other",
"Type the following codes in the search bar of this dictionary for some fun minigames!\n\n15-Puzzle: 15p; Schulte Grid: grid\nPong: pong; AtoZ: atoz; 2048: 2048\nCubefield: cube; Just get ten: ten\nUltimate Tic-tac-toe: uttt\nTapping speed test: tap\nDon't touch white: dtw\nCannon: can; Dropper: drp",
"Type the following codes in the search bar of this dictionary for some fun minigames!\n\n15-Puzzle: 15p; Schulte Grid: grid\nPong: pong; AtoZ: atoz; 2048: 2048\nCubefield: cube; Just get ten: ten\nUltimate Tic-tac-toe: uttt\nTapping speed test: tap\nDon't touch white: dtw\nCannon: can; Dropper: drp\nCalculater: calc",
},
--English

2
parts/language/dict_zh.lua
View File

@@ -775,7 +775,7 @@ return{
{"小游戏",
"小游戏 minigame xiaoyouxi",
"other",
"输入以下词语，小游戏免费玩!\n\n15-Puzzle: 15p; Schulte Grid: grid\nPong: pong; AtoZ: atoz; 2048: 2048\nCubefield: cube; Just get ten: ten\nUltimate Tic-tac-toe: uttt\nTapping speed test: tap\nDon't touch white: dtw\nCannon: can; Dropper: drp",
"输入以下词语，小游戏免费玩!\n\n15-Puzzle: 15p; Schulte Grid: grid\nPong: pong; AtoZ: atoz; 2048: 2048\nCubefield: cube; Just get ten: ten\nUltimate Tic-tac-toe: uttt\nTapping speed test: tap\nDon't touch white: dtw\nCannon: can; Dropper: drp\nCalculater: calc",
},
--英文

3
parts/language/lang_en.lua
View File

@@ -275,9 +275,8 @@ return{
autoPause="Pause when focus is lost",
swap="Key Combination (Change Atk. Mode)",
fine="Finesse Error Sound",
appLock="App Lock (Password: 626)",
appLock="App Lock (Password: 2+6)",
simpMode="Simple mode",
calc="App Lock",
},
setting_video={
title="Video Settings",

4
parts/language/lang_fr.lua
View File

@@ -251,8 +251,8 @@ 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 : 626)",
calc="Verrouillage d'appli",
appLock="Verrouillage d'appli (MDP : 2+6)",
-- simpMode="Simple mode",
},
setting_video={
title="Paramètres vidéo",

3
parts/language/lang_pt.lua
View File

@@ -275,9 +275,8 @@ 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: 626)",
appLock="App Lock (Senha: 2+6)",
-- simpMode="Simple mode",
calc="App Lock",
},
setting_video={
title="Config. de vídeo",

3
parts/language/lang_sp.lua
View File

@@ -255,9 +255,8 @@ 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: 626)",
appLock="Bloqueo de App (Contraseña: 2+6)",
-- simpMode="Simple mode",
calc="Bloqueo de App",
},
setting_video={
title="Ajustes de Video",

5
parts/language/lang_symbol.lua
View File

@@ -135,9 +135,8 @@ return{
autoPause="A||",
swap="=+=+=",
fine="12 X 21",
appLock="?XX(=626)",
-- simpMode="_",
calc="?XX",
appLock="?XX(=2+6)",
simpMode=".",
},
setting_video={
title="{~~}",

1
parts/language/lang_yygq.lua
View File

@@ -70,7 +70,6 @@ return{
ctrl="改控制",
key="改键位",
touch="改触屏",
calc="家长锁",
},
setting_video={
title="改画面",

3
parts/language/lang_zh.lua
View File

@@ -276,9 +276,8 @@ return{
autoPause="失去焦点自动暂停",
swap="组合键切换攻击模式",
fine="极简操作提示音",
appLock="软件锁(密码626)",
appLock="软件锁(密码2+6)",
simpMode="简洁模式",
calc="软件锁",
},
setting_video={
title="画面设置",

1
parts/scenes/dict.lua
View File

@@ -56,6 +56,7 @@ local eggInput={
dtw=goScene"mg_dtw",
can=goScene"mg_cannon",
drp=goScene"mg_dropper",
calc=goScene"mg_calc",
flag=function()
BG.setDefault("none")
BGM.setDefault(false)

43
parts/scenes/calculator.lua → parts/scenes/mg_calc.lua
View File

@@ -6,16 +6,14 @@ local find,sub,byte=string.find,string.sub,string.byte
local scene={}
local reg--register
local val--value
local val--result value
local sym--symbol
local pass--if password correct
function scene.sceneInit()
BG.set("none")
reg=false
val="0"
sym=false
pass=false
end
scene.mouseDown=NULL
@@ -74,14 +72,11 @@ function scene.keyDown(k)
sym="="
reg=false
local v=tonumber(val)
if v==600+26 then pass=true
elseif v==190000+6022 then
pass=true
if v==190000+6022 then
_G["\100\114\97\119\70\87\77"]=NULL
LOG.print("\68\69\86\58\87\97\116\101\114\109\97\114\107\32\82\101\109\111\118\101\100","message")
SFX.play("clear")
elseif v==7294e4+3816 then
pass=true
for name,M in next,MODES do
if type(name)=="string"and not RANKS[name]and M.x then
RANKS[name]=M.score and 0 or 6
@@ -98,23 +93,21 @@ function scene.keyDown(k)
elseif v==654321 then
love._setGammaCorrect(not gc.isGammaCorrect())
LOG.print("GammaCorrect: "..(gc.isGammaCorrect()and"on"or"off"),"warn")
elseif v==114514 or v==1919810 or v==1145141919810 then
error()
elseif v==200 then
loadGame("marathon_bfmax",true)
elseif v==670 then
SCR.print()
end
elseif k=="escape"then
val,reg,sym="0"
if val~="0"then
val,reg,sym="0"
else
scene.keyDown("quit")
end
elseif k=="delete"then
val="0"
elseif k=="space"and pass then
if LOADED then
SCN.back()
else
SCN.swapTo("load","swipeD")
end
elseif k=="quit"then
SCN.back()
end
end
@@ -139,15 +132,15 @@ scene.widgetList={
WIDGET.newKey{name="_8",x=250,y=500,w=90,fText="8",font=50,code=pressKey"8"},
WIDGET.newKey{name="_9",x=350,y=500,w=90,fText="9",font=50,code=pressKey"9"},
WIDGET.newKey{name="_0",x=150,y=600,w=90,fText="0",font=50,code=pressKey"0"},
WIDGET.newKey{name=".", x=250,y=600,w=90,fText=".",color="lPurple", font=50,code=pressKey"."},
WIDGET.newKey{name="e", x=350,y=600,w=90,fText="e",color="lPurple", font=50,code=pressKey"e"},
WIDGET.newKey{name="+", x=450,y=300,w=90,fText="+",color="lBlue", font=50,code=pressKey"+"},
WIDGET.newKey{name="-", x=450,y=400,w=90,fText="-",color="lBlue", font=50,code=pressKey"-"},
WIDGET.newKey{name="*", x=450,y=500,w=90,fText="*",color="lBlue", font=50,code=pressKey"*"},
WIDGET.newKey{name="/", x=450,y=600,w=90,fText="/",color="lBlue", font=50,code=pressKey"/"},
WIDGET.newKey{name="<", x=550,y=300,w=90,fText="<",color="lRed", font=50,code=pressKey"backspace"},
WIDGET.newKey{name="=", x=550,y=400,w=90,fText="=",color="lYellow",font=50,code=pressKey"return"},
WIDGET.newButton{name="play",x=640,y=600,w=180,h=90,fText="-->",color="lGreen",font=40,code=pressKey"space",hide=function()return not pass end},
WIDGET.newKey{name=".", x=250,y=600,w=90,fText=".",color="lM",font=50,code=pressKey"."},
WIDGET.newKey{name="e", x=350,y=600,w=90,fText="e",color="lM",font=50,code=pressKey"e"},
WIDGET.newKey{name="+", x=450,y=300,w=90,fText="+",color="lB",font=50,code=pressKey"+"},
WIDGET.newKey{name="-", x=450,y=400,w=90,fText="-",color="lB",font=50,code=pressKey"-"},
WIDGET.newKey{name="*", x=450,y=500,w=90,fText="*",color="lB",font=50,code=pressKey"*"},
WIDGET.newKey{name="/", x=450,y=600,w=90,fText="/",color="lB",font=50,code=pressKey"/"},
WIDGET.newKey{name="<", x=550,y=300,w=90,fText="<",color="lR",font=50,code=pressKey"backspace"},
WIDGET.newKey{name="=", x=550,y=400,w=90,fText="=",color="lY",font=50,code=pressKey"return"},
WIDGET.newKey{name="back",x=1140,y=640,w=170,h=80,font=40,code=pressKey"quit"},
}
return scene

1
parts/scenes/setting_game.lua
View File

@@ -44,7 +44,6 @@ scene.widgetList={
end
end
end},
WIDGET.newButton{name="calc", x=1195, y=490, w=150,h=60,color="dGrey", font=25,code=goScene"calculator",hide=function()return not SETTING.appLock end},
WIDGET.newButton{name="back", x=1140, y=640, w=170,h=80, font=40,code=backScene},
}