diff --git a/media/effect/chiptune/click.ogg b/media/effect/chiptune/click.ogg index 86513c26..d7e8a428 100644 Binary files a/media/effect/chiptune/click.ogg and b/media/effect/chiptune/click.ogg differ diff --git a/parts/scenes/music.lua b/parts/scenes/music.lua index 9c3bf0f9..5d8ad0fa 100644 --- a/parts/scenes/music.lua +++ b/parts/scenes/music.lua @@ -55,11 +55,10 @@ function scene.keyDown(key,isRep) if key=='return'or key=='space'then if BGM.nowPlay~=bgmList[S]then BGM.play(bgmList[S]) - if SETTING.bgm>0 then - SFX.play('click') - end + SFX.play('click') else BGM.stop() + SFX.play('click') end elseif key=='tab'then SCN.swapTo('launchpad','none') @@ -126,7 +125,7 @@ scene.widgetList={ }, WIDGET.newSlider{name='bgm', x=760,y=80,w=400,disp=SETval('bgm'),code=function(v)SETTING.bgm=v BGM.setVol(SETTING.bgm)end}, WIDGET.newButton{name='up', x=200,y=250,w=120,code=pressKey'up',hideF=function()return selected==1 end,font=60,fText=CHAR.key.up}, - WIDGET.newButton{name='play', x=200,y=390,w=120,code=pressKey'space',font=65,fText=CHAR.icon.play_pause}, + 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},