diff options
5 files changed, 57 insertions, 7 deletions
diff --git a/Assets/Bundle/Curves.meta b/Assets/Bundle/Curves.meta new file mode 100644 index 00000000..8270b2ee --- /dev/null +++ b/Assets/Bundle/Curves.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 89d7a483edd237c41b3a2278c2e4c80c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_2.asset b/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_2.asset index 1bc564a9..34f21520 100644 --- a/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_2.asset +++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_2.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: cab6406109041434e890f22d6455172f, type: 3} - m_Name: Air_Combo03_Z0_2(Clone) + m_Name: Air_Combo03_Z0_2 m_EditorClassIdentifier: animationName: Air_Combo03_Z0_2 animationPath: Assets/Bundle/Unit/PC/Erika/AnimationClip/Air_Combo03_Z0_2.anim diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/Frank_RPG_Assassin_Combo02_1.asset b/Assets/Bundle/Unit/PC/Erika/AnimationData/Frank_RPG_Assassin_Combo02_1.asset index df3d1d67..b17bb4ff 100644 --- a/Assets/Bundle/Unit/PC/Erika/AnimationData/Frank_RPG_Assassin_Combo02_1.asset +++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/Frank_RPG_Assassin_Combo02_1.asset @@ -10,13 +10,14 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: cab6406109041434e890f22d6455172f, type: 3} - m_Name: Frank_RPG_Assassin_Combo02_1 + m_Name: Frank_RPG_Assassin_Combo02_1(Clone) m_EditorClassIdentifier: animationName: Frank_RPG_Assassin_Combo02_1 animationPath: Assets/Bundle/Unit/PC/Erika/AnimationClip/Frank_RPG_Assassin_Combo02_1.anim animationEvents: - {fileID: 114964882930719632} - {fileID: 114533364586825402} + - {fileID: 114167633906909970} hurtBoxes: [] hitBoxes: - collider: @@ -100,6 +101,9 @@ MonoBehaviour: throwBoxes: [] blockBoxes: [] defendBoxes: [] + overrideRootMotion: 0 + rootMotionOverrideData: + positions: [] speedCurve: serializedVersion: 2 m_Curve: @@ -135,6 +139,29 @@ MonoBehaviour: parameters: m_keys: m_values: [] +--- !u!114 &114167633906909970 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 75c54c029c766614590737d26471b7a4, type: 3} + m_Name: EventProjectile + m_EditorClassIdentifier: + startFrame: 7 + projectilePath: Assets/Bundle/Projectile/PlasmaOceanBlue_Big_Projectile 1.prefab + attachedToBone: 0 + bone: + posOffset: {x: 0, y: 1, z: 0} + rotation: {x: 0, y: 0, z: 0} + scale: {x: 1, y: 1, z: 1} + velocity: {x: 1, y: 0, z: 0} + towardDirection: 0 + hitResponse: 0 + sparkPath: Assets/Bundle/Sparks/PlasmaOceanBlue_Big_Impact 1.prefab --- !u!114 &114273515162279198 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Unit/Events/EventProjectile.cs b/Assets/Scripts/Unit/Events/EventProjectile.cs index 0c1dc22b..5f9a22aa 100644 --- a/Assets/Scripts/Unit/Events/EventProjectile.cs +++ b/Assets/Scripts/Unit/Events/EventProjectile.cs @@ -4,6 +4,12 @@ using UnityEngine; public class EventProjectile : AnimationEventBase
{
+ public enum EMoveType
+ {
+ GoStraight,
+ Curve,
+ }
+
public override TimelineEventProxy.EEventType type { get { return TimelineEventProxy.EEventType.EventProjectile; } }
public override string shortName { get { return "P"; } }
@@ -23,18 +29,23 @@ public class EventProjectile : AnimationEventBase [Tooltip("Rotation in euler")]
public Vector3 rotation;
- [Tooltip("Scale")]
+ [When("moveType", EMoveType.GoStraight), Tooltip("Scale")]
public Vector3 scale = Vector3.one;
- [Tooltip("初始速度")]
+ [Comment("[ 运动方式 ]", TextAnchor.MiddleCenter)]
+
+ public EMoveType moveType;
+
+ [When("moveType", EMoveType.GoStraight), Tooltip("初始速度")]
public Vector3 velocity;
- [Tooltip("朝向运动方向")]
public bool towardDirection;
- [Tooltip("击中效果")]
- public ColliderBox.EHitResponse hitResponse;
+ [Comment("[ 击中反馈 ]", TextAnchor.MiddleCenter)]
public string sparkPath;
+ [Tooltip("击中效果")]
+ public ColliderBox.EHitResponse hitResponse;
+
}
diff --git a/Assets/Scripts/Unit/TimelineEventProxy.cs b/Assets/Scripts/Unit/TimelineEventProxy.cs index 7d2231c6..da4185a7 100644 --- a/Assets/Scripts/Unit/TimelineEventProxy.cs +++ b/Assets/Scripts/Unit/TimelineEventProxy.cs @@ -155,6 +155,8 @@ public partial class TimelineEventProxy if (effect == null) return; string path = effect.effectPath; + if (path == null || path == "") + return; GameObject prefab = ResourceManager.Instance.LoadAsset<GameObject>(path); if (prefab != null) { @@ -186,6 +188,8 @@ public partial class TimelineEventProxy if (e == null)
return;
string projectilePath = e.projectilePath;
+ if (projectilePath == null || projectilePath == "")
+ return;
GameObject prefab = ResourceManager.Instance.LoadAsset<GameObject>(projectilePath);
if(prefab == null)
{
|