Merge branch 'master' into leveldesign

# Conflicts:
#	Viagg-io/ProjectSettings/EditorBuildSettings.asset

Viagg-io/Assets/BehaviourTrees/3.2-Grotto.bt.txt

@@ -12,7 +12,7 @@
             }
 
             Composite(Sequence) {
-                //RunTree("32_Grotto_Story_B_Grotto_Intro")
+                RunTree("32_Grotto_Story_B_Grotto_Intro")
 
                 //RunTree("32_Grotto_Kueche_Intro")
                 //RunTree("32_Grotto_Kueche_Zwiebeln_schneiden")
@@ -20,7 +20,7 @@
                 //RunTree("32_Grotto_Kueche_Interesse_Kochen")
                 //RunTree("32_Grotto_Kueche_Kochen_Anzahl")
                 //RunTree("32_Grotto_Kueche_Zusammen_Kochen")
-                RunTree("32_Grotto_Kueche_Parmigiano")
+                //RunTree("32_Grotto_Kueche_Parmigiano")
                 //RunTree("32_Grotto_Im_Grotto_Essen_Intro")
             }
         }
@@ -42,6 +42,9 @@
 
 Tree("32_Grotto_Story_B_Grotto_Intro") {
     Composite(Sequence) {
+        // Initialization
+        BTC.Run("StudioEventEmitter.STATIC.AmbiGarten")
+
         BTC.Run("AudioSource.AUDIO.StoryBGrottoIntro1")
         BTC.Run("AudioSource.AUDIO.StoryBGrottoIntro2")
 
@@ -478,7 +481,10 @@ Tree("32_Grotto_Kueche_Intro") {
 // --- Kueche - Intro ---
     Composite(Sequence) {
         // Initialization
-        BTC.Run("StudioEventEmitter.STATIC.Ambi3D")
+        //BTC.Run("StudioEventEmitter.STATIC.Ambi3D")
+        BTC.StopSound("StudioEventEmitter.STATIC.AmbiGarten")
+        BTC.SetPosition("GO.XRInteractionHandsSetup.XROrigin", -7.036, 0, -16.413)
+        BTC.SetPosition("GO.HANDMENU", -7.036, 0, -16.413)
 
         BTC.Run("AudioSource.AUDIO.KuecheIntro1")
 
@@ -1244,8 +1250,8 @@ Tree("32_Grotto_Im_Grotto_Essen_Intro") {
             BTC.SetPosition("GO.XRInteractionHandsSetup.XROrigin", -4.648, 0, -12.295)
             BTC.SetPosition("GO.HANDMENU", -4.648, 0, -12.295)
             BTC.Run("StudioEventEmitter.STATIC.KuechenAmbi")
-            BTC.Run("StudioEventEmitter.AUDIO.Ambi2D")
+            BTC.Run("StudioEventEmitter.STATIC.AmbiGarten")
-            BTC.StopSound("StudioEventEmitter.STATIC.Ambi3D")
+            //BTC.StopSound("StudioEventEmitter.STATIC.Ambi3D")
             //BTC.StopSound("StudioEventEmitter.STATIC.HerdplatteAnstelle")
             BTC.StopSound("StudioEventEmitter.INTERACTABLES.Abloeschen")
         }
@@ -1330,9 +1336,62 @@ Tree("32_Grotto_Im_Grotto_Essen_Intro") {
     }
 }
 
+Tree("32_Grotto_Im_Grotto_Essen_Nachfrage_Kellner") {
+    Composite(Sequence) {
+        BTC.GetKeyDown("Return")
+        BTC.SetBool("drink_ordered", false)
+
+        Composite(Race) {
+            BTC.CompareBool("drink_ordered")
+
+            Decorator(Repeat) {
+                Composite(Sequence) {
+                    BTC.Run("AudioSource.AUDIO.ImGrottoessen1Nach")
+
+                    BTC.AddPossbileSpeechIntent("Im_Grotto_essen.Zweite_Bestellung.2")
+                    BTC.StartSpeechIntentRecognition()
+
+                    Composite(Race) {
+                        // -- Race 1: User sagt etwas
+                        Composite(Sequence) {
+                            BTC.UserStartedSpeechInput()
+                
+                            Composite(Selector) {
+                                // -- Selector 1: Intent erkannt
+                                Composite(Sequence) {
+                                    BTC.SpeechIntentRecognized()
+                                    BTC.ClearPossbileSpeechIntents()
+                                    RunTree("32_Grotto_Im_Grotto_Essen_Nachfrage_Kellner_Essen")
+                                }
+
+                                // -- Selector 2: Intent nicht erkannt
+                                Composite(Sequence) {
+                                    BTC.ClearPossbileSpeechIntents()
+                                    RunTree("32_Grotto_Im_Grotto_Essen_Nachfrage_Kellner_Essen")
+                                }
+                            }
+                        }
+
+                        // -- Race 2: User sagt nichts
+                        Composite(Sequence) {
+                            BTC.Wait(5)
+                            BTC.CompareUserSpeechInputStarted(false)
+                            BTC.AbortSpeechEventListener()
+                            BTC.StopSpeechIntentRecognition()
+                            BTC.ClearPossbileSpeechIntents()
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+}
+
 Tree("32_Grotto_Im_Grotto_Essen_Nachfrage_Kellner_Essen") {
     Composite(Sequence) {
         BTC.Run("AudioSource.AUDIO.ImGrottoessen1Esse")
+        BTC.GetKeyDown("Return")
 
     }
 }

Viagg-io/Assets/Prefabs/Components/NextButton.prefab

@@ -55,7 +55,7 @@ MonoBehaviour:
     m_SingletonActionBindings:
     - m_Name: 
       m_Id: 60ed3969-99ce-484e-a6ba-c03865d49b79
-      m_Path: <XRController>{RightHand}/{Secondary2DAxisClick}
+      m_Path: <XRController>{RightHand}/primaryButton
       m_Interactions: 
       m_Processors: 
       m_Groups: 

Viagg-io/Assets/Prefabs/UI/LoadAllScenesUI.prefab

@@ -6497,7 +6497,7 @@ MonoBehaviour:
     m_SingletonActionBindings:
     - m_Name: 
       m_Id: b76f0ec6-86c7-407a-9e72-af8eb46d85f5
-      m_Path: <XRController>{LeftHand}/{Primary2DAxisClick}
+      m_Path: <XRController>{LeftHand}/primaryButton
       m_Interactions: 
       m_Processors: 
       m_Groups: 

Viagg-io/Assets/Prefabs/UI/_HANDMENU.prefab

@@ -149,7 +149,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &1816826061814438359
 RectTransform:
   m_ObjectHideFlags: 0
@@ -331,7 +331,7 @@ GameObject:
   - component: {fileID: 240211946506320929}
   - component: {fileID: 5329492480982599062}
   m_Layer: 9
-  m_Name: NamedEventTrigger.HANDMENU.Option1Button_37356
+  m_Name: NamedEventTrigger.HANDMENU.Option1Button_40452
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -450,7 +450,7 @@ MonoBehaviour:
   handlers:
   - {fileID: 5329492480982599062}
   roomId: HANDMENU
-  uniqueId: 37356
+  uniqueId: 40452
 --- !u!114 &5329492480982599062
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -613,7 +613,7 @@ GameObject:
   - component: {fileID: 8915473895132193941}
   - component: {fileID: 5131142393743762101}
   m_Layer: 9
-  m_Name: TextMeshPro.HANDMENU.Option1Button_37394
+  m_Name: TextMeshPro.HANDMENU.Option1Button_40458
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -750,7 +750,7 @@ MonoBehaviour:
   handlers:
   - {fileID: 5131142393743762101}
   roomId: HANDMENU
-  uniqueId: 37394
+  uniqueId: 40458
 --- !u!114 &5131142393743762101
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1712,7 +1712,7 @@ GameObject:
   - component: {fileID: 7842760327751594417}
   - component: {fileID: 145716044316846140}
   m_Layer: 9
-  m_Name: TextMeshPro.HANDMENU.Option2Button_37386
+  m_Name: TextMeshPro.HANDMENU.Option2Button_40460
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -1849,7 +1849,7 @@ MonoBehaviour:
   handlers:
   - {fileID: 145716044316846140}
   roomId: HANDMENU
-  uniqueId: 37386
+  uniqueId: 40460
 --- !u!114 &145716044316846140
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -2375,12 +2375,12 @@ GameObject:
   - component: {fileID: 3179213291823671039}
   - component: {fileID: 3034346200053839326}
   m_Layer: 9
-  m_Name: GO.HANDMENU.Option1Button_37370
+  m_Name: GO.HANDMENU.Option1Button_322696
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &7910983220414103464
 RectTransform:
   m_ObjectHideFlags: 0
@@ -2416,7 +2416,7 @@ MonoBehaviour:
   handlers:
   - {fileID: 3034346200053839326}
   roomId: HANDMENU
-  uniqueId: 37370
+  uniqueId: 322696
 --- !u!114 &3034346200053839326
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -3299,12 +3299,12 @@ GameObject:
   - component: {fileID: 1550598400944840158}
   - component: {fileID: 6932652443108931229}
   m_Layer: 9
-  m_Name: GO.HANDMENU.Option3Button_37362
+  m_Name: GO.HANDMENU.Option3Button_40448
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &2805570513244560250
 RectTransform:
   m_ObjectHideFlags: 0
@@ -3340,7 +3340,7 @@ MonoBehaviour:
   handlers:
   - {fileID: 6932652443108931229}
   roomId: HANDMENU
-  uniqueId: 37362
+  uniqueId: 40448
 --- !u!114 &6932652443108931229
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -3374,7 +3374,7 @@ GameObject:
   - component: {fileID: 5043064095138479469}
   - component: {fileID: 6028808426266995019}
   m_Layer: 9
-  m_Name: NamedEventTrigger.HANDMENU.Option2Button_37378
+  m_Name: NamedEventTrigger.HANDMENU.Option2Button_40454
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -3511,7 +3511,7 @@ MonoBehaviour:
   handlers:
   - {fileID: 6028808426266995019}
   roomId: HANDMENU
-  uniqueId: 37378
+  uniqueId: 40454
 --- !u!114 &6028808426266995019
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -4007,7 +4007,7 @@ GameObject:
   - component: {fileID: 8061268387521178252}
   - component: {fileID: 9007450541643059173}
   m_Layer: 9
-  m_Name: NamedEventTrigger.HANDMENU.Option3Button_37388
+  m_Name: NamedEventTrigger.HANDMENU.Option3Button_40456
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -4144,7 +4144,7 @@ MonoBehaviour:
   handlers:
   - {fileID: 9007450541643059173}
   roomId: HANDMENU
-  uniqueId: 37388
+  uniqueId: 40456
 --- !u!114 &9007450541643059173
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -5339,12 +5339,12 @@ GameObject:
   - component: {fileID: 5903078286478072736}
   - component: {fileID: 4441290746772365774}
   m_Layer: 9
-  m_Name: GO.HANDMENU.Option2Button_37380
+  m_Name: GO.HANDMENU.Option2Button_40450
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &6639259985717695159
 RectTransform:
   m_ObjectHideFlags: 0
@@ -5380,7 +5380,7 @@ MonoBehaviour:
   handlers:
   - {fileID: 4441290746772365774}
   roomId: HANDMENU
-  uniqueId: 37380
+  uniqueId: 40450
 --- !u!114 &4441290746772365774
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -5929,7 +5929,7 @@ GameObject:
   - component: {fileID: 7263654527900220643}
   - component: {fileID: 2459840645607503370}
   m_Layer: 9
-  m_Name: TextMeshPro.HANDMENU.Option3Button_37384
+  m_Name: TextMeshPro.HANDMENU.Option3Button_40462
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -6066,7 +6066,7 @@ MonoBehaviour:
   handlers:
   - {fileID: 2459840645607503370}
   roomId: HANDMENU
-  uniqueId: 37384
+  uniqueId: 40462
 --- !u!114 &2459840645607503370
 MonoBehaviour:
   m_ObjectHideFlags: 0

Viagg-io/Assets/Scenes/1.0-SBB.unity

@@ -251,7 +251,10 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
-    m_AddedGameObjects: []
+    m_AddedGameObjects:
+    - targetCorrespondingSourceObject: {fileID: 3340381317484726287, guid: 5e1bbec9323a9d94097497afd40f797a, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 818524695}
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 5e1bbec9323a9d94097497afd40f797a, type: 3}
 --- !u!4 &30008259 stripped
@@ -519,8 +522,8 @@ MonoBehaviour:
   NonRigidbodyVelocity: 0
   Params: []
   OverrideAttenuation: 0
-  OverrideMinDistance: 1
+  OverrideMinDistance: 0.8
-  OverrideMaxDistance: 15
+  OverrideMaxDistance: 9
 --- !u!1 &215796642 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 3373087078195129553, guid: 3bd016cf950018041a4587ee114475c3, type: 3}
@@ -1242,7 +1245,6 @@ Transform:
   - {fileID: 1148303044}
   - {fileID: 297001280}
   - {fileID: 1156450819}
-  - {fileID: 818524695}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &646867269
@@ -4103,6 +4105,11 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 417220410822485292, guid: 286dc01058952db40ad1c0658ded8cfd, type: 3}
   m_PrefabInstance: {fileID: 1623035010}
   m_PrefabAsset: {fileID: 0}
+--- !u!4 &1671841563 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 3340381317484726287, guid: 5e1bbec9323a9d94097497afd40f797a, type: 3}
+  m_PrefabInstance: {fileID: 30008258}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1832207159
 GameObject:
   m_ObjectHideFlags: 0
@@ -4315,6 +4322,10 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 2969953363054433920, guid: af9043897c84648c183060ba5d1b108f, type: 3}
+      propertyPath: actionA.m_SingletonActionBindings.Array.data[0].m_Path
+      value: <XRController>{RightHand}/primaryButton
+      objectReference: {fileID: 0}
     - target: {fileID: 2969953363054433920, guid: af9043897c84648c183060ba5d1b108f, type: 3}
       propertyPath: OnPressA.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_StringArgument
       value: 3.0-SBB
@@ -4441,7 +4452,7 @@ MonoBehaviour:
   overrideLogStringDisplay: 0
   overrideDebugInternalActive: 0
   overrideDebugChangesActive: 0
-  instanceID: 773358
+  instanceID: 305910
   __behaviourTreeGenerator: {fileID: 0}
   taskScripts:
   - {fileID: 4900000, guid: e058cb28be8d744b98baf62e50716721, type: 3}
@@ -4769,8 +4780,30 @@ PrefabInstance:
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
-    m_AddedComponents: []
+    m_AddedComponents:
+    - targetCorrespondingSourceObject: {fileID: 7990873191231833679, guid: 5eccbf4be2c00e94689ee8062e4e7276, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 1939442486}
   m_SourcePrefab: {fileID: 100100000, guid: 5eccbf4be2c00e94689ee8062e4e7276, type: 3}
+--- !u!1 &1939442485 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 7990873191231833679, guid: 5eccbf4be2c00e94689ee8062e4e7276, type: 3}
+  m_PrefabInstance: {fileID: 1939442484}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &1939442486
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1939442485}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 86c6556701af9e04380698b89f691b6e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  nonRigidbodyVelocity: 0
+  attenuationObject: {fileID: 0}
 --- !u!1001 &1942342585
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -5672,7 +5705,7 @@ PrefabInstance:
   serializedVersion: 2
   m_Modification:
     serializedVersion: 3
-    m_TransformParent: {fileID: 594108320}
+    m_TransformParent: {fileID: 1671841563}
     m_Modifications:
     - target: {fileID: 3630783616650750083, guid: 04f002f8ed4f9436e8a358582b619e54, type: 3}
       propertyPath: m_LocalPosition.x
@@ -5714,6 +5747,14 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 4717072211422748236, guid: 04f002f8ed4f9436e8a358582b619e54, type: 3}
+      propertyPath: OverrideMaxDistance
+      value: 9
+      objectReference: {fileID: 0}
+    - target: {fileID: 4717072211422748236, guid: 04f002f8ed4f9436e8a358582b619e54, type: 3}
+      propertyPath: OverrideMinDistance
+      value: 0.8
+      objectReference: {fileID: 0}
     - target: {fileID: 6669376013871226009, guid: 04f002f8ed4f9436e8a358582b619e54, type: 3}
       propertyPath: m_Name
       value: SBBAmbi

Viagg-io/Assets/Scenes/3.2-Grotto.unity

@@ -12128,7 +12128,10 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
-    m_AddedGameObjects: []
+    m_AddedGameObjects:
+    - targetCorrespondingSourceObject: {fileID: 400000, guid: 3407765c3328944e6a992c45bd04d3d3, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 6740973416449694737}
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 3407765c3328944e6a992c45bd04d3d3, type: 3}
 --- !u!4 &176965637 stripped
