diff --git a/Zframework b/Zframework index d0b485ab..ca4e0e4f 160000 --- a/Zframework +++ b/Zframework @@ -1 +1 @@ -Subproject commit d0b485abdbe4490f63ff15fef58f21baddd50f84 +Subproject commit ca4e0e4fe172e849ff8c8506b6017495020f0eea diff --git a/parts/scenes/setting_sound.lua b/parts/scenes/setting_sound.lua index d82dd610..e5430661 100644 --- a/parts/scenes/setting_sound.lua +++ b/parts/scenes/setting_sound.lua @@ -95,10 +95,10 @@ scene.widgetList={ WIDGET.newSlider{name='bgm', x=300, y=240,w=420,lim=220,color='lG',disp=SETval('bgm'), code=function(v) SETTING.bgm=v BGM.setVol(SETTING.bgm) end}, WIDGET.newSlider{name='sfx', x=300, y=310,w=420,lim=220,color='lC',disp=SETval('sfx'), code=function(v) SETTING.sfx=v SFX.setVol(SETTING.sfx) end, change=function() SFX.play('warn_1') end}, WIDGET.newSlider{name='stereo', x=300, y=380,w=420,lim=220,color='lC',disp=SETval('stereo'), code=function(v) SETTING.stereo=v SFX.setStereo(SETTING.stereo) end,change=function() SFX.play('touch',1,-1)SFX.play('lock',1,1) end,hideF=function() return SETTING.sfx==0 end}, - WIDGET.newSlider{name='spawn', x=300, y=450,w=420,lim=220,color='lC',disp=SETval('sfx_spawn'), code=function(v) SETTING.sfx_spawn=v end, change=function() SFX.fplay('spawn_'..math.random(7),SETTING.sfx_spawn) end,}, - WIDGET.newSlider{name='warn', x=300, y=520,w=420,lim=220,color='lC',disp=SETval('sfx_warn'), code=function(v) SETTING.sfx_warn=v end, change=function() SFX.fplay('warn_beep',SETTING.sfx_warn) end}, - WIDGET.newSlider{name='vib', x=300, y=590,w=420,lim=220,color='lN',disp=SETval('vib'),axis={0,10,1},code=function(v) SETTING.vib=v end, change=function() if SETTING.vib>0 then VIB(SETTING.vib+2) end end}, - WIDGET.newSlider{name='voc', x=300, y=660,w=420,lim=220,color='lN',disp=SETval('voc'), code=function(v) SETTING.voc=v VOC.setVol(SETTING.voc) end, change=function() VOC.play('test') end}, + WIDGET.newSlider{name='spawn', x=300, y=450,w=420,lim=220,color='lC',disp=SETval('sfx_spawn'), code=function(v) SETTING.sfx_spawn=v end, change=function() SFX.fplay('spawn_'..math.random(7),SETTING.sfx_spawn) end,}, + WIDGET.newSlider{name='warn', x=300, y=520,w=420,lim=220,color='lC',disp=SETval('sfx_warn'), code=function(v) SETTING.sfx_warn=v end, change=function() SFX.fplay('warn_beep',SETTING.sfx_warn) end}, + WIDGET.newSlider{name='vib', x=300, y=590,w=420,lim=220,color='lN',disp=SETval('vib'),axis={0,10,1},code=function(v) SETTING.vib=v end, change=function() if SETTING.vib>0 then VIB(SETTING.vib+2) end end}, + WIDGET.newSlider{name='voc', x=300, y=660,w=420,lim=220,color='lN',disp=SETval('voc'), code=function(v) SETTING.voc=v VOC.setVol(SETTING.voc) end, change=function() if VOC.getQueueLength(1)==0 then VOC.play('test',1) end end}, WIDGET.newSwitch{name='autoMute', x=1150,y=180,lim=380,disp=SETval('autoMute'),code=SETrev('autoMute')}, WIDGET.newSwitch{name='fine', x=1150,y=250,lim=380,disp=SETval('fine'),code=function() SETTING.fine=not SETTING.fine if SETTING.fine then SFX.play('finesseError',.6) end end},