From 4c3219688bfb16359d563af03ef6e96c97613188 Mon Sep 17 00:00:00 2001
From: MrZ626 <1046101471@qq.com>
Date: Fri, 9 Apr 2021 02:27:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=E4=BB=A3=E7=A0=81=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=BA=9B=E8=81=94=E7=BD=91=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Zframework/widget.lua     | 4 ++--
 parts/net.lua             | 2 +-
 parts/scenes/net_game.lua | 3 ---
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/Zframework/widget.lua b/Zframework/widget.lua
index 26c9df19..f7db59cc 100644
--- a/Zframework/widget.lua
+++ b/Zframework/widget.lua
@@ -845,10 +845,10 @@ function textBox:update()
 end
 function textBox:push(t)
 	ins(self.texts,t)
-	if self.scrollPos==#self.texts-1 and not(self.hide==true or self.hide and self.hide())then
+	if self.scrollPos==#self.texts-1 then
 		self.scrollPos=#self.texts
 	else
-		SFX.play("spin_0",.8)
+		SFX.play("spin_0",.6)
 		self.new=true
 	end
 end
diff --git a/parts/net.lua b/parts/net.lua
index 36b1d856..53d8f61f 100644
--- a/parts/net.lua
+++ b/parts/net.lua
@@ -56,7 +56,7 @@ local function _parse(res)
 					)or
 					"[NO Message]"
 				),
-			"warning")
+			"warn")
 		end
 	end
 end
diff --git a/parts/scenes/net_game.lua b/parts/scenes/net_game.lua
index e6261800..0a3b916d 100644
--- a/parts/scenes/net_game.lua
+++ b/parts/scenes/net_game.lua
@@ -145,9 +145,6 @@ function scene.socketRead(cmd,d)
 			COLOR.dY,"#"..d.uid.." ",
 			COLOR.Y,text.leaveRoom,
 		}
-		if not playing then
-			initPlayerPosition(true)
-		end
 	elseif cmd=="Talk"then
 		textBox:push{
 			COLOR.W,d.username,