diff --git a/Game/Assets/Images/idle sprites fixed_0.controller b/Game/Assets/Images/idle sprites fixed_0.controller index 22d1931..c5c4ac0 100644 --- a/Game/Assets/Images/idle sprites fixed_0.controller +++ b/Game/Assets/Images/idle sprites fixed_0.controller @@ -31,6 +31,37 @@ AnimatorStateMachine: m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: 4867714824566219673} +--- !u!1101 &-5345594468514814611 +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: WalkingRight + m_EventTreshold: 0 + - m_ConditionMode: 2 + m_ConditionEvent: WalkingLeft + m_EventTreshold: 0 + - m_ConditionMode: 1 + m_ConditionEvent: Dropping + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -4100425624255115093} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.7 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &-4100425624255115093 AnimatorState: serializedVersion: 6 @@ -43,6 +74,8 @@ AnimatorState: m_CycleOffset: 0 m_Transitions: - {fileID: 1902467679799337346} + - {fileID: 5721671685920488220} + - {fileID: -1011589476512551679} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -114,6 +147,37 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1101 &-1011589476512551679 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: WalkingRight + m_EventTreshold: 0 + - m_ConditionMode: 1 + m_ConditionEvent: WalkingLeft + m_EventTreshold: 0 + - m_ConditionMode: 2 + m_ConditionEvent: Dropping + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1292901503783358426} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.8333333 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1101 &-699895348011422805 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -211,6 +275,37 @@ AnimatorController: m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} m_EvaluateTransitionsOnStart: 1 +--- !u!1101 &589212740603625067 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: WalkingRight + m_EventTreshold: 0 + - m_ConditionMode: 1 + m_ConditionEvent: WalkingLeft + m_EventTreshold: 0 + - m_ConditionMode: 1 + m_ConditionEvent: Dropping + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -4100425624255115093} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.72727275 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1101 &711880722001846590 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -252,6 +347,7 @@ AnimatorState: m_Transitions: - {fileID: -699895348011422805} - {fileID: 711880722001846590} + - {fileID: 589212740603625067} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -355,6 +451,37 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &5721671685920488220 +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: WalkingRight + m_EventTreshold: 0 + - m_ConditionMode: 2 + m_ConditionEvent: WalkingLeft + m_EventTreshold: 0 + - m_ConditionMode: 2 + m_ConditionEvent: Dropping + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 8946204458583563640} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.8333333 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1101 &7253676799287818117 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -399,6 +526,7 @@ AnimatorState: m_Transitions: - {fileID: -282604017707346780} - {fileID: -3489521878920140281} + - {fileID: -5345594468514814611} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 diff --git a/Game/Assets/Scripts/DamageHandler.cs b/Game/Assets/Scripts/DamageHandler.cs index b923bc2..615b33e 100644 --- a/Game/Assets/Scripts/DamageHandler.cs +++ b/Game/Assets/Scripts/DamageHandler.cs @@ -14,6 +14,11 @@ public class DamageHandler : MonoBehaviour private void Start() { + threshold = 2.5f; + multiplier = 0.5f; + + maxHealth = 1f; + minSize = 0.4f; health = maxHealth; }