GemBattle.git - Gitblit

main / GemBattle

宝石塔防

summary
reflog
commits
tree
docs
forks
compare

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

liuzhiwei

2020-11-06 f44ad64eff5c66b711e2b8d28c44c85a92cbc393

 Assets/Scripts/ActionGameFramework/Projectiles/BallisticProjectile.cs

@@ -36,6 +36,8 @@
        /// </summary>
        protected Collider[] m_Colliders;

        public bool IsHitEnemy { get; set; }

        public event Action fired;

        /// <summary>
@@ -163,6 +165,7 @@

            m_CollidersIgnoring.Clear();

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

			@@ -36,6 +36,8 @@
			/// </summary>
			protected Collider[] m_Colliders;

			public bool IsHitEnemy { get; set; }

			public event Action fired;

			/// <summary>
			@@ -163,6 +165,7 @@

			m_CollidersIgnoring.Clear();

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