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.asset53
-rw-r--r--Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_2.asset26
-rw-r--r--Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_3.asset57
-rw-r--r--Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_4.asset14
-rw-r--r--Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_5.asset53
-rw-r--r--Assets/Bundle/Unit/PC/Erika/AnimationData/Attack_Jump_to_Air.asset24
6 files changed, 207 insertions, 20 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 5361ee8e..323a0783 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,7 +10,7 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: cab6406109041434e890f22d6455172f, type: 3}
- m_Name: Air_Combo03_Z0_1(Clone)
+ m_Name: Air_Combo03_Z0_1
m_EditorClassIdentifier:
animationName: Air_Combo03_Z0_1
animationPath: Assets/Bundle/Unit/PC/Erika/AnimationClip/Air_Combo03_Z0_1.anim
@@ -18,7 +18,56 @@ MonoBehaviour:
- {fileID: 114581710045323768}
- {fileID: 114435450776992514}
hurtBoxes: []
- hitBoxes: []
+ hitBoxes:
+ - collider:
+ type: 0
+ pivot: 1
+ multiHit: 0
+ hitResponse: 4
+ 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: Assets/Art/Vfx/Hit & Slashes Vol.3/Prefabs/hit-line-1.prefab
+ sparkAnchor: 1
+ sparkOffset: {x: 0, y: 0, z: 0}
+ sparkScale: {x: 1, y: 1, z: 1}
+ multiSparks: 0
+ spark2Path:
+ spark2Anchor: 0
+ spark2Offset: {x: 0, y: 0, z: 0}
+ spark3Path:
+ spark3Anchor: 0
+ spark3Offset: {x: 0, y: 0, z: 0}
+ selfEffect: 0
+ otherEffect: 0
+ zoomCamera: 0
+ shakeScreen: 0
+ shakeOffset: {x: 0, y: 0}
+ shakeStrength: 0
+ colorDrift: 0
+ blur: 0
+ soundPath:
+ useGravity: 0
+ multiple: 0
+ frames:
+ - frame: 7
+ active: 1
+ position: {x: 0.5, y: 1.09, z: 0}
+ size: {x: 2.45, y: 2.07, z: 1}
+ - frame: 10
+ active: 1
+ position: {x: 0.58, y: 1.05, z: 0}
+ size: {x: 3.5, y: 2.29, z: 1}
+ - frame: 12
+ active: 1
+ position: {x: 0.2, y: 0.81, z: 0}
+ size: {x: 2.89, y: 2.64, z: 1}
throwBoxes: []
blockBoxes: []
defendBoxes: []
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 9f230140..18616499 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
@@ -59,7 +59,7 @@ MonoBehaviour:
type: 0
pivot: 1
multiHit: 0
- hitResponse: 0
+ hitResponse: 4
hitBack: {x: 0, y: 0, z: 0}
hitCurve:
serializedVersion: 2
@@ -69,8 +69,8 @@ MonoBehaviour:
m_RotationOrder: 4
freezeFramesSelf: 0
freezeFramesOther: 0
- sparkPath:
- sparkAnchor: 0
+ sparkPath: Assets/Art/Vfx/Hit & Slashes Vol.3/Prefabs/hit-line-1.prefab
+ sparkAnchor: 1
sparkOffset: {x: 0, y: 0, z: 0}
sparkScale: {x: 1, y: 1, z: 1}
multiSparks: 0
@@ -91,7 +91,23 @@ MonoBehaviour:
soundPath:
useGravity: 0
multiple: 0
- frames: []
+ frames:
+ - frame: 16
+ active: 1
+ position: {x: -0.45, y: 1.19, z: 0}
+ size: {x: 3.76, y: 2.79, z: 1}
+ - frame: 19
+ active: 1
+ position: {x: 0.28, y: 1.59, z: 0}
+ size: {x: 3.87, y: 2.59, z: 1}
+ - frame: 21
+ active: 1
+ position: {x: 0.55, y: 1.19, z: 0}
+ size: {x: 2.16, y: 2.14, z: 1}
+ - frame: 23
+ active: 1
+ position: {x: -0.54, y: 0.54, z: 0}
+ size: {x: 3.89, y: 1.59, z: 1}
throwBoxes: []
blockBoxes: []
defendBoxes: []
@@ -145,7 +161,7 @@ MonoBehaviour:
properties:
m_keys: 01000000
m_values:
- - 0.3
+ - 0.12
--- !u!114 &114311271947421858
MonoBehaviour:
m_ObjectHideFlags: 0
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 f8c7443a..1e4c20b5 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
@@ -17,7 +17,60 @@ MonoBehaviour:
animationEvents:
- {fileID: 114014187727905604}
hurtBoxes: []
- hitBoxes: []
+ hitBoxes:
+ - collider:
+ type: 0
+ pivot: 1
+ multiHit: 0
+ hitResponse: 4
+ 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: Assets/Art/Vfx/Hit & Slashes Vol.3/Prefabs/hit-line-1.prefab
+ sparkAnchor: 1
+ sparkOffset: {x: 0, y: 0, z: 0}
+ sparkScale: {x: 1, y: 1, z: 1}
+ multiSparks: 0
+ spark2Path:
+ spark2Anchor: 0
+ spark2Offset: {x: 0, y: 0, z: 0}
+ spark3Path:
+ spark3Anchor: 0
+ spark3Offset: {x: 0, y: 0, z: 0}
+ selfEffect: 0
+ otherEffect: 0
+ zoomCamera: 0
+ shakeScreen: 0
+ shakeOffset: {x: 0, y: 0}
+ shakeStrength: 0
+ colorDrift: 0
+ blur: 0
+ soundPath:
+ useGravity: 0
+ multiple: 0
+ frames:
+ - frame: 8
+ active: 1
+ position: {x: -0.48, y: 1.22, z: 0}
+ size: {x: 1.78, y: 2.57, z: 1}
+ - frame: 9
+ active: 1
+ position: {x: 0.45, y: 1.97, z: 0}
+ size: {x: 1.43, y: 2.47, z: 1}
+ - frame: 10
+ active: 1
+ position: {x: 1.01, y: 1, z: 0}
+ size: {x: 1.62, y: 2.64, z: 1}
+ - frame: 12
+ active: 1
+ position: {x: 0, y: 0.74, z: 0}
+ size: {x: 1.93, y: 2.65, z: 1}
throwBoxes: []
blockBoxes: []
defendBoxes: []
@@ -75,7 +128,7 @@ MonoBehaviour:
properties:
m_keys: 01000000
m_values:
- - 0.15
+ - 0.08
--- !u!114 &114014187727905604
MonoBehaviour:
m_ObjectHideFlags: 0
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 6d202f86..35ad051a 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
@@ -67,7 +67,7 @@ MonoBehaviour:
type: 0
pivot: 1
multiHit: 0
- hitResponse: 0
+ hitResponse: 4
hitBack: {x: 0, y: 0, z: 0}
hitCurve:
serializedVersion: 2
@@ -77,8 +77,8 @@ MonoBehaviour:
m_RotationOrder: 4
freezeFramesSelf: 0
freezeFramesOther: 0
- sparkPath:
- sparkAnchor: 0
+ sparkPath: Assets/Art/Vfx/Hit & Slashes Vol.3/Prefabs/hit-line-1.prefab
+ sparkAnchor: 1
sparkOffset: {x: 0, y: 0, z: 0}
sparkScale: {x: 1, y: 1, z: 1}
multiSparks: 0
@@ -103,11 +103,11 @@ MonoBehaviour:
- frame: 4
active: 1
position: {x: 0, y: 0.81, z: 1.04}
- size: {x: 2.41, y: 1.02, z: 1}
+ size: {x: 3.75, y: 1.68, z: 1}
- frame: 27
active: 1
- position: {x: 0, y: 0.72, z: -0.91}
- size: {x: 2.62, y: 1, z: 1}
+ position: {x: 0, y: 0.89, z: -0.91}
+ size: {x: 3.35, y: 1.46, z: 1}
throwBoxes: []
blockBoxes: []
defendBoxes: []
@@ -196,7 +196,7 @@ MonoBehaviour:
properties:
m_keys: 0100000002000000
m_values:
- - 0.15
+ - 0.09
- 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 71217e0e..cf4c4953 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
@@ -17,7 +17,56 @@ MonoBehaviour:
animationEvents:
- {fileID: 114811261527305922}
hurtBoxes: []
- hitBoxes: []
+ hitBoxes:
+ - collider:
+ type: 0
+ pivot: 1
+ multiHit: 0
+ hitResponse: 4
+ 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: Assets/Art/Vfx/Hit & Slashes Vol.3/Prefabs/hit-line-1.prefab
+ sparkAnchor: 1
+ sparkOffset: {x: 0, y: 0, z: 0}
+ sparkScale: {x: 1, y: 1, z: 1}
+ multiSparks: 0
+ spark2Path:
+ spark2Anchor: 0
+ spark2Offset: {x: 0, y: 0, z: 0}
+ spark3Path:
+ spark3Anchor: 0
+ spark3Offset: {x: 0, y: 0, z: 0}
+ selfEffect: 0
+ otherEffect: 0
+ zoomCamera: 0
+ shakeScreen: 0
+ shakeOffset: {x: 0, y: 0}
+ shakeStrength: 0
+ colorDrift: 0
+ blur: 0
+ soundPath:
+ useGravity: 0
+ multiple: 0
+ frames:
+ - frame: 16
+ active: 1
+ position: {x: 0.4, y: 1.72, z: 0}
+ size: {x: 1.17, y: 2.66, z: 1}
+ - frame: 18
+ active: 1
+ position: {x: 0.76, y: 1.12, z: 0}
+ size: {x: 1.76, y: 2.61, z: 1}
+ - frame: 22
+ active: 1
+ position: {x: 0.16, y: 2.27, z: 0}
+ size: {x: 2.55, y: 3.13, z: 1}
throwBoxes: []
blockBoxes: []
defendBoxes: []
@@ -62,7 +111,7 @@ MonoBehaviour:
properties:
m_keys: 01000000
m_values:
- - 0.07
+ - 0.04
--- !u!114 &114811261527305922
MonoBehaviour:
m_ObjectHideFlags: 0
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 c1f7f8d0..54dd0273 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
@@ -10,11 +10,12 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: cab6406109041434e890f22d6455172f, type: 3}
- m_Name: Attack_Jump_to_Air
+ m_Name: Attack_Jump_to_Air(Clone)
m_EditorClassIdentifier:
animationName: Attack_Jump_to_Air
animationPath: Assets/Bundle/Unit/PC/Erika/AnimationClip/Attack_Jump_to_Air.anim
- animationEvents: []
+ animationEvents:
+ - {fileID: 114282673544850798}
hurtBoxes: []
hitBoxes:
- collider:
@@ -106,3 +107,22 @@ MonoBehaviour:
properties:
m_keys:
m_values: []
+--- !u!114 &114282673544850798
+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: 11
+ effectPath: Assets/Art/Vfx/Sword slash VFX/Prefabs/Sword Slash 9.prefab
+ attached: 0
+ bone:
+ position: {x: 0, y: 1.8, z: 0.5}
+ rotation: {x: -137.822, y: -87.41101, z: 86.147}
+ scale: {x: 0.7, y: 0.7, z: -0.7}