From 2131aea57570818dbc23f85a2df825a8a530d1b8 Mon Sep 17 00:00:00 2001 From: MrZ626 <1046101471@qq.com> Date: Wed, 3 Nov 2021 15:41:13 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8E=A9=E5=AE=B6=E7=B1=BB=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E7=9B=AE=E6=A0=87=E7=BA=BF=E7=BB=98=E5=88=B6?= =?UTF-8?q?=E5=87=BD=E6=95=B0=20=E5=A0=86=E5=8F=A0=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=9C=80=E8=A6=81=E5=A1=AB=E6=BB=A1=E7=9A=84?= =?UTF-8?q?=E9=AB=98=E5=BA=A6=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- parts/eventsets/stack_e.lua | 1 + parts/eventsets/stack_h.lua | 1 + parts/eventsets/stack_u.lua | 1 + parts/player/draw.lua | 22 ++++++++++++++++------ 4 files changed, 19 insertions(+), 6 deletions(-) diff --git a/parts/eventsets/stack_e.lua b/parts/eventsets/stack_e.lua index 9d2eb852..b103b175 100644 --- a/parts/eventsets/stack_e.lua +++ b/parts/eventsets/stack_e.lua @@ -5,6 +5,7 @@ return{ setFont(60) mStr(P.stat.row,63,280) mText(TEXTOBJ.line,63,350) + PLY.draw.drawMarkLine(P,20,.3,1,1,TIME()%.42<.21 and .95 or .6) end, dropPiece=function(P) if #P.field>20 then diff --git a/parts/eventsets/stack_h.lua b/parts/eventsets/stack_h.lua index e4b2138f..a1f80bb0 100644 --- a/parts/eventsets/stack_h.lua +++ b/parts/eventsets/stack_h.lua @@ -5,6 +5,7 @@ return{ setFont(60) mStr(P.stat.row,63,280) mText(TEXTOBJ.line,63,350) + PLY.draw.drawMarkLine(P,18,.3,1,1,TIME()%.42<.21 and .95 or .6) end, dropPiece=function(P) if #P.field>20 then diff --git a/parts/eventsets/stack_u.lua b/parts/eventsets/stack_u.lua index c0cb83e9..36df7758 100644 --- a/parts/eventsets/stack_u.lua +++ b/parts/eventsets/stack_u.lua @@ -5,6 +5,7 @@ return{ setFont(60) mStr(P.stat.row,63,280) mText(TEXTOBJ.line,63,350) + PLY.draw.drawMarkLine(P,17,.3,1,1,TIME()%.42<.21 and .95 or .6) end, dropPiece=function(P) if #P.field>20 then diff --git a/parts/player/draw.lua b/parts/player/draw.lua index 0d1a0bb0..6056b7b8 100644 --- a/parts/player/draw.lua +++ b/parts/player/draw.lua @@ -658,16 +658,26 @@ local draw={} draw.drawGhost=drawGhost draw.applyField=_applyField draw.cancelField=_cancelField -function draw.drawTargetLine(P,r) - if r<=20+(P.fieldBeneath+P.fieldUp+10)/30 and r>0 then +function draw.drawTargetLine(P,h) + if h<=20+(P.fieldBeneath+P.fieldUp+10)/30 and h>0 then gc_setLineWidth(3) - gc_setColor(1,r>10 and 0 or .2+.8*rnd(),.5) + gc_setColor(1,h>10 and 0 or .2+.8*rnd(),.5) _applyField(P) - r=600-30*r + h=600-30*h if P.falling~=-1 then - r=r-#P.clearingRow*(P.gameEnv.smooth and(P.falling/(P.gameEnv.fall+1))^1.6*30 or 30) + h=h-#P.clearingRow*(P.gameEnv.smooth and(P.falling/(P.gameEnv.fall+1))^1.6*30 or 30) end - gc_line(0,r,300,r) + gc_line(0,h,300,h) + _cancelField() + end +end +function draw.drawMarkLine(P,h,r,g,b,a) + if h<=20+(P.fieldBeneath+P.fieldUp+10)/30 and h>0 then + gc_setLineWidth(4) + gc_setColor(r,g,b,a) + _applyField(P) + h=600-30*h + gc_line(0,h,300,h) _cancelField() end end