*misc

6 files changed, 57 insertions, 3 deletions

diff --git a/Assets/Scripts/Unit/Collider/ColliderBox.cs b/Assets/Scripts/Unit/Collider/ColliderBox.cs
index 9c6e14e8..1163c888 100644
--- a/Assets/Scripts/Unit/Collider/ColliderBox.cs
+++ b/Assets/Scripts/Unit/Collider/ColliderBox.cs
@@ -49,10 +49,14 @@ public class ColliderBox
     public string sparkPath;

 	[ColliderType(EColliderType.HitBox), Tooltip("击中后的粒子效果")]

 	public Vector3 sparkOffset;

-	#endregion

+    [ColliderType(EColliderType.HitBox), Tooltip("自身钝帧")]

+    public float freezeFramesSelf;

+    [ColliderType(EColliderType.HitBox), Tooltip("对方钝帧")]

+    public float freezeFramesOther;

+    #endregion

 

-	#region ThrowBox 

-	[ColliderType(EColliderType.ThrowBox), Tooltip("是否允许抓取多个")]

+    #region ThrowBox 

+    [ColliderType(EColliderType.ThrowBox), Tooltip("是否允许抓取多个")]

     public bool multiple;

     #endregion 

 

diff --git a/Assets/Scripts/Unit/Component/UnitCollider.cs b/Assets/Scripts/Unit/Component/UnitCollider.cs
index 3d6bca70..4f2c5ef3 100644
--- a/Assets/Scripts/Unit/Component/UnitCollider.cs
+++ b/Assets/Scripts/Unit/Component/UnitCollider.cs
@@ -60,6 +60,7 @@ public class UnitCollider : UnitComponent
 

 #if UNITY_EDITOR

 

+    // 绘制collider调试

     public void OnDrawGizmos()

     {

         if (!showGizmos)

diff --git a/Assets/Scripts/Unit/Events/EventMesh_FadeIn.cs b/Assets/Scripts/Unit/Events/EventMesh_FadeIn.cs
new file mode 100644
index 00000000..29d1adde
--- /dev/null
+++ b/Assets/Scripts/Unit/Events/EventMesh_FadeIn.cs
@@ -0,0 +1,19 @@
+using UnityEngine;

+

+public class EventMesh_FadeIn : AnimationEventBase

+{

+    public enum EFadeInMode

+    {

+        Linear = 0,

+        Curve = 1,

+    }

+

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

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

+

+    public EFadeInMode mode;

+

+    [Tooltip("Duration in frame")]

+    public float duration;

+

+}
\ No newline at end of file
diff --git a/Assets/Scripts/Unit/Events/EventMesh_FadeIn.cs.meta b/Assets/Scripts/Unit/Events/EventMesh_FadeIn.cs.meta
new file mode 100644
index 00000000..5c943a7d
--- /dev/null
+++ b/Assets/Scripts/Unit/Events/EventMesh_FadeIn.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 155962a945650e440806af7a4346f155
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scripts/Unit/Events/EventMesh_FadeOut.cs b/Assets/Scripts/Unit/Events/EventMesh_FadeOut.cs
new file mode 100644
index 00000000..209810b2
--- /dev/null
+++ b/Assets/Scripts/Unit/Events/EventMesh_FadeOut.cs
@@ -0,0 +1,8 @@
+using UnityEngine;

+

+public class EventMesh_FadeOut : AnimationEventBase

+{

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

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

+

+}

diff --git a/Assets/Scripts/Unit/Events/EventMesh_FadeOut.cs.meta b/Assets/Scripts/Unit/Events/EventMesh_FadeOut.cs.meta
new file mode 100644
index 00000000..7abb9b33
--- /dev/null
+++ b/Assets/Scripts/Unit/Events/EventMesh_FadeOut.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 3ed55d0137f7de849918ade75357e60b
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: