SKIN.libColor改名为minoColor并且从SKIN模块移到list

Zframework/init.lua

@@ -514,7 +514,7 @@ function love.run()
 					--Draw cursor
 					if mouseShow then
 						local R=int((t+1)/2)%7+1
-						_=SKIN.libColor[SETTING.skin[R]]
+						_=minoColor[SETTING.skin[R]]
 						gc_setColor(_[1],_[2],_[3],min(abs(1-t%2),.3))
 						_=SCS[R][0]
 						gc_draw(TEXTURE.miniBlock[R],mx,my,t%3.14159265359*4,16,16,_[2]+.5,#BLOCKS[R][0]-_[1]-.5)

parts/backgrounds/lightning2.lua

@@ -8,7 +8,7 @@ local colorLib
 local blocks
 local scs
 function back.init()
-	colorLib=SKIN.libColor
+	colorLib=minoColor
 	blocks=BLOCKS
 	scs=SCS
 	t=rnd()*2600

parts/list.lua

@@ -298,4 +298,31 @@ rankColor={
 	COLOR.lBlue,	--A
 	COLOR.lCyan,	--S
 	COLOR.lGreen,	--Special
+}
+
+minoColor={
+	COLOR.red,
+	COLOR.fire,
+	COLOR.orange,
+	COLOR.yellow,
+	COLOR.lame,
+	COLOR.grass,
+	COLOR.green,
+	COLOR.water,
+	COLOR.cyan,
+	COLOR.sky,
+	COLOR.sea,
+	COLOR.blue,
+	COLOR.purple,
+	COLOR.grape,
+	COLOR.magenta,
+	COLOR.pink,
+	COLOR.dGrey,
+	COLOR.black,
+	COLOR.lYellow,
+	COLOR.grey,
+	COLOR.lGrey,
+	COLOR.dPurple,
+	COLOR.dRed,
+	COLOR.dGreen,
 }

parts/player/draw.lua

@@ -933,7 +933,7 @@ function draw.demo(P)
 			gc_pop()
 
 			local blockImg=TEXTURE.miniBlock
-			local libColor=SKIN.libColor
+			local libColor=minoColor
 			local skinSet=ENV.skin
 			--Draw hold
 			local N=1

parts/player/player.lua

@@ -107,7 +107,7 @@ function Player.createBeam(P,R,send,color)
 	else x2,y2=R.x+308*R.size,R.y+450*R.size
 	end
 
-	local r,g,b=unpack(SKIN.libColor[color])
+	local r,g,b=unpack(minoColor[color])
 	r,g,b=r*2,g*2,b*2
 
 	local a=GAME.modeEnv.royaleMode and not(P.type=="human"or R.type=="human")and .2 or 1

parts/scenes/custom_field.lua

@@ -213,7 +213,7 @@ function scene.draw()
 	--Draw pen color
 	if pen>0 then
 		gc.setLineWidth(13)
-		gc.setColor(SKIN.libColor[pen])
+		gc.setColor(minoColor[pen])
 		gc.rectangle("line",565,495,70,70)
 	elseif pen==-1 then
 		gc.setLineWidth(5)

parts/scenes/custom_mission.lua

@@ -127,7 +127,7 @@ function scene.draw()
 	gc.print(input,1200,275)
 
 	--Draw targets
-	local libColor=SKIN.libColor
+	local libColor=minoColor
 	local set=SETTING.skin
 	local L=MISSION
 	local x,y=100,136--Next block pos

parts/scenes/custom_sequence.lua

@@ -129,7 +129,7 @@ function scene.draw()
 
 	--Draw sequence
 	local miniBlock=TEXTURE.miniBlock
-	local libColor=SKIN.libColor
+	local libColor=minoColor
 	local set=SETTING.skin
 	local L=BAG
 	local x,y=120,136--Next block pos

parts/scenes/stat.lua

@@ -46,7 +46,7 @@ end
 
 function scene.draw()
 	setFont(25)
-	local _,__=SKIN.libColor,SETTING.skin
+	local _,__=minoColor,SETTING.skin
 	local A,B=form.A1,form.A2
 	for x=1,7 do
 		gc.setColor(_[__[x]])

parts/skin.lua

@@ -18,32 +18,6 @@ function SKIN.init(list)
 	local count=#list function SKIN.getCount()return count end
 	SKIN.lib={}
 	SKIN.libMini={}
-	SKIN.libColor={
-		COLOR.red,
-		COLOR.fire,
-		COLOR.orange,
-		COLOR.yellow,
-		COLOR.lame,
-		COLOR.grass,
-		COLOR.green,
-		COLOR.water,
-		COLOR.cyan,
-		COLOR.sky,
-		COLOR.sea,
-		COLOR.blue,
-		COLOR.purple,
-		COLOR.grape,
-		COLOR.magenta,
-		COLOR.pink,
-		COLOR.dGrey,
-		COLOR.black,
-		COLOR.lYellow,
-		COLOR.grey,
-		COLOR.lGrey,
-		COLOR.dPurple,
-		COLOR.dRed,
-		COLOR.dGreen,
-	}
 
 	local function load(skip)
 		for i=1,count do

parts/texture.lua

@@ -31,14 +31,14 @@ TEXTURE.puzzleMark={}
 gc.setLineWidth(3)
 for i=1,17 do
 	TEXTURE.puzzleMark[i]=C(30,30)
-	local _=SKIN.libColor[i]
+	local _=minoColor[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.setColor(minoColor[i])
 	gc.rectangle("line",7,7,16,16)
 end
 local _=C(30,30)