diff --git a/Assets/Prefabs/Environment/Sign.prefab b/Assets/Prefabs/Environment/Sign.prefab index 6d08e5f..6fe9dd0 100644 --- a/Assets/Prefabs/Environment/Sign.prefab +++ b/Assets/Prefabs/Environment/Sign.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 7072441087776005243} - component: {fileID: 8426239756890406194} - component: {fileID: 6741445596982526073} - m_Layer: 5 + m_Layer: 0 m_Name: Text (TMP) m_TagString: Untagged m_Icon: {fileID: 0} @@ -369,7 +369,7 @@ GameObject: - component: {fileID: 1039918501382505828} - component: {fileID: 6656584795593480448} - component: {fileID: 2654703776032602725} - m_Layer: 5 + m_Layer: 0 m_Name: Canvas m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Assets/Scripts/Environment/Pitfall.cs b/Assets/Scripts/Environment/Pitfall.cs index 0347da5..77bd611 100644 --- a/Assets/Scripts/Environment/Pitfall.cs +++ b/Assets/Scripts/Environment/Pitfall.cs @@ -121,9 +121,13 @@ public class Pitfall : NetworkBehaviour List itemList = itemsAsString.Split(',').ToList(); character.GetComponentInChildren().UpdateEquips(itemList, this.gameObject.GetComponent().ItemDict); - GameHandler.FindGameObjectInChildWithTag(character, "PlayerCam").GetComponent().enabled = true; - GameHandler.FindGameObjectInChildWithTag(character, "PlayerCam").GetComponent().enabled = true; - GameHandler.FindGameObjectInChildWithTag(character, "PlayerCam").GetComponent().enabled = true; + + GameObject UICamera = GameHandler.FindGameObjectInChildWithTag(character, "UICam"); + + GameHandler.FindGameObjectInChildWithTag(character, "UICam").GetComponent().enabled = true; + GameHandler.FindGameObjectInChildWithTag(UICamera, "PlayerCam").GetComponent().enabled = true; + GameHandler.FindGameObjectInChildWithTag(UICamera, "PlayerCam").GetComponent().enabled = true; + GameHandler.FindGameObjectInChildWithTag(UICamera, "PlayerCam").GetComponent().enabled = true; character.GetComponentInChildren().enabled = true; character.GetComponentInChildren().enabled = true; diff --git a/Assets/Scripts/Game/EndCollider.cs b/Assets/Scripts/Game/EndCollider.cs index c05dd62..6c2d6b5 100644 --- a/Assets/Scripts/Game/EndCollider.cs +++ b/Assets/Scripts/Game/EndCollider.cs @@ -83,8 +83,11 @@ public class EndCollider : NetworkBehaviour { foreach (GameObject character in playableCharacters) { if (character.GetComponent().OwnerClientId == otherRunnerClientID) { - GameHandler.FindGameObjectInChildWithTag(character, "PlayerCam").GetComponent().enabled = true; - GameHandler.FindGameObjectInChildWithTag(character, "PlayerCam").GetComponent().enabled = true; + GameObject UICamera = GameHandler.FindGameObjectInChildWithTag(character, "UICam"); + + //GameHandler.FindGameObjectInChildWithTag(character, "UICam").GetComponent().enabled = true; + GameHandler.FindGameObjectInChildWithTag(UICamera, "PlayerCam").GetComponent().enabled = true; + GameHandler.FindGameObjectInChildWithTag(UICamera, "PlayerCam").GetComponent().enabled = true; } } diff --git a/Assets/Scripts/PlayerScripts/DebugStateMachine/DebugAerialState/dAerialStateManager.cs b/Assets/Scripts/PlayerScripts/DebugStateMachine/DebugAerialState/dAerialStateManager.cs index 5bb42b1..badecd4 100644 --- a/Assets/Scripts/PlayerScripts/DebugStateMachine/DebugAerialState/dAerialStateManager.cs +++ b/Assets/Scripts/PlayerScripts/DebugStateMachine/DebugAerialState/dAerialStateManager.cs @@ -245,7 +245,7 @@ public class dAerialStateManager : NetworkBehaviour } } } - else if(Physics.Raycast(groundRay, out groundHit, moveController.height + groundSlantDistance) && !jumpPressed){ + else if(Physics.Raycast(groundRay, out groundHit, moveController.height + groundSlantDistance) && !jumpPressed && curCoyJumpTimer <= 0){ if(Vector3.Dot(groundHit.normal, transform.up) > 0f){ moveController.Move(groundHit.normal * 20 * Time.deltaTime); mSM.CancelMomentum(); diff --git a/Assets/Scripts/PlayerScripts/NetworkedStateMachines/AerialState/AerialStateManager.cs b/Assets/Scripts/PlayerScripts/NetworkedStateMachines/AerialState/AerialStateManager.cs index dac9162..9bcca50 100644 --- a/Assets/Scripts/PlayerScripts/NetworkedStateMachines/AerialState/AerialStateManager.cs +++ b/Assets/Scripts/PlayerScripts/NetworkedStateMachines/AerialState/AerialStateManager.cs @@ -272,7 +272,7 @@ public class AerialStateManager : NetworkBehaviour } } } - else if(Physics.Raycast(groundRay, out groundHit, moveController.height + groundSlantDistance) && !jumpPressed){ + else if(Physics.Raycast(groundRay, out groundHit, moveController.height + groundSlantDistance) && !jumpPressed && curCoyJumpTimer <= 0 ){ if(Vector3.Dot(groundHit.normal, transform.up) > 0f){ Debug.Log("On a Slant"); // Debug.Log("The grounds Normal" + groundHit.normal); diff --git a/Assets/Scripts/UI/PauseMenu.cs b/Assets/Scripts/UI/PauseMenu.cs index dbad3a0..d90998d 100644 --- a/Assets/Scripts/UI/PauseMenu.cs +++ b/Assets/Scripts/UI/PauseMenu.cs @@ -278,9 +278,12 @@ public class PauseMenu : NetworkBehaviour { List itemList = itemsAsString.Split(',').ToList(); character.GetComponentInChildren().UpdateEquips(itemList, this.gameObject.GetComponent().ItemDict); - GameHandler.FindGameObjectInChildWithTag(character, "PlayerCam").GetComponent().enabled = true; - GameHandler.FindGameObjectInChildWithTag(character, "PlayerCam").GetComponent().enabled = true; - GameHandler.FindGameObjectInChildWithTag(character, "PlayerCam").GetComponent().enabled = true; + GameObject UICamera = GameHandler.FindGameObjectInChildWithTag(character, "UICam"); + + GameHandler.FindGameObjectInChildWithTag(character, "UICam").GetComponent().enabled = true; + GameHandler.FindGameObjectInChildWithTag(UICamera, "PlayerCam").GetComponent().enabled = true; + GameHandler.FindGameObjectInChildWithTag(UICamera, "PlayerCam").GetComponent().enabled = true; + GameHandler.FindGameObjectInChildWithTag(UICamera, "PlayerCam").GetComponent().enabled = true; character.GetComponentInChildren().enabled = true; character.GetComponentInChildren().enabled = true;