Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master

chenxin

2020-12-09 7fcfe2b029ffad2c35630d411d283c95ada7df5f

 Assets/Scripts/TowerDefense/UI/HUD/SelectBuffIcon.cs

@@ -55,7 +55,7 @@
        GameObject psParent;
        private void Start()
        {
            if (psParent == null)
            if (psParent == null && myPS != null)
            {
                psParent = myPS.transform.parent.gameObject;
            }
@@ -63,7 +63,15 @@

        public void OnClick()
        {
            AudioSourceManager.Ins.Play(AudioEnum.ChooseBuff);
            //判断是否是金钱
            if (isGold)
            {
                AudioSourceManager.Ins.Play(AudioEnum.Gold);
            }
            else
            {
                AudioSourceManager.Ins.Play(AudioEnum.UI);
            }

            if (OnSelectBuffCompleted != null)
                OnSelectBuffCompleted(Index);
@@ -106,6 +114,12 @@
            Name.color = EndlessBuffData.GetColorByRare(rare);
        }

        bool isGold;//是否是金币BUFF
        public void SetIsGold(bool isGold)
        {
            this.isGold = isGold;
        }


        /// <summary>
        /// 设置选中状态，做个缓动播放粒子特效
@@ -122,12 +136,12 @@
            {
                DOTween.To(() => transform.localScale, (v) => transform.localScale = v, new Vector3(1f, 1f, 1f), 0.15f);
                if (!psParent.activeSelf) psParent.SetActive(true);
                myPS.Play();
                myPS?.Play();
            }
            else
            {
                DOTween.To(() => transform.localScale, (v) => transform.localScale = v, new Vector3(0.87f, 0.87f, 0.87f), 0.15f);
                myPS.Stop();
                myPS?.Stop();
                if (psParent.activeSelf) psParent.SetActive(false);

            }