diff --git a/Assets/Animations/PlayerAnimations/Player1/PlayerAnimations1.controller b/Assets/Animations/PlayerAnimations/Player1/PlayerAnimations1.controller index 10ba60f..dd1b519 100644 --- a/Assets/Animations/PlayerAnimations/Player1/PlayerAnimations1.controller +++ b/Assets/Animations/PlayerAnimations/Player1/PlayerAnimations1.controller @@ -17,16 +17,16 @@ AnimatorStateMachine: m_Position: {x: 570, y: 120, z: 0} - serializedVersion: 1 m_State: {fileID: 5718945116413065706} - m_Position: {x: 130, y: 110, z: 0} - - serializedVersion: 1 - m_State: {fileID: 3308394434488297487} - m_Position: {x: 420, y: 180, z: 0} + m_Position: {x: 270, y: 130, z: 0} - serializedVersion: 1 m_State: {fileID: -4512082985165587279} - m_Position: {x: 130, y: -20, z: 0} + m_Position: {x: 0, y: -20, z: 0} - serializedVersion: 1 m_State: {fileID: 3256446757496701682} m_Position: {x: 60, y: 200, z: 0} + - serializedVersion: 1 + m_State: {fileID: 2037037669563393991} + m_Position: {x: 340, y: 0, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -117,6 +117,31 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1101 &-870703962244547938 +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: IsPulling + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 3256446757496701682} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.34782612 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -131,19 +156,25 @@ AnimatorController: m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: IsSwinging m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: IsPulling m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} + - m_Name: RunMop1 + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -157,6 +188,34 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} +--- !u!1101 &526861958988893975 +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: RunMop1 + m_EventTreshold: 0 + - m_ConditionMode: 1 + m_ConditionEvent: IsRunning + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 5718945116413065706} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.34782612 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &548892628922324246 AnimatorState: serializedVersion: 6 @@ -183,6 +242,85 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &1371695560528556849 +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: RunMop1 + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 2037037669563393991} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.516129 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &1445465661463145008 +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: RunMop1 + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 9123080415032741332} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.34782612 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &2037037669563393991 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: RunningMopping + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -870703962244547938} + - {fileID: 1445465661463145008} + - {fileID: 526861958988893975} + 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: 7400000, guid: 8fa2170d3269c7749a927969c08bb6f7, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1101 &2302923505755761183 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -235,32 +373,6 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1102 &3308394434488297487 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: RunningMopping - 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: 7400000, guid: 8fa2170d3269c7749a927969c08bb6f7, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: --- !u!1101 &4529714568082305897 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -303,6 +415,9 @@ AnimatorStateTransition: - m_ConditionMode: 2 m_ConditionEvent: IsPulling m_EventTreshold: 0 + - m_ConditionMode: 2 + m_ConditionEvent: RunMop1 + m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 5718945116413065706} m_Solo: 0 @@ -355,6 +470,7 @@ AnimatorState: m_Transitions: - {fileID: -2150761196750939476} - {fileID: 5296502382817736391} + - {fileID: 1371695560528556849} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -370,6 +486,31 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &7792750871673684812 +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: RunMop1 + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 2037037669563393991} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.516129 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &9123080415032741332 AnimatorState: serializedVersion: 6 @@ -383,6 +524,7 @@ AnimatorState: m_Transitions: - {fileID: 5149346213670764323} - {fileID: -3889731097132723099} + - {fileID: 7792750871673684812} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 diff --git a/Assets/Animations/PlayerAnimations/Player2/PlayerAnimations2.controller b/Assets/Animations/PlayerAnimations/Player2/PlayerAnimations2.controller index fd34d5a..21ba7a9 100644 --- a/Assets/Animations/PlayerAnimations/Player2/PlayerAnimations2.controller +++ b/Assets/Animations/PlayerAnimations/Player2/PlayerAnimations2.controller @@ -42,6 +42,9 @@ AnimatorStateTransition: - m_ConditionMode: 2 m_ConditionEvent: IsPulling m_EventTreshold: 0 + - m_ConditionMode: 2 + m_ConditionEvent: RunMop2 + m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 8304111510876962717} m_Solo: 0 @@ -56,6 +59,31 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1101 &-8664733303210054725 +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: RunMop2 + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 3748437463534410733} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.516129 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1101 &-6837655869494622995 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -109,6 +137,31 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1101 &-5959984174086135684 +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: RunMop2 + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 3748437463534410733} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.625 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1101 &-5519219387846060971 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -178,13 +231,13 @@ AnimatorStateMachine: m_Position: {x: 210, y: -190, z: 0} - serializedVersion: 1 m_State: {fileID: 3748437463534410733} - m_Position: {x: 530, y: 170, z: 0} + m_Position: {x: 350, y: -140, z: 0} - serializedVersion: 1 m_State: {fileID: 8304111510876962717} - m_Position: {x: 270, y: -100, z: 0} + m_Position: {x: 440, y: -50, z: 0} - serializedVersion: 1 m_State: {fileID: 2168268571006691905} - m_Position: {x: 530, y: 20, z: 0} + m_Position: {x: 610, y: -170, z: 0} - serializedVersion: 1 m_State: {fileID: -5284532121480509893} m_Position: {x: 250, y: 80, z: 0} @@ -198,6 +251,34 @@ AnimatorStateMachine: m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: 3357306648811348641} +--- !u!1101 &-3526775090120411568 +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: IsRunning + m_EventTreshold: 0 + - m_ConditionMode: 2 + m_ConditionEvent: RunMop2 + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 8304111510876962717} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.516129 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1101 &-2173210327374923992 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -223,6 +304,31 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1101 &-1608367877430269216 +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: IsPulling + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -5284532121480509893} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.516129 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &-944807189804630194 AnimatorState: serializedVersion: 6 @@ -277,6 +383,12 @@ AnimatorController: m_DefaultInt: 0 m_DefaultBool: 0 m_Controller: {fileID: 0} + - m_Name: RunMop2 + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -316,6 +428,31 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &2968795618224423920 +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: RunMop2 + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 3357306648811348641} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.516129 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &3357306648811348641 AnimatorState: serializedVersion: 6 @@ -329,6 +466,7 @@ AnimatorState: m_Transitions: - {fileID: -8701045174356781676} - {fileID: -6837655869494622995} + - {fileID: -5959984174086135684} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -354,7 +492,10 @@ AnimatorState: m_Name: RunningMopping m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: 2968795618224423920} + - {fileID: -3526775090120411568} + - {fileID: -1608367877430269216} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -383,6 +524,7 @@ AnimatorState: m_Transitions: - {fileID: -2173210327374923992} - {fileID: -8828174110587883696} + - {fileID: -8664733303210054725} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 diff --git a/Assets/Scenes/GameScene.unity b/Assets/Scenes/GameScene.unity index 46476da..2f3684b 100644 --- a/Assets/Scenes/GameScene.unity +++ b/Assets/Scenes/GameScene.unity @@ -1165,12 +1165,12 @@ GameObject: - component: {fileID: 1230350820} - component: {fileID: 1230350819} m_Layer: 5 - m_Name: Panel + m_Name: PausePanel m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1230350818 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Player/PlayerAnimationHandler.cs b/Assets/Scripts/Player/PlayerAnimationHandler.cs index 38e4a82..35cba70 100644 --- a/Assets/Scripts/Player/PlayerAnimationHandler.cs +++ b/Assets/Scripts/Player/PlayerAnimationHandler.cs @@ -6,9 +6,32 @@ public class PlayerAnimationHandler : MonoBehaviour { public Animator animator; + private float previousMop1Clean; + private float previousMop2Clean; + void Start() { animator = GetComponentInChildren(); + + previousMop1Clean = BloodComputeShader.Instance.mop1Clean; + previousMop2Clean = BloodComputeShader.Instance.mop2Clean; + } + private void Update() + { + RunMop1(BloodComputeShader.Instance.mop1Clean >= 10); + + RunMop2(BloodComputeShader.Instance.mop2Clean >= 10); + + // Current frame values + //float currentMop1Clean = BloodComputeShader.Instance.mop1Clean; + //float currentMop2Clean = BloodComputeShader.Instance.mop2Clean; + + //RunMop(currentMop1Clean < previousMop1Clean); + //RunMop(currentMop2Clean < previousMop2Clean); + + //// Update previous values for the next frame + //previousMop1Clean = currentMop1Clean; + //previousMop2Clean = currentMop2Clean; } public void Idle() @@ -17,7 +40,7 @@ public class PlayerAnimationHandler : MonoBehaviour } public void Run(bool state) { - animator.SetBool("RunMop", state); + animator.SetBool("IsRunning", state); } public void Swing(bool state) { @@ -27,8 +50,12 @@ public class PlayerAnimationHandler : MonoBehaviour { animator.SetTrigger("Mop"); } - public void RunMop() + public void RunMop1(bool active) { - animator.SetTrigger("RunMop"); + animator.SetBool("RunMop1", active); + } + public void RunMop2(bool active) + { + animator.SetBool("RunMop2", active); } }