From 4f8cf53a10f8becaf06886bdc07863dfc340297f Mon Sep 17 00:00:00 2001 From: MrZ_26 <1046101471@qq.com> Date: Mon, 12 Jun 2023 14:09:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E9=9A=90=E5=BD=A2=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=E5=BC=80=E4=B8=8D=E5=BC=80=EF=BC=88=E6=97=B6=E9=97=B4=E5=8D=95?= =?UTF-8?q?=E4=BD=8D=E9=94=99=E4=BA=86=EF=BC=89=20=E4=B8=80=E4=BA=9B000?= =?UTF-8?q?=E6=94=B9=E6=88=90e3=20=E4=BF=AE=E4=B8=80=E4=BA=9B=E5=B0=8F?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/game/mechanicLib/mino/hypersonic.lua | 10 +++++----- assets/game/mechanicLib/mino/misc.lua | 4 ++-- assets/game/mechanicLib/mino/progress.lua | 2 +- assets/game/mechanicLib/mino/survivor.lua | 10 +++++----- assets/game/mode/mino/exterior/marathon.lua | 2 +- assets/game/mode/mino/exterior/sprint_40.lua | 10 +++++----- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/assets/game/mechanicLib/mino/hypersonic.lua b/assets/game/mechanicLib/mino/hypersonic.lua index 139db077..5691682d 100644 --- a/assets/game/mechanicLib/mino/hypersonic.lua +++ b/assets/game/mechanicLib/mino/hypersonic.lua @@ -109,11 +109,11 @@ do-- high {lock=360,fresh=4000,spawn=130,clear=300,das=110,arr=27,bumpInterval=false}, {lock=330,fresh=3800,spawn=120,clear=260,das=105,arr=26,bumpInterval=false}, {lock=300,fresh=3600,spawn=110,clear=220,das=100,arr=25,bumpInterval=false}, - {lock=300,fresh=3400,spawn=100,clear=180,das=96, arr=24,bumpInterval=10000}, - {lock=300,fresh=3200,spawn=95, clear=160,das=92, arr=23,bumpInterval=8000}, - {lock=300,fresh=3000,spawn=90, clear=140,das=88, arr=22,bumpInterval=6000}, - {lock=300,fresh=2800,spawn=85, clear=120,das=84, arr=21,bumpInterval=5000}, - {lock=300,fresh=2600,spawn=80, clear=100,das=80, arr=20,bumpInterval=4000}, + {lock=300,fresh=3400,spawn=100,clear=180,das=96, arr=24,bumpInterval=10e3}, + {lock=300,fresh=3200,spawn=95, clear=160,das=92, arr=23,bumpInterval=8e3}, + {lock=300,fresh=3000,spawn=90, clear=140,das=88, arr=22,bumpInterval=6e3}, + {lock=300,fresh=2800,spawn=85, clear=120,das=84, arr=21,bumpInterval=5e3}, + {lock=300,fresh=2600,spawn=80, clear=100,das=80, arr=20,bumpInterval=4e3}, } function hypersonic.high_event_playerInit(P) diff --git a/assets/game/mechanicLib/mino/misc.lua b/assets/game/mechanicLib/mino/misc.lua index ee2960eb..66549423 100644 --- a/assets/game/mechanicLib/mino/misc.lua +++ b/assets/game/mechanicLib/mino/misc.lua @@ -221,11 +221,11 @@ do-- wind local md=P.modeData md._windStrength=md._windStrength+MATH.sign(md.windStrength-md._windStrength) md.windCounter=md.windCounter+math.abs(md._windStrength) - if md.windCounter>=62000 then + if md.windCounter>=62e3 then if P.hand then P[md._windStrength<0 and 'moveLeft' or 'moveRight'](P) end - md.windCounter=md.windCounter-62000 + md.windCounter=md.windCounter-62e3 end end function misc.wind_event_afterClear(P) diff --git a/assets/game/mechanicLib/mino/progress.lua b/assets/game/mechanicLib/mino/progress.lua index e1615a3d..49a8d9eb 100644 --- a/assets/game/mechanicLib/mino/progress.lua +++ b/assets/game/mechanicLib/mino/progress.lua @@ -13,7 +13,7 @@ do-- sprint_40 end P.modeData.maxHeight=math.max(P.modeData.maxHeight or 0,P.field:getHeight()) if P.finished then - if P.gameTime<=86 then + if P.gameTime<=86e3 then PROGRESS.setMinoModeUnlocked('sprint_hide_40') end if P.modeData.maxHeight<=8 then diff --git a/assets/game/mechanicLib/mino/survivor.lua b/assets/game/mechanicLib/mino/survivor.lua index 0824b1f4..1a194d3d 100644 --- a/assets/game/mechanicLib/mino/survivor.lua +++ b/assets/game/mechanicLib/mino/survivor.lua @@ -48,7 +48,7 @@ function survivor.b2b_event_always(P) power=4+P:random(0,MATH.clamp(math.floor(wave/30-P.field:getHeight()/10),0,3)), mode=0, time= - (wave<50 and 100000/(100+2*wave)+500 or 1000)+ + (wave<50 and 100e3/(100+2*wave)+500 or 1000)+ MATH.clamp(400-wave,150,350)*max(P.field:getHeight()+P.garbageSum-8,0), fatal=math.floor(min(30+wave/2,50)), -- speed=?, @@ -76,7 +76,7 @@ function survivor.cheese_event_always(P) power=P:random(0,10)+P:random(-5,5)>=P.field:getHeight() and 2 or 1, defendRate=wave<60 and 2 or 3, mode=0, - time=wave<50 and 100000/(50+wave)-1000 or 0, + time=wave<50 and 100e3/(50+wave)-1000 or 0, fatal=MATH.clamp( ( wave<100 and MATH.interpolate(wave,0,20,100,60) or @@ -100,9 +100,9 @@ function survivor.spike_event_always(P) local wave=md.wave md.curWaveTime=floor( - wave<=10 and MATH.interpolate(wave,0,20000,10,15000) or - wave<=30 and MATH.interpolate(wave,10,15000,30,12000) or - max(MATH.interpolate(wave,30,12000,60,10000),10000) + wave<=10 and MATH.interpolate(wave,0,20e3,10,15e3) or + wave<=30 and MATH.interpolate(wave,10,15e3,30,12e3) or + max(MATH.interpolate(wave,30,12e3,60,10e3),10e3) ) md.waveTimer=md.curWaveTime for i=1,3 do diff --git a/assets/game/mode/mino/exterior/marathon.lua b/assets/game/mode/mino/exterior/marathon.lua index 1d686c30..8474538d 100644 --- a/assets/game/mode/mino/exterior/marathon.lua +++ b/assets/game/mode/mino/exterior/marathon.lua @@ -25,7 +25,7 @@ return { for i,d in next,P.dropHistory do table.insert(dropInfo,{ - x=(d.time-3000)/finalTime, + x=d.time/finalTime, y=i/#P.dropHistory, }) end diff --git a/assets/game/mode/mino/exterior/sprint_40.lua b/assets/game/mode/mino/exterior/sprint_40.lua index f50cc9e5..86f681e7 100644 --- a/assets/game/mode/mino/exterior/sprint_40.lua +++ b/assets/game/mode/mino/exterior/sprint_40.lua @@ -43,10 +43,10 @@ return { local finRate=P.modeData.line/P.modeData.lineTarget local averageTime=finalTime/#P.dropHistory - local lastPieceTime=3000 + local lastPieceTime=0 for i,d in next,P.dropHistory do table.insert(dropInfo,{ - x=(d.time-3000)/finalTime*finRate, + x=d.time/finalTime*finRate, y=i/#P.dropHistory*finRate, choke=math.min(averageTime/(d.time-lastPieceTime),1), key=P.modeData.keyCount[i] or 0, @@ -55,10 +55,10 @@ return { end local _cleared=0 - for _,d in next,P.clearHistory do - _cleared=math.min(_cleared+d.line,P.modeData.lineTarget) + for _,c in next,P.clearHistory do + _cleared=math.min(_cleared+c.line,P.modeData.lineTarget) table.insert(clearInfo,{ - x=(d.time-3000)/finalTime*finRate, + x=c.time/finalTime*finRate, y=_cleared/P.modeData.lineTarget*(100/#P.dropHistory)*finRate, }) end