@@ -12367,7 +12370,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 5465010430621679473}
+  m_Father: {fileID: 217660954}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &198076086
 MonoBehaviour:
@@ -12676,6 +12679,47 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 1294679553787201477, guid: 4c2b49ec8cb62be46aca55946afab3a5, type: 3}
   m_PrefabInstance: {fileID: 209872255}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &217660953
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 217660954}
+  m_Layer: 0
+  m_Name: Essen
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &217660954
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 217660953}
+  serializedVersion: 2
+  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:
+  - {fileID: 628832322}
+  - {fileID: 1535417919}
+  - {fileID: 1825785031}
+  - {fileID: 340818751}
+  - {fileID: 1007766354}
+  - {fileID: 1817325964}
+  - {fileID: 198076085}
+  - {fileID: 1314703028}
+  - {fileID: 1714869413}
+  - {fileID: 405120400}
+  m_Father: {fileID: 7043454953661402403}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &223435095
 GameObject:
   m_ObjectHideFlags: 0
@@ -18231,7 +18275,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4782590869987522912, guid: c49ceeff408a54a4dbde71675195362c, type: 3}
       propertyPath: actionA.m_SingletonActionBindings.Array.data[0].m_Path
-      value: <XRController>{LeftHand}/{Primary2DAxisClick}
+      value: <XRController>{LeftHand}/primaryButton
       objectReference: {fileID: 0}
     - target: {fileID: 4782590869987522912, guid: c49ceeff408a54a4dbde71675195362c, type: 3}
       propertyPath: OnPressA.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
