From e1941e53223919a54c2d15394e3c1676c663aaea Mon Sep 17 00:00:00 2001 From: Nadine Ganz Date: Mon, 17 Mar 2025 14:39:02 +0100 Subject: [PATCH] Add Speech Alarm audio to handmenu; hide Idle Nonna Video in 3.2 --- .../Assets/BehaviourTrees/3.2-Grotto.bt.txt | 5 +- Viagg-io/Assets/Prefabs/UI/_HANDMENU.prefab | 100 ++++++++++++++++++ 2 files changed, 103 insertions(+), 2 deletions(-) diff --git a/Viagg-io/Assets/BehaviourTrees/3.2-Grotto.bt.txt b/Viagg-io/Assets/BehaviourTrees/3.2-Grotto.bt.txt index b2553b0..14948a3 100644 --- a/Viagg-io/Assets/BehaviourTrees/3.2-Grotto.bt.txt +++ b/Viagg-io/Assets/BehaviourTrees/3.2-Grotto.bt.txt @@ -500,8 +500,9 @@ Tree("32_Grotto_Story_B_Grotto_Antwort_Nonna_Grotto") { } } - BTC.SynthesizeText("Mentre aspetti, se vuoi puoi dare un'occhiata alle foto che ho scattato di recente in Bregaglia. Puoi usare il visore che trovi sul tavolo.") - BTC.SpeechOutputEnded() + BTC.Hide("Depthkit.VIDEOS.IdleLoopNonnaGrott") + //BTC.SynthesizeText("Mentre aspetti, se vuoi puoi dare un'occhiata alle foto che ho scattato di recente in Bregaglia. Puoi usare il visore che trovi sul tavolo.") + //BTC.SpeechOutputEnded() // TODO: Option VR Brille Bilder und Buch anschauen fehlt BTC.Wait(10) diff --git a/Viagg-io/Assets/Prefabs/UI/_HANDMENU.prefab b/Viagg-io/Assets/Prefabs/UI/_HANDMENU.prefab index af8096f..b1b0dc4 100644 --- a/Viagg-io/Assets/Prefabs/UI/_HANDMENU.prefab +++ b/Viagg-io/Assets/Prefabs/UI/_HANDMENU.prefab @@ -240,6 +240,7 @@ RectTransform: m_Children: - {fileID: 7937117793700210357} - {fileID: 3307118877399062237} + - {fileID: 784431681836084746} m_Father: {fileID: 1358931757919523100} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -1660,6 +1661,105 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &1451213738793270481 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 784431681836084746} + - component: {fileID: 4768190642636357489} + - component: {fileID: 1779658338136558249} + m_Layer: 9 + m_Name: SpeechAlarm + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &784431681836084746 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1451213738793270481} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3275877086145120985} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &4768190642636357489 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1451213738793270481} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9a6610d2e704f1648819acc8d7460285, type: 3} + m_Name: + m_EditorClassIdentifier: + CollisionTag: + EventReference: + Guid: + Data1: -2068560407 + Data2: 1318027983 + Data3: -837250152 + Data4: 1878482183 + Path: event:/Allgemein/Allgemein.Smartphone.Alarm.Piep + Event: + EventPlayTrigger: 11 + EventStopTrigger: 12 + AllowFadeout: 0 + TriggerOnce: 0 + Preload: 0 + NonRigidbodyVelocity: 0 + Params: [] + OverrideAttenuation: 0 + OverrideMinDistance: 0.7 + OverrideMaxDistance: 20 +--- !u!114 &1779658338136558249 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1451213738793270481} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9a6610d2e704f1648819acc8d7460285, type: 3} + m_Name: + m_EditorClassIdentifier: + CollisionTag: + EventReference: + Guid: + Data1: -1163200096 + Data2: 1213197754 + Data3: -608006258 + Data4: -105037913 + Path: event:/Allgemein/Allgemein.Smartphone.Alarm.Vibration + Event: + EventPlayTrigger: 11 + EventStopTrigger: 12 + AllowFadeout: 0 + TriggerOnce: 0 + Preload: 0 + NonRigidbodyVelocity: 0 + Params: [] + OverrideAttenuation: 0 + OverrideMinDistance: 0.7 + OverrideMaxDistance: 20 --- !u!1 &1492808684176202360 GameObject: m_ObjectHideFlags: 0