summaryrefslogtreecommitdiff
path: root/Assets/Bundle/Unit
diff options
context:
space:
mode:
authorchai <chaifix@163.com>2021-09-01 19:29:48 +0800
committerchai <chaifix@163.com>2021-09-01 19:29:48 +0800
commit8c519185b0053daa23c5c5978d47baf77c1391b0 (patch)
tree72c149df2e9691db3e079c92fb03219c9ddc8e9e /Assets/Bundle/Unit
parent21278085eae9c069fcb5cf61fbcdb6ca18f15b69 (diff)
*action tool的帧范围
Diffstat (limited to 'Assets/Bundle/Unit')
-rw-r--r--Assets/Bundle/Unit/PC/Erika/AnimationData/Frank_RPG_Assassin_Combo02_1.asset2
-rw-r--r--Assets/Bundle/Unit/PC/Erika/AnimationData/Frank_RPG_Assassin_Combo02_2.asset7
-rw-r--r--Assets/Bundle/Unit/PC/Erika/AnimatorController/Erika_AnimatorControllerCrossFade.controller10
3 files changed, 7 insertions, 12 deletions
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 aed0b017..df3d1d67 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
@@ -17,8 +17,6 @@ MonoBehaviour:
animationEvents:
- {fileID: 114964882930719632}
- {fileID: 114533364586825402}
- - {fileID: 114607369761710776}
- - {fileID: 114273515162279198}
hurtBoxes: []
hitBoxes:
- collider:
diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/Frank_RPG_Assassin_Combo02_2.asset b/Assets/Bundle/Unit/PC/Erika/AnimationData/Frank_RPG_Assassin_Combo02_2.asset
index 3f3d141a..724a553f 100644
--- a/Assets/Bundle/Unit/PC/Erika/AnimationData/Frank_RPG_Assassin_Combo02_2.asset
+++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/Frank_RPG_Assassin_Combo02_2.asset
@@ -10,7 +10,7 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: cab6406109041434e890f22d6455172f, type: 3}
- m_Name: Frank_RPG_Assassin_Combo02_2(Clone)(Clone)
+ m_Name: Frank_RPG_Assassin_Combo02_2(Clone)
m_EditorClassIdentifier:
animationName: Frank_RPG_Assassin_Combo02_2
animationPath: Assets/Bundle/Unit/PC/Erika/AnimationClip/Frank_RPG_Assassin_Combo02_2.anim
@@ -18,9 +18,6 @@ MonoBehaviour:
- {fileID: 114347121473010800}
- {fileID: 114766687553299966}
- {fileID: 114312737581800856}
- - {fileID: 114376026760716050}
- - {fileID: 114330056635207858}
- - {fileID: 114201303160775736}
hurtBoxes: []
hitBoxes:
- collider:
@@ -173,7 +170,7 @@ MonoBehaviour:
toggles:
m_keys: 00000000
m_values:
- - from: 0.57
+ - from: 0.45
to: 0.83
parameters:
m_keys:
diff --git a/Assets/Bundle/Unit/PC/Erika/AnimatorController/Erika_AnimatorControllerCrossFade.controller b/Assets/Bundle/Unit/PC/Erika/AnimatorController/Erika_AnimatorControllerCrossFade.controller
index 2cede664..17b56b71 100644
--- a/Assets/Bundle/Unit/PC/Erika/AnimatorController/Erika_AnimatorControllerCrossFade.controller
+++ b/Assets/Bundle/Unit/PC/Erika/AnimatorController/Erika_AnimatorControllerCrossFade.controller
@@ -421,7 +421,7 @@ AnimatorState:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: Attack3
+ m_Name: Attack2
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
@@ -434,7 +434,7 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
- m_Motion: {fileID: 7400000, guid: 04b9fb69058af0f438a6e8a3022ff336, type: 2}
+ m_Motion: {fileID: 7400000, guid: 5dfb4ccf3e0777d4f84f764949fba8a6, type: 2}
m_Tag:
m_SpeedParameter: PlaybackSpeed0
m_MirrorParameter:
@@ -685,7 +685,7 @@ AnimatorState:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: Attack2
+ m_Name: Attack3
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
@@ -900,10 +900,10 @@ AnimatorStateMachine:
m_Position: {x: 708, y: -552, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102230929257620240}
- m_Position: {x: 1236, y: -456, z: 0}
+ m_Position: {x: 1236, y: -504, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102642339950476984}
- m_Position: {x: 1236, y: -504, z: 0}
+ m_Position: {x: 1236, y: -456, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102101182547217892}
m_Position: {x: 1236, y: -552, z: 0}