@@ -18263,19 +18307,19 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6929003491571950587, guid: c49ceeff408a54a4dbde71675195362c, type: 3}
       propertyPath: m_LocalPosition.x
-      value: -0.329
+      value: -6.012
       objectReference: {fileID: 0}
     - target: {fileID: 6929003491571950587, guid: c49ceeff408a54a4dbde71675195362c, type: 3}
       propertyPath: m_LocalPosition.y
-      value: 0
+      value: -0.13
       objectReference: {fileID: 0}
     - target: {fileID: 6929003491571950587, guid: c49ceeff408a54a4dbde71675195362c, type: 3}
       propertyPath: m_LocalPosition.z
-      value: 0
+      value: -16.878
       objectReference: {fileID: 0}
     - target: {fileID: 6929003491571950587, guid: c49ceeff408a54a4dbde71675195362c, type: 3}
       propertyPath: m_LocalRotation.w
-      value: 1
+      value: 0.7071068
       objectReference: {fileID: 0}
     - target: {fileID: 6929003491571950587, guid: c49ceeff408a54a4dbde71675195362c, type: 3}
       propertyPath: m_LocalRotation.x
@@ -18283,7 +18327,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6929003491571950587, guid: c49ceeff408a54a4dbde71675195362c, type: 3}
       propertyPath: m_LocalRotation.y
