From 1d24fbd1655e724eebb2e717c9f0ed80e881b582 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期五, 24 八月 2018 11:49:20 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

---
 System/FairyAu/UnionPanel.cs |  393 ++++++++++++++++++++++++++++---------------------------
 1 files changed, 198 insertions(+), 195 deletions(-)

diff --git a/System/FairyAu/UnionPanel.cs b/System/FairyAu/UnionPanel.cs
index 1edc775..f7a07b2 100644
--- a/System/FairyAu/UnionPanel.cs
+++ b/System/FairyAu/UnionPanel.cs
@@ -1,195 +1,198 @@
-锘縰sing System;
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using UnityEngine.UI;
-namespace Snxxz.UI
-{
-
-    //浠欑洘绯荤粺闈㈡澘鎺у埗鍣�
-    public class UnionPanel : Window
-    {
-        #region 鐣岄潰
-        [SerializeField] GameObject funcPanel;
-        #endregion
-
-        [SerializeField] Button _CloseBtn;//鍏抽棴鎸夐挳
-        [SerializeField] Button _LeftBtn;//鍚戝乏鎸夐挳
-        [SerializeField] Button _RightBtn;//鍚戝彸鎸夐挳
-
-
-        [SerializeField] FunctionButton _FunctionsBtn;//鍩烘湰鍔熻兘
-        [SerializeField] FunctionButton _MemberListBtn;//鎴愬憳鍒楄〃
-        [SerializeField] FunctionButton _UnionLisBtn;//浠欑洘鍒楄〃
-        [SerializeField] FunctionButton _UnionLeagueBtn;//浠欑洘鑱旇禌
-        [SerializeField] FunctionButton _KingTemperBtn;//鐜嬭�呭湥娈�
-        [SerializeField] FunctionButtonGroup buttonGroup;
-
-        private void OnRefreshFairyMine()
-        {
-            if (!PlayerDatas.Instance.fairyData.HasFairy)
-            {
-                InitFairyFunc();
-                buttonGroup.TriggerByOrder(3);
-            }
-        }
-
-        private void OnRefreshFariyInfo()
-        {
-            if (!_MemberListBtn.gameObject.activeInHierarchy)
-            {
-                InitFairyFunc();
-                buttonGroup.TriggerByOrder(2);
-            }
-        }
-
-        protected override void BindController()
-        {
-
-        }
-
-        protected override void AddListeners()
-        {
-            _FunctionsBtn.AddListener(OnBaseFunc);
-            _MemberListBtn.AddListener(OnMemberList);
-            _UnionLisBtn.AddListener(OnUnionList);
-            _UnionLeagueBtn.AddListener(OnUnionLeague);
-            _KingTemperBtn.AddListener(OnKingTemper);
-            _CloseBtn.onClick.AddListener(CloseClick);
-            _RightBtn.onClick.AddListener(buttonGroup.TriggerNext);
-            _LeftBtn.onClick.AddListener(buttonGroup.TriggerLast);
-
-        }
-
-        private void OnKingTemper()
-        {
-            CloseChildWin();
-            if (windowState == WindowState.Opened)
-            {
-                WindowCenter.Instance.OpenWithoutAnimation<KingTempleWin>();
-            }
-            else
-            {
-                WindowCenter.Instance.Open<KingTempleWin>();
-            }
-            functionOrder = 5;
-        }
-
-        private void OnUnionLeague()
-        {
-            CloseChildWin();
-            if (windowState == WindowState.Opened)
-            {
-                WindowCenter.Instance.OpenWithoutAnimation<FairyLeagueWin>();
-            }
-            else
-            {
-                WindowCenter.Instance.Open<FairyLeagueWin>();
-            }
-            functionOrder = 4;
-        }
-
-        private void OnUnionList()
-        {
-            CloseChildWin();
-            if (windowState == WindowState.Opened)
-            {
-                WindowCenter.Instance.OpenWithoutAnimation<FairyApplyWin>();
-            }
-            else
-            {
-                WindowCenter.Instance.Open<FairyApplyWin>();
-            }
-            functionOrder = 3;
-        }
-
-        private void OnMemberList()
-        {
-            CloseChildWin();
-            if (windowState == WindowState.Opened)
-            {
-                WindowCenter.Instance.OpenWithoutAnimation<FairyMemberWin>();
-            }
-            else
-            {
-                WindowCenter.Instance.Open<FairyMemberWin>();
-            }
-            functionOrder = 2;
-        }
-
-        private void OnBaseFunc()
-        {
-            CloseChildWin();
-            funcPanel.SetActive(true);
-            functionOrder = 1;
-        }
-
-        protected override void OnPreOpen()
-        {
-            PlayerDatas.Instance.fairyData.OnRefreshFairyInfo += OnRefreshFariyInfo;
-            PlayerDatas.Instance.fairyData.OnRefreshFairyMine += OnRefreshFairyMine;
-
-            InitFairyFunc();
-        }
-
-        protected override void OnActived()
-        {
-            base.OnActived();
-            buttonGroup.TriggerByOrder(functionOrder);
-        }
-
-        protected override void OnAfterOpen()
-        {
-            
-        }
-
-        protected override void OnPreClose()
-        {
-            CloseChildWin();
-        }
-
-        protected override void OnAfterClose()
-        {
-            PlayerDatas.Instance.fairyData.OnRefreshFairyInfo -= OnRefreshFariyInfo;
-            PlayerDatas.Instance.fairyData.OnRefreshFairyMine -= OnRefreshFairyMine;
-            WindowCenter.Instance.Open<MainInterfaceWin>();
-        }
-
-
-        void CloseChildWin()
-        {
-            funcPanel.SetActive(false);
-            if (WindowCenter.Instance.CheckOpen<FairyApplyWin>())
-            {
-                WindowCenter.Instance.CloseImmediately<FairyApplyWin>();
-            }
-            if (WindowCenter.Instance.CheckOpen<FairyMemberWin>())
-            {
-                WindowCenter.Instance.CloseImmediately<FairyMemberWin>();
-            }
-            if (WindowCenter.Instance.CheckOpen<FairyLeagueWin>())
-            {
-                WindowCenter.Instance.CloseImmediately<FairyLeagueWin>();
-            }
-            if (WindowCenter.Instance.CheckOpen<KingTempleWin>())
-            {
-                WindowCenter.Instance.CloseImmediately<KingTempleWin>();
-            }
-        }
-
-        void InitFairyFunc()
-        {
-            if (!PlayerDatas.Instance.fairyData.HasFairy)
-            {
-                _FunctionsBtn.gameObject.SetActive(false);
-                _MemberListBtn.gameObject.SetActive(false);
-            }
-            else
-            {
-                _FunctionsBtn.gameObject.SetActive(true);
-                _MemberListBtn.gameObject.SetActive(true);
-            }
-        }
-    }
-}
-
+锘縰sing System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+namespace Snxxz.UI
+{
+
+    //浠欑洘绯荤粺闈㈡澘鎺у埗鍣�
+    public class UnionPanel : Window
+    {
+        #region 鐣岄潰
+        [SerializeField] GameObject funcPanel;
+        #endregion
+
+        [SerializeField] Button _CloseBtn;//鍏抽棴鎸夐挳
+        [SerializeField] Button _LeftBtn;//鍚戝乏鎸夐挳
+        [SerializeField] Button _RightBtn;//鍚戝彸鎸夐挳
+
+
+        [SerializeField] FunctionButton _FunctionsBtn;//鍩烘湰鍔熻兘
+        [SerializeField] FunctionButton _MemberListBtn;//鎴愬憳鍒楄〃
+        [SerializeField] FunctionButton _UnionLisBtn;//浠欑洘鍒楄〃
+        [SerializeField] FunctionButton _UnionLeagueBtn;//浠欑洘鑱旇禌
+        [SerializeField] FunctionButton _KingTemperBtn;//鐜嬭�呭湥娈�
+        [SerializeField] FunctionButtonGroup buttonGroup;
+
+        private void OnRefreshFairyMine()
+        {
+            if (!PlayerDatas.Instance.fairyData.HasFairy)
+            {
+                InitFairyFunc();
+                buttonGroup.TriggerByOrder(3);
+            }
+        }
+
+        private void OnRefreshFariyInfo()
+        {
+            if (!_MemberListBtn.gameObject.activeInHierarchy)
+            {
+                InitFairyFunc();
+                buttonGroup.TriggerByOrder(2);
+            }
+        }
+
+        protected override void BindController()
+        {
+
+        }
+
+        protected override void AddListeners()
+        {
+            _FunctionsBtn.AddListener(OnBaseFunc);
+            _MemberListBtn.AddListener(OnMemberList);
+            _UnionLisBtn.AddListener(OnUnionList);
+            _UnionLeagueBtn.AddListener(OnUnionLeague);
+            _KingTemperBtn.AddListener(OnKingTemper);
+            _CloseBtn.onClick.AddListener(CloseClick);
+            _RightBtn.onClick.AddListener(buttonGroup.TriggerNext);
+            _LeftBtn.onClick.AddListener(buttonGroup.TriggerLast);
+
+        }
+
+        private void OnKingTemper()
+        {
+            CloseChildWin();
+            if (windowState == WindowState.Opened)
+            {
+                WindowCenter.Instance.OpenWithoutAnimation<KingTempleWin>();
+            }
+            else
+            {
+                WindowCenter.Instance.Open<KingTempleWin>();
+            }
+            functionOrder = 5;
+        }
+
+        private void OnUnionLeague()
+        {
+            CloseChildWin();
+            if (windowState == WindowState.Opened)
+            {
+                WindowCenter.Instance.OpenWithoutAnimation<FairyLeagueWin>();
+            }
+            else
+            {
+                WindowCenter.Instance.Open<FairyLeagueWin>();
+            }
+            functionOrder = 4;
+        }
+
+        private void OnUnionList()
+        {
+            CloseChildWin();
+            if (windowState == WindowState.Opened)
+            {
+                WindowCenter.Instance.OpenWithoutAnimation<FairyApplyWin>();
+            }
+            else
+            {
+                WindowCenter.Instance.Open<FairyApplyWin>();
+            }
+            functionOrder = 3;
+        }
+
+        private void OnMemberList()
+        {
+            CloseChildWin();
+            if (windowState == WindowState.Opened)
+            {
+                WindowCenter.Instance.OpenWithoutAnimation<FairyMemberWin>();
+            }
+            else
+            {
+                WindowCenter.Instance.Open<FairyMemberWin>();
+            }
+            functionOrder = 2;
+        }
+
+        private void OnBaseFunc()
+        {
+            CloseChildWin();
+            funcPanel.SetActive(true);
+            functionOrder = 1;
+        }
+
+        protected override void OnPreOpen()
+        {
+            PlayerDatas.Instance.fairyData.OnRefreshFairyInfo += OnRefreshFariyInfo;
+            PlayerDatas.Instance.fairyData.OnRefreshFairyMine += OnRefreshFairyMine;
+
+            InitFairyFunc();
+        }
+
+        protected override void OnActived()
+        {
+            base.OnActived();
+            buttonGroup.TriggerByOrder(functionOrder);
+        }
+
+        protected override void OnAfterOpen()
+        {
+            
+        }
+
+        protected override void OnPreClose()
+        {
+            CloseChildWin();
+        }
+
+        protected override void OnAfterClose()
+        {
+            PlayerDatas.Instance.fairyData.OnRefreshFairyInfo -= OnRefreshFariyInfo;
+            PlayerDatas.Instance.fairyData.OnRefreshFairyMine -= OnRefreshFairyMine;
+            if (!WindowJumpMgr.Instance.IsJumpState)
+            {
+                WindowCenter.Instance.Open<MainInterfaceWin>();
+            }
+        }
+
+
+        void CloseChildWin()
+        {
+            funcPanel.SetActive(false);
+            if (WindowCenter.Instance.CheckOpen<FairyApplyWin>())
+            {
+                WindowCenter.Instance.CloseImmediately<FairyApplyWin>();
+            }
+            if (WindowCenter.Instance.CheckOpen<FairyMemberWin>())
+            {
+                WindowCenter.Instance.CloseImmediately<FairyMemberWin>();
+            }
+            if (WindowCenter.Instance.CheckOpen<FairyLeagueWin>())
+            {
+                WindowCenter.Instance.CloseImmediately<FairyLeagueWin>();
+            }
+            if (WindowCenter.Instance.CheckOpen<KingTempleWin>())
+            {
+                WindowCenter.Instance.CloseImmediately<KingTempleWin>();
+            }
+        }
+
+        void InitFairyFunc()
+        {
+            if (!PlayerDatas.Instance.fairyData.HasFairy)
+            {
+                _FunctionsBtn.gameObject.SetActive(false);
+                _MemberListBtn.gameObject.SetActive(false);
+            }
+            else
+            {
+                _FunctionsBtn.gameObject.SetActive(true);
+                _MemberListBtn.gameObject.SetActive(true);
+            }
+        }
+    }
+}
+

--
Gitblit v1.8.0