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

Merge branch 'programming'

Browse Source
This commit is contained in:
Nadine Ganz 2025-08-13 15:24:49 +02:00
commit 958f87624b
15 changed files with 794975 additions and 428 deletions
Show Stats Download Patch File Download Diff File 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/Grotto_Kueche.bank
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

@ -331,6 +331,7 @@ Tree("10_SBB_Zugabteil_Szenenwahl") {
BTC.Hide("GO.HANDMENU.SpeechOptions")
}
BTC.FadeOut("FadeScene.XRInteractionHandsSetup.Black")
BTC.Hide("MediaPlayer.VIDEOS.SzenenwahlFidle4")
BTC.Run("LoadScene.NEXT.40Puschlav")
}
@ -359,6 +360,7 @@ Tree("10_SBB_Zugabteil_Szenenwahl") {
// Load Scene: Story A Picknicken
//BTC.FadeOut("FadeScene.XRInteractionHandsSetup.Black")
BTC.Hide("MediaPlayer.VIDEOS.SzenenwahlFidle4")
BTC.Run("LoadScene.NEXT.20SBB")
}
Composite(Sequence) {
@ -375,13 +377,11 @@ Tree("10_SBB_Zugabteil_Szenenwahl") {
// Load Scene: Story B Grotto
//BTC.FadeOut("FadeScene.XRInteractionHandsSetup.Black")
BTC.Hide("MediaPlayer.VIDEOS.SzenenwahlFidle4")
BTC.Run("LoadScene.NEXT.30SBB")
}
} // Race Buttons
} // Handmenu Ende
}
// TODO: Check if necessary
//BTC.Hide("MediaPlayer.VIDEOS.SzenenwahlFidle4")
}
}

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

