*misc

3 files changed, 33 insertions, 0 deletions

diff --git a/Assets/Scripts/Unit/Collider/ColliderAttributes.cs b/Assets/Scripts/Unit/Collider/ColliderAttributes.cs
index 3f3db4c5..9b9c142f 100644
--- a/Assets/Scripts/Unit/Collider/ColliderAttributes.cs
+++ b/Assets/Scripts/Unit/Collider/ColliderAttributes.cs
@@ -42,6 +42,7 @@ public class WhenAttribute : Attribute
 	public WhenAttribute(string name, float value)
 	{
 		this.conditionName = name;
+        this.value = value;
 	}
 
 	public string conditionName;
diff --git a/Assets/Scripts/Unit/Events/EventMesh_AfterImage.cs b/Assets/Scripts/Unit/Events/EventMesh_AfterImage.cs
new file mode 100644
index 00000000..ee792ddc
--- /dev/null
+++ b/Assets/Scripts/Unit/Events/EventMesh_AfterImage.cs
@@ -0,0 +1,21 @@
+using UnityEngine;

+

+public class EventMesh_AfterImage : AnimationEventBase

+{

+    public enum ELife

+    {

+        FrameBased = 0,

+        FixedTime = 1, 

+    }

+

+    public override TimelineEventProxy.EEventType type { get { return TimelineEventProxy.EEventType.EventMesh_AfterImage; } }

+    public override string shortName { get { return "A"; } }

+

+    public ELife lifeType;

+    [When("lifeType", (int)ELife.FixedTime), Tooltip("持续时间（按时间，scaledTime）")]

+    public float durationInFixedTime;

+    [When("lifeType", (int)ELife.FrameBased), Tooltip("持续时间（按帧, unscaledTime）")]

+    public float durationInFrame;

+

+}

+ 
\ No newline at end of file
diff --git a/Assets/Scripts/Unit/Events/EventMesh_AfterImage.cs.meta b/Assets/Scripts/Unit/Events/EventMesh_AfterImage.cs.meta
new file mode 100644
index 00000000..5e68ea59
--- /dev/null
+++ b/Assets/Scripts/Unit/Events/EventMesh_AfterImage.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: cbd5a33b9ed7704439230ab5ba43cb86
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: