diff --git a/Viagg-io/Assets/BehaviourTrees/0.5-Tutorial.bt.txt b/Viagg-io/Assets/BehaviourTrees/0.5-Tutorial.bt.txt index bedbaec8..6d48e3a7 100644 --- a/Viagg-io/Assets/BehaviourTrees/0.5-Tutorial.bt.txt +++ b/Viagg-io/Assets/BehaviourTrees/0.5-Tutorial.bt.txt @@ -230,7 +230,7 @@ Tree("05_Tutorial") { Composite(Sequence) { Composite(Marathon) { BTC.Hide("GO.HINTS.SpeakHint") - BTC.Show("GO.HANDMENU.SpeechButton") + BTC.Show("GO.HANDMENU.SpeechOptions") BTC.Set("TextMeshPro.HANDMENU.Option1Button", "text", "Spaghetti") BTC.Show("GO.HANDMENU.Option1Button") BTC.Set("TextMeshPro.HANDMENU.Option2Button", "text", "Pizza") @@ -248,7 +248,6 @@ Tree("05_Tutorial") { BTC.Hide("GO.HANDMENU.Option1Button") BTC.Hide("GO.HANDMENU.Option2Button") BTC.Hide("GO.HANDMENU.Option3Button") - BTC.Hide("GO.HANDMENU.SpeechButton") BTC.Hide("GO.HANDMENU.SpeechOptions") BTC.SynthesizeText("Ah, Spaghetti mag ich auch!") BTC.SpeechOutputEnded() @@ -261,7 +260,6 @@ Tree("05_Tutorial") { BTC.Hide("GO.HANDMENU.Option1Button") BTC.Hide("GO.HANDMENU.Option2Button") BTC.Hide("GO.HANDMENU.Option3Button") - BTC.Hide("GO.HANDMENU.SpeechButton") BTC.Hide("GO.HANDMENU.SpeechOptions") BTC.SynthesizeText("Ah, Pizza mag ich auch!") BTC.SpeechOutputEnded() @@ -274,7 +272,6 @@ Tree("05_Tutorial") { BTC.Hide("GO.HANDMENU.Option1Button") BTC.Hide("GO.HANDMENU.Option2Button") BTC.Hide("GO.HANDMENU.Option3Button") - BTC.Hide("GO.HANDMENU.SpeechButton") BTC.Hide("GO.HANDMENU.SpeechOptions") BTC.SynthesizeText("Ah, Risotto mag ich auch!") BTC.SpeechOutputEnded() @@ -296,7 +293,7 @@ Tree("05_Tutorial") { Composite(Sequence) { Composite(Marathon) { - BTC.Show("GO.HANDMENU.SpeechButton") + BTC.Show("GO.HANDMENU.SpeechOptions") BTC.Set("TextMeshPro.HANDMENU.Option1Button", "text", "Spaghetti") BTC.Show("GO.HANDMENU.Option1Button") BTC.Set("TextMeshPro.HANDMENU.Option2Button", "text", "Pizza") @@ -314,7 +311,6 @@ Tree("05_Tutorial") { BTC.Hide("GO.HANDMENU.Option1Button") BTC.Hide("GO.HANDMENU.Option2Button") BTC.Hide("GO.HANDMENU.Option3Button") - BTC.Hide("GO.HANDMENU.SpeechButton") BTC.Hide("GO.HANDMENU.SpeechOptions") BTC.SynthesizeText("Ah, Spaghetti mag ich auch!") BTC.SpeechOutputEnded() @@ -327,7 +323,6 @@ Tree("05_Tutorial") { BTC.Hide("GO.HANDMENU.Option1Button") BTC.Hide("GO.HANDMENU.Option2Button") BTC.Hide("GO.HANDMENU.Option3Button") - BTC.Hide("GO.HANDMENU.SpeechButton") BTC.Hide("GO.HANDMENU.SpeechOptions") BTC.SynthesizeText("Ah, Pizza mag ich auch!") BTC.SpeechOutputEnded() @@ -340,7 +335,6 @@ Tree("05_Tutorial") { BTC.Hide("GO.HANDMENU.Option1Button") BTC.Hide("GO.HANDMENU.Option2Button") BTC.Hide("GO.HANDMENU.Option3Button") - BTC.Hide("GO.HANDMENU.SpeechButton") BTC.Hide("GO.HANDMENU.SpeechOptions") BTC.SynthesizeText("Ah, Risotto mag ich auch!") BTC.SpeechOutputEnded() diff --git a/Viagg-io/Assets/BehaviourTrees/1.0-SBB.bt.txt b/Viagg-io/Assets/BehaviourTrees/1.0-SBB.bt.txt index eee45d83..e009496f 100644 --- a/Viagg-io/Assets/BehaviourTrees/1.0-SBB.bt.txt +++ b/Viagg-io/Assets/BehaviourTrees/1.0-SBB.bt.txt @@ -327,7 +327,6 @@ Tree("10_SBB_Zugabteil_Szenenwahl") { BTC.AbortEventListener("NamedEventTrigger.HANDMENU.Option1Button") BTC.Hide("GO.HANDMENU.Option1Button") BTC.Hide("GO.HANDMENU.Option2Button") - BTC.Hide("GO.HANDMENU.SpeechButton") BTC.Hide("GO.HANDMENU.SpeechOptions") } BTC.FadeOut("FadeScene.XRInteractionHandsSetup.Black") @@ -338,7 +337,7 @@ Tree("10_SBB_Zugabteil_Szenenwahl") { // Szenenwahl per Handmenu Composite(Sequence) { Composite(Marathon) { - BTC.Show("GO.HANDMENU.SpeechButton") + BTC.Show("GO.HANDMENU.SpeechOptions") BTC.Set("TextMeshPro.HANDMENU.Option1Button", "text", "picnic") BTC.Show("GO.HANDMENU.Option1Button") BTC.Set("TextMeshPro.HANDMENU.Option2Button", "text", "grotto") @@ -354,7 +353,6 @@ Tree("10_SBB_Zugabteil_Szenenwahl") { BTC.AbortEventListener("NamedEventTrigger.HANDMENU.Option2Button") BTC.Hide("GO.HANDMENU.Option1Button") BTC.Hide("GO.HANDMENU.Option2Button") - BTC.Hide("GO.HANDMENU.SpeechButton") BTC.Hide("GO.HANDMENU.SpeechOptions") } @@ -371,7 +369,6 @@ Tree("10_SBB_Zugabteil_Szenenwahl") { BTC.AbortEventListener("NamedEventTrigger.HANDMENU.Option1Button") BTC.Hide("GO.HANDMENU.Option1Button") BTC.Hide("GO.HANDMENU.Option2Button") - BTC.Hide("GO.HANDMENU.SpeechButton") BTC.Hide("GO.HANDMENU.SpeechOptions") } diff --git a/Viagg-io/Assets/BehaviourTrees/2.6-Castello.bt.txt b/Viagg-io/Assets/BehaviourTrees/2.6-Castello.bt.txt index bce19625..c9d3c924 100644 --- a/Viagg-io/Assets/BehaviourTrees/2.6-Castello.bt.txt +++ b/Viagg-io/Assets/BehaviourTrees/2.6-Castello.bt.txt @@ -233,7 +233,7 @@ Tree("26_Castello_Castelli_di_Bellinzona_Intro") { // Fallback Button Composite(Marathon) { - BTC.Show("GO.GO.SpeechButton") + BTC.Show("GO.GO.SpeechOptions") BTC.Set("TextMeshPro.GO.Option1Button", "text", "Sì.") BTC.Show("GO.GO.Option1Button") BTC.Set("TextMeshPro.GO.Option2Button", "text", "No.") @@ -247,7 +247,6 @@ Tree("26_Castello_Castelli_di_Bellinzona_Intro") { BTC.AbortEventListener("NamedEventTrigger.GO.Option2Button") BTC.Hide("GO.GO.Option1Button") BTC.Hide("GO.GO.Option2Button") - BTC.Hide("GO.GO.SpeechButton") BTC.Hide("GO.GO.SpeechOptions") BTC.SetBool("InitOffeneFragen", false) RunTree("26_Castello_Castelli_di_Bellinzona_Geschichte_Castelli") @@ -258,7 +257,6 @@ Tree("26_Castello_Castelli_di_Bellinzona_Intro") { BTC.AbortEventListener("NamedEventTrigger.GO.Option1Button") BTC.Hide("GO.GO.Option1Button") BTC.Hide("GO.GO.Option2Button") - BTC.Hide("GO.GO.SpeechButton") BTC.Hide("GO.GO.SpeechOptions") BTC.SetBool("InitOffeneFragen") BTC.FadeOut("FadeScene.XRInteractionHandsSetup.Black") @@ -546,7 +544,7 @@ Tree("26_Castello_Castelli_di_Bellinzona_Geschichte_Castelli") { // Fallback Button Composite(Marathon) { - BTC.Show("GO.GO.SpeechButton") + BTC.Show("GO.GO.SpeechOptions") BTC.Set("TextMeshPro.GO.Option1Button", "text", "Sì.") BTC.Show("GO.GO.Option1Button") BTC.Set("TextMeshPro.GO.Option2Button", "text", "No.") @@ -560,7 +558,6 @@ Tree("26_Castello_Castelli_di_Bellinzona_Geschichte_Castelli") { BTC.AbortEventListener("NamedEventTrigger.GO.Option2Button") BTC.Hide("GO.GO.Option1Button") BTC.Hide("GO.GO.Option2Button") - BTC.Hide("GO.GO.SpeechButton") BTC.Hide("GO.GO.SpeechOptions") BTC.Hide("MediaPlayer.VIDEOS.ChatbotBurgenFidle_07") @@ -578,7 +575,6 @@ Tree("26_Castello_Castelli_di_Bellinzona_Geschichte_Castelli") { BTC.AbortEventListener("NamedEventTrigger.GO.Option1Button") BTC.Hide("GO.GO.Option1Button") BTC.Hide("GO.GO.Option2Button") - BTC.Hide("GO.GO.SpeechButton") BTC.Hide("GO.GO.SpeechOptions") BTC.Hide("MediaPlayer.VIDEOS.ChatbotBurgenFidle_07") @@ -648,7 +644,7 @@ Tree("26_Castello_Castelli_di_Bellinzona_Chatbot_Burgen_Entscheidung_Offene_Frag // Fallback Button Composite(Marathon) { - BTC.Show("GO.GO.SpeechButton") + BTC.Show("GO.GO.SpeechOptions") BTC.Set("TextMeshPro.GO.Option1Button", "text", "Sì.") BTC.Show("GO.GO.Option1Button") BTC.Set("TextMeshPro.GO.Option2Button", "text", "No.") @@ -662,7 +658,6 @@ Tree("26_Castello_Castelli_di_Bellinzona_Chatbot_Burgen_Entscheidung_Offene_Frag BTC.AbortEventListener("NamedEventTrigger.GO.Option2Button") BTC.Hide("GO.GO.Option1Button") BTC.Hide("GO.GO.Option2Button") - BTC.Hide("GO.GO.SpeechButton") BTC.Hide("GO.GO.SpeechOptions") RunTree("26_Castello_Castelli_di_Bellinzona_Castelli_Bot_offene_Fragen") } @@ -672,7 +667,6 @@ Tree("26_Castello_Castelli_di_Bellinzona_Chatbot_Burgen_Entscheidung_Offene_Frag BTC.AbortEventListener("NamedEventTrigger.GO.Option1Button") BTC.Hide("GO.GO.Option1Button") BTC.Hide("GO.GO.Option2Button") - BTC.Hide("GO.GO.SpeechButton") BTC.Hide("GO.GO.SpeechOptions") // Go To Outro } diff --git a/Viagg-io/Assets/BehaviourTrees/3.2-Grotto1.bt.txt b/Viagg-io/Assets/BehaviourTrees/3.2-Grotto1.bt.txt index 87eede25..d00cad83 100644 --- a/Viagg-io/Assets/BehaviourTrees/3.2-Grotto1.bt.txt +++ b/Viagg-io/Assets/BehaviourTrees/3.2-Grotto1.bt.txt @@ -332,7 +332,7 @@ Tree("32_Grotto_Story_B_Grotto_Intro") { // Selector 3: Fallback Button Composite(Sequence) { Composite(Marathon) { - BTC.Show("GO.GO.SpeechButton") + BTC.Show("GO.GO.SpeechOptions") BTC.Set("TextMeshPro.GO.Option1Button", "text", "L'aiuto in cucina.") BTC.Show("GO.GO.Option1Button") BTC.Set("TextMeshPro.GO.Option2Button", "text", "La aspetto.") @@ -346,7 +346,6 @@ Tree("32_Grotto_Story_B_Grotto_Intro") { BTC.AbortEventListener("NamedEventTrigger.GO.Option2Button") BTC.Hide("GO.GO.Option1Button") BTC.Hide("GO.GO.Option2Button") - BTC.Hide("GO.GO.SpeechButton") BTC.Hide("GO.GO.SpeechOptions") RunTree("32_Grotto_Story_B_Grotto_Antwort_Nonna_Kueche") } @@ -356,7 +355,6 @@ Tree("32_Grotto_Story_B_Grotto_Intro") { BTC.AbortEventListener("NamedEventTrigger.GO.Option1Button") BTC.Hide("GO.GO.Option1Button") BTC.Hide("GO.GO.Option2Button") - BTC.Hide("GO.GO.SpeechButton") BTC.Hide("GO.GO.SpeechOptions") RunTree("32_Grotto_Story_B_Grotto_Antwort_Nonna_Grotto") } @@ -377,7 +375,7 @@ Tree("32_Grotto_Story_B_Grotto_Intro") { // Fallback Button Composite(Sequence) { Composite(Marathon) { - BTC.Show("GO.GO.SpeechButton") + BTC.Show("GO.GO.SpeechOptions") BTC.Set("TextMeshPro.GO.Option1Button", "text", "L'aiuto in cucina.") BTC.Show("GO.GO.Option1Button") BTC.Set("TextMeshPro.GO.Option2Button", "text", "La aspetto.") @@ -391,7 +389,6 @@ Tree("32_Grotto_Story_B_Grotto_Intro") { BTC.AbortEventListener("NamedEventTrigger.GO.Option2Button") BTC.Hide("GO.GO.Option1Button") BTC.Hide("GO.GO.Option2Button") - BTC.Hide("GO.GO.SpeechButton") BTC.Hide("GO.GO.SpeechOptions") RunTree("32_Grotto_Story_B_Grotto_Antwort_Nonna_Kueche") } @@ -401,7 +398,6 @@ Tree("32_Grotto_Story_B_Grotto_Intro") { BTC.AbortEventListener("NamedEventTrigger.GO.Option1Button") BTC.Hide("GO.GO.Option1Button") BTC.Hide("GO.GO.Option2Button") - BTC.Hide("GO.GO.SpeechButton") BTC.Hide("GO.GO.SpeechOptions") RunTree("32_Grotto_Story_B_Grotto_Antwort_Nonna_Grotto") } diff --git a/Viagg-io/Assets/BehaviourTrees/3.2-Grotto2.bt.txt b/Viagg-io/Assets/BehaviourTrees/3.2-Grotto2.bt.txt index 964895ff..62f0913a 100644 --- a/Viagg-io/Assets/BehaviourTrees/3.2-Grotto2.bt.txt +++ b/Viagg-io/Assets/BehaviourTrees/3.2-Grotto2.bt.txt @@ -255,7 +255,7 @@ Tree("32_Grotto_Kueche_Intro") { // Fallback Button Composite(Marathon) { - BTC.Show("GO.GO.SpeechButton") + BTC.Show("GO.GO.SpeechOptions") BTC.Set("TextMeshPro.GO.Option1Button", "text", "Sì.") BTC.Show("GO.GO.Option1Button") BTC.Set("TextMeshPro.GO.Option2Button", "text", "No.") @@ -269,7 +269,6 @@ Tree("32_Grotto_Kueche_Intro") { BTC.AbortEventListener("NamedEventTrigger.GO.Option2Button") BTC.Hide("GO.GO.Option1Button") BTC.Hide("GO.GO.Option2Button") - BTC.Hide("GO.GO.SpeechButton") BTC.Hide("GO.GO.SpeechOptions") RunTree("32_Grotto_Kueche_Interesse_Kochen") } @@ -279,7 +278,6 @@ Tree("32_Grotto_Kueche_Intro") { BTC.AbortEventListener("NamedEventTrigger.GO.Option1Button") BTC.Hide("GO.GO.Option1Button") BTC.Hide("GO.GO.Option2Button") - BTC.Hide("GO.GO.SpeechButton") BTC.Hide("GO.GO.SpeechOptions") RunTree("32_Grotto_Kueche_Zusammen_Kochen") } @@ -299,7 +297,7 @@ Tree("32_Grotto_Kueche_Intro") { // Fallback Button Composite(Marathon) { - BTC.Show("GO.GO.SpeechButton") + BTC.Show("GO.GO.SpeechOptions") BTC.Set("TextMeshPro.GO.Option1Button", "text", "Sì.") BTC.Show("GO.GO.Option1Button") BTC.Set("TextMeshPro.GO.Option2Button", "text", "No.") @@ -313,7 +311,6 @@ Tree("32_Grotto_Kueche_Intro") { BTC.AbortEventListener("NamedEventTrigger.GO.Option2Button") BTC.Hide("GO.GO.Option1Button") BTC.Hide("GO.GO.Option2Button") - BTC.Hide("GO.GO.SpeechButton") BTC.Hide("GO.GO.SpeechOptions") RunTree("32_Grotto_Kueche_Interesse_Kochen") } @@ -323,7 +320,6 @@ Tree("32_Grotto_Kueche_Intro") { BTC.AbortEventListener("NamedEventTrigger.GO.Option1Button") BTC.Hide("GO.GO.Option1Button") BTC.Hide("GO.GO.Option2Button") - BTC.Hide("GO.GO.SpeechButton") BTC.Hide("GO.GO.SpeechOptions") RunTree("32_Grotto_Kueche_Zusammen_Kochen") } @@ -417,7 +413,7 @@ Tree("32_Grotto_Kueche_Kochen_Anzahl") { // Fallback Button Composite(Marathon) { - BTC.Show("GO.GO.SpeechButton") + BTC.Show("GO.GO.SpeechOptions") BTC.Set("TextMeshPro.GO.Option1Button", "text", "molto spesso") BTC.Show("GO.GO.Option1Button") BTC.Set("TextMeshPro.GO.Option2Button", "text", "raramente") @@ -431,7 +427,6 @@ Tree("32_Grotto_Kueche_Kochen_Anzahl") { BTC.AbortEventListener("NamedEventTrigger.GO.Option2Button") BTC.Hide("GO.GO.Option1Button") BTC.Hide("GO.GO.Option2Button") - BTC.Hide("GO.GO.SpeechButton") BTC.Hide("GO.GO.SpeechOptions") RunTree("32_Grotto_Kueche_Zusammen_Kochen") } @@ -441,7 +436,6 @@ Tree("32_Grotto_Kueche_Kochen_Anzahl") { BTC.AbortEventListener("NamedEventTrigger.GO.Option1Button") BTC.Hide("GO.GO.Option1Button") BTC.Hide("GO.GO.Option2Button") - BTC.Hide("GO.GO.SpeechButton") BTC.Hide("GO.GO.SpeechOptions") RunTree("32_Grotto_Kueche_Zusammen_Kochen") } diff --git a/Viagg-io/Assets/BehaviourTrees/3.2-Grotto3.bt.txt b/Viagg-io/Assets/BehaviourTrees/3.2-Grotto3.bt.txt index 06d45bea..85889fe6 100644 --- a/Viagg-io/Assets/BehaviourTrees/3.2-Grotto3.bt.txt +++ b/Viagg-io/Assets/BehaviourTrees/3.2-Grotto3.bt.txt @@ -760,14 +760,13 @@ Tree("32_Grotto_Im_Grotto_Essen_Nachfrage_Kellner_Getraenk_Handmenu") { Composite(Sequence) { // Fallback Button Composite(Marathon) { - BTC.Show("GO.GO.SpeechButton") + BTC.Show("GO.GO.SpeechOptions") BTC.Set("TextMeshPro.GO.Option1Button", "text", "una gazzosa") BTC.Show("GO.GO.Option1Button") } BTC.Run("NamedEventTrigger.GO.Option1Button") BTC.Hide("GO.GO.Option1Button") - BTC.Hide("GO.GO.SpeechButton") BTC.Hide("GO.GO.SpeechOptions") } } @@ -847,7 +846,7 @@ Tree("32_Grotto_Im_Grotto_Essen_Nachfrage_Kellner_Essen_Handmenu") { Composite(Sequence) { // Fallback Button Composite(Marathon) { - BTC.Show("GO.GO.SpeechButton") + BTC.Show("GO.GO.SpeechOptions") BTC.Set("TextMeshPro.GO.Option1Button", "text", "Risotto") BTC.Show("GO.GO.Option1Button") BTC.Set("TextMeshPro.GO.Option2Button", "text", "Pizochen") @@ -865,7 +864,6 @@ Tree("32_Grotto_Im_Grotto_Essen_Nachfrage_Kellner_Essen_Handmenu") { BTC.Hide("GO.GO.Option1Button") BTC.Hide("GO.GO.Option2Button") BTC.Hide("GO.GO.Option3Button") - BTC.Hide("GO.GO.SpeechButton") BTC.Hide("GO.GO.SpeechOptions") BTC.SetBool("ChoosedRisotto") } @@ -877,7 +875,6 @@ Tree("32_Grotto_Im_Grotto_Essen_Nachfrage_Kellner_Essen_Handmenu") { BTC.Hide("GO.GO.Option1Button") BTC.Hide("GO.GO.Option2Button") BTC.Hide("GO.GO.Option3Button") - BTC.Hide("GO.GO.SpeechButton") BTC.Hide("GO.GO.SpeechOptions") BTC.SetBool("ChoosedPizochen") } @@ -889,7 +886,6 @@ Tree("32_Grotto_Im_Grotto_Essen_Nachfrage_Kellner_Essen_Handmenu") { BTC.Hide("GO.GO.Option1Button") BTC.Hide("GO.GO.Option2Button") BTC.Hide("GO.GO.Option3Button") - BTC.Hide("GO.GO.SpeechButton") BTC.Hide("GO.GO.SpeechOptions") BTC.SetBool("ChoosedInsalata") } diff --git a/Viagg-io/Assets/BehaviourTrees/4.0-Puschlav.bt.txt b/Viagg-io/Assets/BehaviourTrees/4.0-Puschlav.bt.txt index 59d38256..b2c6143b 100644 --- a/Viagg-io/Assets/BehaviourTrees/4.0-Puschlav.bt.txt +++ b/Viagg-io/Assets/BehaviourTrees/4.0-Puschlav.bt.txt @@ -120,7 +120,11 @@ Tree("40_Puschlav_Story_C_Puschlav") { BTC.CheckEntryLevel(0) BTC.Run("LoadScene.NEXT.10SBB") } - BTC.Run("LoadScene.NEXT.32Grotto1") + Composite(Sequence) { + BTC.CheckEntryLevel(1) + BTC.Run("LoadScene.NEXT.32Grotto1") + } + BTC.Run("LoadScene.NEXT.00Menu") } } } @@ -173,7 +177,11 @@ Tree("40_Puschlav_Story_C_Puschlav") { BTC.CheckEntryLevel(0) BTC.Run("LoadScene.NEXT.10SBB") } - BTC.Run("LoadScene.NEXT.32Grotto1") + Composite(Sequence) { + BTC.CheckEntryLevel(1) + BTC.Run("LoadScene.NEXT.32Grotto1") + } + BTC.Run("LoadScene.NEXT.00Menu") } } } @@ -257,7 +265,11 @@ Tree("40_Puschlav_Story_C_Puschlav") { BTC.CheckEntryLevel(0) BTC.Run("LoadScene.NEXT.10SBB") } - BTC.Run("LoadScene.NEXT.32Grotto1") + Composite(Sequence) { + BTC.CheckEntryLevel(1) + BTC.Run("LoadScene.NEXT.32Grotto1") + } + BTC.Run("LoadScene.NEXT.00Menu") } } } @@ -317,7 +329,11 @@ Tree("40_Puschlav_Story_C_Puschlav") { BTC.CheckEntryLevel(0) BTC.Run("LoadScene.NEXT.10SBB") } - BTC.Run("LoadScene.NEXT.32Grotto1") + Composite(Sequence) { + BTC.CheckEntryLevel(1) + BTC.Run("LoadScene.NEXT.32Grotto1") + } + BTC.Run("LoadScene.NEXT.00Menu") } } } @@ -417,7 +433,11 @@ Tree("40_Puschlav_Story_C_Puschlav_3A_Gletschergarten") { BTC.CheckEntryLevel(0) BTC.Run("LoadScene.NEXT.10SBB") } - BTC.Run("LoadScene.NEXT.32Grotto1") + Composite(Sequence) { + BTC.CheckEntryLevel(1) + BTC.Run("LoadScene.NEXT.32Grotto1") + } + BTC.Run("LoadScene.NEXT.00Menu") } } } @@ -470,7 +490,11 @@ Tree("40_Puschlav_Story_C_Puschlav_3A_Gletschergarten") { BTC.CheckEntryLevel(0) BTC.Run("LoadScene.NEXT.10SBB") } - BTC.Run("LoadScene.NEXT.32Grotto1") + Composite(Sequence) { + BTC.CheckEntryLevel(1) + BTC.Run("LoadScene.NEXT.32Grotto1") + } + BTC.Run("LoadScene.NEXT.00Menu") } } } @@ -545,7 +569,11 @@ Tree("40_Puschlav_Story_C_Puschlav_3A_Gletschergarten") { BTC.CheckEntryLevel(0) BTC.Run("LoadScene.NEXT.10SBB") } - BTC.Run("LoadScene.NEXT.32Grotto1") + Composite(Sequence) { + BTC.CheckEntryLevel(1) + BTC.Run("LoadScene.NEXT.32Grotto1") + } + BTC.Run("LoadScene.NEXT.00Menu") } } } @@ -598,7 +626,11 @@ Tree("40_Puschlav_Story_C_Puschlav_3A_Gletschergarten") { BTC.CheckEntryLevel(0) BTC.Run("LoadScene.NEXT.10SBB") } - BTC.Run("LoadScene.NEXT.32Grotto1") + Composite(Sequence) { + BTC.CheckEntryLevel(1) + BTC.Run("LoadScene.NEXT.32Grotto1") + } + BTC.Run("LoadScene.NEXT.00Menu") } } } @@ -755,7 +787,11 @@ Tree("40_Puschlav_Story_C_Puschlav_3B_Alpgruem") { BTC.CheckEntryLevel(0) BTC.Run("LoadScene.NEXT.10SBB") } - BTC.Run("LoadScene.NEXT.32Grotto1") + Composite(Sequence) { + BTC.CheckEntryLevel(1) + BTC.Run("LoadScene.NEXT.32Grotto1") + } + BTC.Run("LoadScene.NEXT.00Menu") } } } @@ -808,7 +844,11 @@ Tree("40_Puschlav_Story_C_Puschlav_3B_Alpgruem") { BTC.CheckEntryLevel(0) BTC.Run("LoadScene.NEXT.10SBB") } - BTC.Run("LoadScene.NEXT.32Grotto1") + Composite(Sequence) { + BTC.CheckEntryLevel(1) + BTC.Run("LoadScene.NEXT.32Grotto1") + } + BTC.Run("LoadScene.NEXT.00Menu") } } } @@ -883,7 +923,11 @@ Tree("40_Puschlav_Story_C_Puschlav_3B_Alpgruem") { BTC.CheckEntryLevel(0) BTC.Run("LoadScene.NEXT.10SBB") } - BTC.Run("LoadScene.NEXT.32Grotto1") + Composite(Sequence) { + BTC.CheckEntryLevel(1) + BTC.Run("LoadScene.NEXT.32Grotto1") + } + BTC.Run("LoadScene.NEXT.00Menu") } } } @@ -936,7 +980,11 @@ Tree("40_Puschlav_Story_C_Puschlav_3B_Alpgruem") { BTC.CheckEntryLevel(0) BTC.Run("LoadScene.NEXT.10SBB") } - BTC.Run("LoadScene.NEXT.32Grotto1") + Composite(Sequence) { + BTC.CheckEntryLevel(1) + BTC.Run("LoadScene.NEXT.32Grotto1") + } + BTC.Run("LoadScene.NEXT.00Menu") } } } diff --git a/Viagg-io/Assets/Prefabs/UI/_HANDMENU.prefab b/Viagg-io/Assets/Prefabs/UI/_HANDMENU.prefab index 9d070858..98f57d8e 100644 --- a/Viagg-io/Assets/Prefabs/UI/_HANDMENU.prefab +++ b/Viagg-io/Assets/Prefabs/UI/_HANDMENU.prefab @@ -1423,6 +1423,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 1 + - m_Target: {fileID: 4922434386707919304} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 1 --- !u!114 &6131320024260505541 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2800,32 +2812,23 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9bf92c9573b2a9f42bb2d99d57a87ef7, type: 3} m_Name: m_EditorClassIdentifier: - jumpPointGrottoEssen: GrottoEssen - jumpPointGrottoKueche: GrottoKueche fadeDuration: 2 _fadeScreenObj: {fileID: 0} levels: - levelButton: {fileID: 3574905379413314231} sceneName: 0.5-Tutorial - jumpPoint: - levelButton: {fileID: 3169801860479176337} sceneName: 1.0-SBB - jumpPoint: - levelButton: {fileID: 9093523400736982200} sceneName: 2.2-Geschaeft - jumpPoint: - levelButton: {fileID: 4389954661606497373} sceneName: 2.6-Castello - jumpPoint: - levelButton: {fileID: 5086790528451368382} sceneName: 3.2-Grotto1 - jumpPoint: - levelButton: {fileID: 8004889795424434734} sceneName: 3.2-Grotto2 - jumpPoint: - levelButton: {fileID: 1160308868113885560} sceneName: 3.2-Grotto3 - jumpPoint: --- !u!114 &2193313745158143424 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3601,7 +3604,7 @@ MonoBehaviour: m_PressedTrigger: Pressed m_SelectedTrigger: Selected m_DisabledTrigger: Disabled - m_Interactable: 0 + m_Interactable: 1 m_TargetGraphic: {fileID: 631090957775741481} m_OnClick: m_PersistentCalls: @@ -3782,6 +3785,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 1 + - m_Target: {fileID: 4922434386707919304} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 1 --- !u!114 &4932607075636810457 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4237,8 +4252,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 8052757528544109721} + m_Children: [] m_Father: {fileID: 3983828319149830297} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -4501,13 +4515,14 @@ GameObject: - component: {fileID: 475537189225577815} - component: {fileID: 5898539999483921607} - component: {fileID: 9181719262004322874} + - component: {fileID: 8030893549098307336} m_Layer: 9 m_Name: GO.HANDMENU.SpeechOptions_148102 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &475537189225577815 RectTransform: m_ObjectHideFlags: 0 @@ -4521,6 +4536,7 @@ RectTransform: m_ConstrainProportionsScale: 1 m_Children: - {fileID: 6764805162998936320} + - {fileID: 8052757528544109721} m_Father: {fileID: 2751281580566150895} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -4562,6 +4578,23 @@ MonoBehaviour: fadeOutTime: 1.5 go: {fileID: 3519308568976615508} objName: SpeechOptions +--- !u!114 &8030893549098307336 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3519308568976615508} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 66d060d884fa941b0a4b4951aa164672, type: 3} + m_Name: + m_EditorClassIdentifier: + canvasMenues: {fileID: 5749279540897740160} + menuMain: {fileID: 678905784368509000} + menuLevels: {fileID: 9195006167712604860} + menuHelp: {fileID: 1024422540830896549} + notificationObject: {fileID: 4922434386707919304} --- !u!1 &3871271027943893194 GameObject: m_ObjectHideFlags: 0 @@ -8903,7 +8936,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &2751281580566150895 RectTransform: m_ObjectHideFlags: 0 @@ -9151,6 +9184,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 1 + - m_Target: {fileID: 4922434386707919304} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 1 --- !u!114 &1022464775461504965 MonoBehaviour: m_ObjectHideFlags: 0 @@ -9948,16 +9993,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8121247755317407095} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: -0.0000002980231, y: 0.00000005988638, z: 0.0000000033339453, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.00007671319} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 8852356936048008922} + m_Father: {fileID: 475537189225577815} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: -37.000107, y: -117.7144} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &6692481775643520009 diff --git a/Viagg-io/Assets/Scripts/OnEnableSpeechOptions.cs b/Viagg-io/Assets/Scripts/OnEnableSpeechOptions.cs new file mode 100644 index 00000000..b3507980 --- /dev/null +++ b/Viagg-io/Assets/Scripts/OnEnableSpeechOptions.cs @@ -0,0 +1,30 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class OnEnableSpeechOptions : MonoBehaviour +{ + [SerializeField] + GameObject canvasMenues; + + [SerializeField] + GameObject menuMain; + + [SerializeField] + GameObject menuLevels; + + [SerializeField] + GameObject menuHelp; + + [SerializeField] + GameObject notificationObject; + + private void OnEnable() + { + canvasMenues?.SetActive(false); + menuMain?.SetActive(false); + menuLevels?.SetActive(false); + menuHelp?.SetActive(false); + notificationObject?.SetActive(true); + } +} diff --git a/Viagg-io/Assets/Scripts/OnEnableSpeechOptions.cs.meta b/Viagg-io/Assets/Scripts/OnEnableSpeechOptions.cs.meta new file mode 100644 index 00000000..95f23d95 --- /dev/null +++ b/Viagg-io/Assets/Scripts/OnEnableSpeechOptions.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 66d060d884fa941b0a4b4951aa164672 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: