From a8337f342701cee7fe7cd3ff2075f23604b46dfb Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期五, 24 八月 2018 11:33:46 +0800
Subject: [PATCH] 2868 主界面打开的时候，判断是否在跳转中。
---
System/Market/MarketWin.cs | 261 ++++++++++++++++++++++++++-------------------------
1 files changed, 132 insertions(+), 129 deletions(-)
diff --git a/System/Market/MarketWin.cs b/System/Market/MarketWin.cs
index 34b847a..556568c 100644
--- a/System/Market/MarketWin.cs
+++ b/System/Market/MarketWin.cs
@@ -1,129 +1,132 @@
-锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
-// [ Date ]: Thursday, September 21, 2017
-//--------------------------------------------------------
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using UnityEngine.UI;
-
-namespace Snxxz.UI {
-
- public class MarketWin : Window
- {
- [SerializeField] Button leftBtn;
- [SerializeField] Button rightBtn;
- [SerializeField] Button closeBtn;
- [SerializeField] FunctionButton dealTitleBtn;
- [SerializeField] FunctionButton putawayTitleBtn;
- [SerializeField] FunctionButton dealRecordTitleBtn;
- [SerializeField] FunctionButtonGroup buttonGroup;
- #region Built-in
- protected override void BindController()
- {
- }
-
- protected override void AddListeners()
- {
- leftBtn.onClick.AddListener(buttonGroup.TriggerLast);
- rightBtn.onClick.AddListener(buttonGroup.TriggerNext);
- closeBtn.onClick.AddListener(OnClose);
- dealTitleBtn.onClick.AddListener(OnDeal);
- putawayTitleBtn.onClick.AddListener(OnPutaway);
- dealRecordTitleBtn.onClick.AddListener(OnDealRecord);
- }
-
- private void OnDealRecord()
- {
- CloseChildWin();
- if (windowState == WindowState.Opened)
- {
- WindowCenter.Instance.OpenWithoutAnimation<MarketDealRecordWin>();
- }
- else
- {
- WindowCenter.Instance.Open<MarketDealRecordWin>();
- }
- functionOrder = 2;
- }
-
- private void OnPutaway()
- {
- CloseChildWin();
- if (windowState == WindowState.Opened)
- {
- WindowCenter.Instance.OpenWithoutAnimation<MarketPutawayWin>();
- }
- else
- {
- WindowCenter.Instance.Open<MarketPutawayWin>();
- }
- functionOrder = 1;
- }
-
- private void OnDeal()
- {
- CloseChildWin();
- if (windowState == WindowState.Opened)
- {
- WindowCenter.Instance.OpenWithoutAnimation<MarketDealWin>();
- }
- else
- {
- WindowCenter.Instance.Open<MarketDealWin>();
- }
- functionOrder = 0;
- }
-
- protected override void OnPreOpen()
- {
- CloseChildWin();
- }
-
- protected override void OnActived()
- {
- base.OnActived();
- buttonGroup.TriggerByOrder(functionOrder);
- }
-
- protected override void OnAfterOpen()
- {
- }
-
- protected override void OnPreClose()
- {
- CloseChildWin();
- }
-
- protected override void OnAfterClose()
- {
- WindowCenter.Instance.Open<MainInterfaceWin>();
- }
- #endregion
- private void OnClose()
- {
- CloseChildWin();
- CloseImmediately();
-
- }
- private void CloseChildWin()
- {
- if (WindowCenter.Instance.CheckOpen<MarketDealWin>()) {
- WindowCenter.Instance.CloseImmediately<MarketDealWin>();
- }
- if (WindowCenter.Instance.CheckOpen<MarketPutawayWin>()) {
- WindowCenter.Instance.CloseImmediately<MarketPutawayWin>();
- }
- if (WindowCenter.Instance.CheckOpen<MarketDealRecordWin>()) {
- WindowCenter.Instance.CloseImmediately<MarketDealRecordWin>();
- }
- }
- }
-
-}
-
-
-
-
+锘�//--------------------------------------------------------
+// [Author]: 绗簩涓栫晫
+// [ Date ]: Thursday, September 21, 2017
+//--------------------------------------------------------
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+namespace Snxxz.UI {
+
+ public class MarketWin : Window
+ {
+ [SerializeField] Button leftBtn;
+ [SerializeField] Button rightBtn;
+ [SerializeField] Button closeBtn;
+ [SerializeField] FunctionButton dealTitleBtn;
+ [SerializeField] FunctionButton putawayTitleBtn;
+ [SerializeField] FunctionButton dealRecordTitleBtn;
+ [SerializeField] FunctionButtonGroup buttonGroup;
+ #region Built-in
+ protected override void BindController()
+ {
+ }
+
+ protected override void AddListeners()
+ {
+ leftBtn.onClick.AddListener(buttonGroup.TriggerLast);
+ rightBtn.onClick.AddListener(buttonGroup.TriggerNext);
+ closeBtn.onClick.AddListener(OnClose);
+ dealTitleBtn.onClick.AddListener(OnDeal);
+ putawayTitleBtn.onClick.AddListener(OnPutaway);
+ dealRecordTitleBtn.onClick.AddListener(OnDealRecord);
+ }
+
+ private void OnDealRecord()
+ {
+ CloseChildWin();
+ if (windowState == WindowState.Opened)
+ {
+ WindowCenter.Instance.OpenWithoutAnimation<MarketDealRecordWin>();
+ }
+ else
+ {
+ WindowCenter.Instance.Open<MarketDealRecordWin>();
+ }
+ functionOrder = 2;
+ }
+
+ private void OnPutaway()
+ {
+ CloseChildWin();
+ if (windowState == WindowState.Opened)
+ {
+ WindowCenter.Instance.OpenWithoutAnimation<MarketPutawayWin>();
+ }
+ else
+ {
+ WindowCenter.Instance.Open<MarketPutawayWin>();
+ }
+ functionOrder = 1;
+ }
+
+ private void OnDeal()
+ {
+ CloseChildWin();
+ if (windowState == WindowState.Opened)
+ {
+ WindowCenter.Instance.OpenWithoutAnimation<MarketDealWin>();
+ }
+ else
+ {
+ WindowCenter.Instance.Open<MarketDealWin>();
+ }
+ functionOrder = 0;
+ }
+
+ protected override void OnPreOpen()
+ {
+ CloseChildWin();
+ }
+
+ protected override void OnActived()
+ {
+ base.OnActived();
+ buttonGroup.TriggerByOrder(functionOrder);
+ }
+
+ protected override void OnAfterOpen()
+ {
+ }
+
+ protected override void OnPreClose()
+ {
+ CloseChildWin();
+ }
+
+ protected override void OnAfterClose()
+ {
+ if (!WindowJumpMgr.Instance.IsJumpState)
+ {
+ WindowCenter.Instance.Open<MainInterfaceWin>();
+ }
+ }
+ #endregion
+ private void OnClose()
+ {
+ CloseChildWin();
+ CloseImmediately();
+
+ }
+ private void CloseChildWin()
+ {
+ if (WindowCenter.Instance.CheckOpen<MarketDealWin>()) {
+ WindowCenter.Instance.CloseImmediately<MarketDealWin>();
+ }
+ if (WindowCenter.Instance.CheckOpen<MarketPutawayWin>()) {
+ WindowCenter.Instance.CloseImmediately<MarketPutawayWin>();
+ }
+ if (WindowCenter.Instance.CheckOpen<MarketDealRecordWin>()) {
+ WindowCenter.Instance.CloseImmediately<MarketDealRecordWin>();
+ }
+ }
+ }
+
+}
+
+
+
+
--
Gitblit v1.8.0