From f1b9d0c5e4794608739d94b41874415a0f332c56 Mon Sep 17 00:00:00 2001 From: MrZ626 <1046101471@qq.com> Date: Fri, 3 Dec 2021 17:15:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=BF=94=E5=9B=9E=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E9=9F=B3=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- media/effect/chiptune/back.ogg | Bin 0 -> 6458 bytes 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_arithmetic.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_link.lua | 2 +- parts/scenes/app_memorize.lua | 2 +- parts/scenes/app_piano.lua | 2 +- parts/scenes/app_polyforge.lua | 2 +- parts/scenes/app_pong.lua | 2 +- parts/scenes/app_reflect.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 | 2 +- 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 +- 55 files changed, 54 insertions(+), 54 deletions(-) create mode 100644 media/effect/chiptune/back.ogg diff --git a/media/effect/chiptune/back.ogg b/media/effect/chiptune/back.ogg new file mode 100644 index 0000000000000000000000000000000000000000..16e9b62109715c80b2e46b669d66829b0eb0be74 GIT binary patch literal 6458 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 literal 0 HcmV?d00001 diff --git a/parts/scenes/about.lua b/parts/scenes/about.lua index 12ec2723..3adb13b7 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,fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back', x=640, y=600,w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/account.lua b/parts/scenes/account.lua index 17908c5b..cc74b10f 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,fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back',x=1140,y=640,w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/app_15p.lua b/parts/scenes/app_15p.lua index ad8bf787..687e7d55 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,fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/app_2048.lua b/parts/scenes/app_2048.lua index 530beb8d..7691f5fb 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,fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/app_AtoZ.lua b/parts/scenes/app_AtoZ.lua index 197858bb..dfe49795 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,fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/app_UTTT.lua b/parts/scenes/app_UTTT.lua index 651c5d01..e8017377 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,fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back',x=1140,y=640,w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/app_arithmetic.lua b/parts/scenes/app_arithmetic.lua index cb6f6d8b..62a12335 100644 --- a/parts/scenes/app_arithmetic.lua +++ b/parts/scenes/app_arithmetic.lua @@ -231,7 +231,7 @@ scene.widgetList={ WIDGET.newKey{name='7',x=540,y=320,w=90,font=60,fText="7",code=pressKey'7'}, WIDGET.newKey{name='8',x=640,y=320,w=90,font=60,fText="8",code=pressKey'8'}, WIDGET.newKey{name='9',x=740,y=320,w=90,font=60,fText="9",code=pressKey'9'}, - WIDGET.newButton{name='back',x=1200,y=660,w=110,h=60,font=60,fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back',x=1200,y=660,w=110,h=60,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/app_calc.lua b/parts/scenes/app_calc.lua index eb6de02d..d9137b40 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,fText=CHAR.icon.back,code=backScene}, + WIDGET.newKey{name='back',x=1135,y=640,w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/app_cannon.lua b/parts/scenes/app_cannon.lua index a4f7b668..406f3f58 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,fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back',x=1140,y=640,w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/app_cubefield.lua b/parts/scenes/app_cubefield.lua index 1ed6d884..651f76ad 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,fText=CHAR.icon.back,code=backScene}, + WIDGET.newKey{name='back',x=1140,y=80,w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/app_dropper.lua b/parts/scenes/app_dropper.lua index 72ee0a07..a67d63a9 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,fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back',x=1140,y=60,w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/app_dtw.lua b/parts/scenes/app_dtw.lua index 5745d7c1..eb49595a 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,fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/app_link.lua b/parts/scenes/app_link.lua index aac71b64..210a4626 100644 --- a/parts/scenes/app_link.lua +++ b/parts/scenes/app_link.lua @@ -399,7 +399,7 @@ end scene.widgetList={ WIDGET.newButton{name='reset',x=80,y=60,w=110,h=60,color='lG',fText=CHAR.icon.retry_spin,code=pressKey'r',hideF=function()return state==0 end}, WIDGET.newSwitch{name='invis',x=100,y=140,lim=80,disp=function()return invis end,code=pressKey'q',hideF=function()return state==1 end}, - WIDGET.newButton{name='back',x=1200,y=660,w=110,font=50,fText=CHAR.icon.back,code=pressKey'escape'}, + WIDGET.newButton{name='back',x=1200,y=660,w=110,font=50,sound='back',fText=CHAR.icon.back,code=pressKey'escape'}, } return scene diff --git a/parts/scenes/app_memorize.lua b/parts/scenes/app_memorize.lua index f54b0a96..32b032ba 100644 --- a/parts/scenes/app_memorize.lua +++ b/parts/scenes/app_memorize.lua @@ -120,7 +120,7 @@ scene.widgetList={ WIDGET.newKey{name='7',x=540,y=320,w=90,font=60,fText="7",code=pressKey'7'}, WIDGET.newKey{name='8',x=640,y=320,w=90,font=60,fText="8",code=pressKey'8'}, WIDGET.newKey{name='9',x=740,y=320,w=90,font=60,fText="9",code=pressKey'9'}, - WIDGET.newButton{name='back',x=1200,y=660,w=110,h=60,font=60,fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back',x=1200,y=660,w=110,h=60,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/app_piano.lua b/parts/scenes/app_piano.lua index 460eb247..f36bba2a 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,fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/app_polyforge.lua b/parts/scenes/app_polyforge.lua index 546e5995..a0786acb 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,fText=CHAR.icon.back,code=backScene}, + WIDGET.newKey{name='back',x=1140,y=60,w=170,h=80,color='D',font=60,sound='back',fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/app_pong.lua b/parts/scenes/app_pong.lua index e92c86b6..a7a09462 100644 --- a/parts/scenes/app_pong.lua +++ b/parts/scenes/app_pong.lua @@ -177,7 +177,7 @@ end scene.widgetList={ WIDGET.newKey{name='reset',x=640,y=45,w=150,h=50,font=35,fText=CHAR.icon.retry_spin,code=pressKey'r'}, - WIDGET.newKey{name='back',x=640,y=675,w=150,h=50,font=40,fText=CHAR.icon.back,code=backScene}, + WIDGET.newKey{name='back',x=640,y=675,w=150,h=50,font=40,sound='back',fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/app_reflect.lua b/parts/scenes/app_reflect.lua index 53e73cc5..a087a822 100644 --- a/parts/scenes/app_reflect.lua +++ b/parts/scenes/app_reflect.lua @@ -131,7 +131,7 @@ function scene.draw() end scene.widgetList={ - WIDGET.newKey{name='back',x=640,y=675,w=150,h=50,font=40,fText=CHAR.icon.back,code=backScene}, + WIDGET.newKey{name='back',x=640,y=675,w=150,h=50,font=40,sound='back',fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/app_schulteG.lua b/parts/scenes/app_schulteG.lua index e1b3bad2..d50e34cf 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,fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/app_spin.lua b/parts/scenes/app_spin.lua index 1d12cbe9..11ae0c82 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,fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/app_tap.lua b/parts/scenes/app_tap.lua index 79db93d2..72c4ee0f 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,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,fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back',x=1140,y=640,w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/app_ten.lua b/parts/scenes/app_ten.lua index 61e2db0c..d7fbbc85 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,fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/app_triple.lua b/parts/scenes/app_triple.lua index 9440973a..77316c86 100644 --- a/parts/scenes/app_triple.lua +++ b/parts/scenes/app_triple.lua @@ -345,6 +345,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,fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/customGame.lua b/parts/scenes/customGame.lua index e28c7695..5f80f91f 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,fText=CHAR.icon.back,code=pressKey'escape'}, + WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,font=60,sound='back',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 29691c73..7e9866e0 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,fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/custom_mission.lua b/parts/scenes/custom_mission.lua index f9015cb0..85216905 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,fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/custom_sequence.lua b/parts/scenes/custom_sequence.lua index 73e147fd..f8cdd2b9 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,fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/dict.lua b/parts/scenes/dict.lua index eec588ff..d06e0262 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,fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back', x=1165,y=60,w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/history.lua b/parts/scenes/history.lua index 87d6f72d..7e07c1e5 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,fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back',x=1140,y=640,w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/lang.lua b/parts/scenes/lang.lua index 360e8903..fe091041 100644 --- a/parts/scenes/lang.lua +++ b/parts/scenes/lang.lua @@ -68,7 +68,7 @@ scene.widgetList={ WIDGET.newButton{x=271,y=472,w=346,h=120,font=45, fText=langList.zh_grass,color='N',code=function()_setLang('zh_grass')end}, WIDGET.newButton{x=637,y=472,w=346,h=120,font=45, fText=langList.zh_yygq, color='S',code=function()_setLang('zh_yygq')end}, WIDGET.newButton{x=1003,y=472,w=346,h=120,font=45,fText=langList.symbol, color='B',code=function()_setLang('symbol')end}, - WIDGET.newButton{name='back',x=1140,y=640,w=170,h=80,font=60,fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back',x=1140,y=640,w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/launchpad.lua b/parts/scenes/launchpad.lua index 1bebdb59..c0fc6c78 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,fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/legals.lua b/parts/scenes/legals.lua index ab759e09..5d867b41 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,fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back',x=1140,y=640,w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/login.lua b/parts/scenes/login.lua index ce802249..db0ed718 100644 --- a/parts/scenes/login.lua +++ b/parts/scenes/login.lua @@ -36,7 +36,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,fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/manual.lua b/parts/scenes/manual.lua index 6e0a18e2..9bb88665 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,fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back',x=1140,y=640,w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/mod.lua b/parts/scenes/mod.lua index b2f7b3a6..a3dc3f77 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,fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/mode.lua b/parts/scenes/mode.lua index 11b5adac..75d2d925 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,fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back', x=1200,y=655,w=120,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/music.lua b/parts/scenes/music.lua index beb15add..9c3bf0f9 100644 --- a/parts/scenes/music.lua +++ b/parts/scenes/music.lua @@ -129,7 +129,7 @@ scene.widgetList={ WIDGET.newButton{name='play', x=200,y=390,w=120,code=pressKey'space',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,fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/net_league.lua b/parts/scenes/net_league.lua index 8b441457..e4199420 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,fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back',x=1140,y=640,w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/net_menu.lua b/parts/scenes/net_menu.lua index 6a29c614..c80cee6e 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,fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/net_newRoom.lua b/parts/scenes/net_newRoom.lua index bacf4b6d..2697c303 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,fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,font=60,sound='back',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 2afb39d9..0002e4ec 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,fText=CHAR.icon.back,code=pressKey'escape'}, + WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=pressKey'escape'}, } return scene diff --git a/parts/scenes/register.lua b/parts/scenes/register.lua index 28e92426..934484ae 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,fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/replays.lua b/parts/scenes/replays.lua index a1a3b6fd..4845b350 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,fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/savedata.lua b/parts/scenes/savedata.lua index eb877ab2..752d907b 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,fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/setting_control.lua b/parts/scenes/setting_control.lua index 4bb88353..0c3a74b9 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,fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back', x=1140, y=640,w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/setting_game.lua b/parts/scenes/setting_game.lua index cd1bb07c..537a9f90 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,fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back', x=1140, y=640, w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/setting_key.lua b/parts/scenes/setting_key.lua index dd83128a..bf78ab34 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=190,h=80,font=60,fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back',x=1140,y=640,w=190,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/setting_skin.lua b/parts/scenes/setting_skin.lua index ed5e77b3..0d8ca3e1 100644 --- a/parts/scenes/setting_skin.lua +++ b/parts/scenes/setting_skin.lua @@ -124,7 +124,7 @@ scene.widgetList={ end SFX.play('hold') end}, - WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,font=60,fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, playEgg, } diff --git a/parts/scenes/setting_sound.lua b/parts/scenes/setting_sound.lua index f400dd62..f1488ebe 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,fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/setting_touch.lua b/parts/scenes/setting_touch.lua index c2e2f2fa..087ec136 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,fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back', x=750,y=190,w=200,h=80,font=60,sound='back',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 fe9da965..d204315e 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,fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back', x=1140, y=640, w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/setting_video.lua b/parts/scenes/setting_video.lua index 3b79b60e..028c4ba9 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,fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/staff.lua b/parts/scenes/staff.lua index e064500a..377f208e 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,fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back',x=1140,y=640,w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, } return scene diff --git a/parts/scenes/stat.lua b/parts/scenes/stat.lua index ecdea798..b80795d9 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,fText=CHAR.icon.back,code=backScene}, + WIDGET.newButton{name='back',x=1140,y=640,w=170,h=80,font=60,sound='back',fText=CHAR.icon.back,code=backScene}, } return scene