-      value: 0
+      value: 0.7071068
       objectReference: {fileID: 0}
     - target: {fileID: 6929003491571950587, guid: c49ceeff408a54a4dbde71675195362c, type: 3}
       propertyPath: m_LocalRotation.z
@@ -18295,7 +18339,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6929003491571950587, guid: c49ceeff408a54a4dbde71675195362c, type: 3}
       propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
+      value: 90
       objectReference: {fileID: 0}
     - target: {fileID: 6929003491571950587, guid: c49ceeff408a54a4dbde71675195362c, type: 3}
       propertyPath: m_LocalEulerAnglesHint.z
@@ -18483,7 +18527,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 5465010430621679473}
+  m_Father: {fileID: 217660954}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &340818752
 MonoBehaviour:
@@ -18960,6 +19004,170 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 1294679553787201477, guid: 4c2b49ec8cb62be46aca55946afab3a5, type: 3}
   m_PrefabInstance: {fileID: 397385011}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &405120399
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 405120400}
+  - component: {fileID: 405120403}
+  - component: {fileID: 405120402}
+  - component: {fileID: 405120401}
+  m_Layer: 0
+  m_Name: AudioSource.AUDIO.ImGrottoessen1Nach
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &405120400
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 405120399}
+  serializedVersion: 2
+  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: 217660954}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &405120401
+MonoBehaviour:
+  m_ObjectHideFlags: 2
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 405120399}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cd222a199f55445d2885e5eae7890730, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  showHelpText: 0
+  fadeInTime: 1.5
+  fadeOutTime: 1.5
+  audioSourceComponent: {fileID: 405120403}
+  playInBackground: 0
+  fadeToVolume: 1
+--- !u!114 &405120402
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 405120399}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ab2a8bf28f111456caf08afcd0888bf5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  handlers:
+  - {fileID: 405120401}
+  roomId: AUDIO
+  uniqueId: 
+--- !u!82 &405120403
+AudioSource:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 405120399}
+  m_Enabled: 1
+  serializedVersion: 4
+  OutputAudioMixerGroup: {fileID: 0}
+  m_audioClip: {fileID: 8300000, guid: 5ccf11ddbb64848b6945ddeb2e635472, type: 3}
+  m_PlayOnAwake: 0
+  m_Volume: 1
+  m_Pitch: 1
+  Loop: 0
+  Mute: 0
+  Spatialize: 0
+  SpatializePostEffects: 0
+  Priority: 128
+  DopplerLevel: 1
+  MinDistance: 1
+  MaxDistance: 500
+  Pan2D: 0
+  rolloffMode: 0
+  BypassEffects: 0
+  BypassListenerEffects: 0
+  BypassReverbZones: 0
+  rolloffCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 1
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  panLevelCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  spreadCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  reverbZoneMixCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
 --- !u!1001 &408991772
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -20084,7 +20292,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 5465010430621679473}
+  m_Father: {fileID: 217660954}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &628832323
 MonoBehaviour:
