From f353e7d662f673d295367a10b8713fb306789135 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期四, 21 二月 2019 14:15:04 +0800
Subject: [PATCH] 3335 添加窗口关闭全部时忽略的窗口配置
---
System/WindowBase/WindowCenter.cs | 19 ++++++-------------
1 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/System/WindowBase/WindowCenter.cs b/System/WindowBase/WindowCenter.cs
index ae3fa57..39ada68 100644
--- a/System/WindowBase/WindowCenter.cs
+++ b/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;
}
--
Gitblit v1.8.0