Merge branch 'master' into leveldesign

Viagg-io/Assets/BehaviourTrees/1.0-SBB.bt.txt

@@ -29,7 +29,6 @@
             BTC.Run("NamedEventTrigger.HANDMENU.Option1Button")
             BTC.Hide("GO.HANDMENU.Option1Button")
             BTC.Hide("GO.HANDMENU.SpeechButton")
-            BTC.Show("GO.HANDMENU.Home")
             BTC.Hide("GO.HANDMENU.SpeechOptions")
         }                             
     }
@@ -342,7 +341,6 @@ Tree("10_SBB_Zugabteil_Szenenwahl") {
                                             BTC.Hide("GO.HANDMENU.Option2Button")
                                             BTC.Hide("GO.HANDMENU.Option3Button")
                                             BTC.Hide("GO.HANDMENU.SpeechButton")
-                                            BTC.Show("GO.HANDMENU.Home")
                                             BTC.Hide("GO.HANDMENU.SpeechOptions")
                                         }
 
@@ -363,7 +361,6 @@ Tree("10_SBB_Zugabteil_Szenenwahl") {
                                             BTC.Hide("GO.HANDMENU.Option2Button")
                                             BTC.Hide("GO.HANDMENU.Option3Button")
                                             BTC.Hide("GO.HANDMENU.SpeechButton")
-                                            BTC.Show("GO.HANDMENU.Home")
                                             BTC.Hide("GO.HANDMENU.SpeechOptions")
                                         }
 
@@ -384,7 +381,6 @@ Tree("10_SBB_Zugabteil_Szenenwahl") {
                                             BTC.Hide("GO.HANDMENU.Option2Button")
                                             BTC.Hide("GO.HANDMENU.Option3Button")
                                             BTC.Hide("GO.HANDMENU.SpeechButton")
-                                            BTC.Show("GO.HANDMENU.Home")
                                             BTC.Hide("GO.HANDMENU.SpeechOptions")
                                         }
 
@@ -463,7 +459,6 @@ Tree("10_SBB_Zugabteil_Szenenwahl") {
                             BTC.Hide("GO.HANDMENU.Option2Button")
                             BTC.Hide("GO.HANDMENU.Option3Button")
                             BTC.Hide("GO.HANDMENU.SpeechButton")
-                            BTC.Show("GO.HANDMENU.Home")
                             BTC.Hide("GO.HANDMENU.SpeechOptions")
                         }
 
@@ -486,7 +481,6 @@ Tree("10_SBB_Zugabteil_Szenenwahl") {
                             BTC.Hide("GO.HANDMENU.Option2Button")
                             BTC.Hide("GO.HANDMENU.Option3Button")
                             BTC.Hide("GO.HANDMENU.SpeechButton")
-                            BTC.Show("GO.HANDMENU.Home")
                             BTC.Hide("GO.HANDMENU.SpeechOptions")
                         }
 
@@ -509,7 +503,6 @@ Tree("10_SBB_Zugabteil_Szenenwahl") {
                             BTC.Hide("GO.HANDMENU.Option2Button")
                             BTC.Hide("GO.HANDMENU.Option3Button")
                             BTC.Hide("GO.HANDMENU.SpeechButton")
-                            BTC.Show("GO.HANDMENU.Home")
                             BTC.Hide("GO.HANDMENU.SpeechOptions")
                         }
 

Viagg-io/Assets/BehaviourTrees/2.2-Geschaeft.bt.txt

@@ -31,7 +31,6 @@
             BTC.Run("NamedEventTrigger.GO.Option1Button")
             BTC.Hide("GO.GO.Option1Button")
             BTC.Hide("GO.GO.SpeechButton")
-            BTC.Show("GO.GO.Home")
             BTC.Hide("GO.GO.SpeechOptions")
         }
     }
@@ -499,7 +498,6 @@ Tree("22_Geschaeft_Baeckerei_Outro") {
                                 BTC.Hide("GO.GO.Option1Button")
                                 BTC.Hide("GO.GO.Option2Button")
                                 BTC.Hide("GO.GO.SpeechButton")
-                                BTC.Show("GO.GO.Home")
                                 BTC.Hide("GO.GO.SpeechOptions")
                                 BTC.SetBool("ChoosedWalking")
                             }
