修改三个音效名称
This commit is contained in:
@@ -10,7 +10,7 @@ return{
|
|||||||
end
|
end
|
||||||
setField(P,D.finished+1)
|
setField(P,D.finished+1)
|
||||||
SYSFX.newShade(1.4,P.absFieldX,P.absFieldY,300*P.size,610*P.size,.6,.8,.6)
|
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
|
else
|
||||||
P:win('finish')
|
P:win('finish')
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -41,15 +41,15 @@ return{
|
|||||||
if D.target==110 then
|
if D.target==110 then
|
||||||
P.gameEnv.drop,P.gameEnv.lock=5,5
|
P.gameEnv.drop,P.gameEnv.lock=5,5
|
||||||
P.gameEnv.sddas,P.gameEnv.sdarr=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
|
elseif D.target==140 then
|
||||||
P.gameEnv.drop,P.gameEnv.lock=4,4
|
P.gameEnv.drop,P.gameEnv.lock=4,4
|
||||||
P.gameEnv.sddas,P.gameEnv.sdarr=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
|
elseif D.target==170 then
|
||||||
P.gameEnv.drop,P.gameEnv.lock=3,3
|
P.gameEnv.drop,P.gameEnv.lock=3,3
|
||||||
P.gameEnv.sddas,P.gameEnv.sdarr=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
|
elseif D.target==200 then
|
||||||
P:win('finish')
|
P:win('finish')
|
||||||
return
|
return
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ return{
|
|||||||
if D.target==110 then
|
if D.target==110 then
|
||||||
P.gameEnv.drop,P.gameEnv.lock=2,2
|
P.gameEnv.drop,P.gameEnv.lock=2,2
|
||||||
P.gameEnv.sddas,P.gameEnv.sdarr=2,2
|
P.gameEnv.sddas,P.gameEnv.sdarr=2,2
|
||||||
SFX.play('blip_1')
|
SFX.play('warn_1')
|
||||||
elseif D.target==200 then
|
elseif D.target==200 then
|
||||||
P:win('finish')
|
P:win('finish')
|
||||||
return
|
return
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ return{
|
|||||||
D.pt=D.pt+s
|
D.pt=D.pt+s
|
||||||
|
|
||||||
if D.pt%100==99 then
|
if D.pt%100==99 then
|
||||||
SFX.play('blip_1')
|
SFX.play('warn_1')
|
||||||
elseif D.pt>=D.target then--Level up!
|
elseif D.pt>=D.target then--Level up!
|
||||||
s=D.target/100--range from 1 to 9
|
s=D.target/100--range from 1 to 9
|
||||||
local E=P.gameEnv
|
local E=P.gameEnv
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ return{
|
|||||||
D.pt=D.pt+s
|
D.pt=D.pt+s
|
||||||
|
|
||||||
if D.pt%100==99 then
|
if D.pt%100==99 then
|
||||||
SFX.play('blip_1')
|
SFX.play('warn_1')
|
||||||
elseif D.pt>=D.target then--Level up!
|
elseif D.pt>=D.target then--Level up!
|
||||||
s=D.target/100
|
s=D.target/100
|
||||||
local E=P.gameEnv
|
local E=P.gameEnv
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ return{
|
|||||||
D.pt=D.pt+s
|
D.pt=D.pt+s
|
||||||
|
|
||||||
if D.pt%100==99 then
|
if D.pt%100==99 then
|
||||||
SFX.play('blip_1')
|
SFX.play('warn_1')
|
||||||
elseif D.pt>=D.target then--Level up!
|
elseif D.pt>=D.target then--Level up!
|
||||||
s=D.target/100
|
s=D.target/100
|
||||||
local E=P.gameEnv
|
local E=P.gameEnv
|
||||||
|
|||||||
@@ -147,7 +147,7 @@ return
|
|||||||
|
|
||||||
P.modeData.target=260
|
P.modeData.target=260
|
||||||
p=260
|
p=260
|
||||||
SFX.play('blip_2')
|
SFX.play('warn_2')
|
||||||
SFX.play('reach')
|
SFX.play('reach')
|
||||||
else
|
else
|
||||||
p=260
|
p=260
|
||||||
|
|||||||
@@ -818,7 +818,7 @@ do--function checkWarning()
|
|||||||
end
|
end
|
||||||
GAME.warnLVL=_
|
GAME.warnLVL=_
|
||||||
if GAME.warnLVL>1.126 and P1.frameRun%30==0 then
|
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
|
end
|
||||||
elseif GAME.warnLVL>0 then
|
elseif GAME.warnLVL>0 then
|
||||||
GAME.warnLVL=max(GAME.warnLVL-.026,0)
|
GAME.warnLVL=max(GAME.warnLVL-.026,0)
|
||||||
|
|||||||
@@ -157,7 +157,7 @@ function NETPLY.setJoinMode(uid,ready)
|
|||||||
return
|
return
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
SFX.play('blip_2',.5)
|
SFX.play('warn_2',.5)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
return
|
return
|
||||||
|
|||||||
@@ -819,7 +819,7 @@ function Player:receive(A,send,time,line)
|
|||||||
self.atkBufferSum=self.atkBufferSum+send
|
self.atkBufferSum=self.atkBufferSum+send
|
||||||
self.stat.recv=self.stat.recv+send
|
self.stat.recv=self.stat.recv+send
|
||||||
if self.sound then
|
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
|
end
|
||||||
if send>=2 then
|
if send>=2 then
|
||||||
self:shakeField(send/2)
|
self:shakeField(send/2)
|
||||||
|
|||||||
@@ -187,7 +187,7 @@ function scene.update(dt)
|
|||||||
speed=speed+.2
|
speed=speed+.2
|
||||||
end
|
end
|
||||||
level=level+1
|
level=level+1
|
||||||
SFX.play('blip_1')
|
SFX.play('warn_1')
|
||||||
end
|
end
|
||||||
sunH=sunH+.01
|
sunH=sunH+.01
|
||||||
elseif menu==1 then
|
elseif menu==1 then
|
||||||
|
|||||||
@@ -209,7 +209,7 @@ function scene.keyDown(key)
|
|||||||
elseif key=='n'then
|
elseif key=='n'then
|
||||||
ins(FIELD,page+1,DATA.newBoard(FIELD[page]))
|
ins(FIELD,page+1,DATA.newBoard(FIELD[page]))
|
||||||
page=page+1
|
page=page+1
|
||||||
SFX.play('blip_1',.8)
|
SFX.play('warn_1',.8)
|
||||||
SYSFX.newShade(3,200,60,300,600,.5,1,.5)
|
SYSFX.newShade(3,200,60,300,600,.5,1,.5)
|
||||||
elseif key=='m'then
|
elseif key=='m'then
|
||||||
rem(FIELD,page)
|
rem(FIELD,page)
|
||||||
|
|||||||
@@ -53,12 +53,12 @@ pad={x=140,y=65,page=1,
|
|||||||
{samp={tag='clear_7',func=function()playClearSFX(7)end}},
|
{samp={tag='clear_7',func=function()playClearSFX(7)end}},
|
||||||
{samp={tag='clear_10',func=function()playClearSFX(10)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='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='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_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='blip_1'}},
|
{{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='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='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'},{}, {}, {}},
|
{{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='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='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'}},
|
{{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_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='blip_2'}, {sfx='collect'}, {sfx='emit'}, {}},
|
{{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'}},
|
{{sfx='ren_9'}, {sfx='ren_10'}, {sfx='ren_11'},{sfx='ren_mega'}, {voc='win'}, {voc='lose'}, {sfx='win'}, {sfx='fail'}},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -200,7 +200,7 @@ function scene.socketRead(cmd,d)
|
|||||||
COLOR.dY,"#"..d.uid.." ",
|
COLOR.dY,"#"..d.uid.." ",
|
||||||
COLOR.Y,text.joinRoom,
|
COLOR.Y,text.joinRoom,
|
||||||
}
|
}
|
||||||
SFX.play('click')
|
SFX.play('warn_1')
|
||||||
elseif cmd=='leave'then
|
elseif cmd=='leave'then
|
||||||
textBox:push{
|
textBox:push{
|
||||||
COLOR.lR,d.username,
|
COLOR.lR,d.username,
|
||||||
|
|||||||
@@ -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='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='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='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='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='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},
|
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},
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user