From 0449b9f500d01bc40f35d8a36d0bb1edf0fd1379 Mon Sep 17 00:00:00 2001 From: chai Date: Mon, 13 Sep 2021 12:36:28 +0800 Subject: *misc --- .../PC/Erika/AnimationData/Air_Combo03_Z0_1.asset | 9 ++- .../PC/Erika/AnimationData/Air_Combo03_Z0_2.asset | 4 +- .../PC/Erika/AnimationData/Air_Combo03_Z0_3.asset | 4 +- .../PC/Erika/AnimationData/Air_Combo03_Z0_4.asset | 4 +- .../PC/Erika/AnimationData/Air_Combo03_Z0_5.asset | 4 +- .../Erika/AnimationData/Attack_Jump_to_Air.asset | 4 +- .../Frank_RPG_Assassin_Combo02_1.asset | 12 +++- .../Frank_RPG_Assassin_Combo02_2.asset | 81 ++++++++++++++++++++-- Assets/Scripts/Unit/Events/EventEffect.cs | 13 +++- Assets/Scripts/Unit/TimelineEventProxy.cs | 48 +++++++------ 10 files changed, 142 insertions(+), 41 deletions(-) (limited to 'Assets') diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_1.asset b/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_1.asset index cae0b6e4..fddcc1d1 100644 --- a/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_1.asset +++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_1.asset @@ -14,6 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: animationName: Air_Combo03_Z0_1 animationPath: Assets/Bundle/Unit/PC/Erika/AnimationClip/Air_Combo03_Z0_1.anim + note: animationEvents: - {fileID: 114581710045323768} - {fileID: 114435450776992514} @@ -137,7 +138,8 @@ MonoBehaviour: m_EditorClassIdentifier: startFrame: 12 effectPath: Assets/Art/Vfx/Sword slash VFX/Prefabs/Sword Slash 9.prefab - attached: 0 + attached: 1 + attachNode: 0 bone: position: {x: 0, y: 0.8, z: 0} rotation: {x: -24.814, y: 33.032, z: -30.331} @@ -157,6 +159,7 @@ MonoBehaviour: startFrame: 9 effectPath: Assets/Art/Vfx/Sword slash VFX/Prefabs/Sword Slash 9.prefab attached: 0 + attachNode: 0 bone: position: {x: 0, y: 1.3, z: 0} rotation: {x: -24.814, y: 33.032, z: -30.331} @@ -175,7 +178,8 @@ MonoBehaviour: m_EditorClassIdentifier: startFrame: 7 effectPath: Assets/Art/Vfx/Sword slash VFX/Prefabs/Sword Slash 9 small.prefab - attached: 0 + attached: 1 + attachNode: 0 bone: position: {x: 0, y: 1, z: 0} rotation: {x: -24.814, y: 33.032, z: -30.331} @@ -195,6 +199,7 @@ MonoBehaviour: startFrame: 9 effectPath: Assets/Art/Vfx/Sword slash VFX/Prefabs/Sword Slash 9.prefab attached: 0 + attachNode: 0 bone: position: {x: 0, y: 1, z: 0} rotation: {x: -24.814, y: 33.032, z: -30.331} 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 19125755..38e6e111 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 @@ -14,6 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: animationName: Air_Combo03_Z0_2 animationPath: Assets/Bundle/Unit/PC/Erika/AnimationClip/Air_Combo03_Z0_2.anim + note: animationEvents: - {fileID: 114311271947421858} hurtBoxes: @@ -178,7 +179,8 @@ MonoBehaviour: m_EditorClassIdentifier: startFrame: 17 effectPath: Assets/Art/Vfx/Sword slash VFX/Prefabs/Sword Slash 9.prefab - attached: 0 + attached: 1 + attachNode: 0 bone: position: {x: 0, y: 0.8, z: 0} rotation: {x: 16.405, y: -122.817, z: 27.753} diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_3.asset b/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_3.asset index 5f4f3c83..a3541eca 100644 --- a/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_3.asset +++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_3.asset @@ -14,6 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: animationName: Air_Combo03_Z0_3 animationPath: Assets/Bundle/Unit/PC/Erika/AnimationClip/Air_Combo03_Z0_3.anim + note: animationEvents: - {fileID: 114014187727905604} hurtBoxes: [] @@ -144,7 +145,8 @@ MonoBehaviour: m_EditorClassIdentifier: startFrame: 9 effectPath: Assets/Art/Vfx/Sword slash VFX/Prefabs/Sword Slash 9.prefab - attached: 0 + attached: 1 + attachNode: 0 bone: position: {x: 0, y: 1.2, z: 0} rotation: {x: -85.16, y: 0, z: 0} diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_4.asset b/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_4.asset index 5ef74246..822adaed 100644 --- a/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_4.asset +++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_4.asset @@ -14,6 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: animationName: Air_Combo03_Z0_4 animationPath: Assets/Bundle/Unit/PC/Erika/AnimationClip/Air_Combo03_Z0_4.anim + note: animationEvents: - {fileID: 114099195259598398} hurtBoxes: @@ -214,7 +215,8 @@ MonoBehaviour: m_EditorClassIdentifier: startFrame: 12 effectPath: Assets/Art/Vfx/Sword slash VFX/Prefabs/Sword Slash 9.prefab - attached: 0 + attached: 1 + attachNode: 0 bone: position: {x: 0, y: 0.3, z: 0} rotation: {x: 30.204, y: 15.196, z: -14.663} diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_5.asset b/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_5.asset index ea25db64..86c2fbf8 100644 --- a/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_5.asset +++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_5.asset @@ -14,6 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: animationName: Air_Combo03_Z0_5 animationPath: Assets/Bundle/Unit/PC/Erika/AnimationClip/Air_Combo03_Z0_5.anim + note: animationEvents: - {fileID: 114811261527305922} hurtBoxes: [] @@ -127,7 +128,8 @@ MonoBehaviour: m_EditorClassIdentifier: startFrame: 17 effectPath: Assets/Art/Vfx/Sword slash VFX/Prefabs/Sword Slash 9.prefab - attached: 0 + attached: 1 + attachNode: 0 bone: position: {x: 0, y: 1.7, z: 0} rotation: {x: 0, y: 90.00001, z: 270} diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/Attack_Jump_to_Air.asset b/Assets/Bundle/Unit/PC/Erika/AnimationData/Attack_Jump_to_Air.asset index faa8def9..30557709 100644 --- a/Assets/Bundle/Unit/PC/Erika/AnimationData/Attack_Jump_to_Air.asset +++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/Attack_Jump_to_Air.asset @@ -14,6 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: animationName: Attack_Jump_to_Air animationPath: Assets/Bundle/Unit/PC/Erika/AnimationClip/Attack_Jump_to_Air.anim + note: animationEvents: - {fileID: 114282673544850798} hurtBoxes: [] @@ -123,7 +124,8 @@ MonoBehaviour: m_EditorClassIdentifier: startFrame: 11 effectPath: Assets/Art/Vfx/Sword slash VFX/Prefabs/Sword Slash 9.prefab - attached: 0 + attached: 1 + attachNode: 0 bone: position: {x: 0, y: 1.8, z: 0.5} rotation: {x: 190, y: -87.41101, z: 86.147} 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 e4d94696..6f794770 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 @@ -14,6 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: animationName: Frank_RPG_Assassin_Combo02_1 animationPath: Assets/Bundle/Unit/PC/Erika/AnimationClip/Frank_RPG_Assassin_Combo02_1.anim + note: animationEvents: - {fileID: 114964882930719632} - {fileID: 114533364586825402} @@ -33,6 +34,7 @@ MonoBehaviour: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 + freezeGlobal: 0 freezeFramesSelf: 0 freezeFramesOther: 0 sparkPath: Assets/Art/Vfx/Hit & Slashes Vol.3/Prefabs/hit-white-3.prefab @@ -78,6 +80,7 @@ MonoBehaviour: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 + freezeGlobal: 0 freezeFramesSelf: 0 freezeFramesOther: 0 sparkPath: Assets/Art/Vfx/Hit & Slashes Vol.3/Prefabs/hit-blue-1.prefab @@ -152,6 +155,9 @@ MonoBehaviour: parameters: m_keys: m_values: [] + properties: + m_keys: + m_values: [] --- !u!114 &114167633906909970 MonoBehaviour: m_ObjectHideFlags: 0 @@ -271,7 +277,8 @@ MonoBehaviour: m_EditorClassIdentifier: startFrame: 11 effectPath: Assets/Art/Vfx/Sword slash VFX/Prefabs/Sword Slash 9.prefab - attached: 0 + attached: 1 + attachNode: 0 bone: position: {x: 0, y: 0, z: 0} rotation: {x: 9.041, y: 3.24, z: -13.587} @@ -325,7 +332,8 @@ MonoBehaviour: m_EditorClassIdentifier: startFrame: 7 effectPath: Assets/Art/Vfx/Sword slash VFX/Prefabs/Sword Slash 9.prefab - attached: 0 + attached: 1 + attachNode: 0 bone: position: {x: 0, y: 0, z: 0} rotation: {x: 29.554, y: -2.357, z: -15.468} diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/Frank_RPG_Assassin_Combo02_2.asset b/Assets/Bundle/Unit/PC/Erika/AnimationData/Frank_RPG_Assassin_Combo02_2.asset index a9da654d..877f0c2b 100644 --- a/Assets/Bundle/Unit/PC/Erika/AnimationData/Frank_RPG_Assassin_Combo02_2.asset +++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/Frank_RPG_Assassin_Combo02_2.asset @@ -10,10 +10,11 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: cab6406109041434e890f22d6455172f, type: 3} - m_Name: Frank_RPG_Assassin_Combo02_2 + m_Name: Frank_RPG_Assassin_Combo02_2(Clone) m_EditorClassIdentifier: animationName: Frank_RPG_Assassin_Combo02_2 animationPath: Assets/Bundle/Unit/PC/Erika/AnimationClip/Frank_RPG_Assassin_Combo02_2.anim + note: animationEvents: - {fileID: 114347121473010800} - {fileID: 114766687553299966} @@ -26,6 +27,13 @@ MonoBehaviour: multiHit: 0 hitResponse: 0 hitBack: {x: 0, y: 0, z: 0} + hitCurve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + freezeGlobal: 0 freezeFramesSelf: 0 freezeFramesOther: 0 sparkPath: Assets/Art/Vfx/Hit & Slashes Vol.3/Prefabs/hit-blue-1.prefab @@ -65,6 +73,13 @@ MonoBehaviour: multiHit: 0 hitResponse: 0 hitBack: {x: 0, y: 0, z: 0} + hitCurve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + freezeGlobal: 0 freezeFramesSelf: 0 freezeFramesOther: 0 sparkPath: Assets/Art/Vfx/Hit & Slashes Vol.3/Prefabs/hit-blue-1.prefab @@ -104,6 +119,13 @@ MonoBehaviour: multiHit: 0 hitResponse: 0 hitBack: {x: 0, y: 0, z: 0} + hitCurve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + freezeGlobal: 0 freezeFramesSelf: 0 freezeFramesOther: 0 sparkPath: Assets/Art/Vfx/Hit & Slashes Vol.3/Prefabs/hit-blue-1.prefab @@ -140,6 +162,9 @@ MonoBehaviour: throwBoxes: [] blockBoxes: [] defendBoxes: [] + overrideRootMotion: 0 + rootMotionOverrideData: + positions: [] speedCurve: serializedVersion: 2 m_Curve: @@ -175,6 +200,9 @@ MonoBehaviour: parameters: m_keys: m_values: [] + properties: + m_keys: + m_values: [] --- !u!114 &114201303160775736 MonoBehaviour: m_ObjectHideFlags: 0 @@ -188,16 +216,28 @@ MonoBehaviour: m_Name: EventProjectile m_EditorClassIdentifier: startFrame: 12 + name: + tag: 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} + lifeTime: 0 + moveType: 0 velocity: {x: 1, y: 0, z: 0} + acceleration: {x: 0, y: 0, z: 0} + curvePath: + speedCurve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 towardDirection: 0 - hitResponse: 0 sparkPath: Assets/Bundle/Sparks/PlasmaOceanBlue_Big_Impact 1.prefab + hitResponse: 0 --- !u!114 &114312737581800856 MonoBehaviour: m_ObjectHideFlags: 0 @@ -212,7 +252,8 @@ MonoBehaviour: m_EditorClassIdentifier: startFrame: 12 effectPath: Assets/Art/Vfx/Sword slash VFX/Prefabs/Sword Slash 9.prefab - attached: 0 + attached: 1 + attachNode: 0 bone: position: {x: 0, y: 0, z: 0} rotation: {x: 0, y: 0, z: -30} @@ -230,16 +271,28 @@ MonoBehaviour: m_Name: EventProjectile m_EditorClassIdentifier: startFrame: 6 + name: + tag: projectilePath: Assets/Bundle/Projectile/PlasmaOceanBlue_Big_Projectile 1.prefab attachedToBone: 0 bone: posOffset: {x: 0, y: 0, z: 0} rotation: {x: 0, y: 0, z: 0} scale: {x: 1, y: 1, z: 1} + lifeTime: 0 + moveType: 0 velocity: {x: 1, y: 0, z: 0} + acceleration: {x: 0, y: 0, z: 0} + curvePath: + speedCurve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 towardDirection: 0 - hitResponse: 0 sparkPath: Assets/Bundle/Sparks/PlasmaOceanBlue_Big_Impact 1.prefab + hitResponse: 0 --- !u!114 &114347121473010800 MonoBehaviour: m_ObjectHideFlags: 0 @@ -254,7 +307,8 @@ MonoBehaviour: m_EditorClassIdentifier: startFrame: 2 effectPath: Assets/Art/Vfx/Sword slash VFX/Prefabs/Sword Slash 9.prefab - attached: 0 + attached: 1 + attachNode: 0 bone: position: {x: 0, y: 0, z: 0} rotation: {x: -20, y: 0, z: 0} @@ -272,16 +326,28 @@ MonoBehaviour: m_Name: EventProjectile m_EditorClassIdentifier: startFrame: 2 + name: + tag: 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} + lifeTime: 0 + moveType: 0 velocity: {x: 1, y: 0, z: 0} + acceleration: {x: 0, y: 0, z: 0} + curvePath: + speedCurve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 towardDirection: 0 - hitResponse: 0 sparkPath: Assets/Bundle/Sparks/PlasmaOceanBlue_Big_Impact 1.prefab + hitResponse: 0 --- !u!114 &114766687553299966 MonoBehaviour: m_ObjectHideFlags: 0 @@ -296,7 +362,8 @@ MonoBehaviour: m_EditorClassIdentifier: startFrame: 6 effectPath: Assets/Art/Vfx/Sword slash VFX/Prefabs/Sword Slash 9.prefab - attached: 0 + attached: 1 + attachNode: 0 bone: position: {x: 0, y: 0, z: 0} rotation: {x: 0, y: 80, z: 0} diff --git a/Assets/Scripts/Unit/Events/EventEffect.cs b/Assets/Scripts/Unit/Events/EventEffect.cs index 9798ed6a..347b92f5 100644 --- a/Assets/Scripts/Unit/Events/EventEffect.cs +++ b/Assets/Scripts/Unit/Events/EventEffect.cs @@ -2,6 +2,12 @@ public class EventEffect : AnimationEventBase { + public enum EAttachNode + { + Unit, + Bone, + } + public override TimelineEventProxy.EEventType type { get { return TimelineEventProxy.EEventType.EventEffect; } } public override string shortName { get { return "E"; } } @@ -9,9 +15,12 @@ public class EventEffect : AnimationEventBase public string effectPath; [Tooltip("Is attached to a bone")] - public bool attached; + public bool attached = true; + + [If("attached")] + public EAttachNode attachNode = EAttachNode.Unit; - [If("attached"), Tooltip("Bone path attach to")] + [When("attachNode", EAttachNode.Bone), Tooltip("Bone path attach to")] public string bone; [Tooltip("Position offset")] diff --git a/Assets/Scripts/Unit/TimelineEventProxy.cs b/Assets/Scripts/Unit/TimelineEventProxy.cs index 6d4650fc..e750def2 100644 --- a/Assets/Scripts/Unit/TimelineEventProxy.cs +++ b/Assets/Scripts/Unit/TimelineEventProxy.cs @@ -81,6 +81,8 @@ public partial class TimelineEventProxy private Transform m_Root; + private Transform m_UnitModel; // 模型的Unit,默认是m_Root的第一个子节点 + public UnitController owner { get; private set; } private UnitAnimation m_UnitAnimation { get { return owner.unitAnimation; } } @@ -92,12 +94,14 @@ public partial class TimelineEventProxy this.owner = owner; m_Root = owner.transform; m_PrevAnimationData = null; + m_UnitModel = m_Root.GetChild(0); } public TimelineEventProxy(Transform root) { m_Root = root; m_PrevAnimationData = null; + m_UnitModel = m_Root.GetChild(0); } public static Type GetTypeByName(string name) @@ -177,32 +181,30 @@ public partial class TimelineEventProxy go.transform.SetParent(root.transform); FxClear onClear = root.AddComponent(); onClear.gameObject.name = prefab.name + "(Clone)"; - if(owner != null) - { - PlayEffectInfo info = new PlayEffectInfo(); - info.path = path; - info.playEffectType = EffectPlayTypes.Oneshot; - info.rootTr = m_Root; - info.posOffset = effect.position; - info.rot = effect.rotation; - info.scale = effect.scale; - info.bAttached = true; - onClear.Initialize(info); - } - else + PlayEffectInfo info = new PlayEffectInfo(); + info.path = path; + info.playEffectType = EffectPlayTypes.Oneshot; + info.posOffset = effect.position; + info.rot = effect.rotation; + info.scale = effect.scale; + info.bAttached = effect.attached; + if(effect.attached) { - PlayEffectInfo info = new PlayEffectInfo(); - info.path = path; - info.playEffectType = EffectPlayTypes.Oneshot; - info.rootTr = m_Root; - info.posOffset = effect.position; - info.rot = effect.rotation; - info.scale = effect.scale; - info.bAttached = true; - - onClear.Initialize(info); + if(effect.attachNode == global::EventEffect.EAttachNode.Unit) + { + info.rootTr = m_Root; + } + else if(effect.attachNode == global::EventEffect.EAttachNode.Bone) + { + if(m_UnitModel != null) + { + info.rootTr = m_UnitModel.Find(effect.bone); + } + } } + + onClear.Initialize(info); #if UNITY_EDITOR if (isInEditMode && registerParticleSystem != null) { -- cgit v1.1-26-g67d0