From f88d4e599849c7dc2a7389931e09c7a4610f8d65 Mon Sep 17 00:00:00 2001 From: Randall Date: Thu, 30 Nov 2017 13:34:49 -0600 Subject: [PATCH] Fixed issue preventing spies from moving. --- .../Assets/Scenes/GameScene.unity | 26 +++++----- .../ActionScripts/IdleClickAction.cs | 11 +++-- .../Assets/Scripts/UI/InGameMenuController.cs | 48 +++++++++---------- .../ProjectSettings/ProjectVersion.txt | 2 +- 4 files changed, 45 insertions(+), 42 deletions(-) diff --git a/Project Undercover/Assets/Scenes/GameScene.unity b/Project Undercover/Assets/Scenes/GameScene.unity index 5a59bd3..a590fad 100755 --- a/Project Undercover/Assets/Scenes/GameScene.unity +++ b/Project Undercover/Assets/Scenes/GameScene.unity @@ -77,17 +77,15 @@ LightmapSettings: m_PVRDirectSampleCount: 32 m_PVRSampleCount: 500 m_PVRBounces: 2 - m_PVRFilterTypeDirect: 0 - m_PVRFilterTypeIndirect: 0 - m_PVRFilterTypeAO: 0 + m_PVRFiltering: 0 m_PVRFilteringMode: 1 m_PVRCulling: 1 m_PVRFilteringGaussRadiusDirect: 1 m_PVRFilteringGaussRadiusIndirect: 5 m_PVRFilteringGaussRadiusAO: 2 - m_PVRFilteringAtrousPositionSigmaDirect: 0.5 - m_PVRFilteringAtrousPositionSigmaIndirect: 2 - m_PVRFilteringAtrousPositionSigmaAO: 1 + m_PVRFilteringAtrousColorSigma: 1 + m_PVRFilteringAtrousNormalSigma: 1 + m_PVRFilteringAtrousPositionSigma: 1 m_LightingDataAsset: {fileID: 0} m_UseShadowmask: 1 --- !u!196 &4 @@ -1326,12 +1324,12 @@ Prefab: - target: {fileID: 224003334026830312, guid: c67fa24334c0f364cad8798522e92116, type: 2} propertyPath: m_AnchoredPosition.y - value: 0 + value: -35 objectReference: {fileID: 0} - target: {fileID: 224003334026830312, guid: c67fa24334c0f364cad8798522e92116, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 70 objectReference: {fileID: 0} - target: {fileID: 224003334026830312, guid: c67fa24334c0f364cad8798522e92116, type: 2} @@ -2903,7 +2901,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0, g: 0, b: 0, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -5077,12 +5075,12 @@ Prefab: - target: {fileID: 224003334026830312, guid: c67fa24334c0f364cad8798522e92116, type: 2} propertyPath: m_AnchoredPosition.y - value: 0 + value: -35 objectReference: {fileID: 0} - target: {fileID: 224003334026830312, guid: c67fa24334c0f364cad8798522e92116, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 70 objectReference: {fileID: 0} - target: {fileID: 224003334026830312, guid: c67fa24334c0f364cad8798522e92116, type: 2} @@ -5660,7 +5658,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -6594,12 +6592,12 @@ Prefab: - target: {fileID: 224003334026830312, guid: c67fa24334c0f364cad8798522e92116, type: 2} propertyPath: m_AnchoredPosition.y - value: 0 + value: -35 objectReference: {fileID: 0} - target: {fileID: 224003334026830312, guid: c67fa24334c0f364cad8798522e92116, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 70 objectReference: {fileID: 0} - target: {fileID: 224003334026830312, guid: c67fa24334c0f364cad8798522e92116, type: 2} diff --git a/Project Undercover/Assets/Scripts/CharacterStateMachine/ActionScripts/IdleClickAction.cs b/Project Undercover/Assets/Scripts/CharacterStateMachine/ActionScripts/IdleClickAction.cs index abecc59..3266e3d 100644 --- a/Project Undercover/Assets/Scripts/CharacterStateMachine/ActionScripts/IdleClickAction.cs +++ b/Project Undercover/Assets/Scripts/CharacterStateMachine/ActionScripts/IdleClickAction.cs @@ -23,9 +23,14 @@ public class IdleClickAction : Action public override void Act(StateController controller) { // If the user clicks, but not on a UI object ... - if (EventSystem.current.IsPointerOverGameObject()) - Debug.Log("Clicking on UI element"); - if (Input.GetMouseButtonDown(0) && !EventSystem.current.IsPointerOverGameObject()) + GameObject target = null; + if (EventSystem.current.IsPointerOverGameObject()) + { + Debug.Log("Clicking on UI element"); + target = EventSystem.current.currentSelectedGameObject; + } + + if (Input.GetMouseButtonDown(0) && (target == null || !target.GetActive())) { if (controller.Interactor) { diff --git a/Project Undercover/Assets/Scripts/UI/InGameMenuController.cs b/Project Undercover/Assets/Scripts/UI/InGameMenuController.cs index 9dc258f..5b8b5ec 100644 --- a/Project Undercover/Assets/Scripts/UI/InGameMenuController.cs +++ b/Project Undercover/Assets/Scripts/UI/InGameMenuController.cs @@ -1,13 +1,13 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class InGameMenuController : MonoBehaviour { - - public static bool MenuBlocked { get; set; } - - public GameObject inGameMenu; - +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class InGameMenuController : MonoBehaviour { + + public static bool MenuBlocked { get; set; } + + public GameObject inGameMenu; + private void Start() { MenuBlocked = false; } @@ -17,19 +17,19 @@ public class InGameMenuController : MonoBehaviour { return; } if (Input.GetKeyDown(KeyCode.Escape)) { - EscapePressed(); - } - } - - void EscapePressed() { + EscapePressed(); + } + } + + void EscapePressed() { if (inGameMenu.GetActive()) { Resume(); - } else { - inGameMenu.SetActive(true); - } - } - - public void Resume() { - inGameMenu.SetActive(false); - } -} + } else { + inGameMenu.SetActive(true); + } + } + + public void Resume() { + inGameMenu.SetActive(false); + } +} diff --git a/Project Undercover/ProjectSettings/ProjectVersion.txt b/Project Undercover/ProjectSettings/ProjectVersion.txt index 4b80f92..a211ccd 100644 --- a/Project Undercover/ProjectSettings/ProjectVersion.txt +++ b/Project Undercover/ProjectSettings/ProjectVersion.txt @@ -1 +1 @@ -m_EditorVersion: 2017.1.2f1 +m_EditorVersion: 2017.1.1f1