@@ -510,7 +508,6 @@ Tree("22_Geschaeft_Baeckerei_Outro") {
                                 BTC.Hide("GO.GO.Option1Button")
                                 BTC.Hide("GO.GO.Option2Button")
                                 BTC.Hide("GO.GO.SpeechButton")
-                                BTC.Show("GO.GO.Home")
                                 BTC.Hide("GO.GO.SpeechOptions")
                                 BTC.SetBool("ChoosedDriving")
                             }
@@ -543,7 +540,6 @@ Tree("22_Geschaeft_Baeckerei_Outro") {
                         BTC.Hide("GO.GO.Option1Button")
                         BTC.Hide("GO.GO.Option2Button")
                         BTC.Hide("GO.GO.SpeechButton")
-                        BTC.Show("GO.GO.Home")
                         BTC.Hide("GO.GO.SpeechOptions")
                         BTC.SetBool("ChoosedWalking")
                     }
@@ -554,7 +550,6 @@ Tree("22_Geschaeft_Baeckerei_Outro") {
                         BTC.Hide("GO.GO.Option1Button")
                         BTC.Hide("GO.GO.Option2Button")
                         BTC.Hide("GO.GO.SpeechButton")
-                        BTC.Show("GO.GO.Home")
                         BTC.Hide("GO.GO.SpeechOptions")
                         BTC.SetBool("ChoosedDriving")
                     }

Viagg-io/Assets/BehaviourTrees/2.6-Castello.bt.txt

@@ -34,7 +34,6 @@
             BTC.Run("NamedEventTrigger.GO.Option1Button")
             BTC.Hide("GO.GO.Option1Button")
             BTC.Hide("GO.GO.SpeechButton")
-            BTC.Show("GO.GO.Home")
             BTC.Hide("GO.GO.SpeechOptions")
         }
     }
