SweetSea/Techmino
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整sysFX的使用参数

Browse Source
This commit is contained in:
MrZ626
2020-11-25 13:59:56 +08:00
parent 9fbb248929
commit 373fc31408
10 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Zframework/init.lua
View File

@@ -108,7 +108,7 @@ function love.mousepressed(x,y,k,touch)
WIDGET.press(mx,my)
end
lastX,lastY=mx,my
SYSFX.newRipple(.3,mx,my,30)
SYSFX.newRipple(3,mx,my,30)
end
function love.mousemoved(x,y,dx,dy,t)
if t then return end
@@ -191,7 +191,7 @@ function love.touchreleased(id,x,y)
if touchClick[SCN.cur]then
touchClick[SCN.cur](x,y)
end
SYSFX.newRipple(.3,x,y,30)
SYSFX.newRipple(3,x,y,30)
end
end

12
Zframework/sysFX.lua
View File

@@ -115,30 +115,30 @@ function SYSFX.newAttack(rate,x1,y1,x2,y2,wid,r,g,b,a)
r=r,g=g,b=b,a=a,
}
end
function SYSFX.newRipple(duration,x,y,r)
function SYSFX.newRipple(rate,x,y,r)
fx[#fx+1]={
update=FXupdate.ripple,
draw=FXdraw.ripple,
t=0,
rate=1/duration,
rate=rate,
x=x,y=y,r=r,
}
end
function SYSFX.newRectRipple(duration,x,y,w,h)
function SYSFX.newRectRipple(rate,x,y,w,h)
fx[#fx+1]={
update=FXupdate.rectRipple,
draw=FXdraw.rectRipple,
t=0,
rate=1/duration,
rate=rate,
x=x,y=y,w=w,h=h,
}
end
function SYSFX.newShade(duration,r,g,b,x,y,w,h)
function SYSFX.newShade(rate,r,g,b,x,y,w,h)
fx[#fx+1]={
update=FXupdate.shade,
draw=FXdraw.shade,
t=0,
rate=1/duration,
rate=rate,
r=r,g=g,b=b,
x=x,y=y,w=w,h=h,
}

10
Zframework/widget.lua
View File

