From 941b875afa0990e8c4a79ae951f1a1e116d3d134 Mon Sep 17 00:00:00 2001 From: MrZ626 <1046101471@qq.com> Date: Tue, 7 Dec 2021 01:05:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=86=8D=E5=BE=AE=E8=B0=83=E8=AF=AD=E8=A8=80?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E7=95=8C=E9=9D=A2=20=E6=95=B4=E7=90=86?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- parts/language/lang_en.lua | 2 +- parts/scenes/about.lua | 2 +- parts/scenes/account.lua | 2 +- parts/scenes/app_15p.lua | 2 +- parts/scenes/app_2048.lua | 2 +- parts/scenes/app_AtoZ.lua | 2 +- parts/scenes/app_UTTT.lua | 2 +- parts/scenes/app_calc.lua | 2 +- parts/scenes/app_cannon.lua | 2 +- parts/scenes/app_cubefield.lua | 2 +- parts/scenes/app_dropper.lua | 2 +- parts/scenes/app_dtw.lua | 2 +- parts/scenes/app_piano.lua | 2 +- parts/scenes/app_polyforge.lua | 2 +- parts/scenes/app_schulteG.lua | 2 +- parts/scenes/app_spin.lua | 2 +- parts/scenes/app_tap.lua | 2 +- parts/scenes/app_ten.lua | 2 +- parts/scenes/app_triple.lua | 2 +- parts/scenes/customGame.lua | 2 +- parts/scenes/custom_field.lua | 2 +- parts/scenes/custom_mission.lua | 2 +- parts/scenes/custom_sequence.lua | 2 +- parts/scenes/dict.lua | 2 +- parts/scenes/history.lua | 2 +- parts/scenes/lang.lua | 24 ++++++++++++------------ parts/scenes/launchpad.lua | 2 +- parts/scenes/legals.lua | 2 +- parts/scenes/login.lua | 2 +- parts/scenes/manual.lua | 2 +- parts/scenes/mod.lua | 2 +- parts/scenes/mode.lua | 2 +- parts/scenes/music.lua | 2 +- parts/scenes/net_league.lua | 2 +- parts/scenes/net_menu.lua | 2 +- parts/scenes/net_newRoom.lua | 2 +- parts/scenes/net_rooms.lua | 2 +- parts/scenes/register.lua | 2 +- parts/scenes/replays.lua | 2 +- parts/scenes/savedata.lua | 2 +- parts/scenes/setting_control.lua | 2 +- parts/scenes/setting_game.lua | 2 +- parts/scenes/setting_key.lua | 2 +- parts/scenes/setting_skin.lua | 2 +- parts/scenes/setting_sound.lua | 2 +- parts/scenes/setting_touch.lua | 2 +- parts/scenes/setting_touchSwitch.lua | 2 +- parts/scenes/setting_video.lua | 2 +- parts/scenes/staff.lua | 2 +- parts/scenes/stat.lua | 2 +- 50 files changed, 61 insertions(+), 61 deletions(-) diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua index 17477aec..6d3c55fd 100644 --- a/parts/language/lang_en.lua +++ b/parts/language/lang_en.lua @@ -339,7 +339,7 @@ return{ title="Game Settings", graphic="←Video", sound="Audio→", - -- style="Style", + style="Style", ctrl="Control Settings", key="Key Mappings", diff --git a/parts/scenes/about.lua b/parts/scenes/about.lua index 3adb13b7..8b02b48c 100644 --- a/parts/scenes/about.lua +++ b/parts/scenes/about.lua @@ -59,7 +59,7 @@ scene.widgetList={ WIDGET.newButton{name='staff', x=1140,y=380,w=220,h=80,font=35,code=goScene'staff'}, WIDGET.newButton{name='his', x=1140,y=480,w=220,h=80,font=35,code=goScene'history'}, WIDGET.newButton{name='legals', x=1140,y=580,w=220,h=80,font=35,code=goScene'legals'}, - WIDGET.newButton{name='back', x=640, y=600,w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back', x=640, y=600,w=170,h=80,sound='back',font=60,fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/account.lua b/parts/scenes/account.lua index cc74b10f..0edd24e3 100644 --- a/parts/scenes/account.lua +++ b/parts/scenes/account.lua @@ -8,7 +8,7 @@ end scene.widgetList={ WIDGET.newText{name='title',x=80,y=50,font=70,align='L'}, - WIDGET.newButton{name='back',x=1140,y=640,w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back',x=1140,y=640,w=170,h=80,sound='back',font=60,fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/app_15p.lua b/parts/scenes/app_15p.lua index 687e7d55..b564681b 100644 --- a/parts/scenes/app_15p.lua +++ b/parts/scenes/app_15p.lua @@ -315,7 +315,7 @@ scene.widgetList={ WIDGET.newSwitch{name='slide', x=240, y=420,lim=200,font=40,disp=function()return slide end, code=pressKey'e',hideF=ifGaming}, WIDGET.newSwitch{name='pathVis',x=240, y=510,lim=200,font=40,disp=function()return pathVis end,code=pressKey'r',hideF=function()return state==1 or not slide end}, WIDGET.newSwitch{name='revKB', x=240, y=600,lim=200,font=40,disp=function()return revKB end, code=pressKey't',hideF=ifGaming}, - WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,sound='back',font=60,fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/app_2048.lua b/parts/scenes/app_2048.lua index 7691f5fb..a086d76d 100644 --- a/parts/scenes/app_2048.lua +++ b/parts/scenes/app_2048.lua @@ -493,7 +493,7 @@ scene.widgetList={ WIDGET.newKey{name='record2', x=1100,y=450,w=220,h=50,fText="", color='H',code=pressKey'2', hideF=function()return state==2 end}, WIDGET.newKey{name='replay1', x=1245,y=390,w=50,fText="!", color='G',code=pressKey'c1', hideF=function()return state==2 or #repeater.seq[1]==0 end}, WIDGET.newKey{name='replay2', x=1245,y=450,w=50,fText="!", color='G',code=pressKey'c2', hideF=function()return state==2 or #repeater.seq[2]==0 end}, - WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,sound='back',font=60,fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/app_AtoZ.lua b/parts/scenes/app_AtoZ.lua index dfe49795..6978a58b 100644 --- a/parts/scenes/app_AtoZ.lua +++ b/parts/scenes/app_AtoZ.lua @@ -119,7 +119,7 @@ scene.widgetList={ WIDGET.newSelector{name='level', x=640,y=640,w=200,list={'A_Z','Z_A','Tech1','Tech2','KeyTest1','KeyTest2','Hello','Roll1','Roll2','Roll3','ZZZ','ZXZX','ZMZM','Stair','Stair2','Stair3','BPW'},disp=function()return levelName end,code=function(i)levelName=i;targetString=levels[i]end,hideF=function()return state>0 end}, WIDGET.newButton{name='reset', x=160,y=100,w=180,h=100,color='lG',font=50,fText=CHAR.icon.retry_spin,code=pressKey'space'}, WIDGET.newButton{name='keyboard',x=160,y=210,w=180,h=100,code=function()love.keyboard.setTextInput(true,0,select(2,SCR.xOy:transformPoint(0,500)),1,1)end,hide=not MOBILE}, - WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,sound='back',font=60,fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/app_UTTT.lua b/parts/scenes/app_UTTT.lua index e8017377..96d863da 100644 --- a/parts/scenes/app_UTTT.lua +++ b/parts/scenes/app_UTTT.lua @@ -232,7 +232,7 @@ end scene.widgetList={ WIDGET.newButton{name='reset',x=1140,y=540,w=170,h=80,font=50,fText=CHAR.icon.retry_spin,color='lG',code=restart}, - WIDGET.newButton{name='back',x=1140,y=640,w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back',x=1140,y=640,w=170,h=80,sound='back',font=60,fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/app_calc.lua b/parts/scenes/app_calc.lua index d9137b40..427d4fdc 100644 --- a/parts/scenes/app_calc.lua +++ b/parts/scenes/app_calc.lua @@ -165,7 +165,7 @@ scene.widgetList={ WIDGET.newKey{name='/',x=445,y=600,w=90,sound=false,fText="/",color='lB',font=50,code=pressKey'/'}, WIDGET.newKey{name='<',x=545,y=300,w=90,sound=false,fText=CHAR.key.backspace,color='lR',font=50,code=pressKey'backspace'}, WIDGET.newKey{name='=',x=545,y=400,w=90,sound=false,fText="=",color='lY',font=50,code=pressKey'return'}, - WIDGET.newKey{name='back',x=1135,y=640,w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, + WIDGET.newKey{name='back',x=1135,y=640,w=170,h=80,sound='back',font=60,fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/app_cannon.lua b/parts/scenes/app_cannon.lua index 406f3f58..86a65ed1 100644 --- a/parts/scenes/app_cannon.lua +++ b/parts/scenes/app_cannon.lua @@ -127,7 +127,7 @@ function scene.draw() end scene.widgetList={ - WIDGET.newButton{name='back',x=1140,y=640,w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back',x=1140,y=640,w=170,h=80,sound='back',font=60,fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/app_cubefield.lua b/parts/scenes/app_cubefield.lua index 651f76ad..711810d4 100644 --- a/parts/scenes/app_cubefield.lua +++ b/parts/scenes/app_cubefield.lua @@ -318,7 +318,7 @@ function scene.draw() end scene.widgetList={ - WIDGET.newKey{name='back',x=1140,y=80,w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, + WIDGET.newKey{name='back',x=1140,y=80,w=170,h=80,sound='back',font=60,fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/app_dropper.lua b/parts/scenes/app_dropper.lua index a67d63a9..fbe0be46 100644 --- a/parts/scenes/app_dropper.lua +++ b/parts/scenes/app_dropper.lua @@ -236,7 +236,7 @@ function scene.draw() end scene.widgetList={ - WIDGET.newButton{name='back',x=1140,y=60,w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back',x=1140,y=60,w=170,h=80,sound='back',font=60,fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/app_dtw.lua b/parts/scenes/app_dtw.lua index eb49595a..1c62735a 100644 --- a/parts/scenes/app_dtw.lua +++ b/parts/scenes/app_dtw.lua @@ -383,7 +383,7 @@ scene.widgetList={ WIDGET.newButton{name='reset',x=155,y=100,w=180,h=100,color='lG',font=50,fText=CHAR.icon.retry_spin,code=pressKey'r'}, modeSelector,bgmSelector,colorSelector, arcadeSwitch, - WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,sound='back',font=60,fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/app_piano.lua b/parts/scenes/app_piano.lua index f36bba2a..008c4808 100644 --- a/parts/scenes/app_piano.lua +++ b/parts/scenes/app_piano.lua @@ -48,6 +48,6 @@ function scene.draw() end scene.widgetList={ - WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,sound='back',font=60,fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/app_polyforge.lua b/parts/scenes/app_polyforge.lua index a0786acb..9e4e0208 100644 --- a/parts/scenes/app_polyforge.lua +++ b/parts/scenes/app_polyforge.lua @@ -165,7 +165,7 @@ function scene.draw() end scene.widgetList={ - WIDGET.newKey{name='back',x=1140,y=60,w=170,h=80,color='D',font=60,sound='back',fText=CHAR.icon.back,code=backScene}, + WIDGET.newKey{name='back',x=1140,y=60,w=170,h=80,color='D',sound='back',font=60,fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/app_schulteG.lua b/parts/scenes/app_schulteG.lua index d50e34cf..4f08d043 100644 --- a/parts/scenes/app_schulteG.lua +++ b/parts/scenes/app_schulteG.lua @@ -175,7 +175,7 @@ scene.widgetList={ WIDGET.newSwitch{name='invis', x=240,y=330,lim=200,font=40,disp=function()return invis end, code=pressKey'q',hideF=function()return state==1 end}, WIDGET.newSwitch{name='disappear',x=240,y=420,lim=200,font=40,disp=function()return disappear end,code=pressKey'w',hideF=function()return state==1 end}, WIDGET.newSwitch{name='tapFX', x=240,y=510,lim=200,font=40,disp=function()return tapFX end, code=pressKey'e',hideF=function()return state==1 end}, - WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,sound='back',font=60,fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/app_spin.lua b/parts/scenes/app_spin.lua index 11ae0c82..e0163632 100644 --- a/parts/scenes/app_spin.lua +++ b/parts/scenes/app_spin.lua @@ -43,6 +43,6 @@ end scene.widgetList={ WIDGET.newButton{name="spin", x=1140,y=360,w=120,font=60,fText=CHAR.icon.retry_spin,code=pressKey'space'}, - WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,sound='back',font=60,fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/app_tap.lua b/parts/scenes/app_tap.lua index 5ae3cff0..9fb374a8 100644 --- a/parts/scenes/app_tap.lua +++ b/parts/scenes/app_tap.lua @@ -72,7 +72,7 @@ end scene.widgetList={ WIDGET.newKey{name='tap',x=640,y=540,w=626,h=260,sound='touch',fText="TAP",color='Z',font=100,code=function(i)love.keypressed('b'..i)end}, - WIDGET.newButton{name='back',x=1140,y=640,w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back',x=1140,y=640,w=170,h=80,sound='back',font=60,fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/app_ten.lua b/parts/scenes/app_ten.lua index d7fbbc85..4bb5eb5c 100644 --- a/parts/scenes/app_ten.lua +++ b/parts/scenes/app_ten.lua @@ -308,7 +308,7 @@ scene.widgetList={ WIDGET.newSwitch{name='next', x=240,y=235,lim=200,font=40,disp=function()return nexts end,code=pressKey'q',hideF=function()return state==1 end}, WIDGET.newSwitch{name='invis',x=240,y=305,lim=200,font=40,disp=function()return invis end,code=pressKey'w',hideF=function()return state==1 end}, WIDGET.newSwitch{name='fast', x=240,y=375,lim=200,font=30,disp=function()return fast end,code=pressKey'e',hideF=function()return state==1 end}, - WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,sound='back',font=60,fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/app_triple.lua b/parts/scenes/app_triple.lua index a7fae68c..cfa5ffc8 100644 --- a/parts/scenes/app_triple.lua +++ b/parts/scenes/app_triple.lua @@ -351,6 +351,6 @@ end scene.widgetList={ WIDGET.newButton{name='reset',x=160,y=100,w=180,h=100,color='lG',font=50,fText=CHAR.icon.retry_spin,code=pressKey'r'}, - WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,sound='back',font=60,fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/customGame.lua b/parts/scenes/customGame.lua index 5f80f91f..3561babe 100644 --- a/parts/scenes/customGame.lua +++ b/parts/scenes/customGame.lua @@ -210,7 +210,7 @@ scene.widgetList={ WIDGET.newButton{name='paste', x=1070,y=380,w=310,h=70,color='lB',font=25,code=pressKey'cV'}, WIDGET.newButton{name='play_clear', x=1070,y=460,w=310,h=70,color='lY',font=35,code=pressKey'play1'}, WIDGET.newButton{name='play_puzzle', x=1070,y=540,w=310,h=70,color='lM',font=35,code=pressKey'play2',hideF=function()return #FIELD[1]==0 end}, - WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=pressKey'escape'}, + WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,sound='back',font=60,fText=CHAR.icon.back,code=pressKey'escape'}, --Rule set WIDGET.newSelector{name='eventSet', x=1050,y=760,w=340,color='H',list=sList.eventSet,disp=CUSval('eventSet'),code=CUSsto('eventSet')}, diff --git a/parts/scenes/custom_field.lua b/parts/scenes/custom_field.lua index ed4cb1e6..db7bd17a 100644 --- a/parts/scenes/custom_field.lua +++ b/parts/scenes/custom_field.lua @@ -481,7 +481,7 @@ scene.widgetList={ WIDGET.newButton{name='prevPg', x=100, y=350,w=160,h=110,color='lG',font=20,code=pressKey'pageup',hideF=function()return page==1 end}, WIDGET.newButton{name='nextPg', x=100, y=470,w=160,h=110,color='lG',font=20,code=pressKey'pagedown',hideF=function()return page==#FIELD end}, - WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,sound='back',font=60,fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/custom_mission.lua b/parts/scenes/custom_mission.lua index 85216905..cbae968e 100644 --- a/parts/scenes/custom_mission.lua +++ b/parts/scenes/custom_mission.lua @@ -224,7 +224,7 @@ scene.widgetList={ WIDGET.newButton{name='paste', x=1140,y=540,w=170,h=80,color='lB',font=50,code=pressKey'cV', fText=CHAR.icon.import}, WIDGET.newSwitch{name='mission',x=1150,y=340,lim=280,disp=CUSval('missionKill'),code=CUSrev('missionKill')}, - WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,sound='back',font=60,fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/custom_sequence.lua b/parts/scenes/custom_sequence.lua index f8cdd2b9..706d3957 100644 --- a/parts/scenes/custom_sequence.lua +++ b/parts/scenes/custom_sequence.lua @@ -220,7 +220,7 @@ scene.widgetList={ WIDGET.newButton{name='copy', x=1140,y=460,w=170,h=80,color='lR',font=50,fText=CHAR.icon.export,code=pressKey'cC',hideF=function()return #BAG==0 end}, WIDGET.newButton{name='paste',x=1140,y=550,w=170,h=80,color='lB',font=50,fText=CHAR.icon.import,code=pressKey'cV'}, - WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,sound='back',font=60,fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/dict.lua b/parts/scenes/dict.lua index d06e0262..38539182 100644 --- a/parts/scenes/dict.lua +++ b/parts/scenes/dict.lua @@ -221,7 +221,7 @@ scene.widgetList={ WIDGET.newKey{name='down', x=1120,y=565,w=80,font=50,fText=CHAR.key.down, code=pressKey'down',hide=not MOBILE}, WIDGET.newKey{name='pageup', x=1210,y=475,w=80,font=50,fText=CHAR.icon.toUp, code=pressKey'pageup',hide=not MOBILE}, WIDGET.newKey{name='pagedown',x=1210,y=565,w=80,font=50,fText=CHAR.icon.toDown,code=pressKey'pagedown',hide=not MOBILE}, - WIDGET.newButton{name='back', x=1165,y=60,w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back', x=1165,y=60,w=170,h=80,sound='back',font=60,fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/history.lua b/parts/scenes/history.lua index 7e07c1e5..777971f3 100644 --- a/parts/scenes/history.lua +++ b/parts/scenes/history.lua @@ -24,7 +24,7 @@ end scene.widgetList={ WIDGET.newTextBox{name='texts',x=30,y=45,w=1000,h=640,font=20,fix=true}, - WIDGET.newButton{name='back',x=1140,y=640,w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back',x=1140,y=640,w=170,h=80,sound='back',font=60,fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/lang.lua b/parts/scenes/lang.lua index 555685ce..0728371d 100644 --- a/parts/scenes/lang.lua +++ b/parts/scenes/lang.lua @@ -50,21 +50,21 @@ local function _setLang(lid) end scene.widgetList={ - WIDGET.newButton{x=271,y=210,w=346,h=100,font=40, fText=langList.en, color='R',code=function()_setLang('en')end}, - WIDGET.newButton{x=271,y=329,w=346,h=100,font=40, fText=langList.fr, color='F',code=function()_setLang('fr')end}, - WIDGET.newButton{x=271,y=449,w=346,h=100,font=35, fText=langList.es, color='O',code=function()_setLang('es')end}, - WIDGET.newButton{x=271,y=568,w=346,h=100,font=40, fText=langList.id, color='Y',code=function()_setLang('id')end}, + WIDGET.newButton{x=271,y=210,w=346,h=100,font=40, fText=langList.en, color='R',sound='click',code=function()_setLang('en')end}, + WIDGET.newButton{x=271,y=329,w=346,h=100,font=40, fText=langList.fr, color='F',sound='click',code=function()_setLang('fr')end}, + WIDGET.newButton{x=271,y=449,w=346,h=100,font=35, fText=langList.es, color='O',sound='click',code=function()_setLang('es')end}, + WIDGET.newButton{x=271,y=568,w=346,h=100,font=40, fText=langList.id, color='Y',sound='click',code=function()_setLang('id')end}, - WIDGET.newButton{x=637,y=210,w=346,h=100,font=40, fText=langList.pt, color='A',code=function()_setLang('pt')end}, - WIDGET.newButton{x=637,y=329,w=346,h=100,font=40, fText=langList.symbol, color='G',code=function()_setLang('symbol')end}, - WIDGET.newButton{x=637,y=449,w=346,h=100,font=40, fText=langList.zh_yygq, color='J',code=function()_setLang('zh_yygq')end}, - WIDGET.newButton{x=637,y=568,w=346,h=100,font=40, fText=langList.zh_grass,color='L',code=function()_setLang('zh_grass')end}, + WIDGET.newButton{x=637,y=210,w=346,h=100,font=40, fText=langList.pt, color='A',sound='click',code=function()_setLang('pt')end}, + WIDGET.newButton{x=637,y=329,w=346,h=100,font=40, fText=langList.symbol, color='G',sound='click',code=function()_setLang('symbol')end}, + WIDGET.newButton{x=637,y=449,w=346,h=100,font=40, fText=langList.zh_yygq, color='J',sound='click',code=function()_setLang('zh_yygq')end}, + WIDGET.newButton{x=637,y=568,w=346,h=100,font=40, fText=langList.zh_grass,color='L',sound='click',code=function()_setLang('zh_grass')end}, - WIDGET.newButton{x=1003,y=210,w=346,h=100,font=40,fText=langList.zh, color='C',code=function()_setLang('zh')end}, - WIDGET.newButton{x=1003,y=329,w=346,h=100,font=40,fText=langList.zh_full, color='N',code=function()_setLang('zh_full')end}, - WIDGET.newButton{x=1003,y=449,w=346,h=100,font=40,fText=langList.zh_trad, color='S',code=function()_setLang('zh_trad')end}, + WIDGET.newButton{x=1003,y=210,w=346,h=100,font=40,fText=langList.zh, color='C',sound='click',code=function()_setLang('zh')end}, + WIDGET.newButton{x=1003,y=329,w=346,h=100,font=40,fText=langList.zh_full, color='N',sound='click',code=function()_setLang('zh_full')end}, + WIDGET.newButton{x=1003,y=449,w=346,h=100,font=40,fText=langList.zh_trad, color='S',sound='click',code=function()_setLang('zh_trad')end}, - WIDGET.newButton{name='back',x=1003,y=568,w=346,h=100,font=60,fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back',x=1003,y=568,w=346,h=100,sound='back',font=60,fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/launchpad.lua b/parts/scenes/launchpad.lua index c0fc6c78..cbcca6c9 100644 --- a/parts/scenes/launchpad.lua +++ b/parts/scenes/launchpad.lua @@ -287,7 +287,7 @@ scene.widgetList={ WIDGET.newSlider{name='voc', x=1000,y=220,lim=130,w=250,disp=SETval('voc'),code=function(v)SETTING.voc=v VOC.setVol(SETTING.voc)end}, WIDGET.newSwitch{name='label',x=1200,y=290,lim=160,disp=function()return showLabel end,code=pressKey'space',}, WIDGET.newButton{name='music',x=1140,y=540,w=170,h=80,font=40,code=pressKey'tab'}, - WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,sound='back',font=60,fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/legals.lua b/parts/scenes/legals.lua index 5d867b41..87f8a42b 100644 --- a/parts/scenes/legals.lua +++ b/parts/scenes/legals.lua @@ -28,7 +28,7 @@ end scene.widgetList={ WIDGET.newTextBox{name='texts',x=30,y=45,w=1000,h=640,font=15,fix=true}, - WIDGET.newButton{name='back',x=1140,y=640,w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back',x=1140,y=640,w=170,h=80,sound='back',font=60,fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/login.lua b/parts/scenes/login.lua index ea4d10a4..cad2c514 100644 --- a/parts/scenes/login.lua +++ b/parts/scenes/login.lua @@ -37,7 +37,7 @@ scene.widgetList={ passwordBox, WIDGET.newSwitch{name='keepPW', x=900, y=420,disp=function()return savePW end,code=function()savePW=not savePW end}, WIDGET.newKey{name='login', x=1140,y=540,w=170,h=80,font=40,code=_login}, - WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,sound='back',font=60,fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/manual.lua b/parts/scenes/manual.lua index 9bb88665..fe005ee1 100644 --- a/parts/scenes/manual.lua +++ b/parts/scenes/manual.lua @@ -30,7 +30,7 @@ end scene.widgetList={ WIDGET.newTextBox{name='texts',x=30,y=45,w=1000,h=640,font=15,fix=true}, - WIDGET.newButton{name='back',x=1140,y=640,w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back',x=1140,y=640,w=170,h=80,sound='back',font=60,fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/mod.lua b/parts/scenes/mod.lua index a3dc3f77..4401e64e 100644 --- a/parts/scenes/mod.lua +++ b/parts/scenes/mod.lua @@ -158,7 +158,7 @@ scene.widgetList={ WIDGET.newText{name='title', x=80,y=50,font=70,align='L'}, WIDGET.newText{name='unranked',x=1200,y=60,color='Y',font=50,align='R'}, WIDGET.newButton{name='reset', x=1140,y=540,w=170,h=80,font=25,code=pressKey'tab'}, - WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,sound='back',font=60,fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/mode.lua b/parts/scenes/mode.lua index 75d2d925..ca9a7913 100644 --- a/parts/scenes/mode.lua +++ b/parts/scenes/mode.lua @@ -331,7 +331,7 @@ end scene.widgetList={ WIDGET.newKey{name='mod', x=140,y=655,w=220,h=80,font=35,code=goScene'mod'}, WIDGET.newButton{name='start',x=1040,y=655,w=180,h=80,font=40,code=pressKey'return',hideF=function()return not mapCam.sel end}, - WIDGET.newButton{name='back', x=1200,y=655,w=120,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back', x=1200,y=655,w=120,h=80,sound='back',font=60,fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/music.lua b/parts/scenes/music.lua index 5d8ad0fa..064dddf1 100644 --- a/parts/scenes/music.lua +++ b/parts/scenes/music.lua @@ -128,7 +128,7 @@ scene.widgetList={ WIDGET.newButton{name='play', x=200,y=390,w=120,code=pressKey'space',sound=false,font=65,fText=CHAR.icon.play_pause}, WIDGET.newButton{name='down', x=200,y=530,w=120,code=pressKey'down',hideF=function()return selected==#bgmList end,font=60,fText=CHAR.key.down}, WIDGET.newButton{name='sound',x=1140,y=540,w=170,h=80,font=40,code=pressKey'tab'}, - WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,sound='back',font=60,fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/net_league.lua b/parts/scenes/net_league.lua index e4199420..23adaa7e 100644 --- a/parts/scenes/net_league.lua +++ b/parts/scenes/net_league.lua @@ -17,7 +17,7 @@ end scene.widgetList={ WIDGET.newKey{name='setting',x=1200,y=160,w=90,h=90,font=60,fText=CHAR.icon.settings,code=goScene'setting_game'}, WIDGET.newKey{name='match',x=640,y=500,w=760,h=140,font=60,code=function()MES.new('warn',text.notFinished)end}, - WIDGET.newButton{name='back',x=1140,y=640,w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back',x=1140,y=640,w=170,h=80,sound='back',font=60,fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/net_menu.lua b/parts/scenes/net_menu.lua index c80cee6e..b0b2b40d 100644 --- a/parts/scenes/net_menu.lua +++ b/parts/scenes/net_menu.lua @@ -30,7 +30,7 @@ scene.widgetList={ end end end}, - WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,sound='back',font=60,fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/net_newRoom.lua b/parts/scenes/net_newRoom.lua index 2697c303..69160f77 100644 --- a/parts/scenes/net_newRoom.lua +++ b/parts/scenes/net_newRoom.lua @@ -86,7 +86,7 @@ scene.widgetList={ --Capacity & Create & Back WIDGET.newSelector{name='capacity', x=1070,y=330,w=310,color='lY',list={2,3,4,5,7,10,17,31,49,99},disp=ROOMval('capacity'),code=ROOMsto('capacity')}, WIDGET.newButton{name='create', x=1070,y=480,w=310,h=140,color='lN',font=40,code=_createRoom}, - WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,sound='back',font=60,fText=CHAR.icon.back,code=backScene}, --Special rules WIDGET.newSwitch{name='ospin', x=850, y=850, lim=210,disp=ROOMval('ospin'), code=ROOMrev('ospin')}, diff --git a/parts/scenes/net_rooms.lua b/parts/scenes/net_rooms.lua index 0002e4ec..5b0beb4d 100644 --- a/parts/scenes/net_rooms.lua +++ b/parts/scenes/net_rooms.lua @@ -140,7 +140,7 @@ scene.widgetList={ WIDGET.newKey{name='refresh', x=250,y=630,w=140,h=120,code=_fetchRoom,hideF=function()return fetchTimer>7 end}, WIDGET.newKey{name='new', x=510,y=630,w=260,h=120,code=goScene'net_newRoom'}, WIDGET.newKey{name='join', x=780,y=630,w=140,h=120,code=pressKey'join',hideF=function()return roomList:getLen()==0 or NET.getlock('enterRoom')end}, - WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=pressKey'escape'}, + WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,sound='back',font=60,fText=CHAR.icon.back,code=pressKey'escape'}, } return scene diff --git a/parts/scenes/register.lua b/parts/scenes/register.lua index 934484ae..4a3aed47 100644 --- a/parts/scenes/register.lua +++ b/parts/scenes/register.lua @@ -28,7 +28,7 @@ scene.widgetList={ WIDGET.newKey{name='register', x=640, y=640,w=300,h=80,font=40,code=_register,hideF=function()return NET.getlock('register')end}, WIDGET.newText{name='registering', x=640, y=605,font=50,hideF=function()return not NET.getlock('register')end}, - WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,sound='back',font=60,fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/replays.lua b/parts/scenes/replays.lua index 4845b350..a56d5c93 100644 --- a/parts/scenes/replays.lua +++ b/parts/scenes/replays.lua @@ -143,7 +143,7 @@ scene.widgetList={ WIDGET.newButton{name='import',x=350,y=640,w=140,h=80,color='lN',code=pressKey'cV',font=50,fText=CHAR.icon.import}, WIDGET.newButton{name='play', x=700,y=640,w=170,h=80,color='lY',code=pressKey'return',font=65,fText=CHAR.icon.play}, WIDGET.newButton{name='delete',x=850,y=640,w=80,h=80,color='lR',code=pressKey'delete',font=50,fText=CHAR.icon.trash}, - WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,sound='back',font=60,fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/savedata.lua b/parts/scenes/savedata.lua index 752d907b..e49ca047 100644 --- a/parts/scenes/savedata.lua +++ b/parts/scenes/savedata.lua @@ -82,7 +82,7 @@ scene.widgetList={ WIDGET.newText{name='notLogin', x=55,y=550,color='dB',align='L',font=30,hideF=function()return WS.status('user')=='running'end}, WIDGET.newButton{name='upload', x=190,y=610,w=280,h=90,color='lB',font=25,code=NET.uploadSave,hideF=function()return WS.status('user')~='running'end}, WIDGET.newButton{name='download', x=490,y=610,w=280,h=90,color='lB',font=25,code=NET.downloadSave,hideF=function()return WS.status('user')~='running'end}, - WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,sound='back',font=60,fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/setting_control.lua b/parts/scenes/setting_control.lua index 0c3a74b9..ff0f33cc 100644 --- a/parts/scenes/setting_control.lua +++ b/parts/scenes/setting_control.lua @@ -105,7 +105,7 @@ scene.widgetList={ _.sddas,_.sdarr=0,2 _.ihs,_.irs,_.ims=false,false,false end}, - WIDGET.newButton{name='back', x=1140, y=640,w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back', x=1140, y=640,w=170,h=80,sound='back',font=60,fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/setting_game.lua b/parts/scenes/setting_game.lua index f6cbd34a..00ca8a5d 100644 --- a/parts/scenes/setting_game.lua +++ b/parts/scenes/setting_game.lua @@ -59,7 +59,7 @@ scene.widgetList={ end end end}, - WIDGET.newButton{name='back', x=1140, y=640, w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back', x=1140, y=640, w=170,h=80,sound='back',font=60,fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/setting_key.lua b/parts/scenes/setting_key.lua index b8271d3f..1f657fda 100644 --- a/parts/scenes/setting_key.lua +++ b/parts/scenes/setting_key.lua @@ -231,7 +231,7 @@ scene.widgetList={ WIDGET.newKey{name='restart',x=150,y=670,w=180,h=60,code=function()_setSel(0)end}, - WIDGET.newButton{name='back',x=1140,y=640,w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back',x=1140,y=640,w=170,h=80,sound='back',font=60,fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/setting_skin.lua b/parts/scenes/setting_skin.lua index 4f36707a..d7cfea52 100644 --- a/parts/scenes/setting_skin.lua +++ b/parts/scenes/setting_skin.lua @@ -123,7 +123,7 @@ scene.widgetList={ end SFX.play('hold') end}, - WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,sound='back',font=60,fText=CHAR.icon.back,code=backScene}, playEgg, } diff --git a/parts/scenes/setting_sound.lua b/parts/scenes/setting_sound.lua index f1488ebe..7ecb6ae2 100644 --- a/parts/scenes/setting_sound.lua +++ b/parts/scenes/setting_sound.lua @@ -95,7 +95,7 @@ scene.widgetList={ WIDGET.newButton{name='apply', x=1100,y=400,w=180,h=60,code=function()SETTING.sfxPack=sfxPack SFX.load('media/effect/'..sfxPack..'/')end,hideF=function()return SETTING.sfxPack==sfxPack end}, WIDGET.newSelector{name='vocPack',x=1100,y=470,w=200,color='lV',list=VOCPACKS,disp=function()return vocPack end,code=function(i)vocPack=i end}, WIDGET.newButton{name='apply', x=1100,y=540,w=180,h=60,code=function()SETTING.vocPack=vocPack VOC.load('media/vocal/'..vocPack..'/')end,hideF=function()return SETTING.vocPack==vocPack end}, - WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,sound='back',font=60,fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/setting_touch.lua b/parts/scenes/setting_touch.lua index 087ec136..35230b62 100644 --- a/parts/scenes/setting_touch.lua +++ b/parts/scenes/setting_touch.lua @@ -115,7 +115,7 @@ scene.widgetList={ end}, WIDGET.newSelector{name='snap', x=750,y=90,w=200,h=80,color='Y',list={1,10,20,40,60,80},disp=function()return snapUnit end,code=function(i)snapUnit=i end}, WIDGET.newButton{name='option', x=530,y=190,w=200,h=80,font=60,fText=CHAR.icon.menu,code=function()SCN.go('setting_touchSwitch')end}, - WIDGET.newButton{name='back', x=750,y=190,w=200,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back', x=750,y=190,w=200,h=80,sound='back',font=60,fText=CHAR.icon.back,code=backScene}, WIDGET.newKey{name='save1', x=475,y=290,w=90,h=70,code=_save1,font=45,fText=CHAR.icon.saveOne}, WIDGET.newKey{name='load1', x=585,y=290,w=90,h=70,code=_load1,font=45,fText=CHAR.icon.loadOne}, WIDGET.newKey{name='save2', x=695,y=290,w=90,h=70,code=_save2,font=45,fText=CHAR.icon.saveTwo}, diff --git a/parts/scenes/setting_touchSwitch.lua b/parts/scenes/setting_touchSwitch.lua index d204315e..74edbb7a 100644 --- a/parts/scenes/setting_touchSwitch.lua +++ b/parts/scenes/setting_touchSwitch.lua @@ -62,7 +62,7 @@ scene.widgetList={ WIDGET.newSlider{name='tchW', x=140, y=860, w=1000, font=35,disp=SETval('VKTchW'),code=function(i)SETTING.VKTchW=i SETTING.VKCurW=math.max(SETTING.VKCurW,i)end,hideF=_notTrack}, WIDGET.newSlider{name='curW', x=140, y=930, w=1000, font=35,disp=SETval('VKCurW'),code=function(i)SETTING.VKCurW=i SETTING.VKTchW=math.min(SETTING.VKTchW,i)end,hideF=_notTrack}, - WIDGET.newButton{name='back', x=1140, y=640, w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back', x=1140, y=640, w=170,h=80,sound='back',font=60,fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/setting_video.lua b/parts/scenes/setting_video.lua index 028c4ba9..c08d48b5 100644 --- a/parts/scenes/setting_video.lua +++ b/parts/scenes/setting_video.lua @@ -113,7 +113,7 @@ scene.widgetList={ code=function(v)SETTING.fieldSatur=v;applyFieldSatur(SETTING.fieldSatur)end }, - WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,sound='back',font=60,fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/staff.lua b/parts/scenes/staff.lua index 377f208e..83b3424f 100644 --- a/parts/scenes/staff.lua +++ b/parts/scenes/staff.lua @@ -95,7 +95,7 @@ function scene.draw() end scene.widgetList={ - WIDGET.newButton{name='back',x=1140,y=640,w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back',x=1140,y=640,w=170,h=80,sound='back',font=60,fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/stat.lua b/parts/scenes/stat.lua index b80795d9..9766e54f 100644 --- a/parts/scenes/stat.lua +++ b/parts/scenes/stat.lua @@ -131,7 +131,7 @@ scene.widgetList={ end }, WIDGET.newButton{name='save',x=820,y=640,w=250,h=80,font=25,code=goScene'savedata'}, - WIDGET.newButton{name='back',x=1140,y=640,w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back',x=1140,y=640,w=170,h=80,sound='back',font=60,fText=CHAR.icon.back,code=backScene}, } return scene