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

liuzhiwei

2020-12-09 b01151f932f8faa041a8facfb03059147170f40c

 Assets/Scripts/TowerDefense/Affectors/AttackAffector.cs

@@ -238,6 +238,7 @@

        }
        private AudioEnum audioEnum;//当前音乐的种类
        bool isWoodAudio;

        void GetAudioEnum()
        {
@@ -607,6 +608,7 @@
                    tmpDamager.damage = damagerProjectile.damage;
                    tmpDamager.IsEnhancedBullet = true;
                    tmpDamager.TowerPtr = towerPtr;
                    isWoodAudio = true;
                }

                // 下一颗子弹是强化子弹，然后直接蓄力
@@ -628,9 +630,19 @@
            {
                m_Launcher.Launch(m_TrackingEnemy, go, projectilePoints);
                if (AudioSourceManager.Ins)
                {
                    if (isWoodAudio)
                    {
                        isWoodAudio = false;
                        AudioSourceManager.Ins.Play(AudioEnum.WoodSkill);
                    }
                    else
                    {
                    AudioSourceManager.Ins.Play(audioEnum);
            }
        }
            }
        }

        /// <summary>
        /// A delegate to compare distances of components