From 7fe275f1687e8d9a0759ddffcf08eba85cd6bc67 Mon Sep 17 00:00:00 2001
From: MrZ626 <1046101471@qq.com>
Date: Thu, 12 Nov 2020 19:52:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=8E=A9=E5=AE=B6=E7=B1=BBse?=
 =?UTF-8?q?tHold=E6=96=B9=E6=B3=95=EF=BC=8CapplyGameEnv=E5=87=BD=E6=95=B0?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=E6=9B=B4=E5=A4=9A=E7=9A=84set=E5=88=9D?=
 =?UTF-8?q?=E5=A7=8B=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 parts/player/init.lua   | 23 ++++++++---------------
 parts/player/player.lua |  5 +++--
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/parts/player/init.lua b/parts/player/init.lua
index c77dbfb3..cf057fc3 100644
--- a/parts/player/init.lua
+++ b/parts/player/init.lua
@@ -110,13 +110,6 @@ local function applyGameEnv(P)--Finish gameEnv processing
 		P.color[_]=SKIN.libColor[ENV.skin[_]]
 	end
 
-	P.keepVisible=ENV.visible=="show"
-	P.showTime=
-		ENV.visible=="show"and 1e99 or
-		ENV.visible=="time"and 300 or
-		ENV.visible=="fast"and 20 or
-		ENV.visible=="none"and 0
-
 	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}
@@ -132,14 +125,14 @@ local function applyGameEnv(P)--Finish gameEnv processing
 		P.keyAvailable[v]=false
 		virtualkey[v].ava=false
 	end
-	if P._20G then
-		P.keyAvailable[7]=false
-		virtualkey[7].ava=false
-	end
-	if not ENV.hold then
-		P.keyAvailable[8]=false
-		virtualkey[8].ava=false
-	end
+	P:setInvisible(
+		ENV.visible=="show"and -1 or
+		ENV.visible=="time"and 300 or
+		ENV.visible=="fast"and 20 or
+		ENV.visible=="none"and 0
+	)
+	P:set20G(P._20G)
+	P:setHold(ENV.hold)
 
 	if type(ENV.mission)=="table"then
 		P.curMission=1
diff --git a/parts/player/player.lua b/parts/player/player.lua
index 0ac33524..eb2cbef9 100644
--- a/parts/player/player.lua
+++ b/parts/player/player.lua
@@ -115,8 +115,8 @@ function Player.set20G(P,if20g,init)
 end
 function Player.setHold(P,ifhold)
 	P.gameEnv.hold=ifhold
-	P.keyAvailable[8]=not ifhold
-	virtualkey[8].ava=not ifhold
+	P.keyAvailable[8]=ifhold
+	virtualkey[8].ava=ifhold
 	if not ifhold then
 		P.hd=nil
 	end
@@ -127,6 +127,7 @@ end
 function Player.setInvisible(P,time)
 	if time<0 then
 		P.keepVisible=true
+		P.showTime=1e99
 	else
 		P.keepVisible=false
 		P.showTime=time