From 6d101512ba4cb8e37a98ace6320a0b70c96efa2b Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期三, 17 四月 2019 10:34:06 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/KnapSack/New/RoleEquipWin.cs | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/System/KnapSack/New/RoleEquipWin.cs b/System/KnapSack/New/RoleEquipWin.cs
index 73a01be..99e0ce8 100644
--- a/System/KnapSack/New/RoleEquipWin.cs
+++ b/System/KnapSack/New/RoleEquipWin.cs
@@ -52,7 +52,7 @@
packModel.refreshItemCountEvent += OnPackUpdate;
PlayerDatas.Instance.playerDataRefreshEvent += OnPlayerDataUpdate;
- WindowCenter.Instance.windowBeforeCloseEvent += BeforeWindowClose;
+ WindowCenter.Instance.windowAfterCloseEvent += AfterWindowClose;
GlobalTimeEvent.Instance.secondEvent += UpdateSecond;
UpdateMoney();
@@ -71,7 +71,7 @@
{
GlobalTimeEvent.Instance.secondEvent -= UpdateSecond;
packModel.refreshItemCountEvent -= OnPackUpdate;
- WindowCenter.Instance.windowBeforeCloseEvent -= BeforeWindowClose;
+ WindowCenter.Instance.windowAfterCloseEvent -= AfterWindowClose;
PlayerDatas.Instance.playerDataRefreshEvent -= OnPlayerDataUpdate;
UI3DModelExhibition.Instance.StopShow();
}
@@ -107,11 +107,15 @@
UI3DModelExhibition.Instance.ShowPlayer(m_Role, PlayerDatas.Instance.baseData.Job);
}
- private void BeforeWindowClose(Window window)
+ private void AfterWindowClose(Window window)
{
- if ("PetMatInfoWin" != window.name && "ItemInfoWin" != window.name) return;
-
- UI3DModelExhibition.Instance.ShowPlayer(m_Role, PlayerDatas.Instance.baseData.Job);
+ if (window.windowInfo.windowType >= WindowType.Modal)
+ {
+ if (!WindowCenter.Instance.ExistAnyFullScreenOrMaskWinLEqual(WindowType.Modal))
+ {
+ UI3DModelExhibition.Instance.ShowPlayer(m_Role, PlayerDatas.Instance.baseData.Job);
+ }
+ }
}
private void UpdateSecond()
--
Gitblit v1.8.0