From 9b9f329a71e7783fed555bd9911418e4653bbace Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期六, 02 二月 2019 11:26:46 +0800
Subject: [PATCH] 3335 重构窗口管理
---
System/MainInterfacePanel/MainInterfaceWin.cs | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/System/MainInterfacePanel/MainInterfaceWin.cs b/System/MainInterfacePanel/MainInterfaceWin.cs
index 6d64272..b9785cf 100644
--- a/System/MainInterfacePanel/MainInterfaceWin.cs
+++ b/System/MainInterfacePanel/MainInterfaceWin.cs
@@ -434,7 +434,7 @@
GlobalTimeEvent.Instance.secondEvent -= secondEvent;
if (WindowCenter.Instance.IsOpen<FunctionForecastWin>())
{
- WindowCenter.Instance.CloseImmediately<FunctionForecastWin>();
+ WindowCenter.Instance.Close<FunctionForecastWin>();
}
GA_NpcCollect.OnArrive -= OnArriveCollectNPC;
GA_NpcCollect.OnLeave -= OnLeaveCollectNpc;
@@ -662,7 +662,7 @@
onMainModel.MoveBool = false;
if (WindowCenter.Instance.IsOpen("PathfindingIconWin"))
{
- WindowCenter.Instance.CloseImmediately<PathfindingIconWin>();
+ WindowCenter.Instance.Close<PathfindingIconWin>();
}
}
@@ -759,21 +759,21 @@
{
if (festivalRedpackModel.systemRedpoint.state == RedPointState.GetReward)
{
- WindowCenter.Instance.CloseImmediately<MainInterfaceWin>();
+ WindowCenter.Instance.Close<MainInterfaceWin>();
festivalRedpackModel.jumpType = 1;
festivalRedpackModel.autoOpen = true;
WindowCenter.Instance.Open<OpenServerActivityWin>(false, 19);
}
else if (festivalRedpackModel.receiveRedpoint.state == RedPointState.GetReward)
{
- WindowCenter.Instance.CloseImmediately<MainInterfaceWin>();
+ WindowCenter.Instance.Close<MainInterfaceWin>();
festivalRedpackModel.jumpType = 3;
festivalRedpackModel.autoOpen = true;
WindowCenter.Instance.Open<OpenServerActivityWin>(false, 19);
}
else if (OSEnvelopeModel.m_OpenServerGetRedpin.state == RedPointState.GetReward)
{
- WindowCenter.Instance.CloseImmediately<MainInterfaceWin>();
+ WindowCenter.Instance.Close<MainInterfaceWin>();
ModelCenter.Instance.GetModel<OSRedEnvelopeModel>().JumpType = 2;
ModelCenter.Instance.GetModel<OSRedEnvelopeModel>().autoOpen = true;
WindowCenter.Instance.Open<OpenServerActivityWin>(false, 2);
@@ -789,13 +789,13 @@
{
if (festivalRedpackModel.taskRedpoint.state == RedPointState.Simple)
{
- WindowCenter.Instance.CloseImmediately<MainInterfaceWin>();
+ WindowCenter.Instance.Close<MainInterfaceWin>();
festivalRedpackModel.jumpType = 2;
WindowCenter.Instance.Open<OpenServerActivityWin>(false, 19);
}
else if (OSEnvelopeModel.m_RedAchieveRedpoint.state == RedPointState.Simple)
{
- WindowCenter.Instance.CloseImmediately<MainInterfaceWin>();
+ WindowCenter.Instance.Close<MainInterfaceWin>();
ModelCenter.Instance.GetModel<OSRedEnvelopeModel>().JumpType = 1;
WindowCenter.Instance.Open<OpenServerActivityWin>(false, 2);
}
@@ -1416,7 +1416,7 @@
m_InGamePusher.gameObject.SetActive(true);
if (WindowCenter.Instance.IsOpen<FightingPKWin>())
{
- WindowCenter.Instance.CloseImmediately<FightingPKWin>();
+ WindowCenter.Instance.Close<FightingPKWin>();
}
OnRedBagGet();
}
--
Gitblit v1.8.0