From 2636bf475c8b4b03ee869a5db2f5fdd891ed9f97 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期四, 04 十二月 2025 09:19:35 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts
---
Main/System/Message/SysNotifyMgr.cs | 25 ++++++++-----------------
1 files changed, 8 insertions(+), 17 deletions(-)
diff --git a/Main/System/Message/SysNotifyMgr.cs b/Main/System/Message/SysNotifyMgr.cs
index 1e7710e..9da1a2f 100644
--- a/Main/System/Message/SysNotifyMgr.cs
+++ b/Main/System/Message/SysNotifyMgr.cs
@@ -111,7 +111,6 @@
#if UNITY_EDITOR
string hint = Language.Get("L1093", key);
ScrollTip.ShowTip(hint);
- ChatManager.Instance.RevChatInfo(hint);
#endif
}
else
@@ -234,20 +233,13 @@
ServerTipDetails.ShowServerTip(msg, tipInfoList, order);
break;
case SysNotifyType.SysMarqueeTip:
- ServerTipDetails.ShowMarquee(msg, tipInfoList,order);
+ ServerTipDetails.ShowMarquee(msg, tipInfoList, order);
break;
-
- case SysNotifyType.SysChanelTip:
- ChatManager.Instance.RevChatInfo(msg, tipInfoList);
+ case SysNotifyType.ChatChannelWorld:
+ ChatManager.Instance.AddSysData(msg, tipInfoList, ChatChannel.World);
break;
- case SysNotifyType.SysFairyQuestionTip:
- ChatManager.Instance.RevChatInfo(msg, tipInfoList, ChatInfoType.FairyQuestion);
- break;
- case SysNotifyType.SysFairyTip:
- ChatManager.Instance.RevChatInfo(msg, tipInfoList, ChatInfoType.FairyTip);
- break;
- case SysNotifyType.SysTeamTip:
- ChatManager.Instance.RevChatInfo(msg, tipInfoList, ChatInfoType.TeamTip);
+ case SysNotifyType.ChatChannelGuild:
+ ChatManager.Instance.AddSysData(msg, tipInfoList, ChatChannel.Guild);
break;
case SysNotifyType.SysRealmTip:
if (OnSysTipEvent != null)
@@ -260,9 +252,7 @@
// case SysNotifyType.SysEvenKill:
// BattleHint.Instance.ReceiveEvenKill(msg, tipInfoList);
// break;
- case SysNotifyType.SysFactionTip:
- ChatManager.Instance.RevChatInfo(msg, tipInfoList, ChatInfoType.default2);
- break;
+
}
}
@@ -282,7 +272,8 @@
SysChatWin = 6, //鑱婂ぉ浣嶇疆鐨勬彁绀�
SysEvenKill = 7,//涓婂彜鎴樺満杩炴潃鎻愮ず
SysFixedTip1 = 11,//鍥哄畾鎻愮ず2
- SysChanelTip = 20,//绯荤粺棰戦亾鏄剧ず
+ ChatChannelWorld = 20,//鑱婂ぉ-涓栫晫棰戦亾
+ ChatChannelGuild = 21,//鑱婂ぉ-鍏細棰戦亾
SysFairyQuestionTip = 31,//浠欑洘棰戦亾闂瓟鎻愮ず
SysFairyTip = 32,//浠欑洘棰戦亾淇℃伅鎻愮ず
SysTeamTip = 41,//闃熶紞棰戦亾鎻愮ず
--
Gitblit v1.8.0