From c6f92a30303d7db2664a0f82c72c8e9195c217c4 Mon Sep 17 00:00:00 2001
From: MrZ_26 <1046101471@qq.com>
Date: Sat, 5 Nov 2022 22:59:21 +0800
Subject: [PATCH] =?UTF-8?q?=E7=95=A5=E5=BE=AE=E9=99=8D=E4=BD=8E=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7=E7=AB=AF=E5=8F=91=E8=A8=80=E9=A2=91=E7=8E=87=E9=99=90?=
 =?UTF-8?q?=E5=88=B6=20=E5=8F=91=E8=A8=80id=E5=92=8C=E6=96=87=E6=9C=AC?=
 =?UTF-8?q?=E4=B9=8B=E9=97=B4=E5=8A=A0=E4=B8=80=E4=B8=AA=E7=A9=BA=E6=A0=BC?=
 =?UTF-8?q?=20=E6=A1=86=E6=9E=B6=E8=B7=9F=E8=BF=9B=EF=BC=8C=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8DtextBox=E6=8E=A7=E4=BB=B6=E5=92=8ClistBox=E6=8E=A7?=
 =?UTF-8?q?=E4=BB=B6=E6=98=BE=E7=A4=BA=E8=8C=83=E5=9B=B4=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Zframework b/Zframework
index 8a56f3f9..8e39257d 160000
--- a/Zframework
+++ b/Zframework
@@ -1 +1 @@
-Subproject commit 8a56f3f9b0a2d7f73aff664138d3a987defb6c03
+Subproject commit 8e39257d646c9c736883b8f79bf0a2ac5526a01e
diff --git a/parts/net.lua b/parts/net.lua
index a1e048f6..da989a5f 100644
--- a/parts/net.lua
+++ b/parts/net.lua
@@ -474,7 +474,7 @@ end
 
 -- Room
 function NET.room_chat(msg,rid)
-    if not TASK.lock('chatLimit',1.626) then
+    if not TASK.lock('chatLimit',1.26) then
         MES.new('warn',text.tooFrequent)
     elseif #msg>0 then
         wsSend(1300,{
@@ -590,7 +590,7 @@ function NET.wsCallBack.room_chat(body)
     TASK.unlock('receiveMessage')
     TASK.lock('receiveMessage',1)
     NET.textBox:push{
-        COLOR.Z,_getFullName(body.data.playerId),
+        COLOR.Z,_getFullName(body.data.playerId).." ",
         COLOR.N,body.data.message,
     }
 end