Merge branch 'master' of https://github.com/AdronTech/GGJ_2017

AdronTech · Jan 22, 2017 · a12b0e0 · a12b0e0
2 parents e55e216 + 57b1b68
commit a12b0e0
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 5 deletions.
diff --git a/GGJ17/Assets/Models/Materials/modelFlag.mat b/GGJ17/Assets/Models/Materials/modelFlag.mat
diff --git a/GGJ17/Assets/Models/Materials/modelFlag.mat.meta b/GGJ17/Assets/Models/Materials/modelFlag.mat.meta
diff --git a/GGJ17/Assets/Prefab/BuildingBlocks/Building_Flag.prefab b/GGJ17/Assets/Prefab/BuildingBlocks/Building_Flag.prefab
diff --git a/GGJ17/Assets/Scene/GameOver.unity b/GGJ17/Assets/Scene/GameOver.unity
diff --git a/GGJ17/Assets/Scene/MainScene.unity b/GGJ17/Assets/Scene/MainScene.unity
diff --git a/GGJ17/Assets/Script/Blocks/Building/Building_Flag.cs b/GGJ17/Assets/Script/Blocks/Building/Building_Flag.cs
@@ -16,11 +16,14 @@ void Awake () {
         Init(bbi);
     }
 
+    private void OnDestroy()
+    {
+        SceneManager.LoadScene(nextSceneName, LoadSceneMode.Single);
+    }
 
     public new void DestroyBuilding()
     {
         // Todo GameOver
         Destroy(gameObject);
-        SceneManager.LoadScene(nextSceneName, LoadSceneMode.Single);
     }
 }
diff --git a/GGJ17/Assets/Script/GameOverScreen/gameOverInput.cs b/GGJ17/Assets/Script/GameOverScreen/gameOverInput.cs
@@ -8,20 +8,25 @@ public class gameOverInput : MonoBehaviour
 
     public float waitBeforeInputSec;
     public string nextSceneName;
+    private float sceneStartTime;
 
     // Use this for initialization
     void Start()
     {
+        sceneStartTime = Time.time;
+    }
 
+    void Awake()
+    {
+        sceneStartTime = Time.time;
     }
 
     // Update is called once per frame
     void Update()
     {
-        if (Time.time >= waitBeforeInputSec && Input.anyKeyDown)
+        if (Time.time - sceneStartTime >= waitBeforeInputSec && Input.anyKeyDown)
         {
             SceneManager.LoadScene(nextSceneName, LoadSceneMode.Single);
         }
     }
 }
-
diff --git a/GGJ17/Assets/Script/TitleScreen/titleInput.cs b/GGJ17/Assets/Script/TitleScreen/titleInput.cs
@@ -8,20 +8,25 @@ public class titleInput : MonoBehaviour
 
     public float waitBeforeInputSec;
     public string nextSceneName;
+    private float sceneStartTime;
 
     // Use this for initialization
     void Start()
     {
+        sceneStartTime = Time.time;
+    }
 
+    void Awake()
+    {
+        sceneStartTime = Time.time;
     }
 
     // Update is called once per frame
     void Update()
     {
-        if (Time.time >= waitBeforeInputSec && Input.anyKeyDown)
+        if (Time.time - sceneStartTime >= waitBeforeInputSec && Input.anyKeyDown)
         {
             SceneManager.LoadScene(nextSceneName, LoadSceneMode.Single);
         }
     }
 }
-
diff --git a/GGJ17/ProjectSettings/EditorBuildSettings.asset b/GGJ17/ProjectSettings/EditorBuildSettings.asset