summaryrefslogtreecommitdiff
path: root/Assets/Bundle/Unit
diff options
context:
space:
mode:
authorchai <chaifix@163.com>2021-09-03 19:54:38 +0800
committerchai <chaifix@163.com>2021-09-03 19:54:38 +0800
commit2a061be5b19e7b85e58ae6405368e28bdc073048 (patch)
treeeb447b84a2c016f6f9ea7d71cf3357a1cbfe1c2c /Assets/Bundle/Unit
parent09fe2bbb41e25e176ac26da56360899870ad80ec (diff)
*misc
Diffstat (limited to 'Assets/Bundle/Unit')
-rw-r--r--Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_2.asset2
-rw-r--r--Assets/Bundle/Unit/PC/Erika/AnimationData/Frank_RPG_Assassin_Combo02_1.asset29
2 files changed, 29 insertions, 2 deletions
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 1bc564a9..34f21520 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
@@ -10,7 +10,7 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: cab6406109041434e890f22d6455172f, type: 3}
- m_Name: Air_Combo03_Z0_2(Clone)
+ m_Name: Air_Combo03_Z0_2
m_EditorClassIdentifier:
animationName: Air_Combo03_Z0_2
animationPath: Assets/Bundle/Unit/PC/Erika/AnimationClip/Air_Combo03_Z0_2.anim
diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/Frank_RPG_Assassin_Combo02_1.asset b/Assets/Bundle/Unit/PC/Erika/AnimationData/Frank_RPG_Assassin_Combo02_1.asset
index df3d1d67..b17bb4ff 100644
--- a/Assets/Bundle/Unit/PC/Erika/AnimationData/Frank_RPG_Assassin_Combo02_1.asset
+++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/Frank_RPG_Assassin_Combo02_1.asset
@@ -10,13 +10,14 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: cab6406109041434e890f22d6455172f, type: 3}
- m_Name: Frank_RPG_Assassin_Combo02_1
+ m_Name: Frank_RPG_Assassin_Combo02_1(Clone)
m_EditorClassIdentifier:
animationName: Frank_RPG_Assassin_Combo02_1
animationPath: Assets/Bundle/Unit/PC/Erika/AnimationClip/Frank_RPG_Assassin_Combo02_1.anim
animationEvents:
- {fileID: 114964882930719632}
- {fileID: 114533364586825402}
+ - {fileID: 114167633906909970}
hurtBoxes: []
hitBoxes:
- collider:
@@ -100,6 +101,9 @@ MonoBehaviour:
throwBoxes: []
blockBoxes: []
defendBoxes: []
+ overrideRootMotion: 0
+ rootMotionOverrideData:
+ positions: []
speedCurve:
serializedVersion: 2
m_Curve:
@@ -135,6 +139,29 @@ MonoBehaviour:
parameters:
m_keys:
m_values: []
+--- !u!114 &114167633906909970
+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: 75c54c029c766614590737d26471b7a4, type: 3}
+ m_Name: EventProjectile
+ m_EditorClassIdentifier:
+ startFrame: 7
+ projectilePath: Assets/Bundle/Projectile/PlasmaOceanBlue_Big_Projectile 1.prefab
+ attachedToBone: 0
+ bone:
+ posOffset: {x: 0, y: 1, z: 0}
+ rotation: {x: 0, y: 0, z: 0}
+ scale: {x: 1, y: 1, z: 1}
+ velocity: {x: 1, y: 0, z: 0}
+ towardDirection: 0
+ hitResponse: 0
+ sparkPath: Assets/Bundle/Sparks/PlasmaOceanBlue_Big_Impact 1.prefab
--- !u!114 &114273515162279198
MonoBehaviour:
m_ObjectHideFlags: 0