@@ -73837,7 +74045,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 5465010430621679473}
+  m_Father: {fileID: 217660954}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1007766355
 MonoBehaviour:
@@ -74474,6 +74682,37 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1082648082}
   m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!1 &1103337165
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1103337166}
+  m_Layer: 2
+  m_Name: FMOD Attenuation Object
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1103337166
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1103337165}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 1.6, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1821956472}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1110076209
 GameObject:
   m_ObjectHideFlags: 0
@@ -74570,16 +74809,6 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   namedObjects:
-  - {fileID: 1714869415}
-  - {fileID: 1314703030}
-  - {fileID: 198076087}
-  - {fileID: 1817325966}
-  - {fileID: 1007766356}
-  - {fileID: 340818753}
-  - {fileID: 1825785033}
-  - {fileID: 2064214812}
-  - {fileID: 1535417921}
-  - {fileID: 628832324}
   - {fileID: 340152453374825803, guid: 7ec926be41bcee347ac844ccf400536d, type: 3}
   - {fileID: 4837797734938144338, guid: 7ec926be41bcee347ac844ccf400536d, type: 3}
   - {fileID: 7597383463162732554, guid: 7ec926be41bcee347ac844ccf400536d, type: 3}
@@ -74616,10 +74845,14 @@ MonoBehaviour:
   - {fileID: 13795137}
   - {fileID: 112878340}
   - {fileID: 126278276}
+  - {fileID: 198076087}
   - {fileID: 223435103}
   - {fileID: 329192909}
+  - {fileID: 340818753}
   - {fileID: 380759081}
+  - {fileID: 405120402}
   - {fileID: 598998318}
+  - {fileID: 628832324}
   - {fileID: 638667230}
   - {fileID: 650461065}
   - {fileID: 763151607}
@@ -74627,9 +74860,11 @@ MonoBehaviour:
   - {fileID: 883609798}
   - {fileID: 885572483}
   - {fileID: 997991611}
+  - {fileID: 1007766356}
   - {fileID: 1029455618}
   - {fileID: 1038977410}
   - {fileID: 1230883718}
+  - {fileID: 1314703030}
   - {fileID: 1472003916}
   - {fileID: 1472003917}
   - {fileID: 1472003918}
@@ -74639,6 +74874,7 @@ MonoBehaviour:
   - {fileID: 1472003922}
   - {fileID: 1472003923}
   - {fileID: 1472003924}
+  - {fileID: 1535417921}
   - {fileID: 1577016763}
   - {fileID: 1577331022}
   - {fileID: 1603455249}
@@ -74647,13 +74883,14 @@ MonoBehaviour:
   - {fileID: 1659032843}
   - {fileID: 1666622650}
   - {fileID: 1701205940}
-  - {fileID: 1725255051}
+  - {fileID: 1714869415}
-  - {fileID: 1725255052}
-  - {fileID: 1725255053}
   - {fileID: 1758426704}
+  - {fileID: 1817325966}
+  - {fileID: 1825785033}
   - {fileID: 1847637247}
   - {fileID: 1990879724}
   - {fileID: 2004940067}
+  - {fileID: 2064214812}
   - {fileID: 2107127227}
   - {fileID: 61983407270546785}
   - {fileID: 188522904620483982}
