From 4149ece4bf9e151ead4ae28f6526ef722928d4a4 Mon Sep 17 00:00:00 2001
From: miepzerino <o.skotnik@gmail.com>
Date: Thu, 14 Dec 2023 22:58:50 +0000
Subject: [PATCH] missed commit
---
Assets/Characters/Player/AC_Player.controller | 64 ++++++++++++++++++++++++++++---
1 files changed, 57 insertions(+), 7 deletions(-)
diff --git a/Assets/Characters/Player/AC_Player.controller b/Assets/Characters/Player/AC_Player.controller
index ec98c2e..964eb59 100644
--- a/Assets/Characters/Player/AC_Player.controller
+++ b/Assets/Characters/Player/AC_Player.controller
@@ -9,9 +9,6 @@
m_Name:
m_Conditions:
- m_ConditionMode: 2
- m_ConditionEvent: IsMoving
- m_EventTreshold: 0
- - m_ConditionMode: 2
m_ConditionEvent: IsFlying
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
@@ -67,9 +64,6 @@
- m_ConditionMode: 2
m_ConditionEvent: IsMoving
m_EventTreshold: 0
- - m_ConditionMode: 2
- m_ConditionEvent: IsFlying
- m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 68305137226140118}
m_Solo: 0
@@ -117,13 +111,16 @@
- m_ConditionMode: 1
m_ConditionEvent: IsFlying
m_EventTreshold: 0
+ - m_ConditionMode: 2
+ m_ConditionEvent: IsGrounded
+ m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 7984510369417086179}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
- m_TransitionDuration: 0
+ m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0
m_HasExitTime: 0
@@ -147,6 +144,24 @@
m_DefaultBool: 0
m_Controller: {fileID: 0}
- m_Name: IsFlying
+ m_Type: 4
+ m_DefaultFloat: 0
+ m_DefaultInt: 0
+ m_DefaultBool: 0
+ m_Controller: {fileID: 0}
+ - m_Name: IsGrounded
+ m_Type: 4
+ m_DefaultFloat: 0
+ m_DefaultInt: 0
+ m_DefaultBool: 0
+ m_Controller: {fileID: 0}
+ - m_Name: IsAtWall
+ m_Type: 4
+ m_DefaultFloat: 0
+ m_DefaultInt: 0
+ m_DefaultBool: 0
+ m_Controller: {fileID: 0}
+ - m_Name: IsAtCeiling
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
@@ -204,6 +219,9 @@
- m_ConditionMode: 2
m_ConditionEvent: IsFlying
m_EventTreshold: 0
+ - m_ConditionMode: 1
+ m_ConditionEvent: IsGrounded
+ m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 6445297590206837791}
m_Solo: 0
@@ -213,6 +231,31 @@
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0
+ m_HasExitTime: 0
+ m_HasFixedDuration: 1
+ m_InterruptionSource: 1
+ m_OrderedInterruption: 1
+ m_CanTransitionToSelf: 1
+--- !u!1101 &3484489205103101802
+AnimatorStateTransition:
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name:
+ m_Conditions:
+ - m_ConditionMode: 1
+ m_ConditionEvent: IsGrounded
+ m_EventTreshold: 0
+ m_DstStateMachine: {fileID: 0}
+ m_DstState: {fileID: 68305137226140118}
+ m_Solo: 0
+ m_Mute: 0
+ m_IsExit: 0
+ serializedVersion: 3
+ m_TransitionDuration: 0
+ m_TransitionOffset: 0
+ m_ExitTime: 0.5
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 1
@@ -228,6 +271,9 @@
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: IsFlying
+ m_EventTreshold: 0
+ - m_ConditionMode: 2
+ m_ConditionEvent: IsGrounded
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 7984510369417086179}
@@ -282,6 +328,9 @@
- m_ConditionMode: 1
m_ConditionEvent: IsMoving
m_EventTreshold: 0
+ - m_ConditionMode: 1
+ m_ConditionEvent: IsGrounded
+ m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 6445297590206837791}
m_Solo: 0
@@ -309,6 +358,7 @@
m_Transitions:
- {fileID: 1760657886866949958}
- {fileID: -8857883071945152901}
+ - {fileID: 3484489205103101802}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
--
Gitblit v1.9.3