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

Assets/Scenes/Floor Level.unity

@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 680319583}
-  m_IndirectSpecularColor: {r: 0.5518341, g: 0.55590534, b: 0.5908708, a: 1}
+  m_IndirectSpecularColor: {r: 0.63570493, g: 0.6013978, b: 0.5769485, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -313,7 +313,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0.000061035, y: 103}
+  m_AnchoredPosition: {x: 0.000061035, y: 66.100006}
   m_SizeDelta: {x: 381.6, y: 93.6}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &223326613
@@ -442,7 +442,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: -27.7}
+  m_AnchoredPosition: {x: 0, y: -64.59999}
   m_SizeDelta: {x: 515.5, y: 111.1}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &377938485
@@ -2045,7 +2045,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0.000061035, y: -155.2}
+  m_AnchoredPosition: {x: 0.000061035, y: -192.09999}
   m_SizeDelta: {x: 265.9, y: 95.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1584704080
@@ -2174,7 +2174,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -0, y: -281.1}
+  m_AnchoredPosition: {x: -0, y: -318}
   m_SizeDelta: {x: 212.4, y: 90.3}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1643871633
@@ -2556,7 +2556,7 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &2066072971
+--- !u!1 &2032483823
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -2564,9 +2564,9 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 2066072974}
+  - component: {fileID: 2032483826}
-  - component: {fileID: 2066072973}
+  - component: {fileID: 2032483825}
-  - component: {fileID: 2066072972}
+  - component: {fileID: 2032483824}
   m_Layer: 0
   m_Name: EventSystem
   m_TagString: Untagged
@@ -2574,13 +2574,13 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!114 &2066072972
+--- !u!114 &2032483824
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2066072971}
+  m_GameObject: {fileID: 2032483823}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
@@ -2593,28 +2593,28 @@ MonoBehaviour:
   m_InputActionsPerSecond: 10
   m_RepeatDelay: 0.5
   m_ForceModuleActive: 0
---- !u!114 &2066072973
+--- !u!114 &2032483825
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2066072971}
+  m_GameObject: {fileID: 2032483823}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_FirstSelected: {fileID: 0}
+  m_FirstSelected: {fileID: 223326611}
   m_sendNavigationEvents: 1
   m_DragThreshold: 10
---- !u!4 &2066072974
+--- !u!4 &2032483826
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2066072971}
+  m_GameObject: {fileID: 2032483823}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}

Assets/Scenes/Main Menu.unity

@@ -3545,7 +3545,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_FirstSelected: {fileID: 0}
+  m_FirstSelected: {fileID: 1417856269}
   m_sendNavigationEvents: 1
   m_DragThreshold: 10
 --- !u!4 &985624425

Assets/Scenes/Waypoint Race.unity

@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 1084448987}
-  m_IndirectSpecularColor: {r: 0.5518341, g: 0.55590534, b: 0.5908708, a: 1}
+  m_IndirectSpecularColor: {r: 0.63570493, g: 0.6013978, b: 0.5769485, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -262,7 +262,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: -29.1}
+  m_AnchoredPosition: {x: 0, y: -68.1}
   m_SizeDelta: {x: 520.2, y: 93.7}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &88922121
@@ -391,7 +391,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -0, y: -285.2}
+  m_AnchoredPosition: {x: 0, y: -324.2}
   m_SizeDelta: {x: 216.1, y: 91.4}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &332295496
@@ -734,72 +734,6 @@ RectTransform:
   m_AnchoredPosition: {x: -761.85, y: 478.62}
   m_SizeDelta: {x: 396.3, y: 124.8}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!1 &488143136
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 488143139}
-  - component: {fileID: 488143138}
-  - component: {fileID: 488143137}
-  m_Layer: 0
-  m_Name: EventSystem
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!114 &488143137
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 488143136}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_HorizontalAxis: Horizontal
-  m_VerticalAxis: Vertical
-  m_SubmitButton: Jump
-  m_CancelButton: Pause
-  m_InputActionsPerSecond: 10
-  m_RepeatDelay: 0.5
-  m_ForceModuleActive: 0
---- !u!114 &488143138
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 488143136}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_FirstSelected: {fileID: 0}
-  m_sendNavigationEvents: 1
-  m_DragThreshold: 10
---- !u!4 &488143139
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 488143136}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 6
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &677662897
 GameObject:
   m_ObjectHideFlags: 0