@@ -74672,9 +74909,6 @@ MonoBehaviour:
   - {fileID: 3210189630052662286}
   - {fileID: 3572364444700610522}
   - {fileID: 3747775373551139635}
-  - {fileID: 3798608539011709008}
-  - {fileID: 3798608539011709009}
-  - {fileID: 3798608539011709010}
   - {fileID: 4054910667554889665}
   - {fileID: 4108246156624846089}
   - {fileID: 4297698541858138646}
@@ -74713,7 +74947,7 @@ MonoBehaviour:
   overrideLogStringDisplay: 0
   overrideDebugInternalActive: 0
   overrideDebugChangesActive: 0
-  instanceID: 902550
+  instanceID: 355892
   __behaviourTreeGenerator: {fileID: 0}
   taskScripts:
   - {fileID: 4900000, guid: 7100bc138828c402baf6fdd9c426735b, type: 3}
@@ -76101,7 +76335,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 5465010430621679473}
+  m_Father: {fileID: 217660954}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1314703029
 MonoBehaviour:
@@ -78158,7 +78392,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 2636888980393329576, guid: 90dfe96f41d164a3081b56f73f4214e4, type: 3}
       propertyPath: m_LocalPosition.x
-      value: -7.036
+      value: -4.05
       objectReference: {fileID: 0}
     - target: {fileID: 2636888980393329576, guid: 90dfe96f41d164a3081b56f73f4214e4, type: 3}
       propertyPath: m_LocalPosition.y
@@ -78166,7 +78400,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 2636888980393329576, guid: 90dfe96f41d164a3081b56f73f4214e4, type: 3}
       propertyPath: m_LocalPosition.z
-      value: -16.413
+      value: -4.92
       objectReference: {fileID: 0}
     - target: {fileID: 2636888980393329576, guid: 90dfe96f41d164a3081b56f73f4214e4, type: 3}
       propertyPath: m_LocalRotation.w
@@ -78887,7 +79121,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 2969953363054433920, guid: af9043897c84648c183060ba5d1b108f, type: 3}
       propertyPath: actionA.m_SingletonActionBindings.Array.data[0].m_Path
-      value: <XRController>{RightHand}/{Primary2DAxisClick}
+      value: <XRController>{RightHand}/primaryButton
       objectReference: {fileID: 0}
     - target: {fileID: 2969953363054433920, guid: af9043897c84648c183060ba5d1b108f, type: 3}
       propertyPath: OnPressA.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
@@ -78986,7 +79220,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 5465010430621679473}
+  m_Father: {fileID: 217660954}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1535417920
 MonoBehaviour:
@@ -81349,7 +81583,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 5465010430621679473}
+  m_Father: {fileID: 217660954}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1714869414
 MonoBehaviour:
@@ -81553,7 +81787,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 324774971893838485, guid: 7ec926be41bcee347ac844ccf400536d, type: 3}
       propertyPath: m_Name
-      value: Collider.INTERACTABLES.ZwiebelTrigger_928102
+      value: Collider.INTERACTABLES.ZwiebelTrigger_358190
       objectReference: {fileID: 0}
     - target: {fileID: 349174638489851951, guid: 7ec926be41bcee347ac844ccf400536d, type: 3}
       propertyPath: m_LocalPosition.x
@@ -81597,11 +81831,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 2051395344875566865, guid: 7ec926be41bcee347ac844ccf400536d, type: 3}
       propertyPath: m_Name
-      value: StudioEventEmitter.INTERACTABLES.ZwiebelSchneiden_928100
+      value: StudioEventEmitter.INTERACTABLES.ZwiebelSchneiden_351028
       objectReference: {fileID: 0}
     - target: {fileID: 8609950645162817176, guid: 7ec926be41bcee347ac844ccf400536d, type: 3}
       propertyPath: m_Name
-      value: GO.INTERACTABLES.Zwiebel01_928104
+      value: GO.INTERACTABLES.Zwiebel01_358618
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
@@ -81613,39 +81847,6 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 349174638489851951, guid: 7ec926be41bcee347ac844ccf400536d, type: 3}
   m_PrefabInstance: {fileID: 1725255049}
   m_PrefabAsset: {fileID: 0}
---- !u!114 &1725255051 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 340152453374825803, guid: 7ec926be41bcee347ac844ccf400536d, type: 3}
-  m_PrefabInstance: {fileID: 1725255049}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: ab2a8bf28f111456caf08afcd0888bf5, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
---- !u!114 &1725255052 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 4837797734938144338, guid: 7ec926be41bcee347ac844ccf400536d, type: 3}
-  m_PrefabInstance: {fileID: 1725255049}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: ab2a8bf28f111456caf08afcd0888bf5, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
---- !u!114 &1725255053 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 7597383463162732554, guid: 7ec926be41bcee347ac844ccf400536d, type: 3}
-  m_PrefabInstance: {fileID: 1725255049}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: ab2a8bf28f111456caf08afcd0888bf5, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!4 &1727794007 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 6685214378485024629, guid: 99bfb1abc7cdfdd48b9cd86cbad67d85, type: 3}
@@ -82137,7 +82338,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 5465010430621679473}
+  m_Father: {fileID: 217660954}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1817325965
 MonoBehaviour:
@@ -82306,6 +82507,11 @@ Transform:
   - {fileID: 13795130}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!4 &1821956472 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 8733093507751517968, guid: 5eccbf4be2c00e94689ee8062e4e7276, type: 3}
