From 86e3d8191391316108660840dcec72ca8734f080 Mon Sep 17 00:00:00 2001 From: Jakub Sztuba Date: Tue, 27 Dec 2022 23:36:19 +0100 Subject: [PATCH] Fixed patrolling enemies' animations on OutsideWizardsHouse map --- .../Animations/Monster/Bats/Bat_0.controller | 2 +- .../Monster/Crab/CrabAnimator.controller | 19 ++++++++----------- .../MushroomAnimationController.controller | 10 ++-------- .../SmallEarthControllerAnimator.controller | 9 --------- UserSettings/EditorUserSettings.asset | 10 +++++----- 5 files changed, 16 insertions(+), 34 deletions(-) diff --git a/Assets/Animations/Monster/Bats/Bat_0.controller b/Assets/Animations/Monster/Bats/Bat_0.controller index ef9cdcf5..e1c70388 100644 --- a/Assets/Animations/Monster/Bats/Bat_0.controller +++ b/Assets/Animations/Monster/Bats/Bat_0.controller @@ -59,7 +59,7 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: -5213105544054879225} - m_Position: {x: 200, y: 0, z: 0} + m_Position: {x: 270, y: 20, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] diff --git a/Assets/Animations/Monster/Crab/CrabAnimator.controller b/Assets/Animations/Monster/Crab/CrabAnimator.controller index 24978b9a..bbf4da5b 100644 --- a/Assets/Animations/Monster/Crab/CrabAnimator.controller +++ b/Assets/Animations/Monster/Crab/CrabAnimator.controller @@ -85,12 +85,12 @@ AnimatorStateTransition: m_PrefabAsset: {fileID: 0} m_Name: m_Conditions: - - m_ConditionMode: 1 - m_ConditionEvent: isChasing - m_EventTreshold: 0 - m_ConditionMode: 2 m_ConditionEvent: Left m_EventTreshold: 0 + - m_ConditionMode: 1 + m_ConditionEvent: isChasing + m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 5922859134109245518} m_Solo: 0 @@ -113,11 +113,8 @@ AnimatorStateTransition: m_PrefabAsset: {fileID: 0} m_Name: m_Conditions: - - m_ConditionMode: 1 - m_ConditionEvent: isChasing - m_EventTreshold: 0 - m_ConditionMode: 2 - m_ConditionEvent: isChasing + m_ConditionEvent: Left m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 5922859134109245518} @@ -147,13 +144,13 @@ AnimatorController: m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: Left m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -260,10 +257,10 @@ AnimatorStateTransition: m_Name: m_Conditions: - m_ConditionMode: 1 - m_ConditionEvent: isChasing + m_ConditionEvent: Left m_EventTreshold: 0 - m_ConditionMode: 1 - m_ConditionEvent: Left + m_ConditionEvent: isChasing m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 2833439707377775734} diff --git a/Assets/Animations/Monster/Mushroom/MushroomAnimationController.controller b/Assets/Animations/Monster/Mushroom/MushroomAnimationController.controller index abad2939..c0543410 100644 --- a/Assets/Animations/Monster/Mushroom/MushroomAnimationController.controller +++ b/Assets/Animations/Monster/Mushroom/MushroomAnimationController.controller @@ -33,9 +33,6 @@ AnimatorStateTransition: m_PrefabAsset: {fileID: 0} m_Name: m_Conditions: - - m_ConditionMode: 1 - m_ConditionEvent: isChasing - m_EventTreshold: 0 - m_ConditionMode: 1 m_ConditionEvent: Left m_EventTreshold: 0 @@ -176,13 +173,13 @@ AnimatorController: m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: Left m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -285,9 +282,6 @@ AnimatorStateTransition: m_PrefabAsset: {fileID: 0} m_Name: m_Conditions: - - m_ConditionMode: 1 - m_ConditionEvent: isChasing - m_EventTreshold: 0 - m_ConditionMode: 2 m_ConditionEvent: Left m_EventTreshold: 0 diff --git a/Assets/Animations/Monster/SmallEarth/SmallEarthControllerAnimator.controller b/Assets/Animations/Monster/SmallEarth/SmallEarthControllerAnimator.controller index eb860d7a..0e44b78c 100644 --- a/Assets/Animations/Monster/SmallEarth/SmallEarthControllerAnimator.controller +++ b/Assets/Animations/Monster/SmallEarth/SmallEarthControllerAnimator.controller @@ -39,9 +39,6 @@ AnimatorStateTransition: - m_ConditionMode: 1 m_ConditionEvent: Left m_EventTreshold: 0 - - m_ConditionMode: 1 - m_ConditionEvent: isChasing - m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 6747777424221554348} m_Solo: 0 @@ -204,9 +201,6 @@ AnimatorStateTransition: m_PrefabAsset: {fileID: 0} m_Name: m_Conditions: - - m_ConditionMode: 1 - m_ConditionEvent: isChasing - m_EventTreshold: 0 - m_ConditionMode: 2 m_ConditionEvent: Left m_EventTreshold: 0 @@ -232,9 +226,6 @@ AnimatorStateTransition: m_PrefabAsset: {fileID: 0} m_Name: m_Conditions: - - m_ConditionMode: 1 - m_ConditionEvent: isChasing - m_EventTreshold: 0 - m_ConditionMode: 2 m_ConditionEvent: Left m_EventTreshold: 0 diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index e4ef98bb..85c1a919 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -24,16 +24,16 @@ EditorUserSettings: value: 22424703114646680e0b0227036c7c151b12163e2d3a3f7e38271427fb flags: 0 RecentlyUsedScenePath-6: - value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d - flags: 0 - RecentlyUsedScenePath-7: value: 22424703114646680e0b0227036c761e1821112620292135633c133af6f9 flags: 0 + RecentlyUsedScenePath-7: + value: 22424703114646680e0b0227036c791904040c1c25242a312a2c5326ece92021 + flags: 0 RecentlyUsedScenePath-8: - value: 22424703114646680e0b0227036c70050204112e291f2f2a2c3b1920caef212be7a923e7ee2e26 + value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d flags: 0 RecentlyUsedScenePath-9: - value: 22424703114646680e0b0227036c791904040c1c25242a312a2c5326ece92021 + value: 22424703114646680e0b0227036c70050204112e291f2f2a2c3b1920caef212be7a923e7ee2e26 flags: 0 vcSharedLogLevel: value: 0d5e400f0650