From c1efe59c11f6c1860f07c432b06d939d79a9bdb0 Mon Sep 17 00:00:00 2001 From: Gregory Campbell Date: Sat, 11 Jul 2020 14:53:27 -0400 Subject: [PATCH] Implemented lives system --- Assets/Prefabs/Life.prefab | 83 ++++++++++ Assets/Prefabs/Life.prefab.meta | 7 + Assets/Scenes/Scene.unity | 243 ++++++++++++++++++++++++++++++ Assets/Scripts/PlayerScript.cs | 15 +- Assets/Sprites/DraftLife.png | Bin 0 -> 555 bytes Assets/Sprites/DraftLife.png.meta | 92 +++++++++++ Assets/Sprites/DraftLife.xcf | Bin 0 -> 2814 bytes Assets/Sprites/DraftLife.xcf.meta | 7 + 8 files changed, 443 insertions(+), 4 deletions(-) create mode 100644 Assets/Prefabs/Life.prefab create mode 100644 Assets/Prefabs/Life.prefab.meta create mode 100644 Assets/Sprites/DraftLife.png create mode 100644 Assets/Sprites/DraftLife.png.meta create mode 100644 Assets/Sprites/DraftLife.xcf create mode 100644 Assets/Sprites/DraftLife.xcf.meta diff --git a/Assets/Prefabs/Life.prefab b/Assets/Prefabs/Life.prefab new file mode 100644 index 0000000..50dd5e3 --- /dev/null +++ b/Assets/Prefabs/Life.prefab @@ -0,0 +1,83 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &8840464674455634544 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8840464674455634546} + - component: {fileID: 8840464674455634545} + m_Layer: 0 + m_Name: Life + m_TagString: Life + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8840464674455634546 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8840464674455634544} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -8.25, y: 4.5, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &8840464674455634545 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8840464674455634544} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 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: -1476903531 + m_SortingLayer: 3 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: fffd5a5c1b50b394aabb5ed94ee7c6e7, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.64, y: 0.64} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 diff --git a/Assets/Prefabs/Life.prefab.meta b/Assets/Prefabs/Life.prefab.meta new file mode 100644 index 0000000..e499320 --- /dev/null +++ b/Assets/Prefabs/Life.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e2348ffe25741cf409503f26d4f38070 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Scene.unity b/Assets/Scenes/Scene.unity index 2a778d7..7b6f637 100644 --- a/Assets/Scenes/Scene.unity +++ b/Assets/Scenes/Scene.unity @@ -400,6 +400,87 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &750352902 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 750352904} + - component: {fileID: 750352903} + m_Layer: 0 + m_Name: Life (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!212 &750352903 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 750352902} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 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: -1476903531 + m_SortingLayer: 3 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: fffd5a5c1b50b394aabb5ed94ee7c6e7, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.64, y: 0.64} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &750352904 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 750352902} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -7.25, y: 4.5, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1098479927 PrefabInstance: m_ObjectHideFlags: 0 @@ -577,6 +658,87 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1112197962} m_PrefabAsset: {fileID: 0} +--- !u!1 &1285277664 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1285277666} + - component: {fileID: 1285277665} + m_Layer: 0 + m_Name: Life + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!212 &1285277665 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1285277664} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 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: -1476903531 + m_SortingLayer: 3 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: fffd5a5c1b50b394aabb5ed94ee7c6e7, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.64, y: 0.64} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &1285277666 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1285277664} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -8.25, y: 4.5, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1572597971 GameObject: m_ObjectHideFlags: 0 @@ -800,6 +962,87 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1881096764} m_PrefabAsset: {fileID: 0} +--- !u!1 &1969484886 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1969484888} + - component: {fileID: 1969484887} + m_Layer: 0 + m_Name: Life (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!212 &1969484887 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1969484886} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 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: -1476903531 + m_SortingLayer: 3 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: fffd5a5c1b50b394aabb5ed94ee7c6e7, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.64, y: 0.64} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &1969484888 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1969484886} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -6.25, y: 4.5, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 9 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1990476329 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/PlayerScript.cs b/Assets/Scripts/PlayerScript.cs index 0a68ba3..76c1e7b 100644 --- a/Assets/Scripts/PlayerScript.cs +++ b/Assets/Scripts/PlayerScript.cs @@ -6,9 +6,9 @@ public class PlayerScript : MonoBehaviour { public float speed; - public GameObject bullet; + private int life = 3; private float translation; private float rotation; private float nextFire = 0.5f; @@ -36,11 +36,16 @@ public class PlayerScript : MonoBehaviour if(Input.GetButton("Fire1") && myTime > nextFire) { nextFire = myTime + 0.5f; - GunFire(Random.Range(0.0f, 360.0f)); + GunFire(); nextFire = nextFire - myTime; myTime = 0.0f; } + if(life <= 0) + { + Destroy(gameObject); + } + } void FixedUpdate() @@ -62,12 +67,14 @@ public class PlayerScript : MonoBehaviour if(other.gameObject.tag == "Enemy") { - Destroy(gameObject); + life--; + + Destroy(GameObject.FindWithTag("Life")); } } - void GunFire(float aim) + void GunFire() { int gunSelect = 0; diff --git a/Assets/Sprites/DraftLife.png b/Assets/Sprites/DraftLife.png new file mode 100644 index 0000000000000000000000000000000000000000..474d57bc7103ca4d81ffab2695a383e67164f1fc GIT binary patch literal 555 zcmV+`0@VG9P)u3lb|S4?wy;0000PbVXQnLvL+uWo~o;Lvm$dbY)~9 zcWHEJAV*0}P*;Ht7XSbOrAb6VRCwC$n$a1;FbISxpDVbGi#dafxr{^TyPvI)a0hL< zXPdy~C!wh#tyZhmYPHU)W#pl!$lLS#+u%GU4e%yk-H3&e_^1gC(iUd&)=YU3(_e_VxK~Q tg@TMtQ;)p5)EHe*-OJh4*)Y1CoQ+TR{qE^#Fgcq{qi#wE)6vU* zbaZ%>wp+xpy|vHOm$yuv-;e%Tn5pkC-}DFLi&1nue-_27+lsb!@a|$fi^dm&SHnv) ze{y^sk0fgen6QmVgIF zfBrpJ0tKdSMlV|psa8&J=d_>GQBGHKI>_lTr&rPDdGqEX%(Kn<53Pn&+i0P|yE#4o z!7WkCwc^jYP7iHh)}j4e^CqJ0(8FIgSXH`<8<)(NZ*nHS#Za=c>o?hQMv z>%=Yk3ogYG&oIx+xE$X{*TD|;I=E+f8*cE7yYM=^2{+mM26_W-!gpXZW|Mu@&|7d7 z-Ue0bJMan|!2x)H4!|z(L7SQf9s-yC9w>u-VBXU{D1t{oz=5j9AE;HZ5+AD|exm&N zDbM_f@t?52Pw{(Q_*Pw4RR)uekdBa!kdBa!kdBa!kdBa!kdBa!kPbDEAI>_u%(w>k zTy#lDM@UCVhjl{wC94DaMms_}Ak(BHq?6V|=8;aSNyoCox{i=ej!P0T);urcvXBmY zED7nrWg(rENe2(EkPe<)AsrzdAsyhMT_K%x4Cx5z2m7HlKW~W zX{qgGS8XM2wVCXxX3_=ws*yZmU1CoT0kJ1XDMGuqO7cWi5`F^g*GoQDPI6uREjyUT zg~o-(1qd}RG%hqQG`rTgNEsI?<3i&?<3h7ri>}7S4HoqdV>`@ivt~=EUXP}ecNZt7`)>!(jQOwp