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

wangguan

2020-12-03 c9fa521f5bec192efd161ad3dfbc79abae6d835f

 Assets/Scripts/TowerDefense/Towers/Tower.cs

@@ -207,8 +207,7 @@

                if (BondageWarningTime <= 0)
                {
                    Destroy(bondageWarningObj);
                    bondageWarningObj = null;
                    DestroyBondageWarningObj();
                    StartBondage();
                    ShowTapPrompt();
                }
@@ -219,6 +218,7 @@

                if (BondageTime <= 0)
                {
                    DestroyBondageWarningObj();
                    HideTapPrompt();
                    IsBondage = false;
                    Destroy(bondageObj);
@@ -228,6 +228,17 @@
            }
        }

        private void DestroyBondageWarningObj()
        {
            if (bondageWarningObj == null) return;

            ParticleSystem ps = bondageWarningObj.transform.GetChild(0).GetComponent<ParticleSystem>();
            ps.Stop();
            ps.Clear();
            Destroy(bondageWarningObj);
            bondageWarningObj = null;
        }

        /// <summary>
        /// 展示连续点击提示
        /// </summary>