Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_Wu Xijin

2018-08-10 0ab36e640c0772905c2c9ed0fcff2cf1be512230

 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: