From 60ef682c807bd5765839fe2512a2509f7ad52612 Mon Sep 17 00:00:00 2001 From: MrZ626 <1046101471@qq.com> Date: Thu, 9 Sep 2021 19:45:52 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8E=A9=E5=AE=B6=E6=B7=BB=E5=8A=A0=E5=BC=B9?= =?UTF-8?q?=E5=87=BA=E8=BF=87=E5=85=B3=E6=96=87=E6=9C=AC=E7=9A=84=E6=96=B9?= =?UTF-8?q?=E6=B3=95=EF=BC=8C=E5=A4=A7=E5=B8=88=E6=A8=A1=E5=BC=8F=E7=BB=9F?= =?UTF-8?q?=E4=B8=80=E4=BD=BF=E7=94=A8=E8=AF=A5=E6=96=B9=E6=B3=95=20?= =?UTF-8?q?=E5=A4=A7=E5=B8=88-=E8=99=9A=E5=B9=BB=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E8=BF=87=E5=85=B3=E6=96=87=E6=9C=ACclose=20#282?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- parts/eventsets/master_final.lua | 4 ++-- parts/eventsets/master_h.lua | 2 +- parts/eventsets/master_l.lua | 2 +- parts/eventsets/master_n.lua | 2 +- parts/eventsets/master_ph.lua | 8 ++++++++ parts/eventsets/master_u.lua | 2 +- parts/player/player.lua | 3 +++ 7 files changed, 17 insertions(+), 6 deletions(-) diff --git a/parts/eventsets/master_final.lua b/parts/eventsets/master_final.lua index c156bed5..c96a5a28 100644 --- a/parts/eventsets/master_final.lua +++ b/parts/eventsets/master_final.lua @@ -23,7 +23,7 @@ return{ s=D.target/100--range from 1 to 9 local E=P.gameEnv if s<4 then - P:_showText(text.stage:gsub("$1",s),0,-120,80,'fly') + P:stageComplete(s) --First 300 if s~=1 then E.lock=E.lock-1 end if s~=2 then E.wait=E.wait-1 end @@ -31,7 +31,7 @@ return{ D.target=D.target+100 elseif s<10 then if s==5 then BGM.play('distortion')end - P:_showText(text.stage:gsub("$1",s),0,-120,60,'fly',1.26) + P:stageComplete(s) if s==4 or s==7 then E.das=E.das-1 end if s%3==0 then E.lock=E.lock-1 elseif s%3==1 then E.wait=E.wait-1 diff --git a/parts/eventsets/master_h.lua b/parts/eventsets/master_h.lua index 17f0d276..be7bd792 100644 --- a/parts/eventsets/master_h.lua +++ b/parts/eventsets/master_h.lua @@ -57,7 +57,7 @@ return{ return end D.target=D.target+100 - P:_showText(text.stage:gsub("$1",s),0,-120,80,'beat') + P:stageComplete(s) SFX.play('reach') end end, diff --git a/parts/eventsets/master_l.lua b/parts/eventsets/master_l.lua index c7793b51..42eedc6a 100644 --- a/parts/eventsets/master_l.lua +++ b/parts/eventsets/master_l.lua @@ -42,7 +42,7 @@ return{ P:win('finish') else D.target=D.target+100 - P:_showText(text.stage:gsub("$1",s),0,-120,80,'fly') + P:stageComplete(s) end SFX.play('reach') end diff --git a/parts/eventsets/master_n.lua b/parts/eventsets/master_n.lua index 8a02f162..2e187e7f 100644 --- a/parts/eventsets/master_n.lua +++ b/parts/eventsets/master_n.lua @@ -57,7 +57,7 @@ return{ return end D.target=D.target+100 - P:_showText(text.stage:gsub("$1",s),0,-120,80,'fly') + P:stageComplete(s) SFX.play('reach') end end, diff --git a/parts/eventsets/master_ph.lua b/parts/eventsets/master_ph.lua index 30a608f2..383a02f1 100644 --- a/parts/eventsets/master_ph.lua +++ b/parts/eventsets/master_ph.lua @@ -14,6 +14,7 @@ return local T=P.modeData.target --Stage 1: clear 3 techrash if T==12 then--Stage 2: swap color of S/Z & J/L + P:stageComplete(2) P.waiting=30 P.curMission=false @@ -28,6 +29,7 @@ return P.modeData.target=26 SFX.play('reach') elseif T==26 then--Stage 3: dig to bottom + P:stageComplete(3) if not P.holdQueue[1]then--1 up if ban hold P.life=P.life+1 end @@ -72,6 +74,7 @@ return P.modeData.target=42 SFX.play('reach') elseif T==42 then--Stage 4: survive in high speed + P:stageComplete(4) if P.garbageBeneath==0 then P.waiting=30 ENV.lock=11 @@ -84,6 +87,7 @@ return p=41 end elseif T==62 then--Stage 5: survive without easy-fresh rule + P:stageComplete(5) P.life=P.life+1 ENV.lock=13 ENV.wait=5 @@ -94,6 +98,7 @@ return P.modeData.target=126 SFX.play('reach') elseif T==126 then--Stage 6: speed up + P:stageComplete(6) P.life=P.life+1 ENV.lock=11 @@ -102,6 +107,7 @@ return P.modeData.target=162 elseif T==162 then--Stage 7: speed up+++ + P:stageComplete(7) P.life=P.life+1 ENV.lock=10 @@ -112,6 +118,7 @@ return P.modeData.target=226 SFX.play('reach') elseif T==226 then--Stage 8: final invisible + P:stageComplete(8) P.life=P.life+1 ENV.bone=false @@ -120,6 +127,7 @@ return P.modeData.target=259 SFX.play('reach') elseif T==259 then--Stage 9: ending + P:stageComplete(9) P.life=P.life+1 for i=1,7 do ENV.skin[i]=P.holeRND:random(16)end diff --git a/parts/eventsets/master_u.lua b/parts/eventsets/master_u.lua index b0d67f1f..c204545c 100644 --- a/parts/eventsets/master_u.lua +++ b/parts/eventsets/master_u.lua @@ -53,7 +53,7 @@ return{ return end D.target=D.target+100 - P:_showText(text.stage:gsub("$1",s),0,-120,80,'fly') + P:stageComplete(s) end end, task=function(P) diff --git a/parts/player/player.lua b/parts/player/player.lua index 3968b323..fc624da2 100644 --- a/parts/player/player.lua +++ b/parts/player/player.lua @@ -47,6 +47,9 @@ function Player:popScore(score) ) end end +function Player:stageComplete(stage) + self:_showText(text.stage:gsub("$1",stage),0,-120,60,'fly',1.26) +end function Player:createLockFX() if self.gameEnv.lockFX then local CB=self.cur.bk