summaryrefslogtreecommitdiff
path: root/Assets/Scripts/Projectile/Projectile.cs
diff options
context:
space:
mode:
Diffstat (limited to 'Assets/Scripts/Projectile/Projectile.cs')
-rw-r--r--Assets/Scripts/Projectile/Projectile.cs7
1 files changed, 5 insertions, 2 deletions
diff --git a/Assets/Scripts/Projectile/Projectile.cs b/Assets/Scripts/Projectile/Projectile.cs
index b1eb1b61..a6411f5f 100644
--- a/Assets/Scripts/Projectile/Projectile.cs
+++ b/Assets/Scripts/Projectile/Projectile.cs
@@ -59,7 +59,7 @@ public class Projectile : MonoBehaviour
private List<int> m_Hitmask;
- private float time;
+ public float time;
private bool markDestroy;
@@ -94,7 +94,7 @@ public class Projectile : MonoBehaviour
{
this.transform.position += this.velocity * deltaTime;
time += deltaTime;
- if(time > this.lifetime || markDestroy)
+ if (time > this.lifetime || markDestroy)
{
DestroyImmediate(this.gameObject);
}
@@ -170,6 +170,9 @@ public class Projectile : MonoBehaviour
if (spark)
{
GameObject obj = GameObject.Instantiate(spark);
+#if UNITY_EDITOR
+ obj.transform.SetParent(TimelineEventProxy.Root_Particles.transform);
+#endif
obj.transform.position = collision.collidee.unitCollider.owner.center;
markDestroy = true;