From 10343559a6b0d87466b749fc31f40b5c134273ec Mon Sep 17 00:00:00 2001
From: MrZ626 <1046101471@qq.com>
Date: Mon, 21 Dec 2020 13:32:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=98=E6=B1=B0=E4=B8=80=E4=B8=AA=E6=B2=A1?=
 =?UTF-8?q?=E5=95=A5=E7=94=A8=E7=9A=84=E7=8E=A9=E5=AE=B6=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 parts/player/draw.lua | 6 ++++--
 parts/player/init.lua | 6 ------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/parts/player/draw.lua b/parts/player/draw.lua
index 1758942c..5c5bf606 100644
--- a/parts/player/draw.lua
+++ b/parts/player/draw.lua
@@ -698,11 +698,13 @@ function draw.demo(P)
 			gc.pop()
 
 			local blockImg=TEXTURE.miniBlock
+			local libColor=SKIN.libColor
+			local skinSet=ENV.skin
 			--Draw hold
 			local N=1
 			while P.holdQueue[N]do
 				local id=P.holdQueue[N].id
-				_=P.color[id]
+				_=libColor[skinSet[id]]
 				gc_setColor(_[1],_[2],_[3],.3)
 				_=blockImg[id]
 				gc.draw(_,15,40*N-10,nil,16,nil,0,_:getHeight()*.5)
@@ -713,7 +715,7 @@ function draw.demo(P)
 			N=1
 			while N<=ENV.nextCount and P.nextQueue[N]do
 				local id=P.nextQueue[N].id
-				_=P.color[id]
+				_=libColor[skinSet[id]]
 				gc_setColor(_[1],_[2],_[3],.3)
 				_=blockImg[id]
 				gc.draw(_,285,40*N-10,nil,16,nil,_:getWidth(),_:getHeight()*.5)
diff --git a/parts/player/init.lua b/parts/player/init.lua
index 3dd5b0fd..60a53b1c 100644
--- a/parts/player/init.lua
+++ b/parts/player/init.lua
@@ -130,7 +130,6 @@ local function newEmptyPlayer(id,mini)
 	P.atker,P.atking,P.lastRecv={}
 
 	P.dropDelay,P.lockDelay=0,0
-	P.color={}
 	P.showTime=nil
 	P.keepVisible=true
 
@@ -228,11 +227,6 @@ local function applyGameEnv(P)--Finish gameEnv processing
 	P.lockDelay=ENV.lock
 	P.freshTime=ENV.freshLimit
 
-	P.color={}
-	for _=1,7 do
-		P.color[_]=SKIN.libColor[ENV.skin[_]]
-	end
-
 	P.life=ENV.life
 
 	P.keyAvailable={true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true}