From a66d3f1465584f8215b28357033076f142d6cb22 Mon Sep 17 00:00:00 2001 From: Jamie Greunbaum Date: Sun, 8 Jun 2025 16:55:22 -0400 Subject: [PATCH] - Added chase music that may end up being temporary, but is usable. - Fixed risk amount defaulting to -1 if no risk cards were chosen. - Fixed reference to Think About It music. - Resolved a bunch of fucking merge conflicts that keep popping up because git sucks shit. --- Assets/UdonSharp/Podium/RiskCardGroup.cs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Assets/UdonSharp/Podium/RiskCardGroup.cs b/Assets/UdonSharp/Podium/RiskCardGroup.cs index dffd7a4..e691ffb 100644 --- a/Assets/UdonSharp/Podium/RiskCardGroup.cs +++ b/Assets/UdonSharp/Podium/RiskCardGroup.cs @@ -18,7 +18,7 @@ public class RiskCardGroup : UdonSharpBehaviour [SerializeField] private GameObject _PCCardHeldPosition; [SerializeField] private Animator _PCCardAnimator; - [UdonSynced] private int _SelectedRiskAmount = 0; + [UdonSynced] private int _SelectedRiskAmount = -1; void Start() @@ -104,7 +104,7 @@ public class RiskCardGroup : UdonSharpBehaviour public int GetSelectedChoice() { - return _SelectedRiskAmount; + return (_SelectedRiskAmount < 0) ? 0 : _SelectedRiskAmount; } [NetworkCallable] @@ -142,7 +142,6 @@ public class RiskCardGroup : UdonSharpBehaviour RiskCard Card = _RiskCards[i]; Card.ResetPosition(); - _RiskCardText[i].text = ""; _RiskCardText[i].gameObject.SetActive(false); Card.DisableInteractive = IsInVR;