From ecf899f610572898d9ae9af7839a17ac3558c994 Mon Sep 17 00:00:00 2001
From: MrZ626 <1046101471@qq.com>
Date: Thu, 4 Mar 2021 15:14:36 +0800
Subject: [PATCH] =?UTF-8?q?puzzleMark=E7=B4=A0=E6=9D=90=E5=88=9D=E5=A7=8B?=
 =?UTF-8?q?=E5=8C=96=E7=A7=BB=E5=87=BAload=E8=BF=87=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 parts/modes/custom_puzzle.lua |  4 ++--
 parts/player/draw.lua         |  3 ++-
 parts/scenes/customGame.lua   |  2 +-
 parts/scenes/custom_field.lua |  2 +-
 parts/scenes/load.lua         | 31 -------------------------------
 parts/texture.lua             | 24 ++++++++++++++++++++++++
 6 files changed, 30 insertions(+), 36 deletions(-)

diff --git a/parts/modes/custom_puzzle.lua b/parts/modes/custom_puzzle.lua
index 278bc245..4f3ecc07 100644
--- a/parts/modes/custom_puzzle.lua
+++ b/parts/modes/custom_puzzle.lua
@@ -57,12 +57,12 @@ return{
 		mStr(P.stat.row,69,225)
 		mText(drawableText.line,69,290)
 		if P.modeData.event==0 then
-			local m=puzzleMark
+			local mark=TEXTURE.puzzleMark
 			local F=FIELD[P.modeData.point+1]
 			for y=1,20 do for x=1,10 do
 				local T=F[y][x]
 				if T~=0 then
-					gc.draw(m[T],150+30*x-30+dx,600-30*y+dy)
+					gc.draw(mark[T],150+30*x-30+dx,600-30*y+dy)
 				end
 			end end
 		end
diff --git a/parts/player/draw.lua b/parts/player/draw.lua
index 68c468d0..26097354 100644
--- a/parts/player/draw.lua
+++ b/parts/player/draw.lua
@@ -215,9 +215,10 @@ local function drawNextPreview(P,B)
 	local y=int(P.gameEnv.fieldH+1-modf(B.sc[1]))+ceil(P.fieldBeneath/30)
 	B=B.bk
 	local x=int(6-#B[1]*.5)
+	local cross=TEXTURE.puzzleMark[-1]
 	for i=1,#B do for j=1,#B[1]do
 		if B[i][j]then
-			gc_draw(puzzleMark[-1],30*(x+j-2),30*(1-y-i))
+			gc_draw(cross,30*(x+j-2),30*(1-y-i))
 		end
 	end end
 end
diff --git a/parts/scenes/customGame.lua b/parts/scenes/customGame.lua
index d7f82427..8dce60c0 100644
--- a/parts/scenes/customGame.lua
+++ b/parts/scenes/customGame.lua
@@ -103,7 +103,7 @@ function scene.draw()
 		gc.setLineWidth(3)
 		gc.rectangle("line",-2,-2,304,604)
 		local F=FIELD[1]
-		local cross=puzzleMark[-1]
+		local cross=TEXTURE.puzzleMark[-1]
 		local texture=SKIN.curText
 		for y=1,20 do for x=1,10 do
 			local B=F[y][x]
diff --git a/parts/scenes/custom_field.lua b/parts/scenes/custom_field.lua
index d8463c53..53cdb0c0 100644
--- a/parts/scenes/custom_field.lua
+++ b/parts/scenes/custom_field.lua
@@ -171,7 +171,7 @@ function scene.draw()
 	gc.setLineWidth(3)
 	gc.rectangle("line",-2,-2,304,604)
 	gc.setLineWidth(2)
-	local cross=puzzleMark[-1]
+	local cross=TEXTURE.puzzleMark[-1]
 	local F=FIELD[page]
 	local texture=SKIN.curText
 	for y=1,20 do for x=1,10 do
diff --git a/parts/scenes/load.lua b/parts/scenes/load.lua
index 9f6c82f9..bbe6f9a6 100644
--- a/parts/scenes/load.lua
+++ b/parts/scenes/load.lua
@@ -27,7 +27,6 @@ function scene.sceneInit()
 		SKIN.getCount(),
 		#MODES,
 		1,
-		1,
 	}
 	studioLogo=gc.newText(getFont(80),"26F Studio")
 	skip=false--If skipped
@@ -78,36 +77,6 @@ function scene.update()
 			-- M.icon=gc.newImage("media/image/modeIcon/"..m.icon..".png")
 			-- M.icon=gc.newImage("media/image/modeIcon/custom.png")
 		elseif phase==8 then
-			local function C(x,y)
-				local _=gc.newCanvas(x,y)
-				gc.setCanvas(_)
-				return _
-			end
-
-			puzzleMark={}
-			gc.setLineWidth(3)
-			for i=1,17 do
-				puzzleMark[i]=C(30,30)
-				local _=SKIN.libColor[i]
-				gc.setColor(_[1],_[2],_[3],.6)
-				gc.rectangle("line",5,5,20,20)
-				gc.rectangle("line",10,10,10,10)
-			end
-			for i=18,24 do
-				puzzleMark[i]=C(30,30)
-				gc.setColor(SKIN.libColor[i])
-				gc.rectangle("line",7,7,16,16)
-			end
-			local _=C(30,30)
-			gc.setColor(1,1,1)
-			gc.line(5,5,25,25)
-			gc.line(5,25,25,5)
-			puzzleMark[-1]=C(30,30)
-			gc.setColor(1,1,1,.8)
-			gc.draw(_)
-			_:release()
-			gc.setCanvas()
-		elseif phase==9 then
 			SKIN.change(SETTING.skinSet)
 			if newVersionLaunch then--Delete old ranks & Unlock modes which should be unlocked
 				for name,rank in next,RANKS do
diff --git a/parts/texture.lua b/parts/texture.lua
index f15c2965..f704ceb2 100644
--- a/parts/texture.lua
+++ b/parts/texture.lua
@@ -27,6 +27,30 @@ for i=1,29 do
 	end end
 end
 
+TEXTURE.puzzleMark={}
+gc.setLineWidth(3)
+for i=1,17 do
+	TEXTURE.puzzleMark[i]=C(30,30)
+	local _=SKIN.libColor[i]
+	gc.setColor(_[1],_[2],_[3],.6)
+	gc.rectangle("line",5,5,20,20)
+	gc.rectangle("line",10,10,10,10)
+end
+for i=18,24 do
+	TEXTURE.puzzleMark[i]=C(30,30)
+	gc.setColor(SKIN.libColor[i])
+	gc.rectangle("line",7,7,16,16)
+end
+local _=C(30,30)
+gc.setColor(1,1,1)
+gc.line(5,5,25,25)
+gc.line(5,25,25,5)
+TEXTURE.puzzleMark[-1]=C(30,30)
+gc.setColor(1,1,1,.8)
+gc.draw(_)
+_:release()
+gc.setCanvas()
+
 TEXTURE.mapCross=C(40,40)
 gc.setColor(1,1,1)
 gc.setLineWidth(4)