diff --git a/Assets/Scenes/JasonScene.unity b/Assets/Scenes/JasonScene.unity index e22a40e..cabf7b3 100644 --- a/Assets/Scenes/JasonScene.unity +++ b/Assets/Scenes/JasonScene.unity @@ -215,6 +215,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 1214567908930553594, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3} m_PrefabInstance: {fileID: 1942557562} m_PrefabAsset: {fileID: 0} +--- !u!1 &1186739821 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1844274959428875625, guid: e1dac4f28fe75a547b919b7aa8240fed, type: 3} + m_PrefabInstance: {fileID: 1551362086} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1359990804 PrefabInstance: m_ObjectHideFlags: 0 @@ -226,6 +231,10 @@ PrefabInstance: propertyPath: gameTimer value: objectReference: {fileID: 344214379} + - target: {fileID: 1359990806, guid: 581322f036f3ff1448d4d2ec70f295a4, type: 3} + propertyPath: startPrompt + value: + objectReference: {fileID: 1186739821} - target: {fileID: 4164153230343464235, guid: 581322f036f3ff1448d4d2ec70f295a4, type: 3} propertyPath: globalCamera value: @@ -423,6 +432,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 3328484984159178892, guid: f7f5d2b1228d13f4d9015073aced3e81, type: 3} m_PrefabInstance: {fileID: 647315810} m_PrefabAsset: {fileID: 0} +--- !u!1 &1596616199 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 763564871199756608, guid: e1dac4f28fe75a547b919b7aa8240fed, type: 3} + m_PrefabInstance: {fileID: 1551362086} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1942557562 PrefabInstance: m_ObjectHideFlags: 0 @@ -582,6 +596,10 @@ PrefabInstance: propertyPath: globalCamera value: objectReference: {fileID: 1557338110} + - target: {fileID: 1214567908930553592, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3} + propertyPath: safeZonePrompt + value: + objectReference: {fileID: 1596616199} - target: {fileID: 1214567908930553592, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3} propertyPath: gameFlowManager value: diff --git a/Assets/Scripts/Monster.cs b/Assets/Scripts/Monster.cs index 5260077..9a6e5b4 100644 --- a/Assets/Scripts/Monster.cs +++ b/Assets/Scripts/Monster.cs @@ -69,7 +69,6 @@ public class Monster : AIEntity { } public override BaseState? FixedUpdateState() { - Debug.Log($"Velocity: {entity.rb.velocity.magnitude}"); return entity.rb.velocity.magnitude < entity.AIStats.MinVelocityWhenThrown ? new FindTargetState(entity) : null; diff --git a/Assets/Scripts/PlayerMovement.cs b/Assets/Scripts/PlayerMovement.cs index 6ec4ee9..b48b0a5 100644 --- a/Assets/Scripts/PlayerMovement.cs +++ b/Assets/Scripts/PlayerMovement.cs @@ -49,7 +49,7 @@ public class PlayerMovement : MonoBehaviour { if (gameFlowManager.Paused) return; - if (safeZone != null && safeZone.IsInSafeZone) { + if (safeZone != null && IsInSafeZone) { safeZonePrompt.SetActive(false); } else { safeZonePrompt.SetActive(true);