Fix merge conflict and add audio to Test Scene Grotto

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

@@ -12,9 +12,9 @@
             }
 
             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_Intro")
                 //RunTree("32_Grotto_Kueche_Zwiebeln_schneiden")
                 //RunTree("32_Grotto_Kueche_alles_gefunden")
                 //RunTree("32_Grotto_Kueche_Kochen_Anzahl")

Viagg-io/Assets/Resources/BuildDateTime.txt

@@ -1,9 +1 @@
-<<<<<<< HEAD
-2025-01-28T16:43:12.0269790Z
-=======
-<<<<<<< HEAD
-2025-01-17T14:37:10.9376140Z
-=======
-2025-01-28T09:20:11.7363448Z
->>>>>>> leveldesign
->>>>>>> master
+2025-01-31T15:19:22.4706310Z

Viagg-io/ProjectSettings/EditorBuildSettings.asset

@@ -5,95 +5,12 @@ EditorBuildSettings:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Scenes:
-<<<<<<< HEAD
-  - enabled: 1
-    path: Assets/Scenes/1.0-SBB.unity
-    guid: 6a1144d40bbf04513a9929856271d4e7
-  - enabled: 1
-    path: Assets/Scenes/3.2-Grotto.unity
-    guid: 51bd2edc532024f96a432eaf867d3a47
-<<<<<<< HEAD
-  - enabled: 0
-=======
-  - enabled: 1
-=======
-  - enabled: 0
-    path: Assets/Scenes/3.2-Grotto.unity
-    guid: 51bd2edc532024f96a432eaf867d3a47
   - enabled: 0
     path: Assets/Scenes/1.0-SBB.unity
     guid: 6a1144d40bbf04513a9929856271d4e7
   - enabled: 0
->>>>>>> leveldesign
->>>>>>> master
-    path: Assets/Scenes/Test-Scene.unity
-    guid: 5739d873cf7d24221bea4b568b59f9c1
-  - enabled: 0
-    path: Assets/Scenes/Test-HandInteraction.unity
-    guid: 6560c631efa4b492689f76d06071d916
-  - enabled: 0
-    path: Assets/Scenes/2.0-SBB.unity
-    guid: 0492708372646415eb23036f23680178
-  - enabled: 0
-    path: Assets/Scenes/2.1-Slideshow.unity
-    guid: d30b9a945a08543918f700fd6e5cd57e
-  - enabled: 0
-    path: Assets/Scenes/2.2-Geschaeft.unity
-    guid: 498707af75f244daa9eacd8a71c6ee5f
-  - enabled: 0
-    path: Assets/Scenes/2.4-Slideshow.unity
-    guid: 9e54eaa42db9043bebef8558b9e38350
-  - enabled: 0
-    path: Assets/Scenes/2.5-Slideshow.unity
-    guid: 9678dd7d3bc674a2ebec4585b619f754
-  - enabled: 0
-    path: Assets/Scenes/2.6-Castello.unity
-    guid: 8554de5c9e3d141a1bee7985b31e8313
-  - enabled: 0
-    path: Assets/Scenes/2.7-Slideshow.unity
-    guid: aec0fafea778d426aa05255e7625431a
-  - enabled: 0
-    path: Assets/Scenes/2.8-SBB.unity
-    guid: f2c5f5fa7a1cf4cb880b99c3506ea5b3
-  - enabled: 0
-    path: Assets/Scenes/3.0-SBB.unity
-    guid: a21f6e13e09234179a685c8f89b0e031
-  - enabled: 0
-    path: Assets/Scenes/3.1-Slideshow.unity
-    guid: 4a08bc26692b04e5da8898f704f20b69
-  - enabled: 0
-    path: Assets/Scenes/3.5-Slideshow.unity
-    guid: f6bca66b31e88434d98bdbed5c399b64
-  - enabled: 0
-    path: Assets/Scenes/3.6-SBB.unity
-    guid: 798c4c8d3b6ca4735a1eccbd0e6423f4
-  - enabled: 0
-    path: Assets/Scenes/4.0-SBB.unity
-    guid: c91e1ba2f3a454ce3bd4db34e47e7c2d
-  - enabled: 0
-    path: Assets/Scenes/4.1-RBS.unity
-    guid: 3adc9215168f1498898bff6d8b78ac92
-  - enabled: 0
-    path: Assets/Scenes/4.2-Slideshow.unity
-    guid: 7bfe1b35f364d462f9e70b206e9c712b
-  - enabled: 0
-    path: Assets/Scenes/4.3-Gletschergarten.unity
-    guid: 83108dac4dad24ee8a98f24c14b73ff8
-  - enabled: 0
-    path: Assets/Scenes/4.4-Slideshow.unity
-    guid: b089fcf80ec5f468d82f06273c7ffeb5
-  - enabled: 0
-    path: Assets/Scenes/4.5-Slideshow.unity
-    guid: 1eaca7e63ce4b40439eb193d4674c733
-  - enabled: 0
-    path: Assets/Scenes/4.6-Flussbett.unity
-    guid: 4e93f52c6168549cbb31a1b2cb80a198
-  - enabled: 0
-    path: Assets/Scenes/4.7-Slideshow.unity
-    guid: 0e9a9a94d513d47e0b6c5bb1e24a4b62
-  - enabled: 0
-    path: Assets/Scenes/4.8-RBS.unity
-    guid: 874ea9ab99ca1488b9df2832e7281f8b
+    path: Assets/Scenes/3.2-Grotto.unity
+    guid: 51bd2edc532024f96a432eaf867d3a47
   - enabled: 1
     path: Assets/Scenes/Test-Scene-Grotto.unity
     guid: 73660f1e1eb0e524fb6b6f42ca2c7b54