diff options
Diffstat (limited to 'Assets/Bundle/Unit/PC/Erika/AnimationData')
6 files changed, 90 insertions, 23 deletions
diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03.asset b/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03.asset index 9ac4cfb7..a49dbcb1 100644 --- a/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03.asset +++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03.asset @@ -20,6 +20,9 @@ MonoBehaviour: throwBoxes: [] blockBoxes: [] defendBoxes: [] + overrideRootMotion: 0 + rootMotionOverrideData: + positions: [] speedCurve: serializedVersion: 2 m_Curve: @@ -53,3 +56,6 @@ MonoBehaviour: parameters: m_keys: m_values: [] + properties: + m_keys: + m_values: [] 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 34f21520..c91f8013 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 @@ -22,6 +22,12 @@ 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 freezeFramesSelf: 0 freezeFramesOther: 0 sparkPath: @@ -54,6 +60,12 @@ 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 freezeFramesSelf: 0 freezeFramesOther: 0 sparkPath: @@ -138,3 +150,7 @@ MonoBehaviour: parameters: m_keys: m_values: [] + properties: + m_keys: 01000000 + m_values: + - 0.07 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 1009b6af..7fdac624 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 @@ -53,8 +53,12 @@ MonoBehaviour: toggles: m_keys: 00000000 m_values: - - from: 0.45 + - from: 0.54 to: 1 parameters: m_keys: m_values: [] + properties: + m_keys: 01000000 + m_values: + - 0.08 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 0f718029..9cf4efee 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 @@ -22,6 +22,12 @@ 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 freezeFramesSelf: 0 freezeFramesOther: 0 sparkPath: @@ -62,6 +68,12 @@ 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 freezeFramesSelf: 0 freezeFramesOther: 0 sparkPath: @@ -98,27 +110,9 @@ MonoBehaviour: throwBoxes: [] blockBoxes: [] defendBoxes: [] - overrideRootMotion: 1 + overrideRootMotion: 0 rootMotionOverrideData: - positions: - - position: {x: 0, y: 0, z: 0} - frame: 0 - - position: {x: 0.79, y: 0.14, z: 0} - frame: 3 - - position: {x: 1.41, y: 0.24, z: 0} - frame: 6 - - position: {x: 2.44, y: 0.28, z: 0} - frame: 9 - - position: {x: 3.41, y: 0.25, z: 0} - frame: 12 - - position: {x: 3.83, y: 0.29, z: 0} - frame: 18 - - position: {x: 4.01, y: 0.26, z: 0} - frame: 28 - - position: {x: 4.09, y: 0.27, z: 0} - frame: 42 - - position: {x: 4.37, y: 0.14, z: 0} - frame: 45 + positions: [] speedCurve: serializedVersion: 2 m_Curve: @@ -181,8 +175,12 @@ MonoBehaviour: toggles: m_keys: 00000000 m_values: - - from: 0.69 + - from: 0.55 to: 1 parameters: m_keys: m_values: [] + properties: + m_keys: 01000000 + m_values: + - 0.05 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 694b3f64..27a674b8 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 @@ -20,6 +20,9 @@ MonoBehaviour: throwBoxes: [] blockBoxes: [] defendBoxes: [] + overrideRootMotion: 0 + rootMotionOverrideData: + positions: [] speedCurve: serializedVersion: 2 m_Curve: @@ -55,3 +58,7 @@ MonoBehaviour: parameters: m_keys: m_values: [] + properties: + m_keys: 01000000 + m_values: + - 0.03 diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/Take 001.asset b/Assets/Bundle/Unit/PC/Erika/AnimationData/Take 001.asset index b372229a..a0695940 100644 --- a/Assets/Bundle/Unit/PC/Erika/AnimationData/Take 001.asset +++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/Take 001.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: cab6406109041434e890f22d6455172f, type: 3} - m_Name: Take 001(Clone) + m_Name: Take 001 m_EditorClassIdentifier: animationName: Take 001 animationPath: Assets/Art/Animations/Erika/Take 001.anim @@ -28,6 +28,12 @@ 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 freezeFramesSelf: 0 freezeFramesOther: 0 sparkPath: @@ -116,6 +122,12 @@ 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 freezeFramesSelf: 0 freezeFramesOther: 0 sparkPath: @@ -155,6 +167,12 @@ 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 freezeFramesSelf: 0 freezeFramesOther: 0 sparkPath: @@ -194,6 +212,12 @@ 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 freezeFramesSelf: 0 freezeFramesOther: 0 sparkPath: @@ -233,6 +257,12 @@ 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 freezeFramesSelf: 0 freezeFramesOther: 0 sparkPath: @@ -272,6 +302,12 @@ 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 freezeFramesSelf: 0 freezeFramesOther: 0 sparkPath: |