diff --git a/IronToad_UnityProject/Assets/Scripts/HidingSpot.cs b/IronToad_UnityProject/Assets/Scripts/HidingSpot.cs index 1150dc0..b2877ea 100644 --- a/IronToad_UnityProject/Assets/Scripts/HidingSpot.cs +++ b/IronToad_UnityProject/Assets/Scripts/HidingSpot.cs @@ -17,13 +17,17 @@ public class HidingSpot : MonoBehaviour { } void OnTriggerEnter(Collider other) { - if (other.gameObject.CompareTag("Player")) + if (other.gameObject.CompareTag("Player")) { Searchlight.playerHidden = true; + Debug.Log("player here"); + } } void OnTriggerExit(Collider other) { - if (other.gameObject.CompareTag("Player")) + if (other.gameObject.CompareTag("Player")) { Searchlight.playerHidden = false; + Debug.Log("player exit"); + } } } diff --git a/IronToad_UnityProject/Assets/Scripts/Searchlight.cs b/IronToad_UnityProject/Assets/Scripts/Searchlight.cs index 5c354d0..a2dce54 100644 --- a/IronToad_UnityProject/Assets/Scripts/Searchlight.cs +++ b/IronToad_UnityProject/Assets/Scripts/Searchlight.cs @@ -47,7 +47,7 @@ public class Searchlight : MonoBehaviour void OnTriggerEnter(Collider other) { - if (other.tag != "Player") + if (other.tag != "Player" || playerHidden ) return; chased = other; isTriggering = true; @@ -64,7 +64,7 @@ public class Searchlight : MonoBehaviour void OnTriggerExit(Collider other) { - if (other.tag != "Player" || playerHidden) + if (other.tag != "Player" ) return; isTriggering = false; if (state == SearchState.Chasing && !isTriggeringAtLeastOne()) diff --git a/IronToad_UnityProject/Assets/_Scenes/GreyBox_Prototype.unity b/IronToad_UnityProject/Assets/_Scenes/GreyBox_Prototype.unity index 9d75dbc..8e6df44 100644 Binary files a/IronToad_UnityProject/Assets/_Scenes/GreyBox_Prototype.unity and b/IronToad_UnityProject/Assets/_Scenes/GreyBox_Prototype.unity differ diff --git a/IronToad_UnityProject/Assets/water/Water.mat b/IronToad_UnityProject/Assets/water/Water.mat index faf0bbc..d7600b2 100644 Binary files a/IronToad_UnityProject/Assets/water/Water.mat and b/IronToad_UnityProject/Assets/water/Water.mat differ