pause menu initialization changes
This commit is contained in:
@@ -30,9 +30,9 @@ public class PauseMenuControls : MonoBehaviour
|
||||
public TextMeshProUGUI SensitvityShow;
|
||||
public GameObject Sens;
|
||||
|
||||
public Canvas mainCanvas;
|
||||
public Canvas pauseCanvas;
|
||||
public Canvas settingsCanvas;
|
||||
public GameObject mainCanvas;
|
||||
public GameObject pauseCanvas;
|
||||
public GameObject settingsCanvas;
|
||||
|
||||
|
||||
void Start()
|
||||
@@ -148,9 +148,9 @@ public class PauseMenuControls : MonoBehaviour
|
||||
|
||||
public void ResumeGame()
|
||||
{
|
||||
mainCanvas.enabled = true;
|
||||
pauseCanvas.enabled = false;
|
||||
settingsCanvas.enabled = false;
|
||||
mainCanvas.SetActive(true);
|
||||
pauseCanvas.SetActive(false);
|
||||
settingsCanvas.SetActive(false);
|
||||
Time.timeScale = 1;
|
||||
Cursor.lockState = CursorLockMode.Locked;
|
||||
Cursor.visible = false;
|
||||
@@ -163,12 +163,12 @@ public class PauseMenuControls : MonoBehaviour
|
||||
|
||||
public void OpenSettings()
|
||||
{
|
||||
pauseCanvas.enabled = false;
|
||||
settingsCanvas.enabled = true;
|
||||
pauseCanvas.SetActive(false);
|
||||
settingsCanvas.SetActive(true);
|
||||
}
|
||||
public void CloseSettings()
|
||||
{
|
||||
settingsCanvas.enabled = false;
|
||||
pauseCanvas.enabled = true;
|
||||
settingsCanvas.SetActive(false);
|
||||
pauseCanvas.SetActive(true);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -51,8 +51,8 @@ public class PlayerCam : MonoBehaviour
|
||||
sens = Sensitivity.value;
|
||||
if (canLook)
|
||||
{
|
||||
yRotation += lookInput.x * sens * Time.deltaTime;
|
||||
xRotation -= lookInput.y * sens * Time.deltaTime;
|
||||
yRotation += lookInput.x * sens * 50 * Time.deltaTime;
|
||||
xRotation -= lookInput.y * sens * 50 * Time.deltaTime;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -225,17 +225,17 @@ public class PlayerMovement : MonoBehaviour
|
||||
{
|
||||
if (Time.timeScale == 1 && context.performed)
|
||||
{
|
||||
uiController.GetComponent<PauseMenuControls>().mainCanvas.enabled = false;
|
||||
uiController.GetComponent<PauseMenuControls>().pauseCanvas.enabled = true;
|
||||
uiController.GetComponent<PauseMenuControls>().mainCanvas.SetActive(false);
|
||||
uiController.GetComponent<PauseMenuControls>().pauseCanvas.SetActive(true);
|
||||
Time.timeScale = 0;
|
||||
Cursor.lockState = CursorLockMode.None;
|
||||
Cursor.visible = true;
|
||||
}
|
||||
else if (context.performed)
|
||||
{
|
||||
uiController.GetComponent<PauseMenuControls>().mainCanvas.enabled = true;
|
||||
uiController.GetComponent<PauseMenuControls>().pauseCanvas.enabled = false;
|
||||
uiController.GetComponent<PauseMenuControls>().settingsCanvas.enabled = false;
|
||||
uiController.GetComponent<PauseMenuControls>().mainCanvas.SetActive(true);
|
||||
uiController.GetComponent<PauseMenuControls>().pauseCanvas.SetActive(false);
|
||||
uiController.GetComponent<PauseMenuControls>().settingsCanvas.SetActive(false);
|
||||
Time.timeScale = 1;
|
||||
Cursor.lockState = CursorLockMode.Locked;
|
||||
Cursor.visible = false;
|
||||
|
||||
Reference in New Issue
Block a user