From 998c79d331a0a8bc004ad91cb92fba481785d9c2 Mon Sep 17 00:00:00 2001 From: MrZ626 <1046101471@qq.com> Date: Fri, 6 Aug 2021 09:58:26 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=9B=E5=BA=A6=E6=98=BE=E7=A4=BA=E5=99=A8?= =?UTF-8?q?=E7=A7=BB=E5=85=A5=E5=B8=B8=E7=94=A8=E7=8E=A9=E5=AE=B6draw?= =?UTF-8?q?=E5=87=BD=E6=95=B0=E5=B9=B6=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- parts/modes/classic_fast.lua | 5 +---- parts/modes/marathon_bfmax.lua | 5 +---- parts/modes/marathon_h.lua | 5 +---- parts/modes/marathon_n.lua | 5 +---- parts/modes/master_final.lua | 5 +---- parts/modes/master_h.lua | 5 +---- parts/modes/master_l.lua | 5 +---- parts/modes/master_n.lua | 5 +---- parts/modes/master_ph.lua | 5 +---- parts/modes/master_u.lua | 5 +---- parts/modes/rhythm_e.lua | 5 +---- parts/modes/rhythm_h.lua | 5 +---- parts/modes/rhythm_u.lua | 5 +---- parts/player/draw.lua | 13 ++++++++++--- 14 files changed, 23 insertions(+), 55 deletions(-) diff --git a/parts/modes/classic_fast.lua b/parts/modes/classic_fast.lua index e162e70c..86429dad 100644 --- a/parts/modes/classic_fast.lua +++ b/parts/modes/classic_fast.lua @@ -38,10 +38,7 @@ return{ local r=P.modeData.target*.1 mStr(r<11 and 18 or r<22 and r+8 or("%02x"):format(r*10-220),69,210) mText(drawableText.speedLV,69,290) - setFont(45) - mStr(P.stat.row,69,320) - mStr(P.modeData.target,69,370) - gc.rectangle('fill',25,375,90,4) + PLY.draw.drawProgress(P.stat.row,P.modeData.target) end, score=function(P)return{P.stat.score,P.stat.row}end, scoreDisp=function(D)return D[1].." "..D[2].." Lines"end, diff --git a/parts/modes/marathon_bfmax.lua b/parts/modes/marathon_bfmax.lua index 42290ac6..8c85ecce 100644 --- a/parts/modes/marathon_bfmax.lua +++ b/parts/modes/marathon_bfmax.lua @@ -36,10 +36,7 @@ return{ }, slowMark=true, mesDisp=function(P) - setFont(45) - mStr(P.stat.row,69,320) - mStr(P.modeData.target,69,370) - gc.rectangle('fill',25,375,90,4) + PLY.draw.drawProgress(P.stat.row,P.modeData.target) PLY.draw.drawTargetLine(P,200-P.stat.row) end, getRank=function(P) diff --git a/parts/modes/marathon_h.lua b/parts/modes/marathon_h.lua index f85b8570..98acbd1d 100644 --- a/parts/modes/marathon_h.lua +++ b/parts/modes/marathon_h.lua @@ -27,10 +27,7 @@ return{ }, slowMark=true, mesDisp=function(P) - setFont(45) - mStr(P.stat.row,69,320) - mStr(P.modeData.target,69,370) - gc.rectangle('fill',25,375,90,4) + PLY.draw.drawProgress(P.stat.row,P.modeData.target) PLY.draw.drawTargetLine(P,200-P.stat.row) end, score=function(P)return{math.min(P.stat.row,200),P.stat.time}end, diff --git a/parts/modes/marathon_n.lua b/parts/modes/marathon_n.lua index e6d465a1..3cb3f5a3 100644 --- a/parts/modes/marathon_n.lua +++ b/parts/modes/marathon_n.lua @@ -24,10 +24,7 @@ return{ }, slowMark=true, mesDisp=function(P) - setFont(45) - mStr(P.stat.row,69,320) - mStr(P.modeData.target,69,370) - gc.rectangle('fill',25,375,90,4) + PLY.draw.drawProgress(P.stat.row,P.modeData.target) PLY.draw.drawTargetLine(P,200-P.stat.row) end, score=function(P)return{math.min(P.stat.row,200),P.stat.time}end, diff --git a/parts/modes/master_final.lua b/parts/modes/master_final.lua index f707fa70..e1225443 100644 --- a/parts/modes/master_final.lua +++ b/parts/modes/master_final.lua @@ -58,10 +58,7 @@ return{ }, slowMark=true, mesDisp=function(P) - setFont(45) - mStr(P.modeData.pt,69,320) - mStr(P.modeData.target,69,370) - gc.rectangle('fill',25,375,90,4) + PLY.draw.drawProgress(P.modeData.pt,P.modeData.target) end, score=function(P)return{P.modeData.pt,P.stat.time}end, scoreDisp=function(D)return D[1].."P "..STRING.time(D[2])end, diff --git a/parts/modes/master_h.lua b/parts/modes/master_h.lua index daef8b85..73dc6823 100644 --- a/parts/modes/master_h.lua +++ b/parts/modes/master_h.lua @@ -74,10 +74,7 @@ return{ }, slowMark=true, mesDisp=function(P) - setFont(45) - mStr(P.modeData.pt,69,320) - mStr(P.modeData.target,69,370) - gc.rectangle('fill',25,375,90,4) + PLY.draw.drawProgress(P.modeData.pt,P.modeData.target) end, score=function(P)return{P.modeData.pt,P.stat.time}end, scoreDisp=function(D)return D[1].."P "..STRING.time(D[2])end, diff --git a/parts/modes/master_l.lua b/parts/modes/master_l.lua index 48258859..bd88d001 100644 --- a/parts/modes/master_l.lua +++ b/parts/modes/master_l.lua @@ -60,10 +60,7 @@ return{ }, slowMark=true, mesDisp=function(P) - setFont(45) - mStr(P.modeData.pt,69,320) - mStr(P.modeData.target,69,370) - gc.rectangle('fill',25,375,90,4) + PLY.draw.drawProgress(P.modeData.pt,P.modeData.target) end, score=function(P)return{P.modeData.pt,P.stat.time}end, scoreDisp=function(D)return D[1].."P "..STRING.time(D[2])end, diff --git a/parts/modes/master_n.lua b/parts/modes/master_n.lua index 62c695bb..76988c4e 100644 --- a/parts/modes/master_n.lua +++ b/parts/modes/master_n.lua @@ -74,10 +74,7 @@ return{ }, slowMark=true, mesDisp=function(P) - setFont(45) - mStr(P.modeData.pt,69,320) - mStr(P.modeData.target,69,370) - gc.rectangle('fill',25,375,90,4) + PLY.draw.drawProgress(P.modeData.pt,P.modeData.target) end, score=function(P)return{P.modeData.pt,P.stat.time}end, scoreDisp=function(D)return D[1].."P "..STRING.time(D[2])end, diff --git a/parts/modes/master_ph.lua b/parts/modes/master_ph.lua index 33465418..1ac1c39d 100644 --- a/parts/modes/master_ph.lua +++ b/parts/modes/master_ph.lua @@ -147,10 +147,7 @@ return{ }, slowMark=true, mesDisp=function(P) - setFont(45) - mStr(P.modeData.pt,69,320) - mStr(P.modeData.target,69,370) - gc.rectangle('fill',25,375,90,4) + PLY.draw.drawProgress(P.modeData.pt,P.modeData.target) end, score=function(P)return{P.result=='win'and 260 or P.modeData.pt,P.stat.time}end, scoreDisp=function(D)return D[1].."P "..STRING.time(D[2])end, diff --git a/parts/modes/master_u.lua b/parts/modes/master_u.lua index c536d35b..3d4b866e 100644 --- a/parts/modes/master_u.lua +++ b/parts/modes/master_u.lua @@ -69,10 +69,7 @@ return{ }, slowMark=true, mesDisp=function(P) - setFont(45) - mStr(P.modeData.pt,69,320) - mStr(P.modeData.target,69,370) - gc.rectangle('fill',25,375,90,4) + PLY.draw.drawProgress(P.modeData.pt,P.modeData.target) end, score=function(P)return{P.modeData.pt,P.stat.time}end, scoreDisp=function(D)return D[1].."P "..STRING.time(D[2])end, diff --git a/parts/modes/rhythm_e.lua b/parts/modes/rhythm_e.lua index dbc44c26..5377e068 100644 --- a/parts/modes/rhythm_e.lua +++ b/parts/modes/rhythm_e.lua @@ -45,10 +45,7 @@ return{ }, slowMark=true, mesDisp=function(P) - setFont(45) - mStr(P.stat.row,69,320) - mStr(P.modeData.target,69,370) - gc.rectangle('fill',25,375,90,4) + PLY.draw.drawProgress(P.stat.row,P.modeData.target) setFont(30) mStr(P.modeData.bpm,69,178) diff --git a/parts/modes/rhythm_h.lua b/parts/modes/rhythm_h.lua index 190b84e3..585c5bbb 100644 --- a/parts/modes/rhythm_h.lua +++ b/parts/modes/rhythm_h.lua @@ -45,10 +45,7 @@ return{ }, slowMark=true, mesDisp=function(P) - setFont(45) - mStr(P.stat.row,69,320) - mStr(P.modeData.target,69,370) - gc.rectangle('fill',25,375,90,4) + PLY.draw.drawProgress(P.stat.row,P.modeData.target) setFont(30) mStr(P.modeData.bpm,69,178) diff --git a/parts/modes/rhythm_u.lua b/parts/modes/rhythm_u.lua index 158e23bd..cb957e01 100644 --- a/parts/modes/rhythm_u.lua +++ b/parts/modes/rhythm_u.lua @@ -51,10 +51,7 @@ return{ }, slowMark=true, mesDisp=function(P) - setFont(45) - mStr(P.stat.row,69,320) - mStr(P.modeData.target,69,370) - gc.rectangle('fill',25,375,90,4) + PLY.draw.drawProgress(P.stat.row,P.modeData.target) setFont(30) mStr(P.modeData.bpm,69,178) diff --git a/parts/player/draw.lua b/parts/player/draw.lua index 3db4f89f..54cb065e 100644 --- a/parts/player/draw.lua +++ b/parts/player/draw.lua @@ -409,6 +409,7 @@ local function drawHold(P) local N=ENV.holdCount*72 gc_push('transform') gc_translate(12,20) + gc_setLineWidth(2) gc_setColor(0,0,0,.4)gc_rectangle('fill',0,0,100,N+8,5) gc_setColor(.97,.97,.975)gc_rectangle('line',0,0,100,N+8,5) N=#holdQueue