From 0741e8755621923d27501e9ae957815291d612bd Mon Sep 17 00:00:00 2001 From: Adam P Skawinski Date: Tue, 18 Feb 2020 23:18:33 -0500 Subject: [PATCH] Final Push Game is somehow done in time here is the final push. --- .../Meteors => Materials}/meteorGrey_big3.png | Bin .../meteorGrey_big3.png.meta | 38 +++- SpaceShooter/Assets/Prefabs/Asteroid.prefab | 178 ++++++++++++++++++ .../Assets/Prefabs/Asteroid.prefab.meta | 7 + .../Assets/Scripts/DestroyByContact.cs | 16 ++ .../Assets/Scripts/DestroyByContact.cs.meta | 11 ++ SpaceShooter/Assets/Scripts/GameController.cs | 37 ++++ .../Assets/Scripts/GameController.cs.meta | 11 ++ .../Assets/Scripts/PlayerController.cs | 4 + .../PNG/Effects/fire17.png.meta | 38 +++- .../PNG/Meteors/meteorGrey_med2.png | Bin 864 -> 0 bytes .../PNG/Meteors/meteorGrey_med2.png.meta | 88 --------- 12 files changed, 324 insertions(+), 104 deletions(-) rename SpaceShooter/Assets/{SpaceShooterRedux (1)/PNG/Meteors => Materials}/meteorGrey_big3.png (100%) rename SpaceShooter/Assets/{SpaceShooterRedux (1)/PNG/Meteors => Materials}/meteorGrey_big3.png.meta (71%) create mode 100644 SpaceShooter/Assets/Prefabs/Asteroid.prefab create mode 100644 SpaceShooter/Assets/Prefabs/Asteroid.prefab.meta create mode 100644 SpaceShooter/Assets/Scripts/DestroyByContact.cs create mode 100644 SpaceShooter/Assets/Scripts/DestroyByContact.cs.meta create mode 100644 SpaceShooter/Assets/Scripts/GameController.cs create mode 100644 SpaceShooter/Assets/Scripts/GameController.cs.meta delete mode 100644 SpaceShooter/Assets/SpaceShooterRedux (1)/PNG/Meteors/meteorGrey_med2.png delete mode 100644 SpaceShooter/Assets/SpaceShooterRedux (1)/PNG/Meteors/meteorGrey_med2.png.meta diff --git a/SpaceShooter/Assets/SpaceShooterRedux (1)/PNG/Meteors/meteorGrey_big3.png b/SpaceShooter/Assets/Materials/meteorGrey_big3.png similarity index 100% rename from SpaceShooter/Assets/SpaceShooterRedux (1)/PNG/Meteors/meteorGrey_big3.png rename to SpaceShooter/Assets/Materials/meteorGrey_big3.png diff --git a/SpaceShooter/Assets/SpaceShooterRedux (1)/PNG/Meteors/meteorGrey_big3.png.meta b/SpaceShooter/Assets/Materials/meteorGrey_big3.png.meta similarity index 71% rename from SpaceShooter/Assets/SpaceShooterRedux (1)/PNG/Meteors/meteorGrey_big3.png.meta rename to SpaceShooter/Assets/Materials/meteorGrey_big3.png.meta index 3d37ce5..288c610 100644 --- a/SpaceShooter/Assets/SpaceShooterRedux (1)/PNG/Meteors/meteorGrey_big3.png.meta +++ b/SpaceShooter/Assets/Materials/meteorGrey_big3.png.meta @@ -6,7 +6,7 @@ TextureImporter: serializedVersion: 9 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -34,13 +34,13 @@ TextureImporter: filterMode: -1 aniso: -1 mipBias: -100 - wrapU: -1 - wrapV: -1 + wrapU: 1 + wrapV: 1 wrapW: -1 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -49,9 +49,9 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 singleChannelComponent: 0 maxTextureSizeSet: 0 @@ -69,13 +69,35 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] physicsShape: [] bones: [] - spriteID: + spriteID: d77dd99e2b7a3c345aa618dccce8b4d6 vertices: [] indices: edges: [] diff --git a/SpaceShooter/Assets/Prefabs/Asteroid.prefab b/SpaceShooter/Assets/Prefabs/Asteroid.prefab new file mode 100644 index 0000000..93895e3 --- /dev/null +++ b/SpaceShooter/Assets/Prefabs/Asteroid.prefab @@ -0,0 +1,178 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &8413504239141626582 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8413504239141626583} + - component: {fileID: 8413504239141626576} + m_Layer: 0 + m_Name: meteorGrey_big3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8413504239141626583 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8413504239141626582} + 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_Children: [] + m_Father: {fileID: 8413504239514052082} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &8413504239141626576 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8413504239141626582} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + 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_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + 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: 21300000, guid: df286c1d2bd68f147aebf6ab883a6ade, 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.89, y: 0.82} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &8413504239514052086 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8413504239514052082} + - component: {fileID: 8413504239514052081} + - component: {fileID: 8413504239514052080} + - component: {fileID: 8413504239514052087} + - component: {fileID: 8413504239514052083} + m_Layer: 0 + m_Name: Asteroid + m_TagString: Asteroid + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8413504239514052082 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8413504239514052086} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 1, y: 12, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 8413504239141626583} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!50 &8413504239514052081 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8413504239514052086} + 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_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 +--- !u!58 &8413504239514052080 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8413504239514052086} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: -0.021292627, y: -0.014195174} + serializedVersion: 2 + m_Radius: 0.4219268 +--- !u!114 &8413504239514052087 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8413504239514052086} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f0f01462b645a5140940ea2d8aea2ec2, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &8413504239514052083 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8413504239514052086} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5ff6ebfbd9061a54e90a0f68a9da7e82, type: 3} + m_Name: + m_EditorClassIdentifier: + speed: -3 diff --git a/SpaceShooter/Assets/Prefabs/Asteroid.prefab.meta b/SpaceShooter/Assets/Prefabs/Asteroid.prefab.meta new file mode 100644 index 0000000..cf3055f --- /dev/null +++ b/SpaceShooter/Assets/Prefabs/Asteroid.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 36ad102bc23fdf24bbb56f0c5a2caa28 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SpaceShooter/Assets/Scripts/DestroyByContact.cs b/SpaceShooter/Assets/Scripts/DestroyByContact.cs new file mode 100644 index 0000000..0386dae --- /dev/null +++ b/SpaceShooter/Assets/Scripts/DestroyByContact.cs @@ -0,0 +1,16 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class DestroyByContact : MonoBehaviour +{ + void OnTriggerEnter2D(Collider2D other) + { + if (other.tag == "Boundary") + { + return; + } + Destroy(other.gameObject); + Destroy(gameObject); + } +} \ No newline at end of file diff --git a/SpaceShooter/Assets/Scripts/DestroyByContact.cs.meta b/SpaceShooter/Assets/Scripts/DestroyByContact.cs.meta new file mode 100644 index 0000000..0c409ef --- /dev/null +++ b/SpaceShooter/Assets/Scripts/DestroyByContact.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f0f01462b645a5140940ea2d8aea2ec2 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SpaceShooter/Assets/Scripts/GameController.cs b/SpaceShooter/Assets/Scripts/GameController.cs new file mode 100644 index 0000000..eef3fbe --- /dev/null +++ b/SpaceShooter/Assets/Scripts/GameController.cs @@ -0,0 +1,37 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class GameController : MonoBehaviour +{ + public GameObject hazard; + public Vector2 spawnValues; + public int hazardCount; + public float spawnWait; + public float startWait; + public float waveWait; + + + + void Start() + { + StartCoroutine(SpawnWaves()); + } + + IEnumerator SpawnWaves() + { + yield return new WaitForSeconds(startWait); + while (true) + { + for (int i = 0; i < hazardCount; i++) + { + Vector2 spawnPosition = new Vector2(Random.Range(-spawnValues.x, spawnValues.x), spawnValues.y); + Quaternion spawnRotation = Quaternion.identity; + Instantiate(hazard, spawnPosition, spawnRotation); + yield return new WaitForSeconds(spawnWait); + } + yield return new WaitForSeconds(waveWait); + } + } +} + diff --git a/SpaceShooter/Assets/Scripts/GameController.cs.meta b/SpaceShooter/Assets/Scripts/GameController.cs.meta new file mode 100644 index 0000000..595da8a --- /dev/null +++ b/SpaceShooter/Assets/Scripts/GameController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 0cde2c6df7977f240997a1e3434f83b6 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SpaceShooter/Assets/Scripts/PlayerController.cs b/SpaceShooter/Assets/Scripts/PlayerController.cs index 2e80317..a930fd7 100644 --- a/SpaceShooter/Assets/Scripts/PlayerController.cs +++ b/SpaceShooter/Assets/Scripts/PlayerController.cs @@ -1,6 +1,8 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; +using UnityEngine.UI; + [System.Serializable] public class Boundary @@ -18,6 +20,8 @@ public class PlayerController : MonoBehaviour private float nextFire; + public Text score; + void Update() { if (Input.GetKeyDown("space") && Time.time > nextFire) diff --git a/SpaceShooter/Assets/SpaceShooterRedux (1)/PNG/Effects/fire17.png.meta b/SpaceShooter/Assets/SpaceShooterRedux (1)/PNG/Effects/fire17.png.meta index 29fd4c9..7ba04c5 100644 --- a/SpaceShooter/Assets/SpaceShooterRedux (1)/PNG/Effects/fire17.png.meta +++ b/SpaceShooter/Assets/SpaceShooterRedux (1)/PNG/Effects/fire17.png.meta @@ -6,7 +6,7 @@ TextureImporter: serializedVersion: 9 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -34,13 +34,13 @@ TextureImporter: filterMode: -1 aniso: -1 mipBias: -100 - wrapU: -1 - wrapV: -1 + wrapU: 1 + wrapV: 1 wrapW: -1 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -49,9 +49,9 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 singleChannelComponent: 0 maxTextureSizeSet: 0 @@ -69,13 +69,35 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] physicsShape: [] bones: [] - spriteID: + spriteID: 06917969e484b5e4692bc7d2f4bfa86c vertices: [] indices: edges: [] diff --git a/SpaceShooter/Assets/SpaceShooterRedux (1)/PNG/Meteors/meteorGrey_med2.png b/SpaceShooter/Assets/SpaceShooterRedux (1)/PNG/Meteors/meteorGrey_med2.png deleted file mode 100644 index e63e2f609b7fe4920c13d24ece5778458be850f3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 864 zcmV-m1E2hfP)*y?7&CZz7G}c%opAzTJrN^>3CPo_%L8LZ{a+PW2|zz-n?q zlXh@=#RgZYKCWlx91}C4?cfYn1{wzWaKTk^l}z<0g75=s0UyvXjA5MWb;qP~5<2n) z4PSt7m}E>ycupFal`m-6=;{|Mq9|?0Ri~9STtW{oe-^Gb0s}3oiXx`ca0ShYB6^}x z6`+kY%0ffSTqo3;gsFAZC<|?p6*H?o8);C=#`c;3?@un+B)S$a zzsPF408T4j8hj=h)72%@I`hb=YjFW?W4RR_2iz*6IO@i&j>%9-`2Y~ufxA5#)4;3h&Z!tOKI4W3#Ixq9FjRe)=4)U=ZGX&t<5_DmK-PR^!t z!DrbM;7GT4Il`4mT-Q%Yz1+L#X+O;XgKei9fV4?DIghrDEQqOiG3TBo<$~z8QdyWh z2wVECR@$VnQ)MoP{sBkoZ*W@HJE8yp04;PySaefwW^{L9a%BKwc`jmXZ*OE|c`jpe qd2n=ZE@^FHXJsx>PDe5{MQ&qnWMy)w27m4V0000