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

Compare commits

base: spoerrireto:e8cabbe7ee6e4ee8698e88e1fc0414e59ae9306d
Branches Tags
spoerrireto:master
spoerrireto:programming
spoerrireto:leveldesign
spoerrireto:PerformanceV2
spoerrireto:dev
spoerrireto:story_process
spoerrireto:interaction
spoerrireto:scene_loading
spoerrireto:depthkit_samples
spoerrireto:btc_debug
...
compare: spoerrireto:642d60475840999f205a68c46ff25914688b6a88
Branches Tags
spoerrireto:master
spoerrireto:programming
spoerrireto:leveldesign
spoerrireto:PerformanceV2
spoerrireto:dev
spoerrireto:story_process
spoerrireto:interaction
spoerrireto:scene_loading
spoerrireto:depthkit_samples
spoerrireto:btc_debug

4 Commits
e8cabbe7ee ... 642d604758

Author SHA1 Message Date
Nadine Ganz
642d604758 Merge branch 'programming' 2025-07-30 11:36:10 +02:00
Nadine Ganz
8e19b86b0e Replace Cavaglia Bahnhof Sound, make Puschlav Sounds louder 2025-07-30 11:28:18 +02:00
Nadine Ganz
b70551584b Update User Intents 2025-07-29 17:49:46 +02:00
Nadine Ganz
95fa4e39d1 Merge branch 'master' into programming 2025-07-29 15:37:01 +02:00
7 changed files with 634 additions and 326 deletions
Show Stats Expand all files Collapse all files

BIN
Viagg-io/Assets/Audio/FMOD/Castello.bank
View File

Binary file not shown.

BIN
Viagg-io/Assets/Audio/FMOD/Puschlav.bank
View File

Binary file not shown.

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

