From 7b9712f33f42b14e4d277166fa533a379021312d Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Fri, 18 Dec 2020 09:52:45 +0800
Subject: [PATCH] Merge branch 'master' of http://47.95.218.140:8090/r/GemBattle into master
---
Assets/Scripts/ActionGameFramework/Projectiles/BallisticProjectile.cs | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/Assets/Scripts/ActionGameFramework/Projectiles/BallisticProjectile.cs b/Assets/Scripts/ActionGameFramework/Projectiles/BallisticProjectile.cs
index e1b243d..3e2b811 100644
--- a/Assets/Scripts/ActionGameFramework/Projectiles/BallisticProjectile.cs
+++ b/Assets/Scripts/ActionGameFramework/Projectiles/BallisticProjectile.cs
@@ -36,8 +36,6 @@
/// </summary>
protected Collider[] m_Colliders;
- public bool IsHitEnemy { get; set; }
-
public event Action fired;
/// <summary>
@@ -165,11 +163,12 @@
m_CollidersIgnoring.Clear();
- IsHitEnemy = false;
// 因为炮弹没有模型，本身就是一个带碰撞体的粒子特效
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)
--
Gitblit v1.9.1