From 740e61c97a60a11584993d0f5cdad7dafd53bbe2 Mon Sep 17 00:00:00 2001 From: Stedd Date: Fri, 14 Oct 2022 21:26:36 +0200 Subject: [PATCH] Updates *Added IAggroable interface *Stopping camera rotation on death *Added Death screen --- Assets/Animation/AttackAnimation.anim | 358 ++++++------ Assets/Enemies/Enemy.prefab | 94 ++-- Assets/Enemies/EnemyAI.cs | 2 +- Assets/Enemies/EnemyAttack.cs | 2 +- Assets/Enemies/EnemyHealth.cs | 10 +- .../Prefabs/PlayerCapsule.prefab | 50 +- Assets/InputSystem/StarterAssetsInputs.cs | 9 +- Assets/Interfaces.meta | 8 + Assets/Interfaces/IAggroable.cs | 8 + Assets/Interfaces/IAggroable.cs.meta | 11 + Assets/{Enemies => Interfaces}/IDamageable.cs | 2 +- .../IDamageable.cs.meta | 0 Assets/PlayerHealth.cs | 17 +- Assets/Scenes/Sandbox.unity | 527 +++++++++++++++++- Assets/Scenes/Sandbox/NavMesh.asset | Bin 34524 -> 39908 bytes Assets/Scripts/DeathHandler.cs | 32 ++ Assets/Scripts/DeathHandler.cs.meta | 11 + Assets/Weapons/Weapon.cs | 4 +- 18 files changed, 860 insertions(+), 285 deletions(-) create mode 100644 Assets/Interfaces.meta create mode 100644 Assets/Interfaces/IAggroable.cs create mode 100644 Assets/Interfaces/IAggroable.cs.meta rename Assets/{Enemies => Interfaces}/IDamageable.cs (99%) rename Assets/{Enemies => Interfaces}/IDamageable.cs.meta (100%) create mode 100644 Assets/Scripts/DeathHandler.cs create mode 100644 Assets/Scripts/DeathHandler.cs.meta diff --git a/Assets/Animation/AttackAnimation.anim b/Assets/Animation/AttackAnimation.anim index 523bd28..a248c50 100644 --- a/Assets/Animation/AttackAnimation.anim +++ b/Assets/Animation/AttackAnimation.anim @@ -30,16 +30,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.083333336 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.16666667 + time: 0.13333334 value: 1 inSlope: 0 outSlope: 0 @@ -57,16 +48,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.33333334 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.41666666 + time: 0.36666667 value: 1 inSlope: 0 outSlope: 0 @@ -84,7 +66,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5833333 + time: 0.6333333 value: 1 inSlope: 0 outSlope: 0 @@ -93,7 +75,25 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.6666667 + time: 0.75 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.8666667 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 value: 1 inSlope: 0 outSlope: 0 @@ -121,7 +121,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.083333336 + time: 0.13333334 value: 0.20983982 inSlope: 0 outSlope: 0 @@ -129,26 +129,8 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.16666667 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - serializedVersion: 3 time: 0.25 - value: 0.20983982 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.33333334 value: 0 inSlope: 0 outSlope: 0 @@ -157,7 +139,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.41666666 + time: 0.36666667 value: 0.20983982 inSlope: 0 outSlope: 0 @@ -175,7 +157,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5833333 + time: 0.6333333 value: 0.20983982 inSlope: 0 outSlope: 0 @@ -184,7 +166,25 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.6666667 + time: 0.75 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.8666667 + value: 0.20983982 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 value: 0 inSlope: 0 outSlope: 0 @@ -212,16 +212,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.083333336 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.16666667 + time: 0.13333334 value: 0 inSlope: 0 outSlope: 0 @@ -239,16 +230,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.33333334 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.41666666 + time: 0.36666667 value: 0 inSlope: 0 outSlope: 0 @@ -266,7 +248,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5833333 + time: 0.6333333 value: 0 inSlope: 0 outSlope: 0 @@ -275,7 +257,25 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.6666667 + time: 0.75 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.8666667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 value: 0 inSlope: 0 outSlope: 0 @@ -303,16 +303,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.083333336 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.16666667 + time: 0.13333334 value: 1 inSlope: 0 outSlope: 0 @@ -330,16 +321,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.33333334 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.41666666 + time: 0.36666667 value: 1 inSlope: 0 outSlope: 0 @@ -357,7 +339,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5833333 + time: 0.6333333 value: 1 inSlope: 0 outSlope: 0 @@ -366,7 +348,25 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.6666667 + time: 0.75 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.8666667 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 value: 1 inSlope: 0 outSlope: 0 @@ -423,7 +423,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.6666667 + m_StopTime: 1 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -452,16 +452,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.083333336 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.16666667 + time: 0.13333334 value: 1 inSlope: 0 outSlope: 0 @@ -479,16 +470,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.33333334 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.41666666 + time: 0.36666667 value: 1 inSlope: 0 outSlope: 0 @@ -506,7 +488,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5833333 + time: 0.6333333 value: 1 inSlope: 0 outSlope: 0 @@ -515,7 +497,25 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.6666667 + time: 0.75 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.8666667 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 value: 1 inSlope: 0 outSlope: 0 @@ -543,7 +543,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.083333336 + time: 0.13333334 value: 0.20983982 inSlope: 0 outSlope: 0 @@ -551,26 +551,8 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.16666667 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - serializedVersion: 3 time: 0.25 - value: 0.20983982 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.33333334 value: 0 inSlope: 0 outSlope: 0 @@ -579,7 +561,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.41666666 + time: 0.36666667 value: 0.20983982 inSlope: 0 outSlope: 0 @@ -597,7 +579,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5833333 + time: 0.6333333 value: 0.20983982 inSlope: 0 outSlope: 0 @@ -606,7 +588,25 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.6666667 + time: 0.75 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.8666667 + value: 0.20983982 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 value: 0 inSlope: 0 outSlope: 0 @@ -634,16 +634,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.083333336 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.16666667 + time: 0.13333334 value: 0 inSlope: 0 outSlope: 0 @@ -661,16 +652,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.33333334 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.41666666 + time: 0.36666667 value: 0 inSlope: 0 outSlope: 0 @@ -688,7 +670,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5833333 + time: 0.6333333 value: 0 inSlope: 0 outSlope: 0 @@ -697,7 +679,25 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.6666667 + time: 0.75 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.8666667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 value: 0 inSlope: 0 outSlope: 0 @@ -725,16 +725,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.083333336 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.16666667 + time: 0.13333334 value: 1 inSlope: 0 outSlope: 0 @@ -752,16 +743,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.33333334 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.41666666 + time: 0.36666667 value: 1 inSlope: 0 outSlope: 0 @@ -779,7 +761,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5833333 + time: 0.6333333 value: 1 inSlope: 0 outSlope: 0 @@ -788,7 +770,25 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.6666667 + time: 0.75 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.8666667 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 value: 1 inSlope: 0 outSlope: 0 @@ -807,14 +807,14 @@ AnimationClip: m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 m_Events: - - time: 0.083333336 + - time: 0.5 functionName: AttackHitEvent data: objectReferenceParameter: {fileID: 0} floatParameter: 0 intParameter: 0 messageOptions: 0 - - time: 0.41666666 + - time: 1 functionName: AttackHitEvent data: objectReferenceParameter: {fileID: 0} diff --git a/Assets/Enemies/Enemy.prefab b/Assets/Enemies/Enemy.prefab index f1ee00f..a038040 100644 --- a/Assets/Enemies/Enemy.prefab +++ b/Assets/Enemies/Enemy.prefab @@ -9,10 +9,10 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1834225747245264377} + - component: {fileID: 527013406} + - component: {fileID: 3924901601269037083} - component: {fileID: 3641925206354690580} - component: {fileID: 2032617874441210469} - - component: {fileID: 3924901601269037083} - - component: {fileID: 527013406} - component: {fileID: 527013401} - component: {fileID: 527013407} m_Layer: 0 @@ -38,6 +38,48 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} +--- !u!95 &527013406 +Animator: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1314956764262545219} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 9adb9a2d73196d648a28555e7ef55736, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!195 &3924901601269037083 +NavMeshAgent: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1314956764262545219} + m_Enabled: 1 + m_AgentTypeID: 0 + m_Radius: 0.4 + m_Speed: 3 + m_Acceleration: 8 + avoidancePriority: 50 + m_AngularSpeed: 140 + m_StoppingDistance: 0.2 + m_AutoTraverseOffMeshLink: 1 + m_AutoBraking: 1 + m_AutoRepath: 1 + m_Height: 1.45 + m_BaseOffset: 1 + m_WalkableMask: 4294967295 + m_ObstacleAvoidanceType: 4 --- !u!65 &3641925206354690580 BoxCollider: m_ObjectHideFlags: 0 @@ -64,52 +106,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _detectRange: 15 - _attackRange: 5 + _attackRange: 2 _rotationSpeed: 0.9 _target: {fileID: 0} _isProvoked: 0 ---- !u!195 &3924901601269037083 -NavMeshAgent: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1314956764262545219} - m_Enabled: 1 - m_AgentTypeID: 0 - m_Radius: 0.4 - m_Speed: 2 - m_Acceleration: 8 - avoidancePriority: 50 - m_AngularSpeed: 120 - m_StoppingDistance: 0.2 - m_AutoTraverseOffMeshLink: 1 - m_AutoBraking: 1 - m_AutoRepath: 1 - m_Height: 1.45 - m_BaseOffset: 1 - m_WalkableMask: 4294967295 - m_ObstacleAvoidanceType: 4 ---- !u!95 &527013406 -Animator: - serializedVersion: 4 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1314956764262545219} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 9adb9a2d73196d648a28555e7ef55736, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_StabilizeFeet: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 --- !u!114 &527013401 MonoBehaviour: m_ObjectHideFlags: 0 @@ -136,8 +136,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d9ce02b60179d0340bac9f018033afab, type: 3} m_Name: m_EditorClassIdentifier: - target: {fileID: 0} - damage: 40 + _target: {fileID: 0} + _damage: 25 --- !u!1 &8248657945561792745 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Enemies/EnemyAI.cs b/Assets/Enemies/EnemyAI.cs index f05679a..eafb89b 100644 --- a/Assets/Enemies/EnemyAI.cs +++ b/Assets/Enemies/EnemyAI.cs @@ -1,7 +1,7 @@ using UnityEngine; using UnityEngine.AI; -public class EnemyAI : MonoBehaviour +public class EnemyAI : MonoBehaviour, IAggroable { [Header("Configuration")] [SerializeField] private float _detectRange = 15f; diff --git a/Assets/Enemies/EnemyAttack.cs b/Assets/Enemies/EnemyAttack.cs index b9851e5..88b8881 100644 --- a/Assets/Enemies/EnemyAttack.cs +++ b/Assets/Enemies/EnemyAttack.cs @@ -14,7 +14,7 @@ public class EnemyAttack : MonoBehaviour private void AttackHitEvent() { if (_target == null) return; - if (_target.GetComponent() != null) return; + if (_target.GetComponent() == null) return; Debug.Log($"{transform.name} Hits {_target.transform.name}"); _target.GetComponent().ModifyHealth(-_damage); } diff --git a/Assets/Enemies/EnemyHealth.cs b/Assets/Enemies/EnemyHealth.cs index 9669bad..87ddfb2 100644 --- a/Assets/Enemies/EnemyHealth.cs +++ b/Assets/Enemies/EnemyHealth.cs @@ -12,16 +12,12 @@ public class EnemyHealth : MonoBehaviour, IDamageable _health = _maxHealth; } - private void Update() - { - if (!(_health <= 0)) return; - print("Ded"); - Destroy(gameObject); - } - public void ModifyHealth(float healthChange) { _health += healthChange; + if (!(_health <= 0)) return; + print("Ded"); + Destroy(gameObject); } public void SetHealth(float newHealth) diff --git a/Assets/ImportedAssets/StarterAssets/FirstPersonController/Prefabs/PlayerCapsule.prefab b/Assets/ImportedAssets/StarterAssets/FirstPersonController/Prefabs/PlayerCapsule.prefab index 4ca03dd..cb51c1d 100644 --- a/Assets/ImportedAssets/StarterAssets/FirstPersonController/Prefabs/PlayerCapsule.prefab +++ b/Assets/ImportedAssets/StarterAssets/FirstPersonController/Prefabs/PlayerCapsule.prefab @@ -197,6 +197,8 @@ GameObject: - component: {fileID: 1978471637655604388} - component: {fileID: 5420857361349278248} - component: {fileID: 8616685848737228376} + - component: {fileID: 8294200720936265358} + - component: {fileID: 8729095170121787993} m_Layer: 8 m_Name: PlayerCapsule m_TagString: Player @@ -251,9 +253,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 55919ac34a26952479f3fc91f777b2fa, type: 3} m_Name: m_EditorClassIdentifier: - MoveSpeed: 4 - SprintSpeed: 6 - RotationSpeed: 1 + MoveSpeed: 3.5 + SprintSpeed: 8 + RotationSpeed: 1.5 SpeedChangeRate: 10 JumpHeight: 1.2 Gravity: -15 @@ -297,13 +299,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e087ecce43ebbff45a1b360637807d93, type: 3} m_Name: m_EditorClassIdentifier: - move: {x: 0, y: 0} - look: {x: 0, y: 0} - jump: 0 - sprint: 0 - analogMovement: 0 - cursorLocked: 0 - cursorInputForLook: 1 + _move: {x: 0, y: 0} + _look: {x: 0, y: 0} + _jump: 0 + _sprint: 0 + _analogMovement: 0 + _cursorLocked: 1 + _cursorInputForLook: 1 --- !u!114 &8616685848737228376 MonoBehaviour: m_ObjectHideFlags: 0 @@ -402,6 +404,34 @@ MonoBehaviour: m_DefaultActionMap: Player m_SplitScreenIndex: -1 m_Camera: {fileID: 0} +--- !u!114 &8294200720936265358 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8616685848737228372} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3c9b54b89b900ca46acb801d273ce670, type: 3} + m_Name: + m_EditorClassIdentifier: + _gameOverCanvas: {fileID: 0} +--- !u!114 &8729095170121787993 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8616685848737228372} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cd8f816ece356744ab73c6998c96717b, type: 3} + m_Name: + m_EditorClassIdentifier: + _deathHandler: {fileID: 8294200720936265358} + _maxHealth: 100 + _health: 0 --- !u!1001 &1216783236557002590 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/InputSystem/StarterAssetsInputs.cs b/Assets/InputSystem/StarterAssetsInputs.cs index e6a18e9..7c5fe51 100644 --- a/Assets/InputSystem/StarterAssetsInputs.cs +++ b/Assets/InputSystem/StarterAssetsInputs.cs @@ -30,7 +30,14 @@ namespace StarterAssets { if (_cursorInputForLook) { - LookInput(value.Get()); + if (Time.timeScale > 0) + { + LookInput(value.Get()); + } + else + { + LookInput(Vector2.zero); + } } } diff --git a/Assets/Interfaces.meta b/Assets/Interfaces.meta new file mode 100644 index 0000000..ef73d90 --- /dev/null +++ b/Assets/Interfaces.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 478e7d6acc302b64e969e23267aa1666 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Interfaces/IAggroable.cs b/Assets/Interfaces/IAggroable.cs new file mode 100644 index 0000000..00f202f --- /dev/null +++ b/Assets/Interfaces/IAggroable.cs @@ -0,0 +1,8 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +interface IAggroable +{ + public bool IsProvoked { get; set; } +} \ No newline at end of file diff --git a/Assets/Interfaces/IAggroable.cs.meta b/Assets/Interfaces/IAggroable.cs.meta new file mode 100644 index 0000000..6820e51 --- /dev/null +++ b/Assets/Interfaces/IAggroable.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: cac3261ff7d233544b303bd196756c1d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Enemies/IDamageable.cs b/Assets/Interfaces/IDamageable.cs similarity index 99% rename from Assets/Enemies/IDamageable.cs rename to Assets/Interfaces/IDamageable.cs index 5b48820..6ea95c6 100644 --- a/Assets/Enemies/IDamageable.cs +++ b/Assets/Interfaces/IDamageable.cs @@ -11,4 +11,4 @@ interface IDamageable public float GetMaxHealth(); public float GetHealthFactor(); -} +} \ No newline at end of file diff --git a/Assets/Enemies/IDamageable.cs.meta b/Assets/Interfaces/IDamageable.cs.meta similarity index 100% rename from Assets/Enemies/IDamageable.cs.meta rename to Assets/Interfaces/IDamageable.cs.meta diff --git a/Assets/PlayerHealth.cs b/Assets/PlayerHealth.cs index 7850cfb..d4ab457 100644 --- a/Assets/PlayerHealth.cs +++ b/Assets/PlayerHealth.cs @@ -2,6 +2,7 @@ using UnityEngine; public class PlayerHealth : MonoBehaviour, IDamageable { + [SerializeField] private DeathHandler _deathHandler; [SerializeField] private float _maxHealth; [SerializeField] private float _health; @@ -10,14 +11,6 @@ public class PlayerHealth : MonoBehaviour, IDamageable SetHealth(_maxHealth); } - private void Update() - { - if (_health <= 0) - { - Debug.Log($"{transform.name} Died"); - } - } - public float GetHealth() { return _health; @@ -33,9 +26,17 @@ public class PlayerHealth : MonoBehaviour, IDamageable return _maxHealth; } + public bool IsProvoked { get; set; } + public void ModifyHealth(float healthChange) { _health += healthChange; + + if (_health <= 0) + { + _health = 0; + _deathHandler.HandleDeath(); + } } public void SetHealth(float newHealth) diff --git a/Assets/Scenes/Sandbox.unity b/Assets/Scenes/Sandbox.unity index cdc04f0..598c50e 100644 --- a/Assets/Scenes/Sandbox.unity +++ b/Assets/Scenes/Sandbox.unity @@ -857,6 +857,80 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 520203987} m_CullTransparentMesh: 1 +--- !u!1001 &525282610 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 2081327037} + m_Modifications: + - target: {fileID: 100000, guid: 5d2e4237b4429b34fae4c9eb3cd9efd5, type: 3} + propertyPath: m_Name + value: CubePrototype04x04x04 (2) + objectReference: {fileID: 0} + - target: {fileID: 100000, guid: 5d2e4237b4429b34fae4c9eb3cd9efd5, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5d2e4237b4429b34fae4c9eb3cd9efd5, type: 3} + propertyPath: m_RootOrder + value: 25 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5d2e4237b4429b34fae4c9eb3cd9efd5, type: 3} + propertyPath: m_LocalScale.z + value: 7.7161555 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5d2e4237b4429b34fae4c9eb3cd9efd5, type: 3} + propertyPath: m_LocalPosition.x + value: 27.25 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5d2e4237b4429b34fae4c9eb3cd9efd5, type: 3} + propertyPath: m_LocalPosition.y + value: -1.94 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5d2e4237b4429b34fae4c9eb3cd9efd5, type: 3} + propertyPath: m_LocalPosition.z + value: 7.2602 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5d2e4237b4429b34fae4c9eb3cd9efd5, type: 3} + propertyPath: m_LocalRotation.w + value: 0.98075604 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5d2e4237b4429b34fae4c9eb3cd9efd5, type: 3} + propertyPath: m_LocalRotation.x + value: 0.000000079892885 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5d2e4237b4429b34fae4c9eb3cd9efd5, type: 3} + propertyPath: m_LocalRotation.y + value: 0.000000015904144 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5d2e4237b4429b34fae4c9eb3cd9efd5, type: 3} + propertyPath: m_LocalRotation.z + value: 0.19523759 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5d2e4237b4429b34fae4c9eb3cd9efd5, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5d2e4237b4429b34fae4c9eb3cd9efd5, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5d2e4237b4429b34fae4c9eb3cd9efd5, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 22.517 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 5d2e4237b4429b34fae4c9eb3cd9efd5, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 5d091c0f43a7704409e8d2eab7f99d8a, type: 2} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5d2e4237b4429b34fae4c9eb3cd9efd5, type: 3} +--- !u!4 &525282611 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400000, guid: 5d2e4237b4429b34fae4c9eb3cd9efd5, type: 3} + m_PrefabInstance: {fileID: 525282610} + m_PrefabAsset: {fileID: 0} --- !u!4 &527013405 stripped Transform: m_CorrespondingSourceObject: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} @@ -1540,6 +1614,84 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &815270658 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 2081327037} + m_Modifications: + - target: {fileID: 100000, guid: 5d2e4237b4429b34fae4c9eb3cd9efd5, type: 3} + propertyPath: m_Name + value: CubePrototype04x04x04 (3) + objectReference: {fileID: 0} + - target: {fileID: 100000, guid: 5d2e4237b4429b34fae4c9eb3cd9efd5, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5d2e4237b4429b34fae4c9eb3cd9efd5, type: 3} + propertyPath: m_RootOrder + value: 26 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5d2e4237b4429b34fae4c9eb3cd9efd5, type: 3} + propertyPath: m_LocalScale.x + value: 3.2927983 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5d2e4237b4429b34fae4c9eb3cd9efd5, type: 3} + propertyPath: m_LocalScale.z + value: 0.7838 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5d2e4237b4429b34fae4c9eb3cd9efd5, type: 3} + propertyPath: m_LocalPosition.x + value: 1.87 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5d2e4237b4429b34fae4c9eb3cd9efd5, type: 3} + propertyPath: m_LocalPosition.y + value: -0.65 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5d2e4237b4429b34fae4c9eb3cd9efd5, type: 3} + propertyPath: m_LocalPosition.z + value: 28.87 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5d2e4237b4429b34fae4c9eb3cd9efd5, type: 3} + propertyPath: m_LocalRotation.w + value: 0.9419316 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5d2e4237b4429b34fae4c9eb3cd9efd5, type: 3} + propertyPath: m_LocalRotation.x + value: 0.00000007673013 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5d2e4237b4429b34fae4c9eb3cd9efd5, type: 3} + propertyPath: m_LocalRotation.y + value: 0.33580473 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5d2e4237b4429b34fae4c9eb3cd9efd5, type: 3} + propertyPath: m_LocalRotation.z + value: -0.00000002735478 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5d2e4237b4429b34fae4c9eb3cd9efd5, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5d2e4237b4429b34fae4c9eb3cd9efd5, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 39.243 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5d2e4237b4429b34fae4c9eb3cd9efd5, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 5d2e4237b4429b34fae4c9eb3cd9efd5, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 2236c125e13c3dd41a4428d631bf633c, type: 2} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5d2e4237b4429b34fae4c9eb3cd9efd5, type: 3} +--- !u!4 &815270659 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400000, guid: 5d2e4237b4429b34fae4c9eb3cd9efd5, type: 3} + m_PrefabInstance: {fileID: 815270658} + m_PrefabAsset: {fileID: 0} --- !u!1001 &868432015 PrefabInstance: m_ObjectHideFlags: 0 @@ -1736,6 +1888,84 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 880482538} m_CullTransparentMesh: 1 +--- !u!1001 &923022665 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 2081327037} + m_Modifications: + - target: {fileID: 100000, guid: ab33e6080ae416b4d899f39fa8951b98, type: 3} + propertyPath: m_Name + value: BlockPrototype04x04x04 (2) + objectReference: {fileID: 0} + - target: {fileID: 100000, guid: ab33e6080ae416b4d899f39fa8951b98, type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: ab33e6080ae416b4d899f39fa8951b98, type: 3} + propertyPath: m_RootOrder + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: ab33e6080ae416b4d899f39fa8951b98, type: 3} + propertyPath: m_LocalScale.x + value: 18.269152 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: ab33e6080ae416b4d899f39fa8951b98, type: 3} + propertyPath: m_LocalScale.y + value: 2.0733 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: ab33e6080ae416b4d899f39fa8951b98, type: 3} + propertyPath: m_LocalPosition.x + value: 0.2542 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: ab33e6080ae416b4d899f39fa8951b98, type: 3} + propertyPath: m_LocalPosition.y + value: -1.04 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: ab33e6080ae416b4d899f39fa8951b98, type: 3} + propertyPath: m_LocalPosition.z + value: -32.2 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: ab33e6080ae416b4d899f39fa8951b98, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: ab33e6080ae416b4d899f39fa8951b98, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: ab33e6080ae416b4d899f39fa8951b98, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: ab33e6080ae416b4d899f39fa8951b98, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: ab33e6080ae416b4d899f39fa8951b98, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: ab33e6080ae416b4d899f39fa8951b98, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: ab33e6080ae416b4d899f39fa8951b98, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: ab33e6080ae416b4d899f39fa8951b98, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 1032d41f900276c40a9dd24f55b7d420, type: 2} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ab33e6080ae416b4d899f39fa8951b98, type: 3} +--- !u!4 &923022666 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400000, guid: ab33e6080ae416b4d899f39fa8951b98, type: 3} + m_PrefabInstance: {fileID: 923022665} + m_PrefabAsset: {fileID: 0} --- !u!1001 &945433442 PrefabInstance: m_ObjectHideFlags: 0 @@ -2610,7 +2840,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1400272403 RectTransform: m_ObjectHideFlags: 0 @@ -2681,7 +2911,7 @@ Canvas: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1400272402} - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 3 m_RenderMode: 0 m_Camera: {fileID: 0} @@ -2832,6 +3062,10 @@ PrefabInstance: propertyPath: m_RootOrder value: 4 objectReference: {fileID: 0} + - target: {fileID: 400000, guid: ab33e6080ae416b4d899f39fa8951b98, type: 3} + propertyPath: m_LocalScale.y + value: 1.013 + objectReference: {fileID: 0} - target: {fileID: 400000, guid: ab33e6080ae416b4d899f39fa8951b98, type: 3} propertyPath: m_LocalPosition.x value: 8.41873 @@ -3179,9 +3413,13 @@ PrefabInstance: propertyPath: m_RootOrder value: 5 objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 5d2e4237b4429b34fae4c9eb3cd9efd5, type: 3} + propertyPath: m_LocalScale.x + value: 4.4709888 + objectReference: {fileID: 0} - target: {fileID: 400000, guid: 5d2e4237b4429b34fae4c9eb3cd9efd5, type: 3} propertyPath: m_LocalPosition.x - value: 20.428303 + value: 19.1793 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 5d2e4237b4429b34fae4c9eb3cd9efd5, type: 3} propertyPath: m_LocalPosition.y @@ -3230,6 +3468,84 @@ Transform: m_CorrespondingSourceObject: {fileID: 400000, guid: 5d2e4237b4429b34fae4c9eb3cd9efd5, type: 3} m_PrefabInstance: {fileID: 1754370120} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1793928668 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 2081327037} + m_Modifications: + - target: {fileID: 100000, guid: ab33e6080ae416b4d899f39fa8951b98, type: 3} + propertyPath: m_Name + value: BlockPrototype04x04x04 (1) + objectReference: {fileID: 0} + - target: {fileID: 100000, guid: ab33e6080ae416b4d899f39fa8951b98, type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: ab33e6080ae416b4d899f39fa8951b98, type: 3} + propertyPath: m_RootOrder + value: 21 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: ab33e6080ae416b4d899f39fa8951b98, type: 3} + propertyPath: m_LocalScale.x + value: 18.269152 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: ab33e6080ae416b4d899f39fa8951b98, type: 3} + propertyPath: m_LocalScale.y + value: 2.0851176 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: ab33e6080ae416b4d899f39fa8951b98, type: 3} + propertyPath: m_LocalPosition.x + value: 0.2542 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: ab33e6080ae416b4d899f39fa8951b98, type: 3} + propertyPath: m_LocalPosition.y + value: -1.04 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: ab33e6080ae416b4d899f39fa8951b98, type: 3} + propertyPath: m_LocalPosition.z + value: 34.86 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: ab33e6080ae416b4d899f39fa8951b98, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: ab33e6080ae416b4d899f39fa8951b98, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: ab33e6080ae416b4d899f39fa8951b98, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: ab33e6080ae416b4d899f39fa8951b98, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: ab33e6080ae416b4d899f39fa8951b98, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: ab33e6080ae416b4d899f39fa8951b98, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: ab33e6080ae416b4d899f39fa8951b98, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: ab33e6080ae416b4d899f39fa8951b98, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 1032d41f900276c40a9dd24f55b7d420, type: 2} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ab33e6080ae416b4d899f39fa8951b98, type: 3} +--- !u!4 &1793928669 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400000, guid: ab33e6080ae416b4d899f39fa8951b98, type: 3} + m_PrefabInstance: {fileID: 1793928668} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1795367538 PrefabInstance: m_ObjectHideFlags: 0 @@ -3367,30 +3683,167 @@ Transform: m_CorrespondingSourceObject: {fileID: 8762286023885395322, guid: 9c489a8547f4d9e4387da15a4ff82c81, type: 3} m_PrefabInstance: {fileID: 6782772648210504087} m_PrefabAsset: {fileID: 0} ---- !u!1 &1859157918 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 8616685848737228372, guid: c5efc39a8aaf6e64ea40e9ad573e9b47, type: 3} - m_PrefabInstance: {fileID: 8204767108263278737} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1859157924 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1859157918} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cd8f816ece356744ab73c6998c96717b, type: 3} - m_Name: - m_EditorClassIdentifier: - _maxHealth: 1000 - _health: 0 --- !u!20 &1874573760 stripped Camera: m_CorrespondingSourceObject: {fileID: 9005220659476430821, guid: 2d3a85ecde41a8246a79669975912b74, type: 3} m_PrefabInstance: {fileID: 4313866246714185760} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1957558930 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 2081327037} + m_Modifications: + - target: {fileID: 100000, guid: ab33e6080ae416b4d899f39fa8951b98, type: 3} + propertyPath: m_Name + value: BlockPrototype04x04x04 (3) + objectReference: {fileID: 0} + - target: {fileID: 100000, guid: ab33e6080ae416b4d899f39fa8951b98, type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: ab33e6080ae416b4d899f39fa8951b98, type: 3} + propertyPath: m_RootOrder + value: 23 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: ab33e6080ae416b4d899f39fa8951b98, type: 3} + propertyPath: m_LocalScale.x + value: 18.269152 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: ab33e6080ae416b4d899f39fa8951b98, type: 3} + propertyPath: m_LocalScale.y + value: 2.0733 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: ab33e6080ae416b4d899f39fa8951b98, type: 3} + propertyPath: m_LocalPosition.x + value: 32.8 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: ab33e6080ae416b4d899f39fa8951b98, type: 3} + propertyPath: m_LocalPosition.y + value: -1.04 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: ab33e6080ae416b4d899f39fa8951b98, type: 3} + propertyPath: m_LocalPosition.z + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: ab33e6080ae416b4d899f39fa8951b98, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: ab33e6080ae416b4d899f39fa8951b98, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: ab33e6080ae416b4d899f39fa8951b98, type: 3} + propertyPath: m_LocalRotation.y + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: ab33e6080ae416b4d899f39fa8951b98, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: ab33e6080ae416b4d899f39fa8951b98, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: ab33e6080ae416b4d899f39fa8951b98, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -90 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: ab33e6080ae416b4d899f39fa8951b98, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: ab33e6080ae416b4d899f39fa8951b98, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 1032d41f900276c40a9dd24f55b7d420, type: 2} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ab33e6080ae416b4d899f39fa8951b98, type: 3} +--- !u!4 &1957558931 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400000, guid: ab33e6080ae416b4d899f39fa8951b98, type: 3} + m_PrefabInstance: {fileID: 1957558930} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &1970649149 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 2081327037} + m_Modifications: + - target: {fileID: 100000, guid: ab33e6080ae416b4d899f39fa8951b98, type: 3} + propertyPath: m_Name + value: BlockPrototype04x04x04 (4) + objectReference: {fileID: 0} + - target: {fileID: 100000, guid: ab33e6080ae416b4d899f39fa8951b98, type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: ab33e6080ae416b4d899f39fa8951b98, type: 3} + propertyPath: m_RootOrder + value: 24 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: ab33e6080ae416b4d899f39fa8951b98, type: 3} + propertyPath: m_LocalScale.x + value: 18.269152 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: ab33e6080ae416b4d899f39fa8951b98, type: 3} + propertyPath: m_LocalScale.y + value: 2.0733 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: ab33e6080ae416b4d899f39fa8951b98, type: 3} + propertyPath: m_LocalPosition.x + value: -34.55 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: ab33e6080ae416b4d899f39fa8951b98, type: 3} + propertyPath: m_LocalPosition.y + value: -1.04 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: ab33e6080ae416b4d899f39fa8951b98, type: 3} + propertyPath: m_LocalPosition.z + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: ab33e6080ae416b4d899f39fa8951b98, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: ab33e6080ae416b4d899f39fa8951b98, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: ab33e6080ae416b4d899f39fa8951b98, type: 3} + propertyPath: m_LocalRotation.y + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: ab33e6080ae416b4d899f39fa8951b98, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: ab33e6080ae416b4d899f39fa8951b98, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: ab33e6080ae416b4d899f39fa8951b98, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -90 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: ab33e6080ae416b4d899f39fa8951b98, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: ab33e6080ae416b4d899f39fa8951b98, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 1032d41f900276c40a9dd24f55b7d420, type: 2} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ab33e6080ae416b4d899f39fa8951b98, type: 3} +--- !u!4 &1970649150 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400000, guid: ab33e6080ae416b4d899f39fa8951b98, type: 3} + m_PrefabInstance: {fileID: 1970649149} + m_PrefabAsset: {fileID: 0} --- !u!4 &2023513984 stripped Transform: m_CorrespondingSourceObject: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} @@ -3450,6 +3903,12 @@ Transform: - {fileID: 1441195750} - {fileID: 1597297138} - {fileID: 760641180} + - {fileID: 1793928669} + - {fileID: 923022666} + - {fileID: 1957558931} + - {fileID: 1970649150} + - {fileID: 525282611} + - {fileID: 815270659} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3475,7 +3934,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} propertyPath: m_LocalPosition.x - value: -11.185878 + value: -42.2 objectReference: {fileID: 0} - target: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} propertyPath: m_LocalPosition.y @@ -3483,7 +3942,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} propertyPath: m_LocalPosition.z - value: 12.498965 + value: 19.77 objectReference: {fileID: 0} - target: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} propertyPath: m_LocalRotation.w @@ -3676,6 +4135,10 @@ PrefabInstance: propertyPath: reloadAction.m_Name value: Reload objectReference: {fileID: 0} + - target: {fileID: 1218087889432038952, guid: c5efc39a8aaf6e64ea40e9ad573e9b47, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2132953286740742962, guid: c5efc39a8aaf6e64ea40e9ad573e9b47, type: 3} propertyPath: fireAction.m_Id value: 95062357-7b41-46da-81a2-d1977a9c523b @@ -3692,6 +4155,14 @@ PrefabInstance: propertyPath: reloadAction.m_Name value: Reload objectReference: {fileID: 0} + - target: {fileID: 3273242134651530650, guid: c5efc39a8aaf6e64ea40e9ad573e9b47, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360281265970703093, guid: c5efc39a8aaf6e64ea40e9ad573e9b47, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4641286401744272850, guid: c5efc39a8aaf6e64ea40e9ad573e9b47, type: 3} propertyPath: _fpCamera value: @@ -3720,6 +4191,10 @@ PrefabInstance: propertyPath: reloadAction.m_Name value: Reload objectReference: {fileID: 0} + - target: {fileID: 8294200720936265358, guid: c5efc39a8aaf6e64ea40e9ad573e9b47, type: 3} + propertyPath: _gameOverCanvas + value: + objectReference: {fileID: 1400272406} - target: {fileID: 8616685848737228372, guid: c5efc39a8aaf6e64ea40e9ad573e9b47, type: 3} propertyPath: m_Name value: Player @@ -3732,10 +4207,6 @@ PrefabInstance: propertyPath: m_Camera value: objectReference: {fileID: 1874573760} - - target: {fileID: 8616685848737228376, guid: c5efc39a8aaf6e64ea40e9ad573e9b47, type: 3} - propertyPath: m_Actions - value: - objectReference: {fileID: -944628639613478452, guid: 4419d82f33d36e848b3ed5af4c8da37e, type: 3} - target: {fileID: 8616685848737228376, guid: c5efc39a8aaf6e64ea40e9ad573e9b47, type: 3} propertyPath: m_Enabled value: 1 diff --git a/Assets/Scenes/Sandbox/NavMesh.asset b/Assets/Scenes/Sandbox/NavMesh.asset index 677a389ac694c5813ea111bd064deb93fe86c112..050315ce488f98eea114ebc5539f295f711021fa 100644 GIT binary patch literal 39908 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 Co2lIZ literal 34524 zcmchA3wTw0Ni$XvY#Q+I}OF$9`h{{$_0$P!3 zZMoE{6}3PsM?ESGS{du=c#) zyx;fDb9j|d;G_7pAp;iu;r|?nO>x*fqL#!j{SQW5>ijpB zw2%gy>_1!hXsD3tzexi=!`z-}qD!5Bmf@Sq->iXsa`~G#;4{ov)Ndy$&GtQwe3ZG^ zfbwMwMEmd{&o<16_f+h;yR& zaUnJT)=1BZDa*W)^UoolpoPB@GV`bZHsqrTg$$D=`OiZV`7;{ujg#u%mV5+1E@YVO zr24l*dUF2R<^j}C>(BEfna?uo(YIAdXWiO2;2Vqm4M=DEbx6anaeT)#{GEq_zgp3&%y^`rv3C#g7X*zl;FS^Y3gN z97h_+KZvnE*71EooQj{~c+PXD;;(c3xoP+Xj_;R-U+(z+Y53b6e_k4Xo8t$Zg6I6b z!|?-8!9NIokK+fOf~Wlf#}}mGf8lt}^{MSc`(Hc${8R9}K7H!=3r@k){-on^oonE~ z9WGku;ed)6N&vtwS zX{X}L93M2`v&>3dKj*sqM+uJ~7wDhupAVV&UyLKiMDc3_dH?!fgydx2wr>^uvwcT{ z|EBgGLq3Kd7gDcZmmod4{Ti8D;ajg?W64LIF(SQwZF2eZI-1NUU%xITAHk0csn@T| zke-}>w)7wKXa5xopNC%?GE9@C{u__va|_TPjwy!PM32E4sKZ*%pVL_Ufi7tlW$ zIOoIl$>m7@rutn$UX2lJ{aHWu|KtWdQ%&>{>`Io2RHUGJ3c+H>d)a3Fvk@@RGAv}Iu;Q7h(a(S#te92Yd#&m1+1vj^}+uvOTR#bQE~bZ>uPI zf$K+Jzjc1QQMkNNgZ=CG&rNA~ZJ(Rd@Y+7B8}K%No!_Dj_~iU=NyBUYx2EAW|1}Nx z4D(y8A1+7xu-(=+;O+Wa=l9#v@S6YaX?V?lT^fD{^5^)dZNQ^^=$~uB^ZK*C0iRsH z4QY5S-yLaqE#I9D_zam}DqQ)#C4Ay%Lh17HWmWTvN~=rFq)F9FM~t3RQN4KS=oQsv zl~omsD@U3|GsjdcEE`t@FsZb99)RdgT3S|KI%`~IRds3Q>@uo3S5u%}WjsNAFPa%< zvuNhn(yDo8*2?O#s;dWF3;*0Q-_OU$9fA+fMj+QpWC zQR$K@6GG|lC5x*ns!?=Ih%3zvrn+qD($b1bHx#TY2Lwh+LU8QVvZd7(v%xHyIj(Y! zL#||tW?qb%lr04(Lll*oIbrdfBsZg`GKH|Na^_cDQMsVX1k0)ydkHSz z$2Gx99Q?YzTr`s=>|~_bevp)+ilt?1=H~ST3$E6{ZFzle8UR z?F|>6fHJY0SRdY+CqfHeA^*+L1omzq%cS&|rp8PSCKPdkPs$hOge zk5z~1KBkVAKU&)~R#WqgTrA(H(t5tols%G4+dzo)UdxUbqs2 zurZblHZYAi-}Ep&O)t~irE5gKF^)`VWjPNRYN0Rk^xYUY2^^CQya;lvF{uBhp@mIN z2A81uBMw!4u7?LjZnhoE|vAs1(xRD(X=ydL#r0@kes6OOlfKO z=sP)R{;l!Ip^Z5snS`W#Hd>%9@?c>3o5^GL1m7M@yN<2|nNjjKB<$OnT$jf7(~@ZU zvcYzCR(yb;<8;-&5o&*$;iF@_NrLk}O00Y{SfA;5`p%4UW=QazV6A0h+xh-=tcZc@ zNBXrR$JW;_jkVt`YsZ7dwr{z7Hm;wn*V84%>abq6L|T8V&$490ietvsFjH_Bs-xeT zZpQ_0RgKBRq3QV^?&;y)f|>7$c*O;)gU`Gy3)6i}osVAa7=OM;G}wIS zp7_!7j`3-|ZVui)`$^t=qh;Dj-#3!h`GmwZ!ba2zy43i~Y8f2y3W9I1M#a>A}9 z@;G7c!tpMyS&eYsP|n5irzH7z=C3L8KaynIrnG8{k{5MXqw{jEL*VJz+{^^nSYn}byoc&rU&-*yTl6jV=d8q%s%t^NV zBP4&$1LU=R*dDDsne7pGGTV#(5^@unk6-Y3p7*qGVV*;K-z54f=R#(`w=(lWp7Sa5 zzZJeO#=-Wm<&C3!e-itI{2?^?@V2G-*jy$&&o0Vp&-S?33>W@l*z;Vy!tq*u%4?Aq zWzIva5A7-IoP^}G;T<%xu7jwAEM**`tvrp}hluZBLUqdtkJmV6=p zsiT;-Q%l~E@)Q-lD4712*R+qn_wFA>-^Z%+{2fJsVy=Bu$H%IpP?jFqM-1x!UtN3KVdU!CfwLax z76!HF2A-}Bn5Ne`-CV>UJo-Qy({FVICnZDJ{JeAi2HfCzlYBgoGCg3 zfjgN2eBr~C;^4JoIO1{~&9Msl<8MYq-Y?p95kxcYkGDkL-}}Z$;-W_e1&W~)6ct1Y znclUkW^`_AI(u${cI9EtWgP`hVcQOZT_>piX?oa*OwWuT6p2 zHofau?1OV6;h3zG~j>@i9m1Bh=||=uYv;y6^jVs>Nu}-9s*o-&)*P%ENQ^hU_6y z9^%dmY~6`F9JFmh{FfF-q%OoKDt;+#NZhmElak)&WO01xJG&%({`~3jOKSHBe(2HZ z@z+|#M5p)9isPTpf7zzjOpm{}*S1gZEyeM9_iq-R6Q35xZyJA(=q&u%^mymawmqlb zP#&LmvBe*r9f_BYy+`z){%&!6+wTgc{LxQ}?g{vw3aW2h8oP(K& zaVBzQ%zGQI4cnjuyiR6An{j)Tfa`{K$eD9YGaz2)+ad?v?X-tS>ZM!XooYRL8uH$);EZdkrX(oRfg`*W7-fSBd# zgqY>xJsta_3$WiGY%lgl3&iY?u848XlejHfg6)$D?`$95F>;;J2#EJO9gqX(>`w5_ z`Ifw*qs-7a4= zIs-Y<{&XPPbwJL{rxS9t`E{1^<$`5dJ0m~Ft&ju#w*X>&+5pjiN91VpI~^&!&$f5X zZGo6yJN$B;)(V=8dEd>rHBuO#3B;IpMI43psRG+Q8#1na(jtu6HeAy;LfhK)gN_@< zTx*|>m?M?_z<#phh3AYNPmD8R&GB*?ELeUXEO!f7*zwauc=j*#xO%YT%ia&41`Dg- z3_cjx(x1xx%I{@uX=ScYzetg}-c|ivGZ3EDz8_lIuGcMpj>rlBNT{;d2S^nWDn&GP(2%4_SNkawd8ZF%XR`P(}*mLYwJ;bhYF zKC(mkY~bQ#2@b~Wb7F41A?R~Y5!`xzl>glGNL_K^(RZJZbDd6Xyyt!Xb3lDQXmyON z{pnPn_Ytf9)ROaqy!;Pi^hrFWCNAsf3gLQX`Pit#2{nIDQeB$_o5UWq7 z`r4F3 zyWf|x5l4!OLd@r*wrn+FzV!d;@#CUHJfPrn!O!nq73AlS3iDN;gA48neG*S9DG~iP zIh#UETWv!hQ%B1{+h|?gK9+|%im8*IKTGoMk$-E5ckbALx?e8oK31KTmzcoEs>5_2 zQ-@=W`3^2v6XNIg-hsM5Dd|2|9gY(ps}9qBOr5(ocMSb2rp^O9c1ZjCSoPIE_0=c! zQ!({*oUjdb%oA(+`r7Y>eMGEnPOLf^W_PGVto?ZO-5-Z|=Z-C*Ep@byB;EBL^|g)} z=7A8euYD}6ua8xS^-_HGcUIthd`0wqtU8=8>^S*bpm=@l*TLG_T4`tE);XI5&n^El z#Dfc74|Uq){35g^)^_0i{B`B!&d;wx+$QJG!F9DwrN4ZmTOVHrzX!_=a@1) zPrBS`G&2`C4Yi*GZm#pdYYX#aP@XZ%%|NWr6o~1c`ya|vlj|`C<;(Hv*%c@Q!!R6r z{UXo2>~jJD1g@dDu3%96R>(2ozf}Xi1+JZ~oQ7S~B<$&*E8y0$db8_JuG<(i|Ax;| zcx6oRS@5lO=Bk?OGzKjn*ScCKgPkJX4N;yeb*^V^yPhHa&o&}YJG%$MRbq0`@^MYA z{!e%7L~5%4>+m#U7J5)Zv|;~smbIFFB9bes7yE=y{ddMH#MYP|E|fkXQvcjt%3}h; z032NZGAQ32t7Ge(sqGr@U18nbX>e_=&lhRWHYvbLZIYP^#87}^gdpW-m}|_nW~QY1 zKgwTerkktG)jpME-$i!uli=@g z&XZjl=b51?{1kYY;L_OJsr==zp5invfZh<#p821S`Gvdayf)x$K}*AR<&Zf2sSly0YN24DMO7J@au;BJL@ukz5_^7|#@ZHdUb01iyA{*lYN?l5TN74|CkBz8zoI zmSc%KqO2dU?bIRG8JyVm2cNy!k1SYUV%$I?SR4^-ZAW>y$irhiJl4aP3buaiS#GgC zBdkw5el4El*dzW;Kpn{lo3D-jDySYozrjy9NKE#em5CZ#^w*c^|6|?`hPQbF06% z|F2|@dA>{Vf2x;GU(+@ISN_O1mQ^30!trSw&n-TSOu&qn#VL&v(X9a8i@g)|7-uL<@>+QPxVv%q{^z78mH><+GO8_ zu_J|}BY8YBr5)02oN8~M$e+N~|5LLL&j@|_rBHqg*X&QtZ$f!5l{aC%Ywb6h|AxQqvgVl-D_4>$lF_BK~t-e!q7-*Dso1 z7qp7juS)uBLs;JRPUhVU^{d3+GFd}Ua^>xUROXkEOXNP~7O#9bJqLKPfXm z%FO?EC+FhL8TzAq1D?=R=Gy3g;s=2>Y^)nDgi-hbQ+edY6<%>Eo~J~S`DKY7Z%%!_iq?(<}x zuRn8g7qeXY_vcQ|h0HZwg16^SLN1YKI)_93X|jU%{j+^l?t=VT{y&ELFUoo_!I#LM z+dkB^1iALYvmxrM+y&=r3zR1YewsNbJlBh?-!$_F$hFeHluKp2FPHwc@|~d*Zf&uwjbqOXwlx6d6z?ZzTp zk-6SKD)yG=n%}p#?a%yQhW|BqUSSOTuNL{`BER8~*&ek>%{7~(y{*jobED*!kT=LP z5Xw6L@t*cA&z|{F-XQI>QSM3q;PJfAVf{C_`m??X`9;ZJWtNZrtZd7}J3N+ulPf>( zO<4c?&_07Pr%_+!TywuXonred&%5l`p#MXcKigMj&5z|JPnpk@$ZvOYQ^;>XK7_fH z=O^=1ITtdo$#0;SmA7|;Nc@KIm!63|Jzp(=uo?$rJ_Y+Nj$3gsxOeyn^&LLh(|d03 z@L+KMd9u&O{Vc`$ejE4S6w{c2&)^x;mUwj0oM1)G5WyMdI>GeAy)yb#9rZ(f?y0E` zF?DD=w|tDGk1i?_%=D=xCGa^-bQIH8b-1_VW7T20kE!$A-o1tN$vrU~5ygWGo(wUn zCV5du%S^1c++*3Yd9(Q8K9yqbU#U;(s88aZJ9dbF>MN%H=%Tff?qlj`8EC6zARb+m zC1tbv7E^zHZBy~XeIdo%U&7w2r2ANPxUb@4)zQ5s+9q@kdj2h@{>~krg#Hyjnts86Rac{zQ- z)L&m)+W=EX+yCgh-^bq3Ht7rE3=<2nmW}Bgb9M~B6zWecc?o61o*KsC;DQ%IoPm8a z^}nL#QTU9A4zc>#viV10Ui71R5%h#Ee$hF~i)XU=c-hCeae=6xdo?2pcKD#R# z@v-VK-N)3?Ha~IvCn4rOBLsnFMseKhz%c~q+=bZzSswe`HDRCpzH;jZ{J;CYa>IQ>mM&5MYCO@D7k-g80(TUOwSMF9cKveHaUys= z1J1_!fPp;k=W6hrpPUVYsQ+BKYqvW^y^!A4c~k%TotGG47nEa&LG8KE*wu8G zG_I$4&&Z(mcAwGm+!eLE!3n+_EZUhonjr8F(|S<*4zTGdoZZLb8jgWH$4f7)vYD?9 z`LdHjtb7l&S7M)xZKqG$ZTs~`pZ1YIV`V+)ujb#^?c`~?#>(4WJl$PWHc>zBQ*bXW zHK;xJPqcs9;%wl1iws)+e6%n3+H7D=^98DXXVfRLPsf(Bt)V=3>2#-)`v4tHUXpzm z+!YUTyFcyFk7uXw7r}eSuvNRmR-gRaa<|8bZ{qrl_d|A%BT@hM7@s;PaW8~pjDh82 z|8b8n;`RY~f5>}o2J&o|Jd@^?8?-C|?ow=*D9oQho552Q}!wF%G*=34p-)!S1sp^1lq$ z6NI(jE2Q$=rIDCDJ%vM#>$Zd10@ze{k-T%!HY-byb?YWaF>CA__2YjwI8V7SB9)p8#wdD!;2wVmgsS9o|nF!w0~#Oy)NM3*3DTe1|yc5Py@UB_6w zT68i*C+gu_1Y4ao9=^@P>pZ;P!*>9;#PzBK@k1`1_+bw};^D_Uyu-u0fceJu)rkL7 z(lZ1hw-_^^k6 z?%`i}_;nAz;o<-G@LL{!Td=LyJ6`%xFa15iwq754Iv+WmaYu&9w>7Qm+69yUIzYZR z+V}g@gO%IY%l9kCV>2Qhzp~%cJT~Ma?0HU=Z(P0@F){MU#2ZAX>nqns`W>?0e$_p3 zZs6eUzb*5>IrG0o z^S@E^zg>fl)Qin>SqJ-FQH#p)g+&MK_eojDFDuL(YSW9x^bY>!z8kxFYj5l&+i%6T zn`4puBKv*Pu4Q$RxhL&6PfwlsWaNV(_FJeY2lNiEbl)@8FY6fmdZ0}o|9Xp{@|gY3 zssDrZk^joG=|dkm7FoC7rWbZP9GN;jDsBFo^@j@2&$j8AuMZ8r9A>|(oAKb#;D$?I zlXiQ5_XWZ5)o)6>4O@Ld;J2aQwtk!Yec{{sKK;D>GVnPUzxl&+6?y)}efPQLQ-dj= z?3ePq@Og32w1;iO4M&QDjKj8V*FRkxOzl%8wu4?S4vyv9x}SWuIC!tl*72_o(C3)Y zKcAOrUhDRsE_HmgLrJiV!f_p~}6x{z;!-BtzYa)2#Zzkc{ z)?cOHSx&4(B>kb5!-AZg48gCV%)D=BT{`{v@+5uVkMG~t_xk;w)~e(Kl{So!AEOs`nrOGAma&Ol=;mcOb@;q zZO2S-usC=r!+xXo#=7b998>#<&o{L_{dV))({Ja0%<3p@{?A#{gGM-K{P!EUOKZRF zvAgTs-M5H;TYx+JcE6pgVD7i`8pZwgZ1`yc*8euHyXa?Qy>0dQjaC!rG3J%GGh%w< zH(Pvvl;61VJym|A#qWd|^M0Ojrd*Lv{f%56czz>yCSusHd{Nj)@-=XF+ zg=`?Ew}K^OaKRPb>gp@+h&-{&(ZvzmBBl^Z#2;S6@v}SMStvsy;`Q z!9FS9Lt2e}Qk8o_j(alSQ{g_i@|3wR?91Gz^=0n6QvMh{!1r2Mh6G)#8pe7klTLUoFlS`m^`j+!wa|NN0b**{i!C0Pc?I z-v+kNm5@L7>Py+~!`t#ww(mV8}+f--Ploc>-k5lEb!Z2do${P?{N-aj2zaV<6Griv?}XMd86cazxbnkA67wpkActZx`zBFdBU0J{L!BIQzk?C zESEp?<9i(4AX|S!B!A8CKIGR6y+->Svjdko z{BX$UK`y~qzXGFRKlCYAK<0ZI?0=P+AKQcSDvTe>EMG#l{jW0nzq9yf|5JYrN^bMJ z&)Ktl)Thk$JKyOme*xqXt~|MT1Bv-jULfbM9Y0p){85duX7%m-utC<9zCH7!yix4$ zmFK^f=lNTWGFp53XZ=}U>!0&YYX0|1el`ZCKu5>LJ#Mvsvn27BdszHmKG`ChyYmkZwNw-kNK7bfxFmuKi#L0|j- zJ@}_Q1Nn12u>O?qlky&r^7u0SQ{Llvu2n3*3Hkp(o`BB~dzL3A<*_pPJ@Ty&se@>e+*@(|(A z4f&yvpMt&}j|b#$nfWryPg&cS>$n7euk40VzE|qAN8T%>{EU+aI(_BUpOx>EJ&vb6 zd%L3mqkj<&V;_9W<~_I^FBxS_6mec)Oe6v`xkTe#7<;M31swkx1g7zMY@aFo+o_S@ zSEDN9_fI+;BYqS3VZqU0LHB3kRwo)P1b)EjEbRW3OOGJ^tN8ThLxL&8@(TYnd18Dr za3A3BkDCppIfR-GO^{_kRX4+TV=2#lfn6N~ij`Of}HTc3(&0WT5!Ts#x_-mydXQ|C0`PbxQ#oVfM5csB5xz}K54 zk?ikn9m%$x2K?>sZXLD4cSCq39D^+pV!YVCwXTt>AkKr3~AuZ!SFk_z=-2rY&{0 z0`Gzj^CBLzeTe9+NIyb9RbZjCXWI@DhV{L;Sj#OI98e;s*p{aK<yZRWAf%9X_=7 zm7wL1ui2l8^qSQP{BY$9qJQlEDJZlf z-%c!`M{FbD@Av%iRuNsHB!UR9Q^R7VgRUK~%-m9vRbRSbk=K;=X zIu9u3xyCt7=KOZ~`%?BE z*uJko%=;aC&u5=Q*!xp^%|cz}{*7z$Ja=?=X_WJEP@alo8jdR+W?bTqDK71D#FKGQ zCceVS;}K89!F_+?2~Hk|_%a;DIEXKG@@T}D;24X8c#M++#24cz!a+RB$rmB!1v!F) zm=|TrD{Qcam{fHjx{*eI((~>7a^|1u^2}Mjs-XtIy~RW z*C3vW<2oF~*W#c&9miETuEwzpM-7e@4lj3d8REG(=HVbNcQW^ot8rY9gSg6*m$)>R zjpd?Tienaz**KUl^PGW$=}eo0gZFN{|KL3bG4HJ?^B$J>F6J)4|Q@6#65BJ!a>ZqH;!x^O>l7C zNzAwzjy5>Xz|q!W#_e#Nhl6XvK@JaaGRxKn2g`R8j+=3;c9?M#2iNAUaI|)qaSo1i zaP-5`-{EtejEH}GEW#LJRAVtL6F9(1}AqN?@pW!5CUvkaI>jBqxoSVpVo;nGh z!RLAXBF}3d|MOUmSD)wgggmcHprn0xJ=W_D?e*Hpw&TG$jn`aWLz#aj%Fg`hze@_w zxr#jJDz-cAIk!R;>$z=WZ|Bf20*)Q>2&b&S)-RRkbq{Hym_Gxre>$i0dPAPqKaP=8 z`OmOZz$o?;d0oeGonqH7(SYkO^?xd!>pY$twCB97>szj4xgMi^Avn$(JfHRd4!9eC z_o}31d)$0>*9cesv=9H! zg5$^c6%@Q6d<?|1{wLKR`_XJMsO1@*|3}V)}Q4i1}Xc(RUByeQ{g9ocxFO zD^HxtFR2+4+7qYp{JTc9KT`Km@V5J#V8rTQ`FZ6>L!LO5A6)Q#8?$ZPq0Uh79*>*w?Q`%7B>FY)*0Sihw5JDz1y-Y=ipvrfwU^|OB$?m*%C+Oa`Z z%~#TX#9Dsg-``YtX5^xfCr;w;`>gQm*CvNNvGULE-5cY(?A((lX88}-Eev`7{kfNi z+x$<~uWpdP@Xo*TzJK9e`IPs|$NyJD-=!yJ{!>f76XwtF_kuBCxc_hDo zp82c2pFi7Q?X~@Vdz~NoH{gh`#aLX4vB>t##Pvt#Kk|xwK6U>12y;n3`cmz+ei`@{ zNAW(C)#v^3e--ktsrm1a_s0*`ZV}c+#}CV=?XUg!2k@&fm#Kfh{X5{gscoUW-@d;; z{*wm0mRZ~P1Ng76|3T>AZ(l8+wlB-azpKgd$8Tkbmux)0@Wk={V$bV4--{y8_paLH z3=B?G^^o-=k!8d7X?U_IA zQ}fsFvS`0^M|1a0RO0*`Tu>nSbNmt0-k%@%%^B-Iy6EBHv*VRge`0NawdZ$VYL9R9 zLZ08LsXhFPf8So~&-}Ige*Rj2+GzbxWzYQ8-p^m_PaCbjZ$G#ECxL!%Mr_B=mazPX z>z)dE;#5AvJQniAsXV`VqyH_N{{!!&eOGv5Z9nA)7wimq;#3}Q0EaxW@>+g=7pLXl zPz;bte;{qiZ#Iw|kh??_!|@y~DVi0R+& zpRJqE4te5K9&faTJaH<|?*m!>!3BGR_uhRsLY`RLPx&M0TjhyU`7N8{Ay2HlmY?er zEx*4$(ejbk^7*{hkG$5;=lM>smVf7tOQn8(`ITpxl=sW0JnN*qUq63-+l>E9P3Jn+ zkMnct{6^lN-~IV5D0)%Ob)Da6ujen*rn|Yo=k@&8`771G&M!JYk@v5U{`~Ykl)vW6 zESamc{Qmr-<().ModifyHealth(-_weaponDamage); } - if (hit.transform.GetComponent() != null) + if (hit.transform.GetComponent() != null) { - hit.transform.GetComponent().IsProvoked = true; + hit.transform.GetComponent().IsProvoked = true; } }