diff --git a/Zframework/languages.lua b/Zframework/languages.lua index 6f9c0241..4a64f800 100644 --- a/Zframework/languages.lua +++ b/Zframework/languages.lua @@ -192,7 +192,7 @@ local langList={ down="↓", back="返回", }, - custom_norm={ + custom_basic={ drop="下落延迟",lock="锁定延迟",wait="出块等待",fall="消行延迟", next="Next",hold="Hold",oncehold="Hold一次", block="方块可见", @@ -223,8 +223,8 @@ local langList={ opponent="对手", life="命数", pushSpeed="上涨速度", - - norm="←基本规则", + + basic="←基本规则", sequence="序列设置(Tab)→", back="返回", }, @@ -276,7 +276,7 @@ local langList={ mission="强制任务", draw="←初始场地", - norm="基础设置(tab)→", + basic="基础设置(tab)→", back="返回", }, play={ @@ -714,7 +714,7 @@ local langList={ down="↓", back="返回", }, - custom_norm={ + custom_basic={ drop="下落延迟",lock="锁定延迟",wait="出块等待",fall="消行延迟", next="预览",hold="暂存",oncehold="暂存一次", block="方块可见", @@ -745,8 +745,8 @@ local langList={ opponent="对手", life="命数", pushSpeed="上涨速度", - - norm="←基本规则", + + basic="←基本规则", sequence="序列设置(Tab)→", back="返回", }, @@ -798,7 +798,7 @@ local langList={ mission="强制任务", draw="←初始场地", - norm="基础设置(tab)→", + basic="基础设置(tab)→", back="返回", }, play={ @@ -1226,7 +1226,7 @@ local langList={ down="↓", back="Back", }, - custom_norm={ + custom_basic={ drop="Drop Speed",lock="Lock Delay",wait="Entry Delay",fall="Line Delay", next="Next",hold="Hold",oncehold="Hold Once", block="Draw Block", @@ -1258,7 +1258,7 @@ local langList={ life="Life", pushSpeed="Garbage Speed", - norm="←Basic", + basic="←Basic", sequence="SEQ. (Tab)→", back="Back", }, @@ -1310,7 +1310,7 @@ local langList={ mission="Force mission", draw="←Field", - norm="Basic (tab)→", + basic="Basic (tab)→", back="Back", }, play={ @@ -1738,7 +1738,7 @@ local langList={ down="↓", back="X", }, - custom_norm={ + custom_basic={ drop="↓",lock="↓_",wait="→=",fall="↓=", next="→",hold="[ ]",oncehold="[ ]*1", block="==↓==", @@ -1770,7 +1770,7 @@ local langList={ life="", pushSpeed="_↑_↑_", - norm="←Basic", + basic="←Basic", sequence="Seq (Tab)→", back="X", }, @@ -1822,7 +1822,7 @@ local langList={ mission="Force mission", draw="←Field", - norm="Basic (tab)→", + basic="Basic (tab)→", back="X", }, play={ @@ -2260,7 +2260,7 @@ local langList={ down="↓", back="返回", }, - custom_norm={ + custom_basic={ drop="下落延迟",lock="锁定延迟",wait="出块等待",fall="消行延迟", next="Next",hold="Hold",oncehold="Hold一次", block="方块可见", @@ -2292,7 +2292,7 @@ local langList={ life="命数", pushSpeed="上涨速度", - norm="←基本规则", + basic="←基本规则", sequence="序列设置(Tab)→", back="返回", }, @@ -2344,7 +2344,7 @@ local langList={ mission="强制任务", draw="←初始场地", - norm="基础设置(tab)→", + basic="基础设置(tab)→", back="返回", }, play={ @@ -2446,7 +2446,7 @@ local langList={ b9= "功能键:", b10="重新开始:",b11="左瞬移:", b12="右瞬移:", b13="软降到底:",b14="软降一格:",b15="软降四格:", b16="软降十格:", b17="落在最左:",b18="落在最右:",b19="列在最左:", b20="列在最右:", - norm="标准", + basic="标准", pro="专业", hide="显示虚拟按键", track="按键自动跟踪", diff --git a/Zframework/widgetList.lua b/Zframework/widgetList.lua index d72c1e54..8eb9925c 100644 --- a/Zframework/widgetList.lua +++ b/Zframework/widgetList.lua @@ -161,7 +161,7 @@ local Widgets={ newButton({name="down", x=200, y=530, w=120, color="white", font=55,code=pressKey("down"),hide=function()return sceneTemp==BGM.len end}), newButton({name="back", x=1140, y=640, w=170,h=80, color="white", font=40,code=BACK}), }, - custom_norm={ + custom_basic={ --Basic newSelector({name="drop", x=250, y=150,w=260,color="orange", list=CUSlist.drop, disp=CUSval("drop"), code=CUSsto("drop")}), newSelector({name="lock", x=250, y=230,w=260,color="red", list=CUSlist.lock, disp=CUSval("lock"), code=CUSsto("lock")}), @@ -181,12 +181,12 @@ local Widgets={ newSwitch({name="nextPos", x=1190, y=300, font=30, disp=CUSval("nextPos"), code=CUSrev("nextPos")}), newSwitch({name="bone", x=1190, y=370, font=30, disp=CUSval("bone"), code=CUSrev("bone")}), - --Else + --Else newSelector({name="bg", x=1140, y=460, w=220,color="yellow", list=CUSlist.bg, disp=CUSval("bg"), code=function(i)customEnv.bg=i BG.set(i)end}), newSelector({name="bgm", x=1140, y=540, w=220,color="yellow", list=CUSlist.bgm, disp=CUSval("bgm"), code=function(i)customEnv.bgm=i BGM.play(i)end}), - newButton({name="mission", x=900, y=60, w=220,h=80, color="lBlue", font=30,code=swapScene("custom_mission","swipeR")}), - newButton({name="rule", x=1140, y=60, w=220,h=80, color="lBlue", font=30,code=swapScene("custom_rule","swipeL")}), + newButton({name="mission", x=900, y=60, w=220,h=80, color="lBlue", font=25,code=swapScene("custom_mission","swipeR")}), + newButton({name="rule", x=1140, y=60, w=220,h=80, color="lBlue", font=25,code=swapScene("custom_rule","swipeL")}), newButton({name="back", x=1140, y=640, w=170,h=80, color="white", font=40,code=BACK}), }, custom_rule={ @@ -205,8 +205,8 @@ local Widgets={ newSelector({name="life", x=1100, y=260,w=260,color="red", list=CUSlist.life, disp=CUSval("life"), code=CUSsto("life")}), newSelector({name="pushSpeed", x=1100, y=360,w=260,color="red", list=CUSlist.pushSpeed, disp=CUSval("pushSpeed"),code=CUSsto("pushSpeed")}), - newButton({name="norm", x=900, y=60, w=220,h=80, color="lBlue", font=30,code=swapScene("custom_norm","swipeR")}), - newButton({name="sequence", x=1140, y=60, w=220,h=80, color="lBlue", font=30,code=swapScene("custom_seq","swipeL")}), + newButton({name="basic", x=900, y=60, w=220,h=80, color="lBlue", font=25,code=swapScene("custom_basic","swipeR")}), + newButton({name="sequence", x=1140, y=60, w=220,h=80, color="lBlue", font=25,code=swapScene("custom_seq","swipeL")}), newButton({name="back", x=1140, y=640, w=170,h=80, color="white", font=40,code=BACK}), }, custom_seq={ @@ -246,8 +246,8 @@ local Widgets={ newButton({name="paste", x=1140, y=540, w=170,h=80, color="lBlue", font=40,code=pressKey("cV")}), newSelector({name="sequence",x=670, y=60, w=200,color="yellow",list=CUSlist.sequence,disp=CUSval("sequence"),code=CUSsto("sequence")}), - newButton({name="rule", x=900, y=60, w=220,h=80, color="lBlue", font=30,code=swapScene("custom_rule","swipeR")}), - newButton({name="draw", x=1140, y=60, w=220,h=80, color="lBlue", font=30,code=swapScene("custom_draw","swipeL")}), + newButton({name="rule", x=900, y=60, w=220,h=80, color="lBlue", font=25,code=swapScene("custom_rule","swipeR")}), + newButton({name="draw", x=1140, y=60, w=220,h=80, color="lBlue", font=25,code=swapScene("custom_draw","swipeL")}), newButton({name="back", x=1140, y=640, w=170,h=80, color="white", font=40,code=BACK}), }, custom_draw={ @@ -279,8 +279,8 @@ local Widgets={ newButton({name="delLine", x=1200, y=520, w=120, color="lYellow",font=20,code=pressKey("l")}), newSwitch({name="demo", x=755, y=640, font=30,disp=function()return sceneTemp.demo end,code=function()sceneTemp.demo=not sceneTemp.demo end}), - newButton({name="sequence", x=900, y=60, w=220,h=80, color="lBlue", font=30,code=swapScene("custom_seq","swipeR")}), - newButton({name="mission", x=1140, y=60, w=220,h=80, color="lBlue", font=30,code=swapScene("custom_mission","swipeL")}), + newButton({name="sequence", x=900, y=60, w=220,h=80, color="lBlue", font=25,code=swapScene("custom_seq","swipeR")}), + newButton({name="mission", x=1140, y=60, w=220,h=80, color="lBlue", font=25,code=swapScene("custom_mission","swipeL")}), newButton({name="back", x=1140, y=640, w=170,h=80, color="white", font=40,code=BACK}), }, custom_mission={ @@ -330,8 +330,8 @@ local Widgets={ newButton({name="paste", x=1140, y=540, w=170,h=80, color="lBlue", font=40,code=pressKey("cV")}), newSwitch({name="mission", x=1150, y=350, font=30, disp=CUSval("missionKill"), code=CUSrev("missionKill")}), - newButton({name="draw", x=900, y=60, w=220,h=80, color="lBlue", font=30,code=swapScene("custom_draw","swipeR")}), - newButton({name="norm", x=1140, y=60, w=220,h=80, color="lBlue", font=30,code=swapScene("custom_norm","swipeL")}), + newButton({name="draw", x=900, y=60, w=220,h=80, color="lBlue", font=25,code=swapScene("custom_draw","swipeR")}), + newButton({name="basic", x=1140, y=60, w=220,h=80, color="lBlue", font=25,code=swapScene("custom_basic","swipeL")}), newButton({name="back", x=1140, y=640, w=170,h=80, color="white", font=40,code=BACK}), }, play={ diff --git a/parts/scenes.lua b/parts/scenes.lua index 9169a107..98786ea8 100644 --- a/parts/scenes.lua +++ b/parts/scenes.lua @@ -1004,7 +1004,7 @@ do--mode end elseif mapCam.sel=="custom_clear" or mapCam.sel=="custom_puzzle" then if key=="e"then - SCN.go("custom_norm") + SCN.go("custom_basic") end end end @@ -1219,14 +1219,14 @@ do--mode end end end -do--custom_norm - function sceneInit.custom_norm() +do--custom_basic + function sceneInit.custom_basic() destroyPlayers() BG.set(customEnv.bg) BGM.play(customEnv.bgm) end - function keyDown.custom_norm(key) + function keyDown.custom_basic(key) if key=="tab"then if kb.isDown("lshift","rshift")then SCN.swapTo("custom_mission","swipeR") @@ -1240,7 +1240,7 @@ do--custom_norm end end - function Pnt.custom_norm() + function Pnt.custom_basic() gc.setColor(1,1,1) gc.draw(drawableText.custom,20,5) gc.setColor(.7,.7,.7) @@ -1255,7 +1255,7 @@ do--custom_rule function keyDown.custom_rule(key) if key=="tab"then if kb.isDown("lshift","rshift")then - SCN.swapTo("custom_norm","swipeR") + SCN.swapTo("custom_basic","swipeR") else SCN.swapTo("custom_seq","swipeL") end @@ -1638,7 +1638,7 @@ do--custom_mission if kb.isDown("lshift","rshift")then SCN.swapTo("custom_draw","swipeR") else - SCN.swapTo("custom_norm","swipeL") + SCN.swapTo("custom_basic","swipeL") end elseif key=="escape"then SCN.back()