Merge commit '80b4237334a773b29bf69f38532a90ca659b3bfe' into master

chenxin

2020-11-04 ce7efae14eb31bcdfa0d540da6a1ef1457e046ab

 Assets/Scripts/TowerDefense/Affectors/AttackAffector.cs

@@ -176,8 +176,8 @@
            towerTargetter.ResetTargetter();
            towerTargetter.alignment = affectorAlignment;
            towerTargetter.acquiredTarget += OnAcquiredTarget;
            towerTargetter.lostTarget += OnLostTarget;
         GetAudioEnum();
            // towerTargetter.lostTarget += OnLostTarget;
            GetAudioEnum();
        }
        private AudioEnum audioEnum;//当前音乐的种类

@@ -203,17 +203,12 @@
        void OnDestroy()
        {
            towerTargetter.acquiredTarget -= OnAcquiredTarget;
            towerTargetter.lostTarget -= OnLostTarget;
        }

        void OnLostTarget()
        {
            m_TrackingEnemy = null;
            // towerTargetter.lostTarget -= OnLostTarget;
        }

        void OnAcquiredTarget(Targetable acquiredTarget)
        {
            m_TrackingEnemy = acquiredTarget;
            // m_TrackingEnemy = acquiredTarget;
        }

        public Damager damagerProjectile
@@ -320,6 +315,8 @@
        /// </summary>
        protected virtual void Update()
        {
            if (m_Launcher == null) return;

            // 处理当前Affector所在Tower对应的技能
            updateTowerSkillData();

@@ -330,7 +327,6 @@
            {
                OnFireTimer();
                m_FireTimer = 1 / fireRate;

                // 多倍攻速：
                if (fInEnergy > 0.0f)
                    m_FireTimer = m_FireTimer / 3.0f;
@@ -385,6 +381,11 @@
                    fillBulletTime = 2.0f;
                }
            }
            else
            {
                if (this.towerPtr)
                    towerPtr.setTowerState(true);
            }

            if (isMultiAttack)
            {