diff --git a/Assets/Animations/EnemyAnimations/3/v1/Enemy3v1DeathAni.anim b/Assets/Animations/EnemyAnimations/3/v1/Enemy3v1DeathAni.anim index 7f81a7d..ec29935 100644 --- a/Assets/Animations/EnemyAnimations/3/v1/Enemy3v1DeathAni.anim +++ b/Assets/Animations/EnemyAnimations/3/v1/Enemy3v1DeathAni.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 0, z: 0} + value: {x: -1.1, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -29,7 +29,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.23333333 - value: {x: 0, y: 0, z: 0} + value: {x: -1.1, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -90,7 +90,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.33333334 + m_StopTime: 0.41666666 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -112,7 +112,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: -1.1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -121,7 +121,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.23333333 - value: 0 + value: -1.1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -200,7 +200,7 @@ AnimationClip: m_HasGenericRootTransform: 1 m_HasMotionFloatCurves: 0 m_Events: - - time: 0.33333334 + - time: 0.41666666 functionName: DestroyGameobject data: objectReferenceParameter: {fileID: 0} diff --git a/Assets/Animations/EnemyAnimations/3/v1/Enemy3v1StrangleAni.anim b/Assets/Animations/EnemyAnimations/3/v1/Enemy3v1StrangleAni.anim index c482c48..d18adbf 100644 --- a/Assets/Animations/EnemyAnimations/3/v1/Enemy3v1StrangleAni.anim +++ b/Assets/Animations/EnemyAnimations/3/v1/Enemy3v1StrangleAni.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 0, z: 0} + value: {x: -1.1, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -97,7 +97,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: -1.1 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/Animations/EnemyAnimations/3/v2/Enemy3v2DeathAni.anim b/Assets/Animations/EnemyAnimations/3/v2/Enemy3v2DeathAni.anim index 5059793..44142c7 100644 --- a/Assets/Animations/EnemyAnimations/3/v2/Enemy3v2DeathAni.anim +++ b/Assets/Animations/EnemyAnimations/3/v2/Enemy3v2DeathAni.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 0, z: 0} + value: {x: -1.1, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -29,7 +29,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.23333333 - value: {x: 0, y: 0, z: 0} + value: {x: -1.1, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -90,7 +90,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.33333334 + m_StopTime: 0.41666666 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -112,7 +112,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: -1.1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -121,7 +121,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.23333333 - value: 0 + value: -1.1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -200,7 +200,7 @@ AnimationClip: m_HasGenericRootTransform: 1 m_HasMotionFloatCurves: 0 m_Events: - - time: 0.33333334 + - time: 0.41666666 functionName: DestroyGameobject data: objectReferenceParameter: {fileID: 0} diff --git a/Assets/Animations/EnemyAnimations/3/v2/Enemy3v2StrangleAni.anim b/Assets/Animations/EnemyAnimations/3/v2/Enemy3v2StrangleAni.anim index 7d3e35f..dda63fc 100644 --- a/Assets/Animations/EnemyAnimations/3/v2/Enemy3v2StrangleAni.anim +++ b/Assets/Animations/EnemyAnimations/3/v2/Enemy3v2StrangleAni.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 0, z: 0} + value: {x: -1.1, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -97,7 +97,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: -1.1 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/Animations/EnemyAnimations/3/v3/Enemy3v3.controller b/Assets/Animations/EnemyAnimations/3/v3/Enemy3v3.controller index 25cbdaa..3a258f9 100644 --- a/Assets/Animations/EnemyAnimations/3/v3/Enemy3v3.controller +++ b/Assets/Animations/EnemyAnimations/3/v3/Enemy3v3.controller @@ -62,7 +62,7 @@ AnimatorStateTransition: m_Name: m_Conditions: - m_ConditionMode: 1 - m_ConditionEvent: Strangler + m_ConditionEvent: Strangle m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 5001590403131153829} @@ -119,13 +119,13 @@ AnimatorController: m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} - - m_Name: Strangler + m_Controller: {fileID: 0} + - m_Name: Strangle m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer diff --git a/Assets/Animations/EnemyAnimations/3/v3/Enemy3v3DeathAni.anim b/Assets/Animations/EnemyAnimations/3/v3/Enemy3v3DeathAni.anim index 74eb911..d62df83 100644 --- a/Assets/Animations/EnemyAnimations/3/v3/Enemy3v3DeathAni.anim +++ b/Assets/Animations/EnemyAnimations/3/v3/Enemy3v3DeathAni.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 0, z: 0} + value: {x: -1.1, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -29,7 +29,16 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.23333333 - value: {x: 0, y: 0, z: 0} + value: {x: -1.1, y: 0, z: 0} + 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: 0.5 + value: {x: -1.1, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -47,10 +56,10 @@ AnimationClip: curve: - time: 0 value: {fileID: 21300000, guid: 52bfa0c35d09d3d4ea7707eb897af446, type: 3} - - time: 0.11666667 - value: {fileID: 21300000, guid: 5fb5a5ee14104284abd140c8254a3489, type: 3} - time: 0.23333333 value: {fileID: 21300000, guid: 13cac21306a78c94a968940a189e23ef, type: 3} + - time: 0.5 + value: {fileID: 21300000, guid: 13cac21306a78c94a968940a189e23ef, type: 3} attribute: m_Sprite path: classID: 212 @@ -83,14 +92,14 @@ AnimationClip: isSerializeReferenceCurve: 0 pptrCurveMapping: - {fileID: 21300000, guid: 52bfa0c35d09d3d4ea7707eb897af446, type: 3} - - {fileID: 21300000, guid: 5fb5a5ee14104284abd140c8254a3489, type: 3} + - {fileID: 21300000, guid: 13cac21306a78c94a968940a189e23ef, type: 3} - {fileID: 21300000, guid: 13cac21306a78c94a968940a189e23ef, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.33333334 + m_StopTime: 0.51666665 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -112,7 +121,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: -1.1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -121,7 +130,16 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.23333333 - value: 0 + value: -1.1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: -1.1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -158,6 +176,15 @@ AnimationClip: 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 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -188,6 +215,15 @@ AnimationClip: 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 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -200,7 +236,7 @@ AnimationClip: m_HasGenericRootTransform: 1 m_HasMotionFloatCurves: 0 m_Events: - - time: 0.33333334 + - time: 0.5 functionName: DestroyGameobject data: objectReferenceParameter: {fileID: 0} diff --git a/Assets/Animations/EnemyAnimations/3/v3/Enemy3v3StrangleAni.anim b/Assets/Animations/EnemyAnimations/3/v3/Enemy3v3StrangleAni.anim index 38584b2..7f3b12b 100644 --- a/Assets/Animations/EnemyAnimations/3/v3/Enemy3v3StrangleAni.anim +++ b/Assets/Animations/EnemyAnimations/3/v3/Enemy3v3StrangleAni.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 0, z: 0} + value: {x: -1.1, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -97,7 +97,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: -1.1 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/Animations/EnemyAnimations/4/v1/Enemy4v1DeathAni.anim b/Assets/Animations/EnemyAnimations/4/v1/Enemy4v1DeathAni.anim index 959dabf..8f8c49a 100644 --- a/Assets/Animations/EnemyAnimations/4/v1/Enemy4v1DeathAni.anim +++ b/Assets/Animations/EnemyAnimations/4/v1/Enemy4v1DeathAni.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 0, z: 0} + value: {x: -1, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -29,7 +29,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.3 - value: {x: 0, y: 0, z: 0} + value: {x: -1, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -115,7 +115,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: -1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -124,7 +124,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.3 - value: 0 + value: -1 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/Animations/EnemyAnimations/4/v1/Enemy4v1StrangleAni.anim b/Assets/Animations/EnemyAnimations/4/v1/Enemy4v1StrangleAni.anim index c14fb21..515d085 100644 --- a/Assets/Animations/EnemyAnimations/4/v1/Enemy4v1StrangleAni.anim +++ b/Assets/Animations/EnemyAnimations/4/v1/Enemy4v1StrangleAni.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 0, z: 0} + value: {x: -1, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -97,7 +97,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: -1 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/Animations/EnemyAnimations/4/v2/Enemy4v2DeathAni.anim b/Assets/Animations/EnemyAnimations/4/v2/Enemy4v2DeathAni.anim index 26c6de6..fdad478 100644 --- a/Assets/Animations/EnemyAnimations/4/v2/Enemy4v2DeathAni.anim +++ b/Assets/Animations/EnemyAnimations/4/v2/Enemy4v2DeathAni.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 0, z: 0} + value: {x: -1, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -29,7 +29,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.3 - value: {x: 0, y: 0, z: 0} + value: {x: -1, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -115,7 +115,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: -1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -124,7 +124,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.3 - value: 0 + value: -1 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/Animations/EnemyAnimations/4/v2/Enemy4v2StrangleAni.anim b/Assets/Animations/EnemyAnimations/4/v2/Enemy4v2StrangleAni.anim index 60a7bc5..23b9246 100644 --- a/Assets/Animations/EnemyAnimations/4/v2/Enemy4v2StrangleAni.anim +++ b/Assets/Animations/EnemyAnimations/4/v2/Enemy4v2StrangleAni.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 0, z: 0} + value: {x: -1, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -97,7 +97,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: -1 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/Animations/EnemyAnimations/4/v3/Enemy4v3DeathAni.anim b/Assets/Animations/EnemyAnimations/4/v3/Enemy4v3DeathAni.anim index f132b2f..9148c4a 100644 --- a/Assets/Animations/EnemyAnimations/4/v3/Enemy4v3DeathAni.anim +++ b/Assets/Animations/EnemyAnimations/4/v3/Enemy4v3DeathAni.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 0, z: 0} + value: {x: -1, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -29,7 +29,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.3 - value: {x: 0, y: 0, z: 0} + value: {x: -1, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -115,7 +115,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: -1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -124,7 +124,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.3 - value: 0 + value: -1 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/Animations/EnemyAnimations/4/v3/Enemy4v3StrangleAni.anim b/Assets/Animations/EnemyAnimations/4/v3/Enemy4v3StrangleAni.anim index 030646a..24e7063 100644 --- a/Assets/Animations/EnemyAnimations/4/v3/Enemy4v3StrangleAni.anim +++ b/Assets/Animations/EnemyAnimations/4/v3/Enemy4v3StrangleAni.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 0, z: 0} + value: {x: -1, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -97,7 +97,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: -1 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/Animations/EnemyAnimations/5/v1/Enemy5v1DeathAni.anim b/Assets/Animations/EnemyAnimations/5/v1/Enemy5v1DeathAni.anim index 0e07d59..33bf013 100644 --- a/Assets/Animations/EnemyAnimations/5/v1/Enemy5v1DeathAni.anim +++ b/Assets/Animations/EnemyAnimations/5/v1/Enemy5v1DeathAni.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 0, z: 0} + value: {x: -2.2, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -29,7 +29,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.3 - value: {x: 0, y: 0, z: 0} + value: {x: -2.2, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -115,7 +115,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: -2.2 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -124,7 +124,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.3 - value: 0 + value: -2.2 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/Animations/EnemyAnimations/5/v1/Enemy5v1StrangleAni.anim b/Assets/Animations/EnemyAnimations/5/v1/Enemy5v1StrangleAni.anim index 1dc3c6e..9545b70 100644 --- a/Assets/Animations/EnemyAnimations/5/v1/Enemy5v1StrangleAni.anim +++ b/Assets/Animations/EnemyAnimations/5/v1/Enemy5v1StrangleAni.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 0, z: 0} + value: {x: -2.2, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -97,7 +97,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: -2.2 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/Animations/EnemyAnimations/5/v2/Enemy5v2DeathAni.anim b/Assets/Animations/EnemyAnimations/5/v2/Enemy5v2DeathAni.anim index 461b078..191acf3 100644 --- a/Assets/Animations/EnemyAnimations/5/v2/Enemy5v2DeathAni.anim +++ b/Assets/Animations/EnemyAnimations/5/v2/Enemy5v2DeathAni.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 0, z: 0} + value: {x: -2.2, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -29,7 +29,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.3 - value: {x: 0, y: 0, z: 0} + value: {x: -2.2, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -115,7 +115,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: -2.2 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -124,7 +124,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.3 - value: 0 + value: -2.2 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/Animations/EnemyAnimations/5/v2/Enemy5v2StrangleAni.anim b/Assets/Animations/EnemyAnimations/5/v2/Enemy5v2StrangleAni.anim index 99beca8..20b5cd7 100644 --- a/Assets/Animations/EnemyAnimations/5/v2/Enemy5v2StrangleAni.anim +++ b/Assets/Animations/EnemyAnimations/5/v2/Enemy5v2StrangleAni.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 0, z: 0} + value: {x: -2.2, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -97,7 +97,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: -2.2 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/Animations/EnemyAnimations/5/v3/Enemy5v3DeathAni.anim b/Assets/Animations/EnemyAnimations/5/v3/Enemy5v3DeathAni.anim index 8226c21..bc72e18 100644 --- a/Assets/Animations/EnemyAnimations/5/v3/Enemy5v3DeathAni.anim +++ b/Assets/Animations/EnemyAnimations/5/v3/Enemy5v3DeathAni.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 0, z: 0} + value: {x: -2.2, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -29,7 +29,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.3 - value: {x: 0, y: 0, z: 0} + value: {x: -2.2, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -115,7 +115,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: -2.2 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -124,7 +124,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.3 - value: 0 + value: -2.2 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/Animations/EnemyAnimations/5/v3/Enemy5v3StrangleAni.anim b/Assets/Animations/EnemyAnimations/5/v3/Enemy5v3StrangleAni.anim index 5968a8d..deeef10 100644 --- a/Assets/Animations/EnemyAnimations/5/v3/Enemy5v3StrangleAni.anim +++ b/Assets/Animations/EnemyAnimations/5/v3/Enemy5v3StrangleAni.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 0, z: 0} + value: {x: -2.2, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -97,7 +97,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: -2.2 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/Resources/Enemies/3/Enemy3V1.prefab b/Assets/Resources/Enemies/3/Enemy3V1.prefab index f6cdd25..22ccf04 100644 --- a/Assets/Resources/Enemies/3/Enemy3V1.prefab +++ b/Assets/Resources/Enemies/3/Enemy3V1.prefab @@ -119,6 +119,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9fa05ebd2f063df4a8079e013369f78b, type: 3} m_Name: m_EditorClassIdentifier: + healthBar: {fileID: 0} --- !u!1 &6905705041633878913 GameObject: m_ObjectHideFlags: 0 @@ -129,7 +130,6 @@ GameObject: m_Component: - component: {fileID: 3920219362688286786} - component: {fileID: 2938081276856164938} - - component: {fileID: 944314729512195366} - component: {fileID: 8373694659570615877} - component: {fileID: -1793628155013383594} - component: {fileID: 5601190281078907372} @@ -160,29 +160,6 @@ Transform: m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2938081276856164938 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6905705041633878913} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1fdfc885f1a69704b893825cf9e616ba, type: 3} - m_Name: - m_EditorClassIdentifier: - onlyCallZeroHealthOnce: 1 - maxHealth: 100 - damageTickDelay: 0.25 - OnHealthZero: - m_PersistentCalls: - m_Calls: [] - OnHealthChange: - m_PersistentCalls: - m_Calls: [] - minThreshold: 1 - squezeDamageScalor: 1 ---- !u!114 &944314729512195366 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} diff --git a/Assets/Scenes/GameScene 1.unity b/Assets/Scenes/GameScene 1.unity index 2d71770..32c06e1 100644 --- a/Assets/Scenes/GameScene 1.unity +++ b/Assets/Scenes/GameScene 1.unity @@ -123,63 +123,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1001 &29432006 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 3920219362688286786, guid: 23e5e0951502e6d49bc400d919073d4b, type: 3} - propertyPath: m_LocalPosition.x - value: -11.734728 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 23e5e0951502e6d49bc400d919073d4b, type: 3} - propertyPath: m_LocalPosition.y - value: 19.568419 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 23e5e0951502e6d49bc400d919073d4b, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 23e5e0951502e6d49bc400d919073d4b, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 23e5e0951502e6d49bc400d919073d4b, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 23e5e0951502e6d49bc400d919073d4b, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 23e5e0951502e6d49bc400d919073d4b, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 23e5e0951502e6d49bc400d919073d4b, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 23e5e0951502e6d49bc400d919073d4b, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 23e5e0951502e6d49bc400d919073d4b, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6905705041633878913, guid: 23e5e0951502e6d49bc400d919073d4b, type: 3} - propertyPath: m_Name - value: Enemy3V3 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 23e5e0951502e6d49bc400d919073d4b, type: 3} --- !u!1001 &45309643 PrefabInstance: m_ObjectHideFlags: 0 @@ -190,11 +133,11 @@ PrefabInstance: m_Modifications: - target: {fileID: 3920219362688286786, guid: 8def55d0ae3630644b661b55945b88ab, type: 3} propertyPath: m_LocalPosition.x - value: 15.233719 + value: -8.12 objectReference: {fileID: 0} - target: {fileID: 3920219362688286786, guid: 8def55d0ae3630644b661b55945b88ab, type: 3} propertyPath: m_LocalPosition.y - value: 16.981707 + value: -23.96 objectReference: {fileID: 0} - target: {fileID: 3920219362688286786, guid: 8def55d0ae3630644b661b55945b88ab, type: 3} propertyPath: m_LocalPosition.z @@ -360,63 +303,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &288328697 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 3920219362688286786, guid: 8994050caaa5f2c45b56e985a0d0448a, type: 3} - propertyPath: m_LocalPosition.x - value: -12.740581 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 8994050caaa5f2c45b56e985a0d0448a, type: 3} - propertyPath: m_LocalPosition.y - value: -29.43488 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 8994050caaa5f2c45b56e985a0d0448a, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 8994050caaa5f2c45b56e985a0d0448a, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 8994050caaa5f2c45b56e985a0d0448a, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 8994050caaa5f2c45b56e985a0d0448a, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 8994050caaa5f2c45b56e985a0d0448a, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 8994050caaa5f2c45b56e985a0d0448a, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 8994050caaa5f2c45b56e985a0d0448a, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 8994050caaa5f2c45b56e985a0d0448a, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6905705041633878913, guid: 8994050caaa5f2c45b56e985a0d0448a, type: 3} - propertyPath: m_Name - value: Enemy1V1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 8994050caaa5f2c45b56e985a0d0448a, type: 3} --- !u!1 &362707003 GameObject: m_ObjectHideFlags: 0 @@ -619,63 +505,6 @@ Transform: - {fileID: 147729522} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &579830309 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 3920219362688286786, guid: 29618f067a17cd94eb329fa634e06f5a, type: 3} - propertyPath: m_LocalPosition.x - value: -17.530842 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 29618f067a17cd94eb329fa634e06f5a, type: 3} - propertyPath: m_LocalPosition.y - value: 36.57346 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 29618f067a17cd94eb329fa634e06f5a, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 29618f067a17cd94eb329fa634e06f5a, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 29618f067a17cd94eb329fa634e06f5a, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 29618f067a17cd94eb329fa634e06f5a, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 29618f067a17cd94eb329fa634e06f5a, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 29618f067a17cd94eb329fa634e06f5a, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 29618f067a17cd94eb329fa634e06f5a, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 29618f067a17cd94eb329fa634e06f5a, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6905705041633878913, guid: 29618f067a17cd94eb329fa634e06f5a, type: 3} - propertyPath: m_Name - value: Enemy4V2 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 29618f067a17cd94eb329fa634e06f5a, type: 3} --- !u!1001 &680467646 PrefabInstance: m_ObjectHideFlags: 0 @@ -733,120 +562,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: af739fea850caf944ac8c1932d2ec386, type: 3} ---- !u!1001 &694992243 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 3920219362688286786, guid: 0dc1cd5eb961eb049b13867a3bff4396, type: 3} - propertyPath: m_LocalPosition.x - value: -16.86022 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 0dc1cd5eb961eb049b13867a3bff4396, type: 3} - propertyPath: m_LocalPosition.y - value: 27.903278 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 0dc1cd5eb961eb049b13867a3bff4396, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 0dc1cd5eb961eb049b13867a3bff4396, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 0dc1cd5eb961eb049b13867a3bff4396, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 0dc1cd5eb961eb049b13867a3bff4396, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 0dc1cd5eb961eb049b13867a3bff4396, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 0dc1cd5eb961eb049b13867a3bff4396, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 0dc1cd5eb961eb049b13867a3bff4396, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 0dc1cd5eb961eb049b13867a3bff4396, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6905705041633878913, guid: 0dc1cd5eb961eb049b13867a3bff4396, type: 3} - propertyPath: m_Name - value: Enemy4V1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 0dc1cd5eb961eb049b13867a3bff4396, type: 3} ---- !u!1001 &764029194 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 3920219362688286786, guid: 363f3bb5d515d994ea8bfb37232263b0, type: 3} - propertyPath: m_LocalPosition.x - value: -11.44732 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 363f3bb5d515d994ea8bfb37232263b0, type: 3} - propertyPath: m_LocalPosition.y - value: 13.437017 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 363f3bb5d515d994ea8bfb37232263b0, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 363f3bb5d515d994ea8bfb37232263b0, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 363f3bb5d515d994ea8bfb37232263b0, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 363f3bb5d515d994ea8bfb37232263b0, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 363f3bb5d515d994ea8bfb37232263b0, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 363f3bb5d515d994ea8bfb37232263b0, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 363f3bb5d515d994ea8bfb37232263b0, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 363f3bb5d515d994ea8bfb37232263b0, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6905705041633878913, guid: 363f3bb5d515d994ea8bfb37232263b0, type: 3} - propertyPath: m_Name - value: Enemy3V2 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 363f3bb5d515d994ea8bfb37232263b0, type: 3} --- !u!1001 &869964773 PrefabInstance: m_ObjectHideFlags: 0 @@ -934,120 +649,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4aabce12c1341ff488ee4dc806fd80e8, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1001 &906992645 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 3920219362688286786, guid: f48e8133073214446b0889b26d867b03, type: 3} - propertyPath: m_LocalPosition.x - value: -11.782581 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: f48e8133073214446b0889b26d867b03, type: 3} - propertyPath: m_LocalPosition.y - value: -3.8075562 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: f48e8133073214446b0889b26d867b03, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: f48e8133073214446b0889b26d867b03, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: f48e8133073214446b0889b26d867b03, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: f48e8133073214446b0889b26d867b03, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: f48e8133073214446b0889b26d867b03, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: f48e8133073214446b0889b26d867b03, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: f48e8133073214446b0889b26d867b03, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: f48e8133073214446b0889b26d867b03, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6905705041633878913, guid: f48e8133073214446b0889b26d867b03, type: 3} - propertyPath: m_Name - value: Enemy2V2 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: f48e8133073214446b0889b26d867b03, type: 3} ---- !u!1001 &986896050 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 3920219362688286786, guid: 8e3efe9ba9a961e4883e6d4b3bede1b3, type: 3} - propertyPath: m_LocalPosition.x - value: -17.291334 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 8e3efe9ba9a961e4883e6d4b3bede1b3, type: 3} - propertyPath: m_LocalPosition.y - value: 42.944366 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 8e3efe9ba9a961e4883e6d4b3bede1b3, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 8e3efe9ba9a961e4883e6d4b3bede1b3, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 8e3efe9ba9a961e4883e6d4b3bede1b3, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 8e3efe9ba9a961e4883e6d4b3bede1b3, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 8e3efe9ba9a961e4883e6d4b3bede1b3, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 8e3efe9ba9a961e4883e6d4b3bede1b3, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 8e3efe9ba9a961e4883e6d4b3bede1b3, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 8e3efe9ba9a961e4883e6d4b3bede1b3, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6905705041633878913, guid: 8e3efe9ba9a961e4883e6d4b3bede1b3, type: 3} - propertyPath: m_Name - value: Enemy4V3 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 8e3efe9ba9a961e4883e6d4b3bede1b3, type: 3} --- !u!1001 &1022813124 PrefabInstance: m_ObjectHideFlags: 0 @@ -1058,11 +659,11 @@ PrefabInstance: m_Modifications: - target: {fileID: 3920219362688286786, guid: fa674b5c4ab900d439c6188142bfd1b5, type: 3} propertyPath: m_LocalPosition.x - value: 13.748831 + value: -12.22 objectReference: {fileID: 0} - target: {fileID: 3920219362688286786, guid: fa674b5c4ab900d439c6188142bfd1b5, type: 3} propertyPath: m_LocalPosition.y - value: 39.303852 + value: -13.29 objectReference: {fileID: 0} - target: {fileID: 3920219362688286786, guid: fa674b5c4ab900d439c6188142bfd1b5, type: 3} propertyPath: m_LocalPosition.z @@ -1105,63 +706,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fa674b5c4ab900d439c6188142bfd1b5, type: 3} ---- !u!1001 &1065460763 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 3920219362688286786, guid: 8c660e9fc6ef07843a373f99149d1849, type: 3} - propertyPath: m_LocalPosition.x - value: -11.734695 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 8c660e9fc6ef07843a373f99149d1849, type: 3} - propertyPath: m_LocalPosition.y - value: 2.0364237 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 8c660e9fc6ef07843a373f99149d1849, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 8c660e9fc6ef07843a373f99149d1849, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 8c660e9fc6ef07843a373f99149d1849, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 8c660e9fc6ef07843a373f99149d1849, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 8c660e9fc6ef07843a373f99149d1849, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 8c660e9fc6ef07843a373f99149d1849, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 8c660e9fc6ef07843a373f99149d1849, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 8c660e9fc6ef07843a373f99149d1849, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6905705041633878913, guid: 8c660e9fc6ef07843a373f99149d1849, type: 3} - propertyPath: m_Name - value: Enemy2V3 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 8c660e9fc6ef07843a373f99149d1849, type: 3} --- !u!1001 &1125101199 PrefabInstance: m_ObjectHideFlags: 0 @@ -1368,63 +912,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4aabce12c1341ff488ee4dc806fd80e8, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1001 &1244733879 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 3920219362688286786, guid: f808ad67f6a747241a310437e433c828, type: 3} - propertyPath: m_LocalPosition.x - value: -11.399368 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: f808ad67f6a747241a310437e433c828, type: 3} - propertyPath: m_LocalPosition.y - value: -9.795253 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: f808ad67f6a747241a310437e433c828, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: f808ad67f6a747241a310437e433c828, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: f808ad67f6a747241a310437e433c828, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: f808ad67f6a747241a310437e433c828, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: f808ad67f6a747241a310437e433c828, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: f808ad67f6a747241a310437e433c828, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: f808ad67f6a747241a310437e433c828, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: f808ad67f6a747241a310437e433c828, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6905705041633878913, guid: f808ad67f6a747241a310437e433c828, type: 3} - propertyPath: m_Name - value: Enemy2V1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: f808ad67f6a747241a310437e433c828, type: 3} --- !u!1 &1377274208 GameObject: m_ObjectHideFlags: 0 @@ -1583,63 +1070,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ad94da4dcc3c6204494b1b223e3ad6bd, type: 3} ---- !u!1001 &1535826745 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 3920219362688286786, guid: ee739a33f1762c142bc1ef49e6e95fa4, type: 3} - propertyPath: m_LocalPosition.x - value: -12.501073 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: ee739a33f1762c142bc1ef49e6e95fa4, type: 3} - propertyPath: m_LocalPosition.y - value: -23.68669 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: ee739a33f1762c142bc1ef49e6e95fa4, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: ee739a33f1762c142bc1ef49e6e95fa4, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: ee739a33f1762c142bc1ef49e6e95fa4, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: ee739a33f1762c142bc1ef49e6e95fa4, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: ee739a33f1762c142bc1ef49e6e95fa4, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: ee739a33f1762c142bc1ef49e6e95fa4, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: ee739a33f1762c142bc1ef49e6e95fa4, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: ee739a33f1762c142bc1ef49e6e95fa4, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6905705041633878913, guid: ee739a33f1762c142bc1ef49e6e95fa4, type: 3} - propertyPath: m_Name - value: Enemy1V2 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: ee739a33f1762c142bc1ef49e6e95fa4, type: 3} --- !u!1 &1600052931 GameObject: m_ObjectHideFlags: 0 @@ -1708,63 +1138,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &1771641709 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 3920219362688286786, guid: cd2055c0dcd26e4448309266b8c6f03e, type: 3} - propertyPath: m_LocalPosition.x - value: -11.590942 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: cd2055c0dcd26e4448309266b8c6f03e, type: 3} - propertyPath: m_LocalPosition.y - value: -15.687125 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: cd2055c0dcd26e4448309266b8c6f03e, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: cd2055c0dcd26e4448309266b8c6f03e, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: cd2055c0dcd26e4448309266b8c6f03e, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: cd2055c0dcd26e4448309266b8c6f03e, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: cd2055c0dcd26e4448309266b8c6f03e, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: cd2055c0dcd26e4448309266b8c6f03e, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: cd2055c0dcd26e4448309266b8c6f03e, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: cd2055c0dcd26e4448309266b8c6f03e, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6905705041633878913, guid: cd2055c0dcd26e4448309266b8c6f03e, type: 3} - propertyPath: m_Name - value: Enemy1V3 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: cd2055c0dcd26e4448309266b8c6f03e, type: 3} --- !u!1001 &1785224621 PrefabInstance: m_ObjectHideFlags: 0 @@ -1775,11 +1148,11 @@ PrefabInstance: m_Modifications: - target: {fileID: 3920219362688286786, guid: cc70504ee89b0b74fac0167fd3c76bdd, type: 3} propertyPath: m_LocalPosition.x - value: 14.515253 + value: -16.96 objectReference: {fileID: 0} - target: {fileID: 3920219362688286786, guid: cc70504ee89b0b74fac0167fd3c76bdd, type: 3} propertyPath: m_LocalPosition.y - value: 25.939312 + value: -23.76 objectReference: {fileID: 0} - target: {fileID: 3920219362688286786, guid: cc70504ee89b0b74fac0167fd3c76bdd, type: 3} propertyPath: m_LocalPosition.z @@ -1991,63 +1364,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &1942620212 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 3920219362688286786, guid: 40512b69b08d56d498aa78823087362c, type: 3} - propertyPath: m_LocalPosition.x - value: -11.734695 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 40512b69b08d56d498aa78823087362c, type: 3} - propertyPath: m_LocalPosition.y - value: 7.68881 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 40512b69b08d56d498aa78823087362c, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 40512b69b08d56d498aa78823087362c, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 40512b69b08d56d498aa78823087362c, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 40512b69b08d56d498aa78823087362c, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 40512b69b08d56d498aa78823087362c, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 40512b69b08d56d498aa78823087362c, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 40512b69b08d56d498aa78823087362c, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 40512b69b08d56d498aa78823087362c, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6905705041633878913, guid: 40512b69b08d56d498aa78823087362c, type: 3} - propertyPath: m_Name - value: Enemy3V1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 40512b69b08d56d498aa78823087362c, type: 3} --- !u!4 &2041669625 stripped Transform: m_CorrespondingSourceObject: {fileID: 6564855475370468539, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3} @@ -2123,18 +1439,6 @@ SceneRoots: - {fileID: 869964773} - {fileID: 483723115} - {fileID: 1920006249} - - {fileID: 288328697} - - {fileID: 1535826745} - - {fileID: 1771641709} - - {fileID: 1244733879} - - {fileID: 906992645} - - {fileID: 1065460763} - - {fileID: 1942620212} - - {fileID: 764029194} - - {fileID: 29432006} - - {fileID: 694992243} - - {fileID: 579830309} - - {fileID: 986896050} - {fileID: 1785224621} - {fileID: 1022813124} - {fileID: 45309643} diff --git a/Assets/Scripts/Enemy/EnemyAnimationHandler.cs b/Assets/Scripts/Enemy/EnemyAnimationHandler.cs index 3c902f3..647479f 100644 --- a/Assets/Scripts/Enemy/EnemyAnimationHandler.cs +++ b/Assets/Scripts/Enemy/EnemyAnimationHandler.cs @@ -7,6 +7,8 @@ public class EnemyAnimationHandler : MonoBehaviour { Animator animator; bool isDying = false; + + public GameObject healthBar; void Start() { animator = GetComponent(); @@ -17,8 +19,9 @@ public class EnemyAnimationHandler : MonoBehaviour } void EnemyDie() { - //GetComponent().enabled = false; - //GetComponent().enabled = false; + GetComponentInParent().enabled = false; + GetComponentInParent().enabled = false; + if (!isDying) StartCoroutine(AnimationDie()); isDying = true; diff --git a/Assets/Scripts/Misc/HealthBar.cs b/Assets/Scripts/Misc/HealthBar.cs index be05978..8a1a18f 100644 --- a/Assets/Scripts/Misc/HealthBar.cs +++ b/Assets/Scripts/Misc/HealthBar.cs @@ -14,17 +14,27 @@ public class HealthBar : MonoBehaviour private void OnEnable() { - attachedHealth.OnHealthChange.AddListener(UpdateHealthBar); + if (healthBarImg != null) + attachedHealth.OnHealthChange.AddListener(UpdateHealthBar); } private void OnDisable() { - attachedHealth.OnHealthChange.RemoveListener(UpdateHealthBar); + if (healthBarImg != null) + attachedHealth.OnHealthChange.RemoveListener(UpdateHealthBar); } private void UpdateHealthBar(float prevHealth, float newHealth) { float percent = newHealth / attachedHealth.getMaxHealth(); healthBarImg.fillAmount = percent; + if (percent <= 0) + { + for (int i = 0; i < transform.childCount; i++) + { + transform.GetChild(i).gameObject.SetActive(false); + + } + } } } diff --git a/Assets/Scripts/Player/HealthComponent.cs b/Assets/Scripts/Player/HealthComponent.cs index dc4b7bb..25aedc0 100644 --- a/Assets/Scripts/Player/HealthComponent.cs +++ b/Assets/Scripts/Player/HealthComponent.cs @@ -74,10 +74,13 @@ public class HealthComponent : MonoBehaviour, ISquezeDamageReceiver OnHealthZero?.Invoke(); - int blood = (int)(maxHealth * 100.0f * BloodComputeShader.Instance.scoreMult); + if (BloodComputeShader.Instance != null) + { + int blood = (int)(maxHealth * 100.0f * BloodComputeShader.Instance.scoreMult); - BloodComputeShader.Instance.createBlood(transform.position, blood/2, maxHealth / 8.0f); - BloodComputeShader.Instance.createBlood(transform.position, blood / 2, maxHealth / 8.0f); + BloodComputeShader.Instance.createBlood(transform.position, blood / 2, maxHealth / 8.0f); + BloodComputeShader.Instance.createBlood(transform.position, blood / 2, maxHealth / 8.0f); + } } }