- 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.
This commit is contained in:
parent
fd2807a940
commit
a66d3f1465
@ -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;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user