diff options
46 files changed, 1340 insertions, 97 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} diff --git a/Assets/Bundle/Unit/PC/Erika/AnimatorController/Erika_AnimatorControllerCrossFade.controller b/Assets/Bundle/Unit/PC/Erika/AnimatorController/Erika_AnimatorControllerCrossFade.controller index 53aaf969..7d0c542c 100644 --- a/Assets/Bundle/Unit/PC/Erika/AnimatorController/Erika_AnimatorControllerCrossFade.controller +++ b/Assets/Bundle/Unit/PC/Erika/AnimatorController/Erika_AnimatorControllerCrossFade.controller @@ -278,7 +278,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 3af4a4fdd9720044bacfd86b0c3435b1, type: 2} + m_Motion: {fileID: 7400000, guid: 47193788a5f8b264ea6cecc0f40565fd, type: 2} m_Tag: m_SpeedParameter: PlaybackSpeed0 m_MirrorParameter: @@ -304,7 +304,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 30ab9f767efd0ad4bbb7f1a3f0103903, type: 2} + m_Motion: {fileID: 7400000, guid: 12d218bc2d437724596bf621977ef2b1, type: 2} m_Tag: m_SpeedParameter: PlaybackSpeed0 m_MirrorParameter: @@ -330,7 +330,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 5dfb4ccf3e0777d4f84f764949fba8a6, type: 2} + m_Motion: {fileID: 7400000, guid: 9f98de732e61882409d9a3456b87be18, type: 2} m_Tag: m_SpeedParameter: PlaybackSpeed0 m_MirrorParameter: @@ -356,7 +356,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 206480665046382184} + m_Motion: {fileID: 7400000, guid: 699f02cd5bde7474c87c46a702af08af, type: 2} m_Tag: m_SpeedParameter: PlaybackSpeed0 m_MirrorParameter: @@ -408,7 +408,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 76fde77dd4724694eb0955b10a0d54e4, type: 2} + m_Motion: {fileID: 7400000, guid: 27718441c96a4114ebb01ccc168d623d, type: 2} m_Tag: m_SpeedParameter: PlaybackSpeed0 m_MirrorParameter: @@ -434,7 +434,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 5dfb4ccf3e0777d4f84f764949fba8a6, type: 2} + m_Motion: {fileID: 7400000, guid: 9dd4ab0963a41b34b82a519bb7cced5b, type: 2} m_Tag: m_SpeedParameter: PlaybackSpeed0 m_MirrorParameter: @@ -460,7 +460,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 1c1b573ac9e8cb947afae3a21b84a6ce, type: 2} + m_Motion: {fileID: 7400000, guid: 2e5d802bfba7db747af88bfe578a602b, type: 2} m_Tag: m_SpeedParameter: PlaybackSpeed0 m_MirrorParameter: @@ -486,7 +486,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 80b0945bbe9b94f468cc20801c050baf, type: 2} + m_Motion: {fileID: 7400000, guid: a3d6b748582c79b4aaa28b16395f2152, type: 2} m_Tag: m_SpeedParameter: PlaybackSpeed0 m_MirrorParameter: @@ -593,7 +593,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: f132e9d177395cc44a2e06c71cbd7849, type: 2} + m_Motion: {fileID: 7400000, guid: 46fdb4c35c347b04ca9c107a10f50e90, type: 2} m_Tag: m_SpeedParameter: PlaybackSpeed0 m_MirrorParameter: @@ -619,7 +619,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 154fc7715a2686b43ba21cd2178be9a9, type: 2} + m_Motion: {fileID: 7400000, guid: ce137d29e7943ad4081d2ab6c4bad77c, type: 2} m_Tag: m_SpeedParameter: PlaybackSpeed0 m_MirrorParameter: @@ -645,7 +645,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 95c80bbb74677844aad0f268349b4743, type: 2} + m_Motion: {fileID: 7400000, guid: 78c6ded2841535449b1e3f362cbd2a87, type: 2} m_Tag: m_SpeedParameter: PlaybackSpeed0 m_MirrorParameter: @@ -678,6 +678,32 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1102 &1102559519921444194 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: AirAttack4 + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 1 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 5c91a24c28d8248438c7b28ce88cdaa9, type: 2} + m_Tag: + m_SpeedParameter: PlaybackSpeed0 + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1102 &1102642339950476984 AnimatorState: serializedVersion: 5 @@ -698,7 +724,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 95825ba91d25c0d4883ab6879910778e, type: 2} + m_Motion: {fileID: 7400000, guid: 3aa5c8eea43356142af2368559af17b1, type: 2} m_Tag: m_SpeedParameter: PlaybackSpeed0 m_MirrorParameter: @@ -724,7 +750,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: d2551386674378f4cbedd917bf6348c5, type: 2} + m_Motion: {fileID: 7400000, guid: 09e1d1b1eaa33064299f7a72a18410dd, type: 2} m_Tag: m_SpeedParameter: PlaybackSpeed0 m_MirrorParameter: @@ -776,7 +802,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 1a50f1532c8bfe644869ccd4c1379a9e, type: 2} + m_Motion: {fileID: 7400000, guid: 3cc70e950f9a2e84f82c182e9d3f268d, type: 2} m_Tag: m_SpeedParameter: PlaybackSpeed0 m_MirrorParameter: @@ -802,7 +828,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 26bb0d2d4098c084b9f324a004bea6d2, type: 2} + m_Motion: {fileID: 7400000, guid: 05b364e0ea3f6b44ca336a2abf51ba67, type: 2} m_Tag: IgnoreY m_SpeedParameter: PlaybackSpeed0 m_MirrorParameter: @@ -944,7 +970,10 @@ AnimatorStateMachine: m_Position: {x: 972, y: -600, z: 0} - serializedVersion: 1 m_State: {fileID: 1102653220258956662} - m_Position: {x: 708, y: -372, z: 0} + m_Position: {x: 708, y: -336, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1102559519921444194} + m_Position: {x: 708, y: -408, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] diff --git a/Assets/Bundle/Unit/PC/Erika/AnimatorController/Erika_OverrideController.overrideController b/Assets/Bundle/Unit/PC/Erika/AnimatorController/Erika_OverrideController.overrideController new file mode 100644 index 00000000..65428b0f --- /dev/null +++ b/Assets/Bundle/Unit/PC/Erika/AnimatorController/Erika_OverrideController.overrideController @@ -0,0 +1,45 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!221 &22100000 +AnimatorOverrideController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Erika_OverrideController + m_Controller: {fileID: 9100000, guid: dbcf42e4fb8a6ad4488eb7d2941acc31, type: 2} + m_Clips: + - m_OriginalClip: {fileID: 7400000, guid: 699f02cd5bde7474c87c46a702af08af, type: 2} + m_OverrideClip: {fileID: 7400000, guid: 599f2b26128dfd742b4aefbc285c4d3e, type: 2} + - m_OriginalClip: {fileID: 7400000, guid: 78c6ded2841535449b1e3f362cbd2a87, type: 2} + m_OverrideClip: {fileID: 7400000, guid: 95c80bbb74677844aad0f268349b4743, type: 2} + - m_OriginalClip: {fileID: 7400000, guid: 12d218bc2d437724596bf621977ef2b1, type: 2} + m_OverrideClip: {fileID: 7400000, guid: 30ab9f767efd0ad4bbb7f1a3f0103903, type: 2} + - m_OriginalClip: {fileID: 7400000, guid: 05b364e0ea3f6b44ca336a2abf51ba67, type: 2} + m_OverrideClip: {fileID: 7400000, guid: 26bb0d2d4098c084b9f324a004bea6d2, type: 2} + - m_OriginalClip: {fileID: 7400000, guid: a3d6b748582c79b4aaa28b16395f2152, type: 2} + m_OverrideClip: {fileID: 7400000, guid: 80b0945bbe9b94f468cc20801c050baf, type: 2} + - m_OriginalClip: {fileID: 7400000, guid: 47193788a5f8b264ea6cecc0f40565fd, type: 2} + m_OverrideClip: {fileID: 7400000, guid: 3af4a4fdd9720044bacfd86b0c3435b1, type: 2} + - m_OriginalClip: {fileID: 7400000, guid: 46fdb4c35c347b04ca9c107a10f50e90, type: 2} + m_OverrideClip: {fileID: 7400000, guid: f132e9d177395cc44a2e06c71cbd7849, type: 2} + - m_OriginalClip: {fileID: 7400000, guid: ce137d29e7943ad4081d2ab6c4bad77c, type: 2} + m_OverrideClip: {fileID: 7400000, guid: 154fc7715a2686b43ba21cd2178be9a9, type: 2} + - m_OriginalClip: {fileID: 7400000, guid: 3cc70e950f9a2e84f82c182e9d3f268d, type: 2} + m_OverrideClip: {fileID: 7400000, guid: 1a50f1532c8bfe644869ccd4c1379a9e, type: 2} + - m_OriginalClip: {fileID: 7400000, guid: 5c91a24c28d8248438c7b28ce88cdaa9, type: 2} + m_OverrideClip: {fileID: 7400000, guid: 6543c9aee7b3f7b4d80c8f87fdf3c837, type: 2} + - m_OriginalClip: {fileID: 7400000, guid: 09e1d1b1eaa33064299f7a72a18410dd, type: 2} + m_OverrideClip: {fileID: 7400000, guid: d2551386674378f4cbedd917bf6348c5, type: 2} + - m_OriginalClip: {fileID: 7400000, guid: 27718441c96a4114ebb01ccc168d623d, type: 2} + m_OverrideClip: {fileID: 7400000, guid: 76fde77dd4724694eb0955b10a0d54e4, type: 2} + - m_OriginalClip: {fileID: 7400000, guid: 2e5d802bfba7db747af88bfe578a602b, type: 2} + m_OverrideClip: {fileID: 7400000, guid: 1c1b573ac9e8cb947afae3a21b84a6ce, type: 2} + - m_OriginalClip: {fileID: 7400000, guid: 9f98de732e61882409d9a3456b87be18, type: 2} + m_OverrideClip: {fileID: 7400000, guid: 5dfb4ccf3e0777d4f84f764949fba8a6, type: 2} + - m_OriginalClip: {fileID: 7400000, guid: 9dd4ab0963a41b34b82a519bb7cced5b, type: 2} + m_OverrideClip: {fileID: 7400000, guid: 5dfb4ccf3e0777d4f84f764949fba8a6, type: 2} + - m_OriginalClip: {fileID: 7400000, guid: 599f2b26128dfd742b4aefbc285c4d3e, type: 2} + m_OverrideClip: {fileID: 7400000, guid: 95825ba91d25c0d4883ab6879910778e, type: 2} + - m_OriginalClip: {fileID: 7400000, guid: 3aa5c8eea43356142af2368559af17b1, type: 2} + m_OverrideClip: {fileID: 7400000, guid: 95825ba91d25c0d4883ab6879910778e, type: 2} diff --git a/Assets/Bundle/Unit/PC/Erika/AnimatorController/Erika_OverrideController.overrideController.meta b/Assets/Bundle/Unit/PC/Erika/AnimatorController/Erika_OverrideController.overrideController.meta new file mode 100644 index 00000000..facde7f6 --- /dev/null +++ b/Assets/Bundle/Unit/PC/Erika/AnimatorController/Erika_OverrideController.overrideController.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 05a3a5adfcdba2247a71c5e335295e45 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 22100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundle/Unit/PC/Erika/OverrideClip/AirAttack0.anim b/Assets/Bundle/Unit/PC/Erika/OverrideClip/AirAttack0.anim new file mode 100644 index 00000000..7010af54 --- /dev/null +++ b/Assets/Bundle/Unit/PC/Erika/OverrideClip/AirAttack0.anim @@ -0,0 +1,53 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: AirAttack0 + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: [] + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Bundle/Unit/PC/Erika/OverrideClip/AirAttack0.anim.meta b/Assets/Bundle/Unit/PC/Erika/OverrideClip/AirAttack0.anim.meta new file mode 100644 index 00000000..810dd5b4 --- /dev/null +++ b/Assets/Bundle/Unit/PC/Erika/OverrideClip/AirAttack0.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 47193788a5f8b264ea6cecc0f40565fd +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundle/Unit/PC/Erika/OverrideClip/AirAttack1.anim b/Assets/Bundle/Unit/PC/Erika/OverrideClip/AirAttack1.anim new file mode 100644 index 00000000..01bf4833 --- /dev/null +++ b/Assets/Bundle/Unit/PC/Erika/OverrideClip/AirAttack1.anim @@ -0,0 +1,53 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: AirAttack1 + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: [] + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Bundle/Unit/PC/Erika/OverrideClip/AirAttack1.anim.meta b/Assets/Bundle/Unit/PC/Erika/OverrideClip/AirAttack1.anim.meta new file mode 100644 index 00000000..4e5c881f --- /dev/null +++ b/Assets/Bundle/Unit/PC/Erika/OverrideClip/AirAttack1.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 46fdb4c35c347b04ca9c107a10f50e90 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundle/Unit/PC/Erika/OverrideClip/AirAttack2.anim b/Assets/Bundle/Unit/PC/Erika/OverrideClip/AirAttack2.anim new file mode 100644 index 00000000..b66b2357 --- /dev/null +++ b/Assets/Bundle/Unit/PC/Erika/OverrideClip/AirAttack2.anim @@ -0,0 +1,53 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: AirAttack2 + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: [] + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Bundle/Unit/PC/Erika/OverrideClip/AirAttack2.anim.meta b/Assets/Bundle/Unit/PC/Erika/OverrideClip/AirAttack2.anim.meta new file mode 100644 index 00000000..08b7cfa7 --- /dev/null +++ b/Assets/Bundle/Unit/PC/Erika/OverrideClip/AirAttack2.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ce137d29e7943ad4081d2ab6c4bad77c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundle/Unit/PC/Erika/OverrideClip/AirAttack3.anim b/Assets/Bundle/Unit/PC/Erika/OverrideClip/AirAttack3.anim new file mode 100644 index 00000000..356f916d --- /dev/null +++ b/Assets/Bundle/Unit/PC/Erika/OverrideClip/AirAttack3.anim @@ -0,0 +1,53 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: AirAttack3 + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: [] + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Bundle/Unit/PC/Erika/OverrideClip/AirAttack3.anim.meta b/Assets/Bundle/Unit/PC/Erika/OverrideClip/AirAttack3.anim.meta new file mode 100644 index 00000000..34213b16 --- /dev/null +++ b/Assets/Bundle/Unit/PC/Erika/OverrideClip/AirAttack3.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3cc70e950f9a2e84f82c182e9d3f268d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundle/Unit/PC/Erika/OverrideClip/AirAttack4.anim b/Assets/Bundle/Unit/PC/Erika/OverrideClip/AirAttack4.anim new file mode 100644 index 00000000..8f952fec --- /dev/null +++ b/Assets/Bundle/Unit/PC/Erika/OverrideClip/AirAttack4.anim @@ -0,0 +1,53 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: AirAttack4 + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: [] + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Bundle/Unit/PC/Erika/OverrideClip/AirAttack4.anim.meta b/Assets/Bundle/Unit/PC/Erika/OverrideClip/AirAttack4.anim.meta new file mode 100644 index 00000000..17683e3b --- /dev/null +++ b/Assets/Bundle/Unit/PC/Erika/OverrideClip/AirAttack4.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5c91a24c28d8248438c7b28ce88cdaa9 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundle/Unit/PC/Erika/OverrideClip/AirDash.anim b/Assets/Bundle/Unit/PC/Erika/OverrideClip/AirDash.anim new file mode 100644 index 00000000..2cbd6d95 --- /dev/null +++ b/Assets/Bundle/Unit/PC/Erika/OverrideClip/AirDash.anim @@ -0,0 +1,53 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: AirDash + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: [] + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Bundle/Unit/PC/Erika/OverrideClip/AirDash.anim.meta b/Assets/Bundle/Unit/PC/Erika/OverrideClip/AirDash.anim.meta new file mode 100644 index 00000000..e2cf3478 --- /dev/null +++ b/Assets/Bundle/Unit/PC/Erika/OverrideClip/AirDash.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 27718441c96a4114ebb01ccc168d623d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundle/Unit/PC/Erika/OverrideClip/Attack0.anim b/Assets/Bundle/Unit/PC/Erika/OverrideClip/Attack0.anim new file mode 100644 index 00000000..e434d878 --- /dev/null +++ b/Assets/Bundle/Unit/PC/Erika/OverrideClip/Attack0.anim @@ -0,0 +1,53 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Attack0 + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: [] + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Bundle/Unit/PC/Erika/OverrideClip/Attack0.anim.meta b/Assets/Bundle/Unit/PC/Erika/OverrideClip/Attack0.anim.meta new file mode 100644 index 00000000..ea7f3d19 --- /dev/null +++ b/Assets/Bundle/Unit/PC/Erika/OverrideClip/Attack0.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2e5d802bfba7db747af88bfe578a602b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundle/Unit/PC/Erika/OverrideClip/Attack1.anim b/Assets/Bundle/Unit/PC/Erika/OverrideClip/Attack1.anim new file mode 100644 index 00000000..74debe7a --- /dev/null +++ b/Assets/Bundle/Unit/PC/Erika/OverrideClip/Attack1.anim @@ -0,0 +1,53 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Attack1 + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: [] + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Bundle/Unit/PC/Erika/OverrideClip/Attack1.anim.meta b/Assets/Bundle/Unit/PC/Erika/OverrideClip/Attack1.anim.meta new file mode 100644 index 00000000..59b914fc --- /dev/null +++ b/Assets/Bundle/Unit/PC/Erika/OverrideClip/Attack1.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9f98de732e61882409d9a3456b87be18 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundle/Unit/PC/Erika/OverrideClip/Attack2.anim b/Assets/Bundle/Unit/PC/Erika/OverrideClip/Attack2.anim new file mode 100644 index 00000000..2f1910a5 --- /dev/null +++ b/Assets/Bundle/Unit/PC/Erika/OverrideClip/Attack2.anim @@ -0,0 +1,53 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Attack2 + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: [] + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Bundle/Unit/PC/Erika/OverrideClip/Attack2.anim.meta b/Assets/Bundle/Unit/PC/Erika/OverrideClip/Attack2.anim.meta new file mode 100644 index 00000000..2b91ac59 --- /dev/null +++ b/Assets/Bundle/Unit/PC/Erika/OverrideClip/Attack2.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9dd4ab0963a41b34b82a519bb7cced5b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundle/Unit/PC/Erika/OverrideClip/Attack3.anim b/Assets/Bundle/Unit/PC/Erika/OverrideClip/Attack3.anim new file mode 100644 index 00000000..5aad0009 --- /dev/null +++ b/Assets/Bundle/Unit/PC/Erika/OverrideClip/Attack3.anim @@ -0,0 +1,53 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Attack3 + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: [] + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Bundle/Unit/PC/Erika/OverrideClip/Attack3.anim.meta b/Assets/Bundle/Unit/PC/Erika/OverrideClip/Attack3.anim.meta new file mode 100644 index 00000000..3f551c37 --- /dev/null +++ b/Assets/Bundle/Unit/PC/Erika/OverrideClip/Attack3.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3aa5c8eea43356142af2368559af17b1 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundle/Unit/PC/Erika/OverrideClip/AttackToAir.anim b/Assets/Bundle/Unit/PC/Erika/OverrideClip/AttackToAir.anim new file mode 100644 index 00000000..47d3ad18 --- /dev/null +++ b/Assets/Bundle/Unit/PC/Erika/OverrideClip/AttackToAir.anim @@ -0,0 +1,53 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: AttackToAir + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: [] + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Bundle/Unit/PC/Erika/OverrideClip/AttackToAir.anim.meta b/Assets/Bundle/Unit/PC/Erika/OverrideClip/AttackToAir.anim.meta new file mode 100644 index 00000000..41a53c73 --- /dev/null +++ b/Assets/Bundle/Unit/PC/Erika/OverrideClip/AttackToAir.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 09e1d1b1eaa33064299f7a72a18410dd +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundle/Unit/PC/Erika/OverrideClip/Idle.anim b/Assets/Bundle/Unit/PC/Erika/OverrideClip/Idle.anim new file mode 100644 index 00000000..c89c1003 --- /dev/null +++ b/Assets/Bundle/Unit/PC/Erika/OverrideClip/Idle.anim @@ -0,0 +1,53 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Idle + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: [] + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Bundle/Unit/PC/Erika/OverrideClip/Idle.anim.meta b/Assets/Bundle/Unit/PC/Erika/OverrideClip/Idle.anim.meta new file mode 100644 index 00000000..61915493 --- /dev/null +++ b/Assets/Bundle/Unit/PC/Erika/OverrideClip/Idle.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 699f02cd5bde7474c87c46a702af08af +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundle/Unit/PC/Erika/OverrideClip/Jump.anim b/Assets/Bundle/Unit/PC/Erika/OverrideClip/Jump.anim new file mode 100644 index 00000000..79cb6fb9 --- /dev/null +++ b/Assets/Bundle/Unit/PC/Erika/OverrideClip/Jump.anim @@ -0,0 +1,53 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Jump + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: [] + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Bundle/Unit/PC/Erika/OverrideClip/Jump.anim.meta b/Assets/Bundle/Unit/PC/Erika/OverrideClip/Jump.anim.meta new file mode 100644 index 00000000..72aa409b --- /dev/null +++ b/Assets/Bundle/Unit/PC/Erika/OverrideClip/Jump.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a3d6b748582c79b4aaa28b16395f2152 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundle/Unit/PC/Erika/OverrideClip/Landing.anim b/Assets/Bundle/Unit/PC/Erika/OverrideClip/Landing.anim new file mode 100644 index 00000000..bb4169c4 --- /dev/null +++ b/Assets/Bundle/Unit/PC/Erika/OverrideClip/Landing.anim @@ -0,0 +1,53 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Landing + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: [] + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Bundle/Unit/PC/Erika/OverrideClip/Landing.anim.meta b/Assets/Bundle/Unit/PC/Erika/OverrideClip/Landing.anim.meta new file mode 100644 index 00000000..3d6af889 --- /dev/null +++ b/Assets/Bundle/Unit/PC/Erika/OverrideClip/Landing.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 12d218bc2d437724596bf621977ef2b1 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundle/Unit/PC/Erika/OverrideClip/LandingGround.anim b/Assets/Bundle/Unit/PC/Erika/OverrideClip/LandingGround.anim new file mode 100644 index 00000000..f47fb06d --- /dev/null +++ b/Assets/Bundle/Unit/PC/Erika/OverrideClip/LandingGround.anim @@ -0,0 +1,53 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: LandingGround + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: [] + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Bundle/Unit/PC/Erika/OverrideClip/LandingGround.anim.meta b/Assets/Bundle/Unit/PC/Erika/OverrideClip/LandingGround.anim.meta new file mode 100644 index 00000000..264759a6 --- /dev/null +++ b/Assets/Bundle/Unit/PC/Erika/OverrideClip/LandingGround.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 05b364e0ea3f6b44ca336a2abf51ba67 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundle/Unit/PC/Erika/OverrideClip/Move.anim b/Assets/Bundle/Unit/PC/Erika/OverrideClip/Move.anim new file mode 100644 index 00000000..9126daa9 --- /dev/null +++ b/Assets/Bundle/Unit/PC/Erika/OverrideClip/Move.anim @@ -0,0 +1,53 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Move + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: [] + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Bundle/Unit/PC/Erika/OverrideClip/Move.anim.meta b/Assets/Bundle/Unit/PC/Erika/OverrideClip/Move.anim.meta new file mode 100644 index 00000000..2593fd56 --- /dev/null +++ b/Assets/Bundle/Unit/PC/Erika/OverrideClip/Move.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 78c6ded2841535449b1e3f362cbd2a87 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Demo/AnimationEditScene.unity b/Assets/Scenes/Demo/AnimationEditScene.unity index 3f59f961..1f07db91 100644 --- a/Assets/Scenes/Demo/AnimationEditScene.unity +++ b/Assets/Scenes/Demo/AnimationEditScene.unity @@ -464,7 +464,7 @@ MonoBehaviour: type: 3} unitPrefab: {fileID: 8398550124946730917, guid: 7ad9bdd473f2e5f49a7ec144e5b5c999, type: 3} - animController: {fileID: 9100000, guid: dbcf42e4fb8a6ad4488eb7d2941acc31, type: 2} + animController: {fileID: 22100000, guid: 05a3a5adfcdba2247a71c5e335295e45, type: 2} unitFolder: Assets/Bundle/Unit/PC/Erika/ unit: {fileID: 0} unitController: {fileID: 0} @@ -563,7 +563,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2098653157 GameObject: @@ -685,5 +685,97 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 8 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2137539566 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2137539570} + - component: {fileID: 2137539569} + - component: {fileID: 2137539568} + - component: {fileID: 2137539567} + m_Layer: 0 + m_Name: EffectReference + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!64 &2137539567 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2137539566} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Convex: 0 + m_CookingOptions: 14 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &2137539568 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2137539566} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!33 &2137539569 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2137539566} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &2137539570 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2137539566} + m_LocalRotation: {x: 0.23985012, y: 0.15956683, z: -0.1562906, w: 0.94476646} + m_LocalPosition: {x: 2.94, y: 0.553, z: 0} + m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 30.204002, y: 15.196001, z: -14.663001} diff --git a/Assets/Scripts/Test 1/TestErika.cs b/Assets/Scripts/Test 1/TestErika.cs index 967c3bdb..cb40b103 100644 --- a/Assets/Scripts/Test 1/TestErika.cs +++ b/Assets/Scripts/Test 1/TestErika.cs @@ -52,9 +52,15 @@ public class TestErika : MonoBehaviour RootMotionProxy rootMotionProxy = erika.unit.GetOrAddComponent<RootMotionProxy>();
Animator animator = erika.unit.GetComponent<Animator>();
- AnimatorOverrideController animCtr = new AnimatorOverrideController(erika.animController);
- animCtr.name = erika.unitPrefab.name + " Override Controller";
- animator.runtimeAnimatorController = animCtr;
+ //AnimatorOverrideController animCtr = new AnimatorOverrideController(erika.animController);
+ //animCtr.name = erika.unitPrefab.name + " Override Controller";
+ //foreach(var anim in erika.actionData.actions)
+ //{
+ // animCtr[anim.Key] = anim.Value;
+ //}
+ animator.runtimeAnimatorController = erika.animController;
+
+ Debug.Assert(animator.runtimeAnimatorController is AnimatorOverrideController);
unitCtr.pcState.ChangeState(PCState.EUnitState.Idle, new PCState.IdleParam(), true);
} diff --git a/Assets/Scripts/Unit/AnimationData.cs b/Assets/Scripts/Unit/AnimationData.cs index 2250da76..84b75f47 100644 --- a/Assets/Scripts/Unit/AnimationData.cs +++ b/Assets/Scripts/Unit/AnimationData.cs @@ -79,6 +79,7 @@ public class ParameterDictionary : SerializableDictionary<EAnimationParameter, A public enum EAnimationProperty
{
ComboTimeOffset = 1,
+ IgnoreY = 2,
}
[Serializable]
@@ -234,10 +235,10 @@ public class AnimationData : ScriptableObject return true;
}
- public float GetProperty(EAnimationProperty property)
+ public float GetProperty(EAnimationProperty property, float defaultValue = 0)
{
if (!HasProperty(property))
- return 0;
+ return defaultValue;
return properties[property];
}
diff --git a/Assets/Scripts/Unit/Components/UnitAnimation/PCAnimation.cs b/Assets/Scripts/Unit/Components/UnitAnimation/PCAnimation.cs index 243ce162..df074061 100644 --- a/Assets/Scripts/Unit/Components/UnitAnimation/PCAnimation.cs +++ b/Assets/Scripts/Unit/Components/UnitAnimation/PCAnimation.cs @@ -75,6 +75,15 @@ public class PCAnimation : UnitAnimation public bool updateAnimationAuto { get; private set; } // 自动更新动画 + private AnimatorOverrideController controller
+ {
+ get
+ {
+ Debug.Assert(owner.unitAnimation.animator.runtimeAnimatorController is AnimatorOverrideController);
+ return owner.unitAnimation.animator.runtimeAnimatorController as AnimatorOverrideController;
+ }
+ } + public override void Initialize() { base.Initialize(); @@ -139,9 +148,19 @@ public class PCAnimation : UnitAnimation { if (!applyRootCurve) return; - } - - public void AnimIdle() + }
+
+ AnimationData GetAnimationDataOfGivenState(string name)
+ {
+ string animName = controller[name].name;
+ string path = owner.folder + "AnimationData/" + animName + ".asset";
+ AnimationData data = ResourceManager.Instance.LoadAsset<AnimationData>(path);
+ return data;
+ }
+
+ ////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+ public void AnimIdle() { CrossFade(EAnimState.Idle, 0.2f, 0); } @@ -164,7 +183,9 @@ public class PCAnimation : UnitAnimation else if (id == 2) state = EAnimState.AirAttack2; else if (id == 3) state = EAnimState.AirAttack3;
- CrossFade(state, 0.05f); + AnimationData data = GetAnimationDataOfGivenState(state.ToString());
+ Debug.Assert(data != null);
+ CrossFade(state, 0.02f, data.GetProperty(EAnimationProperty.ComboTimeOffset, defaultValue: 0)); } public void AnimAttackToAir(float offset)
@@ -221,7 +242,7 @@ public class PCAnimation : UnitAnimation base.Play(animState.ToString(), layerIndex, normalizedTime); } - private void CrossFade(EAnimState animState, float normalizedTransitionDuration, int layerIndex = 0, float normalizedTimeOffset = float.NegativeInfinity, float normalizedTransitionTime = 0.0f) + private void CrossFade(EAnimState animState, float normalizedTransitionDuration, float normalizedTimeOffset = float.NegativeInfinity, float normalizedTransitionTime = 0.0f, int layerIndex = 0) { base.CrossFade(animState.ToString(), normalizedTransitionDuration, layerIndex, normalizedTimeOffset, normalizedTransitionTime); } diff --git a/Assets/Scripts/Unit/Components/UnitState/PCState.cs b/Assets/Scripts/Unit/Components/UnitState/PCState.cs index c8937895..1d0332cd 100644 --- a/Assets/Scripts/Unit/Components/UnitState/PCState.cs +++ b/Assets/Scripts/Unit/Components/UnitState/PCState.cs @@ -298,15 +298,15 @@ public class PCState : UnitState }
}
- void OnAttackToAirExit()
- {
- }
+ void OnAttackToAirExit(EUnitState next)
+ {
+ }
- #endregion + #endregion - #region AirAttack + #region AirAttack - IEnumerator AirAttack(SkillParam param) + IEnumerator AirAttack(SkillParam param) { int id = 0; m_Owner.pcAnimation.AnimAirAttack(id); diff --git a/Assets/Scripts/Unit/Events/EventEffect.cs b/Assets/Scripts/Unit/Events/EventEffect.cs index d6a3fa16..9798ed6a 100644 --- a/Assets/Scripts/Unit/Events/EventEffect.cs +++ b/Assets/Scripts/Unit/Events/EventEffect.cs @@ -21,5 +21,5 @@ public class EventEffect : AnimationEventBase public Vector3 rotation;
[Tooltip("Scale")]
- public Vector3 scale;
+ public Vector3 scale = Vector3.one;
}
diff --git a/Assets/Scripts/Unit/UnitRootMotion.cs b/Assets/Scripts/Unit/UnitRootMotion.cs index caf59d7c..86e44abd 100644 --- a/Assets/Scripts/Unit/UnitRootMotion.cs +++ b/Assets/Scripts/Unit/UnitRootMotion.cs @@ -104,7 +104,8 @@ public class UnitRootMotion : UnitComponent Vector3 dest = m_Owner.unitAnimation.animator.deltaPosition;
dest.z = 0;
var state = m_Owner.unitAnimation.baseLayer.stateInfo;
- if (state.IsTag("IgnoreY"))
+ bool ignoreY = m_Owner.unitAnimation.baseLayer.animationData.GetProperty(EAnimationProperty.IgnoreY, 0) != 0;
+ if (state.IsTag("IgnoreY") || ignoreY)
{
dest.y = 0;
}
|