From 94c478cfa485adc30190d21f40df02df707ddef8 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期五, 10 八月 2018 20:49:19 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

---
 System/Message/SysNotifyMgr.cs |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/System/Message/SysNotifyMgr.cs b/System/Message/SysNotifyMgr.cs
index 2eb21b4..a09bde0 100644
--- a/System/Message/SysNotifyMgr.cs
+++ b/System/Message/SysNotifyMgr.cs
@@ -158,6 +158,20 @@
             switch ((SysNotifyType)type[i])
             {
                 case SysNotifyType.SysFixedTip:
+                case SysNotifyType.SysFixedTip1:
+                case SysNotifyType.SysScrollTip:
+                case SysNotifyType.SysIntervalFixedTip:
+                case SysNotifyType.SysMarqueeTip:
+                case SysNotifyType.SysRealmTip:
+                    if (!PreFightMission.Instance.IsFinished())
+                    {
+                        continue;
+                    }
+                    break;
+            }
+            switch ((SysNotifyType)type[i])
+            {
+                case SysNotifyType.SysFixedTip:
                     MessageWin.Inst.ShowFixedTip(msg, tipInfoList);
                     break;
                 case SysNotifyType.SysFixedTip1:

--
Gitblit v1.8.0