Merge branch 'master' into 1871天赋功能

client_linchunjie

2018-09-25 78bfe524ea4776c47f6314e56e97f39970b00fce

 System/Dogz/DogzPackWin.cs

@@ -16,7 +16,7 @@
    public class DogzPackWin : Window

    {

        [SerializeField] List<DogzEquip> m_DogzEquips;

        [SerializeField] List<Button> m_DogzUnEquipBtns;

        [SerializeField] List<DogzUnEquip> m_DogzUnEquipBtns;

        [SerializeField] List<Text> m_DogzUnEquipContents;

        [SerializeField] Image m_DogzHeadIcon;

        [SerializeField] Button m_CloseBtn;

@@ -24,6 +24,8 @@
        [SerializeField] ScrollerController m_PackController;

        [SerializeField] Button qualitySelectBtn;

        [SerializeField] Button starSelectBtn;

        [SerializeField] Transform qualityArrow;

        [SerializeField] Transform starArrow;

        [SerializeField] SortTable qualitySort;

        [SerializeField] SortTable starSort;



@@ -63,14 +65,19 @@
            playerPack.RefreshItemCountAct += RefreshDogzItemEvent;

            qualitySort.onSelectSortEvent += RefreshDogzSelectEvent;

            starSort.onSelectSortEvent += RefreshDogzSelectEvent;

            qualitySort.onSortCloseEvent += CloseQualitySort;

            starSort.onSortCloseEvent += CloseStarSort;

            dogzModel.SelectDogzItemQuality = 0;

            dogzModel.SelectDogzItemStart = 0;



            starSort.SetDefault();

            qualitySort.SetDefault();

            UpdateDogzEquip();

            UpdateDogzPack();

            starSort.gameObject.SetActive(false);

            qualitySort.gameObject.SetActive(false);

            starArrow.localRotation = Quaternion.Euler(0, 0, 180);

            qualityArrow.localRotation = Quaternion.Euler(0, 0, 180);

        }



        protected override void OnAfterOpen()

@@ -83,6 +90,8 @@
            playerPack.RefreshItemCountAct -= RefreshDogzItemEvent;

            qualitySort.onSelectSortEvent -= RefreshDogzSelectEvent;

            starSort.onSelectSortEvent -= RefreshDogzSelectEvent;

            qualitySort.onSortCloseEvent -= CloseQualitySort;

            starSort.onSortCloseEvent -= CloseStarSort;

        }



        protected override void OnAfterClose()

@@ -106,7 +115,8 @@
                ItemModel _data;

                int index = i;

                bool _equiped = dogzModel.TryGetDogzEquip(dogzModel.presentSelectDogz, i+101, out _data);

                m_DogzUnEquipBtns[i].gameObject.SetActive(!_equiped);

                m_DogzUnEquipBtns[i].DogzUnEquipBtn.gameObject.SetActive(!_equiped);

                m_DogzUnEquipBtns[i].RedpointBeh.redpointId = dogzModel.GetDogzEquipPlaceRedpointById(dogzModel.presentSelectDogz,i).id;

                m_DogzEquips[i].gameObject.SetActive(_equiped);

                if (_equiped)

                {

@@ -118,15 +128,15 @@
                    m_DogzUnEquipContents[i].text = StringUtility.Contact(DogzModel.GetItemColorName(_itemColor),

                        DogzModel.GetDogzPartNameByIndex(i));

                    m_DogzUnEquipContents[i].color = UIHelper.GetUIColor(_itemColor);

                    m_DogzUnEquipBtns[i].RemoveAllListeners();

                    m_DogzUnEquipBtns[i].AddListener(() => { ClickEquipIndex(index); });

                    m_DogzUnEquipBtns[i].DogzUnEquipBtn.RemoveAllListeners();

                    m_DogzUnEquipBtns[i].DogzUnEquipBtn.AddListener(() => { ClickEquipIndex(index); });

                }

            }

        }



        private void ClickEquipIndex(int index)

        {

            dogzModel.GetDogzItemListByIndex(index);

            dogzModel.GetDogzItemListByIndex(dogzModel.presentSelectDogz,index);

            if(dogzModel.selectEquipPlacelist.Count > 0)

            {

                WindowCenter.Instance.Open<SelectDogzItemWin>();

@@ -177,16 +187,45 @@
        private void GetEquipBtn()

        {

            //--界面跳转

            WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.DogzDungeon);

        }



        private void ClickStarSelect()

        {

            starSort.gameObject.SetActive(!starSort.gameObject.activeInHierarchy);

            starArrow.localRotation = Quaternion.Euler(0, 0, 0);

            if (!starSort.gameObject.activeInHierarchy)

            {

                starSort.gameObject.SetActive(true);

            }

        }



        private void ClickQualitySelect()

        {

            qualitySort.gameObject.SetActive(!qualitySort.gameObject.activeInHierarchy);

            qualityArrow.localRotation = Quaternion.Euler(0, 0, 0);

            if (!qualitySort.gameObject.activeInHierarchy)

            {

                qualitySort.gameObject.SetActive(true);

            }

        }





        private void CloseQualitySort()

        {

            qualityArrow.localRotation = Quaternion.Euler(0, 0, 180);

        }



        private void CloseStarSort()

        {

            starArrow.localRotation = Quaternion.Euler(0, 0, 180);

        }



        [Serializable]

        public class DogzUnEquip

        {

            [SerializeField] Button m_DogzUnEquipBtn;

            public Button DogzUnEquipBtn { get { return m_DogzUnEquipBtn; } }

            [SerializeField] RedpointBehaviour m_RedpointBeh;

            public RedpointBehaviour RedpointBeh { get { return m_RedpointBeh; } }

        }

    }