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