Added game over

62e5037f · Raphael · 2d0f87cd · 62e5037f · 62e5037f · 62e5037f
Commit 62e5037f authored Oct 25, 2016 by Raphael
24 changed files
--- a/Assets/Images/pile_2.png
+++ b/Assets/Images/pile_2.png
--- a/Assets/Images/pile_2.png.meta
+++ b/Assets/Images/pile_2.png.meta
+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: 
--- a/Assets/Images/pile_3.png
+++ b/Assets/Images/pile_3.png
--- a/Assets/Images/pile_3.png.meta
+++ b/Assets/Images/pile_3.png.meta
+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: 
--- a/Assets/Images/pile_4.png
+++ b/Assets/Images/pile_4.png
--- a/Assets/Images/pile_4.png.meta
+++ b/Assets/Images/pile_4.png.meta
+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: 
--- a/Assets/Images/pile_5.png
+++ b/Assets/Images/pile_5.png
--- a/Assets/Images/pile_5.png.meta
+++ b/Assets/Images/pile_5.png.meta
+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: 
--- a/Assets/Images/pile_6.png
+++ b/Assets/Images/pile_6.png
--- a/Assets/Images/pile_6.png.meta
+++ b/Assets/Images/pile_6.png.meta
+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: 
--- a/Assets/Images/pile_7.png
+++ b/Assets/Images/pile_7.png
--- a/Assets/Images/pile_7.png.meta
+++ b/Assets/Images/pile_7.png.meta
+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: 
--- a/Assets/Images/pile_8.png
+++ b/Assets/Images/pile_8.png
--- a/Assets/Images/pile_8.png.meta
+++ b/Assets/Images/pile_8.png.meta
+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: 
--- a/Assets/Scenes/GameOver.unity
+++ b/Assets/Scenes/GameOver.unity
--- a/Assets/Scenes/GameOver.unity.meta
+++ b/Assets/Scenes/GameOver.unity.meta
+fileFormatVersion: 2
+guid: 0cb8f644a3531a54a87034b751b762b1
+timeCreated: 1477408040
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scenes/Main.unity
+++ b/Assets/Scenes/Main.unity
--- a/Assets/Scripts/GameOverTimeout.cs
+++ b/Assets/Scripts/GameOverTimeout.cs
+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");
+	}
+}
--- a/Assets/Scripts/GameOverTimeout.cs.meta
+++ b/Assets/Scripts/GameOverTimeout.cs.meta
+fileFormatVersion: 2
+guid: db1617bc54ffa5d418ba76a2af51731b
+timeCreated: 1477408259
+licenseType: Free
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scripts/Player.cs
+++ b/Assets/Scripts/Player.cs
 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()

--- a/Assets/Scripts/SimpleEnnemy.cs
+++ b/Assets/Scripts/SimpleEnnemy.cs
@@ -31,7 +31,7 @@ public class SimpleEnnemy : MonoBehaviour
    {
        Destroy(gameObject);

-        _player.GetComponent<Player>().Battery -= 4;
+        _player.GetComponent<Player>().Battery -= 8;
        _player.GetComponent<Player>().SetBlinking();
        //GetScores(); TODO: Successfully get scores from API
    }

--- a/Assets/Scripts/StaticEnemy.cs
+++ b/Assets/Scripts/StaticEnemy.cs
@@ -25,6 +25,6 @@ public class StaticEnemy : MonoBehaviour
    {
        gameObject.SetActive(false);
        _player.GetComponent<Player>().SetBlinking();
-        _player.GetComponent<Player>().Battery -= 4;
+        _player.GetComponent<Player>().Battery -= 8;
    }
 }
--- a/Assets/Scripts/UIController.cs
+++ b/Assets/Scripts/UIController.cs
 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<Sprite> 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];
    }
 }
--- a/ProjectSettings/EditorBuildSettings.asset
+++ b/ProjectSettings/EditorBuildSettings.asset