diff options
Diffstat (limited to 'Assets/Bundle/Unit/PC/Erika/AnimationData')
10 files changed, 256 insertions, 7 deletions
diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/HitUp.asset b/Assets/Bundle/Unit/PC/Erika/AnimationData/HitUp.asset new file mode 100644 index 00000000..77914e55 --- /dev/null +++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/HitUp.asset @@ -0,0 +1,28 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +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: cab6406109041434e890f22d6455172f, type: 3} + m_Name: HitUp + m_EditorClassIdentifier: + animationName: HitUp + animationPath: Assets/Bundle/Unit/PC/Erika/AnimationClip/HitUp.anim + animationEvents: [] + hurtBoxes: [] + hitBoxes: [] + throwBoxes: [] + blockBoxes: [] + defendBoxes: [] + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/HitUp.asset.meta b/Assets/Bundle/Unit/PC/Erika/AnimationData/HitUp.asset.meta new file mode 100644 index 00000000..0eed147c --- /dev/null +++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/HitUp.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3e4f8a99603d1d24486ec0e32da74b1d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/Run_Turn180Left.asset b/Assets/Bundle/Unit/PC/Erika/AnimationData/Run_Turn180Left.asset new file mode 100644 index 00000000..cb24a00c --- /dev/null +++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/Run_Turn180Left.asset @@ -0,0 +1,46 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +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: cab6406109041434e890f22d6455172f, type: 3} + m_Name: Run_Turn180Left + m_EditorClassIdentifier: + animationName: Run_Turn180Left + animationPath: Assets/Bundle/Unit/PC/Erika/AnimationClip/Run_Turn180Left.anim + animationEvents: [] + hurtBoxes: [] + hitBoxes: [] + throwBoxes: [] + blockBoxes: [] + defendBoxes: [] + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/Run_Turn180Left.asset.meta b/Assets/Bundle/Unit/PC/Erika/AnimationData/Run_Turn180Left.asset.meta new file mode 100644 index 00000000..4ef684fd --- /dev/null +++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/Run_Turn180Left.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 642f9d2cf7c717147b0124d22b4ac5af +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/Run_Turn181Right.asset b/Assets/Bundle/Unit/PC/Erika/AnimationData/Run_Turn181Right.asset new file mode 100644 index 00000000..d40e9d96 --- /dev/null +++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/Run_Turn181Right.asset @@ -0,0 +1,28 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +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: cab6406109041434e890f22d6455172f, type: 3} + m_Name: Run_Turn181Right + m_EditorClassIdentifier: + animationName: Run_Turn181Right + animationPath: Assets/Bundle/Unit/PC/Erika/AnimationClip/Run_Turn181Right.anim + animationEvents: [] + hurtBoxes: [] + hitBoxes: [] + throwBoxes: [] + blockBoxes: [] + defendBoxes: [] + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/Run_Turn181Right.asset.meta b/Assets/Bundle/Unit/PC/Erika/AnimationData/Run_Turn181Right.asset.meta new file mode 100644 index 00000000..f93dc10a --- /dev/null +++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/Run_Turn181Right.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0a37975ef20eb224e82a68db4b6200d5 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/SuperKickCombo.asset b/Assets/Bundle/Unit/PC/Erika/AnimationData/SuperKickCombo.asset index aadb1c60..b75c1423 100644 --- a/Assets/Bundle/Unit/PC/Erika/AnimationData/SuperKickCombo.asset +++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/SuperKickCombo.asset @@ -16,8 +16,12 @@ MonoBehaviour: animationPath: Assets/Art/Animations/Erika/SuperKickCombo.anim animationEvents: [] hurtBoxes: - - type: 1 - pivot: 0 + - collider: + type: 0 + pivot: 0 + useGravity: 0 + hitBack: {x: 0, y: 0, z: 0} + multiHit: 0 frames: - frame: 0 active: 1 @@ -28,12 +32,44 @@ MonoBehaviour: position: {x: 0, y: 0, z: 0} size: {x: 1, y: 1, z: 0.5} hitBoxes: - - type: 0 - pivot: 1 + - collider: + type: 0 + pivot: 0 + useGravity: 0 + hitBack: {x: 0, y: 0, z: 0} + multiHit: 0 frames: [] - - type: 0 - pivot: 1 + - collider: + type: 0 + pivot: 0 + useGravity: 0 + hitBack: {x: 0, y: 0, z: 0} + multiHit: 0 frames: [] throwBoxes: [] blockBoxes: [] defendBoxes: [] + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 34 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 34 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/Take 001.asset b/Assets/Bundle/Unit/PC/Erika/AnimationData/Take 001.asset index 0de79a47..256db6f4 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 + m_Name: Take 001(Clone) m_EditorClassIdentifier: animationName: Take 001 animationPath: Assets/Art/Animations/Erika/Take 001.anim @@ -163,6 +163,57 @@ MonoBehaviour: throwBoxes: [] blockBoxes: [] defendBoxes: [] + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: -4.309641 + outSlope: -4.309641 + tangentMode: 34 + weightedMode: 0 + inWeight: 0 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.19568487 + value: 0.15666851 + inSlope: 0.97335625 + outSlope: 0.97335625 + tangentMode: 34 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.4097463 + value: 1.4959124 + inSlope: 2.5298142 + outSlope: 2.5298142 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.20279202 + outWeight: 0.16576308 + - serializedVersion: 3 + time: 0.68909186 + value: 2.0484724 + inSlope: 0.00018796552 + outSlope: 0.00018796552 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: -3.37229 + outSlope: -3.37229 + tangentMode: 34 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!114 &114097288536488508 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/jump 1.asset b/Assets/Bundle/Unit/PC/Erika/AnimationData/jump 1.asset new file mode 100644 index 00000000..a2c91d44 --- /dev/null +++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/jump 1.asset @@ -0,0 +1,28 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +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: cab6406109041434e890f22d6455172f, type: 3} + m_Name: jump 1 + m_EditorClassIdentifier: + animationName: jump 1 + animationPath: Assets/Bundle/Unit/PC/Erika/AnimationClip/jump 1.anim + animationEvents: [] + hurtBoxes: [] + hitBoxes: [] + throwBoxes: [] + blockBoxes: [] + defendBoxes: [] + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/jump 1.asset.meta b/Assets/Bundle/Unit/PC/Erika/AnimationData/jump 1.asset.meta new file mode 100644 index 00000000..bcf7a6ca --- /dev/null +++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/jump 1.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e4f432be3e6d01449b3a97010c5222a9 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: |