spoerrireto/UP-Viagg-io
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: spoerrireto:28b8522b3e631e452d58122754042286610f0abd
Branches Tags
spoerrireto:master
spoerrireto:leveldesign
spoerrireto:programming
spoerrireto:PerformanceV2
spoerrireto:dev
spoerrireto:story_process
spoerrireto:interaction
spoerrireto:scene_loading
spoerrireto:depthkit_samples
spoerrireto:btc_debug
...
compare: spoerrireto:3a5d9b22a13a9ea4a440211a19ea8ed92e35c738
Branches Tags
spoerrireto:leveldesign
spoerrireto:master
spoerrireto:programming
spoerrireto:PerformanceV2
spoerrireto:dev
spoerrireto:story_process
spoerrireto:interaction
spoerrireto:scene_loading
spoerrireto:depthkit_samples
spoerrireto:btc_debug

4 Commits
28b8522b3e ... 3a5d9b22a1

Author SHA1 Message Date
Dominik Gut
3a5d9b22a1 Merge branch 'master' into leveldesign 2025-05-20 17:04:36 +02:00
Nadine Ganz
7a3ab5302e Merge branch 'programming' 2025-05-20 17:02:26 +02:00
Nadine Ganz
4445ab094f update handmenu in all scenes 2025-05-20 16:35:04 +02:00
Nadine Ganz
8b9cc7592e Merge branch 'master' into programming 2025-05-20 13:11:58 +02:00
21 changed files with 29224 additions and 462106 deletions
Show Stats Expand all files Collapse all files

7
Viagg-io/Assets/BehaviourTrees/1.0-SBB.bt.txt
View File

@ -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")
}

5
Viagg-io/Assets/BehaviourTrees/2.2-Geschaeft.bt.txt
View File

@ -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")
}

7
Viagg-io/Assets/BehaviourTrees/2.6-Castello.bt.txt
View File

@ -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")

5
Viagg-io/Assets/BehaviourTrees/3.2-Grotto1.bt.txt
View File

@ -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")
}

7
Viagg-io/Assets/BehaviourTrees/3.2-Grotto2.bt.txt
View File

@ -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")
}

8
Viagg-io/Assets/BehaviourTrees/3.2-Grotto3.bt.txt
View File

@ -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")
}

15283
Viagg-io/Assets/Prefabs/UI/_HANDMENU.prefab
View File

File diff suppressed because it is too large Load Diff

2
Viagg-io/Assets/Prefabs/UI/_HANDMENU.prefab.meta
View File

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

7587
Viagg-io/Assets/Prefabs/UI/_HANDMENU_alt.prefab Normal file
View File

File diff suppressed because it is too large Load Diff

7
Viagg-io/Assets/Prefabs/UI/_HANDMENU_alt.prefab.meta Normal file
View File

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

1902
Viagg-io/Assets/Scenes/1.0-SBB.unity
View File

File diff suppressed because it is too large Load Diff

1768
Viagg-io/Assets/Scenes/2.0-SBB.unity
View File

File diff suppressed because it is too large Load Diff

2018
Viagg-io/Assets/Scenes/2.2-Geschaeft.unity
View File

File diff suppressed because it is too large Load Diff

445250
Viagg-io/Assets/Scenes/2.6-Castello.unity
View File

File diff suppressed because it is too large Load Diff

1872
Viagg-io/Assets/Scenes/3.0-SBB.unity
View File

File diff suppressed because it is too large Load Diff

2053
Viagg-io/Assets/Scenes/3.2-Grotto1.unity
View File

File diff suppressed because it is too large Load Diff

1999
Viagg-io/Assets/Scenes/3.2-Grotto2.unity
View File

File diff suppressed because it is too large Load Diff

2001
Viagg-io/Assets/Scenes/3.2-Grotto3.unity
View File

File diff suppressed because it is too large Load Diff

9514
Viagg-io/Assets/Scenes/Test-Scene-Nick-Handmenu.unity
View File

File diff suppressed because it is too large Load Diff

18
Viagg-io/Assets/Scripts/OnActivateSpeechButton.cs Normal file
View File

@ -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);
}
}

11
Viagg-io/Assets/Scripts/OnActivateSpeechButton.cs.meta Normal file
View File

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