From ad3ac1661daaf4b445914f87009d3d88c990f040 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期二, 28 四月 2026 11:45:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into h5version

---
 Main/System/Message/SysNotifyMgr.cs |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Main/System/Message/SysNotifyMgr.cs b/Main/System/Message/SysNotifyMgr.cs
index f9aa613..04ee321 100644
--- a/Main/System/Message/SysNotifyMgr.cs
+++ b/Main/System/Message/SysNotifyMgr.cs
@@ -241,11 +241,14 @@
                 case SysNotifyType.SysMarqueeTip:
                     ServerTipDetails.ShowMarquee(msg, tipInfoList, order);
                     break;
+                case SysNotifyType.SysBulletScreen:
+                    ChatManager.Instance.SendPureBullet(msg, tipInfoList);
+                    break;
                 case SysNotifyType.ChatChannelWorld:
-                    ChatManager.Instance.AddSysData(msg, tipInfoList, ChatChannel.World, true);
+                    ChatManager.Instance.AddSysData(msg, tipInfoList, ChatChannel.World);
                     break;
                 case SysNotifyType.ChatChannelGuild:
-                    ChatManager.Instance.AddSysData(msg, tipInfoList, ChatChannel.Guild, true);
+                    ChatManager.Instance.AddSysData(msg, tipInfoList, ChatChannel.Guild);
                     break;
                 case SysNotifyType.SysRealmTip:
                     if (OnSysTipEvent != null)
@@ -278,6 +281,7 @@
         SysChatWin = 6, //鑱婂ぉ浣嶇疆鐨勬彁绀�
         SysEvenKill = 7,//涓婂彜鎴樺満杩炴潃鎻愮ず
         SysFixedTip1 = 11,//鍥哄畾鎻愮ず2
+        SysBulletScreen = 19,//寮瑰箷
         ChatChannelWorld = 20,//鑱婂ぉ-涓栫晫棰戦亾
         ChatChannelGuild = 21,//鑱婂ぉ-鍏細棰戦亾
         SysFairyQuestionTip = 31,//浠欑洘棰戦亾闂瓟鎻愮ず

--
Gitblit v1.8.0