gjcampbell/Magical-Jumping-Bean
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed mouse pointer disappearing in menus bug as well as added controller support for the main menu

Browse Source
This commit is contained in:
Gregory Campbell
2020-01-26 23:03:41 -05:00
parent 4061ebc8d7
commit bb13bb930e
10 changed files with 1054 additions and 1064 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Scripts/FloorLevel.cs
+3 -1
View File
@@ -69,9 +69,11 @@ public class FloorLevel : MonoBehaviour
{
script.lives = -1;
PauseMenu.GameIsOver = true;
fullTime = Time.time - fullTime;
gameOver = true;
Cursor.visible = true;
Cursor.lockState = CursorLockMode.None;
PauseMenu.GameIsOver = true;
SceneManager.LoadScene("Hub World", LoadSceneMode.Single);
}
Assets/Scripts/PauseMenu.cs
+18 -36
View File
@@ -17,74 +17,59 @@ public class PauseMenu : MonoBehaviour
public TextMeshProUGUI TimeText;
public TextMeshProUGUI LivesText;
// Start is called before the first frame update
void Start()
{
}
// Update is called once per frame
void Update()
{
if(SceneManager.GetActiveScene().name == "Floor Level")
{
ScoreText.text = "LEVEL: " + FloorLevel.escalation + "-" + FloorLevel.level;
LivesText.text = "LIVES: " + PlayerController.shownLives;
}
if(SceneManager.GetActiveScene().name == "Waypoint Race")
{
ScoreText.text = "LEVEL: " + (WaypointRace.size - 1) + "-" + WaypointRace.level;
TimeText.text = "TIME: " + Mathf.Round((WaypointRace.countdown + WaypointRace.completionTime) - Time.time);
}
if(Input.GetButtonDown("Pause"))
{
if(GameIsPaused)
{
Resume();
Cursor.visible = !Cursor.visible;
Cursor.lockState = CursorLockMode.Locked;
} else {
Pause();
Cursor.visible = Cursor.visible;
Cursor.lockState = CursorLockMode.None;
}
}
if(GameIsOver)
{
GameOver();
Cursor.visible = Cursor.visible;
Cursor.lockState = CursorLockMode.None;
}
}
public void Resume()
{
Cursor.visible = false;
Cursor.lockState = CursorLockMode.Locked;
pauseMenuUI.SetActive(false);
gameOverUI.SetActive(false);
Time.timeScale = 1f;
GameIsPaused = false;
GameIsOver = false;
Cursor.visible = !Cursor.visible;
Cursor.lockState = CursorLockMode.Locked;
}
void Pause()
{
Cursor.visible = true;
Cursor.lockState = CursorLockMode.None;
pauseMenuUI.SetActive(true);
Time.timeScale = 0f;
GameIsPaused = true;
Cursor.visible = Cursor.visible;
Cursor.lockState = CursorLockMode.None;
}
void GameOver()
{
Cursor.visible = true;
Cursor.lockState = CursorLockMode.None;
gameOverUI.SetActive(true);
Time.timeScale = 0f;
GameIsPaused = true;
if(FloorLevel.gameOver == true)
{
ScoreText.text = "LEVEL: " + FloorLevel.escalation + "-" + FloorLevel.level;
@@ -97,11 +82,6 @@ public class PauseMenu : MonoBehaviour
TimeText.text = "TIME: " + Mathf.Round(WaypointRace.fullTime);
}
gameOverUI.SetActive(true);
Time.timeScale = 0f;
GameIsPaused = true;
Cursor.visible = Cursor.visible;
Cursor.lockState = CursorLockMode.None;
}
public void LoadHubWorld()
@@ -109,7 +89,7 @@ public class PauseMenu : MonoBehaviour
Time.timeScale = 1f;
GameIsPaused = false;
SceneManager.LoadScene("Hub World", LoadSceneMode.Single);
Cursor.visible = !Cursor.visible;
Cursor.visible = false;
Cursor.lockState = CursorLockMode.Locked;
}
@@ -118,6 +98,8 @@ public class PauseMenu : MonoBehaviour
Time.timeScale = 1f;
GameIsPaused = false;
SceneManager.LoadScene("Main Menu", LoadSceneMode.Single);
Cursor.visible = true;
Cursor.lockState = CursorLockMode.None;
}
public void Quit()
Assets/Scripts/PlayerController.cs
+1 -1
View File
@@ -64,7 +64,7 @@ public class PlayerController : MonoBehaviour
shownLives = 3;
Cursor.visible = !Cursor.visible;
Cursor.visible = false;
Cursor.lockState = CursorLockMode.Locked;
}
Assets/Scripts/WaypointRace.cs
+3 -1
View File
@@ -79,9 +79,11 @@ public class WaypointRace : MonoBehaviour
if(countdown + completionTime < Time.time)
{
PauseMenu.GameIsOver = true;
gameOver = true;
fullTime = Time.time - fullTime;
Cursor.visible = true;
Cursor.lockState = CursorLockMode.None;
PauseMenu.GameIsOver = true;
SceneManager.LoadScene("Hub World", LoadSceneMode.Single);
}