From 34d01108e9f0c5488e8824f768c43801dd8ed4cc Mon Sep 17 00:00:00 2001
From: chai <chaifix@163.com>
Date: Sat, 4 Sep 2021 14:02:24 +0800
Subject: *misc

---
 Assets/Scripts/Unit/Events/EventProjectile.cs | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

(limited to 'Assets/Scripts/Unit/Events/EventProjectile.cs')

diff --git a/Assets/Scripts/Unit/Events/EventProjectile.cs b/Assets/Scripts/Unit/Events/EventProjectile.cs
index 5f9a22aa..6083179b 100644
--- a/Assets/Scripts/Unit/Events/EventProjectile.cs
+++ b/Assets/Scripts/Unit/Events/EventProjectile.cs
@@ -6,21 +6,28 @@ public class EventProjectile : AnimationEventBase
 {
     public enum EMoveType
     {
-        GoStraight,
-        Curve,
-    }
+		Kinematic = 0,
+        Curve,  // 用一个固定曲线运动
+		Procedural, // 程序控制
+	}
 
     public override TimelineEventProxy.EEventType type { get { return TimelineEventProxy.EEventType.EventProjectile; } }
 
     public override string shortName { get { return "P"; } }
 
+	[Tooltip("名字，可以用来识别这个projectile")]
+	public string name;
+
+	[Tooltip("标签，可以用来做一些标记,逗号分隔")]
+	public string tag;
+
     [Tooltip("Projectile path")]
     public string projectilePath;
 
     [Tooltip("Is attached to a bone")]
     public bool attachedToBone;
 
-    [Tooltip("Bone path attach to")]
+    [If("attachedToBone"), Tooltip("Bone path attach to")]
     public string bone;
 
     [Tooltip("Position offset")]
@@ -29,16 +36,24 @@ public class EventProjectile : AnimationEventBase
     [Tooltip("Rotation in euler")]
     public Vector3 rotation;
 
-    [When("moveType", EMoveType.GoStraight), Tooltip("Scale")]
+    [Tooltip("Scale")]
     public Vector3 scale = Vector3.one;
 
+	public float lifeTime;
+
     [Comment("[ 运动方式 ]", TextAnchor.MiddleCenter)]
 
     public EMoveType moveType;
 
-    [When("moveType", EMoveType.GoStraight), Tooltip("初始速度")]
+    [When("moveType", EMoveType.Kinematic), Tooltip("初始速度")]
     public Vector3 velocity;
+	[When("moveType", EMoveType.Kinematic), Tooltip("加速度")]
+	public Vector3 acceleration;
+
+	[When("moveType", EMoveType.Curve), Tooltip("运动曲线")]
+	public string curvePath;
 
+	[WhenNot("moveType", EMoveType.Procedural)]
 	public bool towardDirection;
 
     [Comment("[ 击中反馈 ]", TextAnchor.MiddleCenter)]
-- 
cgit v1.1-26-g67d0