diff --git a/UOP1_Project/Assets/Art/Characters/Townsfolk_F/Animation/Townsfolk_F.overrideController b/UOP1_Project/Assets/Art/Characters/Townsfolk_F/Animation/Townsfolk_F.overrideController index bfc924435..c6e18896d 100644 --- a/UOP1_Project/Assets/Art/Characters/Townsfolk_F/Animation/Townsfolk_F.overrideController +++ b/UOP1_Project/Assets/Art/Characters/Townsfolk_F/Animation/Townsfolk_F.overrideController @@ -21,3 +21,11 @@ AnimatorOverrideController: type: 3} m_OverrideClip: {fileID: -3419257869308726280, guid: 04b624c9c23f14df3b9d8316a8e8da2c, type: 3} + - m_OriginalClip: {fileID: -395696784264195149, guid: e24cee4b4d7d4c643b7c1af93545399c, + type: 3} + m_OverrideClip: {fileID: -395696784264195149, guid: 530ae980197cf5e48a91006005c85a8b, + type: 3} + - m_OriginalClip: {fileID: 665853745831072719, guid: 87226ae1782bd024fac34c7fa010fcf8, + type: 3} + m_OverrideClip: {fileID: 665853745831072719, guid: cc3ad960a2946814686d39a7df3e8fc4, + type: 3} diff --git a/UOP1_Project/Assets/Art/Characters/Townsfolk_M/Animation/Townsfolk_M.controller b/UOP1_Project/Assets/Art/Characters/Townsfolk_M/Animation/Townsfolk_M.controller index af9355ad1..c60d31603 100644 --- a/UOP1_Project/Assets/Art/Characters/Townsfolk_M/Animation/Townsfolk_M.controller +++ b/UOP1_Project/Assets/Art/Characters/Townsfolk_M/Animation/Townsfolk_M.controller @@ -80,7 +80,7 @@ AnimatorStateTransition: m_CanTransitionToSelf: 1 --- !u!1102 &-7058627895698951798 AnimatorState: - serializedVersion: 5 + serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -108,7 +108,7 @@ AnimatorState: m_TimeParameter: --- !u!1102 &-6787925190261692325 AnimatorState: - serializedVersion: 5 + serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -135,9 +135,35 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1102 &-5249082931292424735 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: idle2 + 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: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 665853745831072719, guid: 87226ae1782bd024fac34c7fa010fcf8, type: 3} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1102 &-4311044846455179410 AnimatorState: - serializedVersion: 5 + serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -253,7 +279,7 @@ AnimatorStateTransition: m_CanTransitionToSelf: 1 --- !u!1107 &6255328692093510715 AnimatorStateMachine: - serializedVersion: 5 + serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -269,6 +295,12 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: -7058627895698951798} m_Position: {x: 320, y: 150, z: 0} + - serializedVersion: 1 + m_State: {fileID: 8708967178038148988} + m_Position: {x: 410, y: 420, z: 0} + - serializedVersion: 1 + m_State: {fileID: -5249082931292424735} + m_Position: {x: 200, y: 420, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -279,3 +311,30 @@ AnimatorStateMachine: m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: -6787925190261692325} +--- !u!1102 &8708967178038148988 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: talk2 + 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: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: -395696784264195149, guid: e24cee4b4d7d4c643b7c1af93545399c, + type: 3} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: