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

@@ -787,9 +787,8 @@ Tree("32_Grotto_Kueche_alles_gefunden") {
         BTC.SynthesizeText("Super, du hast alles gefunden. Bitte gib nun etwas Olivenöl in den Topf.")
         BTC.SpeechOutputEnded()
 
-        // Oel in Topf geben - ToDo: Particle Trigger
+        // Oel in Topf geben - Particle Trigger
-        BTC.Set("Collider.INTERACTABLES.Topf", "otherTag", "Olivenoel")
+        // ...
-        BTC.Run("Collider.INTERACTABLES.Topf")
         BTC.Run("AudioSource.AUDIO.Kueche2Fallesgefun")
 
         // Herd anstellen
@@ -911,7 +910,6 @@ Tree("32_Grotto_Kueche_Interesse_Kochen") {
 // --- Kueche - Interesse Kochen ---
     Composite(Sequence) {
         BTC.Run("AudioSource.AUDIO.Kueche1FInteresseK")
-        // ToDo: Freie Antwort als Speech Input
         BTC.Set("TextMeshPro.HANDMENU.Option1Button", "text", "Lasagne")
         BTC.Show("GO.HANDMENU.Option1Button")
         BTC.SetBool("32_Grotto_Kueche_Interesse_Kochen_Button_Clicked", false)
@@ -1024,13 +1022,16 @@ Tree("32_Grotto_Kueche_Zusammen_Kochen") {
         BTC.Run("AudioSource.AUDIO.Kueche1FZusammenKo")
 
         // Risotto in Topf geben
+        BTC.Run("GO/NamedGrabEvent/NamedOutline.INTERACTABLES.Risotto")
         BTC.Set("Collider.INTERACTABLES.Topf", "otherTag", "Risotto")
         BTC.Run("Collider.INTERACTABLES.Topf")
 
         // Ruehren 
+        BTC.Run("NamedGrabEvent.INTERACTABLES.Loeffel")
         BTC.Set("Collider.INTERACTABLES.Topf", "otherTag", "Loeffel")
         BTC.Run("Collider.INTERACTABLES.Topf")
-        BTC.Wait(2) // Wie lange ruehren?
+        // Wie lange ruehren?
+        BTC.Wait(2)
         BTC.Run("AudioSource.AUDIO.Kueche2FZusammenKo")
 
         // Wein leuchtet
@@ -1040,12 +1041,8 @@ Tree("32_Grotto_Kueche_Zusammen_Kochen") {
         BTC.Run("NamedGrabEvent/NamedOutline.INTERACTABLES.Weisswein")
         BTC.Disable("NamedGrabEvent/NamedOutline.INTERACTABLES.Weisswein")
         
-        // Wein in Topf giessen - Todo: Particle Trigger
+        // Wein in Topf giessen
-        BTC.Set("Collider.INTERACTABLES.Topf", "otherTag", "Weisswein")
+        // ...
-        BTC.Run("Collider.INTERACTABLES.Topf")
-        BTC.Hide("GO/StudioEventEmitter.INTERACTABLES.ZwiebelninTopf")
-        BTC.Show("GO.INTERACTABLES.Abloeschen")
-        BTC.Show("GO.INTERACTABLES.ChangeSound")
         BTC.Run("AudioSource.AUDIO.Kueche3FZusammenKo")
 
         // Bouillon leuchtet
@@ -1055,12 +1052,12 @@ Tree("32_Grotto_Kueche_Zusammen_Kochen") {
         BTC.Run("NamedGrabEvent/NamedOutline.INTERACTABLES.Bouillon")
         BTC.Disable("NamedGrabEvent/NamedOutline.INTERACTABLES.Bouillon")
 
-        // Bouillon in Topf geben - Todo: Particle Trigger
+        // Bouillon in Topf geben
-        BTC.Set("Collider.INTERACTABLES.Topf", "otherTag", "Bouillon")
+        // ...
-        BTC.Run("Collider.INTERACTABLES.Topf")
         BTC.Run("AudioSource.AUDIO.Kueche4FZusammenKo")
 
         // Glas Wasser mit Steinpilze in Topf geben
+        BTC.Run("NamedGrabEvent/NamedOutline.INTERACTABLES.Steinpilze")
         BTC.Set("Collider.INTERACTABLES.Topf", "otherTag", "Steinpilze")
         BTC.Run("Collider.INTERACTABLES.Topf")
 

Viagg-io/Assets/Plugins/FMOD/src/StudioEventEmitter.cs

@@ -405,12 +405,5 @@ namespace FMODUnity
             }
             return false;
         }
-
-        public void ChangeEvent(EventReference eventRef)
-        {
-            Stop();
-            EventReference = eventRef;
-            Lookup();
-        }
     }
 }

Viagg-io/Assets/Resources/BuildDateTime.txt

@@ -1 +1 @@
-2025-01-07T15:36:13.6061680Z
+2024-12-16T19:11:12.2113660Z

Viagg-io/Assets/Scripts/Audio/OnCollideSound.cs

@@ -1,10 +1,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
-#if FMOD_AVAILABLE
-using FMOD;
 using FMODUnity;
-#endif
 
 [RequireComponent(typeof(Rigidbody))]
 public class OnCollideSound : MonoBehaviour
@@ -47,7 +44,7 @@ public class OnCollideSound : MonoBehaviour
             {
                 // Play default collide sound
                 RuntimeManager.PlayOneShot(soundRef, transform.position);
-                UnityEngine.Debug.Log(gameObject.name);
+                Debug.Log(gameObject.name);
             }
 
             _specialCase = false;

Viagg-io/Assets/Scripts/Audio/OnGrabSound.cs

@@ -2,10 +2,7 @@ using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.XR.Interaction.Toolkit;
-#if FMOD_AVAILABLE
-using FMOD;
 using FMODUnity;
-#endif
 
 [RequireComponent(typeof(XRGrabInteractable))]
 public class OnGrabSound : MonoBehaviour

Viagg-io/Assets/Scripts/Audio/OnSocketSnapSound.cs

@@ -2,10 +2,7 @@ using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.XR.Interaction.Toolkit;
-#if FMOD_AVAILABLE
-using FMOD;
 using FMODUnity;
-#endif
 
 public class OnSocketSnapSound : MonoBehaviour
 {

Viagg-io/Assets/Scripts/Audio/OnStirringSound.cs

@@ -1,22 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-#if FMOD_AVAILABLE
-using FMOD;
-using FMODUnity;
-#endif
-
-public class OnStirringSound : MonoBehaviour
-{
-    [SerializeField]
-    EventReference stirringDrySoundRef;
-
-    [SerializeField]
-    StudioEventEmitter emitter;
-
-    void Start()
-    {
-        emitter.Stop();
-        emitter.ChangeEvent(stirringDrySoundRef);
-    }
-}

Viagg-io/Assets/Scripts/Audio/OnStirringSound.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 753dee63ed4644fb4826b73d51770690
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Viagg-io/ProjectSettings/ProjectSettings.asset

@@ -140,6 +140,9 @@ PlayerSettings:
   bundleVersion: 0.1
   preloadedAssets:
   - {fileID: 11400000, guid: be340e3c48769439d8d18a5a2bccd498, type: 2}
+  - {fileID: 11400000, guid: bfa1182bd221b4ca89619141f66f1260, type: 2}
+  - {fileID: -8196854396901781169, guid: 1a4c68ca72a83449f938d669337cb305, type: 2}
+  - {fileID: -64324148185763206, guid: a9a6963505ddf7f4d886008c6dc86122, type: 2}
   metroInputSource: 0
   wsaTransparentSwapchain: 0
   m_HolographicPauseOnTrackingLoss: 1