From f44ad64eff5c66b711e2b8d28c44c85a92cbc393 Mon Sep 17 00:00:00 2001
From: liuzhiwei <liuzhiwei@qq.com>
Date: Fri, 06 Nov 2020 10:08:42 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master

---
 Assets/Scripts/ActionGameFramework/Projectiles/BallisticProjectile.cs |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/Assets/Scripts/ActionGameFramework/Projectiles/BallisticProjectile.cs b/Assets/Scripts/ActionGameFramework/Projectiles/BallisticProjectile.cs
index 64816c8..e1b243d 100644
--- a/Assets/Scripts/ActionGameFramework/Projectiles/BallisticProjectile.cs
+++ b/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)

--
Gitblit v1.9.1