summaryrefslogtreecommitdiff
path: root/Assets/Bundle
diff options
context:
space:
mode:
authorchai <chaifix@163.com>2021-09-10 22:29:23 +0800
committerchai <chaifix@163.com>2021-09-10 22:29:23 +0800
commit63f4fd784f27e195913607e938a6d7282a9485d3 (patch)
tree5daf388cfa445890024ce7da9e7ff3dbb41957d1 /Assets/Bundle
parent4e46f701027da081d60aa96e0814996c7acfa70a (diff)
*misc
Diffstat (limited to 'Assets/Bundle')
-rw-r--r--Assets/Bundle/Unit/PC/Erika/AnimationClip/jump_loop_Z1.anim10
-rw-r--r--Assets/Bundle/Unit/PC/Erika/AnimationData/Attack_Jump_to_Air.asset5
-rw-r--r--Assets/Bundle/Unit/PC/Erika/AnimationData/Jump Up.asset2
-rw-r--r--Assets/Bundle/Unit/PC/Erika/AnimationData/jump_landing 1.asset48
4 files changed, 50 insertions, 15 deletions
diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationClip/jump_loop_Z1.anim b/Assets/Bundle/Unit/PC/Erika/AnimationClip/jump_loop_Z1.anim
index 67f7d0f4..1b53acdc 100644
--- a/Assets/Bundle/Unit/PC/Erika/AnimationClip/jump_loop_Z1.anim
+++ b/Assets/Bundle/Unit/PC/Erika/AnimationClip/jump_loop_Z1.anim
@@ -7111,19 +7111,19 @@ AnimationClip:
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 1.5333334
- m_OrientationOffsetY: 0
+ m_OrientationOffsetY: -1.7
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 1
m_LoopBlend: 1
- m_LoopBlendOrientation: 0
+ m_LoopBlendOrientation: 1
m_LoopBlendPositionY: 0
m_LoopBlendPositionXZ: 0
- m_KeepOriginalOrientation: 0
- m_KeepOriginalPositionY: 1
+ m_KeepOriginalOrientation: 1
+ m_KeepOriginalPositionY: 0
m_KeepOriginalPositionXZ: 0
- m_HeightFromFeet: 0
+ m_HeightFromFeet: 1
m_Mirror: 0
m_EditorCurves: []
m_EulerEditorCurves: []
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 5450dbaf..fb1d508b 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
@@ -106,8 +106,9 @@ MonoBehaviour:
m_keys:
m_values: []
properties:
- m_keys:
- m_values: []
+ m_keys: 07000000
+ m_values:
+ - 0.55
--- !u!114 &114282673544850798
MonoBehaviour:
m_ObjectHideFlags: 0
diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/Jump Up.asset b/Assets/Bundle/Unit/PC/Erika/AnimationData/Jump Up.asset
index 309a603b..d86ea9bf 100644
--- a/Assets/Bundle/Unit/PC/Erika/AnimationData/Jump Up.asset
+++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/Jump Up.asset
@@ -10,7 +10,7 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: cab6406109041434e890f22d6455172f, type: 3}
- m_Name: Jump Up(Clone)
+ m_Name: Jump Up
m_EditorClassIdentifier:
animationName: Jump Up
animationPath: Assets/Bundle/Unit/PC/Erika/AnimationClip/Jump Up.anim
diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/jump_landing 1.asset b/Assets/Bundle/Unit/PC/Erika/AnimationData/jump_landing 1.asset
index 4b3e3da0..8d0d3b93 100644
--- a/Assets/Bundle/Unit/PC/Erika/AnimationData/jump_landing 1.asset
+++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/jump_landing 1.asset
@@ -14,32 +14,44 @@ MonoBehaviour:
m_EditorClassIdentifier:
animationName: jump_landing 1
animationPath: Assets/Bundle/Unit/PC/Erika/AnimationClip/jump_landing 1.anim
- animationEvents: []
+ animationEvents:
+ - {fileID: 114250295280482152}
hurtBoxes: []
hitBoxes: []
throwBoxes: []
blockBoxes: []
defendBoxes: []
+ overrideRootMotion: 1
+ rootMotionOverrideData:
+ positions:
+ - position: {x: 0, y: 1, z: 0}
+ frame: 0
+ - position: {x: 0, y: 0, z: 0}
+ frame: 2
+ - position: {x: 0, y: 0, z: 0}
+ frame: 5
+ - position: {x: 0, y: 0, z: 0}
+ frame: 21
speedCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
- value: 1
+ value: 0.8
inSlope: 0
outSlope: 0
- tangentMode: 0
+ tangentMode: 34
weightedMode: 0
inWeight: 0
- outWeight: 0
+ outWeight: 0.33333334
- serializedVersion: 3
time: 1
- value: 1
+ value: 0.8
inSlope: 0
outSlope: 0
- tangentMode: 0
+ tangentMode: 34
weightedMode: 0
- inWeight: 0
+ inWeight: 0.33333334
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
@@ -53,3 +65,25 @@ MonoBehaviour:
parameters:
m_keys:
m_values: []
+ properties:
+ m_keys:
+ m_values: []
+--- !u!114 &114250295280482152
+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: 7b8952562a0fbae41a92bd6c1f897ca1, type: 3}
+ m_Name: EventUnit_SetPosition
+ m_EditorClassIdentifier:
+ startFrame: 3
+ setX: 0
+ x: 0
+ setY: 1
+ y: 0
+ setZ: 0
+ z: 0