Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_linchunjie

2018-09-25 ad1fe50f4479494aa9ea09384499c69cd7a1d260

Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

 System/Dogz/DogzPackWin.cs

@@ -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()

@@ -183,12 +192,31 @@


        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]