Merge branch 'master' into 3687天赋功能

client_linchunjie

2018-09-26 9ee6fe853c33f10db9cd17312618d454609dc024

 System/Dogz/DogzPackWin.cs

@@ -21,6 +21,7 @@
        [SerializeField] Image m_DogzHeadIcon;

        [SerializeField] Button m_CloseBtn;

        [SerializeField] Button m_GetEquipBtn;

        [SerializeField] Button m_OneKeyPutBtn;

        [SerializeField] ScrollerController m_PackController;

        [SerializeField] Button qualitySelectBtn;

        [SerializeField] Button starSelectBtn;

@@ -55,6 +56,7 @@
        {

            m_CloseBtn.onClick.AddListener(CloseClick);

            m_GetEquipBtn.onClick.AddListener(GetEquipBtn);

            m_OneKeyPutBtn.AddListener(ClickOneKeyPutBtn);

            qualitySelectBtn.AddListener(ClickQualitySelect);

            starSelectBtn.AddListener(ClickStarSelect);

        }

@@ -190,6 +192,24 @@
            WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.DogzDungeon);

        }





        private void ClickOneKeyPutBtn()

        {

            List<int> indexlist = new List<int>();

            for(int i = 0; i < 5; i++)

            {

                dogzModel.GetDogzItemListByIndex(dogzModel.presentSelectDogz,i);

                if (dogzModel.selectEquipPlacelist.Count > 0)

                {

                    indexlist.Add(dogzModel.selectEquipPlacelist[0].itemInfo.ItemPlace);

                }

            }

            if(indexlist.Count > 0)

            {

                dogzModel.SendPutOnEquip(indexlist);

            }

        }



        private void ClickStarSelect()

        {

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