@ -64,7 +64,7 @@ Tree("22_Geschaeft_Story_A_Picknicken_Baeckerei_Intro") {
BTC.Run("MediaPlayer.VIDEOS.BaeckereiIntroV8")
BTC.Run("MediaPlayer.VIDEOS.BaeckereiIntroVidl_09")
BTC.AddPossbileSpeechIntent("Zugabteil-Exposition-U-2") // TODO: Update Intent ID
BTC.AddPossbileSpeechIntent("Story_A_Picknicken-Baeckerei_Intro-U-9")
BTC.StartSpeechIntentRecognition()
Composite(Race) {
@ -100,7 +100,7 @@ Tree("22_Geschaeft_Story_A_Picknicken_Baeckerei_Intro") {
BTC.Run("MediaPlayer.VIDEOS.BaeckereiIntroV10")
BTC.Run("MediaPlayer.VIDEOS.BaeckereiIntroVidl_11")
BTC.AddPossbileSpeechIntent("Zugabteil-Exposition-U-2") // TODO: Update Intent ID
BTC.AddPossbileSpeechIntent("Story_A_Picknicken-Baeckerei_Intro-U-11")
BTC.StartSpeechIntentRecognition()
Composite(Race) {
@ -136,7 +136,7 @@ Tree("22_Geschaeft_Story_A_Picknicken_Baeckerei_Intro") {
BTC.Run("MediaPlayer.VIDEOS.BaeckereiIntroV12")
BTC.Run("MediaPlayer.VIDEOS.BaeckereiIntroVidl_13")
BTC.AddPossbileSpeechIntent("Zugabteil-Exposition-U-2") // TODO: Update Intent ID
BTC.AddPossbileSpeechIntent("Story_A_Picknicken-Baeckerei_Intro-U-13")
BTC.StartSpeechIntentRecognition()
Composite(Race) {
@ -176,7 +176,7 @@ Tree("22_Geschaeft_Story_A_Picknicken_Baeckerei_Intro") {
BTC.Hide("MediaPlayer.VIDEOS.BaeckereiIntroFidl_07")
}
BTC.Run("MediaPlayer.VIDEOS.BaeckereiIntroFidl_16")
BTC.AddPossbileSpeechIntent("Story_A_Picknicken.Intro.3") // TODO: Update Intent ID
BTC.AddPossbileSpeechIntent("Story_A_Picknicken-Baeckerei_Intro-U-16a")
BTC.StartSpeechIntentRecognition()
Composite(Race) {
@ -220,7 +220,7 @@ Tree("22_Geschaeft_Story_A_Picknicken_Baeckerei_Intro") {
}
BTC.Run("MediaPlayer.VIDEOS.NachfrageBestellun_VIdle4")
BTC.AddPossbileSpeechIntent("Story_A_Picknicken.Nachfrage_Bestellung.2") // TODO: Update IntentID
BTC.AddPossbileSpeechIntent("Story_A_Picknicken-Nachfrage_Bestellung-U-4a")
BTC.StartSpeechIntentRecognition()
Composite(Race) {
@ -326,7 +326,7 @@ Tree("22_Geschaeft_Story_A_Picknicken_Mitnehmen") {
BTC.Run("MediaPlayer.VIDEOS.BezahleneinzelnV2")
BTC.Run("MediaPlayer.VIDEOS.BezahleneinzelnVid_03")
BTC.AddPossbileSpeechIntent("Story_A_Picknicken.Nachfrage_Bestellung.2") // TODO: Update IntentID
BTC.AddPossbileSpeechIntent("Story_A_Picknicken-Bezahlen_einzeln-U-3")
BTC.StartSpeechIntentRecognition()
Composite(Race) {
@ -384,7 +384,7 @@ Tree("22_Geschaeft_Story_A_Picknicken_Mitnehmen") {
BTC.Run("MediaPlayer.VIDEOS.BezahleneinzelnV6")
BTC.Run("MediaPlayer.VIDEOS.BezahleneinzelnVid_07")
BTC.AddPossbileSpeechIntent("Story_A_Picknicken.Nachfrage_Bestellung.2") // TODO: Update IntentID
BTC.AddPossbileSpeechIntent("Story_A_Picknicken-Bezahlen_einzeln-U-7a")
BTC.StartSpeechIntentRecognition()
Composite(Race) {
@ -480,7 +480,7 @@ Tree("22_Geschaeft_Story_A_Picknicken_Dank_Einkauf") {
BTC.Run("MediaPlayer.VIDEOS.DankEinkaufV2")
BTC.Run("MediaPlayer.VIDEOS.DankEinkaufVidle3")
BTC.AddPossbileSpeechIntent("Story_A_Picknicken.Nachfrage_Bestellung.2") // TODO: Update IntentID
BTC.AddPossbileSpeechIntent("Story_A_Picknicken-Dank_Einkauf-U-3a")
BTC.StartSpeechIntentRecognition()
Composite(Race) {
@ -605,7 +605,7 @@ Tree("22_Geschaeft_Story_A_Picknicken_Baeckerei_Outro") {
BTC.Run("MediaPlayer.VIDEOS.BaeckereiOutroE10")
BTC.Run("MediaPlayer.VIDEOS.BaeckereiOutroEidl_11")
BTC.AddPossbileSpeechIntent("Story_A_Picknicken.Nachfrage_Bestellung.2") // TODO: Update IntentID
BTC.AddPossbileSpeechIntent("Story_A_Picknicken-Baeckerei_Outro-U-11a")
BTC.StartSpeechIntentRecognition()
Composite(Race) {
@ -640,7 +640,7 @@ Tree("22_Geschaeft_Story_A_Picknicken_Baeckerei_Outro") {
BTC.Hide("MediaPlayer.VIDEOS.BaeckereiOutroEidl_11")
BTC.Run("MediaPlayer.VIDEOS.BaeckereiOutroE12")
BTC.Run("MediaPlayer.VIDEOS.BaeckereiOutroEidl_13")
BTC.AddPossbileSpeechIntent("Story_A_Picknicken.Nachfrage_Bestellung.2") // TODO: Update IntentID
BTC.AddPossbileSpeechIntent("Story_A_Picknicken-Baeckerei_Outro-U-13a")
BTC.StartSpeechIntentRecognition()
Composite(Race) {
@ -696,7 +696,7 @@ Tree("22_Geschaeft_Story_A_Picknicken_Baeckerei_Outro") {
BTC.Run("MediaPlayer.VIDEOS.BaeckereiOutroF24")
BTC.Run("MediaPlayer.VIDEOS.BaeckereiOutroFidl_25")
BTC.AddPossbileSpeechIntent("Story_A_Picknicken.Nachfrage_Bestellung.2") // TODO: Update IntentID
BTC.AddPossbileSpeechIntent("Story_A_Picknicken-Baeckerei_Outro-U-25")
BTC.StartSpeechIntentRecognition()
Composite(Race) {
@ -738,7 +738,8 @@ Tree("22_Geschaeft_Story_A_Picknicken_Baeckerei_Outro") {
}
BTC.Run("MediaPlayer.VIDEOS.BaeckereiOutroFidl_29")
BTC.AddPossbileSpeechIntent("Story_A_Picknicken.Nachfrage_Bestellung.2") // TODO: Update IntentID
BTC.AddPossbileSpeechIntent("Story_A_Picknicken-Baeckerei_Outro-U-29a")
BTC.AddPossbileSpeechIntent("Story_A_Picknicken-Baeckerei_Outro-U-29b")
BTC.StartSpeechIntentRecognition()
Composite(Race) {

3
Viagg-io/Assets/BehaviourTrees/3.0-SBB.bt.txt
View File

@ -41,7 +41,8 @@ Tree("30_SBB_Story_B_Grotto_Start") {
}
BTC.Run("MediaPlayer.VIDEOS.StartFidle2")
BTC.AddPossbileSpeechIntent("Zugabteil-Exposition-U-2") // TODO: Update Intent ID
BTC.AddPossbileSpeechIntent("Story_B_Grotto-Start-U-2a")
BTC.AddPossbileSpeechIntent("Story_B_Grotto-Start-U-2b")
BTC.StartSpeechIntentRecognition()
Composite(Race) {

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

@ -1,6 +1,5 @@
Tree("Root") {
Composite(Sequence) {
//RunTree("32_Grotto_Story_B_Grotto_Antwort_Nonna_Grotto")
BTC.InitializeSpeechManager()
BTC.SetSpeechRecognitionLanguage("it-IT")
BTC.SetVoiceName("it-IT-FabiolaNeural")
@ -12,8 +11,8 @@
BTC.SetBool("error")
}
//RunTree("32_Grotto_Story_B_Grotto_Intro")
RunTree("32_Grotto_Story_B_Grotto_Antwort_Nonna_Grotto")
RunTree("32_Grotto_Story_B_Grotto_Intro")
//RunTree("32_Grotto_Story_B_Grotto_Antwort_Nonna_Grotto")
}
Composite(Sequence) {
@ -45,8 +44,8 @@ Tree("32_Grotto_Story_B_Grotto_Intro") {
BTC.Run("MediaPlayer.VIDEOS.IntroF2")
BTC.Run("MediaPlayer.VIDEOS.IntroFidle3")
BTC.AddPossbileSpeechIntent("Story_B_Grotto.Intro.3") // TODO: Update Speech Intent
BTC.AddPossbileSpeechIntent("Story_B_Grotto.Intro.4") // TODO: Update Speech Intent
BTC.AddPossbileSpeechIntent("Story_B_Grotto-Intro-U-3")
BTC.AddPossbileSpeechIntent("Story_B_Grotto-Intro-U-5")
BTC.StartSpeechIntentRecognition()
Composite(Race) {
@ -62,13 +61,13 @@ Tree("32_Grotto_Story_B_Grotto_Intro") {
// Intent erkannt
Composite(Race) {
Composite(Sequence) {
BTC.CompareIntentID("Story_B_Grotto.Intro.3")
BTC.CompareIntentID("Story_B_Grotto-Intro-U-3")
BTC.ClearPossbileSpeechIntents()
BTC.Hide("MediaPlayer.VIDEOS.IntroFidle3")
BTC.Run("MediaPlayer.VIDEOS.IntroF4")
}
Composite(Sequence) {
BTC.CompareIntentID("Story_B_Grotto.Intro.4")
BTC.CompareIntentID("Story_B_Grotto-Intro-U-5")
BTC.ClearPossbileSpeechIntents()
BTC.Hide("MediaPlayer.VIDEOS.IntroFidle3")
BTC.Run("MediaPlayer.VIDEOS.IntroF6")
@ -111,7 +110,7 @@ Tree("32_Grotto_Story_B_Grotto_Intro") {
BTC.Run("MediaPlayer.VIDEOS.TelefonatF7")
BTC.Run("MediaPlayer.VIDEOS.TelefonatFidle8")
BTC.AddPossbileSpeechIntent("Story_B_Grotto.Telefonat.6") // TODO: Update Intent ID
BTC.AddPossbileSpeechIntent("Story_B_Grotto-Telefonat-U-8a")
BTC.StartSpeechIntentRecognition()
Composite(Race) {
@ -142,7 +141,7 @@ Tree("32_Grotto_Story_B_Grotto_Intro") {
BTC.Run("AudioSource.AUDIO.BegruessungohneNam")
// --- Story B Grotto - Antwort_Reise ---
BTC.AddPossbileSpeechIntent("Story_B_Grotto.Antwort_Reise.1") // TODO: Update Intent ID
BTC.AddPossbileSpeechIntent("Story_B_Grotto-Antwort_Reise-U-0a")
BTC.StartSpeechIntentRecognition()
Composite(Race) {
@ -171,7 +170,7 @@ Tree("32_Grotto_Story_B_Grotto_Intro") {
BTC.Run("AudioSource.AUDIO.AntwortReise4Story")
BTC.AddPossbileSpeechIntent("Story_B_Grotto.Antwort_Reise.5") // TODO: Update Intent ID
BTC.AddPossbileSpeechIntent("Story_B_Grotto-Antwort_Reise-U-1a")
BTC.StartSpeechIntentRecognition()
Composite(Race) {
@ -200,8 +199,8 @@ Tree("32_Grotto_Story_B_Grotto_Intro") {
BTC.Run("AudioSource.AUDIO.AntwortReise8Story")
BTC.AddPossbileSpeechIntent("Story_B_Grotto.Antwort_Reise.9") // TODO: Update Intent ID
BTC.AddPossbileSpeechIntent("Story_B_Grotto.Antwort_Reise.11") // TODO: Update Intent ID
BTC.AddPossbileSpeechIntent("Story_B_Grotto-Antwort_Reise-U-2a")
BTC.AddPossbileSpeechIntent("Story_B_Grotto-Antwort_Reise-U-2b")
BTC.StartSpeechIntentRecognition()
Composite(Race) {
@ -217,12 +216,12 @@ Tree("32_Grotto_Story_B_Grotto_Intro") {
// Intent erkannt
Composite(Race) {
Composite(Sequence) {
BTC.CompareIntentID("Story_B_Grotto.Antwort_Reise.9")
BTC.CompareIntentID("Story_B_Grotto-Antwort_Reise-U-2a")
BTC.ClearPossbileSpeechIntents()
RunTree("32_Grotto_Story_B_Grotto_Antwort_Nonna_Kueche")
}
Composite(Sequence) {
BTC.CompareIntentID("Story_B_Grotto.Antwort_Reise.11")
BTC.CompareIntentID("Story_B_Grotto-Antwort_Reise-U-2b")
BTC.ClearPossbileSpeechIntents()
RunTree("32_Grotto_Story_B_Grotto_Antwort_Nonna_Grotto")
}
@ -243,12 +242,12 @@ Tree("32_Grotto_Story_B_Grotto_Intro") {
Composite(Race) {
Composite(Sequence) {
BTC.CompareIntentID("Story_B_Grotto.Antwort_Reise.9")
BTC.CompareIntentID("Story_B_Grotto-Antwort_Reise-U-2a")
BTC.ClearPossbileSpeechIntents()
RunTree("32_Grotto_Story_B_Grotto_Antwort_Nonna_Kueche")
}
Composite(Sequence) {
BTC.CompareIntentID("Story_B_Grotto.Antwort_Reise.11")
BTC.CompareIntentID("Story_B_Grotto-Antwort_Reise-U-2b")
BTC.ClearPossbileSpeechIntents()
RunTree("32_Grotto_Story_B_Grotto_Antwort_Nonna_Grotto")
}
@ -358,7 +357,7 @@ Tree("32_Grotto_Story_B_Grotto_Antwort_Nonna_Kueche") {
Composite(Sequence) {
BTC.Run("AudioSource.AUDIO.AntwortNonnaKueche")
BTC.AddPossbileSpeechIntent("Story_B_Grotto.Antwort_Nonna_Kueche.2")
BTC.AddPossbileSpeechIntent("Story_B_Grotto-Antwort_Nonna_Kueche-U-1a")
BTC.StartSpeechIntentRecognition()
Composite(Race) {
@ -394,7 +393,7 @@ Tree("32_Grotto_Story_B_Grotto_Antwort_Nonna_Kueche") {
BTC.Run("MediaPlayer.VIDEOS.OutroF3")
BTC.Run("MediaPlayer.VIDEOS.TelefonatFidle8")
BTC.AddPossbileSpeechIntent("Story_B_Grotto.Outro.3")
BTC.AddPossbileSpeechIntent("Story_B_Grotto-Outro-U-4")
BTC.StartSpeechIntentRecognition()
Composite(Race) {
@ -437,7 +436,7 @@ Tree("32_Grotto_Story_B_Grotto_Antwort_Nonna_Grotto") {
Composite(Sequence) {
BTC.Run("AudioSource.AUDIO.AntwortNonnaGrotto_01")
BTC.AddPossbileSpeechIntent("Story_B_Grotto.Antwort_Nonna_Grotto.2")
BTC.AddPossbileSpeechIntent("Story_B_Grotto-Nachfrage_Nonna_Grotto-U-2a")
BTC.StartSpeechIntentRecognition()
Composite(Race) {
@ -467,7 +466,7 @@ Tree("32_Grotto_Story_B_Grotto_Antwort_Nonna_Grotto") {
BTC.Run("AudioSource.AUDIO.AntwortNonnaGrotto_05")
BTC.AddPossbileSpeechIntent("Story_B_Grotto.Antwort_Nonna_Grotto.6")
BTC.AddPossbileSpeechIntent("Story_B_Grotto-Nachfrage_Nonna_Grotto-U-3a")
BTC.StartSpeechIntentRecognition()
Composite(Race) {
@ -519,8 +518,6 @@ Tree("32_Grotto_Story_B_Grotto_Antwort_Nonna_Grotto") {
}
}
Composite(Race) {
BTC.Wait(30)
@ -532,7 +529,8 @@ Tree("32_Grotto_Story_B_Grotto_Antwort_Nonna_Grotto") {
BTC.Run("MediaPlayer.VIDEOS.AntwortNonnaGrotto_Teil2F2")
BTC.Run("MediaPlayer.VIDEOS.AntwortNonnaGrotto_Teil2Fidle03")
BTC.AddPossbileSpeechIntent("Story_B_Grotto.Antwort_Nonna_Grotto.6") // TODO: Update Intent ID
BTC.AddPossbileSpeechIntent("Story_B_Grotto-Antwort_Nonna_Grotto_Teil2-U-3a")
BTC.AddPossbileSpeechIntent("Story_B_Grotto-Antwort_Nonna_Grotto_Teil2-U-3b")
BTC.StartSpeechIntentRecognition()
Composite(Race) {

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

@ -56,7 +56,7 @@ Tree("32_Grotto_Kueche_Intro") {
BTC.Run("MediaPlayer.VIDEOS.KuecheIntroF4")
BTC.Run("MediaPlayer.VIDEOS.KuecheIntroFidle5")
BTC.AddPossbileSpeechIntent("Kueche.Intro.3") // TODO: Update SPeech Intent
BTC.AddPossbileSpeechIntent("Kueche-Intro-U-5a")
BTC.StartSpeechIntentRecognition()
Composite(Race) {
@ -182,8 +182,8 @@ Tree("32_Grotto_Kueche_Intro") {
BTC.Run("MediaPlayer.VIDEOS.allesgefundenFidle_06")
// Frage beantworten
BTC.AddPossbileSpeechIntent("Kueche.alles_gefunden.4")
BTC.AddPossbileSpeechIntent("Kueche.alles_gefunden.6")
BTC.AddPossbileSpeechIntent("Kueche-alles_gefunden-U-6a")
BTC.AddPossbileSpeechIntent("Kueche-alles_gefunden-U-6b")
BTC.StartSpeechIntentRecognition()
Composite(Race) {
@ -199,12 +199,12 @@ Tree("32_Grotto_Kueche_Intro") {
// Intent erkannt
Composite(Race) {
Composite(Sequence) {
BTC.CompareIntentID("Kueche.alles_gefunden.4")
BTC.CompareIntentID("Kueche-alles_gefunden-U-6a")
BTC.ClearPossbileSpeechIntents()
RunTree("32_Grotto_Kueche_Interesse_Kochen")
}
Composite(Sequence) {
BTC.CompareIntentID("Kueche.alles_gefunden.6")
BTC.CompareIntentID("Kueche-alles_gefunden-U-6b")
BTC.ClearPossbileSpeechIntents()
RunTree("32_Grotto_Kueche_Zusammen_Kochen")
}
@ -302,7 +302,7 @@ Tree("32_Grotto_Kueche_Interesse_Kochen") {
BTC.Run("MediaPlayer.VIDEOS.InteresseKochenFid_02")
// Frage beantworten
BTC.AddPossbileSpeechIntent("Kueche.Interesse_Kochen.2")
BTC.AddPossbileSpeechIntent("Kueche-Interesse_Kochen-U-2a")
BTC.StartSpeechIntentRecognition()
Composite(Race) {
@ -349,8 +349,8 @@ Tree("32_Grotto_Kueche_Kochen_Anzahl") {
BTC.Run("MediaPlayer.VIDEOS.KochenAnzahlFidle2")
// Frage beantworten
BTC.AddPossbileSpeechIntent("Kueche.Kochen_Anzahl.2")
BTC.AddPossbileSpeechIntent("Kueche.Kochen_Anzahl.4")
BTC.AddPossbileSpeechIntent("Kueche-Kochen_Anzahl-U-2a")
BTC.AddPossbileSpeechIntent("Kueche-Kochen_Anzahl-U-2b")
BTC.StartSpeechIntentRecognition()
Composite(Race) {
@ -509,7 +509,7 @@ Tree("32_Grotto_Kueche_Zusammen_Kochen") {
}
// Name sagen
BTC.AddPossbileSpeechIntent("Kueche.Outro.4")
BTC.AddPossbileSpeechIntent("Kueche-Outro-U-6a")
BTC.StartSpeechIntentRecognition()
Composite(Race) {
@ -571,8 +571,8 @@ Tree("32_Grotto_Kueche_Zusammen_Kochen") {
}
}
BTC.AddPossbileSpeechIntent("Story_B_Grotto.Intro.3") // TODO: Update Speech Intent
BTC.AddPossbileSpeechIntent("Story_B_Grotto.Intro.4") // TODO: Update Speech Intent
BTC.AddPossbileSpeechIntent("Kueche-Outro-U-14a")
BTC.AddPossbileSpeechIntent("Kueche-Outro-U-14b")
BTC.StartSpeechIntentRecognition()
Composite(Race) {
@ -588,13 +588,13 @@ Tree("32_Grotto_Kueche_Zusammen_Kochen") {
// Intent erkannt
Composite(Race) {
Composite(Sequence) {
BTC.CompareIntentID("Story_B_Grotto.Intro.3")
BTC.CompareIntentID("Kueche-Outro-U-14a")
BTC.ClearPossbileSpeechIntents()
BTC.FadeOut("FadeScene.XRInteractionHandsSetup.Black")
BTC.Run("LoadScene.NEXT.32Grotto3")
}
Composite(Sequence) {
BTC.CompareIntentID("Story_B_Grotto.Intro.4")
BTC.CompareIntentID("Kueche-Outro-U-14b")
BTC.ClearPossbileSpeechIntents()
}
}

862
Viagg-io/Assets/Scripts/Speech/viaggioSpeechIntents_it.json
View File

File diff suppressed because it is too large Load Diff