From be1794049b2ad06cc3332965fa1c5bb7a87b56b7 Mon Sep 17 00:00:00 2001
From: MrZ626 <1046101471@qq.com>
Date: Sat, 5 Dec 2020 22:36:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E8=BF=9B=E5=87=BA=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E6=A0=B7=E5=BC=8F(=E6=9C=8D=E5=8A=A1=E5=99=A8?=
 =?UTF-8?q?=E9=85=8D=E5=90=88=E8=B0=83=E6=95=B4)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 parts/language/lang_en.lua |  4 ++--
 parts/language/lang_fr.lua |  4 ++--
 parts/language/lang_sp.lua |  4 ++--
 parts/language/lang_zh.lua |  4 ++--
 parts/scenes/chat.lua      | 25 ++++++++++++-------------
 5 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua
index a6b6282e..1f3ee898 100644
--- a/parts/language/lang_en.lua
+++ b/parts/language/lang_en.lua
@@ -91,8 +91,8 @@ return{
 	-- wsDisconnected="WS连接断开",
 	-- wsNoConn="WS未连接",
 
-	-- chatJoin="有人来了,当前人数:",
-	-- chatLeave="有人离开了,当前人数:",
+	-- chatJoin="进入房间",
+	-- chatLeave="离开房间",
 	-- chatRemain="人数:",
 	-- chatHistory="------以上是历史消息------",
 
diff --git a/parts/language/lang_fr.lua b/parts/language/lang_fr.lua
index 8f177f3d..23936ebe 100644
--- a/parts/language/lang_fr.lua
+++ b/parts/language/lang_fr.lua
@@ -94,8 +94,8 @@ return{
 	-- wsDisconnected="WS连接断开",
 	-- wsNoConn="WS未连接",
 
-	-- chatJoin="有人来了,当前人数:",
-	-- chatLeave="有人离开了,当前人数:",
+	-- chatJoin="进入房间",
+	-- chatLeave="离开房间",
 	-- chatRemain="人数:",
 	-- chatHistory="------以上是历史消息------",
 
diff --git a/parts/language/lang_sp.lua b/parts/language/lang_sp.lua
index 42dd07d5..c06135dc 100644
--- a/parts/language/lang_sp.lua
+++ b/parts/language/lang_sp.lua
@@ -95,8 +95,8 @@ return{
 	-- wsDisconnected="WS连接断开",
 	-- wsNoConn="WS未连接",
 
-	-- chatJoin="有人来了,当前人数:",
-	-- chatLeave="有人离开了,当前人数:",
+	-- chatJoin="进入房间",
+	-- chatLeave="离开房间",
 	-- chatRemain="人数:",
 	-- chatHistory="------以上是历史消息------",
 
diff --git a/parts/language/lang_zh.lua b/parts/language/lang_zh.lua
index 4aa8f5a7..4743802a 100644
--- a/parts/language/lang_zh.lua
+++ b/parts/language/lang_zh.lua
@@ -92,8 +92,8 @@ return{
 	wsDisconnected="WS连接断开",
 	wsNoConn="WS未连接",
 
-	chatJoin="有人来了,当前人数:",
-	chatLeave="有人离开了,当前人数:",
+	chatJoin="进入房间",
+	chatLeave="离开房间",
 	chatRemain="人数:",
 	chatHistory="------以上是历史消息------",
 
diff --git a/parts/scenes/chat.lua b/parts/scenes/chat.lua
index e47c26aa..19405a5d 100644
--- a/parts/scenes/chat.lua
+++ b/parts/scenes/chat.lua
@@ -33,8 +33,8 @@ function scene.sceneInit()
 
 	scroll=#texts
 	if scroll>0 then
-		if texts[scroll][1]~=COLOR.green then
-			ins(texts,{COLOR.green,text.chatHistory})
+		if texts[scroll][1]~=COLOR.dG then
+			ins(texts,{COLOR.dG,text.chatHistory})
 			scroll=scroll+1
 		end
 	end
@@ -76,22 +76,21 @@ function scene.socketRead(mes)
 		local sep=mes:find(":")
 		local cmd=mes:sub(2,sep-1)
 		local data=mes:sub(sep+1)
-		if cmd=="J"then
-			remain=tonumber(data)
-			if remain<=10 then
-				ins(texts,{COLOR.yellow,text.chatJoin..remain})
-			end
-		elseif cmd=="L"then
-			remain=tonumber(data)
-			if remain<=10 then
-				ins(texts,{COLOR.yellow,text.chatLeave..remain})
-			end
+		if cmd=="J"or cmd=="L"then
+			sep=data:find("@")
+			local num=data:find("#")
+			remain=tonumber(data:sub(1,sep-1))
+			ins(texts,{
+				COLOR.lR,data:sub(sep+1,num-1),
+				COLOR.dY,data:sub(num).." ",
+				COLOR.Y,(cmd=="J"and text.chatJoin or text.chatLeave),
+			})
 		end
 	else--user message
 		local sep=mes:find(":")
 		local num=mes:find("#")
 		ins(texts,{
-			COLOR.white,mes:sub(1,num-1),
+			COLOR.W,mes:sub(1,num-1),
 			COLOR.dY,mes:sub(num,sep-1).." ",
 			COLOR.sky,mes:sub(sep+1),
 		})