@@ -172,7 +171,6 @@ Tree("26_Castello_Castelli_di_Bellinzona_Intro") {
                                 BTC.Hide("GO.GO.Option1Button")
                                 BTC.Hide("GO.GO.Option2Button")
                                 BTC.Hide("GO.GO.SpeechButton")
-                                BTC.Show("GO.GO.Home")
                                 BTC.Hide("GO.GO.SpeechOptions")
                                 BTC.FadeOut("FadeScene.XRInteractionHandsSetup.Black")
                                 RunTree("26_Castello_Castelli_di_Bellinzona_Geschichte_Castelli")
@@ -184,7 +182,6 @@ Tree("26_Castello_Castelli_di_Bellinzona_Intro") {
                                 BTC.Hide("GO.GO.Option1Button")
                                 BTC.Hide("GO.GO.Option2Button")
                                 BTC.Hide("GO.GO.SpeechButton")
-                                BTC.Show("GO.GO.Home")
                                 BTC.Hide("GO.GO.SpeechOptions")
                                 //RunTree("26_Castello_Castelli_di_Bellinzona_KI_Audio_Chat_Castelli")
                                 RunTree("26_Castello_Castelli_di_Bellinzona_Geschichte_Castelli")
@@ -402,7 +399,6 @@ Tree("26_Castello_Castelli_di_Bellinzona_Chatbot_Burgen") {
                                 BTC.Hide("GO.GO.Option1Button")
                                 BTC.Hide("GO.GO.Option2Button")
                                 BTC.Hide("GO.GO.SpeechButton")
-                                BTC.Show("GO.GO.Home")
                                 BTC.Hide("GO.GO.SpeechOptions")
                                 RunTree("26_Castello_Castelli_di_Bellinzona_Geschichte_Castelli_Bot")
                             }
@@ -413,7 +409,6 @@ Tree("26_Castello_Castelli_di_Bellinzona_Chatbot_Burgen") {
                                 BTC.Hide("GO.GO.Option1Button")
                                 BTC.Hide("GO.GO.Option2Button")
                                 BTC.Hide("GO.GO.SpeechButton")
-                                BTC.Show("GO.GO.Home")
                                 BTC.Hide("GO.GO.SpeechOptions")
                                 //RunTree("26_Castello_Castelli_di_Bellinzona_KI_Audio_Chat_Castelli")
                                 RunTree("26_Castello_Castelli_di_Bellinzona_Geschichte_Castelli_Bot")
@@ -508,7 +503,6 @@ Tree("26_Castello_Castelli_di_Bellinzona_Geschichte_Castelli_Bot") {
                                 BTC.Hide("GO.GO.Option1Button")
                                 BTC.Hide("GO.GO.Option2Button")
                                 BTC.Hide("GO.GO.SpeechButton")
-                                BTC.Show("GO.GO.Home")
                                 BTC.Hide("GO.GO.SpeechOptions")
                                 RunTree("26_Castello_Castelli_di_Bellinzona_Geschichte_Castelli_weitererzaehlen")
                             }
@@ -519,7 +513,6 @@ Tree("26_Castello_Castelli_di_Bellinzona_Geschichte_Castelli_Bot") {
                                 BTC.Hide("GO.GO.Option1Button")
                                 BTC.Hide("GO.GO.Option2Button")
                                 BTC.Hide("GO.GO.SpeechButton")
-                                BTC.Show("GO.GO.Home")
                                 BTC.Hide("GO.GO.SpeechOptions")
                                 //RunTree("26_Castello_Castelli_di_Bellinzona_KI_Audio_Chat_Castelli")
                                 RunTree("26_Castello_Castelli_di_Bellinzona_Geschichte_Castelli_weitererzaehlen")

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

@@ -31,7 +31,6 @@
             BTC.Run("NamedEventTrigger.GO.Option1Button")
             BTC.Hide("GO.GO.Option1Button")
             BTC.Hide("GO.GO.SpeechButton")
-            BTC.Show("GO.GO.Home")
             BTC.Hide("GO.GO.SpeechOptions")
         }
     }
@@ -276,7 +275,6 @@ Tree("32_Grotto_Story_B_Grotto_Intro") {
                                 BTC.Hide("GO.GO.Option1Button")
                                 BTC.Hide("GO.GO.Option2Button")
                                 BTC.Hide("GO.GO.SpeechButton")
-                                BTC.Show("GO.GO.Home")
                                 BTC.Hide("GO.GO.SpeechOptions")
                                 RunTree("32_Grotto_Story_B_Grotto_Antwort_Nonna_Kueche")
                             }
@@ -287,7 +285,6 @@ Tree("32_Grotto_Story_B_Grotto_Intro") {
                                 BTC.Hide("GO.GO.Option1Button")
                                 BTC.Hide("GO.GO.Option2Button")
                                 BTC.Hide("GO.GO.SpeechButton")
-                                BTC.Show("GO.GO.Home")
                                 BTC.Hide("GO.GO.SpeechOptions")
                                 RunTree("32_Grotto_Story_B_Grotto_Antwort_Nonna_Grotto")
                             }
@@ -326,7 +323,6 @@ Tree("32_Grotto_Story_B_Grotto_Intro") {
                             BTC.Hide("GO.GO.Option1Button")
                             BTC.Hide("GO.GO.Option2Button")
                             BTC.Hide("GO.GO.SpeechButton")
-                            BTC.Show("GO.GO.Home")
                             BTC.Hide("GO.GO.SpeechOptions")
                             RunTree("32_Grotto_Story_B_Grotto_Antwort_Nonna_Kueche")
                         }
@@ -337,7 +333,6 @@ Tree("32_Grotto_Story_B_Grotto_Intro") {
                             BTC.Hide("GO.GO.Option1Button")
                             BTC.Hide("GO.GO.Option2Button")
                             BTC.Hide("GO.GO.SpeechButton")
-                            BTC.Show("GO.GO.Home")
                             BTC.Hide("GO.GO.SpeechOptions")
                             RunTree("32_Grotto_Story_B_Grotto_Antwort_Nonna_Grotto")
                         }

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

@@ -37,7 +37,6 @@
             BTC.Run("NamedEventTrigger.GO.Option1Button")
             BTC.Hide("GO.GO.Option1Button")
             BTC.Hide("GO.GO.SpeechButton")
-            BTC.Show("GO.GO.Home")
             BTC.Hide("GO.GO.SpeechOptions")
         }
     }
