diff --git a/Assets/Scenes/MainGame.shade b/Assets/Scenes/MainGame.shade index b2f41cec..2bbb7070 100644 --- a/Assets/Scenes/MainGame.shade +++ b/Assets/Scenes/MainGame.shade @@ -8526,8 +8526,8 @@ moveForce: 50 sprintMultiplier: 1.5 rotationFactorPerFrame: 5 - maxJumpHeight: 1 - maxJumpTime: 0.5 + maxJumpHeight: 2 + maxJumpTime: 0.75 fallMultipler: 3 lightMultiper: 0.75 mediumMultiper: 0.5 @@ -8633,7 +8633,7 @@ IsActive: true Renderable Component: Mesh: 140964851 - Material: 126974645 + Material: 124370424 IsActive: true RigidBody Component: Type: Dynamic @@ -8837,7 +8837,7 @@ IsActive: true Renderable Component: Mesh: 140964851 - Material: 126974645 + Material: 124370424 IsActive: true RigidBody Component: Type: Dynamic @@ -9041,7 +9041,7 @@ IsActive: true Renderable Component: Mesh: 140964851 - Material: 126974645 + Material: 124370424 IsActive: true RigidBody Component: Type: Dynamic diff --git a/Assets/Scripts/AIBehaviour/Implemented/LeafNodes/LeafPatrol.cs b/Assets/Scripts/AIBehaviour/Implemented/LeafNodes/LeafPatrol.cs index 2f9c8e1a..84c45779 100644 --- a/Assets/Scripts/AIBehaviour/Implemented/LeafNodes/LeafPatrol.cs +++ b/Assets/Scripts/AIBehaviour/Implemented/LeafNodes/LeafPatrol.cs @@ -240,6 +240,8 @@ public partial class LeafPatrol : BehaviourTreeNode { //Debug.Log("Unalert"); Audio.PlaySFXOnce2D("event:/Homeowner/humming"); + Audio.StopAllSounds(); + Audio.PlayBGMOnce2D("event:/Music/player_undetected"); } SetNodeData("isAlert", false); } diff --git a/Assets/Scripts/AIBehaviour/Implemented/LeafNodes/LeafSearch.cs b/Assets/Scripts/AIBehaviour/Implemented/LeafNodes/LeafSearch.cs index 4fa5e376..7c68712c 100644 --- a/Assets/Scripts/AIBehaviour/Implemented/LeafNodes/LeafSearch.cs +++ b/Assets/Scripts/AIBehaviour/Implemented/LeafNodes/LeafSearch.cs @@ -186,12 +186,18 @@ public partial class LeafSearch : BehaviourTreeNode { SetNodeData("isAlert", true); Audio.PlaySFXOnce2D("event:/Homeowner/homeowner_detect_raccoon"); + Audio.PlaySFXOnce2D("event:/Music/stingers/player_detected"); + Audio.StopAllSounds(); + Audio.PlayBGMOnce2D("event:/Music/player_detected"); } else { if (GetNodeData("isAlert") != null && (bool)GetNodeData("isAlert") == false) { Audio.PlaySFXOnce2D("event:/Homeowner/homeowner_detect_raccoon"); + Audio.PlaySFXOnce2D("event:/Music/stingers/player_detected"); + Audio.StopAllSounds(); + Audio.PlayBGMOnce2D("event:/Music/player_detected"); } SetNodeData("isAlert", true); } diff --git a/Assets/Scripts/Gameplay/Player/SC_PlayerController.cs b/Assets/Scripts/Gameplay/Player/SC_PlayerController.cs index 47dd2c41..c9e7b81e 100644 --- a/Assets/Scripts/Gameplay/Player/SC_PlayerController.cs +++ b/Assets/Scripts/Gameplay/Player/SC_PlayerController.cs @@ -119,7 +119,6 @@ public class PlayerController : Script protected override void lateUpdate() { - //rb.FreezePositionY = false; } protected override void update() { @@ -152,6 +151,7 @@ public class PlayerController : Script camArm = GetComponentInChildren(); Rotation(); + Jump(); GotCaught(); //Debug.Log($"{currentState}"); //Debug.Log($" axisX: {axisMove.x} axisY:{axisMove.y}"); @@ -165,7 +165,6 @@ public class PlayerController : Script MoveKey(); Move(); Sprint(); - Jump(); Gravity(); //Debug.Log($"X: {rb.LinearVelocity.x}" + $" Z: {rb.LinearVelocity.z}"); } diff --git a/Assets/Scripts/SC_EndScene.cs b/Assets/Scripts/SC_EndScene.cs index d22157a4..8d3104c5 100644 --- a/Assets/Scripts/SC_EndScene.cs +++ b/Assets/Scripts/SC_EndScene.cs @@ -14,12 +14,14 @@ public class EndScene : Script if (Input.GetKey(Input.KeyCode.R)) { Audio.PlaySFXOnce2D("event:/UI/mouse_down_element"); + Audio.StopAllSounds(); SceneManager.ChangeScene(mainGameScene); } if (Input.GetKey(Input.KeyCode.M)) { Audio.PlaySFXOnce2D("event:/UI/mouse_down_element"); + Audio.StopAllSounds(); SceneManager.ChangeScene(mainMainScene); }