From 47df6586e00945cca1f654fd44733e57874afb2f Mon Sep 17 00:00:00 2001 From: Nadine Ganz Date: Mon, 11 Aug 2025 17:48:02 +0200 Subject: [PATCH] Add Anim Door Baeckerei - Enrico left; fix bugs --- Viagg-io/Assets/BehaviourTrees/2.2-Geschaeft.bt.txt | 7 +++++++ Viagg-io/Assets/BehaviourTrees/3.2-Grotto1.bt.txt | 6 +++--- Viagg-io/Assets/BehaviourTrees/3.2-Grotto3.bt.txt | 2 +- .../Assets/Packages/MyBT/BTC/Handlers/NamedAnimator.cs | 1 + 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Viagg-io/Assets/BehaviourTrees/2.2-Geschaeft.bt.txt b/Viagg-io/Assets/BehaviourTrees/2.2-Geschaeft.bt.txt index 757b5a0b..de0289e1 100644 --- a/Viagg-io/Assets/BehaviourTrees/2.2-Geschaeft.bt.txt +++ b/Viagg-io/Assets/BehaviourTrees/2.2-Geschaeft.bt.txt @@ -635,6 +635,7 @@ Tree("22_Geschaeft_Story_A_Picknicken_Baeckerei_Outro") { } } + BTC.Hide("Animator.AnimatorBaeckereiT") BTC.Run("MediaPlayer.VIDEOS.BaeckereiOutroFidl_04") BTC.Run("MediaPlayer.VIDEOS.BaeckereiOutroE5") BTC.Run("MediaPlayer.VIDEOS.BaeckereiOutroE6") @@ -786,6 +787,12 @@ Tree("22_Geschaeft_Story_A_Picknicken_Baeckerei_Outro") { Composite(Marathon) { BTC.Run("MediaPlayer.VIDEOS.BaeckereiOutroE27") + + Composite(Sequence) { + BTC.Wait(1) + BTC.Show("Animator.AnimatorBaeckereiT") + } + BTC.Run("MediaPlayer.VIDEOS.BaeckereiOutroF28") } diff --git a/Viagg-io/Assets/BehaviourTrees/3.2-Grotto1.bt.txt b/Viagg-io/Assets/BehaviourTrees/3.2-Grotto1.bt.txt index 6ce48066..87eede25 100644 --- a/Viagg-io/Assets/BehaviourTrees/3.2-Grotto1.bt.txt +++ b/Viagg-io/Assets/BehaviourTrees/3.2-Grotto1.bt.txt @@ -525,11 +525,11 @@ Tree("32_Grotto_Story_B_Grotto_Antwort_Nonna_Grotto") { // -- Race 2: User sagt nichts Composite(Sequence) { BTC.Wait(5) + BTC.Hide("GO.HINTS.SpeakHint") BTC.CompareUserSpeechInputStarted(false) BTC.AbortSpeechEventListener() BTC.StopSpeechIntentRecognition() BTC.ClearPossbileSpeechIntents() - BTC.Hide("GO.HINTS.SpeakHint") } } @@ -558,11 +558,11 @@ Tree("32_Grotto_Story_B_Grotto_Antwort_Nonna_Grotto") { // -- Race 2: User sagt nichts Composite(Sequence) { BTC.Wait(5) + BTC.Hide("GO.HINTS.SpeakHint") BTC.CompareUserSpeechInputStarted(false) BTC.AbortSpeechEventListener() BTC.StopSpeechIntentRecognition() BTC.ClearPossbileSpeechIntents() - BTC.Hide("GO.HINTS.SpeakHint") } } @@ -639,11 +639,11 @@ Tree("32_Grotto_Story_B_Grotto_Antwort_Nonna_Grotto_Teil2") { // -- Race 2: User sagt nichts Composite(Sequence) { BTC.Wait(5) + BTC.Hide("GO.HINTS.SpeakHint") BTC.CompareUserSpeechInputStarted(false) BTC.AbortSpeechEventListener() BTC.StopSpeechIntentRecognition() BTC.ClearPossbileSpeechIntents() - BTC.Hide("GO.HINTS.SpeakHint") } } diff --git a/Viagg-io/Assets/BehaviourTrees/3.2-Grotto3.bt.txt b/Viagg-io/Assets/BehaviourTrees/3.2-Grotto3.bt.txt index 2416fe0e..06d45bea 100644 --- a/Viagg-io/Assets/BehaviourTrees/3.2-Grotto3.bt.txt +++ b/Viagg-io/Assets/BehaviourTrees/3.2-Grotto3.bt.txt @@ -622,7 +622,7 @@ Tree("32_Grotto_Im_Grotto_Essen_Intro") { BTC.Run("MediaPlayer.VIDEOS.OutroG2") BTC.Run("MediaPlayer.VIDEOS.OutroGidle3") - BTC.Hide("MediaPlayer.VIDEOS.GrottoUnterhaltung_FIdle20") + BTC.Hide("MediaPlayer.VIDEOS.OutroFidle1") BTC.Run("MediaPlayer.VIDEOS.OutroF4") BTC.Run("MediaPlayer.VIDEOS.OutroFidle5") diff --git a/Viagg-io/Assets/Packages/MyBT/BTC/Handlers/NamedAnimator.cs b/Viagg-io/Assets/Packages/MyBT/BTC/Handlers/NamedAnimator.cs index 07b3aee8..10e032ad 100644 --- a/Viagg-io/Assets/Packages/MyBT/BTC/Handlers/NamedAnimator.cs +++ b/Viagg-io/Assets/Packages/MyBT/BTC/Handlers/NamedAnimator.cs @@ -274,6 +274,7 @@ public class NamedAnimator : ComponentHandler { if (nodeState == NodeState.FirstRun) { animatorComponent.enabled = false; + animatorComponent.Rebind(); Task.SetSucceeded(); return; }