3335 添加窗口关闭全部时忽略的窗口配置

client_Wu Xijin

2019-02-21 f353e7d662f673d295367a10b8713fb306789135

 System/WindowBase/WindowCenter.cs

@@ -14,13 +14,6 @@
        public event Action<Window> windowAfterCloseEvent;

        public event Action<Window> jumpWindowCloseEvent;



        List<string> closeAllIgnoreWindows = new List<string>() {

                     "MessageWin", "NewBieWin", "NewItemGetWin", "AttributePromoteShowWin" ,"DungeonBeginCoolDownWin","DungeonFightWin","StatusTipWin"

                     ,"ScrollTipWin","MarqueeWin","ExperienceOpenWin","TrumpetWin","BattlePrepareCoolDownWin","DungeonGradeWin","BattleHintWin",

                     "TreasureDungeonMissionHintWin","FairyGrabBossHintWin","DungeonFairyFeastHintWin","PetAndMountPushWin","UpgradeWin","DungeonFairyLandWin"

                     ,"GatherSoulDungeonHintWin"

                 };



        UIRoot m_UIRoot;

        public UIRoot uiRoot {

            get {

@@ -230,16 +223,16 @@
                        isIgnore = window.windowInfo.windowType <= WindowType.Base;

                        break;

                    case CloseAllIgnoreType.BaseAndCustom:

                        isIgnore = window.windowInfo.windowType <= WindowType.Base || closeAllIgnoreWindows.Contains(name);

                        isIgnore = window.windowInfo.windowType <= WindowType.Base || CloseAllIgnoreWindowConfig.IsIgnore(name);

                        break;

                    case CloseAllIgnoreType.System:

                        isIgnore = window.windowInfo.windowType >= WindowType.System;

                        break;

                    case CloseAllIgnoreType.Custom:

                        isIgnore = closeAllIgnoreWindows.Contains(name);

                        isIgnore = CloseAllIgnoreWindowConfig.IsIgnore(name);

                        break;

                    case CloseAllIgnoreType.SystemAndCustom:

                        isIgnore = window.windowInfo.windowType >= WindowType.System || closeAllIgnoreWindows.Contains(name);

                        isIgnore = window.windowInfo.windowType >= WindowType.System || CloseAllIgnoreWindowConfig.IsIgnore(name);

                        break;

                }



@@ -303,16 +296,16 @@
                        isIgnore = windowNames.Contains(name) || window.windowInfo.windowType <= WindowType.Base;

                        break;

                    case CloseAllIgnoreType.BaseAndCustom:

                        isIgnore = windowNames.Contains(name) || window.windowInfo.windowType <= WindowType.Base || closeAllIgnoreWindows.Contains(name);

                        isIgnore = windowNames.Contains(name) || window.windowInfo.windowType <= WindowType.Base || CloseAllIgnoreWindowConfig.IsIgnore(name);

                        break;

                    case CloseAllIgnoreType.System:

                        isIgnore = windowNames.Contains(name) || window.windowInfo.windowType >= WindowType.System;

                        break;

                    case CloseAllIgnoreType.Custom:

                        isIgnore = windowNames.Contains(name) || closeAllIgnoreWindows.Contains(name);

                        isIgnore = windowNames.Contains(name) || CloseAllIgnoreWindowConfig.IsIgnore(name);

                        break;

                    case CloseAllIgnoreType.SystemAndCustom:

                        isIgnore = windowNames.Contains(name) || window.windowInfo.windowType >= WindowType.System || closeAllIgnoreWindows.Contains(name);

                        isIgnore = windowNames.Contains(name) || window.windowInfo.windowType >= WindowType.System || CloseAllIgnoreWindowConfig.IsIgnore(name);

                        break;

                }