+  m_PrefabInstance: {fileID: 1990879717}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1825785030
 GameObject:
   m_ObjectHideFlags: 0
@@ -82338,7 +82544,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 5465010430621679473}
+  m_Father: {fileID: 217660954}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1825785032
 MonoBehaviour:
@@ -88968,7 +89174,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8733093507751517968, guid: 5eccbf4be2c00e94689ee8062e4e7276, type: 3}
       propertyPath: m_LocalPosition.x
-      value: -7.036
+      value: -4.05
       objectReference: {fileID: 0}
     - target: {fileID: 8733093507751517968, guid: 5eccbf4be2c00e94689ee8062e4e7276, type: 3}
       propertyPath: m_LocalPosition.y
@@ -88976,7 +89182,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8733093507751517968, guid: 5eccbf4be2c00e94689ee8062e4e7276, type: 3}
       propertyPath: m_LocalPosition.z
-      value: -16.413
+      value: -4.92
       objectReference: {fileID: 0}
     - target: {fileID: 8733093507751517968, guid: 5eccbf4be2c00e94689ee8062e4e7276, type: 3}
       propertyPath: m_LocalRotation.w
@@ -89017,6 +89223,9 @@ PrefabInstance:
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects:
+    - targetCorrespondingSourceObject: {fileID: 8733093507751517968, guid: 5eccbf4be2c00e94689ee8062e4e7276, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 1103337166}
     - targetCorrespondingSourceObject: {fileID: 7990873191231833676, guid: 5eccbf4be2c00e94689ee8062e4e7276, type: 3}
       insertIndex: -1
       addedObject: {fileID: 856944163}
@@ -89062,7 +89271,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   nonRigidbodyVelocity: 0
-  attenuationObject: {fileID: 1990879720}
+  attenuationObject: {fileID: 0}
 --- !u!114 &1990879722
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -89851,8 +90060,8 @@ MonoBehaviour:
   NonRigidbodyVelocity: 0
   Params: []
   OverrideAttenuation: 0
-  OverrideMinDistance: 1
+  OverrideMinDistance: 0.8
-  OverrideMaxDistance: 15
+  OverrideMaxDistance: 9
 --- !u!1 &2070821297
 GameObject:
   m_ObjectHideFlags: 0
@@ -141342,7 +141551,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   handlers:
   - {fileID: 7292102518381573077}
-  roomId: AUDIO
+  roomId: STATIC
   uniqueId: 
 --- !u!1001 &208451267927814681
 PrefabInstance:
@@ -143467,7 +143676,7 @@ GameObject:
   - component: {fileID: 188522904620483982}
   - component: {fileID: 7292102518381573077}
   m_Layer: 0
-  m_Name: StudioEventEmitter.AUDIO.Ambi2D
+  m_Name: StudioEventEmitter.STATIC.AmbiGarten
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -145862,7 +146071,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 324774971893838485, guid: 7ec926be41bcee347ac844ccf400536d, type: 3}
       propertyPath: m_Name
-      value: Collider.INTERACTABLES.ZwiebelTrigger_946896
+      value: Collider.INTERACTABLES.ZwiebelTrigger_352192
       objectReference: {fileID: 0}
     - target: {fileID: 349174638489851951, guid: 7ec926be41bcee347ac844ccf400536d, type: 3}
       propertyPath: m_LocalPosition.x
@@ -145906,50 +146115,17 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 2051395344875566865, guid: 7ec926be41bcee347ac844ccf400536d, type: 3}
       propertyPath: m_Name
-      value: StudioEventEmitter.INTERACTABLES.ZwiebelSchneiden_946894
+      value: StudioEventEmitter.INTERACTABLES.ZwiebelSchneiden_359952
       objectReference: {fileID: 0}
     - target: {fileID: 8609950645162817176, guid: 7ec926be41bcee347ac844ccf400536d, type: 3}
       propertyPath: m_Name
-      value: GO.INTERACTABLES.Zwiebel01_946898
+      value: GO.INTERACTABLES.Zwiebel01_360530
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 7ec926be41bcee347ac844ccf400536d, type: 3}
---- !u!114 &3798608539011709008 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 340152453374825803, guid: 7ec926be41bcee347ac844ccf400536d, type: 3}
-  m_PrefabInstance: {fileID: 3798608539011709007}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: ab2a8bf28f111456caf08afcd0888bf5, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
---- !u!114 &3798608539011709009 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 4837797734938144338, guid: 7ec926be41bcee347ac844ccf400536d, type: 3}
-  m_PrefabInstance: {fileID: 3798608539011709007}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: ab2a8bf28f111456caf08afcd0888bf5, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
---- !u!114 &3798608539011709010 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 7597383463162732554, guid: 7ec926be41bcee347ac844ccf400536d, type: 3}
-  m_PrefabInstance: {fileID: 3798608539011709007}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: ab2a8bf28f111456caf08afcd0888bf5, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1 &3849075167179259476
 GameObject:
   m_ObjectHideFlags: 0
@@ -147738,15 +147914,6 @@ Transform:
   - {fileID: 380759079}
   - {fileID: 650461063}
   - {fileID: 1616541348}
