From e7bfc8335e28b9ccdbffa249e6aa7b468e677900 Mon Sep 17 00:00:00 2001
From: MrZ626 <1046101471@qq.com>
Date: Mon, 14 Jun 2021 19:59:47 +0800
Subject: [PATCH] =?UTF-8?q?MES=E6=A8=A1=E5=9D=97=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=85=AC=E5=91=8A=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Zframework/message.lua       | 9 ++++++++-
 parts/net.lua                | 4 ++--
 parts/scenes/app_console.lua | 3 ++-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/Zframework/message.lua b/Zframework/message.lua
index 9ae101a7..f014c802 100644
--- a/Zframework/message.lua
+++ b/Zframework/message.lua
@@ -23,6 +23,14 @@ local mesIcon={
 		{'fRect',18,11,4,4},
 		{'fRect',18,17,4,12},
 	},
+	broadcast=DOGC{40,40,
+		{'setCL',1,1,1},
+		{'fRect',2,4,36,26,3},
+		{'fPoly',2,27,2,37,14,25},
+		{'setCL',.5,.5,.5},
+		{'fRect',6,11,4,4},{'fRect',14,11,19,4},
+		{'fRect',6,19,4,4},{'fRect',14,19,19,4},
+	},
 	warn=DOGC{40,40,
 		{'setCL',.95,.83,.4},
 		{'fPoly',20.5,1,0,38,40,38},
@@ -52,7 +60,6 @@ local mesIcon={
 local MES={}
 
 function MES.new(icon,str,time)
-	-- icon=mesIcon.info
 	if type(icon)=='string'then icon=mesIcon[icon]end
 	local t=gc.newText(getFont(30),str)
 	local w=math.max(t:getWidth()+(icon and 45 or 5),200)
diff --git a/parts/net.lua b/parts/net.lua
index 2941067c..82a64a4e 100644
--- a/parts/net.lua
+++ b/parts/net.lua
@@ -416,10 +416,10 @@ function NET.updateWS_app()
 						if VERSION.code<res.newestCode then
 							MES.new('warn',text.oldVersion:gsub("$1",res.newestName),3)
 						end
-						MES.new('info',res.notice,5)
+						MES.new('broadcast',res.notice,5)
 						NET.tryLogin(true)
 					elseif res.action==0 then--Broadcast
-						MES.new('info',res.data.message,5)
+						MES.new('broadcast',res.data.message,5)
 					elseif res.action==1 then--Get notice
 						--?
 					elseif res.action==2 then--Register
diff --git a/parts/scenes/app_console.lua b/parts/scenes/app_console.lua
index e9a262cd..84340de2 100644
--- a/parts/scenes/app_console.lua
+++ b/parts/scenes/app_console.lua
@@ -303,6 +303,7 @@ local commands={}do
 			if
 				arg=='check'or
 				arg=='info'or
+				arg=='broadcast'or
 				arg=='warn'or
 				arg=='error'
 			then
@@ -310,7 +311,7 @@ local commands={}do
 			else
 				log{C.A,"Show a message on the up-left corner"}
 				log""
-				log{C.A,"Usage: mes <check|info|warn|error> [message]"}
+				log{C.A,"Usage: mes <check|info|broadcast|warn|error> [message]"}
 			end
 		end,
 		description="Show a message",