Wireline-Studios/JourneyProject
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pause menu initialization changes

Browse Source
This commit is contained in:
Isaac Pond
2025-11-21 13:13:04 -08:00
parent a98e003edc
commit 70d60bfcd9
6 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Assets/Materials/leaf.mat
View File

@@ -20,7 +20,8 @@ Material:
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
disabledShaderPasses:
- MOTIONVECTORS
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3

3
Assets/Materials/trunk.mat
View File

@@ -20,7 +20,8 @@ Material:
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
disabledShaderPasses:
- MOTIONVECTORS
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3

BIN
Assets/Scenes/Scene1-1.unity LFS
View File

Binary file not shown.

20
Assets/Scripts/PauseMenuControls.cs
View File

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

4
Assets/Scripts/PlayerCam.cs
View File

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

10
Assets/Scripts/PlayerMovement.cs
View File

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