From 4c18629cd795047810086b88282601966d3576ec Mon Sep 17 00:00:00 2001 From: MrZ626 <1046101471@qq.com> Date: Wed, 25 Aug 2021 13:51:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=B9=8B=E5=89=8D=E7=8E=A9?= =?UTF-8?q?=E5=AE=B6showTextF=E6=96=B9=E6=B3=95=E6=94=B9=E5=90=8D=E4=BD=86?= =?UTF-8?q?=E7=94=A8=E7=9A=84=E5=9C=B0=E6=96=B9=E6=BC=8F=E6=94=B9=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- parts/gametoolfunc.lua | 2 +- parts/modes/attacker_h.lua | 4 ++-- parts/modes/attacker_u.lua | 6 +++--- parts/modes/defender_l.lua | 6 +++--- parts/modes/defender_n.lua | 6 +++--- parts/modes/infinite_dig.lua | 6 +++--- parts/modes/master_final.lua | 4 ++-- parts/modes/master_h.lua | 2 +- parts/modes/master_l.lua | 2 +- parts/modes/master_n.lua | 2 +- parts/modes/master_u.lua | 2 +- parts/modes/pctrain_l.lua | 2 +- parts/modes/survivor_e.lua | 2 +- parts/modes/survivor_h.lua | 2 +- parts/modes/survivor_l.lua | 2 +- parts/modes/survivor_n.lua | 2 +- parts/modes/survivor_u.lua | 2 +- 17 files changed, 27 insertions(+), 27 deletions(-) diff --git a/parts/gametoolfunc.lua b/parts/gametoolfunc.lua index 5d77b0a9..fa0f2c7a 100644 --- a/parts/gametoolfunc.lua +++ b/parts/gametoolfunc.lua @@ -327,7 +327,7 @@ function gameOver()--Save record end if p<10 then if p==0 then - P:showTextF(text.newRecord,0,-100,100,'beat',.5) + P:_showText(text.newRecord,0,-100,100,'beat',.5) if SETTING.autoSave and DATA.saveReplay()then GAME.saved=true SFX.play('connected') diff --git a/parts/modes/attacker_h.lua b/parts/modes/attacker_h.lua index 91ca1af2..a27a2dc8 100644 --- a/parts/modes/attacker_h.lua +++ b/parts/modes/attacker_h.lua @@ -24,10 +24,10 @@ return{ D.wave=D.wave+1 if D.wave%10==0 then if D.wave==20 then - P:showTextF(text.great,0,-140,100,'appear',.6) + P:_showText(text.great,0,-140,100,'appear',.6) P.gameEnv.pushSpeed=3 elseif D.wave==50 then - P:showTextF(text.maxspeed,0,-140,100,'appear',.6) + P:_showText(text.maxspeed,0,-140,100,'appear',.6) end end end diff --git a/parts/modes/attacker_u.lua b/parts/modes/attacker_u.lua index 66a74d16..bb1ed141 100644 --- a/parts/modes/attacker_u.lua +++ b/parts/modes/attacker_u.lua @@ -29,13 +29,13 @@ return{ D.wave=D.wave+1 if D.wave%10==0 then if D.wave==10 then - P:showTextF(text.great,0,-140,100,'appear',.6) + P:_showText(text.great,0,-140,100,'appear',.6) P.gameEnv.pushSpeed=4 elseif D.wave==20 then - P:showTextF(text.awesome,0,-140,100,'appear',.6) + P:_showText(text.awesome,0,-140,100,'appear',.6) P.gameEnv.pushSpeed=5 elseif D.wave==30 then - P:showTextF(text.maxspeed,0,-140,100,'appear',.6) + P:_showText(text.maxspeed,0,-140,100,'appear',.6) end end end diff --git a/parts/modes/defender_l.lua b/parts/modes/defender_l.lua index 868773ed..565000de 100644 --- a/parts/modes/defender_l.lua +++ b/parts/modes/defender_l.lua @@ -24,15 +24,15 @@ return{ if D.wave<=75 then D.rpm=math.floor(144e3/t)*.1 if D.wave==25 then - P:showTextF(text.great,0,-140,100,'appear',.6) + P:_showText(text.great,0,-140,100,'appear',.6) P.gameEnv.pushSpeed=3 P.dropDelay,P.gameEnv.drop=4,4 elseif D.wave==50 then - P:showTextF(text.awesome,0,-140,100,'appear',.6) + P:_showText(text.awesome,0,-140,100,'appear',.6) P.gameEnv.pushSpeed=4 P.dropDelay,P.gameEnv.drop=3,3 elseif D.wave==75 then - P:showTextF(text.maxspeed,0,-140,100,'appear',.6) + P:_showText(text.maxspeed,0,-140,100,'appear',.6) P.dropDelay,P.gameEnv.drop=2,2 end end diff --git a/parts/modes/defender_n.lua b/parts/modes/defender_n.lua index 022e25bc..bfe64cf9 100644 --- a/parts/modes/defender_n.lua +++ b/parts/modes/defender_n.lua @@ -24,16 +24,16 @@ return{ if D.wave<=90 then D.rpm=math.floor(108e3/t)*.1 if D.wave==25 then - P:showTextF(text.great,0,-140,100,'appear',.6) + P:_showText(text.great,0,-140,100,'appear',.6) P.gameEnv.pushSpeed=2 P.dropDelay,P.gameEnv.drop=20,20 elseif D.wave==50 then - P:showTextF(text.awesome,0,-140,100,'appear',.6) + P:_showText(text.awesome,0,-140,100,'appear',.6) P.gameEnv.pushSpeed=3 P.dropDelay,P.gameEnv.drop=10,10 elseif D.wave==90 then P.dropDelay,P.gameEnv.drop=5,5 - P:showTextF(text.maxspeed,0,-140,100,'appear',.6) + P:_showText(text.maxspeed,0,-140,100,'appear',.6) end end end diff --git a/parts/modes/infinite_dig.lua b/parts/modes/infinite_dig.lua index f19918b8..7918e691 100644 --- a/parts/modes/infinite_dig.lua +++ b/parts/modes/infinite_dig.lua @@ -3,9 +3,9 @@ local function check_rise(P) if #P.clearedRow==0 then if L>0 then if L<3 then - P:showTextF(text.almost,0,-120,80,'beat',.8) + P:_showText(text.almost,0,-120,80,'beat',.8) elseif L<5 then - P:showTextF(text.great,0,-120,80,'fly',.8) + P:_showText(text.great,0,-120,80,'fly',.8) end end for _=1,8-L do @@ -13,7 +13,7 @@ local function check_rise(P) end else if L==0 then - P:showTextF(text.awesome,0,-120,80,'beat',.6) + P:_showText(text.awesome,0,-120,80,'beat',.6) SFX.play('clear') BG.send(26) for _=1,8 do diff --git a/parts/modes/master_final.lua b/parts/modes/master_final.lua index 80b7af94..aa6418c5 100644 --- a/parts/modes/master_final.lua +++ b/parts/modes/master_final.lua @@ -15,7 +15,7 @@ local function score(P) s=D.target/100--range from 1 to 9 local E=P.gameEnv if s<4 then - P:showTextF(text.stage:gsub("$1",s),0,-120,80,'fly') + P:_showText(text.stage:gsub("$1",s),0,-120,80,'fly') --First 300 if s~=1 then E.lock=E.lock-1 end if s~=2 then E.wait=E.wait-1 end @@ -23,7 +23,7 @@ local function score(P) D.target=D.target+100 elseif s<10 then if s==5 then BGM.play('distortion')end - P:showTextF(text.stage:gsub("$1",s),0,-120,60,'fly',1.26) + P:_showText(text.stage:gsub("$1",s),0,-120,60,'fly',1.26) 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/modes/master_h.lua b/parts/modes/master_h.lua index b5165621..b6cc3965 100644 --- a/parts/modes/master_h.lua +++ b/parts/modes/master_h.lua @@ -48,7 +48,7 @@ local function score(P) return end D.target=D.target+100 - P:showTextF(text.stage:gsub("$1",s),0,-120,80,'beat') + P:_showText(text.stage:gsub("$1",s),0,-120,80,'beat') SFX.play('reach') end end diff --git a/parts/modes/master_l.lua b/parts/modes/master_l.lua index 75c14ff8..e193c0c9 100644 --- a/parts/modes/master_l.lua +++ b/parts/modes/master_l.lua @@ -33,7 +33,7 @@ local function score(P) P:win('finish') else D.target=D.target+100 - P:showTextF(text.stage:gsub("$1",s),0,-120,80,'fly') + P:_showText(text.stage:gsub("$1",s),0,-120,80,'fly') end SFX.play('reach') end diff --git a/parts/modes/master_n.lua b/parts/modes/master_n.lua index 143103b4..a7f97266 100644 --- a/parts/modes/master_n.lua +++ b/parts/modes/master_n.lua @@ -48,7 +48,7 @@ local function score(P) return end D.target=D.target+100 - P:showTextF(text.stage:gsub("$1",s),0,-120,80,'fly') + P:_showText(text.stage:gsub("$1",s),0,-120,80,'fly') SFX.play('reach') end end diff --git a/parts/modes/master_u.lua b/parts/modes/master_u.lua index 5984ddb4..8e5b51fc 100644 --- a/parts/modes/master_u.lua +++ b/parts/modes/master_u.lua @@ -44,7 +44,7 @@ local function score(P) return end D.target=D.target+100 - P:showTextF(text.stage:gsub("$1",s),0,-120,80,'fly') + P:_showText(text.stage:gsub("$1",s),0,-120,80,'fly') end end diff --git a/parts/modes/pctrain_l.lua b/parts/modes/pctrain_l.lua index a1426023..d26b06d5 100644 --- a/parts/modes/pctrain_l.lua +++ b/parts/modes/pctrain_l.lua @@ -33,7 +33,7 @@ local function check(P) P.gameEnv.lock=pc_lock[s]or 25 P.gameEnv.fall=pc_fall[s]or 4 if s==10 then - P:showTextF(text.maxspeed,0,-140,100,'appear',.6) + P:_showText(text.maxspeed,0,-140,100,'appear',.6) end end end diff --git a/parts/modes/survivor_e.lua b/parts/modes/survivor_e.lua index e2935e38..d72cc1a9 100644 --- a/parts/modes/survivor_e.lua +++ b/parts/modes/survivor_e.lua @@ -13,7 +13,7 @@ return{ table.insert(P.atkBuffer,{line=generateLine(P.holeRND:random(10)),amount=1,countdown=30,cd0=30,time=0,sent=false,lv=1}) P.atkBufferSum=P.atkBufferSum+1 P.stat.recv=P.stat.recv+1 - if D.wave==45 then P:showTextF(text.maxspeed,0,-140,100,'appear',.6)end + if D.wave==45 then P:_showText(text.maxspeed,0,-140,100,'appear',.6)end D.timer=0 D.wave=D.wave+1 end diff --git a/parts/modes/survivor_h.lua b/parts/modes/survivor_h.lua index 4d152e27..fb2250f6 100644 --- a/parts/modes/survivor_h.lua +++ b/parts/modes/survivor_h.lua @@ -20,7 +20,7 @@ return{ end P.atkBufferSum=P.atkBufferSum+s P.stat.recv=P.stat.recv+s - if D.wave==60 then P:showTextF(text.maxspeed,0,-140,100,'appear',.6)end + if D.wave==60 then P:_showText(text.maxspeed,0,-140,100,'appear',.6)end D.timer=0 D.wave=D.wave+1 end diff --git a/parts/modes/survivor_l.lua b/parts/modes/survivor_l.lua index e02ff5ea..79d6c4ab 100644 --- a/parts/modes/survivor_l.lua +++ b/parts/modes/survivor_l.lua @@ -14,7 +14,7 @@ return{ table.insert(P.atkBuffer,{line=generateLine(P.holeRND:random(10)),amount=4,countdown=t,cd0=t,time=0,sent=false,lv=3}) P.atkBufferSum=P.atkBufferSum+4 P.stat.recv=P.stat.recv+4 - if D.wave==60 then P:showTextF(text.maxspeed,0,-140,100,'appear',.6)end + if D.wave==60 then P:_showText(text.maxspeed,0,-140,100,'appear',.6)end D.timer=0 D.wave=D.wave+1 end diff --git a/parts/modes/survivor_n.lua b/parts/modes/survivor_n.lua index 1b535246..f8f74917 100644 --- a/parts/modes/survivor_n.lua +++ b/parts/modes/survivor_n.lua @@ -19,7 +19,7 @@ return{ ) P.atkBufferSum=P.atkBufferSum+d%4+1 P.stat.recv=P.stat.recv+d%4+1 - if D.wave==45 then P:showTextF(text.maxspeed,0,-140,100,'appear',.6)end + if D.wave==45 then P:_showText(text.maxspeed,0,-140,100,'appear',.6)end D.timer=0 D.wave=d end diff --git a/parts/modes/survivor_u.lua b/parts/modes/survivor_u.lua index 1ba40111..dde0c19a 100644 --- a/parts/modes/survivor_u.lua +++ b/parts/modes/survivor_u.lua @@ -19,7 +19,7 @@ return{ table.insert(P.atkBuffer,{line=generateLine(P.holeRND:random(10)),amount=6,countdown=1.5*t,cd0=1.5*t,time=0,sent=false,lv=5}) P.atkBufferSum=P.atkBufferSum+20 P.stat.recv=P.stat.recv+20 - if D.wave==31 then P:showTextF(text.maxspeed,0,-140,100,'appear',.6)end + if D.wave==31 then P:_showText(text.maxspeed,0,-140,100,'appear',.6)end D.timer=0 D.wave=D.wave+1 end