diff --git a/Assets/Resources/Prefabs/Stage_Default.prefab b/Assets/Resources/Prefabs/Stage_Default.prefab index a7d03e5445d15a695dfe2cae55d836c52b37fea5..6372e65faf79b90ff0b2773b8beaf67b2ab3bb1f 100644 --- a/Assets/Resources/Prefabs/Stage_Default.prefab +++ b/Assets/Resources/Prefabs/Stage_Default.prefab @@ -2137,7 +2137,7 @@ PrefabInstance: - target: {fileID: 1063267681976544647, guid: b996060e27da25c498842defc1996d84, type: 3} propertyPath: m_Value - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1063267682090589445, guid: b996060e27da25c498842defc1996d84, type: 3} @@ -2511,11 +2511,6 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 558514683179411186, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, - type: 3} - propertyPath: m_SortingOrder - value: 10 - objectReference: {fileID: 0} - target: {fileID: 625961838730955993, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, type: 3} propertyPath: m_Enabled @@ -3040,6 +3035,12 @@ MonoBehaviour: m_EditorClassIdentifier: m_MovementRange: 50 m_ControlPath: <Gamepad>/leftStick +--- !u!224 &1406371023619087976 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6037608700817923016, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, + type: 3} + m_PrefabInstance: {fileID: 4633513391531001248} + m_PrefabAsset: {fileID: 0} --- !u!1 &4584836137803151881 stripped GameObject: m_CorrespondingSourceObject: {fileID: 9218050178699362217, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, @@ -3058,10 +3059,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fc18334af0ab5ac4c9487f0675dbd439, type: 3} m_Name: m_EditorClassIdentifier: - mathModeCanvas: {fileID: 0} factLayerMask: serializedVersion: 2 m_Bits: 64512 + HidingCanvas: {fileID: 1406371023619087976} --- !u!1 &4982402009794970575 stripped GameObject: m_CorrespondingSourceObject: {fileID: 389710745492588143, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, diff --git a/Assets/Resources/Prefabs/UI/Ingame/FrameITUI_mobile.prefab b/Assets/Resources/Prefabs/UI/Ingame/FrameITUI_mobile.prefab index c252ce6ba41851b0aa13d8ef0209ffd1e0363d80..d9d286d678a7487aeefa57cc210ed699541738e2 100644 --- a/Assets/Resources/Prefabs/UI/Ingame/FrameITUI_mobile.prefab +++ b/Assets/Resources/Prefabs/UI/Ingame/FrameITUI_mobile.prefab @@ -3755,7 +3755,7 @@ Canvas: m_SortingBucketNormalizedSize: 0 m_AdditionalShaderChannelsFlag: 25 m_SortingLayerID: 0 - m_SortingOrder: 10 + m_SortingOrder: 0 m_TargetDisplay: 0 --- !u!114 &1831671680050863756 MonoBehaviour: diff --git a/Assets/Scripts/InteractionEngine/WorldFactInteraction.cs b/Assets/Scripts/InteractionEngine/WorldFactInteraction.cs index 17cc7374a23381c681fc31404d5702d90a895a68..8663faed0ce3b1e25a581a15ae1885cf13a1fb72 100644 --- a/Assets/Scripts/InteractionEngine/WorldFactInteraction.cs +++ b/Assets/Scripts/InteractionEngine/WorldFactInteraction.cs @@ -9,6 +9,7 @@ public class WorldFactInteraction : MonoBehaviour { public LayerMask factLayerMask; + public Transform HidingCanvas; private GameObject currentDisplay; private Transform lastHit = null; @@ -62,7 +63,8 @@ private void InstantiateNewDisplay(FactObject factObj) Destroy(currentDisplay); Fact fact = StageStatic.stage.factState[factObj.URI]; // TODO: this link to DisplayFacts is not ideal: maybe refactor to SciptableObject or such - currentDisplay = fact.instantiateDisplay(DisplayFacts.prefabDictionary[fact.GetType()], transform); + currentDisplay = fact.instantiateDisplay(DisplayFacts.prefabDictionary[fact.GetType()], HidingCanvas); + currentDisplay.transform.SetAsFirstSibling(); } #region Helper