diff --git a/Viagg-io/Assets/Audio/FMOD/Allgemein.bank b/Viagg-io/Assets/Audio/FMOD/Allgemein.bank old mode 100644 new mode 100755 index 7450d5e..0a857c9 Binary files a/Viagg-io/Assets/Audio/FMOD/Allgemein.bank and b/Viagg-io/Assets/Audio/FMOD/Allgemein.bank differ diff --git a/Viagg-io/Assets/Audio/FMOD/Grotto_Essen.bank b/Viagg-io/Assets/Audio/FMOD/Grotto_Essen.bank old mode 100644 new mode 100755 index d7ca690..6b0547e Binary files a/Viagg-io/Assets/Audio/FMOD/Grotto_Essen.bank and b/Viagg-io/Assets/Audio/FMOD/Grotto_Essen.bank differ diff --git a/Viagg-io/Assets/Audio/FMOD/Grotto_Kueche.bank b/Viagg-io/Assets/Audio/FMOD/Grotto_Kueche.bank old mode 100644 new mode 100755 index 296ba4d..63df3b5 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/Master.bank b/Viagg-io/Assets/Audio/FMOD/Master.bank old mode 100644 new mode 100755 index 6350254..c8d4d0e Binary files a/Viagg-io/Assets/Audio/FMOD/Master.bank and b/Viagg-io/Assets/Audio/FMOD/Master.bank differ diff --git a/Viagg-io/Assets/Audio/FMOD/Master.strings.bank b/Viagg-io/Assets/Audio/FMOD/Master.strings.bank old mode 100644 new mode 100755 index 5ec0c48..18b8069 Binary files a/Viagg-io/Assets/Audio/FMOD/Master.strings.bank and b/Viagg-io/Assets/Audio/FMOD/Master.strings.bank differ diff --git a/Viagg-io/Assets/Audio/FMOD/Picknick.Baeckerei.bank b/Viagg-io/Assets/Audio/FMOD/Picknick.Baeckerei.bank new file mode 100755 index 0000000..25a6e3e Binary files /dev/null and b/Viagg-io/Assets/Audio/FMOD/Picknick.Baeckerei.bank differ diff --git a/Viagg-io/Assets/Audio/FMOD/Picknick.Baeckerei.bank.meta b/Viagg-io/Assets/Audio/FMOD/Picknick.Baeckerei.bank.meta new file mode 100644 index 0000000..b046413 --- /dev/null +++ b/Viagg-io/Assets/Audio/FMOD/Picknick.Baeckerei.bank.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3c05e1e61ddc64ac78d98db31ad68bae +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Viagg-io/Assets/Audio/FMOD/SBB.bank b/Viagg-io/Assets/Audio/FMOD/SBB.bank old mode 100644 new mode 100755 index f04a062..cd7ca90 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/3.2-Grotto.bt.txt b/Viagg-io/Assets/BehaviourTrees/3.2-Grotto.bt.txt index 72232a6..a320d47 100644 --- a/Viagg-io/Assets/BehaviourTrees/3.2-Grotto.bt.txt +++ b/Viagg-io/Assets/BehaviourTrees/3.2-Grotto.bt.txt @@ -14,13 +14,13 @@ Composite(Sequence) { //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_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") } } @@ -1169,7 +1169,7 @@ Tree("32_Grotto_Kueche_Parmigiano") { } } - BTC.SynthesizeText("Bitte stelle den Risotto hier hin.") + BTC.SynthesizeText("Posso assaggiarlo? Per piacere, mettilo qui vicino a me!") BTC.SpeechOutputEnded() // Stelle für Pfanne leuchtet diff --git a/Viagg-io/Assets/Plugins/FMOD/Resources/FMODStudioSettings.asset b/Viagg-io/Assets/Plugins/FMOD/Resources/FMODStudioSettings.asset index 56e68b0..a5815f8 100644 --- a/Viagg-io/Assets/Plugins/FMOD/Resources/FMODStudioSettings.asset +++ b/Viagg-io/Assets/Plugins/FMOD/Resources/FMODStudioSettings.asset @@ -202,11 +202,12 @@ MonoBehaviour: Value: 0 HasValue: 0 Plugins: - Value: [] - HasValue: 0 + Value: + - resonanceaudio + HasValue: 1 StaticPlugins: Value: [] - HasValue: 0 + HasValue: 1 CallbackHandler: Value: {fileID: 0} HasValue: 0 @@ -700,6 +701,7 @@ MonoBehaviour: - Allgemein - Grotto_Essen - Grotto_Kueche + - Picknick.Baeckerei - SBB BanksToLoad: - Grotto.Essen @@ -936,7 +938,8 @@ MonoBehaviour: Value: 0 HasValue: 0 Plugins: - Value: [] + Value: + - resonanceaudio HasValue: 1 StaticPlugins: Value: [] diff --git a/Viagg-io/ProjectSettings/ProjectSettings.asset b/Viagg-io/ProjectSettings/ProjectSettings.asset index be91e8e..5d0529c 100644 --- a/Viagg-io/ProjectSettings/ProjectSettings.asset +++ b/Viagg-io/ProjectSettings/ProjectSettings.asset @@ -140,9 +140,6 @@ 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