-  - {fileID: 628832322}
-  - {fileID: 1535417919}
-  - {fileID: 1825785031}
-  - {fileID: 340818751}
-  - {fileID: 1007766354}
-  - {fileID: 1817325964}
-  - {fileID: 198076085}
-  - {fileID: 1314703028}
-  - {fileID: 1714869413}
   m_Father: {fileID: 7043454953661402403}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &5487893231907476764
@@ -147917,6 +148084,14 @@ PrefabInstance:
       propertyPath: roomId
       value: INTERACTABLES
       objectReference: {fileID: 0}
+    - target: {fileID: 5375082589469250678, guid: 8b82ecf5ee06c434a8b6fdf0ce1e8335, type: 3}
+      propertyPath: OverrideMaxDistance
+      value: 9
+      objectReference: {fileID: 0}
+    - target: {fileID: 5375082589469250678, guid: 8b82ecf5ee06c434a8b6fdf0ce1e8335, type: 3}
+      propertyPath: OverrideMinDistance
+      value: 0.8
+      objectReference: {fileID: 0}
     - target: {fileID: 5385366112514530443, guid: 8b82ecf5ee06c434a8b6fdf0ce1e8335, type: 3}
       propertyPath: m_Name
       value: StudioEventEmitter.INTERACTABLES.ZwiebelnInTopf
@@ -149144,8 +149319,8 @@ MonoBehaviour:
   - Name: ambi.damping
     Value: 1
   OverrideAttenuation: 0
-  OverrideMinDistance: 1
+  OverrideMinDistance: 0.8
-  OverrideMaxDistance: 15
+  OverrideMaxDistance: 9
 --- !u!114 &6243667575167822234
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -149615,12 +149790,12 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1603078270732673493}
   serializedVersion: 2
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalRotation: {x: -0, y: 0.38675913, z: -0, w: 0.9221808}
-  m_LocalPosition: {x: 0.6358253, y: 1.1266392, z: 10.739237}
+  m_LocalPosition: {x: 17.581776, y: 2.0405135, z: 5.388441}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 1.5118551, y: 1.1817832, z: 1.5118551}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 7043454953661402403}
+  m_Father: {fileID: 176965637}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &6782827963332887265
 GameObject:
@@ -149799,9 +149974,9 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 6740973416449694737}
   - {fileID: 5465010430621679473}
   - {fileID: 7984207108827924044}
+  - {fileID: 217660954}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &7071412688043362836
@@ -150002,7 +150177,7 @@ MonoBehaviour:
   fadeInTime: 1.5
   fadeOutTime: 1.5
   studioEventEmitter: {fileID: 6213555955092699822}
-  objName: Ambi2D
+  objName: AmbiGarten
 --- !u!114 &7321633242804860324
 MonoBehaviour:
   m_ObjectHideFlags: 0

Viagg-io/Assets/Scripts/Speech/viaggioSpeechIntents_it.json

@@ -221,13 +221,7 @@
             "intentSentences": [
                 "Io vorrei xy.",
                 "Prendo una coca cola.",
-                "Anch'io prendo una gazzosa."
+                "Anch'io prendo una gazzosa.",
-            ]
-        },
-        {
-            "intentID": "Im_Grotto_essen.Nachfrage_Kellner.2",
-            "intentSentences": [
-                "Io vorrei xy.",
                 "Prendo dell'acqua.",
                 "Prendo un' Icetea."
             ]
@@ -237,12 +231,6 @@
             "intentSentences": [
                 "Io vorrei xy.",
                 "Prendo il risotto.",
-                "Non prendo niente, non ho fame."
-            ]
-        },
-        {
-            "intentID": "Im_Grotto_essen.Nachfrage_Kellner_Essen.3",
-            "intentSentences": [
                 "Prendo i pizochen.",
                 "Prendo un'insalata."
             ]

Viagg-io/ProjectSettings/EditorBuildSettings.asset

@@ -5,12 +5,27 @@ EditorBuildSettings:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Scenes:
+<<<<<<< HEAD
   - enabled: 0
     path: Assets/Scenes/Test-Scene-Nick-Handmenu.unity
     guid: 3b4a6e5db0165e344b220fcfbfe68836
   - enabled: 1
     path: Assets/Scenes/Test-Scene-Nick-Zwiebelhacken.unity
     guid: 86afdeefd7cdf934d9c4db691f96a878
+=======
+  - enabled: 1
+    path: Assets/Scenes/1.0-SBB.unity
+    guid: 6a1144d40bbf04513a9929856271d4e7
+  - enabled: 1
+    path: Assets/Scenes/3.0-SBB.unity
+    guid: a21f6e13e09234179a685c8f89b0e031
+  - enabled: 1
+    path: Assets/Scenes/3.1-Slideshow.unity
+    guid: 4a08bc26692b04e5da8898f704f20b69
+  - enabled: 1
+    path: Assets/Scenes/3.2-Grotto.unity
+    guid: 73660f1e1eb0e524fb6b6f42ca2c7b54
+>>>>>>> master
   m_configObjects:
     Unity.XR.Oculus.Settings: {fileID: 11400000, guid: bfa1182bd221b4ca89619141f66f1260, type: 2}
     com.unity.xr.openxr.settings4: {fileID: 11400000, guid: 0f4832b23b368b643bc8a91696fbb473, type: 2}