From 9e00af23059781d957e4615daeaa20e490cc031f Mon Sep 17 00:00:00 2001 From: MrZ_26 <1046101471@qq.com> Date: Sat, 14 Oct 2023 10:01:15 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=80=E4=B8=AA=E5=9C=BA?= =?UTF-8?q?=E5=9C=B0=E8=BE=B9=E6=A1=86=E5=90=91=E5=A4=96=E5=86=92=E7=B2=92?= =?UTF-8?q?=E5=AD=90=E7=9A=84=E6=95=88=E6=9E=9C=20stack=E8=A7=84=E5=88=99?= =?UTF-8?q?=E5=BC=80=E5=90=AF=E6=9C=9F=E9=97=B4=E4=BC=9A=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E5=AE=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/game/classes.lua | 1 + assets/game/mechanicLib/mino/stack.lua | 2 ++ assets/game/minoPlayer.lua | 3 ++- assets/game/particleSystemTemplate.lua | 19 +++++++++++++++++-- 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/assets/game/classes.lua b/assets/game/classes.lua index 8efd3c90..af032b3f 100644 --- a/assets/game/classes.lua +++ b/assets/game/classes.lua @@ -15,6 +15,7 @@ --- @field rectShade love.ParticleSystem --- @field spinArrow table --- @field star love.ParticleSystem +--- @field boardSmoke love.ParticleSystem --- @field line love.ParticleSystem --- @field hitSparkle love.ParticleSystem --- @field cornerCheck love.ParticleSystem diff --git a/assets/game/mechanicLib/mino/stack.lua b/assets/game/mechanicLib/mino/stack.lua index a1cd0177..5b3e1a73 100644 --- a/assets/game/mechanicLib/mino/stack.lua +++ b/assets/game/mechanicLib/mino/stack.lua @@ -72,6 +72,7 @@ function stack.switch(P) md.stack_lockDelay=P.settings.lockDelay P.settings.dropDelay,P.settings.lockDelay=1e99,1e99 + P.particles.boardSmoke:start() BGM.set('all','highgain',.626,.26) else if md.stack_lines>0 then @@ -115,6 +116,7 @@ function stack.switch(P) P.settings.lockDelay=md.stack_lockDelay md.stack_dropDelay,md.stack_lockDelay=nil,nil + P.particles.boardSmoke:pause() BGM.set('all','highgain',1,.1) end end diff --git a/assets/game/minoPlayer.lua b/assets/game/minoPlayer.lua index 2db60cae..b53b2867 100644 --- a/assets/game/minoPlayer.lua +++ b/assets/game/minoPlayer.lua @@ -220,8 +220,8 @@ function MP:createHoldEffect(ifInit) end function MP:createFrenzyEffect(amount) local p=self.particles.star - p:setParticleLifetime(.626,1.6) p:setEmissionArea('uniform',200,400,0,true) + p:setParticleLifetime(.626,1.6) p:setPosition(200,-400) p:emit(amount) end @@ -1760,6 +1760,7 @@ function MP:render() GC.stc_stop() gc_setColor(1,1,1) + gc_draw(self.particles.boardSmoke) gc_draw(self.particles.star) gc_draw(self.particles.line) diff --git a/assets/game/particleSystemTemplate.lua b/assets/game/particleSystemTemplate.lua index c391494a..8752c00c 100644 --- a/assets/game/particleSystemTemplate.lua +++ b/assets/game/particleSystemTemplate.lua @@ -58,13 +58,28 @@ do -- Clearing {'line',0,3.5,6.5,3.5}, {'line',3.5,0,3.5,6.5}, {'fRect',2,2,3,3}, - },2600) - p:setSizes(.26,1,.8,.6,.4,.2,0) + },2260) p:setSpread(MATH.tau) + p:setSizes(.26,1,.8,.6,.4,.2,0) p:setSpeed(0,20) ps.star=p end +do -- Fever State + local p=love.graphics.newParticleSystem(GC.load{1,1, + {'clear',1,1,1}, + },2600) + p:setSpread(.26) + p:setPosition(200,-400) + p:setEmissionArea('borderrectangle',200,400,0,true) + p:setParticleLifetime(.42,1) + p:setSizes(8,5,3,2,0) + p:setSpeed(26,126) + p:setEmissionRate(620) + p:pause() + ps.boardSmoke=p +end + do -- Rotate local p=love.graphics.newParticleSystem(GC.load{10,3, {'clear',1,1,1,1},