From 6a648ae4d50bbc0b389b89ed4cdac789a4890261 Mon Sep 17 00:00:00 2001
From: MrZ626 <1046101471@qq.com>
Date: Mon, 15 Feb 2021 00:04:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A2=A0=E5=80=92=E5=9C=BA?=
 =?UTF-8?q?=E5=9C=B0=E5=90=8E=E7=BD=91=E6=A0=BC=E6=98=BE=E7=A4=BA=E4=B8=8D?=
 =?UTF-8?q?=E6=AD=A3=E7=A1=AE=EF=BC=8C=E6=95=B4=E7=90=86=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 parts/player/draw.lua | 39 +++++++++++++++++++++------------------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/parts/player/draw.lua b/parts/player/draw.lua
index be9b1fa6..790aa3c2 100644
--- a/parts/player/draw.lua
+++ b/parts/player/draw.lua
@@ -220,6 +220,13 @@ local function drawNextPreview(P,B)
 		end
 	end end
 end
+local function drawBoarders(P)
+	gc_setLineWidth(2)
+	gc_setColor(frameColorList[P.frameColor])
+	gc_rectangle("line",-1,-11,302,612)--Bis Boarder
+	gc_rectangle("line",301,-3,15,604)--AtkBuffer boarder
+	gc_rectangle("line",-16,-3,15,604)--B2b bar boarder
+end
 local attackColor={
 	{COLOR.dGrey,COLOR.white},
 	{COLOR.grey,COLOR.white},
@@ -551,14 +558,17 @@ function draw.norm(P)
 				gc_setColor(0,0,0,.6)
 				gc_rectangle("fill",0,-10,300,610)
 
-				--Draw grid
-				if ENV.grid then drawGrid(P)end
-
 				--In-field things
 				gc_push("transform")
 					boardTransform(ENV.flipBoard)
 
+					--Draw grid
+					if ENV.grid then drawGrid(P)end
+
+					--Move camera
 					gc_translate(0,600+FBN+FUP)
+
+					--Set scissor
 					gc.setScissor(SCR.x+(P.absFieldX+P.fieldOff.x)*SCR.k,SCR.y+(P.absFieldY+P.fieldOff.y)*SCR.k,300*P.size*SCR.k,610*P.size*SCR.k)
 
 					--Draw dangerous area
@@ -612,12 +622,7 @@ function draw.norm(P)
 					gc.setScissor()
 				gc_pop()
 
-				gc_setLineWidth(2)
-				gc_setColor(frameColorList[P.frameColor])
-				gc_rectangle("line",-1,-11,302,612)--Boarder
-				gc_rectangle("line",301,-3,15,604)--AtkBuffer boarder
-				gc_rectangle("line",-16,-3,15,604)--B2b bar boarder
-
+				drawBoarders(P)
 				drawBuffer(P)
 				drawB2Bbar(P)
 				drawHold(P)
@@ -710,14 +715,17 @@ function draw.norm_remote(P)
 				gc_setColor(0,0,0,.6)
 				gc_rectangle("fill",0,-10,300,610)
 
-				--Draw grid
-				if ENV.grid then drawGrid(P)end
-
 				--In-field things
 				gc_push("transform")
 					boardTransform(ENV.flipBoard)
 
+					--Draw grid
+					if ENV.grid then drawGrid(P)end
+
+					--Move camera
 					gc_translate(0,600+FBN+FUP)
+
+					--Set scissor
 					gc.setScissor(SCR.x+(P.absFieldX+P.fieldOff.x)*SCR.k,SCR.y+(P.absFieldY+P.fieldOff.y)*SCR.k,300*P.size*SCR.k,610*P.size*SCR.k)
 
 					--Draw dangerous area
@@ -771,12 +779,7 @@ function draw.norm_remote(P)
 					gc.setScissor()
 				gc_pop()
 
-				gc_setLineWidth(2)
-				gc_setColor(frameColorList[P.frameColor])
-				gc_rectangle("line",-1,-11,302,612)--Boarder
-				gc_rectangle("line",301,-3,15,604)--AtkBuffer boarder
-				gc_rectangle("line",-16,-3,15,604)--B2b bar boarder
-
+				drawBoarders(P)
 				drawBuffer(P)
 				drawB2Bbar(P)
 				drawHold(P)