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

liuzhiwei

2020-12-08 48da25609d13d5d727859eaf941217b224381e5c

 Assets/Scripts/ActionGameFramework/Projectiles/BallisticProjectile.cs

@@ -162,11 +162,13 @@
            m_Fired = true;

            m_CollidersIgnoring.Clear();
            

            // 因为炮弹没有模型，本身就是一个带碰撞体的粒子特效
            ParticleSystem ps = GetComponent<ParticleSystem>();
            if (ps == null)
                ps = transform.GetChild(0).GetComponent<ParticleSystem>();
            if (ps == null)
                ps = transform.GetChild(0).GetChild(0).GetComponent<ParticleSystem>();
            ps?.Play();

            if (fired != null)