From fd5455e71f405ec33e5cd75352e68da4bdf3cd35 Mon Sep 17 00:00:00 2001 From: MrZ626 <1046101471@qq.com> Date: Sun, 14 Feb 2021 02:11:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E8=AF=84=E7=BA=A7=E5=85=A8?= =?UTF-8?q?=E9=83=A8=E6=94=B9=E5=9B=9E=E4=BD=BF=E7=94=A8=E7=9C=9F=E5=AE=9E?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E8=80=8C=E9=9D=9E=E5=B8=A7=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- document/mode.txt | 4 ++-- parts/modes/GM.lua | 2 +- parts/modes/attacker_h.lua | 2 +- parts/modes/attacker_u.lua | 2 +- parts/modes/blind_e.lua | 4 ++-- parts/modes/blind_h.lua | 4 ++-- parts/modes/blind_l.lua | 4 ++-- parts/modes/blind_n.lua | 4 ++-- parts/modes/blind_u.lua | 2 +- parts/modes/blind_wtf.lua | 2 +- parts/modes/c4wtrain_l.lua | 4 ++-- parts/modes/c4wtrain_n.lua | 4 ++-- parts/modes/defender_l.lua | 2 +- parts/modes/defender_n.lua | 2 +- parts/modes/dig_100l.lua | 4 ++-- parts/modes/dig_10l.lua | 4 ++-- parts/modes/dig_400l.lua | 4 ++-- parts/modes/dig_40l.lua | 4 ++-- parts/modes/drought_l.lua | 4 ++-- parts/modes/drought_n.lua | 4 ++-- parts/modes/marathon_bfmax.lua | 2 +- parts/modes/marathon_h.lua | 4 ++-- parts/modes/marathon_n.lua | 4 ++-- parts/modes/master_advance.lua | 4 ++-- parts/modes/master_beginner.lua | 4 ++-- parts/modes/master_final.lua | 2 +- parts/modes/master_phantasm.lua | 2 +- parts/modes/pc_h.lua | 2 +- parts/modes/pc_l.lua | 2 +- parts/modes/pc_n.lua | 2 +- parts/modes/pctrain_l.lua | 2 +- parts/modes/pctrain_n.lua | 2 +- parts/modes/round_e.lua | 2 +- parts/modes/round_h.lua | 2 +- parts/modes/round_l.lua | 2 +- parts/modes/round_n.lua | 2 +- parts/modes/round_u.lua | 2 +- parts/modes/solo_e.lua | 4 ++-- parts/modes/solo_h.lua | 4 ++-- parts/modes/solo_l.lua | 4 ++-- parts/modes/solo_n.lua | 4 ++-- parts/modes/solo_u.lua | 4 ++-- parts/modes/sprintFix.lua | 2 +- parts/modes/sprintLock.lua | 2 +- parts/modes/sprintMPH.lua | 4 ++-- parts/modes/sprintPenta.lua | 4 ++-- parts/modes/sprint_1000l.lua | 4 ++-- parts/modes/sprint_100l.lua | 4 ++-- parts/modes/sprint_10l.lua | 4 ++-- parts/modes/sprint_20l.lua | 4 ++-- parts/modes/sprint_400l.lua | 4 ++-- parts/modes/sprint_40l.lua | 4 ++-- 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 +- parts/modes/tech_finesse.lua | 4 ++-- parts/modes/tech_finesse_f.lua | 4 ++-- parts/modes/tech_h.lua | 4 ++-- parts/modes/tech_h_plus.lua | 4 ++-- parts/modes/tech_l.lua | 4 ++-- parts/modes/tech_l_plus.lua | 4 ++-- parts/modes/tech_n.lua | 4 ++-- parts/modes/tech_n_plus.lua | 4 ++-- parts/modes/tsd_e.lua | 2 +- parts/modes/tsd_h.lua | 2 +- parts/modes/tsd_u.lua | 2 +- parts/modes/ultra.lua | 4 ++-- 69 files changed, 108 insertions(+), 108 deletions(-) diff --git a/document/mode.txt b/document/mode.txt index 11751229..e7d9aa25 100644 --- a/document/mode.txt +++ b/document/mode.txt @@ -127,12 +127,12 @@ return{--返回一个table，你也可以在之前定义一些常量或者函数 mStr(r,69,265)--把计算出来的剩余行数r显示出来 PLY.draw.drawTargetLine(P,r)--使用自带的境界高度线绘制函数 end, - score=function(P)return{P.stat.frame/60,P.stat.piece}end,--游戏结束时需要保存的本局关键信息 + score=function(P)return{P.stat.time,P.stat.piece}end,--游戏结束时需要保存的本局关键信息 scoreDisp=function(D)return toTime(D[1]).." "..D[2].." Pieces"end,--把score返回的数据显示出来的方法 comp=function(a,b)return a[1]=53.5*60 then + if P.stat.time>=53.5 then P.modeData.point=min(P.modeData.point+16,80) P.modeData.event=sectionName[int(P.modeData.point*.1)+1] P:win("finish") diff --git a/parts/modes/attacker_h.lua b/parts/modes/attacker_h.lua index c298c266..d412312d 100644 --- a/parts/modes/attacker_h.lua +++ b/parts/modes/attacker_h.lua @@ -48,7 +48,7 @@ return{ mText(drawableText.wave,69,260) mText(drawableText.nextWave,69,380) end, - score=function(P)return{P.modeData.event,P.stat.frame/60}end, + score=function(P)return{P.modeData.event,P.stat.time}end, scoreDisp=function(D)return D[1].." Waves "..toTime(D[2])end, comp=function(a,b)return a[1]>b[1]or a[1]==b[1]and a[2]b[1]or a[1]==b[1]and a[2]b[1]or a[1]==b[1]and a[2]=200 then - local T=P.stat.frame/60 + local T=P.stat.time return T<=140 and 5 or T<=200 and 4 or diff --git a/parts/modes/blind_h.lua b/parts/modes/blind_h.lua index 20885b3e..d817eaa9 100644 --- a/parts/modes/blind_h.lua +++ b/parts/modes/blind_h.lua @@ -26,13 +26,13 @@ return{ gc.setColor(1,1,1,.2) gc.draw(IMG.electric,124,106,0,2.6) end, - score=function(P)return{min(P.stat.row,200),P.stat.frame/60}end, + score=function(P)return{min(P.stat.row,200),P.stat.time}end, scoreDisp=function(D)return D[1].." Lines "..toTime(D[2])end, comp=function(a,b)return a[1]>b[1]or a[1]==b[1]and a[2]=200 then - local T=P.stat.frame/60 + local T=P.stat.time return T<=150 and 5 or T<=210 and 4 or diff --git a/parts/modes/blind_l.lua b/parts/modes/blind_l.lua index 0e413d0a..baad4d24 100644 --- a/parts/modes/blind_l.lua +++ b/parts/modes/blind_l.lua @@ -27,13 +27,13 @@ return{ gc.setColor(1,1,1,.2) gc.draw(IMG.electric,124,106,0,2.6) end, - score=function(P)return{min(P.stat.row,200),P.stat.frame/60}end, + score=function(P)return{min(P.stat.row,200),P.stat.time}end, scoreDisp=function(D)return D[1].." Lines "..toTime(D[2])end, comp=function(a,b)return a[1]>b[1]or a[1]==b[1]and a[2]=200 then - local T=P.stat.frame/60 + local T=P.stat.time return T<=180 and 5 or T<=240 and 4 or diff --git a/parts/modes/blind_n.lua b/parts/modes/blind_n.lua index b4da66ec..899b302e 100644 --- a/parts/modes/blind_n.lua +++ b/parts/modes/blind_n.lua @@ -23,13 +23,13 @@ return{ gc.setColor(1,1,1,.2) gc.draw(IMG.electric,124,106,0,2.6) end, - score=function(P)return{min(P.stat.row,200),P.stat.frame/60}end, + score=function(P)return{min(P.stat.row,200),P.stat.time}end, scoreDisp=function(D)return D[1].." Lines "..toTime(D[2])end, comp=function(a,b)return a[1]>b[1]or a[1]==b[1]and a[2]=200 then - local T=P.stat.frame/60 + local T=P.stat.time return T<=150 and 5 or T<=210 and 4 or diff --git a/parts/modes/blind_u.lua b/parts/modes/blind_u.lua index 744cfe08..5f115733 100644 --- a/parts/modes/blind_u.lua +++ b/parts/modes/blind_u.lua @@ -26,7 +26,7 @@ return{ gc.setColor(1,1,1,.2) gc.draw(IMG.electric,124,106,0,2.6) end, - score=function(P)return{min(P.stat.row,100),P.stat.frame/60}end, + score=function(P)return{min(P.stat.row,100),P.stat.time}end, scoreDisp=function(D)return D[1].." Lines "..toTime(D[2])end, comp=function(a,b)return a[1]>b[1]or a[1]==b[1]and a[2]b[1]or a[1]==b[1]and a[2]b[1]or a[1]==b[1]and a[2]b[1]or a[1]==b[1]and a[2]b[1]or a[1]==b[1]and a[2]b[1]or a[1]==b[1]and a[2]=0 and R or 0,69,265) end, - score=function(P)return{min(P.stat.row,100),P.stat.frame/60}end, + score=function(P)return{min(P.stat.row,100),P.stat.time}end, scoreDisp=function(D)return D[1].." Lines "..toTime(D[2])end, comp=function(a,b)return a[1]>b[1]or a[1]==b[1]and a[2]=100 then - local T=P.stat.frame/60 + local T=P.stat.time return T<=100 and 5 or T<=120 and 4 or diff --git a/parts/modes/drought_n.lua b/parts/modes/drought_n.lua index db62bada..61735016 100644 --- a/parts/modes/drought_n.lua +++ b/parts/modes/drought_n.lua @@ -20,13 +20,13 @@ return{ local R=100-P.stat.row mStr(R>=0 and R or 0,69,265) end, - score=function(P)return{min(P.stat.row,100),P.stat.frame/60}end, + score=function(P)return{min(P.stat.row,100),P.stat.time}end, scoreDisp=function(D)return D[1].." Lines "..toTime(D[2])end, comp=function(a,b)return a[1]>b[1]or a[1]==b[1]and a[2]=100 then - local T=P.stat.frame/60 + local T=P.stat.time return T<=80 and 5 or T<=100 and 4 or diff --git a/parts/modes/marathon_bfmax.lua b/parts/modes/marathon_bfmax.lua index edd52348..10c2562a 100644 --- a/parts/modes/marathon_bfmax.lua +++ b/parts/modes/marathon_bfmax.lua @@ -43,7 +43,7 @@ return{ getRank=function(P) local L=P.stat.row if L>=200 then - local T=P.stat.frame/60 + local T=P.stat.time return T<=400 and 5 or T<=600 and 4 or diff --git a/parts/modes/marathon_h.lua b/parts/modes/marathon_h.lua index 075c9c91..040147b4 100644 --- a/parts/modes/marathon_h.lua +++ b/parts/modes/marathon_h.lua @@ -36,13 +36,13 @@ return{ mStr(P.gameEnv.target,69,370) gc.rectangle("fill",25,375,90,4) end, - score=function(P)return{math.min(P.stat.row,200),P.stat.frame/60}end, + score=function(P)return{math.min(P.stat.row,200),P.stat.time}end, scoreDisp=function(D)return D[1].." Lines "..toTime(D[2])end, comp=function(a,b)return a[1]>b[1]or a[1]==b[1]and a[2]=200 then - local T=P.stat.frame/60 + local T=P.stat.time return T<=240 and 5 or T<=360 and 4 or diff --git a/parts/modes/marathon_n.lua b/parts/modes/marathon_n.lua index 6b652bd2..09904f9e 100644 --- a/parts/modes/marathon_n.lua +++ b/parts/modes/marathon_n.lua @@ -33,13 +33,13 @@ return{ mStr(P.modeData.point+10,69,370) gc.rectangle("fill",25,375,90,4) end, - score=function(P)return{math.min(P.stat.row,200),P.stat.frame/60}end, + score=function(P)return{math.min(P.stat.row,200),P.stat.time}end, scoreDisp=function(D)return D[1].." Lines "..toTime(D[2])end, comp=function(a,b)return a[1]>b[1]or a[1]==b[1]and a[2]=200 then - local T=P.stat.frame/60 + local T=P.stat.time return T<=240 and 5 or T<=360 and 4 or diff --git a/parts/modes/master_advance.lua b/parts/modes/master_advance.lua index 97902048..fd31d82c 100644 --- a/parts/modes/master_advance.lua +++ b/parts/modes/master_advance.lua @@ -62,7 +62,7 @@ return{ mStr((P.modeData.event+1)*100,69,370) gc.rectangle("fill",25,375,90,4) end, - score=function(P)return{P.modeData.point,P.stat.frame/60}end, + score=function(P)return{P.modeData.point,P.stat.time}end, scoreDisp=function(D)return D[1].."P "..toTime(D[2])end, comp=function(a,b) return a[1]>b[1]or(a[1]==b[1]and a[2]b[1]or(a[1]==b[1]and a[2]b[1]or a[1]==b[1]and a[2]b[1]or a[1]==b[1]and a[2]b[1]or a[1]==b[1]and a[2]b[1]or a[1]==b[1]and a[2]b[1]or a[1]==b[1]and a[2]b[1]or a[1]==b[1]and a[2]b[1]or a[1]==b[1]and a[2]10 and 1 or L>5 and 0 end - local T=P.stat.frame/60 + local T=P.stat.time return T<=260 and 5 or T<=420 and 4 or diff --git a/parts/modes/sprintLock.lua b/parts/modes/sprintLock.lua index 975b396c..61b06938 100644 --- a/parts/modes/sprintLock.lua +++ b/parts/modes/sprintLock.lua @@ -24,7 +24,7 @@ return{ L>10 and 1 or L>2 and 0 end - local T=P.stat.frame/60 + local T=P.stat.time return T<=60 and 5 or T<=100 and 4 or diff --git a/parts/modes/sprintMPH.lua b/parts/modes/sprintMPH.lua index e3e3e38f..65525107 100644 --- a/parts/modes/sprintMPH.lua +++ b/parts/modes/sprintMPH.lua @@ -17,12 +17,12 @@ return{ mStr(r,69,265) PLY.draw.drawTargetLine(P,r) end, - score=function(P)return{P.stat.frame/60,P.stat.piece}end, + score=function(P)return{P.stat.time,P.stat.piece}end, scoreDisp=function(D)return toTime(D[1]).." "..D[2].." Pieces"end, comp=function(a,b)return a[1]b[1]or a[1]==b[1]and a[2]b[1]or a[1]==b[1]and a[2]b[1]or a[1]==b[1]and a[2]b[1]or a[1]==b[1]and a[2]b[1]or a[1]==b[1]and a[2]b[1]or a[1]==b[1]and a[2]=200 then - local T=P.stat.frame/60 + local T=P.stat.time return T<120 and 5 or T<150 and 4 or diff --git a/parts/modes/tech_finesse_f.lua b/parts/modes/tech_finesse_f.lua index 040fc2bc..d18162cf 100644 --- a/parts/modes/tech_finesse_f.lua +++ b/parts/modes/tech_finesse_f.lua @@ -34,13 +34,13 @@ return{ mText(drawableText.atk,69,243) mText(drawableText.eff,69,363) end, - score=function(P)return{P.stat.atk<=200 and int(P.stat.atk)or 200,P.stat.frame/60}end, + score=function(P)return{P.stat.atk<=200 and int(P.stat.atk)or 200,P.stat.time}end, scoreDisp=function(D)return D[1].." Attack "..toTime(D[2])end, comp=function(a,b)return a[1]>b[1]or a[1]==b[1]and a[2]=200 then - local T=P.stat.frame/60 + local T=P.stat.time return T<120 and 5 or T<150 and 4 or diff --git a/parts/modes/tech_h.lua b/parts/modes/tech_h.lua index 900fada2..7b76b55d 100644 --- a/parts/modes/tech_h.lua +++ b/parts/modes/tech_h.lua @@ -21,13 +21,13 @@ return{ mText(drawableText.atk,69,243) mText(drawableText.eff,69,363) end, - score=function(P)return{P.stat.atk<=200 and int(P.stat.atk)or 200,P.stat.frame/60}end, + score=function(P)return{P.stat.atk<=200 and int(P.stat.atk)or 200,P.stat.time}end, scoreDisp=function(D)return D[1].." Attack "..toTime(D[2])end, comp=function(a,b)return a[1]>b[1]or a[1]==b[1]and a[2]=200 then - local T=P.stat.frame/60 + local T=P.stat.time return T<120 and 5 or T<150 and 4 or diff --git a/parts/modes/tech_h_plus.lua b/parts/modes/tech_h_plus.lua index 6ea48954..dd80f15c 100644 --- a/parts/modes/tech_h_plus.lua +++ b/parts/modes/tech_h_plus.lua @@ -31,13 +31,13 @@ return{ mText(drawableText.atk,69,243) mText(drawableText.eff,69,363) end, - score=function(P)return{P.stat.atk<=200 and int(P.stat.atk)or 200,P.stat.frame/60}end, + score=function(P)return{P.stat.atk<=200 and int(P.stat.atk)or 200,P.stat.time}end, scoreDisp=function(D)return D[1].." Attack "..toTime(D[2])end, comp=function(a,b)return a[1]>b[1]or a[1]==b[1]and a[2]=200 then - local T=P.stat.frame/60 + local T=P.stat.time return T<130 and 5 or T<160 and 4 or diff --git a/parts/modes/tech_l.lua b/parts/modes/tech_l.lua index 0d414eab..25f47106 100644 --- a/parts/modes/tech_l.lua +++ b/parts/modes/tech_l.lua @@ -21,13 +21,13 @@ return{ mText(drawableText.atk,69,243) mText(drawableText.eff,69,363) end, - score=function(P)return{P.stat.atk<=200 and int(P.stat.atk)or 200,P.stat.frame/60}end, + score=function(P)return{P.stat.atk<=200 and int(P.stat.atk)or 200,P.stat.time}end, scoreDisp=function(D)return D[1].." Attack "..toTime(D[2])end, comp=function(a,b)return a[1]>b[1]or a[1]==b[1]and a[2]=200 then - local T=P.stat.frame/60 + local T=P.stat.time return T<130 and 5 or T<160 and 4 or diff --git a/parts/modes/tech_l_plus.lua b/parts/modes/tech_l_plus.lua index 05bbf4f1..37761c95 100644 --- a/parts/modes/tech_l_plus.lua +++ b/parts/modes/tech_l_plus.lua @@ -31,13 +31,13 @@ return{ mText(drawableText.atk,69,243) mText(drawableText.eff,69,363) end, - score=function(P)return{P.stat.atk<=200 and int(P.stat.atk)or 200,P.stat.frame/60}end, + score=function(P)return{P.stat.atk<=200 and int(P.stat.atk)or 200,P.stat.time}end, scoreDisp=function(D)return D[1].." Attack "..toTime(D[2])end, comp=function(a,b)return a[1]>b[1]or a[1]==b[1]and a[2]=200 then - local T=P.stat.frame/60 + local T=P.stat.time return T<140 and 5 or T<180 and 4 or diff --git a/parts/modes/tech_n.lua b/parts/modes/tech_n.lua index 2b73d1c9..06767551 100644 --- a/parts/modes/tech_n.lua +++ b/parts/modes/tech_n.lua @@ -21,13 +21,13 @@ return{ mText(drawableText.atk,69,243) mText(drawableText.eff,69,363) end, - score=function(P)return{P.stat.atk<=200 and int(P.stat.atk)or 200,P.stat.frame/60}end, + score=function(P)return{P.stat.atk<=200 and int(P.stat.atk)or 200,P.stat.time}end, scoreDisp=function(D)return D[1].." Attack "..toTime(D[2])end, comp=function(a,b)return a[1]>b[1]or a[1]==b[1]and a[2]=200 then - local T=P.stat.frame/60 + local T=P.stat.time return T<120 and 5 or T<150 and 4 or diff --git a/parts/modes/tech_n_plus.lua b/parts/modes/tech_n_plus.lua index 11c0d9b0..c89b62b3 100644 --- a/parts/modes/tech_n_plus.lua +++ b/parts/modes/tech_n_plus.lua @@ -31,13 +31,13 @@ return{ mText(drawableText.atk,69,243) mText(drawableText.eff,69,363) end, - score=function(P)return{P.stat.atk<=200 and int(P.stat.atk)or 200,P.stat.frame/60}end, + score=function(P)return{P.stat.atk<=200 and int(P.stat.atk)or 200,P.stat.time}end, scoreDisp=function(D)return D[1].." Attack "..toTime(D[2])end, comp=function(a,b)return a[1]>b[1]or a[1]==b[1]and a[2]=200 then - local T=P.stat.frame/60 + local T=P.stat.time return T<130 and 5 or T<160 and 4 or diff --git a/parts/modes/tsd_e.lua b/parts/modes/tsd_e.lua index 4cc5ac83..b9aa94d6 100644 --- a/parts/modes/tsd_e.lua +++ b/parts/modes/tsd_e.lua @@ -26,7 +26,7 @@ return{ mStr(P.modeData.event,69,250) mText(drawableText.tsd,69,315) end, - score=function(P)return{P.modeData.event,P.stat.frame/60}end, + score=function(P)return{P.modeData.event,P.stat.time}end, scoreDisp=function(D)return D[1].."TSD "..toTime(D[2])end, comp=function(a,b)return a[1]>b[1]or a[1]==b[1]and a[2]b[1]or a[1]==b[1]and a[2]b[1]or a[1]==b[1]and a[2]=warnTime[_]*60 then + if P.stat.time>=warnTime[_]then if _<9 then P.modeData.counter=_ SFX.play("ready",.7+_*.03) @@ -33,7 +33,7 @@ return{ mesDisp=function(P) gc.setLineWidth(2) gc.rectangle("line",55,120,32,402) - local T=P.stat.frame/7200 + local T=P.stat.time/120 gc.setColor(2*T,2-2*T,.2) gc.rectangle("fill",56,521,30,(T-1)*400) end,