diff --git a/Assets/Enemies/Bringer of Death.meta b/Assets/Enemies/Bringer of Death.meta new file mode 100644 index 0000000..cadb5d6 --- /dev/null +++ b/Assets/Enemies/Bringer of Death.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ab76c0d7b2586154bb31f80ca9b7108a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Enemies/Bringer of Death/Animations.meta b/Assets/Enemies/Bringer of Death/Animations.meta new file mode 100644 index 0000000..9e25b94 --- /dev/null +++ b/Assets/Enemies/Bringer of Death/Animations.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3e2d5b7d40f5ed84f99ae85d0c318e47 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Enemies/Bringer of Death/Animations/Bringer-of-Death.anim b/Assets/Enemies/Bringer of Death/Animations/Bringer-of-Death.anim new file mode 100644 index 0000000..baa4a97 --- /dev/null +++ b/Assets/Enemies/Bringer of Death/Animations/Bringer-of-Death.anim @@ -0,0 +1,93 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Bringer-of-Death + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: 1967737662, guid: 13be54b0410f3e742955baac3b4c684a, type: 3} + - time: 0.083333336 + value: {fileID: 1229344958, guid: 13be54b0410f3e742955baac3b4c684a, type: 3} + - time: 0.16666667 + value: {fileID: -1106222991, guid: 13be54b0410f3e742955baac3b4c684a, type: 3} + - time: 0.25 + value: {fileID: -1206517152, guid: 13be54b0410f3e742955baac3b4c684a, type: 3} + - time: 0.33333334 + value: {fileID: 445162961, guid: 13be54b0410f3e742955baac3b4c684a, type: 3} + - time: 0.41666666 + value: {fileID: 1986018114, guid: 13be54b0410f3e742955baac3b4c684a, type: 3} + - time: 0.5 + value: {fileID: -2119495938, guid: 13be54b0410f3e742955baac3b4c684a, type: 3} + - time: 0.5833333 + value: {fileID: -363162516, guid: 13be54b0410f3e742955baac3b4c684a, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 12 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: 1967737662, guid: 13be54b0410f3e742955baac3b4c684a, type: 3} + - {fileID: 1229344958, guid: 13be54b0410f3e742955baac3b4c684a, type: 3} + - {fileID: -1106222991, guid: 13be54b0410f3e742955baac3b4c684a, type: 3} + - {fileID: -1206517152, guid: 13be54b0410f3e742955baac3b4c684a, type: 3} + - {fileID: 445162961, guid: 13be54b0410f3e742955baac3b4c684a, type: 3} + - {fileID: 1986018114, guid: 13be54b0410f3e742955baac3b4c684a, type: 3} + - {fileID: -2119495938, guid: 13be54b0410f3e742955baac3b4c684a, type: 3} + - {fileID: -363162516, guid: 13be54b0410f3e742955baac3b4c684a, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.6666666 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Enemies/Bringer of Death/Animations/Bringer-of-Death.anim.meta b/Assets/Enemies/Bringer of Death/Animations/Bringer-of-Death.anim.meta new file mode 100644 index 0000000..fb8d16e --- /dev/null +++ b/Assets/Enemies/Bringer of Death/Animations/Bringer-of-Death.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: dc2b8ebd13de25f4f90e9402f169c033 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Enemies/Bringer of Death/Animations/Bringer-of-Death.controller b/Assets/Enemies/Bringer of Death/Animations/Bringer-of-Death.controller new file mode 100644 index 0000000..a0d84d0 --- /dev/null +++ b/Assets/Enemies/Bringer of Death/Animations/Bringer-of-Death.controller @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-8549113792424202924 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Walk + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: dc2b8ebd13de25f4f90e9402f169c033, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Bringer-of-Death + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 8819327164860808556} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1107 &8819327164860808556 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -8549113792424202924} + m_Position: {x: 200, y: 0, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -8549113792424202924} diff --git a/Assets/Enemies/Bringer of Death/Animations/Bringer-of-Death.controller.meta b/Assets/Enemies/Bringer of Death/Animations/Bringer-of-Death.controller.meta new file mode 100644 index 0000000..ad411eb --- /dev/null +++ b/Assets/Enemies/Bringer of Death/Animations/Bringer-of-Death.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 42ef1eb51f6a2f742ad198ddeb23b9ce +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Enemies/Bringer of Death/Bringer of Death.prefab b/Assets/Enemies/Bringer of Death/Bringer of Death.prefab new file mode 100644 index 0000000..8e39ab6 --- /dev/null +++ b/Assets/Enemies/Bringer of Death/Bringer of Death.prefab @@ -0,0 +1,198 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1631754574535955224 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5427576707885550893} + - component: {fileID: 8909895565407144072} + - component: {fileID: 2916816715798730882} + - component: {fileID: 9101480691276938712} + - component: {fileID: 3885645976916376282} + - component: {fileID: 2411932740123829751} + m_Layer: 6 + m_Name: Bringer of Death + m_TagString: Ennemy + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5427576707885550893 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1631754574535955224} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &8909895565407144072 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1631754574535955224} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 1967737662, guid: 13be54b0410f3e742955baac3b4c684a, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1.35, y: 1.35} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!95 &2916816715798730882 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1631754574535955224} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 42ef1eb51f6a2f742ad198ddeb23b9ce, 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_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!50 &9101480691276938712 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1631754574535955224} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 0 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 104 + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 4 +--- !u!61 &3885645976916376282 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1631754574535955224} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1.35, y: 1.35} + newSize: {x: 1.35, y: 1.35} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1.35, y: 1.35} + m_EdgeRadius: 0 +--- !u!114 &2411932740123829751 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1631754574535955224} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4b3c6920a262c94696eed7deeec570f, type: 3} + m_Name: + m_EditorClassIdentifier: + Speed: 1 + Damages: 100 + Life: 1000 diff --git a/Assets/Enemies/Bringer of Death/Bringer of Death.prefab.meta b/Assets/Enemies/Bringer of Death/Bringer of Death.prefab.meta new file mode 100644 index 0000000..b6bd552 --- /dev/null +++ b/Assets/Enemies/Bringer of Death/Bringer of Death.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 7339e2869a0a9d241b10f5d0a658ff4d +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Enemies/Bringer of Death/Sprites.meta b/Assets/Enemies/Bringer of Death/Sprites.meta new file mode 100644 index 0000000..85772eb --- /dev/null +++ b/Assets/Enemies/Bringer of Death/Sprites.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a3954958a2211bc418ad789b765fd9ba +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Enemies/Bringer of Death/Sprites/Bringer-of-Death.png b/Assets/Enemies/Bringer of Death/Sprites/Bringer-of-Death.png new file mode 100644 index 0000000..fed1cd6 Binary files /dev/null and b/Assets/Enemies/Bringer of Death/Sprites/Bringer-of-Death.png differ diff --git a/Assets/Enemies/Bringer of Death/Sprites/Bringer-of-Death.png.meta b/Assets/Enemies/Bringer of Death/Sprites/Bringer-of-Death.png.meta new file mode 100644 index 0000000..916145c --- /dev/null +++ b/Assets/Enemies/Bringer of Death/Sprites/Bringer-of-Death.png.meta @@ -0,0 +1,303 @@ +fileFormatVersion: 2 +guid: 13be54b0410f3e742955baac3b4c684a +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 40 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: Bringer-of-Death_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 54 + height: 54 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: a2573af2776373f4dbc398e024dfb60b + internalID: 1967737662 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Bringer-of-Death_1 + rect: + serializedVersion: 2 + x: 140 + y: 0 + width: 56 + height: 52 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: e74f3e4d752055942a87bee0de70a8f5 + internalID: 1229344958 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Bringer-of-Death_2 + rect: + serializedVersion: 2 + x: 279 + y: 0 + width: 56 + height: 54 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 34e539a888f84c649943009a30aaa472 + internalID: -1106222991 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Bringer-of-Death_3 + rect: + serializedVersion: 2 + x: 420 + y: 0 + width: 54 + height: 55 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 02547ea459acc9348803f8c65823abfc + internalID: -1206517152 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Bringer-of-Death_4 + rect: + serializedVersion: 2 + x: 562 + y: 0 + width: 48 + height: 54 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 02aaa10a23238684694c35cbd103f862 + internalID: 445162961 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Bringer-of-Death_5 + rect: + serializedVersion: 2 + x: 703 + y: 0 + width: 46 + height: 52 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: e65cf7b465b2e654bba12726dfee9659 + internalID: 1986018114 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Bringer-of-Death_6 + rect: + serializedVersion: 2 + x: 845 + y: 0 + width: 45 + height: 54 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 0efe4bfe2094b2f448c52416897e9e14 + internalID: -2119495938 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Bringer-of-Death_7 + rect: + serializedVersion: 2 + x: 981 + y: 0 + width: 50 + height: 55 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: a637a1416966bd941bbc1c52d36bcf2b + internalID: -363162516 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: + Bringer-of-Death_0: 1967737662 + Bringer-of-Death_1: 1229344958 + Bringer-of-Death_2: -1106222991 + Bringer-of-Death_3: -1206517152 + Bringer-of-Death_4: 445162961 + Bringer-of-Death_5: 1986018114 + Bringer-of-Death_6: -2119495938 + Bringer-of-Death_7: -363162516 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Player/Scripts/PlayerManager.cs b/Assets/Player/Scripts/PlayerManager.cs index 9192bd5..0eac5ce 100644 --- a/Assets/Player/Scripts/PlayerManager.cs +++ b/Assets/Player/Scripts/PlayerManager.cs @@ -40,7 +40,7 @@ public class PlayerManager : MonoBehaviour public void TakeDamage(int value) { Health -= value; - if (Health < 0) + if (Health <= 0) { Health = 0; diff --git a/Assets/Weapons/Laser/Laser Beam.cs b/Assets/Weapons/Laser/Laser Beam.cs index 29a11a7..26fd681 100644 --- a/Assets/Weapons/Laser/Laser Beam.cs +++ b/Assets/Weapons/Laser/Laser Beam.cs @@ -1,3 +1,4 @@ +using System; using System.Collections; using UnityEngine; @@ -17,11 +18,18 @@ public class LaserBeam : MonoBehaviour { if (collision.CompareTag("Ennemy")) { - collision.gameObject.GetComponent().Life -= Damages; collision.gameObject.GetComponent().AnimateHit(); } } + private void OnTriggerStay2D(Collider2D collision) + { + if (collision.CompareTag("Ennemy")) + { + collision.gameObject.GetComponent().Life -= (int)(Damages * Time.deltaTime); + } + } + private IEnumerator EndLifeAfterXSeconds() { yield return new WaitForSeconds(lifeSeconds);