@@ -117,7 +117,7 @@ end
function button:FX()
local ATV=self.ATV
SYSFX.newRectRipple(
.16,
6,
self.x-ATV,
self.y-ATV,
self.w+2*ATV,
@@ -617,12 +617,12 @@ function selector:press(x)
if x<self.x+self.w*.5 then
if s>1 then
s=s-1
SYSFX.newShade(.3,1,1,1,self.x,self.y,self.w*.5,60)
SYSFX.newShade(3,1,1,1,self.x,self.y,self.w*.5,60)
end
else
if s<#self.list then
s=s+1
SYSFX.newShade(.3,1,1,1,self.x+self.w*.5,self.y,self.w*.5,60)
SYSFX.newShade(3,1,1,1,self.x+self.w*.5,self.y,self.w*.5,60)
end
end
if self.select~=s then
@@ -638,10 +638,10 @@ function selector:arrowKey(isLeft)
if isLeft and s==1 or not isLeft and s==#self.list then return end
if isLeft then
s=s-1
SYSFX.newShade(.3,1,1,1,self.x,self.y,self.w*.5,60)
SYSFX.newShade(3,1,1,1,self.x,self.y,self.w*.5,60)
else
s=s+1
SYSFX.newShade(.3,1,1,1,self.x+self.w*.5,self.y,self.w*.5,60)
SYSFX.newShade(3,1,1,1,self.x+self.w*.5,self.y,self.w*.5,60)
end
self.code(self.list[s])
self.select=s

2
parts/modes/custom_clear.lua
View File

@@ -38,7 +38,7 @@ local function checkClear(P)
P.field[_],P.visTime[_]=nil
end
setField(P,P.modeData.point+1)
SYSFX.newShade(.7,.6,.8,.6,P.x+150*P.size,P.y+60*P.size,300*P.size,610*P.size)
SYSFX.newShade(1.4,.6,.8,.6,P.x+150*P.size,P.y+60*P.size,300*P.size,610*P.size)
SFX.play("blip_1")
else
P:win("finish")

2
parts/modes/custom_puzzle.lua
View File

@@ -22,7 +22,7 @@ local function puzzleCheck(P)
FREEROW.discard(P.visTime[_])
P.field[_],P.visTime[_]=nil
end
SYSFX.newShade(.7,.3,1,.3,P.x+150*P.size,P.y+60*P.size,300*P.size,610*P.size)
SYSFX.newShade(1.4,.3,1,.3,P.x+150*P.size,P.y+60*P.size,300*P.size,610*P.size)
SFX.play("reach")
P.modeData.event=0
else

2
parts/modes/master_phantasm.lua
View File

@@ -52,7 +52,7 @@ local function check_LVup(P)
for i=1,10 do
P:createClearingFX(i,1.5)
end
SYSFX.newShade(.4,1,1,1,P.x+150*P.size,P.y+370*P.size,300*P.size,300*P.size)
SYSFX.newShade(2.5,1,1,1,P.x+150*P.size,P.y+370*P.size,300*P.size,300*P.size)
ENV.lock=13
ENV.wait=6

6
parts/player/player.lua
View File

@@ -1471,9 +1471,9 @@ function Player.lose(P,force)
for i=1,h do
P:createClearingFX(i,1.5)
end
SYSFX.newShade(.7,1,1,1,P.fieldX,P.fieldY,300*P.size,610*P.size)
SYSFX.newRectRipple(.5,P.fieldX,P.fieldY,300*P.size,610*P.size)
SYSFX.newRipple(.5,P.x+(475+25*(P.life<3 and P.life or 0)+12)*P.size,P.y+(665+12)*P.size,20)
SYSFX.newShade(1.4,1,1,1,P.fieldX,P.fieldY,300*P.size,610*P.size)
SYSFX.newRectRipple(2,P.fieldX,P.fieldY,300*P.size,610*P.size)
SYSFX.newRipple(2,P.x+(475+25*(P.life<3 and P.life or 0)+12)*P.size,P.y+(665+12)*P.size,20)
--300+25*i,595
SFX.play("clear_3")
SFX.play("emit")

8
parts/scenes/custom_field.lua
View File

@@ -99,8 +99,8 @@ function keyDown.custom_field(key)
for j=1,10 do
if F[i][j]<=0 then goto L end
end
SYSFX.newShade(.3,1,1,1,200,660-30*i,300,30)
SYSFX.newRectRipple(.3,200,660-30*i,300,30)
SYSFX.newShade(3,1,1,1,200,660-30*i,300,30)
SYSFX.newRectRipple(3,200,660-30*i,300,30)
rem(F,i)
::L::
end
@@ -133,14 +133,14 @@ function keyDown.custom_field(key)
ins(FIELD,S.page+1,newBoard(FIELD[S.page]))
S.page=S.page+1
SFX.play("blip_1",.8)
SYSFX.newShade(.3,.5,1,.5,200,60,300,600)
SYSFX.newShade(3,.5,1,.5,200,60,300,600)
elseif key=="m"then
rem(FIELD,S.page)
S.page=max(S.page-1,1)
if not FIELD[1]then
ins(FIELD,newBoard())
end
SYSFX.newShade(.3,1,.5,.5,200,60,300,600)
SYSFX.newShade(3,1,.5,.5,200,60,300,600)
SFX.play("clear_4",.8)
SFX.play("fall",.8)
else

2
parts/scenes/mg_15p.lua
View File

@@ -73,7 +73,7 @@ local function tapBoard(x,y,key)
if S.state<2 then
if not key then
if S.pathVis then
SYSFX.newRipple(.16,x,y,10)
SYSFX.newRipple(6,x,y,10)
end
x,y=int((x-320)/160)+1,int((y-40)/160)+1
end

4
parts/scenes/mg_schulteG.lua
View File

@@ -60,12 +60,12 @@ local function tapBoard(x,y)
SFX.play("reach")
end
if S.tapFX then
SYSFX.newShade(.3,.6,.8,1,320+640/R*X,40+640/R*Y,640/R,640/R)
SYSFX.newShade(3,.6,.8,1,320+640/R*X,40+640/R*Y,640/R,640/R)
end
else
S.error=S.error+1
if S.tapFX then
SYSFX.newShade(.5,1,.4,.5,320+640/R*X,40+640/R*Y,640/R,640/R)
SYSFX.newShade(2,1,.4,.5,320+640/R*X,40+640/R*Y,640/R,640/R)
end
SFX.play("finesseError")
end