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

chenxin

2020-12-25 adb0dae8a82a7eabb4e686bc0e83c8859bf6445f

 Assets/Scripts/TowerDefense/UI/EndlessBuffSelect.cs

@@ -51,7 +51,6 @@
                IconList[i].Reset();
            }

            AudioSourceManager.Ins?.Play(AudioEnum.BuffAppear);
        }

        private void OnDisable()
@@ -71,6 +70,7 @@

            SelectedIndex = index;
            IconList[index].SetState(true);

            //PlayEffect();
        }

@@ -112,6 +112,9 @@

            HideBuffUI();

            IconList[index].Fly();
            EndlessRandomTower.instance.SetCountDown(true,true);

            if (BuffSelectCompleted != null)
                BuffSelectCompleted(index);
        }
@@ -120,6 +123,7 @@
        {
            EndlessMaskUI.instance.Show();
            gameObject.SetActive(true);
            AudioSourceManager.Ins?.Play(AudioEnum.ChooseBuff);
        }

        public void HideBuffUI()
@@ -138,6 +142,7 @@
                IconList[i].SetName(list[i].Config.name);
                IconList[i].SetEffect(list[i].Config.brief);
                IconList[i].SetRare(list[i].Config.rare);
                IconList[i].SetIsGold(list[i].EffectType == EndlessBuffEffectType.GoldAdd);
            }
        }
    }