From 196c1f03fe7a8908272c8127133e632d107eaef8 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期一, 13 八月 2018 16:35:33 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

---
 System/Dungeon/DungeonMultipleTaskWin.cs |  456 ++++++++++++++++++++++++++++----------------------------
 1 files changed, 228 insertions(+), 228 deletions(-)

diff --git a/System/Dungeon/DungeonMultipleTaskWin.cs b/System/Dungeon/DungeonMultipleTaskWin.cs
index 104bc09..ae9c53e 100644
--- a/System/Dungeon/DungeonMultipleTaskWin.cs
+++ b/System/Dungeon/DungeonMultipleTaskWin.cs
@@ -1,228 +1,228 @@
-锘�//--------------------------------------------------------
-//    [Author]:           绗簩涓栫晫
-//    [  Date ]:           Wednesday, November 22, 2017
-//--------------------------------------------------------
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using UnityEngine.UI;
-
-namespace Snxxz.UI
-{
-
-    public class DungeonMultipleTaskWin : Window
-    {
-        [SerializeField] RectTransform m_ContainerTitle;
-        [SerializeField] Text m_TitleTxt;
-        [SerializeField] Button firstlyTaskBtn;
-        [SerializeField] Button secondaryTaskBtn;
-        [SerializeField] Text firstlyTaskBtnText;
-        [SerializeField] Text secondaryTaskBtnText;
-        [SerializeField] RectTransform contentRt;
-        [SerializeField] RectTransform m_ImgBGRt;
-
-        GameObject firstlyTaskTarget;
-        GameObject secondaryTaskTarget;
-
-        string firstlyTaskPrefabName;
-        string secondaryTaskPrefabName;
-
-        [SerializeField] SelectEffect m_SelectEffect;
-
-        [Serializable]
-        public struct SelectEffect
-        {
-            [Header("閫変腑鏃跺瓧浣撻鑹�")]
-            public Color selectTextColor;
-            [Header("鏈�変腑鏃跺瓧浣撻鑹�")]
-            public Color unSelectTextColor;
-            [Header("閫変腑鏃舵寜閽�忔槑搴�"), Range(0, 1.0f)]
-            public float selectAlpha;
-            [Header("鏈�変腑鏃舵寜閽�忔槑搴�"), Range(0, 1.0f)]
-            public float unselectAlpha;
-        }
-        #region Built-in
-        protected override void BindController()
-        {
-        }
-
-        protected override void AddListeners()
-        {
-            firstlyTaskBtn.onClick.AddListener(OnFirstlyTask);
-            secondaryTaskBtn.onClick.AddListener(OnSecondaryTask);
-        }
-
-        private void OnSecondaryTask()
-        {
-            if (secondaryTaskTarget != null)
-                return;
-            var _sizeDelta = m_ImgBGRt.sizeDelta;
-            secondaryTaskTarget = LoadTaskTarget(secondaryTaskPrefabName);
-            switch (PlayerDatas.Instance.baseData.MapID)
-            {
-                case 31170:
-                    {
-                        DungeonRankBehaviour dungeonRankBehaviour = secondaryTaskTarget.GetComponent<DungeonRankBehaviour>();
-                        if (dungeonRankBehaviour != null)
-                            dungeonRankBehaviour.Init(PlayerDatas.Instance.baseData.MapID);
-                    }
-                    break;
-                case 31160:
-                    {
-                        AchieveTargetBehaviour achieveTargetBehaviour = secondaryTaskTarget.GetComponent<AchieveTargetBehaviour>();
-                        if (achieveTargetBehaviour != null)
-                            achieveTargetBehaviour.Init(PlayerDatas.Instance.baseData.MapID);
-                        _sizeDelta.y = 204;
-                    }
-                    break;
-                case FairyLeagueModel.FAIRY_LEAGUE_DUNGEON:
-                    break;
-            }
-            var _color = firstlyTaskBtn.targetGraphic.color;
-            _color.a = m_SelectEffect.unselectAlpha;
-            firstlyTaskBtn.targetGraphic.color = _color;
-            firstlyTaskBtnText.color = m_SelectEffect.unSelectTextColor;
-            _color = secondaryTaskBtn.targetGraphic.color;
-            _color.a = m_SelectEffect.selectAlpha;
-            secondaryTaskBtn.targetGraphic.color = _color;
-            secondaryTaskBtnText.color = m_SelectEffect.selectTextColor;
-            ReleaseFirstlyTask();
-            m_ImgBGRt.sizeDelta = _sizeDelta;
-        }
-
-        private void OnFirstlyTask()
-        {
-            if (firstlyTaskTarget != null)
-                return;
-            var _sizeDelta = m_ImgBGRt.sizeDelta;
-            firstlyTaskTarget = LoadTaskTarget(firstlyTaskPrefabName);
-            switch (PlayerDatas.Instance.baseData.MapID)
-            {
-                case 31160:
-                case 31170:
-                    DungeonTargetBehaviour dungeonTargetBehaviour = firstlyTaskTarget.GetComponent<DungeonTargetBehaviour>();
-                    if (dungeonTargetBehaviour != null)
-                        dungeonTargetBehaviour.Init(PlayerDatas.Instance.baseData.MapID);
-                    _sizeDelta.y = 233;
-                    break;
-                case FairyLeagueModel.FAIRY_LEAGUE_DUNGEON:
-                    break;
-            }
-            var _color = firstlyTaskBtn.targetGraphic.color;
-            _color.a = m_SelectEffect.selectAlpha;
-            firstlyTaskBtn.targetGraphic.color = _color;
-            firstlyTaskBtnText.color = m_SelectEffect.selectTextColor;
-            _color = secondaryTaskBtn.targetGraphic.color;
-            _color.a = m_SelectEffect.unselectAlpha;
-            secondaryTaskBtn.targetGraphic.color = _color;
-            secondaryTaskBtnText.color = m_SelectEffect.unSelectTextColor;
-            ReleaseSecondaryTask();
-
-            
-            m_ImgBGRt.sizeDelta = _sizeDelta;
-        }
-
-        protected override void OnPreOpen()
-        {
-            m_ContainerTitle.gameObject.SetActive(false);
-            m_ImgBGRt.gameObject.SetActive(false);
-            switch (PlayerDatas.Instance.baseData.MapID)
-            {
-                case 31170:
-                    {
-                        firstlyTaskPrefabName = "Container_DungeonTarget";
-                        secondaryTaskPrefabName = "Container_DamageRank";
-                        firstlyTaskBtnText.text = Language.Get("GuardTheEmperor1");
-                        secondaryTaskBtnText.text = Language.Get("GuardSkyRankTitle");
-                    }
-                    break;
-                case 31160:
-                    {
-                        m_ImgBGRt.gameObject.SetActive(true);
-                        firstlyTaskPrefabName = "Container_DungeonTarget";
-                        secondaryTaskPrefabName = "Container_AchieveTarget";
-                        firstlyTaskBtnText.text = Language.Get("AncientBattle");
-                        secondaryTaskBtnText.text = Language.Get("AncientTarget");
-                    }
-                    break;
-                case FairyLeagueModel.FAIRY_LEAGUE_DUNGEON:
-                    {
-                        firstlyTaskPrefabName = "Container_FairyLeagueResource";
-                        secondaryTaskPrefabName = "Container_IntegralRank";
-                        firstlyTaskBtnText.text = Language.Get("FairyLeagueResourceTitle");
-                        secondaryTaskBtnText.text = Language.Get("IntergralRankTitle");
-                        m_ContainerTitle.gameObject.SetActive(true);
-                        m_TitleTxt.text = Language.Get("FamilyMatchName");
-                    }
-                    break;
-            }
-            OnFirstlyTask();
-        }
-
-        protected override void OnAfterOpen()
-        {
-        }
-
-        protected override void OnPreClose()
-        {
-            ReleaseFirstlyTask();
-            ReleaseSecondaryTask();
-        }
-
-        protected override void OnAfterClose()
-        {
-        }
-        #endregion
-
-
-        private void ReleaseFirstlyTask()
-        {
-            if (firstlyTaskTarget != null)
-            {
-                var prefab = UILoader.LoadPrefab(firstlyTaskPrefabName);
-                var pool = GameObjectPoolManager.Instance.RequestPool(prefab);
-                firstlyTaskTarget.SetActive(false);
-                pool.Release(firstlyTaskTarget);
-                firstlyTaskTarget = null;
-            }
-        }
-
-        private void ReleaseSecondaryTask()
-        {
-            if (secondaryTaskTarget != null)
-            {
-                var prefab = UILoader.LoadPrefab(secondaryTaskPrefabName);
-                var pool = GameObjectPoolManager.Instance.RequestPool(prefab);
-                secondaryTaskTarget.SetActive(false);
-                pool.Release(secondaryTaskTarget);
-                secondaryTaskTarget = null;
-            }
-        }
-
-        private GameObject LoadTaskTarget(string prefabName)
-        {
-            var prefab = UILoader.LoadPrefab(prefabName);
-            var pool = GameObjectPoolManager.Instance.RequestPool(prefab);
-            GameObject target = null;
-            if (pool != null)
-            {
-                target = pool.Request();
-                if (target != null)
-                {
-                    target.transform.SetParent(contentRt);
-                    target.transform.localScale = Vector3.one;
-                    target.transform.localPosition = Vector3.zero;
-                    target.gameObject.SetActive(true);
-                }
-            }
-            return target;
-        }
-    }
-
-}
-
-
-
-
+锘�//--------------------------------------------------------
+//    [Author]:           绗簩涓栫晫
+//    [  Date ]:           Wednesday, November 22, 2017
+//--------------------------------------------------------
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+namespace Snxxz.UI
+{
+
+    public class DungeonMultipleTaskWin : Window
+    {
+        [SerializeField] RectTransform m_ContainerTitle;
+        [SerializeField] Text m_TitleTxt;
+        [SerializeField] Button firstlyTaskBtn;
+        [SerializeField] Button secondaryTaskBtn;
+        [SerializeField] Text firstlyTaskBtnText;
+        [SerializeField] Text secondaryTaskBtnText;
+        [SerializeField] RectTransform contentRt;
+        [SerializeField] RectTransform m_ImgBGRt;
+
+        GameObject firstlyTaskTarget;
+        GameObject secondaryTaskTarget;
+
+        string firstlyTaskPrefabName;
+        string secondaryTaskPrefabName;
+
+        [SerializeField] SelectEffect m_SelectEffect;
+
+        [Serializable]
+        public struct SelectEffect
+        {
+            [Header("閫変腑鏃跺瓧浣撻鑹�")]
+            public Color selectTextColor;
+            [Header("鏈�変腑鏃跺瓧浣撻鑹�")]
+            public Color unSelectTextColor;
+            [Header("閫変腑鏃舵寜閽�忔槑搴�"), Range(0, 1.0f)]
+            public float selectAlpha;
+            [Header("鏈�変腑鏃舵寜閽�忔槑搴�"), Range(0, 1.0f)]
+            public float unselectAlpha;
+        }
+        #region Built-in
+        protected override void BindController()
+        {
+        }
+
+        protected override void AddListeners()
+        {
+            firstlyTaskBtn.onClick.AddListener(OnFirstlyTask);
+            secondaryTaskBtn.onClick.AddListener(OnSecondaryTask);
+        }
+
+        private void OnSecondaryTask()
+        {
+            if (secondaryTaskTarget != null)
+                return;
+            var _sizeDelta = m_ImgBGRt.sizeDelta;
+            secondaryTaskTarget = LoadTaskTarget(secondaryTaskPrefabName);
+            switch (PlayerDatas.Instance.baseData.MapID)
+            {
+                case 31170:
+                    {
+                        DungeonRankBehaviour dungeonRankBehaviour = secondaryTaskTarget.GetComponent<DungeonRankBehaviour>();
+                        if (dungeonRankBehaviour != null)
+                            dungeonRankBehaviour.Init(PlayerDatas.Instance.baseData.MapID);
+                    }
+                    break;
+                case 31160:
+                    {
+                        AchieveTargetBehaviour achieveTargetBehaviour = secondaryTaskTarget.GetComponent<AchieveTargetBehaviour>();
+                        if (achieveTargetBehaviour != null)
+                            achieveTargetBehaviour.Init(PlayerDatas.Instance.baseData.MapID);
+                        _sizeDelta.y = 204;
+                    }
+                    break;
+                case FairyLeagueModel.FAIRY_LEAGUE_DUNGEON:
+                    break;
+            }
+            var _color = firstlyTaskBtn.targetGraphic.color;
+            _color.a = m_SelectEffect.unselectAlpha;
+            firstlyTaskBtn.targetGraphic.color = _color;
+            firstlyTaskBtnText.color = m_SelectEffect.unSelectTextColor;
+            _color = secondaryTaskBtn.targetGraphic.color;
+            _color.a = m_SelectEffect.selectAlpha;
+            secondaryTaskBtn.targetGraphic.color = _color;
+            secondaryTaskBtnText.color = m_SelectEffect.selectTextColor;
+            ReleaseFirstlyTask();
+            m_ImgBGRt.sizeDelta = _sizeDelta;
+        }
+
+        private void OnFirstlyTask()
+        {
+            if (firstlyTaskTarget != null)
+                return;
+            var _sizeDelta = m_ImgBGRt.sizeDelta;
+            firstlyTaskTarget = LoadTaskTarget(firstlyTaskPrefabName);
+            switch (PlayerDatas.Instance.baseData.MapID)
+            {
+                case 31160:
+                case 31170:
+                    DungeonTargetBehaviour dungeonTargetBehaviour = firstlyTaskTarget.GetComponent<DungeonTargetBehaviour>();
+                    if (dungeonTargetBehaviour != null)
+                        dungeonTargetBehaviour.Init(PlayerDatas.Instance.baseData.MapID);
+                    _sizeDelta.y = 233;
+                    break;
+                case FairyLeagueModel.FAIRY_LEAGUE_DUNGEON:
+                    break;
+            }
+            var _color = firstlyTaskBtn.targetGraphic.color;
+            _color.a = m_SelectEffect.selectAlpha;
+            firstlyTaskBtn.targetGraphic.color = _color;
+            firstlyTaskBtnText.color = m_SelectEffect.selectTextColor;
+            _color = secondaryTaskBtn.targetGraphic.color;
+            _color.a = m_SelectEffect.unselectAlpha;
+            secondaryTaskBtn.targetGraphic.color = _color;
+            secondaryTaskBtnText.color = m_SelectEffect.unSelectTextColor;
+            ReleaseSecondaryTask();
+
+            
+            m_ImgBGRt.sizeDelta = _sizeDelta;
+        }
+
+        protected override void OnPreOpen()
+        {
+            m_ContainerTitle.gameObject.SetActive(false);
+            m_ImgBGRt.gameObject.SetActive(false);
+            switch (PlayerDatas.Instance.baseData.MapID)
+            {
+                case 31170:
+                    {
+                        firstlyTaskPrefabName = "Container_DungeonTarget";
+                        secondaryTaskPrefabName = "Container_DamageRank";
+                        firstlyTaskBtnText.text = Language.Get("GuardTheEmperor1");
+                        secondaryTaskBtnText.text = Language.Get("GuardSkyRankTitle");
+                    }
+                    break;
+                case 31160:
+                    {
+                        m_ImgBGRt.gameObject.SetActive(true);
+                        firstlyTaskPrefabName = "Container_DungeonTarget";
+                        secondaryTaskPrefabName = "Container_AchieveTarget";
+                        firstlyTaskBtnText.text = Language.Get("AncientBattle");
+                        secondaryTaskBtnText.text = Language.Get("AncientTarget");
+                    }
+                    break;
+                case FairyLeagueModel.FAIRY_LEAGUE_DUNGEON:
+                    {
+                        firstlyTaskPrefabName = "Container_FairyLeagueResource";
+                        secondaryTaskPrefabName = "Container_IntegralRank";
+                        firstlyTaskBtnText.text = Language.Get("FairyLeagueResourceTitle");
+                        secondaryTaskBtnText.text = Language.Get("IntergralRankTitle");
+                        m_ContainerTitle.gameObject.SetActive(true);
+                        m_TitleTxt.text = Language.Get("FamilyMatchName");
+                    }
+                    break;
+            }
+            OnFirstlyTask();
+        }
+
+        protected override void OnAfterOpen()
+        {
+        }
+
+        protected override void OnPreClose()
+        {
+            ReleaseFirstlyTask();
+            ReleaseSecondaryTask();
+        }
+
+        protected override void OnAfterClose()
+        {
+        }
+        #endregion
+
+
+        private void ReleaseFirstlyTask()
+        {
+            if (firstlyTaskTarget != null)
+            {
+                var prefab = UILoader.LoadPrefab(firstlyTaskPrefabName);
+                var pool = GameObjectPoolManager.Instance.RequestPool(prefab);
+                firstlyTaskTarget.SetActive(false);
+                pool.Release(firstlyTaskTarget);
+                firstlyTaskTarget = null;
+            }
+        }
+
+        private void ReleaseSecondaryTask()
+        {
+            if (secondaryTaskTarget != null)
+            {
+                var prefab = UILoader.LoadPrefab(secondaryTaskPrefabName);
+                var pool = GameObjectPoolManager.Instance.RequestPool(prefab);
+                secondaryTaskTarget.SetActive(false);
+                pool.Release(secondaryTaskTarget);
+                secondaryTaskTarget = null;
+            }
+        }
+
+        private GameObject LoadTaskTarget(string prefabName)
+        {
+            var prefab = UILoader.LoadPrefab(prefabName);
+            var pool = GameObjectPoolManager.Instance.RequestPool(prefab);
+            GameObject target = null;
+            if (pool != null)
+            {
+                target = pool.Request();
+                if (target != null)
+                {
+                    target.transform.SetParent(contentRt);
+                    target.transform.localScale = Vector3.one;
+                    target.transform.localPosition = Vector3.zero;
+                    target.gameObject.SetActive(true);
+                }
+            }
+            return target;
+        }
+    }
+
+}
+
+
+
+

--
Gitblit v1.8.0