diff --git a/Assets/Materials/leaf.mat b/Assets/Materials/leaf.mat index 7e8c3b7..ab1d39e 100644 --- a/Assets/Materials/leaf.mat +++ b/Assets/Materials/leaf.mat @@ -20,7 +20,8 @@ Material: m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 diff --git a/Assets/Materials/trunk.mat b/Assets/Materials/trunk.mat index ba3e0e4..aec35c9 100644 --- a/Assets/Materials/trunk.mat +++ b/Assets/Materials/trunk.mat @@ -20,7 +20,8 @@ Material: m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 diff --git a/Assets/Scenes/Scene1-1.unity b/Assets/Scenes/Scene1-1.unity index 48caa37..552b1c8 100644 --- a/Assets/Scenes/Scene1-1.unity +++ b/Assets/Scenes/Scene1-1.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:45e662a6d764db3a65a4d42d11e16424c6e7197795621b3365c1f155e88d4af9 -size 1418586 +oid sha256:1dbf24dfea5f4599236fa1780038f51e680055aa831deead404ce9c875ec5a36 +size 1418600 diff --git a/Assets/Scripts/PauseMenuControls.cs b/Assets/Scripts/PauseMenuControls.cs index ab35e96..fb41df7 100644 --- a/Assets/Scripts/PauseMenuControls.cs +++ b/Assets/Scripts/PauseMenuControls.cs @@ -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); } } diff --git a/Assets/Scripts/PlayerCam.cs b/Assets/Scripts/PlayerCam.cs index ee78ecb..7ee152d 100644 --- a/Assets/Scripts/PlayerCam.cs +++ b/Assets/Scripts/PlayerCam.cs @@ -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; } diff --git a/Assets/Scripts/PlayerMovement.cs b/Assets/Scripts/PlayerMovement.cs index cdeb3d4..e19c5a9 100644 --- a/Assets/Scripts/PlayerMovement.cs +++ b/Assets/Scripts/PlayerMovement.cs @@ -225,17 +225,17 @@ public class PlayerMovement : MonoBehaviour { if (Time.timeScale == 1 && context.performed) { - uiController.GetComponent().mainCanvas.enabled = false; - uiController.GetComponent().pauseCanvas.enabled = true; + uiController.GetComponent().mainCanvas.SetActive(false); + uiController.GetComponent().pauseCanvas.SetActive(true); Time.timeScale = 0; Cursor.lockState = CursorLockMode.None; Cursor.visible = true; } else if (context.performed) { - uiController.GetComponent().mainCanvas.enabled = true; - uiController.GetComponent().pauseCanvas.enabled = false; - uiController.GetComponent().settingsCanvas.enabled = false; + uiController.GetComponent().mainCanvas.SetActive(true); + uiController.GetComponent().pauseCanvas.SetActive(false); + uiController.GetComponent().settingsCanvas.SetActive(false); Time.timeScale = 1; Cursor.lockState = CursorLockMode.Locked; Cursor.visible = false;