diff --git a/Assets/Images/pile_2.png b/Assets/Images/pile_2.png new file mode 100644 index 0000000..62cc0e7 Binary files /dev/null and b/Assets/Images/pile_2.png differ diff --git a/Assets/Images/pile_2.png.meta b/Assets/Images/pile_2.png.meta new file mode 100644 index 0000000..9022237 --- /dev/null +++ b/Assets/Images/pile_2.png.meta @@ -0,0 +1,59 @@ +fileFormatVersion: 2 +guid: dbdf85e64e2308e43a738bd5118ad4f2 +timeCreated: 1477407327 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Images/pile_3.png b/Assets/Images/pile_3.png new file mode 100644 index 0000000..540d97a Binary files /dev/null and b/Assets/Images/pile_3.png differ diff --git a/Assets/Images/pile_3.png.meta b/Assets/Images/pile_3.png.meta new file mode 100644 index 0000000..fd46d0b --- /dev/null +++ b/Assets/Images/pile_3.png.meta @@ -0,0 +1,59 @@ +fileFormatVersion: 2 +guid: bfda6a52dd948ad48850f92f0c40e2d3 +timeCreated: 1477407327 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Images/pile_4.png b/Assets/Images/pile_4.png new file mode 100644 index 0000000..aafd40b Binary files /dev/null and b/Assets/Images/pile_4.png differ diff --git a/Assets/Images/pile_4.png.meta b/Assets/Images/pile_4.png.meta new file mode 100644 index 0000000..12c32dc --- /dev/null +++ b/Assets/Images/pile_4.png.meta @@ -0,0 +1,59 @@ +fileFormatVersion: 2 +guid: ba73de8a2e38ad74e9b1eb4512ff93c2 +timeCreated: 1477407327 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Images/pile_5.png b/Assets/Images/pile_5.png new file mode 100644 index 0000000..640591c Binary files /dev/null and b/Assets/Images/pile_5.png differ diff --git a/Assets/Images/pile_5.png.meta b/Assets/Images/pile_5.png.meta new file mode 100644 index 0000000..a8b84a3 --- /dev/null +++ b/Assets/Images/pile_5.png.meta @@ -0,0 +1,59 @@ +fileFormatVersion: 2 +guid: 6f2cf1797f8c3e844873e2c9235e48e7 +timeCreated: 1477407326 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Images/pile_6.png b/Assets/Images/pile_6.png new file mode 100644 index 0000000..d73ea29 Binary files /dev/null and b/Assets/Images/pile_6.png differ diff --git a/Assets/Images/pile_6.png.meta b/Assets/Images/pile_6.png.meta new file mode 100644 index 0000000..cd2432e --- /dev/null +++ b/Assets/Images/pile_6.png.meta @@ -0,0 +1,59 @@ +fileFormatVersion: 2 +guid: 4f28308d282a4a94aa2b91b9eef12e61 +timeCreated: 1477407326 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Images/pile_7.png b/Assets/Images/pile_7.png new file mode 100644 index 0000000..03b39b3 Binary files /dev/null and b/Assets/Images/pile_7.png differ diff --git a/Assets/Images/pile_7.png.meta b/Assets/Images/pile_7.png.meta new file mode 100644 index 0000000..51489df --- /dev/null +++ b/Assets/Images/pile_7.png.meta @@ -0,0 +1,59 @@ +fileFormatVersion: 2 +guid: f9a4695a983bfd64b939ef681f14f2f2 +timeCreated: 1477407328 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Images/pile_8.png b/Assets/Images/pile_8.png new file mode 100644 index 0000000..f0cdf8f Binary files /dev/null and b/Assets/Images/pile_8.png differ diff --git a/Assets/Images/pile_8.png.meta b/Assets/Images/pile_8.png.meta new file mode 100644 index 0000000..245468c --- /dev/null +++ b/Assets/Images/pile_8.png.meta @@ -0,0 +1,59 @@ +fileFormatVersion: 2 +guid: bd24ab413532b1c4497a9b6447abf70a +timeCreated: 1477407327 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/GameOver.unity b/Assets/Scenes/GameOver.unity new file mode 100644 index 0000000..b243cc3 Binary files /dev/null and b/Assets/Scenes/GameOver.unity differ diff --git a/Assets/Scenes/GameOver.unity.meta b/Assets/Scenes/GameOver.unity.meta new file mode 100644 index 0000000..17382a9 --- /dev/null +++ b/Assets/Scenes/GameOver.unity.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0cb8f644a3531a54a87034b751b762b1 +timeCreated: 1477408040 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index c14ec98..90c6ead 100644 Binary files a/Assets/Scenes/Main.unity and b/Assets/Scenes/Main.unity differ diff --git a/Assets/Scripts/GameOverTimeout.cs b/Assets/Scripts/GameOverTimeout.cs new file mode 100644 index 0000000..74d0913 --- /dev/null +++ b/Assets/Scripts/GameOverTimeout.cs @@ -0,0 +1,21 @@ +using UnityEngine; +using System.Collections; +using UnityEngine.SceneManagement; + +public class GameOverTimeout : MonoBehaviour +{ + private float _timer = 0f; + + void Start() + { + + } + + void Update () + { + _timer += Time.deltaTime; + + if (_timer > 4f) + SceneManager.LoadScene("Menu"); + } +} diff --git a/Assets/Scripts/GameOverTimeout.cs.meta b/Assets/Scripts/GameOverTimeout.cs.meta new file mode 100644 index 0000000..3396273 --- /dev/null +++ b/Assets/Scripts/GameOverTimeout.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: db1617bc54ffa5d418ba76a2af51731b +timeCreated: 1477408259 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Player.cs b/Assets/Scripts/Player.cs index 884889f..8b46d40 100644 --- a/Assets/Scripts/Player.cs +++ b/Assets/Scripts/Player.cs @@ -1,4 +1,5 @@ using UnityEngine; +using UnityEngine.SceneManagement; namespace Assets.Scripts { @@ -26,6 +27,9 @@ namespace Assets.Scripts _pos.position = Vector3.Lerp(_pos.position, newPos, 10 * Time.deltaTime); if (IsBlinking) Blink(); + + if (Battery < 12) + SceneManager.LoadScene("GameOver"); } public void Blink() diff --git a/Assets/Scripts/SimpleEnnemy.cs b/Assets/Scripts/SimpleEnnemy.cs index 7e4ac9a..8545170 100644 --- a/Assets/Scripts/SimpleEnnemy.cs +++ b/Assets/Scripts/SimpleEnnemy.cs @@ -31,7 +31,7 @@ public class SimpleEnnemy : MonoBehaviour { Destroy(gameObject); - _player.GetComponent().Battery -= 4; + _player.GetComponent().Battery -= 8; _player.GetComponent().SetBlinking(); //GetScores(); TODO: Successfully get scores from API } diff --git a/Assets/Scripts/StaticEnemy.cs b/Assets/Scripts/StaticEnemy.cs index 4136921..a31e6e2 100644 --- a/Assets/Scripts/StaticEnemy.cs +++ b/Assets/Scripts/StaticEnemy.cs @@ -25,6 +25,6 @@ public class StaticEnemy : MonoBehaviour { gameObject.SetActive(false); _player.GetComponent().SetBlinking(); - _player.GetComponent().Battery -= 4; + _player.GetComponent().Battery -= 8; } } diff --git a/Assets/Scripts/UIController.cs b/Assets/Scripts/UIController.cs index 8b15887..5627cf3 100644 --- a/Assets/Scripts/UIController.cs +++ b/Assets/Scripts/UIController.cs @@ -1,6 +1,7 @@ using System; using UnityEngine; using System.Collections; +using System.Collections.Generic; using Assets.Scripts; using UnityEngine.UI; @@ -13,6 +14,8 @@ public class UIController : MonoBehaviour public Image Vial1; public Image Vial2; public Image Vial3; + public Image Battery; + public List BatteryImages; private Player _player; @@ -30,5 +33,12 @@ public class UIController : MonoBehaviour Distance.text = (int.Parse(Distance.text) + 1).ToString(); int score = _player.Score + int.Parse(Distance.text) / 5; Score.text = (_player.Score + score).ToString(); + + DisplayBattery(); } + + private void DisplayBattery() + { + Battery.sprite = BatteryImages[_player.Battery/8]; + } } diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 602111f..cb5ce64 100644 Binary files a/ProjectSettings/EditorBuildSettings.asset and b/ProjectSettings/EditorBuildSettings.asset differ