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_1.asset48
-rw-r--r--Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_2.asset54
-rw-r--r--Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_3.asset38
-rw-r--r--Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_4.asset44
4 files changed, 124 insertions, 60 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 7b0b13aa..e34dc684 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,32 +14,36 @@ MonoBehaviour:
m_EditorClassIdentifier:
animationName: Air_Combo03_Z0_1
animationPath: Assets/Bundle/Unit/PC/Erika/AnimationClip/Air_Combo03_Z0_1.anim
- animationEvents: []
+ animationEvents:
+ - {fileID: 114949443759766766}
hurtBoxes: []
hitBoxes: []
throwBoxes: []
blockBoxes: []
defendBoxes: []
+ overrideRootMotion: 0
+ rootMotionOverrideData:
+ positions: []
speedCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
- value: 1.5
- inSlope: -0.10062852
- outSlope: -0.10062852
- tangentMode: 0
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 34
weightedMode: 0
inWeight: 0
- outWeight: 0.14214464
+ outWeight: 0
- serializedVersion: 3
time: 1
value: 1
- inSlope: -1.7464255
- outSlope: -1.7464255
- tangentMode: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 34
weightedMode: 0
- inWeight: 0.04738152
+ inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
@@ -50,8 +54,30 @@ MonoBehaviour:
toggles:
m_keys: 00000000
m_values:
- - from: 0.4
+ - from: 0.26
to: 1
parameters:
m_keys:
m_values: []
+ properties:
+ m_keys:
+ m_values: []
+--- !u!114 &114949443759766766
+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, z: 0}
+ rotation: {x: -24.814, y: 33.032, z: -30.331}
+ scale: {x: 0.6, y: 0.6, z: 0.6}
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 c91f8013..0ea0ff63 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,7 +14,8 @@ MonoBehaviour:
m_EditorClassIdentifier:
animationName: Air_Combo03_Z0_2
animationPath: Assets/Bundle/Unit/PC/Erika/AnimationClip/Air_Combo03_Z0_2.anim
- animationEvents: []
+ animationEvents:
+ - {fileID: 114311271947421858}
hurtBoxes:
- collider:
type: 1
@@ -94,36 +95,18 @@ MonoBehaviour:
throwBoxes: []
blockBoxes: []
defendBoxes: []
- overrideRootMotion: 1
+ overrideRootMotion: 0
rootMotionOverrideData:
- positions:
- - position: {x: 0, y: 0, z: 0}
- frame: 0
- - position: {x: 0, y: 0, z: 0}
- frame: 8
- - position: {x: 0.3, y: 0.02, z: 0}
- frame: 11
- - position: {x: 0.72, y: 0.02, z: 0}
- frame: 13
- - position: {x: 1.37, y: 0.09, z: 0}
- frame: 16
- - position: {x: 1.77, y: 0.08, z: 0}
- frame: 19
- - position: {x: 2.62, y: 0.15, z: 0}
- frame: 22
- - position: {x: 2.95, y: 0.01, z: 0}
- frame: 48
- - position: {x: 2.95, y: 0.01, z: 0}
- frame: 50
+ positions: []
speedCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
- value: 1.5
+ value: 1
inSlope: 0
outSlope: 0
- tangentMode: 0
+ tangentMode: 34
weightedMode: 0
inWeight: 0
outWeight: 0
@@ -132,7 +115,7 @@ MonoBehaviour:
value: 1
inSlope: 0
outSlope: 0
- tangentMode: 0
+ tangentMode: 34
weightedMode: 0
inWeight: 0
outWeight: 0
@@ -145,7 +128,7 @@ MonoBehaviour:
toggles:
m_keys: 00000000
m_values:
- - from: 0.54
+ - from: 0.47
to: 1
parameters:
m_keys:
@@ -153,4 +136,23 @@ MonoBehaviour:
properties:
m_keys: 01000000
m_values:
- - 0.07
+ - 0.3
+--- !u!114 &114311271947421858
+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: 17
+ effectPath: Assets/Art/Vfx/Sword slash VFX/Prefabs/Sword Slash 9.prefab
+ attached: 0
+ bone:
+ position: {x: 0, y: 0.8, z: 0}
+ rotation: {x: 0, y: 0, z: 0}
+ 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 7fdac624..6f81b6ec 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,15 +14,20 @@ MonoBehaviour:
m_EditorClassIdentifier:
animationName: Air_Combo03_Z0_3
animationPath: Assets/Bundle/Unit/PC/Erika/AnimationClip/Air_Combo03_Z0_3.anim
- animationEvents: []
+ animationEvents:
+ - {fileID: 114014187727905604}
hurtBoxes: []
hitBoxes: []
throwBoxes: []
blockBoxes: []
defendBoxes: []
- overrideRootMotion: 0
+ overrideRootMotion: 1
rootMotionOverrideData:
- positions: []
+ positions:
+ - position: {x: 0, y: 0, z: 0}
+ frame: 0
+ - position: {x: 1.42, y: 0, z: 0}
+ frame: 25
speedCurve:
serializedVersion: 2
m_Curve:
@@ -31,7 +36,7 @@ MonoBehaviour:
value: 1
inSlope: 0
outSlope: 0
- tangentMode: 0
+ tangentMode: 34
weightedMode: 0
inWeight: 0
outWeight: 0
@@ -40,7 +45,7 @@ MonoBehaviour:
value: 1
inSlope: 0
outSlope: 0
- tangentMode: 0
+ tangentMode: 34
weightedMode: 0
inWeight: 0
outWeight: 0
@@ -53,7 +58,7 @@ MonoBehaviour:
toggles:
m_keys: 00000000
m_values:
- - from: 0.54
+ - from: 0.45
to: 1
parameters:
m_keys:
@@ -61,4 +66,23 @@ MonoBehaviour:
properties:
m_keys: 01000000
m_values:
- - 0.08
+ - 0.15
+--- !u!114 &114014187727905604
+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.2, z: 0}
+ rotation: {x: -85.16, y: 0, z: 0}
+ scale: {x: 0.6, y: 0.6, z: 0.6}
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 9cf4efee..53271c66 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,7 +14,8 @@ MonoBehaviour:
m_EditorClassIdentifier:
animationName: Air_Combo03_Z0_4
animationPath: Assets/Bundle/Unit/PC/Erika/AnimationClip/Air_Combo03_Z0_4.anim
- animationEvents: []
+ animationEvents:
+ - {fileID: 114099195259598398}
hurtBoxes:
- collider:
type: 1
@@ -121,25 +122,16 @@ MonoBehaviour:
value: 1
inSlope: 0
outSlope: 0
- tangentMode: 0
+ tangentMode: 34
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
- time: 0.07
- value: 2
- inSlope: 14.285714
- outSlope: Infinity
- tangentMode: 101
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- - serializedVersion: 3
time: 1
- value: 2
+ value: 1
inSlope: 0
outSlope: 0
- tangentMode: 0
+ tangentMode: 34
weightedMode: 0
inWeight: 0
outWeight: 0
@@ -175,12 +167,32 @@ MonoBehaviour:
toggles:
m_keys: 00000000
m_values:
- - from: 0.55
+ - from: 0.45
to: 1
parameters:
m_keys:
m_values: []
properties:
- m_keys: 01000000
+ m_keys: 0100000002000000
m_values:
- - 0.05
+ - 0.18
+ - 1
+--- !u!114 &114099195259598398
+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: 0.3, z: 0}
+ rotation: {x: 30.204, y: 15.196, z: -14.663}
+ scale: {x: 0.6, y: 0.6, z: 0.6}