diff --git a/Zframework/vibrate.lua b/Zframework/vibrate.lua index 6ac5b559..893aaf1f 100644 --- a/Zframework/vibrate.lua +++ b/Zframework/vibrate.lua @@ -1,4 +1,4 @@ -local level={0,0,.01,.015,.02,.03,.04,.05,.06,.07} +local level={0,0,.01,.016,.023,.03,.04,.05,.06,.07,.08,.09,.12,.15} local vib=love.system.vibrate return function(t) local L=SETTING.vib diff --git a/parts/scenes/setting_sound.lua b/parts/scenes/setting_sound.lua index 37eead4e..6f8501a1 100644 --- a/parts/scenes/setting_sound.lua +++ b/parts/scenes/setting_sound.lua @@ -74,7 +74,7 @@ scene.widgetList={ WIDGET.newSlider{name="stereo", x=300, y=330,w=420, change=function()SFX.play('move',1,-1)SFX.play('lock',1,1)end,disp=SETval("stereo"),code=SETsto("stereo"),hideF=function()return SETTING.sx==0 end}, WIDGET.newSlider{name="spawn", x=300, y=400,w=420, 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=300, y=470,w=420, change=function()SFX.fplay("warning",SETTING.sfx_warn)end,disp=SETval("sfx_warn"),code=SETsto("sfx_warn")}, - WIDGET.newSlider{name="vib", x=300, y=540,w=420,unit=5, change=function()VIB(2)end,disp=SETval("vib"),code=SETsto("vib")}, + WIDGET.newSlider{name="vib", x=300, y=540,w=420,unit=10, change=function()VIB(2)end,disp=SETval("vib"),code=SETsto("vib")}, WIDGET.newSlider{name="voc", x=300, y=610,w=420, 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,hideF=function()return SETTING.cv==cv end}, diff --git a/parts/scenes/setting_touchSwitch.lua b/parts/scenes/setting_touchSwitch.lua index fb126def..7d55eaa8 100644 --- a/parts/scenes/setting_touchSwitch.lua +++ b/parts/scenes/setting_touchSwitch.lua @@ -47,7 +47,7 @@ scene.widgetList={ WIDGET.newSwitch{name="hide", x=1150, y=200, font=40,disp=SETval("VKSwitch"),code=SETrev("VKSwitch")}, WIDGET.newSwitch{name="icon", x=1150, y=300, font=40,disp=SETval("VKIcon"),code=SETrev("VKIcon"),hideF=notShow}, WIDGET.newSlider{name="sfx", x=830, y=380, w=400, font=35,change=function()SFX.play('virtualKey',SETTING.VKSFX)end,disp=SETval("VKSFX"),code=SETsto("VKSFX"),hideF=notShow}, - WIDGET.newSlider{name="vib", x=830, y=450, w=400,unit=2,font=35,change=function()VIB(SETTING.VKVIB)end,disp=SETval("VKVIB"),code=SETsto("VKVIB"),hideF=notShow}, + WIDGET.newSlider{name="vib", x=830, y=450, w=400,unit=6,font=35,change=function()VIB(SETTING.VKVIB)end,disp=SETval("VKVIB"),code=SETsto("VKVIB"),hideF=notShow}, WIDGET.newSlider{name="alpha", x=830, y=520, w=400, font=40,disp=SETval("VKAlpha"),code=SETsto("VKAlpha"),hideF=notShow}, WIDGET.newSwitch{name="track", x=360, y=720, font=35,disp=SETval("VKTrack"),code=SETrev("VKTrack"),hideF=notShow},