diff --git a/Assets/Resources/Prefabs/Stage_Default.prefab b/Assets/Resources/Prefabs/Stage_Default.prefab index aac6d63c9dca9fdcb5b73eecf454469f0512decf..b18a78ee997f0ca01c0eef2859312efb7ee84857 100644 --- a/Assets/Resources/Prefabs/Stage_Default.prefab +++ b/Assets/Resources/Prefabs/Stage_Default.prefab @@ -2857,6 +2857,34 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 2822275412857346440} m_PrefabAsset: {fileID: 0} +--- !u!1 &3231672575207917305 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 861183262000521073, guid: b996060e27da25c498842defc1996d84, + type: 3} + m_PrefabInstance: {fileID: 2822275412857346440} + m_PrefabAsset: {fileID: 0} +--- !u!114 &4705772093382662422 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3231672575207917305} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fc18334af0ab5ac4c9487f0675dbd439, type: 3} + m_Name: + m_EditorClassIdentifier: + factLayerMask: + serializedVersion: 2 + m_Bits: 64512 + HidingCanvas: {fileID: 3231672575207917310} +--- !u!224 &3231672575207917310 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 861183262000521078, guid: b996060e27da25c498842defc1996d84, + type: 3} + m_PrefabInstance: {fileID: 2822275412857346440} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4633513391531001248 PrefabInstance: m_ObjectHideFlags: 0 @@ -3584,6 +3612,12 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: [] +--- !u!224 &1734510802335769907 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6368005777045954707, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, + type: 3} + m_PrefabInstance: {fileID: 4633513391531001248} + m_PrefabAsset: {fileID: 0} --- !u!1 &4584836137803151881 stripped GameObject: m_CorrespondingSourceObject: {fileID: 9218050178699362217, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, @@ -3605,7 +3639,7 @@ MonoBehaviour: factLayerMask: serializedVersion: 2 m_Bits: 64512 - HidingCanvas: {fileID: 0} + HidingCanvas: {fileID: 1734510802335769907} --- !u!1 &4982402009794970575 stripped GameObject: m_CorrespondingSourceObject: {fileID: 389710745492588143, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, diff --git a/Assets/Scripts/InteractionEngine/WorldFactInteraction.cs b/Assets/Scripts/InteractionEngine/WorldFactInteraction.cs index 89408b674fe77b78d07217399f293ad92a7cc319..7517a9196e19da9be30c731b5f275a0f6479d5bb 100644 --- a/Assets/Scripts/InteractionEngine/WorldFactInteraction.cs +++ b/Assets/Scripts/InteractionEngine/WorldFactInteraction.cs @@ -14,9 +14,17 @@ public class WorldFactInteraction : MonoBehaviour private GameObject currentDisplay; private Transform lastHit = null; - + private bool canRun = false; + private void Update() + { + // disable this script if HidingCanvas does not render + canRun = HidingCanvas.GetComponent<Canvas>().enabled; + } void LateUpdate() { + if (!canRun) + return; + if (currentDisplay != null && currentDisplay.GetComponent<DragHandling>().dragged) { // currently dragging -> remove transparency to indicate dragging and let DragHandling.cs take over