diff options
Diffstat (limited to 'Assets/Bundle/Unit/PC/Erika/AnimationData')
6 files changed, 189 insertions, 61 deletions
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 e34dc684..06a9fc27 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 @@ -10,12 +10,13 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: cab6406109041434e890f22d6455172f, type: 3} - m_Name: Air_Combo03_Z0_1 + m_Name: Air_Combo03_Z0_1(Clone) m_EditorClassIdentifier: animationName: Air_Combo03_Z0_1 animationPath: Assets/Bundle/Unit/PC/Erika/AnimationClip/Air_Combo03_Z0_1.anim animationEvents: - - {fileID: 114949443759766766} + - {fileID: 114581710045323768} + - {fileID: 114435450776992514} hurtBoxes: [] hitBoxes: [] throwBoxes: [] @@ -29,21 +30,30 @@ MonoBehaviour: m_Curve: - serializedVersion: 3 time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 34 + value: 1.8 + inSlope: -0.053573478 + outSlope: -0.053573478 + tangentMode: 0 weightedMode: 0 inWeight: 0 - outWeight: 0 + outWeight: 0.1677485 + - serializedVersion: 3 + time: 0.58117175 + value: 1.4372973 + inSlope: -1.3982409 + outSlope: -1.3982409 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.15874855 + outWeight: 0.14750415 - serializedVersion: 3 time: 1 - value: 1 - inSlope: 0 - outSlope: 0 + value: 0.5 + inSlope: -2.2379038 + outSlope: -2.2379038 tangentMode: 34 weightedMode: 0 - inWeight: 0 + inWeight: 0.33333334 outWeight: 0 m_PreInfinity: 2 m_PostInfinity: 2 @@ -54,7 +64,7 @@ MonoBehaviour: toggles: m_keys: 00000000 m_values: - - from: 0.26 + - from: 0.3 to: 1 parameters: m_keys: @@ -62,6 +72,63 @@ MonoBehaviour: properties: m_keys: m_values: [] +--- !u!114 &114435450776992514 +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: 9fe45d0826fb033448a877f1d49199d6, type: 3} + m_Name: EventEffect + m_EditorClassIdentifier: + startFrame: 12 + effectPath: Assets/Art/Vfx/Sword slash VFX/Prefabs/Sword Slash 9.prefab + attached: 0 + bone: + position: {x: 0, y: 1, z: 0} + rotation: {x: -24.814, y: 33.032, z: -30.331} + scale: {x: 0.6, y: 0.6, z: 0.6} +--- !u!114 &114480333145456874 +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: 9fe45d0826fb033448a877f1d49199d6, type: 3} + m_Name: EventEffect + m_EditorClassIdentifier: + startFrame: 9 + effectPath: Assets/Art/Vfx/Sword slash VFX/Prefabs/Sword Slash 9.prefab + attached: 0 + bone: + position: {x: 0, y: 1.3, z: 0} + rotation: {x: -24.814, y: 33.032, z: -30.331} + scale: {x: 0.4, y: 0.4, z: 0.4} +--- !u!114 &114581710045323768 +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: 9fe45d0826fb033448a877f1d49199d6, type: 3} + m_Name: EventEffect + m_EditorClassIdentifier: + startFrame: 7 + effectPath: Assets/Art/Vfx/Sword slash VFX/Prefabs/Sword Slash 9.prefab + attached: 0 + bone: + position: {x: 0, y: 1.3, z: 0} + rotation: {x: -24.814, y: 33.032, z: -30.331} + scale: {x: 0.4, y: 0.4, z: 0.4} --- !u!114 &114949443759766766 MonoBehaviour: m_ObjectHideFlags: 0 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 0ea0ff63..9f230140 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 @@ -103,21 +103,30 @@ MonoBehaviour: m_Curve: - serializedVersion: 3 time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 34 + value: 1.8 + inSlope: -0.053573478 + outSlope: -0.053573478 + tangentMode: 0 weightedMode: 0 inWeight: 0 - outWeight: 0 + outWeight: 0.1677485 + - serializedVersion: 3 + time: 0.58117175 + value: 1.4372973 + inSlope: -1.3982409 + outSlope: -1.3982409 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.15874855 + outWeight: 0.14750415 - serializedVersion: 3 time: 1 - value: 1 - inSlope: 0 - outSlope: 0 + value: 0.5 + inSlope: -2.2379038 + outSlope: -2.2379038 tangentMode: 34 weightedMode: 0 - inWeight: 0 + inWeight: 0.33333334 outWeight: 0 m_PreInfinity: 2 m_PostInfinity: 2 @@ -128,7 +137,7 @@ MonoBehaviour: toggles: m_keys: 00000000 m_values: - - from: 0.47 + - from: 0.5 to: 1 parameters: m_keys: @@ -154,5 +163,5 @@ MonoBehaviour: attached: 0 bone: position: {x: 0, y: 0.8, z: 0} - rotation: {x: 0, y: 0, z: 0} + rotation: {x: 16.405, y: -122.817, z: 27.753} scale: {x: 0.6, y: 0.6, z: 0.6} 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 6f81b6ec..05ef48aa 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 @@ -33,21 +33,30 @@ MonoBehaviour: m_Curve: - serializedVersion: 3 time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 34 + value: 1.8 + inSlope: -0.053573478 + outSlope: -0.053573478 + tangentMode: 0 weightedMode: 0 inWeight: 0 - outWeight: 0 + outWeight: 0.1677485 + - serializedVersion: 3 + time: 0.58117175 + value: 1.4372973 + inSlope: -1.3982409 + outSlope: -1.3982409 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.15874855 + outWeight: 0.14750415 - serializedVersion: 3 time: 1 - value: 1 - inSlope: 0 - outSlope: 0 + value: 0.5 + inSlope: -2.2379038 + outSlope: -2.2379038 tangentMode: 34 weightedMode: 0 - inWeight: 0 + inWeight: 0.33333334 outWeight: 0 m_PreInfinity: 2 m_PostInfinity: 2 @@ -58,7 +67,7 @@ MonoBehaviour: toggles: m_keys: 00000000 m_values: - - from: 0.45 + - from: 0.4 to: 1 parameters: m_keys: 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 53271c66..41f36245 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 @@ -111,29 +111,50 @@ MonoBehaviour: throwBoxes: [] blockBoxes: [] defendBoxes: [] - overrideRootMotion: 0 + overrideRootMotion: 1 rootMotionOverrideData: - positions: [] + positions: + - position: {x: 0, y: 0, z: 0} + frame: 0 + - position: {x: 0.994, y: 0.214, z: 0} + frame: 9 + - position: {x: 1.245, y: 0.251, z: 0} + frame: 16 + - position: {x: 1.422, y: 0.27, z: 0} + frame: 19 + - position: {x: 1.487, y: 0.27, z: 0} + frame: 30 + - position: {x: 1.552, y: 0.307, z: 0} + frame: 45 speedCurve: serializedVersion: 2 m_Curve: - serializedVersion: 3 time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 34 + value: 1.8 + inSlope: -0.053573478 + outSlope: -0.053573478 + tangentMode: 0 weightedMode: 0 inWeight: 0 - outWeight: 0 + outWeight: 0.1677485 + - serializedVersion: 3 + time: 0.58117175 + value: 1.4372973 + inSlope: -1.3982409 + outSlope: -1.3982409 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.15874855 + outWeight: 0.14750415 - serializedVersion: 3 time: 1 - value: 1 - inSlope: 0 - outSlope: 0 + value: 0.5 + inSlope: -2.2379038 + outSlope: -2.2379038 tangentMode: 34 weightedMode: 0 - inWeight: 0 + inWeight: 0.33333334 outWeight: 0 m_PreInfinity: 2 m_PostInfinity: 2 @@ -167,7 +188,7 @@ MonoBehaviour: toggles: m_keys: 00000000 m_values: - - from: 0.45 + - from: 0.55 to: 1 parameters: m_keys: @@ -175,7 +196,7 @@ MonoBehaviour: properties: m_keys: 0100000002000000 m_values: - - 0.18 + - 0.15 - 1 --- !u!114 &114099195259598398 MonoBehaviour: 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 27a674b8..146b34b3 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 @@ -28,19 +28,19 @@ MonoBehaviour: m_Curve: - serializedVersion: 3 time: 0 - value: 2 + value: 1 inSlope: 0 outSlope: 0 - tangentMode: 0 + tangentMode: 34 weightedMode: 0 inWeight: 0 outWeight: 0 - serializedVersion: 3 time: 1 - value: 2 + value: 1 inSlope: 0 outSlope: 0 - tangentMode: 0 + tangentMode: 34 weightedMode: 0 inWeight: 0 outWeight: 0 @@ -53,7 +53,7 @@ MonoBehaviour: toggles: m_keys: 00000000 m_values: - - from: 0.61 + - from: 0.5 to: 1 parameters: m_keys: @@ -61,4 +61,4 @@ MonoBehaviour: properties: m_keys: 01000000 m_values: - - 0.03 + - 0.07 diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Dash.asset b/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Dash.asset index 9ddb1da4..f43c83e3 100644 --- a/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Dash.asset +++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Dash.asset @@ -20,12 +20,20 @@ MonoBehaviour: type: 0 pivot: 0 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 freezeFramesSelf: 0 freezeFramesOther: 0 sparkPath: sparkAnchor: 0 sparkOffset: {x: 0, y: 0, z: 0} + sparkScale: {x: 1, y: 1, z: 1} multiSparks: 0 spark2Path: spark2Anchor: 0 @@ -74,12 +82,20 @@ MonoBehaviour: type: 0 pivot: 0 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 freezeFramesSelf: 0 freezeFramesOther: 0 sparkPath: sparkAnchor: 0 sparkOffset: {x: 0, y: 0, z: 0} + sparkScale: {x: 1, y: 1, z: 1} multiSparks: 0 spark2Path: spark2Anchor: 0 @@ -102,26 +118,29 @@ MonoBehaviour: throwBoxes: [] blockBoxes: [] defendBoxes: [] + overrideRootMotion: 0 + rootMotionOverrideData: + positions: [] speedCurve: serializedVersion: 2 m_Curve: - serializedVersion: 3 time: 0 value: 1.5 - inSlope: -0.05896085 - outSlope: -0.05896085 - tangentMode: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 34 weightedMode: 0 inWeight: 0 - outWeight: 0.13216957 + outWeight: 0.33333334 - serializedVersion: 3 time: 1 - value: 1 - inSlope: -1.6730237 - outSlope: -1.6730237 - tangentMode: 0 + value: 1.5 + inSlope: 0 + outSlope: 0 + tangentMode: 34 weightedMode: 0 - inWeight: 0.082294285 + inWeight: 0.33333334 outWeight: 0 m_PreInfinity: 2 m_PostInfinity: 2 @@ -137,3 +156,6 @@ MonoBehaviour: parameters: m_keys: m_values: [] + properties: + m_keys: + m_values: [] |