@@ -472,7 +471,6 @@ Tree("32_Grotto_Kueche_alles_gefunden") {
                                 BTC.Hide("GO.GO.Option1Button")
                                 BTC.Hide("GO.GO.Option2Button")
                                 BTC.Hide("GO.GO.SpeechButton")
-                                BTC.Show("GO.GO.Home")
                                 BTC.Hide("GO.GO.SpeechOptions")
                                 RunTree("32_Grotto_Kueche_Interesse_Kochen")
                             }
@@ -483,7 +481,6 @@ Tree("32_Grotto_Kueche_alles_gefunden") {
                                 BTC.Hide("GO.GO.Option1Button")
                                 BTC.Hide("GO.GO.Option2Button")
                                 BTC.Hide("GO.GO.SpeechButton")
-                                BTC.Show("GO.GO.Home")
                                 BTC.Hide("GO.GO.SpeechOptions")
                                 RunTree("32_Grotto_Kueche_Zusammen_Kochen")
                             }
@@ -517,7 +514,6 @@ Tree("32_Grotto_Kueche_alles_gefunden") {
                         BTC.Hide("GO.GO.Option1Button")
                         BTC.Hide("GO.GO.Option2Button")
                         BTC.Hide("GO.GO.SpeechButton")
-                        BTC.Show("GO.GO.Home")
                         BTC.Hide("GO.GO.SpeechOptions")
                         RunTree("32_Grotto_Kueche_Interesse_Kochen")
                     }
@@ -528,7 +524,6 @@ Tree("32_Grotto_Kueche_alles_gefunden") {
                         BTC.Hide("GO.GO.Option1Button")
                         BTC.Hide("GO.GO.Option2Button")
                         BTC.Hide("GO.GO.SpeechButton")
-                        BTC.Show("GO.GO.Home")
                         BTC.Hide("GO.GO.SpeechOptions")
                         RunTree("32_Grotto_Kueche_Zusammen_Kochen")
                     }
@@ -644,7 +639,6 @@ Tree("32_Grotto_Kueche_Kochen_Anzahl") {
                                 BTC.Hide("GO.GO.Option1Button")
                                 BTC.Hide("GO.GO.Option2Button")
                                 BTC.Hide("GO.GO.SpeechButton")
-                                BTC.Show("GO.GO.Home")
                                 BTC.Hide("GO.GO.SpeechOptions")
                                 //RunTree("32_Grotto_Kueche_Selbststaendig_Kochen")
                                 RunTree("32_Grotto_Kueche_Zusammen_Kochen")
@@ -656,7 +650,6 @@ Tree("32_Grotto_Kueche_Kochen_Anzahl") {
                                 BTC.Hide("GO.GO.Option1Button")
                                 BTC.Hide("GO.GO.Option2Button")
                                 BTC.Hide("GO.GO.SpeechButton")
-                                BTC.Show("GO.GO.Home")
                                 BTC.Hide("GO.GO.SpeechOptions")
                                 RunTree("32_Grotto_Kueche_Zusammen_Kochen")
                             }

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

@@ -30,7 +30,6 @@
             BTC.Run("NamedEventTrigger.GO.Option1Button")
             BTC.Hide("GO.GO.Option1Button")
             BTC.Hide("GO.GO.SpeechButton")
-            BTC.Show("GO.GO.Home")
             BTC.Hide("GO.GO.SpeechOptions")
         }
     }
