From aa9dca918da85aaed8494ec310f561f844560aa3 Mon Sep 17 00:00:00 2001
From: MrZ626 <1046101471@qq.com>
Date: Thu, 10 Sep 2020 01:00:45 +0800
Subject: [PATCH] =?UTF-8?q?LOG.print=E5=8F=96=E6=B6=88"short"=E8=BE=93?=
 =?UTF-8?q?=E5=87=BA=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Zframework/log.lua | 11 ++++-------
 parts/player.lua   |  2 +-
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/Zframework/log.lua b/Zframework/log.lua
index 54be1b3c..c988459a 100644
--- a/Zframework/log.lua
+++ b/Zframework/log.lua
@@ -46,9 +46,7 @@ end
 function LOG.print(text,T,C)--type/time,color
 	local time
 	local his
-	if type(T)=="table"then
-		C,T=T or color.white
-	elseif T=="warn"then
+	if T=="warn"then
 		C=C or color.yellow
 		his=true
 		time=180
@@ -59,19 +57,18 @@ function LOG.print(text,T,C)--type/time,color
 	elseif T=="message"then
 		C=C or color.green
 		his=true
-	elseif T=="short"then
-		C=C or color.orange
-		time=20
 	elseif type(T)=="number"then
 		C=C or color.white
 		time=T
+	elseif type(T)=="table"then
+		C,T=T or color.white
 	elseif not C then
 		C=color.white
 	end
 	if his then
 		ins(debugMesHistory,SCN.cur..": "..tostring(text))
 	end
-	ins(debugMesList,{text=text,r=C[1],g=C[2],b=C[3],blink=30,time=time or 150})
+	ins(debugMesList,{text=text,r=C[1],g=C[2],b=C[3],blink=30,time=time or 120})
 end
 function LOG.copy()
 	local str=table.concat(debugMesHistory,"\n")
diff --git a/parts/player.lua b/parts/player.lua
index 0f0cfd99..935d8e61 100644
--- a/parts/player.lua
+++ b/parts/player.lua
@@ -2735,7 +2735,7 @@ function player.act.restart(P)
 		TASK.removeTask_code(TICK.autoPause)
 		resetPartGameData()
 	else
-		LOG.print(text.holdR,"short")
+		LOG.print(text.holdR,20,color.orange)
 	end
 end
 function player.act.insLeft(P,auto)