From 7ab62d67984dcbda6a50c52f14dee12a9d506d39 Mon Sep 17 00:00:00 2001 From: Stedd Date: Mon, 25 Jul 2022 19:18:21 +0200 Subject: [PATCH] Player and enemy updates Added player health Enemies can do damage to, and kill player Weapon hits provoke enemies Changed idle animation to a better looking one --- Assets/Animation/AttackAnimation.anim | 608 ++++++++++++----------- Assets/Animation/Enemy.controller | 28 +- Assets/Animation/IdleAnimation.anim | 302 +++++++---- Assets/Animation/IdleAnimation.anim.meta | 2 +- Assets/Enemies/Enemy.prefab | 56 ++- Assets/Enemies/EnemyAI.cs | 15 +- Assets/Enemies/EnemyAttack.cs | 25 + Assets/Enemies/EnemyAttack.cs.meta | 11 + Assets/PlayerHealth.cs | 54 ++ Assets/PlayerHealth.cs.meta | 11 + Assets/Scenes/Sandbox.unity | 495 +++++++++++++++--- Assets/Weapons/Weapon.cs | 8 +- 12 files changed, 1165 insertions(+), 450 deletions(-) create mode 100644 Assets/Enemies/EnemyAttack.cs create mode 100644 Assets/Enemies/EnemyAttack.cs.meta create mode 100644 Assets/PlayerHealth.cs create mode 100644 Assets/PlayerHealth.cs.meta diff --git a/Assets/Animation/AttackAnimation.anim b/Assets/Animation/AttackAnimation.anim index 987a5ee..9cd6445 100644 --- a/Assets/Animation/AttackAnimation.anim +++ b/Assets/Animation/AttackAnimation.anim @@ -29,6 +29,15 @@ AnimationClip: weightedMode: 0 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 value: 1 @@ -38,6 +47,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.25 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 time: 0.33333334 value: 1 @@ -47,6 +65,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.41666666 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 time: 0.5 value: 1 @@ -56,6 +83,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5833333 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 time: 0.6666667 value: 1 @@ -65,42 +101,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.8333333 - 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 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.1666666 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.3333334 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -120,8 +120,26 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.083333336 + value: 0.20983982 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + 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 @@ -138,8 +156,26 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.41666666 + value: 0.20983982 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 time: 0.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5833333 value: 0.20983982 inSlope: 0 outSlope: 0 @@ -156,42 +192,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.8333333 - 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 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.1666666 - value: 0.20983982 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.3333334 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -211,6 +211,15 @@ AnimationClip: weightedMode: 0 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 value: 0 @@ -220,6 +229,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.25 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 time: 0.33333334 value: 0 @@ -229,6 +247,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.41666666 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 time: 0.5 value: 0 @@ -238,6 +265,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5833333 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 time: 0.6666667 value: 0 @@ -247,42 +283,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.8333333 - 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 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.1666666 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.3333334 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -302,6 +302,15 @@ AnimationClip: weightedMode: 0 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 value: 1 @@ -311,6 +320,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.25 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 time: 0.33333334 value: 1 @@ -320,6 +338,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.41666666 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 time: 0.5 value: 1 @@ -329,6 +356,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5833333 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 time: 0.6666667 value: 1 @@ -338,42 +374,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.8333333 - 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 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.1666666 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.3333334 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -423,7 +423,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1.3333334 + m_StopTime: 0.6666667 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -451,6 +451,15 @@ AnimationClip: weightedMode: 0 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 value: 1 @@ -460,6 +469,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.25 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 time: 0.33333334 value: 1 @@ -469,6 +487,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.41666666 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 time: 0.5 value: 1 @@ -478,6 +505,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5833333 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 time: 0.6666667 value: 1 @@ -487,42 +523,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.8333333 - 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 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.1666666 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.3333334 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -542,8 +542,26 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.083333336 + value: 0.20983982 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + 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 @@ -560,8 +578,26 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.41666666 + value: 0.20983982 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 time: 0.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5833333 value: 0.20983982 inSlope: 0 outSlope: 0 @@ -578,42 +614,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.8333333 - 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 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.1666666 - value: 0.20983982 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.3333334 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -633,6 +633,15 @@ AnimationClip: weightedMode: 0 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 value: 0 @@ -642,6 +651,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.25 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 time: 0.33333334 value: 0 @@ -651,6 +669,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.41666666 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 time: 0.5 value: 0 @@ -660,6 +687,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5833333 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 time: 0.6666667 value: 0 @@ -669,42 +705,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.8333333 - 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 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.1666666 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.3333334 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -724,6 +724,15 @@ AnimationClip: weightedMode: 0 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 value: 1 @@ -733,6 +742,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.25 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 time: 0.33333334 value: 1 @@ -742,6 +760,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.41666666 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 time: 0.5 value: 1 @@ -751,6 +778,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5833333 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 time: 0.6666667 value: 1 @@ -760,42 +796,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.8333333 - 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 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.1666666 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.3333334 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -806,4 +806,32 @@ AnimationClip: m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 - m_Events: [] + m_Events: + - time: 0.083333336 + functionName: AttackHitEvent + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 + - time: 0.25 + functionName: AttackHitEvent + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 + - time: 0.41666666 + functionName: AttackHitEvent + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 + - time: 0.5833333 + functionName: AttackHitEvent + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 diff --git a/Assets/Animation/Enemy.controller b/Assets/Animation/Enemy.controller index 4f660d5..ee5811f 100644 --- a/Assets/Animation/Enemy.controller +++ b/Assets/Animation/Enemy.controller @@ -59,24 +59,24 @@ AnimatorController: m_Name: Enemy serializedVersion: 5 m_AnimatorParameters: - - m_Name: Attack - m_Type: 4 - m_DefaultFloat: 0 - m_DefaultInt: 0 - m_DefaultBool: 0 - m_Controller: {fileID: 0} - - m_Name: Move - m_Type: 9 - m_DefaultFloat: 0 - m_DefaultInt: 0 - m_DefaultBool: 0 - m_Controller: {fileID: 0} - m_Name: Idle m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} + - m_Name: Move + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: Attack + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -111,7 +111,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 2de3273ed69803c47b3be952aea945f3, type: 2} + m_Motion: {fileID: 7400000, guid: c961d4513f8b52c4f8a105fc45c709bf, type: 2} m_Tag: m_SpeedParameter: m_MirrorParameter: diff --git a/Assets/Animation/IdleAnimation.anim b/Assets/Animation/IdleAnimation.anim index a8235d8..25bd675 100644 --- a/Assets/Animation/IdleAnimation.anim +++ b/Assets/Animation/IdleAnimation.anim @@ -15,60 +15,156 @@ AnimationClip: m_CompressedRotationCurves: [] m_EulerCurves: [] m_PositionCurves: [] - m_ScaleCurves: + m_ScaleCurves: [] + m_FloatCurves: - curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 time: 0 - value: {x: 1, y: 1, z: 1} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 - time: 0.56666666 - value: {x: 0.95, y: 0.95, z: 0.95} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 + time: 2 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 - time: 1 - value: {x: 1, y: 1, z: 1} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 + time: 4 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 1.1666666 - value: {x: 1, y: 1, z: 0.59} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 1.2666667 - value: {x: 1, y: 1, z: 1} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - path: - m_FloatCurves: [] + attribute: material._EmissionColor.r + path: Model + classID: 23 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2 + value: -0.76 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 4 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: material._EmissionColor.g + path: Model + classID: 23 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2 + value: 0.9 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 4 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: material._EmissionColor.b + path: Model + classID: 23 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 4 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: material._EmissionColor.a + path: Model + classID: 23 + script: {fileID: 0} m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 @@ -78,11 +174,32 @@ AnimationClip: m_ClipBindingConstant: genericBindings: - serializedVersion: 2 - path: 0 - attribute: 3 + path: 374627805 + attribute: 1487100290 script: {fileID: 0} - typeID: 4 - customType: 0 + typeID: 23 + customType: 22 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 374627805 + attribute: 1755535746 + script: {fileID: 0} + typeID: 23 + customType: 22 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 374627805 + attribute: 1218664834 + script: {fileID: 0} + typeID: 23 + customType: 22 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 374627805 + attribute: 2023971202 + script: {fileID: 0} + typeID: 23 + customType: 22 isPPtrCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: @@ -90,7 +207,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1.2666667 + m_StopTime: 4 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -111,7 +228,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 1 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -119,8 +236,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.56666666 - value: 0.95 + time: 2 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -128,8 +245,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1 - value: 1 + time: 4 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -139,9 +256,46 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: m_LocalScale.x - path: - classID: 4 + attribute: material._EmissionColor.r + path: Model + classID: 23 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2 + value: -0.76 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 4 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: material._EmissionColor.g + path: Model + classID: 23 script: {fileID: 0} - curve: serializedVersion: 2 @@ -156,8 +310,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.56666666 - value: 0.95 + time: 2 + value: 0.9 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -165,7 +319,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1 + time: 4 value: 1 inSlope: 0 outSlope: 0 @@ -176,9 +330,9 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: m_LocalScale.y - path: - classID: 4 + attribute: material._EmissionColor.b + path: Model + classID: 23 script: {fileID: 0} - curve: serializedVersion: 2 @@ -193,16 +347,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.56666666 - value: 0.95 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 + time: 2 value: 1 inSlope: 0 outSlope: 0 @@ -211,16 +356,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.1666666 - value: 0.59 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.2666667 + time: 4 value: 1 inSlope: 0 outSlope: 0 @@ -231,9 +367,9 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: m_LocalScale.z - path: - classID: 4 + attribute: material._EmissionColor.a + path: Model + classID: 23 script: {fileID: 0} m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 diff --git a/Assets/Animation/IdleAnimation.anim.meta b/Assets/Animation/IdleAnimation.anim.meta index 9d472eb..f92118a 100644 --- a/Assets/Animation/IdleAnimation.anim.meta +++ b/Assets/Animation/IdleAnimation.anim.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2de3273ed69803c47b3be952aea945f3 +guid: c961d4513f8b52c4f8a105fc45c709bf NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 diff --git a/Assets/Enemies/Enemy.prefab b/Assets/Enemies/Enemy.prefab index ed5d234..2664ce2 100644 --- a/Assets/Enemies/Enemy.prefab +++ b/Assets/Enemies/Enemy.prefab @@ -12,6 +12,9 @@ GameObject: - component: {fileID: 3641925206354690580} - component: {fileID: 2032617874441210469} - component: {fileID: 3924901601269037083} + - component: {fileID: 527013406} + - component: {fileID: 527013401} + - component: {fileID: 527013407} m_Layer: 0 m_Name: Enemy m_TagString: Untagged @@ -61,8 +64,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: target: {fileID: 0} - chaseDistance: 15 - stopDistance: 2 + detectRange: 15 + attackRange: 1.5 + isProvoked: 0 --- !u!195 &3924901601269037083 NavMeshAgent: m_ObjectHideFlags: 0 @@ -85,6 +89,54 @@ NavMeshAgent: 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 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1314956764262545219} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dd51d97cd02a30c46a87b8f90059abab, type: 3} + m_Name: + m_EditorClassIdentifier: + _maxHealth: 100 + _health: 0 +--- !u!114 &527013407 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1314956764262545219} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d9ce02b60179d0340bac9f018033afab, type: 3} + m_Name: + m_EditorClassIdentifier: + target: {fileID: 0} + damage: 40 --- !u!1 &8248657945561792745 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Enemies/EnemyAI.cs b/Assets/Enemies/EnemyAI.cs index 59597df..ecfe4b1 100644 --- a/Assets/Enemies/EnemyAI.cs +++ b/Assets/Enemies/EnemyAI.cs @@ -13,6 +13,17 @@ public class EnemyAI : MonoBehaviour private NavMeshAgent navMeshAgent; private Animator _animator; + + public bool IsProvoked + { + get => isProvoked; + set => isProvoked = value; + } + private void Awake() + { + target = FindObjectOfType().transform; + } + void Start() { navMeshAgent = GetComponent(); @@ -41,7 +52,7 @@ public class EnemyAI : MonoBehaviour { AttackTarget(); } - else if(isProvoked) + else if (isProvoked) { FollowTarget(); } @@ -61,7 +72,7 @@ public class EnemyAI : MonoBehaviour private void AttackTarget() { _animator.SetBool("Attack", true); - print("Die Human!"); + //print("Die Human!"); } private void Idle() diff --git a/Assets/Enemies/EnemyAttack.cs b/Assets/Enemies/EnemyAttack.cs new file mode 100644 index 0000000..55cc4e0 --- /dev/null +++ b/Assets/Enemies/EnemyAttack.cs @@ -0,0 +1,25 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class EnemyAttack : MonoBehaviour +{ + [SerializeField] Transform target; + [SerializeField] float damage = 40f; + + private void Awake() + { + target = FindObjectOfType().transform; + } + + private void AttackHitEvent() + { + if (target == null) return; + if(target.GetComponent() != null) + { + Debug.Log($"{transform.name} Hits {target.transform.name}"); + target.GetComponent().ModifyHealth(-damage); + } + } + +} diff --git a/Assets/Enemies/EnemyAttack.cs.meta b/Assets/Enemies/EnemyAttack.cs.meta new file mode 100644 index 0000000..d358679 --- /dev/null +++ b/Assets/Enemies/EnemyAttack.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d9ce02b60179d0340bac9f018033afab +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/PlayerHealth.cs b/Assets/PlayerHealth.cs new file mode 100644 index 0000000..dc23685 --- /dev/null +++ b/Assets/PlayerHealth.cs @@ -0,0 +1,54 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class PlayerHealth : MonoBehaviour, IDamageable +{ + [SerializeField] float _maxHealth; + [SerializeField] float _health; + + private void Awake() + { + SetHealth(_maxHealth); + } + + private void Update() + { + if (_health <= 0) + { + Debug.Log($"{transform.name} Died"); + } + } + + public float GetHealth() + { + return _health; + } + + public float GetHealthFactor() + { + return _health / _maxHealth; + } + + public float GetMaxHealth() + { + return _maxHealth; + } + + public void ModifyHealth(float _healthChange) + { + _health += _healthChange; + } + + public void SetHealth(float newHealth) + { + _health = newHealth; + } + + public void SetMaxHealth(float newHealth) + { + _maxHealth = newHealth; + } + + +} diff --git a/Assets/PlayerHealth.cs.meta b/Assets/PlayerHealth.cs.meta new file mode 100644 index 0000000..363f53a --- /dev/null +++ b/Assets/PlayerHealth.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: cd8f816ece356744ab73c6998c96717b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Sandbox.unity b/Assets/Scenes/Sandbox.unity index 97a7a16..746edbf 100644 --- a/Assets/Scenes/Sandbox.unity +++ b/Assets/Scenes/Sandbox.unity @@ -450,6 +450,120 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2b127815fd0f2074eae3a0c6a4786d0b, type: 3} +--- !u!1001 &326587885 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 641862869} + m_Modifications: + - target: {fileID: 1314956764262545219, guid: 3a896632310e02b468121bf09411f87e, type: 3} + propertyPath: m_Name + value: Enemy (3) + objectReference: {fileID: 0} + - target: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} + propertyPath: m_LocalPosition.x + value: 7.6401224 + objectReference: {fileID: 0} + - target: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} + propertyPath: m_LocalPosition.y + value: -1.5281501 + objectReference: {fileID: 0} + - target: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} + propertyPath: m_LocalPosition.z + value: 23.054966 + objectReference: {fileID: 0} + - target: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} + propertyPath: m_LocalRotation.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 180 + objectReference: {fileID: 0} + - target: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 3a896632310e02b468121bf09411f87e, type: 3} +--- !u!1001 &338363539 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 641862869} + m_Modifications: + - target: {fileID: 1314956764262545219, guid: 3a896632310e02b468121bf09411f87e, type: 3} + propertyPath: m_Name + value: Enemy (5) + objectReference: {fileID: 0} + - target: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} + propertyPath: m_LocalPosition.x + value: 6.420123 + objectReference: {fileID: 0} + - target: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} + propertyPath: m_LocalPosition.y + value: -1.5281501 + objectReference: {fileID: 0} + - target: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} + propertyPath: m_LocalPosition.z + value: -17.025036 + objectReference: {fileID: 0} + - target: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} + propertyPath: m_LocalRotation.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 180 + objectReference: {fileID: 0} + - target: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 3a896632310e02b468121bf09411f87e, type: 3} --- !u!4 &418715333 stripped Transform: m_CorrespondingSourceObject: {fileID: 400000, guid: 2b127815fd0f2074eae3a0c6a4786d0b, type: 3} @@ -531,45 +645,11 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 520203987} m_CullTransparentMesh: 1 ---- !u!1 &527013396 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1314956764262545219, guid: 3a896632310e02b468121bf09411f87e, type: 3} +--- !u!4 &527013405 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} m_PrefabInstance: {fileID: 3924901602849055293} m_PrefabAsset: {fileID: 0} ---- !u!114 &527013401 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 527013396} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dd51d97cd02a30c46a87b8f90059abab, type: 3} - m_Name: - m_EditorClassIdentifier: - _maxHealth: 100 - _health: 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: 527013396} - 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!1001 &529879792 PrefabInstance: m_ObjectHideFlags: 0 @@ -785,6 +865,44 @@ Transform: m_CorrespondingSourceObject: {fileID: 400000, guid: b321aed21e0872743a175d8dbbe12ac8, type: 3} m_PrefabInstance: {fileID: 630789666} m_PrefabAsset: {fileID: 0} +--- !u!1 &641862868 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 641862869} + m_Layer: 0 + m_Name: Enemies + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &641862869 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 641862868} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 14.529878, y: 3.4881501, z: -12.404965} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 527013405} + - {fileID: 1175052922} + - {fileID: 2023513984} + - {fileID: 1502661033} + - {fileID: 1386429977} + - {fileID: 1580631239} + - {fileID: 1818591177} + m_Father: {fileID: 0} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &705507993 GameObject: m_ObjectHideFlags: 0 @@ -945,6 +1063,63 @@ Transform: m_CorrespondingSourceObject: {fileID: 8997996947095583982, guid: c5efc39a8aaf6e64ea40e9ad573e9b47, type: 3} m_PrefabInstance: {fileID: 8204767108263278737} m_PrefabAsset: {fileID: 0} +--- !u!1001 &745340352 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 641862869} + m_Modifications: + - target: {fileID: 1314956764262545219, guid: 3a896632310e02b468121bf09411f87e, type: 3} + propertyPath: m_Name + value: Enemy (1) + objectReference: {fileID: 0} + - target: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} + propertyPath: m_LocalPosition.x + value: 7.6401224 + objectReference: {fileID: 0} + - target: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} + propertyPath: m_LocalPosition.y + value: -1.5281501 + objectReference: {fileID: 0} + - target: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} + propertyPath: m_LocalPosition.z + value: 12.498965 + objectReference: {fileID: 0} + - target: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} + propertyPath: m_LocalRotation.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 180 + objectReference: {fileID: 0} + - target: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 3a896632310e02b468121bf09411f87e, type: 3} --- !u!1001 &747071429 PrefabInstance: m_ObjectHideFlags: 0 @@ -1285,6 +1460,120 @@ Transform: m_CorrespondingSourceObject: {fileID: 400000, guid: 584a8ef4749c89745b7ae07f3ba7617f, type: 3} m_PrefabInstance: {fileID: 945433442} m_PrefabAsset: {fileID: 0} +--- !u!1001 &994016966 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 641862869} + m_Modifications: + - target: {fileID: 1314956764262545219, guid: 3a896632310e02b468121bf09411f87e, type: 3} + propertyPath: m_Name + value: Enemy (4) + objectReference: {fileID: 0} + - target: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} + propertyPath: m_LocalPosition.x + value: -18.159878 + objectReference: {fileID: 0} + - target: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} + propertyPath: m_LocalPosition.y + value: -1.5281501 + objectReference: {fileID: 0} + - target: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} + propertyPath: m_LocalPosition.z + value: -6.8850355 + objectReference: {fileID: 0} + - target: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} + propertyPath: m_LocalRotation.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 180 + objectReference: {fileID: 0} + - target: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 3a896632310e02b468121bf09411f87e, type: 3} +--- !u!1001 &1041868375 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 641862869} + m_Modifications: + - target: {fileID: 1314956764262545219, guid: 3a896632310e02b468121bf09411f87e, type: 3} + propertyPath: m_Name + value: Enemy (6) + objectReference: {fileID: 0} + - target: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} + propertyPath: m_RootOrder + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} + propertyPath: m_LocalPosition.x + value: -19.339878 + objectReference: {fileID: 0} + - target: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} + propertyPath: m_LocalPosition.y + value: -1.5281501 + objectReference: {fileID: 0} + - target: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} + propertyPath: m_LocalPosition.z + value: -16.735035 + objectReference: {fileID: 0} + - target: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} + propertyPath: m_LocalRotation.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 180 + objectReference: {fileID: 0} + - target: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 3a896632310e02b468121bf09411f87e, type: 3} --- !u!1001 &1162621910 PrefabInstance: m_ObjectHideFlags: 0 @@ -1359,6 +1648,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 400000, guid: 584a8ef4749c89745b7ae07f3ba7617f, type: 3} m_PrefabInstance: {fileID: 1162621910} m_PrefabAsset: {fileID: 0} +--- !u!4 &1175052922 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} + m_PrefabInstance: {fileID: 745340352} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1215845398 PrefabInstance: m_ObjectHideFlags: 0 @@ -1490,6 +1784,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 400000, guid: 3681543e5b0f59742b73073cb379cdc6, type: 3} m_PrefabInstance: {fileID: 1300819534} m_PrefabAsset: {fileID: 0} +--- !u!4 &1386429977 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} + m_PrefabInstance: {fileID: 994016966} + m_PrefabAsset: {fileID: 0} --- !u!1 &1411036244 GameObject: m_ObjectHideFlags: 0 @@ -1603,6 +1902,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 400000, guid: d85d3a32fb6157d488e31edf82b7b1c4, type: 3} m_PrefabInstance: {fileID: 1486746696} m_PrefabAsset: {fileID: 0} +--- !u!4 &1502661033 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} + m_PrefabInstance: {fileID: 326587885} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1556481698 PrefabInstance: m_ObjectHideFlags: 0 @@ -1673,11 +1977,73 @@ Transform: m_CorrespondingSourceObject: {fileID: 400000, guid: ab33e6080ae416b4d899f39fa8951b98, type: 3} m_PrefabInstance: {fileID: 1556481698} m_PrefabAsset: {fileID: 0} +--- !u!4 &1580631239 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} + m_PrefabInstance: {fileID: 338363539} + m_PrefabAsset: {fileID: 0} --- !u!4 &1597297138 stripped Transform: m_CorrespondingSourceObject: {fileID: 400000, guid: 2b127815fd0f2074eae3a0c6a4786d0b, type: 3} m_PrefabInstance: {fileID: 252025767} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1613718218 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 641862869} + m_Modifications: + - target: {fileID: 1314956764262545219, guid: 3a896632310e02b468121bf09411f87e, type: 3} + propertyPath: m_Name + value: Enemy (2) + objectReference: {fileID: 0} + - target: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} + propertyPath: m_LocalPosition.x + value: -9.964012 + objectReference: {fileID: 0} + - target: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} + propertyPath: m_LocalPosition.y + value: -1.5281501 + objectReference: {fileID: 0} + - target: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} + propertyPath: m_LocalPosition.z + value: 34.814964 + objectReference: {fileID: 0} + - target: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} + propertyPath: m_LocalRotation.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 180 + objectReference: {fileID: 0} + - target: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 3a896632310e02b468121bf09411f87e, type: 3} --- !u!4 &1639442523 stripped Transform: m_CorrespondingSourceObject: {fileID: 400000, guid: 2b127815fd0f2074eae3a0c6a4786d0b, type: 3} @@ -2186,16 +2552,45 @@ Transform: m_CorrespondingSourceObject: {fileID: 400000, guid: 2b127815fd0f2074eae3a0c6a4786d0b, type: 3} m_PrefabInstance: {fileID: 1800308422} m_PrefabAsset: {fileID: 0} +--- !u!4 &1818591177 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} + m_PrefabInstance: {fileID: 1041868375} + m_PrefabAsset: {fileID: 0} --- !u!4 &1850161069 stripped 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!4 &2023513984 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} + m_PrefabInstance: {fileID: 1613718218} + m_PrefabAsset: {fileID: 0} --- !u!4 &2051410674 stripped Transform: m_CorrespondingSourceObject: {fileID: 400000, guid: 2b127815fd0f2074eae3a0c6a4786d0b, type: 3} @@ -2263,7 +2658,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 641862869} m_Modifications: - target: {fileID: 1314956764262545219, guid: 3a896632310e02b468121bf09411f87e, type: 3} propertyPath: m_Name @@ -2271,19 +2666,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} propertyPath: m_RootOrder - value: 3 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} propertyPath: m_LocalPosition.x - value: 3.344 + value: -11.185878 objectReference: {fileID: 0} - target: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} propertyPath: m_LocalPosition.y - value: 1 + value: -2.4881501 objectReference: {fileID: 0} - target: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} propertyPath: m_LocalPosition.z - value: 0.094 + value: 12.498965 objectReference: {fileID: 0} - target: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} propertyPath: m_LocalRotation.w @@ -2291,7 +2686,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} propertyPath: m_LocalRotation.y @@ -2299,7 +2694,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 1834225747245264377, guid: 3a896632310e02b468121bf09411f87e, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -2317,18 +2712,6 @@ PrefabInstance: propertyPath: target value: objectReference: {fileID: 727849754} - - target: {fileID: 2032617874441210469, guid: 3a896632310e02b468121bf09411f87e, type: 3} - propertyPath: chaseRange - value: 15 - objectReference: {fileID: 0} - - target: {fileID: 2032617874441210469, guid: 3a896632310e02b468121bf09411f87e, type: 3} - propertyPath: attackRange - value: 1.5 - objectReference: {fileID: 0} - - target: {fileID: 8248657945561792745, guid: 3a896632310e02b468121bf09411f87e, type: 3} - propertyPath: m_StaticEditorFlags - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3a896632310e02b468121bf09411f87e, type: 3} --- !u!1001 &4313866246714185760 diff --git a/Assets/Weapons/Weapon.cs b/Assets/Weapons/Weapon.cs index 8ff1d47..7df2d65 100644 --- a/Assets/Weapons/Weapon.cs +++ b/Assets/Weapons/Weapon.cs @@ -20,7 +20,6 @@ public class Weapon : MonoBehaviour public void OnFire() { - print($"{gameObject.name} goes: Boom!"); Shoot(); } @@ -45,7 +44,7 @@ public class Weapon : MonoBehaviour { if (Physics.Raycast(_FpCamera.transform.position, _FpCamera.transform.forward, out RaycastHit hit, _range)) { - print($"{hit.transform.name} was hit!"); + //print($"{hit.transform.name} was hit!"); ImpactAnimation(hit); } else @@ -57,6 +56,11 @@ public class Weapon : MonoBehaviour { hit.transform.GetComponent().ModifyHealth(-_weaponDamage); } + + if(hit.transform.GetComponent()!= null) + { + hit.transform.GetComponent().IsProvoked = true; + } } private void ImpactAnimation(RaycastHit hit)