diff --git a/Pinata_Data/PlayerConnectionConfigFile b/Pinata_Data/PlayerConnectionConfigFile index 509d207..63d17c2 100644 --- a/Pinata_Data/PlayerConnectionConfigFile +++ b/Pinata_Data/PlayerConnectionConfigFile @@ -1 +1 @@ -listen 1859183214 0 0 \ No newline at end of file +listen 1928270416 0 0 \ No newline at end of file diff --git a/playable/Assets/Scenes/Level1.unity b/playable/Assets/Scenes/Level1.unity index badc80e..b345a9e 100644 Binary files a/playable/Assets/Scenes/Level1.unity and b/playable/Assets/Scenes/Level1.unity differ diff --git a/playable/Assets/Scripts/CDscript.cs b/playable/Assets/Scripts/CDscript.cs index 2139cf3..b9b1e6d 100644 --- a/playable/Assets/Scripts/CDscript.cs +++ b/playable/Assets/Scripts/CDscript.cs @@ -14,6 +14,7 @@ public class CDscript : MonoBehaviour { // Use this for initialization void Start () { pause = true; + Time.timeScale = 0.0f; } // Update is called once per frame diff --git a/playable/Assets/sceneController.cs b/playable/Assets/sceneController.cs index 8dc0aa0..c8c5fd9 100644 --- a/playable/Assets/sceneController.cs +++ b/playable/Assets/sceneController.cs @@ -67,10 +67,17 @@ public class sceneController : MonoBehaviour { if (Input.GetButtonDown("start")) { paused = !paused; + optionsSelect (); } - optionsSelect (); + if (exit) { + Time.timeScale = 1.0f; + Application.LoadLevel("Menu_Scene"); + + + } + @@ -89,13 +96,8 @@ public class sceneController : MonoBehaviour { options.SetActive (false); } - if (exit) { - Time.timeScale = 1.0f; - Application.LoadLevel("Menu_Scene"); - } - }