summaryrefslogtreecommitdiff
path: root/Assets/Bundle/Unit/PC/Erika/AnimationData
diff options
context:
space:
mode:
Diffstat (limited to 'Assets/Bundle/Unit/PC/Erika/AnimationData')
-rw-r--r--Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_5.asset2
-rw-r--r--Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Dash.asset4
-rw-r--r--Assets/Bundle/Unit/PC/Erika/AnimationData/Attack_Jump_to_Air.asset2
-rw-r--r--Assets/Bundle/Unit/PC/Erika/AnimationData/Jump Up.asset81
-rw-r--r--Assets/Bundle/Unit/PC/Erika/AnimationData/Jump Up.asset.meta8
5 files changed, 94 insertions, 3 deletions
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 3ea37260..ea25db64 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
@@ -130,5 +130,5 @@ MonoBehaviour:
attached: 0
bone:
position: {x: 0, y: 1.7, z: 0}
- rotation: {x: -416.096, y: 90.00001, z: 270}
+ rotation: {x: 0, y: 90.00001, z: 270}
scale: {x: 0.7, y: 0.7, z: -0.7}
diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Dash.asset b/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Dash.asset
index f43c83e3..21c6882a 100644
--- a/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Dash.asset
+++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Dash.asset
@@ -28,6 +28,7 @@ MonoBehaviour:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
+ freezeGlobal: 0
freezeFramesSelf: 0
freezeFramesOther: 0
sparkPath:
@@ -90,6 +91,7 @@ MonoBehaviour:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
+ freezeGlobal: 0
freezeFramesSelf: 0
freezeFramesOther: 0
sparkPath:
@@ -151,7 +153,7 @@ MonoBehaviour:
toggles:
m_keys: 00000000
m_values:
- - from: 0.3
+ - from: 0.2
to: 1
parameters:
m_keys:
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 4bf59206..5450dbaf 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
@@ -125,5 +125,5 @@ MonoBehaviour:
attached: 0
bone:
position: {x: 0, y: 1.8, z: 0.5}
- rotation: {x: -137.822, y: -87.41101, z: 86.147}
+ rotation: {x: 190, y: -87.41101, z: 86.147}
scale: {x: 0.7, y: 0.7, z: -0.7}
diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/Jump Up.asset b/Assets/Bundle/Unit/PC/Erika/AnimationData/Jump Up.asset
new file mode 100644
index 00000000..309a603b
--- /dev/null
+++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/Jump Up.asset
@@ -0,0 +1,81 @@
+%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 Up(Clone)
+ m_EditorClassIdentifier:
+ animationName: Jump Up
+ animationPath: Assets/Bundle/Unit/PC/Erika/AnimationClip/Jump Up.anim
+ animationEvents: []
+ hurtBoxes: []
+ hitBoxes: []
+ throwBoxes: []
+ blockBoxes: []
+ defendBoxes: []
+ overrideRootMotion: 0
+ rootMotionOverrideData:
+ positions: []
+ speedCurve:
+ 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: 0.6508728
+ value: 0.3
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.9401496
+ value: 1
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 7
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - 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
+ curves:
+ m_keys:
+ m_values: []
+ toggles:
+ m_keys: 00000000
+ m_values:
+ - from: 0.3
+ to: 1
+ parameters:
+ m_keys:
+ m_values: []
+ properties:
+ m_keys:
+ m_values: []
diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/Jump Up.asset.meta b/Assets/Bundle/Unit/PC/Erika/AnimationData/Jump Up.asset.meta
new file mode 100644
index 00000000..101632a2
--- /dev/null
+++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/Jump Up.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 4475e75b43ad6444fb30e0e8be4441c9
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 11400000
+ userData:
+ assetBundleName:
+ assetBundleVariant: