diff --git a/Viagg-io/Assets/Audio/FMOD/Castello.bank b/Viagg-io/Assets/Audio/FMOD/Castello.bank index 7cf285ad..82aa7bb2 100755 Binary files a/Viagg-io/Assets/Audio/FMOD/Castello.bank and b/Viagg-io/Assets/Audio/FMOD/Castello.bank differ diff --git a/Viagg-io/Assets/Audio/FMOD/Grotto_Kueche.bank b/Viagg-io/Assets/Audio/FMOD/Grotto_Kueche.bank index 5d62049d..136626e2 100755 Binary files a/Viagg-io/Assets/Audio/FMOD/Grotto_Kueche.bank and b/Viagg-io/Assets/Audio/FMOD/Grotto_Kueche.bank differ diff --git a/Viagg-io/Assets/Audio/FMOD/Picknick.Baeckerei.bank b/Viagg-io/Assets/Audio/FMOD/Picknick.Baeckerei.bank index f2b6a4a6..02a92378 100755 Binary files a/Viagg-io/Assets/Audio/FMOD/Picknick.Baeckerei.bank and b/Viagg-io/Assets/Audio/FMOD/Picknick.Baeckerei.bank differ diff --git a/Viagg-io/Assets/Audio/FMOD/Puschlav.bank b/Viagg-io/Assets/Audio/FMOD/Puschlav.bank index 1aa2c4fc..b252a501 100644 Binary files a/Viagg-io/Assets/Audio/FMOD/Puschlav.bank and b/Viagg-io/Assets/Audio/FMOD/Puschlav.bank differ diff --git a/Viagg-io/Assets/Audio/FMOD/SBB.bank b/Viagg-io/Assets/Audio/FMOD/SBB.bank index 0bc93ba3..36885e83 100755 Binary files a/Viagg-io/Assets/Audio/FMOD/SBB.bank and b/Viagg-io/Assets/Audio/FMOD/SBB.bank differ diff --git a/Viagg-io/Assets/BehaviourTrees/1.0-SBB.bt.txt b/Viagg-io/Assets/BehaviourTrees/1.0-SBB.bt.txt index af030fe8..6ff1e63c 100644 --- a/Viagg-io/Assets/BehaviourTrees/1.0-SBB.bt.txt +++ b/Viagg-io/Assets/BehaviourTrees/1.0-SBB.bt.txt @@ -331,6 +331,7 @@ Tree("10_SBB_Zugabteil_Szenenwahl") { BTC.Hide("GO.HANDMENU.SpeechOptions") } BTC.FadeOut("FadeScene.XRInteractionHandsSetup.Black") + BTC.Hide("MediaPlayer.VIDEOS.SzenenwahlFidle4") BTC.Run("LoadScene.NEXT.40Puschlav") } @@ -359,6 +360,7 @@ Tree("10_SBB_Zugabteil_Szenenwahl") { // Load Scene: Story A Picknicken //BTC.FadeOut("FadeScene.XRInteractionHandsSetup.Black") + BTC.Hide("MediaPlayer.VIDEOS.SzenenwahlFidle4") BTC.Run("LoadScene.NEXT.20SBB") } Composite(Sequence) { @@ -375,13 +377,11 @@ Tree("10_SBB_Zugabteil_Szenenwahl") { // Load Scene: Story B Grotto //BTC.FadeOut("FadeScene.XRInteractionHandsSetup.Black") + BTC.Hide("MediaPlayer.VIDEOS.SzenenwahlFidle4") BTC.Run("LoadScene.NEXT.30SBB") } } // Race Buttons } // Handmenu Ende } - - // TODO: Check if necessary - //BTC.Hide("MediaPlayer.VIDEOS.SzenenwahlFidle4") } } \ No newline at end of file diff --git a/Viagg-io/Assets/BehaviourTrees/2.2-Geschaeft.bt.txt b/Viagg-io/Assets/BehaviourTrees/2.2-Geschaeft.bt.txt index de0289e1..304ec18b 100644 --- a/Viagg-io/Assets/BehaviourTrees/2.2-Geschaeft.bt.txt +++ b/Viagg-io/Assets/BehaviourTrees/2.2-Geschaeft.bt.txt @@ -620,7 +620,10 @@ Tree("22_Geschaeft_Story_A_Picknicken_Baeckerei_Outro") { Composite(Marathon) { Composite(Marathon) { - BTC.Run("MediaPlayer.VIDEOS.BaeckereiOutroE1") + Composite(Sequence) { + BTC.Run("MediaPlayer.VIDEOS.BaeckereiOutroE1") + BTC.Run("MediaPlayer.VIDEOS.BaeckereiOutroEidl_07") + } Composite(Sequence) { BTC.Wait(3) @@ -637,6 +640,7 @@ Tree("22_Geschaeft_Story_A_Picknicken_Baeckerei_Outro") { BTC.Hide("Animator.AnimatorBaeckereiT") BTC.Run("MediaPlayer.VIDEOS.BaeckereiOutroFidl_04") + BTC.Hide("MediaPlayer.VIDEOS.BaeckereiOutroEidl_07") BTC.Run("MediaPlayer.VIDEOS.BaeckereiOutroE5") BTC.Run("MediaPlayer.VIDEOS.BaeckereiOutroE6") diff --git a/Viagg-io/Assets/Plugins/FMOD/Resources/FMODStudioSettings.asset b/Viagg-io/Assets/Plugins/FMOD/Resources/FMODStudioSettings.asset index 0063ec29..1b2739fc 100644 --- a/Viagg-io/Assets/Plugins/FMOD/Resources/FMODStudioSettings.asset +++ b/Viagg-io/Assets/Plugins/FMOD/Resources/FMODStudioSettings.asset @@ -714,7 +714,7 @@ MonoBehaviour: LiveUpdatePort: 9264 EnableMemoryTracking: 0 AndroidUseOBB: 0 - AndroidPatchBuild: 1 + AndroidPatchBuild: 0 MeterChannelOrdering: 0 StopEventsOutsideMaxDistance: 0 BoltUnitOptionsBuildPending: 0