@@ -1297,7 +1231,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0.000061035, y: 103}
+  m_AnchoredPosition: {x: 0.000061035, y: 64}
   m_SizeDelta: {x: 388.5, y: 80.8}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1040909059
@@ -2104,6 +2038,72 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1486058019}
   m_CullTransparentMesh: 0
+--- !u!1 &1539074417
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1539074420}
+  - component: {fileID: 1539074419}
+  - component: {fileID: 1539074418}
+  m_Layer: 0
+  m_Name: EventSystem
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &1539074418
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1539074417}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalAxis: Horizontal
+  m_VerticalAxis: Vertical
+  m_SubmitButton: Jump
+  m_CancelButton: Pause
+  m_InputActionsPerSecond: 10
+  m_RepeatDelay: 0.5
+  m_ForceModuleActive: 0
+--- !u!114 &1539074419
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1539074417}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_FirstSelected: {fileID: 1040909057}
+  m_sendNavigationEvents: 1
+  m_DragThreshold: 10
+--- !u!4 &1539074420
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1539074417}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 6
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1579256708
 GameObject:
   m_ObjectHideFlags: 0
@@ -2376,7 +2376,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0.000061035, y: -158}
+  m_AnchoredPosition: {x: 0.000061035, y: -197}
   m_SizeDelta: {x: 286.2, y: 82.6}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1952506482

Assets/Scripts/FloorLevel.cs

@@ -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

@@ -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

@@ -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

@@ -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);
             
         }

ProjectSettings/EditorBuildSettings.asset

@@ -17,6 +17,9 @@ EditorBuildSettings:
   - enabled: 1
     path: Assets/Scenes/Waypoint Race.unity
     guid: bdc3fbfbcb669514bb88dd980ef3b259
+  - enabled: 1
+    path: Assets/Scenes/Game Over Screen.unity
+    guid: 299c66332b5b9f44d8d477f77a2efa37
   m_configObjects:
     com.unity.input.settings: {fileID: 11400000, guid: 5dbe934aa009ccc4591ccf96f49a3d48,
       type: 2}

ProjectSettings/InputManager.asset

@@ -165,6 +165,22 @@ InputManager:
     type: 2
     axis: 0
     joyNum: 0
+  - serializedVersion: 3
+    m_Name: Horizontal
+    descriptiveName: 
+    descriptiveNegativeName: 
+    negativeButton: 
+    positiveButton: 
+    altNegativeButton: 
+    altPositiveButton: 
+    gravity: 1000
+    dead: 0.19
+    sensitivity: 1
+    snap: 0
+    invert: 0
+    type: 2
+    axis: 5
+    joyNum: 0
   - serializedVersion: 3
     m_Name: Vertical
     descriptiveName: 
@@ -181,6 +197,22 @@ InputManager:
     type: 2
     axis: 1
     joyNum: 0
+  - serializedVersion: 3
+    m_Name: Vertical
+    descriptiveName: 
+    descriptiveNegativeName: 
+    negativeButton: 
+    positiveButton: 
+    altNegativeButton: 
+    altPositiveButton: 
+    gravity: 1000
+    dead: 0.19
+    sensitivity: 1
+    snap: 0
+    invert: 0
+    type: 2
+    axis: 6
+    joyNum: 0
   - serializedVersion: 3
     m_Name: Crouch
     descriptiveName: 
@@ -254,7 +286,7 @@ InputManager:
     altNegativeButton: 
     altPositiveButton: 
     gravity: 0
-    dead: 0.25
+    dead: 0.5
     sensitivity: 1
     snap: 0
     invert: 0
@@ -270,7 +302,7 @@ InputManager:
     altNegativeButton: 
     altPositiveButton: 
     gravity: 0
-    dead: 0.25
+    dead: 0.5
     sensitivity: 1
     snap: 0
     invert: 1