From 092ad0a46f1eef63b7f02ef38af0a14aa9e4372d Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期二, 12 二月 2019 10:35:31 +0800
Subject: [PATCH] 3335 重构窗口管理
---
System/CrossServerOneVsOne/CrossServerOneVsOneWin.cs | 42 +++++++-----------------------------------
1 files changed, 7 insertions(+), 35 deletions(-)
diff --git a/System/CrossServerOneVsOne/CrossServerOneVsOneWin.cs b/System/CrossServerOneVsOne/CrossServerOneVsOneWin.cs
index fef6a5f..9122641 100644
--- a/System/CrossServerOneVsOne/CrossServerOneVsOneWin.cs
+++ b/System/CrossServerOneVsOne/CrossServerOneVsOneWin.cs
@@ -55,11 +55,11 @@
protected override void OnActived()
{
-
+
}
protected override void OnAfterOpen()
{
-
+
}
protected override void OnPreClose()
@@ -101,7 +101,7 @@
UpdateScore();
UpdateRank();
UpdateHonor();
- switch(funcId)
+ switch (funcId)
{
case 0:
case 1:
@@ -148,14 +148,7 @@
{
if (honorStore_SelectImg.activeInHierarchy) return;
CloseSubWindows();
- if (crossServerWin.windowState == WindowState.Opened)
- {
- WindowCenter.Instance.OpenWithoutAnimation<CrossServerOneVsOneHonorStoreWin>();
- }
- else
- {
- WindowCenter.Instance.Open<CrossServerOneVsOneHonorStoreWin>();
- }
+ WindowCenter.Instance.Open<CrossServerOneVsOneHonorStoreWin>();
honorStore_SelectImg.SetActive(true);
}
@@ -164,14 +157,7 @@
if (seasonAward_SelectImg.activeInHierarchy) return;
CloseSubWindows();
- if (crossServerWin.windowState == WindowState.Opened)
- {
- WindowCenter.Instance.OpenWithoutAnimation<SeasonRewardWin>();
- }
- else
- {
- WindowCenter.Instance.Open<SeasonRewardWin>();
- }
+ WindowCenter.Instance.Open<SeasonRewardWin>();
seasonAward_SelectImg.SetActive(true);
}
@@ -186,14 +172,7 @@
if (arena_SelectImg.activeInHierarchy) return;
CloseSubWindows();
- if (crossServerWin.windowState == WindowState.Opened)
- {
- WindowCenter.Instance.OpenWithoutAnimation<CrossServerOneVsOneArenaWin>();
- }
- else
- {
- WindowCenter.Instance.Open<CrossServerOneVsOneArenaWin>();
- }
+ WindowCenter.Instance.Open<CrossServerOneVsOneArenaWin>();
arena_SelectImg.SetActive(true);
}
@@ -202,14 +181,7 @@
if (rankAward_SelectImg.activeInHierarchy) return;
CloseSubWindows();
- if (crossServerWin.windowState == WindowState.Opened)
- {
- WindowCenter.Instance.OpenWithoutAnimation<SegmentRewardWin>();
- }
- else
- {
- WindowCenter.Instance.Open<SegmentRewardWin>();
- }
+ WindowCenter.Instance.Open<SegmentRewardWin>();
rankAward_SelectImg.SetActive(true);
}
--
Gitblit v1.8.0