diff --git a/parts/scenes/app_calc.lua b/parts/scenes/app_calc.lua index 7fc60afa..4487d8fe 100644 --- a/parts/scenes/app_calc.lua +++ b/parts/scenes/app_calc.lua @@ -103,14 +103,14 @@ 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="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=".",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=backScene}, } diff --git a/parts/scenes/customGame.lua b/parts/scenes/customGame.lua index c14fc4da..794f3342 100644 --- a/parts/scenes/customGame.lua +++ b/parts/scenes/customGame.lua @@ -153,13 +153,13 @@ scene.widgetList={ --Basic WIDGET.newSelector{name="drop", x=170, y=150,w=220,color="O",list={0,.125,.25,.5,1,2,3,4,5,6,7,8,9,10,12,14,16,18,20,25,30,40,60,180,1e99},disp=CUSval("drop"),code=CUSsto("drop")}, - WIDGET.newSelector{name="lock", x=170, y=230,w=220,color="R",list={0,1,2,3,4,5,6,7,8,9,10,12,14,16,18,20,25,30,40,60,180,1e99}, disp=CUSval("lock"),code=CUSsto("lock")}, - WIDGET.newSelector{name="wait", x=410, y=150,w=220,color="G",list={0,1,2,3,4,5,6,7,8,10,15,20,30,60}, disp=CUSval("wait"),code=CUSsto("wait")}, - WIDGET.newSelector{name="fall", x=410, y=230,w=220,color="Y",list={0,1,2,3,4,5,6,7,8,10,15,20,30,60}, disp=CUSval("fall"),code=CUSsto("fall")}, + WIDGET.newSelector{name="lock", x=170, y=230,w=220,color="R",list={0,1,2,3,4,5,6,7,8,9,10,12,14,16,18,20,25,30,40,60,180,1e99},disp=CUSval("lock"),code=CUSsto("lock")}, + WIDGET.newSelector{name="wait", x=410, y=150,w=220,color="G",list={0,1,2,3,4,5,6,7,8,10,15,20,30,60},disp=CUSval("wait"),code=CUSsto("wait")}, + WIDGET.newSelector{name="fall", x=410, y=230,w=220,color="Y",list={0,1,2,3,4,5,6,7,8,10,15,20,30,60},disp=CUSval("fall"),code=CUSsto("fall")}, --Else - WIDGET.newSelector{name="bg", x=1070, y=150,w=250,color="Y",list=BG.getList(),disp=CUSval("bg"), code=function(i)CUSTOMENV.bg=i BG.set(i)end}, - WIDGET.newSelector{name="bgm", x=1070, y=230,w=250,color="Y",list=BGM.getList(), disp=CUSval("bgm"), code=function(i)CUSTOMENV.bgm=i BGM.play(i)end}, + WIDGET.newSelector{name="bg", x=1070, y=150,w=250,color="Y",list=BG.getList(),disp=CUSval("bg"),code=function(i)CUSTOMENV.bg=i BG.set(i)end}, + WIDGET.newSelector{name="bgm", x=1070, y=230,w=250,color="Y",list=BGM.getList(),disp=CUSval("bgm"),code=function(i)CUSTOMENV.bgm=i BGM.play(i)end}, --Copy/Paste/Start WIDGET.newButton{name="copy", x=1070, y=310,w=310,h=70,color="lR",font=25,code=pressKey"cC"}, diff --git a/parts/scenes/custom_advance.lua b/parts/scenes/custom_advance.lua index a6cdb735..6fb4c318 100644 --- a/parts/scenes/custom_advance.lua +++ b/parts/scenes/custom_advance.lua @@ -14,14 +14,14 @@ scene.widgetList={ WIDGET.newText{name="subTitle", x=530,y=50,font=35,align="L",color="H"}, --Control - WIDGET.newSlider{name="nextCount", x=200, y=150, w=200,unit=6,disp=CUSval("nextCount"),code=CUSsto("nextCount")}, - WIDGET.newSlider{name="holdCount", x=200, y=240, w=200,unit=6,disp=CUSval("holdCount"),code=CUSsto("holdCount")}, - WIDGET.newSwitch{name="infHold", x=350, y=340, disp=CUSval("infHold"), code=CUSrev("infHold"),hide=function()return CUSTOMENV.holdCount==0 end}, - WIDGET.newSwitch{name="phyHold", x=350, y=430, disp=CUSval("phyHold"), code=CUSrev("phyHold"),hide=function()return CUSTOMENV.holdCount==0 end}, + WIDGET.newSlider{name="nextCount", x=200, y=150, w=200,unit=6, disp=CUSval("nextCount"),code=CUSsto("nextCount")}, + WIDGET.newSlider{name="holdCount", x=200, y=240, w=200,unit=6, disp=CUSval("holdCount"),code=CUSsto("holdCount")}, + WIDGET.newSwitch{name="infHold", x=350, y=340, disp=CUSval("infHold"), code=CUSrev("infHold"),hide=function()return CUSTOMENV.holdCount==0 end}, + WIDGET.newSwitch{name="phyHold", x=350, y=430, disp=CUSval("phyHold"), code=CUSrev("phyHold"),hide=function()return CUSTOMENV.holdCount==0 end}, --Rule WIDGET.newSelector{name="fieldH", x=270, y=520, w=260,color="N",list=sList.fieldH, disp=CUSval("fieldH"),code=CUSsto("fieldH")}, - WIDGET.newSelector{name="visible", x=840, y=60, w=260,color="lB",list=sList.visible, disp=CUSval("visible"),code=CUSsto("visible")}, + WIDGET.newSelector{name="visible", x=840, y=60, w=260,color="lB",list=sList.visible, disp=CUSval("visible"),code=CUSsto("visible")}, WIDGET.newSelector{name="freshLimit",x=840, y=160, w=260,color="V",list=sList.freshLimit, disp=CUSval("freshLimit"),code=CUSsto("freshLimit")}, WIDGET.newSelector{name="opponent", x=1120, y=60, w=260,color="R",list=sList.opponent, disp=CUSval("opponent"),code=CUSsto("opponent")}, WIDGET.newSelector{name="life", x=1120, y=160, w=260,color="R",list=sList.life, disp=CUSval("life"),code=CUSsto("life")}, diff --git a/parts/scenes/intro.lua b/parts/scenes/intro.lua index 7acc6eff..35fdb086 100644 --- a/parts/scenes/intro.lua +++ b/parts/scenes/intro.lua @@ -5,25 +5,21 @@ local rnd=math.random local scene={} -local t1,t2,animateType +local t1,t2,animeType function scene.sceneInit() BG.set() t1,t2=0,0--Timer - animateType={rnd(5),rnd(5),rnd(5),rnd(5),rnd(5),rnd(5),rnd(5),rnd(5)}--Random animation type + animeType={}for i=1,8 do animeType[i]=rnd(5)end--Random animation type end function scene.mouseDown(_,_,k) - if k~=2 then - if newVersionLaunch then - SCN.push(SETTING.simpMode and"main_simple"or"main") - SCN.swapTo("history","fade") - LOG.print(text.newVersion,"warn",COLOR.lB) - else - SCN.go(SETTING.simpMode and"main_simple"or"main") - end + if newVersionLaunch then + SCN.push(SETTING.simpMode and"main_simple"or"main") + SCN.swapTo("history","fade") + LOG.print(text.newVersion,"warn",COLOR.lB) else - SCN.swapTo("quit","slowFade") + SCN.go(SETTING.simpMode and"main_simple"or"main") end end function scene.touchDown() @@ -39,28 +35,15 @@ function scene.keyDown(key) end function scene.update() - t1=t1+1 - t2=t2+1 + t1,t2=t1+1,t2+1 end local titleTransform={ - function(t) - gc.translate(0,max(50-t,0)^2/25) - end, - function(t) - gc.translate(0,-max(50-t,0)^2/25) - end, - function(t,i) - local d=max(50-t,0) - gc.translate(sin(TIME()*3+626*i)*d,cos(TIME()*3+626*i)*d) - end, - function(t,i) - local d=max(50-t,0) - gc.translate(sin(TIME()*3+626*i)*d,-cos(TIME()*3+626*i)*d) - end, - function(t) - gc.setColor(1,1,1,min(t*.02,1)+rnd()*.2) - end, + function(t)gc.translate(0,max(50-t,0)^2/25)end, + function(t)gc.translate(0,-max(50-t,0)^2/25)end, + function(t,i)local d=max(50-t,0)gc.translate(sin(TIME()*3+626*i)*d,cos(TIME()*3+626*i)*d)end, + function(t,i)local d=max(50-t,0)gc.translate(sin(TIME()*3+626*i)*d,-cos(TIME()*3+626*i)*d)end, + function(t)gc.setColor(1,1,1,min(t*.02,1)+rnd()*.2)end, } function scene.draw() local T=(t1+110)%300 @@ -77,7 +60,7 @@ function scene.draw() if t>0 then gc.push("transform") gc.setColor(1,1,1,min(t*.025,1)) - titleTransform[animateType[i]](t,i) + titleTransform[animeType[i]](t,i) local dt=(t1+62-5*i)%300 if dt<20 then gc.translate(0,math.abs(10-dt)-10) diff --git a/parts/scenes/music.lua b/parts/scenes/music.lua index 3f87abc2..6885b91a 100644 --- a/parts/scenes/music.lua +++ b/parts/scenes/music.lua @@ -96,12 +96,12 @@ scene.widgetList={ WIDGET.newText{name="title", x=30, y=30,font=80,align="L"}, WIDGET.newText{name="arrow", x=270, y=360,font=45,align="L"}, WIDGET.newText{name="now", x=700, y=500,font=50,align="R",hide=function()return not BGM.nowPlay end}, - WIDGET.newSlider{name="bgm", x=760, y=80,w=400, font=35,disp=SETval("bgm"),code=function(v)SETTING.bgm=v BGM.freshVolume()end}, - WIDGET.newButton{name="up", x=200, y=250,w=120, font=55,code=pressKey"up",hide=function()return selected==1 end}, - WIDGET.newButton{name="play", x=200, y=390,w=120, font=35,code=pressKey"space"}, - WIDGET.newButton{name="down", x=200, y=530,w=120, font=55,code=pressKey"down",hide=function()return selected==#bgmList end}, - 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=40,code=backScene}, + WIDGET.newSlider{name="bgm", x=760, y=80,w=400, font=35,disp=SETval("bgm"),code=function(v)SETTING.bgm=v BGM.freshVolume()end}, + WIDGET.newButton{name="up", x=200, y=250,w=120, font=55,code=pressKey"up",hide=function()return selected==1 end}, + WIDGET.newButton{name="play", x=200, y=390,w=120, font=35,code=pressKey"space"}, + WIDGET.newButton{name="down", x=200, y=530,w=120, font=55,code=pressKey"down",hide=function()return selected==#bgmList end}, + 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=40,code=backScene}, } return scene \ No newline at end of file diff --git a/parts/scenes/net_chat.lua b/parts/scenes/net_chat.lua index 0a509573..d889acb7 100644 --- a/parts/scenes/net_chat.lua +++ b/parts/scenes/net_chat.lua @@ -87,9 +87,9 @@ end scene.widgetList={ textBox, - WIDGET.newInputBox{name="input",x=40, y=500,w=980,h=180,font=40}, - WIDGET.newButton{name="send", x=1140, y=540,w=170,h=80,font=40,code=sendMessage}, - WIDGET.newButton{name="back", x=1140, y=640,w=170,h=80,font=40,code=backScene}, + WIDGET.newInputBox{name="input",x=40,y=500,w=980,h=180,font=40}, + WIDGET.newButton{name="send",x=1140,y=540,w=170,h=80,font=40,code=sendMessage}, + WIDGET.newButton{name="back",x=1140,y=640,w=170,h=80,font=40,code=backScene}, } return scene \ No newline at end of file diff --git a/parts/scenes/setting_game.lua b/parts/scenes/setting_game.lua index 604cee60..529eda54 100644 --- a/parts/scenes/setting_game.lua +++ b/parts/scenes/setting_game.lua @@ -29,12 +29,12 @@ scene.widgetList={ WIDGET.newButton{name="touch", x=990, y=220, w=320,h=80, color="lB",font=35,code=goScene"setting_touch"}, WIDGET.newSlider{name="reTime", x=350, y=340, w=300,unit=10,disp=SETval("reTime"),code=SETsto("reTime"),show=function(S)return(.5+S.disp()*.25).."s"end}, WIDGET.newSelector{name="RS", x=500, y=420, w=300,color="S",list={"TRS","SRS","C2","C2sym","Classic","None"},disp=SETval("RS"),code=SETsto("RS")}, - WIDGET.newButton{name="layout", x=250, y=540, w=200,h=70,font=35, code=goScene"setting_skin"}, - WIDGET.newSwitch{name="dataSaving", x=750, y=550, font=20,disp=SETval("dataSaving"),code=SETrev("dataSaving")}, - WIDGET.newSwitch{name="autoPause", x=1060, y=310, font=20,disp=SETval("autoPause"),code=SETrev("autoPause")}, - WIDGET.newSwitch{name="swap", x=1060, y=370, font=20,disp=SETval("swap"), code=SETrev("swap")}, - WIDGET.newSwitch{name="fine", x=1060, y=430, font=20,disp=SETval("fine"), code=function()SETTING.fine=not SETTING.fine if SETTING.fine then SFX.play("finesseError",.6) end end}, - WIDGET.newSwitch{name="appLock", x=1060, y=490, font=20,disp=SETval("appLock"), code=SETrev("appLock")}, + WIDGET.newButton{name="layout", x=250, y=540, w=200,h=70,font=35, code=goScene"setting_skin"}, + WIDGET.newSwitch{name="dataSaving", x=750, y=550, font=20,disp=SETval("dataSaving"), code=SETrev("dataSaving")}, + WIDGET.newSwitch{name="autoPause", x=1060, y=310, font=20,disp=SETval("autoPause"), code=SETrev("autoPause")}, + WIDGET.newSwitch{name="swap", x=1060, y=370, font=20,disp=SETval("swap"), code=SETrev("swap")}, + WIDGET.newSwitch{name="fine", x=1060, y=430, font=20,disp=SETval("fine"), code=function()SETTING.fine=not SETTING.fine if SETTING.fine then SFX.play("finesseError",.6) end end}, + WIDGET.newSwitch{name="appLock", x=1060, y=490, font=20,disp=SETval("appLock"), code=SETrev("appLock")}, WIDGET.newSwitch{name="simpMode", x=1060, y=550, font=25,disp=SETval("simpMode"), code=function() SETTING.simpMode=not SETTING.simpMode diff --git a/parts/scenes/setting_key.lua b/parts/scenes/setting_key.lua index dae2d691..64af5716 100644 --- a/parts/scenes/setting_key.lua +++ b/parts/scenes/setting_key.lua @@ -111,27 +111,27 @@ local function setSel(i) end end scene.widgetList={ - WIDGET.newKey{name="a1", x=160,y=40,w=200,h=60,code=function()setSel(1)end}, - WIDGET.newKey{name="a2", x=160,y=100,w=200,h=60,code=function()setSel(2)end}, - WIDGET.newKey{name="a3", x=160,y=160,w=200,h=60,code=function()setSel(3)end}, - WIDGET.newKey{name="a4", x=160,y=220,w=200,h=60,code=function()setSel(4)end}, - WIDGET.newKey{name="a5", x=160,y=280,w=200,h=60,code=function()setSel(5)end}, - WIDGET.newKey{name="a6", x=160,y=340,w=200,h=60,code=function()setSel(6)end}, - WIDGET.newKey{name="a7", x=160,y=400,w=200,h=60,code=function()setSel(7)end}, - WIDGET.newKey{name="a8", x=160,y=460,w=200,h=60,code=function()setSel(8)end}, - WIDGET.newKey{name="a9", x=160,y=520,w=200,h=60,code=function()setSel(9)end}, - WIDGET.newKey{name="a10", x=160,y=580,w=200,h=60,code=function()setSel(10)end}, + WIDGET.newKey{name="a1",x=160,y=40,w=200,h=60,code=function()setSel(1)end}, + WIDGET.newKey{name="a2",x=160,y=100,w=200,h=60,code=function()setSel(2)end}, + WIDGET.newKey{name="a3",x=160,y=160,w=200,h=60,code=function()setSel(3)end}, + WIDGET.newKey{name="a4",x=160,y=220,w=200,h=60,code=function()setSel(4)end}, + WIDGET.newKey{name="a5",x=160,y=280,w=200,h=60,code=function()setSel(5)end}, + WIDGET.newKey{name="a6",x=160,y=340,w=200,h=60,code=function()setSel(6)end}, + WIDGET.newKey{name="a7",x=160,y=400,w=200,h=60,code=function()setSel(7)end}, + WIDGET.newKey{name="a8",x=160,y=460,w=200,h=60,code=function()setSel(8)end}, + WIDGET.newKey{name="a9",x=160,y=520,w=200,h=60,code=function()setSel(9)end}, + WIDGET.newKey{name="a10",x=160,y=580,w=200,h=60,code=function()setSel(10)end}, - WIDGET.newKey{name="a11", x=800,y=40,w=200,h=60,code=function()setSel(11)end}, - WIDGET.newKey{name="a12", x=800,y=100,w=200,h=60,code=function()setSel(12)end}, - WIDGET.newKey{name="a13", x=800,y=160,w=200,h=60,code=function()setSel(13)end}, - WIDGET.newKey{name="a14", x=800,y=220,w=200,h=60,code=function()setSel(14)end}, - WIDGET.newKey{name="a15", x=800,y=280,w=200,h=60,code=function()setSel(15)end}, - WIDGET.newKey{name="a16", x=800,y=340,w=200,h=60,code=function()setSel(16)end}, - WIDGET.newKey{name="a17", x=800,y=400,w=200,h=60,code=function()setSel(17)end}, - WIDGET.newKey{name="a18", x=800,y=460,w=200,h=60,code=function()setSel(18)end}, - WIDGET.newKey{name="a19", x=800,y=520,w=200,h=60,code=function()setSel(19)end}, - WIDGET.newKey{name="a20", x=800,y=580,w=200,h=60,code=function()setSel(20)end}, + WIDGET.newKey{name="a11",x=800,y=40,w=200,h=60,code=function()setSel(11)end}, + WIDGET.newKey{name="a12",x=800,y=100,w=200,h=60,code=function()setSel(12)end}, + WIDGET.newKey{name="a13",x=800,y=160,w=200,h=60,code=function()setSel(13)end}, + WIDGET.newKey{name="a14",x=800,y=220,w=200,h=60,code=function()setSel(14)end}, + WIDGET.newKey{name="a15",x=800,y=280,w=200,h=60,code=function()setSel(15)end}, + WIDGET.newKey{name="a16",x=800,y=340,w=200,h=60,code=function()setSel(16)end}, + WIDGET.newKey{name="a17",x=800,y=400,w=200,h=60,code=function()setSel(17)end}, + WIDGET.newKey{name="a18",x=800,y=460,w=200,h=60,code=function()setSel(18)end}, + WIDGET.newKey{name="a19",x=800,y=520,w=200,h=60,code=function()setSel(19)end}, + WIDGET.newKey{name="a20",x=800,y=580,w=200,h=60,code=function()setSel(20)end}, WIDGET.newKey{name="restart",x=160,y=670,w=200,h=60,code=function()setSel(0)end}, diff --git a/parts/scenes/setting_sound.lua b/parts/scenes/setting_sound.lua index d9afc4e2..9c3a7fe1 100644 --- a/parts/scenes/setting_sound.lua +++ b/parts/scenes/setting_sound.lua @@ -60,14 +60,14 @@ scene.widgetList={ WIDGET.newButton{name="game", x=200, y=80,w=240,h=80,color="lC",font=35,code=swapScene"setting_game","swipeR"}, WIDGET.newButton{name="graphic",x=1080, y=80,w=240,h=80,color="lC",font=35,code=swapScene"setting_video","swipeL"}, - WIDGET.newSlider{name="sfx", x=180, y=200,w=400, font=35,change=function()SFX.play("blip_1")end, disp=SETval("sfx"),code=SETsto("sfx")}, + WIDGET.newSlider{name="sfx", x=180, y=200,w=400, font=35,change=function()SFX.play("blip_1")end,disp=SETval("sfx"),code=SETsto("sfx")}, WIDGET.newSlider{name="spawn", x=180, y=300,w=400, font=30,change=function()SFX.fplay("spawn_"..math.random(7),SETTING.sfx_spawn)end,disp=SETval("sfx_spawn"),code=SETsto("sfx_spawn")}, WIDGET.newSlider{name="warn", x=180, y=400,w=400, font=30,change=function()SFX.fplay("warning",SETTING.sfx_warn)end,disp=SETval("sfx_warn"),code=SETsto("sfx_warn")}, - WIDGET.newSlider{name="bgm", x=180, y=500,w=400, font=35, disp=SETval("bgm"),code=function(v)SETTING.bgm=v BGM.freshVolume()end}, + WIDGET.newSlider{name="bgm", x=180, y=500,w=400, font=35,disp=SETval("bgm"),code=function(v)SETTING.bgm=v BGM.freshVolume()end}, WIDGET.newSlider{name="stereo", x=180, y=600,w=400, font=35,change=function()SFX.play("move",1,-1)SFX.play("lock",1,1)end,disp=SETval("stereo"),code=SETsto("stereo"),hide=function()return SETTING.sx==0 end}, - WIDGET.newSlider{name="vib", x=750, y=200,w=400,unit=5, font=25,change=function()VIB(2)end, disp=SETval("vib"),code=SETsto("vib")}, - WIDGET.newSlider{name="voc", x=750, y=300,w=400, font=35,change=function()VOC.play("test")end, disp=SETval("voc"),code=SETsto("voc")}, - WIDGET.newSelector{name="cv", x=1100, y=380,w=200, list={"miya","naki"}, disp=function()return cv end,code=function(i)cv=i end}, + WIDGET.newSlider{name="vib", x=750, y=200,w=400,unit=5, font=25,change=function()VIB(2)end,disp=SETval("vib"),code=SETsto("vib")}, + WIDGET.newSlider{name="voc", x=750, y=300,w=400, font=35,change=function()VOC.play("test")end,disp=SETval("voc"),code=SETsto("voc")}, + WIDGET.newSelector{name="cv", x=1100, y=380,w=200, list={"miya","naki"},disp=function()return cv end,code=function(i)cv=i end}, WIDGET.newButton{name="apply", x=1100, y=460,w=180,h=80, code=function()SETTING.cv=cv VOC.loadAll()end,hide=function()return SETTING.cv==cv end}, WIDGET.newButton{name="back", x=1140, y=640,w=170,h=80, font=40,code=backScene}, } diff --git a/parts/scenes/setting_trackSetting.lua b/parts/scenes/setting_trackSetting.lua index f507c92b..3e612c51 100644 --- a/parts/scenes/setting_trackSetting.lua +++ b/parts/scenes/setting_trackSetting.lua @@ -11,10 +11,10 @@ function scene.draw() end scene.widgetList={ - WIDGET.newSwitch{name="VKDodge",x=400, y=530, font=35,disp=SETval("VKDodge"),code=SETrev("VKDodge")}, - WIDGET.newSlider{name="VKTchW", x=140, y=320,w=1000, font=35,disp=SETval("VKTchW"),code=function(i)SETTING.VKTchW=i SETTING.VKCurW=math.max(SETTING.VKCurW,i)end}, - WIDGET.newSlider{name="VKCurW", x=140, y=390,w=1000, font=35,disp=SETval("VKCurW"),code=function(i)SETTING.VKCurW=i SETTING.VKTchW=math.min(SETTING.VKTchW,i)end}, - WIDGET.newButton{name="back", x=1140, y=640,w=170,h=80,font=40,code=backScene}, + WIDGET.newSwitch{name="VKDodge",x=400,y=530,font=35,disp=SETval("VKDodge"),code=SETrev("VKDodge")}, + WIDGET.newSlider{name="VKTchW",x=140,y=320,w=1000,font=35,disp=SETval("VKTchW"),code=function(i)SETTING.VKTchW=i SETTING.VKCurW=math.max(SETTING.VKCurW,i)end}, + WIDGET.newSlider{name="VKCurW",x=140,y=390,w=1000,font=35,disp=SETval("VKCurW"),code=function(i)SETTING.VKCurW=i SETTING.VKTchW=math.min(SETTING.VKTchW,i)end}, + WIDGET.newButton{name="back",x=1140,y=640,w=170,h=80,font=40,code=backScene}, } return scene \ No newline at end of file diff --git a/parts/scenes/setting_video.lua b/parts/scenes/setting_video.lua index 1a38e1c8..ae111c89 100644 --- a/parts/scenes/setting_video.lua +++ b/parts/scenes/setting_video.lua @@ -8,28 +8,28 @@ function scene.sceneBack() end scene.widgetList={ - WIDGET.newText{name="title", x=640, y=15,font=80}, + WIDGET.newText{name="title", x=640,y=15,font=80}, - WIDGET.newButton{name="sound", x=200, y=80,w=240,h=80,color="lC",font=35,code=swapScene"setting_sound","swipeR"}, - WIDGET.newButton{name="game", x=1080, y=80,w=240,h=80,color="lC",font=35,code=swapScene"setting_game","swipeL"}, + WIDGET.newButton{name="sound", x=200,y=80,w=240,h=80,color="lC",font=35,code=swapScene"setting_sound","swipeR"}, + WIDGET.newButton{name="game", x=1080,y=80,w=240,h=80,color="lC",font=35,code=swapScene"setting_game","swipeL"}, - WIDGET.newSwitch{name="block", x=290, y=165,disp=SETval("block"),code=SETrev("block")}, - WIDGET.newSwitch{name="smooth", x=290, y=215,disp=SETval("smooth"),code=SETrev("smooth")}, - WIDGET.newSwitch{name="upEdge", x=290, y=265,disp=SETval("upEdge"),code=SETrev("upEdge")}, - WIDGET.newSwitch{name="bagLine", x=290, y=315,disp=SETval("bagLine"),code=SETrev("bagLine")}, + WIDGET.newSwitch{name="block", x=290,y=165,disp=SETval("block"),code=SETrev("block")}, + WIDGET.newSwitch{name="smooth", x=290,y=215,disp=SETval("smooth"),code=SETrev("smooth")}, + WIDGET.newSwitch{name="upEdge", x=290,y=265,disp=SETval("upEdge"),code=SETrev("upEdge")}, + WIDGET.newSwitch{name="bagLine", x=290,y=315,disp=SETval("bagLine"),code=SETrev("bagLine")}, - WIDGET.newSlider{name="ghost", x=600, y=180,w=200,unit=.6,disp=SETval("ghost"),show="percent",code=SETsto("ghost")}, - WIDGET.newSlider{name="grid", x=600, y=240,w=200,unit=.4,disp=SETval("grid"),show="percent", code=SETsto("grid")}, - WIDGET.newSlider{name="center", x=600, y=300,w=200,unit=1, disp=SETval("center"), code=SETsto("center")}, + WIDGET.newSlider{name="ghost", x=600,y=180,w=200,unit=.6, disp=SETval("ghost"),show="percent",code=SETsto("ghost")}, + WIDGET.newSlider{name="grid", x=600,y=240,w=200,unit=.4, disp=SETval("grid"),show="percent", code=SETsto("grid")}, + WIDGET.newSlider{name="center", x=600,y=300,w=200,unit=1, disp=SETval("center"), code=SETsto("center")}, - WIDGET.newSlider{name="lockFX", x=250, y=375,w=373,unit=5, disp=SETval("lockFX"), code=SETsto("lockFX")}, - WIDGET.newSlider{name="dropFX", x=250, y=420,w=373,unit=5, disp=SETval("dropFX"), code=SETsto("dropFX")}, - WIDGET.newSlider{name="moveFX", x=250, y=465,w=373,unit=5, disp=SETval("moveFX"), code=SETsto("moveFX")}, - WIDGET.newSlider{name="clearFX", x=250, y=510,w=373,unit=5, disp=SETval("clearFX"), code=SETsto("clearFX")}, - WIDGET.newSlider{name="splashFX", x=250, y=555,w=373,unit=5, disp=SETval("splashFX"),code=SETsto("splashFX")}, - WIDGET.newSlider{name="shakeFX", x=250, y=600,w=373,unit=5, disp=SETval("shakeFX"), code=SETsto("shakeFX")}, - WIDGET.newSlider{name="atkFX", x=250, y=645,w=373,unit=5, disp=SETval("atkFX"), code=SETsto("atkFX")}, - WIDGET.newSlider{name="frame", x=350, y=690,w=373,unit=10, + WIDGET.newSlider{name="lockFX", x=250,y=375,w=373,unit=5, disp=SETval("lockFX"), code=SETsto("lockFX")}, + WIDGET.newSlider{name="dropFX", x=250,y=420,w=373,unit=5, disp=SETval("dropFX"), code=SETsto("dropFX")}, + WIDGET.newSlider{name="moveFX", x=250,y=465,w=373,unit=5, disp=SETval("moveFX"), code=SETsto("moveFX")}, + WIDGET.newSlider{name="clearFX", x=250,y=510,w=373,unit=5, disp=SETval("clearFX"), code=SETsto("clearFX")}, + WIDGET.newSlider{name="splashFX", x=250,y=555,w=373,unit=5, disp=SETval("splashFX"),code=SETsto("splashFX")}, + WIDGET.newSlider{name="shakeFX", x=250,y=600,w=373,unit=5, disp=SETval("shakeFX"), code=SETsto("shakeFX")}, + WIDGET.newSlider{name="atkFX", x=250,y=645,w=373,unit=5, disp=SETval("atkFX"), code=SETsto("atkFX")}, + WIDGET.newSlider{name="frame", x=350,y=690,w=373,unit=10, disp=function() return SETTING.frameMul>35 and SETTING.frameMul/10 or SETTING.frameMul/5-4 end, @@ -37,22 +37,22 @@ scene.widgetList={ SETTING.frameMul=i<5 and 5*i+20 or 10*i end}, - WIDGET.newSwitch{name="text", x=1140, y=160,font=35,disp=SETval("text"), code=SETrev("text")}, - WIDGET.newSwitch{name="score", x=1140, y=210,font=35,disp=SETval("score"), code=SETrev("score")}, - WIDGET.newSwitch{name="warn", x=1140, y=260,font=35,disp=SETval("warn"), code=SETrev("warn")}, - WIDGET.newSwitch{name="highCam", x=1140, y=310,font=35,disp=SETval("highCam"), code=SETrev("highCam")}, - WIDGET.newSwitch{name="nextPos", x=1140, y=360,font=35,disp=SETval("nextPos"), code=SETrev("nextPos")}, - WIDGET.newSwitch{name="fullscreen", x=1140, y=410,disp=SETval("fullscreen"), code=switchFullscreen}, - WIDGET.newSwitch{name="power", x=1140, y=460,font=35,disp=SETval("powerInfo"), code=SETrev("powerInfo")}, - WIDGET.newSwitch{name="clickFX", x=1140, y=510,font=35,disp=SETval("clickFX"), code=SETrev("clickFX")}, - WIDGET.newSwitch{name="bg", x=1140, y=560,font=35,disp=SETval("bg"), + WIDGET.newSwitch{name="text", x=1140,y=160,font=35,disp=SETval("text"), code=SETrev("text")}, + WIDGET.newSwitch{name="score", x=1140,y=210,font=35,disp=SETval("score"), code=SETrev("score")}, + WIDGET.newSwitch{name="warn", x=1140,y=260,font=35,disp=SETval("warn"), code=SETrev("warn")}, + WIDGET.newSwitch{name="highCam", x=1140,y=310,font=35,disp=SETval("highCam"), code=SETrev("highCam")}, + WIDGET.newSwitch{name="nextPos", x=1140,y=360,font=35,disp=SETval("nextPos"), code=SETrev("nextPos")}, + WIDGET.newSwitch{name="fullscreen", x=1140,y=410,disp=SETval("fullscreen"), code=switchFullscreen}, + WIDGET.newSwitch{name="power", x=1140,y=460,font=35,disp=SETval("powerInfo"), code=SETrev("powerInfo")}, + WIDGET.newSwitch{name="clickFX", x=1140,y=510,font=35,disp=SETval("clickFX"), code=SETrev("clickFX")}, + WIDGET.newSwitch{name="bg", x=1140,y=560,font=35,disp=SETval("bg"), code=function() BG.set("none") SETTING.bg=not SETTING.bg BG.set() end}, - WIDGET.newSwitch{name="clean", x=990, y=640,font=35,disp=SETval("cleanCanvas"),code=SETrev("cleanCanvas")}, - WIDGET.newButton{name="back", x=1140, y=640,w=170,h=80,font=40,code=backScene}, + WIDGET.newSwitch{name="clean", x=990,y=640,font=35,disp=SETval("cleanCanvas"),code=SETrev("cleanCanvas")}, + WIDGET.newButton{name="back", x=1140,y=640,w=170,h=80,font=40,code=backScene}, } return scene \ No newline at end of file