Updated Level3 Details

jeffalot · Jan 27, 2019 · 274bf27 · 274bf27
1 parent e5ed595
commit 274bf27
Show file tree

Hide file tree

Showing 11 changed files with 5,783 additions and 1,169 deletions.
diff --git a/Assets/Game Jam Template/Scripts/Menu/GameOver.cs b/Assets/Game Jam Template/Scripts/Menu/GameOver.cs
@@ -1,5 +1,6 @@
 using UnityEngine;
 using System.Collections;
+using UnityEngine.UI;
 
 public class GameOver : MonoBehaviour {
 
@@ -45,9 +46,18 @@ public void DoPause()
         //Set time.timescale to 0, this will cause animations and physics to stop updating
         Debug.Log("Pausing Time 2");
         Time.timeScale = 0;
-		//call the ShowPausePanel function of the ShowPanels script
-		showPanels.ShowGameOver();
-	}
+        //call the ShowPausePanel function of the ShowPanels script
+
+
+        int timeElapsed = (int) GameObject.Find("Game_Logic").GetComponent<GameSystemController>().timeElapsed;
+
+
+        showPanels.ShowGameOver();
+
+
+        Text text = (Text)GameObject.Find("TimeText").GetComponent<Text>();
+        text.text = "Time: " + (int)timeElapsed;
+    }
 
 
 	public void UnPause()

diff --git a/Assets/Game Jam Template/Settings ScriptableObjects/Menu Settings.asset b/Assets/Game Jam Template/Settings ScriptableObjects/Menu Settings.asset
@@ -16,4 +16,4 @@ MonoBehaviour:
   sceneChangeFadeColor: {r: 0, g: 0, b: 0, a: 1}
   nextSceneIndex: 1
   mainMenuMusicLoop: {fileID: 8300000, guid: 7db0c87ec4fdb0e48af04349c4f14df9, type: 3}
-  musicLoopToChangeTo: {fileID: 0}
+  musicLoopToChangeTo: {fileID: 8300000, guid: 03e03b88cf8fbe243b451136f64b1df2, type: 3}