*misc

7 files changed, 39 insertions, 26 deletions

diff --git a/Assets/Scripts/Projectile/Projectile.cs b/Assets/Scripts/Projectile/Projectile.cs
index 70f2733c..5250d049 100644
--- a/Assets/Scripts/Projectile/Projectile.cs
+++ b/Assets/Scripts/Projectile/Projectile.cs
@@ -5,9 +5,34 @@ using UnityEngine;
 public class Projectile : MonoBehaviour

 {

 

-    

+	public Box collider;

+

+	public bool multiColliders;

+	public List<Box> colliders; 

+

     public UnitController owner;

 

     public bool isActive;

 

+	public Vector3 velocity; // 初始速度

+

+	public float gravity;

+

+	public bool towardDirection; // foward朝向运动的方向

+

+	void OnEnable()

+	{

+		ColliderRegistry.Instance.AddProjectile(this);	

+	}

+

+	void Update()

+	{

+

+	}

+

+	void OnDestroy()

+	{

+		ColliderRegistry.Instance.RemoveProjectile(this);

+	}

+

 }
\ No newline at end of file
diff --git a/Assets/Scripts/Props.meta b/Assets/Scripts/Props.meta
deleted file mode 100644
index bb96602e..00000000
--- a/Assets/Scripts/Props.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: f299520ed9fcf4a45858ad4ef5a8d5d1
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Scripts/Scene.meta b/Assets/Scripts/Scene.meta
deleted file mode 100644
index eb7a8716..00000000
--- a/Assets/Scripts/Scene.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: eaee2d0f48cff9b40baf0686a8105600
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
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