@ -620,7 +620,10 @@ Tree("22_Geschaeft_Story_A_Picknicken_Baeckerei_Outro") {
Composite(Marathon) {
Composite(Marathon) {
BTC.Run("MediaPlayer.VIDEOS.BaeckereiOutroE1")
Composite(Sequence) {
BTC.Run("MediaPlayer.VIDEOS.BaeckereiOutroE1")
BTC.Run("MediaPlayer.VIDEOS.BaeckereiOutroEidl_07")
}
Composite(Sequence) {
BTC.Wait(3)
@ -635,7 +638,9 @@ Tree("22_Geschaeft_Story_A_Picknicken_Baeckerei_Outro") {
}
}
BTC.Hide("Animator.AnimatorBaeckereiT")
BTC.Run("MediaPlayer.VIDEOS.BaeckereiOutroFidl_04")
BTC.Hide("MediaPlayer.VIDEOS.BaeckereiOutroEidl_07")
BTC.Run("MediaPlayer.VIDEOS.BaeckereiOutroE5")
BTC.Run("MediaPlayer.VIDEOS.BaeckereiOutroE6")
@ -786,6 +791,12 @@ Tree("22_Geschaeft_Story_A_Picknicken_Baeckerei_Outro") {
Composite(Marathon) {
BTC.Run("MediaPlayer.VIDEOS.BaeckereiOutroE27")
Composite(Sequence) {
BTC.Wait(1)
BTC.Show("Animator.AnimatorBaeckereiT")
}
BTC.Run("MediaPlayer.VIDEOS.BaeckereiOutroF28")
}

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

@ -525,11 +525,11 @@ Tree("32_Grotto_Story_B_Grotto_Antwort_Nonna_Grotto") {
// -- Race 2: User sagt nichts
Composite(Sequence) {
BTC.Wait(5)
BTC.Hide("GO.HINTS.SpeakHint")
BTC.CompareUserSpeechInputStarted(false)
BTC.AbortSpeechEventListener()
BTC.StopSpeechIntentRecognition()
BTC.ClearPossbileSpeechIntents()
BTC.Hide("GO.HINTS.SpeakHint")
}
}
@ -558,11 +558,11 @@ Tree("32_Grotto_Story_B_Grotto_Antwort_Nonna_Grotto") {
// -- Race 2: User sagt nichts
Composite(Sequence) {
BTC.Wait(5)
BTC.Hide("GO.HINTS.SpeakHint")
BTC.CompareUserSpeechInputStarted(false)
BTC.AbortSpeechEventListener()
BTC.StopSpeechIntentRecognition()
BTC.ClearPossbileSpeechIntents()
BTC.Hide("GO.HINTS.SpeakHint")
}
}
@ -639,11 +639,11 @@ Tree("32_Grotto_Story_B_Grotto_Antwort_Nonna_Grotto_Teil2") {
// -- Race 2: User sagt nichts
Composite(Sequence) {
BTC.Wait(5)
BTC.Hide("GO.HINTS.SpeakHint")
BTC.CompareUserSpeechInputStarted(false)
BTC.AbortSpeechEventListener()
BTC.StopSpeechIntentRecognition()
BTC.ClearPossbileSpeechIntents()
BTC.Hide("GO.HINTS.SpeakHint")
}
}

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

@ -622,7 +622,7 @@ Tree("32_Grotto_Im_Grotto_Essen_Intro") {
BTC.Run("MediaPlayer.VIDEOS.OutroG2")
BTC.Run("MediaPlayer.VIDEOS.OutroGidle3")
BTC.Hide("MediaPlayer.VIDEOS.GrottoUnterhaltung_FIdle20")
BTC.Hide("MediaPlayer.VIDEOS.OutroFidle1")
BTC.Run("MediaPlayer.VIDEOS.OutroF4")
BTC.Run("MediaPlayer.VIDEOS.OutroFidle5")

2
Viagg-io/Assets/BehaviourTrees/4.0-Puschlav.bt.txt
View File

@ -68,7 +68,7 @@ Tree("40_Puschlav_Story_C_Puschlav") {
Composite(Marathon) {
BTC.Hide("GO.STATIC.Background")
BTC.Hide("GO.UI.ViaggioLogo")
BTC.Hide("GO.UI.Canvas")
}
// Start Slideshow

1
Viagg-io/Assets/Packages/MyBT/BTC/Handlers/NamedAnimator.cs
View File

@ -274,6 +274,7 @@ public class NamedAnimator : ComponentHandler {
if (nodeState == NodeState.FirstRun)
{
animatorComponent.enabled = false;
animatorComponent.Rebind();
Task.SetSucceeded();
return;
}

18
Viagg-io/Assets/Packages/MyBT/BTC/Handlers/NamedStereoscopicSlideshow.cs
View File

@ -46,6 +46,7 @@ public class NamedStereoscopicSlideshow : ComponentHandler {
public PhotoTransition photoTransition;
float _timeLeft;
public float totalTime = 5.0f;
int _indexImgList = 0;
public override void Run(NodeState nodeState)
{
@ -87,16 +88,21 @@ public class NamedStereoscopicSlideshow : ComponentHandler {
}
}
public override void LoadImage(NodeState nodeState, int index)
public override void LoadImage(NodeState nodeState, int indexPath)
{
// LoadImage(0): 1. bild laden im hintergrund
// Show: Setup srctxt (1. bild einblenden) + im hintergrund loadImage(1)
// (Sprachinput): blendimage(2)
if (nodeState == NodeState.FirstRun)
{
string path = photoTransition.imgPathList[index];
string path = photoTransition.imgPathList[indexPath];
_indexImgList = photoTransition.GetLengthOfImgList();
StartCoroutine(photoTransition.ImageLoader(path));
Task.SetSucceeded();
}
if (nodeState == NodeState.Running)
{
Texture2D tex = photoTransition.GetTextureOfImgList(_indexImgList);
if (tex != null)
{
Task.SetSucceeded();
}
}
}

2
Viagg-io/Assets/Plugins/FMOD/Resources/FMODStudioSettings.asset
View File

@ -714,7 +714,7 @@ MonoBehaviour:
LiveUpdatePort: 9264
EnableMemoryTracking: 0
AndroidUseOBB: 0
AndroidPatchBuild: 1
AndroidPatchBuild: 0
MeterChannelOrdering: 0
StopEventsOutsideMaxDistance: 0
BoltUnitOptionsBuildPending: 0

795339
Viagg-io/Assets/Scenes/4.0-Puschlav.unity
View File

File diff suppressed because it is too large Load Diff

14
Viagg-io/Assets/Scripts/PhotoTransition.cs
View File

@ -113,6 +113,20 @@ public class PhotoTransition : MonoBehaviour
}
}
public int GetLengthOfImgList()
{
return _imgList.Count;
}
public Texture2D GetTextureOfImgList(int index)
{
if (_imgList.Count > index)
{
return _imgList[index];
}
return null;
}
private void OnDestroy()
{
Reset();