diff --git a/Game/Assets/Scenes/House.unity b/Game/Assets/Scenes/House.unity index 6c053b6..07a5303 100644 --- a/Game/Assets/Scenes/House.unity +++ b/Game/Assets/Scenes/House.unity @@ -718,7 +718,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: ' ' + m_text: Test m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -745,8 +745,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 36 - m_fontSizeBase: 36 + m_fontSize: 30 + m_fontSizeBase: 30 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -65065,7 +65065,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6045648537344725186, guid: a4a4b6738cb4ba34bb94baa14bd938f0, type: 3} propertyPath: m_LocalPosition.x - value: 74.828 + value: 71.972 objectReference: {fileID: 0} - target: {fileID: 6045648537344725186, guid: a4a4b6738cb4ba34bb94baa14bd938f0, type: 3} propertyPath: m_LocalPosition.y @@ -120290,6 +120290,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: detectionRange: 5 + gazeTimeRequired: 2 + displayTime: 5 infoText: {fileID: 9836844} --- !u!1 &1853702029 GameObject: @@ -138799,8 +138801,8 @@ MonoBehaviour: trashCollected: 0 trashRequired: 1 door: {fileID: 214241217} - lockedDoorUI: {fileID: 0} - unlockedDoorUI: {fileID: 0} + lockedDoorUI: {fileID: 1786768887} + unlockedDoorUI: {fileID: 1654433218} --- !u!43 &2060072005 Mesh: m_ObjectHideFlags: 0 diff --git a/Game/Assets/Scripts/BedroomTask.cs b/Game/Assets/Scripts/BedroomTask.cs index 528cffa..a702ba0 100644 --- a/Game/Assets/Scripts/BedroomTask.cs +++ b/Game/Assets/Scripts/BedroomTask.cs @@ -21,6 +21,8 @@ public class BedroomTask : MonoBehaviour // Defines the door public GameObject door; + + // Defines the grab interactable to know when the door is grabbed private XRGrabInteractable grabInteractable; // Defines door handle diff --git a/Game/ProjectSettings/ProjectSettings.asset b/Game/ProjectSettings/ProjectSettings.asset index 2e28279..bdc22fa 100644 --- a/Game/ProjectSettings/ProjectSettings.asset +++ b/Game/ProjectSettings/ProjectSettings.asset @@ -172,7 +172,7 @@ PlayerSettings: overrideDefaultApplicationIdentifier: 1 AndroidBundleVersionCode: 1 AndroidMinSdkVersion: 32 - AndroidTargetSdkVersion: 28 + AndroidTargetSdkVersion: 32 AndroidPreferredInstallLocation: 0 aotOptions: stripEngineCode: 1 @@ -939,7 +939,7 @@ PlayerSettings: hmiLogStartupTiming: 0 hmiCpuConfiguration: apiCompatibilityLevel: 6 - activeInputHandler: 1 + activeInputHandler: 2 windowsGamepadBackendHint: 0 cloudProjectId: framebufferDepthMemorylessMode: 0 diff --git a/Game/ProjectSettings/TagManager.asset b/Game/ProjectSettings/TagManager.asset index f86203b..9bf7ca1 100644 --- a/Game/ProjectSettings/TagManager.asset +++ b/Game/ProjectSettings/TagManager.asset @@ -7,6 +7,8 @@ TagManager: - Anchor - TrashBin - Destroyable + - Info + - InfoObject layers: - Default - TransparentFX