Merge commit '4a083f2f3d8baf1c2630b3717d62904edcc8e24a' into master

chenxin

2020-11-14 62b2779db75575bebd80ffac74fc3f25b5b994fa

 Assets/Scripts/TowerDefense/Towers/TowerLaunchers/BallisticLauncher.cs

@@ -39,14 +39,15 @@
            }
            ballisticProjectile.FireAtPoint(startPosition, enemy.position);

            if (fireParticleObj != null)
            {
                GameObject psObj = Poolable.TryGetPoolable(fireParticleObj);
                ParticleSystem ps = psObj.GetComponent<ParticleSystem>();
                if (ps == null)
                    ps = psObj.transform.GetChild(0).GetComponent<ParticleSystem>();
                PlayParticles(ps, startPosition, enemy.position);
            }
            // 先不适用炮口特效了
            // if (fireParticleObj != null)
            // {
            //     GameObject psObj = Poolable.TryGetPoolable(fireParticleObj);
            //     ParticleSystem ps = psObj.GetComponent<ParticleSystem>();
            //     if (ps == null)
            //         ps = psObj.transform.GetChild(0).GetComponent<ParticleSystem>();
            //     PlayParticles(ps, startPosition, enemy.position);
            // }
        }
    }
}