From 226d92b12680f464a5d2cb35126bda9b34539d27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20Sch=C3=B6ner?= <tobias.stonehead@gmail.com>
Date: Tue, 14 Feb 2023 12:34:32 +0100
Subject: [PATCH] feat: add WordFactInteraction to non-mobile UI as well
---
Assets/Resources/Prefabs/Stage_Default.prefab | 45 ++++++++++++++++++-
.../InteractionEngine/WorldFactInteraction.cs | 4 +-
2 files changed, 46 insertions(+), 3 deletions(-)
diff --git a/Assets/Resources/Prefabs/Stage_Default.prefab b/Assets/Resources/Prefabs/Stage_Default.prefab
index 75c661c5..d819d6e5 100644
--- a/Assets/Resources/Prefabs/Stage_Default.prefab
+++ b/Assets/Resources/Prefabs/Stage_Default.prefab
@@ -2379,6 +2379,21 @@ PrefabInstance:
propertyPath: m_OverrideSorting
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 4847292362846859827, guid: b996060e27da25c498842defc1996d84,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4847292362846859827, guid: b996060e27da25c498842defc1996d84,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4847292362846859827, guid: b996060e27da25c498842defc1996d84,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
- target: {fileID: 5037491956596048380, guid: b996060e27da25c498842defc1996d84,
type: 3}
propertyPath: m_AnchorMax.x
@@ -2437,7 +2452,7 @@ PrefabInstance:
- target: {fileID: 6244008554354758921, guid: b996060e27da25c498842defc1996d84,
type: 3}
propertyPath: m_AnchoredPosition.x
- value: 0
+ value: 940
objectReference: {fileID: 0}
- target: {fileID: 6244008554354758921, guid: b996060e27da25c498842defc1996d84,
type: 3}
@@ -2490,6 +2505,34 @@ RectTransform:
type: 3}
m_PrefabInstance: {fileID: 2822275412857346440}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &3020720018893859954 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 1063267681848407546, guid: b996060e27da25c498842defc1996d84,
+ type: 3}
+ m_PrefabInstance: {fileID: 2822275412857346440}
+ m_PrefabAsset: {fileID: 0}
+--- !u!114 &4078148274610786619
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3020720018893859954}
+ 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: 3020720018893859957}
+--- !u!224 &3020720018893859957 stripped
+RectTransform:
+ m_CorrespondingSourceObject: {fileID: 1063267681848407549, guid: b996060e27da25c498842defc1996d84,
+ type: 3}
+ m_PrefabInstance: {fileID: 2822275412857346440}
+ m_PrefabAsset: {fileID: 0}
--- !u!1001 &4633513391531001248
PrefabInstance:
m_ObjectHideFlags: 0
diff --git a/Assets/Scripts/InteractionEngine/WorldFactInteraction.cs b/Assets/Scripts/InteractionEngine/WorldFactInteraction.cs
index f1bb9a8a..89408b67 100644
--- a/Assets/Scripts/InteractionEngine/WorldFactInteraction.cs
+++ b/Assets/Scripts/InteractionEngine/WorldFactInteraction.cs
@@ -9,8 +9,8 @@
/// </summary>
public class WorldFactInteraction : MonoBehaviour
{
- public LayerMask factLayerMask;
- public Transform HidingCanvas;
+ [SerializeField] private LayerMask factLayerMask;
+ [SerializeField] private Transform HidingCanvas;
private GameObject currentDisplay;
private Transform lastHit = null;
--
GitLab