From 476abf41a7357db0dd870f0d221f1a26481ab2bf Mon Sep 17 00:00:00 2001
From: chai <chaifix@163.com>
Date: Tue, 31 Aug 2021 09:26:31 +0800
Subject: *misc

---
 Assets/Scripts/Unit/Collider/ColliderBox_Hitbox.cs  |  4 +++-
 Assets/Scripts/Unit/Controller/MonsterController.cs |  5 +++--
 Assets/Scripts/Unit/Events/EventProjectile.cs       | 10 +++++++---
 Assets/Scripts/Unit/TimelineEventProxy.cs           |  3 ---
 4 files changed, 13 insertions(+), 9 deletions(-)

(limited to 'Assets/Scripts/Unit')

diff --git a/Assets/Scripts/Unit/Collider/ColliderBox_Hitbox.cs b/Assets/Scripts/Unit/Collider/ColliderBox_Hitbox.cs
index 2044ae7d..00a5f036 100644
--- a/Assets/Scripts/Unit/Collider/ColliderBox_Hitbox.cs
+++ b/Assets/Scripts/Unit/Collider/ColliderBox_Hitbox.cs
@@ -74,7 +74,9 @@ public partial class ColliderBox
 	[Tooltip("粒子的锚点")]
 	public ESparkAnchor sparkAnchor;
 	[Tooltip("击中后的粒子位置偏移")]
-	public Vector3 sparkOffset;
+	public Vector3 sparkOffset;
+	[Tooltip("击中后的粒子大小")]
+	public Vector3 sparkScale = Vector3.one;
 	[Tooltip("多个粒子，最多支持3个")]
 	public bool multiSparks;
 	[If("multiSparks"), Tooltip("击中后的粒子效果")]
diff --git a/Assets/Scripts/Unit/Controller/MonsterController.cs b/Assets/Scripts/Unit/Controller/MonsterController.cs
index 5dca47d8..981e6d4b 100644
--- a/Assets/Scripts/Unit/Controller/MonsterController.cs
+++ b/Assets/Scripts/Unit/Controller/MonsterController.cs
@@ -49,11 +49,12 @@ public class MonsterController : UnitController
         }
 
         string path = hitbox.sparkPath;
-        GameObject vfx = ResourceManager.Instance.LoadAsset<GameObject>(path);
+		GameObject vfx = ResourceManager.Instance.LoadAsset<GameObject>(path);
         if(vfx != null)
         {
             GameObject go = GameObject.Instantiate(vfx);
-            go.transform.position = center;
+            go.transform.position = center + hitbox.sparkOffset;
+			go.transform.localScale = hitbox.sparkScale;
         }
     }
 
diff --git a/Assets/Scripts/Unit/Events/EventProjectile.cs b/Assets/Scripts/Unit/Events/EventProjectile.cs
index 731c42a9..7dc2923a 100644
--- a/Assets/Scripts/Unit/Events/EventProjectile.cs
+++ b/Assets/Scripts/Unit/Events/EventProjectile.cs
@@ -12,13 +12,13 @@ public class EventProjectile : AnimationEventBase
     public string projectilePath;
 
     [Tooltip("Is attached to a bone")]
-    public bool attached;
+    public bool attachedToBone;
 
     [Tooltip("Bone path attach to")]
     public string bone;
 
     [Tooltip("Position offset")]
-    public Vector3 position;
+    public Vector3 posOffset;
 
     [Tooltip("Rotation in euler")]
     public Vector3 rotation;
@@ -26,10 +26,14 @@ public class EventProjectile : AnimationEventBase
     [Tooltip("Scale")]
     public Vector3 scale;
 
-    [Tooltip("Initial velocity")]
+    [Tooltip("初始速度")]
     public Vector3 velocity;
 
+	[Tooltip("朝向运动方向")]
+	public bool towardDirection;
+
     [Tooltip("击中效果")]
     public ColliderBox.EHitResponse hitResponse;
 
+
 }
diff --git a/Assets/Scripts/Unit/TimelineEventProxy.cs b/Assets/Scripts/Unit/TimelineEventProxy.cs
index bb598666..7a76cd73 100644
--- a/Assets/Scripts/Unit/TimelineEventProxy.cs
+++ b/Assets/Scripts/Unit/TimelineEventProxy.cs
@@ -94,8 +94,6 @@ public partial class TimelineEventProxy
         }
     }
 
-    #region Event handle
-
     void EventEffect(AnimationEventBase animEvent)
     {
         EventEffect effect = animEvent as EventEffect;
@@ -120,5 +118,4 @@ public partial class TimelineEventProxy
 
     }
 
-	#endregion
 }
\ No newline at end of file
-- 
cgit v1.1-26-g67d0