From dc99187b9d2cd596b7588896f332d7c8a98cc301 Mon Sep 17 00:00:00 2001 From: MrZ626 <1046101471@qq.com> Date: Wed, 1 Dec 2021 22:03:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=89=E4=B8=AA=E9=9F=B3?= =?UTF-8?q?=E6=95=88=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../effect/chiptune/{blip_1.ogg => warn_1.ogg} | Bin .../effect/chiptune/{blip_2.ogg => warn_2.ogg} | Bin .../chiptune/{warning.ogg => warn_beep.ogg} | Bin parts/eventsets/checkClearBoard.lua | 2 +- parts/eventsets/classic_e.lua | 6 +++--- parts/eventsets/classic_h.lua | 2 +- parts/eventsets/master_final.lua | 2 +- parts/eventsets/master_h.lua | 2 +- parts/eventsets/master_n.lua | 2 +- parts/eventsets/master_ph.lua | 2 +- parts/gameFuncs.lua | 2 +- parts/netPlayer.lua | 2 +- parts/player/player.lua | 2 +- parts/scenes/app_cubefield.lua | 2 +- parts/scenes/custom_field.lua | 2 +- parts/scenes/launchpad.lua | 16 ++++++++-------- parts/scenes/net_game.lua | 2 +- parts/scenes/setting_sound.lua | 4 ++-- 18 files changed, 25 insertions(+), 25 deletions(-) rename media/effect/chiptune/{blip_1.ogg => warn_1.ogg} (100%) rename media/effect/chiptune/{blip_2.ogg => warn_2.ogg} (100%) rename media/effect/chiptune/{warning.ogg => warn_beep.ogg} (100%) diff --git a/media/effect/chiptune/blip_1.ogg b/media/effect/chiptune/warn_1.ogg similarity index 100% rename from media/effect/chiptune/blip_1.ogg rename to media/effect/chiptune/warn_1.ogg diff --git a/media/effect/chiptune/blip_2.ogg b/media/effect/chiptune/warn_2.ogg similarity index 100% rename from media/effect/chiptune/blip_2.ogg rename to media/effect/chiptune/warn_2.ogg diff --git a/media/effect/chiptune/warning.ogg b/media/effect/chiptune/warn_beep.ogg similarity index 100% rename from media/effect/chiptune/warning.ogg rename to media/effect/chiptune/warn_beep.ogg diff --git a/parts/eventsets/checkClearBoard.lua b/parts/eventsets/checkClearBoard.lua index 603280fd..ea51a2c9 100644 --- a/parts/eventsets/checkClearBoard.lua +++ b/parts/eventsets/checkClearBoard.lua @@ -10,7 +10,7 @@ return{ end setField(P,D.finished+1) SYSFX.newShade(1.4,P.absFieldX,P.absFieldY,300*P.size,610*P.size,.6,.8,.6) - SFX.play('blip_1') + SFX.play('warn_1') else P:win('finish') end diff --git a/parts/eventsets/classic_e.lua b/parts/eventsets/classic_e.lua index 5c9d8f4e..483149ba 100644 --- a/parts/eventsets/classic_e.lua +++ b/parts/eventsets/classic_e.lua @@ -41,15 +41,15 @@ return{ if D.target==110 then P.gameEnv.drop,P.gameEnv.lock=5,5 P.gameEnv.sddas,P.gameEnv.sdarr=5,5 - SFX.play('blip_2',.7) + SFX.play('warn_2',.7) elseif D.target==140 then P.gameEnv.drop,P.gameEnv.lock=4,4 P.gameEnv.sddas,P.gameEnv.sdarr=4,4 - SFX.play('blip_2',.7) + SFX.play('warn_2',.7) elseif D.target==170 then P.gameEnv.drop,P.gameEnv.lock=3,3 P.gameEnv.sddas,P.gameEnv.sdarr=3,3 - SFX.play('blip_2',.7) + SFX.play('warn_2',.7) elseif D.target==200 then P:win('finish') return diff --git a/parts/eventsets/classic_h.lua b/parts/eventsets/classic_h.lua index 9cedea2e..0a864cee 100644 --- a/parts/eventsets/classic_h.lua +++ b/parts/eventsets/classic_h.lua @@ -40,7 +40,7 @@ return{ if D.target==110 then P.gameEnv.drop,P.gameEnv.lock=2,2 P.gameEnv.sddas,P.gameEnv.sdarr=2,2 - SFX.play('blip_1') + SFX.play('warn_1') elseif D.target==200 then P:win('finish') return diff --git a/parts/eventsets/master_final.lua b/parts/eventsets/master_final.lua index 869494f7..b6ad08a7 100644 --- a/parts/eventsets/master_final.lua +++ b/parts/eventsets/master_final.lua @@ -20,7 +20,7 @@ return{ D.pt=D.pt+s if D.pt%100==99 then - SFX.play('blip_1') + SFX.play('warn_1') elseif D.pt>=D.target then--Level up! s=D.target/100--range from 1 to 9 local E=P.gameEnv diff --git a/parts/eventsets/master_h.lua b/parts/eventsets/master_h.lua index d52d0148..9487e10a 100644 --- a/parts/eventsets/master_h.lua +++ b/parts/eventsets/master_h.lua @@ -24,7 +24,7 @@ return{ D.pt=D.pt+s if D.pt%100==99 then - SFX.play('blip_1') + SFX.play('warn_1') elseif D.pt>=D.target then--Level up! s=D.target/100 local E=P.gameEnv diff --git a/parts/eventsets/master_n.lua b/parts/eventsets/master_n.lua index 8f44877f..ef573852 100644 --- a/parts/eventsets/master_n.lua +++ b/parts/eventsets/master_n.lua @@ -24,7 +24,7 @@ return{ D.pt=D.pt+s if D.pt%100==99 then - SFX.play('blip_1') + SFX.play('warn_1') elseif D.pt>=D.target then--Level up! s=D.target/100 local E=P.gameEnv diff --git a/parts/eventsets/master_ph.lua b/parts/eventsets/master_ph.lua index 8f83a236..91725929 100644 --- a/parts/eventsets/master_ph.lua +++ b/parts/eventsets/master_ph.lua @@ -147,7 +147,7 @@ return P.modeData.target=260 p=260 - SFX.play('blip_2') + SFX.play('warn_2') SFX.play('reach') else p=260 diff --git a/parts/gameFuncs.lua b/parts/gameFuncs.lua index b5e0f778..dc7494f0 100644 --- a/parts/gameFuncs.lua +++ b/parts/gameFuncs.lua @@ -818,7 +818,7 @@ do--function checkWarning() end GAME.warnLVL=_ if GAME.warnLVL>1.126 and P1.frameRun%30==0 then - SFX.fplay('warning',SETTING.sfx_warn) + SFX.fplay('warn_beep',SETTING.sfx_warn) end elseif GAME.warnLVL>0 then GAME.warnLVL=max(GAME.warnLVL-.026,0) diff --git a/parts/netPlayer.lua b/parts/netPlayer.lua index 0531d0d7..e41264fa 100644 --- a/parts/netPlayer.lua +++ b/parts/netPlayer.lua @@ -157,7 +157,7 @@ function NETPLY.setJoinMode(uid,ready) return end end - SFX.play('blip_2',.5) + SFX.play('warn_2',.5) end end return diff --git a/parts/player/player.lua b/parts/player/player.lua index 29208edb..57c59ea0 100644 --- a/parts/player/player.lua +++ b/parts/player/player.lua @@ -819,7 +819,7 @@ function Player:receive(A,send,time,line) self.atkBufferSum=self.atkBufferSum+send self.stat.recv=self.stat.recv+send if self.sound then - SFX.play(send<4 and'blip_1'or'blip_2',min(send+1,5)*.1) + SFX.play(send<4 and'warn_1'or'warn_2',min(send+1,5)*.1) end if send>=2 then self:shakeField(send/2) diff --git a/parts/scenes/app_cubefield.lua b/parts/scenes/app_cubefield.lua index dfe4ab93..1ed6d884 100644 --- a/parts/scenes/app_cubefield.lua +++ b/parts/scenes/app_cubefield.lua @@ -187,7 +187,7 @@ function scene.update(dt) speed=speed+.2 end level=level+1 - SFX.play('blip_1') + SFX.play('warn_1') end sunH=sunH+.01 elseif menu==1 then diff --git a/parts/scenes/custom_field.lua b/parts/scenes/custom_field.lua index 239e6e32..29691c73 100644 --- a/parts/scenes/custom_field.lua +++ b/parts/scenes/custom_field.lua @@ -209,7 +209,7 @@ function scene.keyDown(key) elseif key=='n'then ins(FIELD,page+1,DATA.newBoard(FIELD[page])) page=page+1 - SFX.play('blip_1',.8) + SFX.play('warn_1',.8) SYSFX.newShade(3,200,60,300,600,.5,1,.5) elseif key=='m'then rem(FIELD,page) diff --git a/parts/scenes/launchpad.lua b/parts/scenes/launchpad.lua index 19e2cb20..1bebdb59 100644 --- a/parts/scenes/launchpad.lua +++ b/parts/scenes/launchpad.lua @@ -53,12 +53,12 @@ pad={x=140,y=65,page=1, {samp={tag='clear_7',func=function()playClearSFX(7)end}}, {samp={tag='clear_10',func=function()playClearSFX(10)end}}, }, - {{sfx='prerotate'}, {sfx='rotate'}, {sfx='rotatekick'}, {}, {voc='single'}, {voc='double'}, {voc='triple'}, {voc='techrash'}}, - {{sfx='finesseError'},{sfx='finesseError_long'},{sfx='drop_cancel'},{}, {sfx='spin_0'}, {sfx='spin_1'}, {sfx='spin_2'}, {sfx='spin_3'}}, - {{sfx='ren_1'}, {sfx='ren_2'}, {sfx='ren_3'}, {sfx='ren_4'}, {}, {sfx='warning'},{sfx='reach'}, {sfx='pc'}}, - {{sfx='ren_5'}, {sfx='ren_6'}, {sfx='ren_7'}, {sfx='ren_8'}, {}, {sfx='collect'},{sfx='emit'}, {sfx='blip_1'}}, - {{sfx='ren_9'}, {sfx='ren_10'}, {sfx='ren_11'}, {sfx='ren_mega'},{voc='win'}, {voc='lose'}, {sfx='win'}, {sfx='fail'}}, - {{sfx='spawn_1'}, {sfx='spawn_2'}, {sfx='spawn_3'}, {sfx='spawn_4'}, {sfx='spawn_5'},{sfx='spawn_6'},{sfx='spawn_7'},{}}, + {{sfx='prerotate'}, {sfx='rotate'}, {sfx='rotatekick'}, {}, {voc='single'}, {voc='double'}, {voc='triple'}, {voc='techrash'}}, + {{sfx='finesseError'},{sfx='finesseError_long'},{sfx='drop_cancel'},{}, {sfx='spin_0'}, {sfx='spin_1'}, {sfx='spin_2'}, {sfx='spin_3'}}, + {{sfx='ren_1'}, {sfx='ren_2'}, {sfx='ren_3'}, {sfx='ren_4'}, {}, {sfx='warn_beep'},{sfx='reach'}, {sfx='pc'}}, + {{sfx='ren_5'}, {sfx='ren_6'}, {sfx='ren_7'}, {sfx='ren_8'}, {}, {sfx='collect'}, {sfx='emit'}, {sfx='warn_1'}}, + {{sfx='ren_9'}, {sfx='ren_10'}, {sfx='ren_11'}, {sfx='ren_mega'},{voc='win'}, {voc='lose'}, {sfx='win'}, {sfx='fail'}}, + {{sfx='spawn_1'}, {sfx='spawn_2'}, {sfx='spawn_3'}, {sfx='spawn_4'}, {sfx='spawn_5'},{sfx='spawn_6'}, {sfx='spawn_7'},{}}, }, { {{voc='mini'}, {voc='b2b'}, {voc='b3b'}, {voc='perfect_clear'},{voc='half_clear'},{}, {}, {}}, @@ -90,8 +90,8 @@ pad={x=140,y=65,page=1, {{voc='mini'}, {voc='b2b'}, {voc='b3b'}, {voc='perfect_clear'}, {voc='half_clear'}, {sfx='finesseError'}, {sfx='finesseError_long'}, {sfx='drop_cancel'},}, {{voc='zspin'}, {voc='sspin'}, {voc='jspin'}, {voc='lspin'}, {voc='tspin'}, {voc='ospin'}, {voc='ispin'}, {}}, {{voc='single'}, {voc='double'}, {voc='triple'},{voc='techrash'}, {sfx='ren_mega', vol=0.25},{sfx='ren_mega', vol=0.5},{sfx='ren_mega', vol=0.75},{sfx='ren_mega'}}, - {{sfx='ren_1'}, {sfx='ren_2'}, {sfx='ren_3'}, {sfx='ren_4'}, {sfx='blip_1'}, {sfx='warning'}, {sfx='reach'}, {sfx='pc'}}, - {{sfx='ren_5'}, {sfx='ren_6'}, {sfx='ren_7'}, {sfx='ren_8'}, {sfx='blip_2'}, {sfx='collect'}, {sfx='emit'}, {}}, + {{sfx='ren_1'}, {sfx='ren_2'}, {sfx='ren_3'}, {sfx='ren_4'}, {sfx='warn_1'}, {sfx='warn_beep'}, {sfx='reach'}, {sfx='pc'}}, + {{sfx='ren_5'}, {sfx='ren_6'}, {sfx='ren_7'}, {sfx='ren_8'}, {sfx='warn_2'}, {sfx='collect'}, {sfx='emit'}, {}}, {{sfx='ren_9'}, {sfx='ren_10'}, {sfx='ren_11'},{sfx='ren_mega'}, {voc='win'}, {voc='lose'}, {sfx='win'}, {sfx='fail'}}, }, { diff --git a/parts/scenes/net_game.lua b/parts/scenes/net_game.lua index d190d33e..a6abd56a 100644 --- a/parts/scenes/net_game.lua +++ b/parts/scenes/net_game.lua @@ -200,7 +200,7 @@ function scene.socketRead(cmd,d) COLOR.dY,"#"..d.uid.." ", COLOR.Y,text.joinRoom, } - SFX.play('click') + SFX.play('warn_1') elseif cmd=='leave'then textBox:push{ COLOR.lR,d.username, diff --git a/parts/scenes/setting_sound.lua b/parts/scenes/setting_sound.lua index 3e16c8f9..f400dd62 100644 --- a/parts/scenes/setting_sound.lua +++ b/parts/scenes/setting_sound.lua @@ -81,10 +81,10 @@ scene.widgetList={ WIDGET.newSlider{name='mainVol', x=300, y=170,w=420,lim=220,color='lG',disp=SETval('mainVol'), code=function(v)SETTING.mainVol=v love.audio.setVolume(SETTING.mainVol)end}, 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('blip_1')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('move',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('warning',SETTING.sfx_warn)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'),unit=10,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},