From 994add5507c81ff623a19359a8c441dbb96d8a10 Mon Sep 17 00:00:00 2001 From: Gregory Campbell Date: Sat, 8 Feb 2020 20:48:00 -0500 Subject: [PATCH] Added the pausing and playing of music when the game is paused or not --- Assets/Scenes/Floor Level.unity | 1 + Assets/Scenes/Hub World.unity | 1 + Assets/Scenes/Infinity Runner.unity | 1 + Assets/Scenes/Waypoint Race.unity | 1 + Assets/Scripts/PauseMenu.cs | 5 +++++ 5 files changed, 9 insertions(+) diff --git a/Assets/Scenes/Floor Level.unity b/Assets/Scenes/Floor Level.unity index ab8b85d..4907c0f 100644 --- a/Assets/Scenes/Floor Level.unity +++ b/Assets/Scenes/Floor Level.unity @@ -1312,6 +1312,7 @@ MonoBehaviour: CongratsText: {fileID: 0} pauseFirstButton: {fileID: 223326611} gameOverFirstButton: {fileID: 0} + music: {fileID: 1467720640} --- !u!114 &989087329 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Hub World.unity b/Assets/Scenes/Hub World.unity index edd70bd..d598957 100644 --- a/Assets/Scenes/Hub World.unity +++ b/Assets/Scenes/Hub World.unity @@ -7540,6 +7540,7 @@ MonoBehaviour: CongratsText: {fileID: 1992981387} pauseFirstButton: {fileID: 312387577} gameOverFirstButton: {fileID: 630916946} + music: {fileID: 2074891275} --- !u!1 &1728628295 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Infinity Runner.unity b/Assets/Scenes/Infinity Runner.unity index c426d78..dd899e6 100644 --- a/Assets/Scenes/Infinity Runner.unity +++ b/Assets/Scenes/Infinity Runner.unity @@ -1557,6 +1557,7 @@ MonoBehaviour: CongratsText: {fileID: 0} pauseFirstButton: {fileID: 783395647} gameOverFirstButton: {fileID: 0} + music: {fileID: 1128321816} --- !u!114 &1111617282 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Waypoint Race.unity b/Assets/Scenes/Waypoint Race.unity index b5b6466..4869682 100644 --- a/Assets/Scenes/Waypoint Race.unity +++ b/Assets/Scenes/Waypoint Race.unity @@ -1090,6 +1090,7 @@ MonoBehaviour: CongratsText: {fileID: 0} pauseFirstButton: {fileID: 1040909057} gameOverFirstButton: {fileID: 0} + music: {fileID: 595592872} --- !u!114 &963355971 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/PauseMenu.cs b/Assets/Scripts/PauseMenu.cs index 7d7376a..8bfcc1b 100644 --- a/Assets/Scripts/PauseMenu.cs +++ b/Assets/Scripts/PauseMenu.cs @@ -25,6 +25,8 @@ public class PauseMenu : MonoBehaviour public GameObject pauseFirstButton; public GameObject gameOverFirstButton; + public AudioSource music; + private bool highscore = false; private int gameOver = 0; @@ -90,6 +92,7 @@ public class PauseMenu : MonoBehaviour Time.timeScale = 1f; GameIsPaused = false; GameIsOver = false; + music.Play(); } void Pause() @@ -101,6 +104,7 @@ public class PauseMenu : MonoBehaviour GameIsPaused = true; EventSystem.current.SetSelectedGameObject(null); EventSystem.current.SetSelectedGameObject(pauseFirstButton); + music.Pause(); } void GameOver() @@ -111,6 +115,7 @@ public class PauseMenu : MonoBehaviour gameOverUI.SetActive(true); Time.timeScale = 0f; GameIsPaused = true; + music.Pause(); if(FloorLevel.gameOver == true) {