@@ -149,7 +148,6 @@ Tree("32_Grotto_Im_Grotto_Essen_Intro") {
                 BTC.Run("NamedEventTrigger.GO.Option1Button")
                 BTC.Hide("GO.GO.Option1Button")
                 BTC.Hide("GO.GO.SpeechButton")
-                BTC.Show("GO.GO.Home")
                 BTC.Hide("GO.GO.SpeechOptions") 
             }
         }
@@ -261,7 +259,6 @@ Tree("32_Grotto_Im_Grotto_Essen_Intro") {
                                 BTC.Hide("GO.GO.Option2Button")
                                 BTC.Hide("GO.GO.Option3Button")
                                 BTC.Hide("GO.GO.SpeechButton")
-                                BTC.Show("GO.GO.Home")
                                 BTC.Hide("GO.GO.SpeechOptions")
                                 BTC.SetBool("ChoosedRisotto")
                             }
@@ -274,7 +271,6 @@ Tree("32_Grotto_Im_Grotto_Essen_Intro") {
                                 BTC.Hide("GO.GO.Option2Button")
                                 BTC.Hide("GO.GO.Option3Button")
                                 BTC.Hide("GO.GO.SpeechButton")
-                                BTC.Show("GO.GO.Home")
                                 BTC.Hide("GO.GO.SpeechOptions")
                                 BTC.SetBool("ChoosedPizochen")
                             }
@@ -287,7 +283,6 @@ Tree("32_Grotto_Im_Grotto_Essen_Intro") {
                                 BTC.Hide("GO.GO.Option2Button")
                                 BTC.Hide("GO.GO.Option3Button")
                                 BTC.Hide("GO.GO.SpeechButton")
-                                BTC.Show("GO.GO.Home")
                                 BTC.Hide("GO.GO.SpeechOptions")
                                 BTC.SetBool("ChoosedInsalata")
                             }
@@ -326,7 +321,6 @@ Tree("32_Grotto_Im_Grotto_Essen_Intro") {
                             BTC.Hide("GO.GO.Option2Button")
                             BTC.Hide("GO.GO.Option3Button")
                             BTC.Hide("GO.GO.SpeechButton")
-                            BTC.Show("GO.GO.Home")
                             BTC.Hide("GO.GO.SpeechOptions")
                             BTC.SetBool("ChoosedRisotto")
                         }
@@ -339,7 +333,6 @@ Tree("32_Grotto_Im_Grotto_Essen_Intro") {
                             BTC.Hide("GO.GO.Option2Button")
                             BTC.Hide("GO.GO.Option3Button")
                             BTC.Hide("GO.GO.SpeechButton")
-                            BTC.Show("GO.GO.Home")
                             BTC.Hide("GO.GO.SpeechOptions")
                             BTC.SetBool("ChoosedPizochen")
                         }
@@ -352,7 +345,6 @@ Tree("32_Grotto_Im_Grotto_Essen_Intro") {
                             BTC.Hide("GO.GO.Option2Button")
                             BTC.Hide("GO.GO.Option3Button")
                             BTC.Hide("GO.GO.SpeechButton")
-                            BTC.Show("GO.GO.Home")
                             BTC.Hide("GO.GO.SpeechOptions")
                             BTC.SetBool("ChoosedInsalata")
                         }

Viagg-io/Assets/Prefabs/UI/_HANDMENU.prefab.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 90dfe96f41d164a3081b56f73f4214e4
+guid: 23016bb1f9755411a82e6afddfee4016
 PrefabImporter:
   externalObjects: {}
   userData: 

Viagg-io/Assets/Prefabs/UI/_HANDMENU_alt.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 90dfe96f41d164a3081b56f73f4214e4
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Viagg-io/Assets/Scripts/OnActivateSpeechButton.cs

@@ -0,0 +1,18 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class OnActivateSpeechButton : MonoBehaviour
+{
+    [SerializeField]
+    GameObject notificationObj;
+
+    [SerializeField]
+    GameObject speechAlarmObj;
+
+    private void OnEnable()
+    {
+        speechAlarmObj?.SetActive(true);
+        notificationObj?.SetActive(true);
+    }
+}

Viagg-io/Assets/Scripts/OnActivateSpeechButton.cs.meta

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