ActualHorse/CarmenSandiego
1
0
Fork 0
Code Issues 7 Pull Requests Actions Packages Projects Releases Wiki Activity

- Added victory music to round 2.

Browse Source 
- Host card buttons finally properly activate and deactivate during round 2.
- Added tags to camera controller errors in each round manager.
This commit is contained in:
Jamie Greunbaum 2026-03-16 17:27:28 -04:00
parent 05b5b10715
commit 9a630ecd1f
21 changed files with 805 additions and 577 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Assets/Audio/Music/Round 2 Win.wav Normal file
View File

Binary file not shown.

41
Assets/Audio/Music/Round 2 Win.wav.meta Normal file
View File

@ -0,0 +1,41 @@
fileFormatVersion: 2
guid: 4622696ae6c719146bb7274d0fbbfc85
AudioImporter:
externalObjects: {}
serializedVersion: 7
defaultSettings:
serializedVersion: 2
loadType: 0
sampleRateSetting: 2
sampleRateOverride: 44100
compressionFormat: 1
quality: 0.7
conversionMode: 0
preloadAudioData: 0
platformSettingOverrides:
4:
serializedVersion: 2
loadType: 0
sampleRateSetting: 2
sampleRateOverride: 44100
compressionFormat: 1
quality: 0.25
conversionMode: 0
preloadAudioData: 1
7:
serializedVersion: 2
loadType: 0
sampleRateSetting: 2
sampleRateOverride: 44100
compressionFormat: 1
quality: 0.25
conversionMode: 0
preloadAudioData: 1
forceToMono: 1
normalize: 1
loadInBackground: 1
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

2
Assets/Scenes/witwics.unity
View File

@ -11548,7 +11548,6 @@ MonoBehaviour:
- {fileID: 1662151577}
_CommentUI: {fileID: 1394546108}
_ButtonColourEnabled: {r: 1, g: 1, b: 1, a: 1}
_ButtonColourDisabled: {r: 0.5, g: 0.5, b: 0.5, a: 1}
_ButtonColourLoot: {r: 0, g: 0.78431374, b: 0, a: 1}
_ButtonColourWarrant: {r: 0.78431374, g: 0.78431374, b: 0, a: 1}
_ButtonColourCrook: {r: 0.78431374, g: 0, b: 0, a: 1}
@ -95779,6 +95778,7 @@ MonoBehaviour:
_ThinkAboutIt: {fileID: 8300000, guid: fd2e7d68447011640a244f302d442395, type: 3}
_CapitalLoop: {fileID: 8300000, guid: b3309f21d81fe874ea5d6082759667d3, type: 3}
_RecoverTheLoot: {fileID: 8300000, guid: 627fefde5bcc34447857f028da272a9a, type: 3}
_YoureWinner: {fileID: 8300000, guid: 4622696ae6c719146bb7274d0fbbfc85, type: 3}
_IFeelGood: {fileID: 8300000, guid: 408c94c3132deb04187b5f2ac79f075d, type: 3}
_CarmenChaseMusic: {fileID: 8300000, guid: 5f74dca797856b746941aedb98365725, type: 3}
_WhereInTheWorld: {fileID: 8300000, guid: e810feeb6c2063747bbb5f735a88bee9, type: 3}

785
Assets/UdonSharp/AudioManager.asset
View File

File diff suppressed because it is too large Load Diff

3
Assets/UdonSharp/AudioManager.cs
View File

@ -17,6 +17,7 @@ public enum MusicEventType
CapitalLoop,
RecoverTheLoot,
YoureWinner,
IFeelGood,
CarmenChaseMusic,
@ -76,6 +77,7 @@ public class AudioManager : UdonSharpBehaviour
[SerializeField] private AudioClip _CapitalLoop = null;
[SerializeField] private AudioClip _RecoverTheLoot = null;
[SerializeField] private AudioClip _YoureWinner = null;
[SerializeField] private AudioClip _IFeelGood = null;
[SerializeField] private AudioClip _CarmenChaseMusic = null;
@ -268,6 +270,7 @@ public class AudioManager : UdonSharpBehaviour
case MusicEventType.CapitalLoop: _MusicPlayer.clip = _CapitalLoop; break;
case MusicEventType.RecoverTheLoot: _MusicPlayer.clip = _RecoverTheLoot; break;
case MusicEventType.YoureWinner: _MusicPlayer.clip = _YoureWinner; break;
case MusicEventType.IFeelGood: _MusicPlayer.clip = _IFeelGood; break;
case MusicEventType.CarmenChaseMusic: _MusicPlayer.clip = _CarmenChaseMusic; break;

2
Assets/UdonSharp/Game Managers/GameManagerRound1.cs
View File

@ -67,7 +67,7 @@ public class GameManagerRound1 : GameManagerBase
_CameraControllerRound1 = (CameraControllerRound1)_CameraController;
if (_CameraControllerRound1 == null)
{
Debug.LogError("Camera controller is the wrong type. This will cause a crash for sure.");
Debug.LogError("[GameManagerRound1] Camera controller is the wrong type. This will cause a crash for sure.");
}
}

196
Assets/UdonSharp/Game Managers/GameManagerRound2.asset
View File

@ -44,7 +44,7 @@ MonoBehaviour:
Data:
- Name:
Entry: 12
Data: 26
Data: 27
- Name:
Entry: 7
Data:
@ -1256,16 +1256,70 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _CameraControllerRound2
Data: _RoundIsOver
- Name: $v
Entry: 7
Data: 82|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _RoundIsOver
- Name: <UserType>k__BackingField
Entry: 9
Data: 32
- Name: <SystemType>k__BackingField
Entry: 9
Data: 32
- Name: <SyncMode>k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
- Name:
Entry: 3
Data: 1
- Name:
Entry: 8
Data:
- Name: <IsSerialized>k__BackingField
Entry: 5
Data: false
- Name: _fieldAttributes
Entry: 7
Data: 83|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 1
- Name:
Entry: 7
Data: 84|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
- Name:
Entry: 8
Data:
- Name:
Entry: 13
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 7
Data:
- Name: $k
Entry: 1
Data: _CameraControllerRound2
- Name: $v
Entry: 7
Data: 85|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _CameraControllerRound2
- Name: <UserType>k__BackingField
Entry: 7
Data: 83|System.RuntimeType, mscorlib
Data: 86|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: CameraControllerRound2, Assembly-CSharp
@ -1289,7 +1343,7 @@ MonoBehaviour:
Data: false
- Name: _fieldAttributes
Entry: 7
Data: 84|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
Data: 87|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 0
@ -1313,7 +1367,7 @@ MonoBehaviour:
Data: _PanelToReveal_Cache
- Name: $v
Entry: 7
Data: 85|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
Data: 88|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _PanelToReveal_Cache
@ -1335,60 +1389,6 @@ MonoBehaviour:
- Name: <IsSerialized>k__BackingField
Entry: 5
Data: false
- Name: _fieldAttributes
Entry: 7
Data: 86|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 0
- Name:
Entry: 13
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 7
Data:
- Name: $k
Entry: 1
Data: COLOR_STANDARD
- Name: $v
Entry: 7
Data: 87|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: COLOR_STANDARD
- Name: <UserType>k__BackingField
Entry: 7
Data: 88|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: UnityEngine.Color, UnityEngine.CoreModule
- Name:
Entry: 8
Data:
- Name: <SystemType>k__BackingField
Entry: 9
Data: 88
- Name: <SyncMode>k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
- Name:
Entry: 6
Data:
- Name:
Entry: 8
Data:
- Name: <IsSerialized>k__BackingField
Entry: 5
Data: false
- Name: _fieldAttributes
Entry: 7
Data: 89|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
@ -1412,19 +1412,73 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: COLOR_RED
Data: COLOR_STANDARD
- Name: $v
Entry: 7
Data: 90|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: COLOR_STANDARD
- Name: <UserType>k__BackingField
Entry: 7
Data: 91|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: UnityEngine.Color, UnityEngine.CoreModule
- Name:
Entry: 8
Data:
- Name: <SystemType>k__BackingField
Entry: 9
Data: 91
- Name: <SyncMode>k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
- Name:
Entry: 6
Data:
- Name:
Entry: 8
Data:
- Name: <IsSerialized>k__BackingField
Entry: 5
Data: false
- Name: _fieldAttributes
Entry: 7
Data: 92|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 0
- Name:
Entry: 13
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 7
Data:
- Name: $k
Entry: 1
Data: COLOR_RED
- Name: $v
Entry: 7
Data: 93|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: COLOR_RED
- Name: <UserType>k__BackingField
Entry: 9
Data: 88
Data: 91
- Name: <SystemType>k__BackingField
Entry: 9
Data: 88
Data: 91
- Name: <SyncMode>k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@ -1439,7 +1493,7 @@ MonoBehaviour:
Data: false
- Name: _fieldAttributes
Entry: 7
Data: 91|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
Data: 94|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 0
@ -1463,16 +1517,16 @@ MonoBehaviour:
Data: COLOR_YELLOW
- Name: $v
Entry: 7
Data: 92|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
Data: 95|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: COLOR_YELLOW
- Name: <UserType>k__BackingField
Entry: 9
Data: 88
Data: 91
- Name: <SystemType>k__BackingField
Entry: 9
Data: 88
Data: 91
- Name: <SyncMode>k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@ -1487,7 +1541,7 @@ MonoBehaviour:
Data: false
- Name: _fieldAttributes
Entry: 7
Data: 93|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
Data: 96|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 0
@ -1511,16 +1565,16 @@ MonoBehaviour:
Data: COLOR_GREEN
- Name: $v
Entry: 7
Data: 94|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
Data: 97|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: COLOR_GREEN
- Name: <UserType>k__BackingField
Entry: 9
Data: 88
Data: 91
- Name: <SystemType>k__BackingField
Entry: 9
Data: 88
Data: 91
- Name: <SyncMode>k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@ -1535,7 +1589,7 @@ MonoBehaviour:
Data: false
- Name: _fieldAttributes
Entry: 7
Data: 95|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
Data: 98|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 0

93
Assets/UdonSharp/Game Managers/GameManagerRound2.cs
View File

@ -36,6 +36,7 @@ public class GameManagerRound2 : GameManagerBase
[UdonSynced] private int _StageIndex = 0;
[UdonSynced] private int _CurrentPlayerCounter = 0;
[UdonSynced] private string[] _Players = new string[2];
[UdonSynced] private bool _RoundIsOver = false;
private CameraControllerRound2 _CameraControllerRound2 = null;
@ -52,7 +53,7 @@ public class GameManagerRound2 : GameManagerBase
_CameraControllerRound2 = (CameraControllerRound2)_CameraController;
if (_CameraControllerRound2 == null)
{
Debug.LogError("Camera controller is the wrong type. This will cause a crash for sure.");
Debug.LogError("[GameManagerRound2] Camera controller is the wrong type. This will cause a crash for sure.");
}
}
@ -188,6 +189,7 @@ public class GameManagerRound2 : GameManagerBase
private void BeginRound()
{
_CurrentPlayerCounter = 0;
_RoundIsOver = false;
_Players = _CaseManager.GetCurrentWinningPlayers();
if (_Players == null || _Players.Length != 2)
@ -203,7 +205,7 @@ public class GameManagerRound2 : GameManagerBase
RecoverTheLootInterface.SetLootButton(_LocationBoard.LootLocation);
RecoverTheLootInterface.SetWarrantButton(_LocationBoard.WarrantLocation);
RecoverTheLootInterface.SetCrookButton(_LocationBoard.CrookLocation);
RecoverTheLootInterface.EnableAllPanelButtons(true);
RecoverTheLootInterface.ActivateAllPanelButtons(true, true);
for (int i = 0; i < _Landmarks.Length; i++)
{
@ -268,7 +270,7 @@ public class GameManagerRound2 : GameManagerBase
(HostCardRecoverTheLootInterface)GetHostCardInterface(RoundSegmentType.RecoverTheLoot);
Interface.SetComment("Nothing there.", COLOR_STANDARD);
Interface.EnableAllPanelButtons(false);
Interface.ActivateAllPanelButtons(false);
}
public void AlreadyTried()
@ -277,7 +279,7 @@ public class GameManagerRound2 : GameManagerBase
(HostCardRecoverTheLootInterface)GetHostCardInterface(RoundSegmentType.RecoverTheLoot);
Interface.SetComment("Already tried that one.", COLOR_STANDARD);
Interface.EnableAllPanelButtons(false);
Interface.ActivateAllPanelButtons(false);
}
public void NiceStrategy()
@ -286,13 +288,14 @@ public class GameManagerRound2 : GameManagerBase
(HostCardRecoverTheLootInterface)GetHostCardInterface(RoundSegmentType.RecoverTheLoot);
Interface.SetComment("Nice strategy.", COLOR_GREEN);
Interface.EnableAllPanelButtons(false);
Interface.ActivateAllPanelButtons(false);
}
// This is for when a player wins the game. This should disable all inputs,
// and should also enable victory animations.
public void YoureWinner()
{
_RoundIsOver = true;
int WinningPlayerNumber = _CurrentPlayerCounter % _Players.Length;
string[] Winner = new string[1];
Winner[0] = _Players[WinningPlayerNumber];
@ -302,11 +305,13 @@ public class GameManagerRound2 : GameManagerBase
(HostCardRecoverTheLootInterface)GetHostCardInterface(RoundSegmentType.RecoverTheLoot);
Interface.SetComment("Winner! Congratulations, " + Winner[0], COLOR_RED);
Interface.EnableAllPanelButtons(false);
Interface.ActivateAllPanelButtons(false);
_CameraControllerRound2.ActivateLocationBoardAndWinningPlayerCameraSwitcher();
_CameraControllerRound2.ActivateHostWinnerCameraTrigger();
AdvanceRound();
SendCustomEventDelayedSeconds(nameof(YoureWinnerDelayedFunctions), 1.0f);
}
public void YoureWinnerDelayedFunctions()
@ -314,7 +319,11 @@ public class GameManagerRound2 : GameManagerBase
_PlayerConfettiCannons[_CurrentPlayerCounter % _Players.Length].Play();
_AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "StopMusic");
AdvanceRound();
SendCustomEventDelayedSeconds(nameof(YoureWinnerDelayedFunctions2), 1.0f);
}
public void YoureWinnerDelayedFunctions2()
{
_AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "PlayMusic", MusicEventType.YoureWinner);
}
@ -375,18 +384,53 @@ public class GameManagerRound2 : GameManagerBase
HostCardRecoverTheLootInterface Interface =
(HostCardRecoverTheLootInterface)GetHostCardInterface(RoundSegmentType.RecoverTheLoot);
Interface.SetComment(_Players[_CurrentPlayerCounter % _Players.Length] + ", your turn.", COLOR_STANDARD);
SendCustomEventDelayedSeconds(nameof(EnableAllPanelButtons), 0.5f);
SendCustomEventDelayedSeconds(nameof(ActivateAllPanelButtons_DelayFunction), 0.5f);
}
RequestSerialization();
}
public void EnableAllPanelButtons()
{
HostCardRecoverTheLootInterface Interface =
(HostCardRecoverTheLootInterface)GetHostCardInterface(RoundSegmentType.RecoverTheLoot);
Interface.EnableAllPanelButtons(true);
SwitchToCurrentPlayerAndLocationBoardSwitcher();
public void ActivateAllPanelButtons_DelayFunction()
{
if (!_RoundIsOver)
{
HostCardRecoverTheLootInterface Interface =
(HostCardRecoverTheLootInterface)GetHostCardInterface(RoundSegmentType.RecoverTheLoot);
Interface.ActivateAllPanelButtons(true, true);
SwitchToCurrentPlayerAndLocationBoardSwitcher();
}
}
public void FoundTheLoot()
{
_AudioManager.PlaySFX(SFXEventType.TheLoot);
SendCustomEventDelayedSeconds(nameof(ActivateAllPanelButtonsExceptTargets_DelayFunction), 1.5f);
}
public void FoundTheWarrant()
{
_AudioManager.PlaySFX(SFXEventType.TheWarrant);
SendCustomEventDelayedSeconds(nameof(ActivateAllPanelButtonsExceptTargets_DelayFunction), 1.5f);
}
public void FoundTheCrook()
{
_AudioManager.PlayCrookTheme(_CaseManager.GetCrook());
SendCustomEventDelayedSeconds(nameof(ActivateAllPanelButtonsExceptTargets_DelayFunction), 1.5f);
}
public void ActivateAllPanelButtonsExceptTargets_DelayFunction()
{
if (!_RoundIsOver)
{
HostCardRecoverTheLootInterface Interface =
(HostCardRecoverTheLootInterface)GetHostCardInterface(RoundSegmentType.RecoverTheLoot);
Interface.ActivateAllPanelButtons(true);
SwitchToCurrentPlayerAndLocationBoardSwitcher();
}
}
@ -396,22 +440,6 @@ public class GameManagerRound2 : GameManagerBase
}
public void PlayTheLoot()
{
_AudioManager.PlaySFX(SFXEventType.TheLoot);
}
public void PlayTheWarrant()
{
_AudioManager.PlaySFX(SFXEventType.TheWarrant);
}
public void PlayTheCrookTheme()
{
_AudioManager.PlayCrookTheme(_CaseManager.GetCrook());
}
protected override HostCardInterfaceBase GetHostCardInterface(RoundSegmentType Question)
{
return _HostCard.EnableHostCardDisplay(RoundType.RecoverTheLoot, Question);
@ -446,8 +474,9 @@ public class GameManagerRound2 : GameManagerBase
return;
}
((HostCardRecoverTheLootInterface)GetHostCardInterface(RoundSegmentType.RecoverTheLoot))
.DisablePanelButton(Panel);
HostCardRecoverTheLootInterface Interface = (HostCardRecoverTheLootInterface)GetHostCardInterface(RoundSegmentType.RecoverTheLoot);
Interface.ActivateAllPanelButtons(false);
Interface.DisablePanelButton(Panel);
_PanelToReveal_Cache = Panel;

2
Assets/UdonSharp/Game Managers/GameManagerRound3.cs
View File

@ -66,7 +66,7 @@ public class GameManagerRound3 : GameManagerBase
_CameraControllerRound3 = (CameraControllerRound3)_CameraController;
if (_CameraControllerRound3 == null)
{
Debug.LogError("Camera controller is the wrong type. This will cause a crash for sure.");
Debug.LogError("[GameManagerRound3] Camera controller is the wrong type. This will cause a crash for sure.");
}
}

25
Assets/UdonSharp/Host Card Interfaces/HostCardManager.cs
View File

@ -1,10 +1,10 @@

using TMPro;
using UdonSharp;
using UnityEngine;
using VRC.SDKBase;
using VRC.SDK3.Components;
using VRC.SDKBase;
using VRC.Udon.Common;
using TMPro;
[UdonBehaviourSyncMode(BehaviourSyncMode.Manual)]
@ -84,6 +84,27 @@ public class HostCardManager : UdonSharpBehaviour
base.InputJump(Value, Args);
}
public override void InputLookVertical(float Value, UdonInputEventArgs Args)
{
if (Networking.LocalPlayer.IsUserInVR() && _IsBeingHeld)
{
_ChangeFontSize_VR((int)Value, Args);
}
base.InputLookVertical(Value, Args);
}
private void _ChangeFontSize_VR(int Direction, UdonInputEventArgs Args)
{
if (Direction > 0)
{
// Increase host card font sizes here later
}
else if (Direction < 0)
{
// Decrease host card font sizes here later
}
}
public override void OnPickupUseDown()
{

168
Assets/UdonSharp/Host Card Interfaces/HostCardRecoverTheLootInterface.asset
View File

@ -383,13 +383,13 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _ButtonColourDisabled
Data: _ButtonColourLoot
- Name: $v
Entry: 7
Data: 21|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _ButtonColourDisabled
Data: _ButtonColourLoot
- Name: <UserType>k__BackingField
Entry: 9
Data: 18
@ -411,60 +411,12 @@ MonoBehaviour:
- Name: _fieldAttributes
Entry: 7
Data: 22|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 0
- Name:
Entry: 13
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 7
Data:
- Name: $k
Entry: 1
Data: _ButtonColourLoot
- Name: $v
Entry: 7
Data: 23|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _ButtonColourLoot
- Name: <UserType>k__BackingField
Entry: 9
Data: 18
- Name: <SystemType>k__BackingField
Entry: 9
Data: 18
- Name: <SyncMode>k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
- Name:
Entry: 6
Data:
- Name:
Entry: 8
Data:
- Name: <IsSerialized>k__BackingField
Entry: 5
Data: true
- Name: _fieldAttributes
Entry: 7
Data: 24|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 1
- Name:
Entry: 7
Data: 25|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
Data: 23|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
- Name: height
Entry: 4
Data: 8
@ -491,7 +443,7 @@ MonoBehaviour:
Data: _ButtonColourWarrant
- Name: $v
Entry: 7
Data: 26|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
Data: 24|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _ButtonColourWarrant
@ -513,6 +465,54 @@ MonoBehaviour:
- Name: <IsSerialized>k__BackingField
Entry: 5
Data: true
- Name: _fieldAttributes
Entry: 7
Data: 25|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 0
- Name:
Entry: 13
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 7
Data:
- Name: $k
Entry: 1
Data: _ButtonColourCrook
- Name: $v
Entry: 7
Data: 26|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _ButtonColourCrook
- Name: <UserType>k__BackingField
Entry: 9
Data: 18
- Name: <SystemType>k__BackingField
Entry: 9
Data: 18
- Name: <SyncMode>k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
- Name:
Entry: 6
Data:
- Name:
Entry: 8
Data:
- Name: <IsSerialized>k__BackingField
Entry: 5
Data: true
- Name: _fieldAttributes
Entry: 7
Data: 27|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
@ -536,19 +536,25 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _ButtonColourCrook
Data: _LootButton
- Name: $v
Entry: 7
Data: 28|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _ButtonColourCrook
Data: _LootButton
- Name: <UserType>k__BackingField
Entry: 9
Data: 18
Entry: 7
Data: 29|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: System.Int32, mscorlib
- Name:
Entry: 8
Data:
- Name: <SystemType>k__BackingField
Entry: 9
Data: 18
Data: 29
- Name: <SyncMode>k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@ -560,10 +566,10 @@ MonoBehaviour:
Data:
- Name: <IsSerialized>k__BackingField
Entry: 5
Data: true
Data: false
- Name: _fieldAttributes
Entry: 7
Data: 29|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
Data: 30|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 0
@ -584,25 +590,19 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _LootButton
Data: _WarrantButton
- Name: $v
Entry: 7
Data: 30|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
Data: 31|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _LootButton
Data: _WarrantButton
- Name: <UserType>k__BackingField
Entry: 7
Data: 31|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: System.Int32, mscorlib
- Name:
Entry: 8
Data:
Entry: 9
Data: 29
- Name: <SystemType>k__BackingField
Entry: 9
Data: 31
Data: 29
- Name: <SyncMode>k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@ -638,19 +638,19 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _WarrantButton
Data: _CrookButton
- Name: $v
Entry: 7
Data: 33|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _WarrantButton
Data: _CrookButton
- Name: <UserType>k__BackingField
Entry: 9
Data: 31
Data: 29
- Name: <SystemType>k__BackingField
Entry: 9
Data: 31
Data: 29
- Name: <SyncMode>k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@ -686,19 +686,25 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _CrookButton
Data: _DisabledButtons
- Name: $v
Entry: 7
Data: 35|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _CrookButton
Data: _DisabledButtons
- Name: <UserType>k__BackingField
Entry: 9
Data: 31
Entry: 7
Data: 36|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: System.Boolean[], mscorlib
- Name:
Entry: 8
Data:
- Name: <SystemType>k__BackingField
Entry: 9
Data: 31
Data: 36
- Name: <SyncMode>k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@ -713,7 +719,7 @@ MonoBehaviour:
Data: false
- Name: _fieldAttributes
Entry: 7
Data: 36|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
Data: 37|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 0

45
Assets/UdonSharp/Host Card Interfaces/HostCardRecoverTheLootInterface.cs
View File

@ -1,10 +1,8 @@

using System;
using TMPro;
using UnityEngine.UI;
using UdonSharp;
using UnityEngine;
using VRC.SDKBase;
using VRC.Udon;
[UdonBehaviourSyncMode(BehaviourSyncMode.Manual)]
@ -13,7 +11,6 @@ public class HostCardRecoverTheLootInterface : HostCardInterfaceBase
[SerializeField] private TextMeshProUGUI _CommentUI;
[Space]
public Color _ButtonColourEnabled = Color.white;
public Color _ButtonColourDisabled = Color.gray;
[Space]
public Color _ButtonColourLoot = new Color(0.0f, 1.0f, 1.0f);
public Color _ButtonColourWarrant = new Color(1.0f, 1.0f, 0.0f);
@ -23,6 +20,8 @@ public class HostCardRecoverTheLootInterface : HostCardInterfaceBase
private int _WarrantButton = -1;
private int _CrookButton = -1;
private bool[] _DisabledButtons;
public void SetComment(string Comment, Color CommentColour)
{
@ -37,21 +36,28 @@ public class HostCardRecoverTheLootInterface : HostCardInterfaceBase
public void DisablePanelButton(int Panel)
{
ChoiceButtons[Panel - 1].enabled = false;
ChoiceButtonImages[Panel - 1].color = _ButtonColourDisabled;
int PanelIndex = Panel - 1;
ChoiceButtons[PanelIndex].enabled = false;
_DisabledButtons[PanelIndex] = true;
_SetActiveButtonColour(PanelIndex, _DisabledButtons[PanelIndex]);
}
public void EnableAllPanelButtons(bool Enable)
public void ActivateAllPanelButtons(bool Activate, bool ResetAllDisabledButtons = false)
{
for (int i = 0; i < ChoiceButtons.Length; i++)
if (ResetAllDisabledButtons)
{
ChoiceButtons[i].enabled = Enable;
ChoiceButtonImages[i].color = Enable ? _ButtonColourEnabled : _ButtonColourDisabled;
_DisabledButtons = new bool[ChoiceButtons.Length];
}
if (_LootButton >= 0) ChoiceButtonImages[_LootButton].color = _ButtonColourLoot;
if (_WarrantButton >= 0) ChoiceButtonImages[_WarrantButton].color = _ButtonColourWarrant;
if (_CrookButton >= 0) ChoiceButtonImages[_CrookButton].color = _ButtonColourCrook;
for (int i = 0; i < ChoiceButtons.Length; i++)
{
ChoiceButtons[i].enabled = !_DisabledButtons[i];
if (Activate)
_SetActiveButtonColour(i, _DisabledButtons[i]);
else
_SetActiveButtonColour(i, true);
}
}
@ -69,4 +75,17 @@ public class HostCardRecoverTheLootInterface : HostCardInterfaceBase
{
_CrookButton = (Index - 1) % ChoiceButtons.Length;
}
private void _SetActiveButtonColour(int ButtonIndex, bool Disabled)
{
if (ButtonIndex == _LootButton)
ChoiceButtonImages[ButtonIndex].color = _ButtonColourLoot * (Disabled ? 0.5f : 1.0f);
else if (ButtonIndex == _WarrantButton)
ChoiceButtonImages[ButtonIndex].color = _ButtonColourWarrant * (Disabled ? 0.5f : 1.0f);
else if (ButtonIndex == _CrookButton)
ChoiceButtonImages[ButtonIndex].color = _ButtonColourCrook * (Disabled ? 0.5f : 1.0f);
else
ChoiceButtonImages[ButtonIndex].color = _ButtonColourEnabled * (Disabled ? 0.5f : 1.0f);
}
}

6
Assets/UdonSharp/Location Board/LocationBoard.cs
View File

@ -234,15 +234,15 @@ public class LocationBoard : UdonSharpBehaviour
if (RevealedPanel == LootLocation)
{
_GameManager.SendCustomEventDelayedSeconds("PlayTheLoot", 0.35f);
_GameManager.SendCustomEventDelayedSeconds("FoundTheLoot", 0.35f);
}
else if (RevealedPanel == WarrantLocation)
{
_GameManager.SendCustomEventDelayedSeconds("PlayTheWarrant", 0.35f);
_GameManager.SendCustomEventDelayedSeconds("FoundTheWarrant", 0.35f);
}
else if (RevealedPanel == CrookLocation)
{
_GameManager.SendCustomEventDelayedSeconds("PlayTheCrookTheme", 0.35f);
_GameManager.SendCustomEventDelayedSeconds("FoundTheCrook", 0.35f);
}
if (_OrderIsCorrect[0] && _OrderIsCorrect[1] && _OrderIsCorrect[2])

2
Assets/UdonSharp/UtilityScripts/BoneFollower.asset
View File

@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
m_Name: BoneFollower
m_EditorClassIdentifier:
serializedUdonProgramAsset: {fileID: 11400000, guid: ccbda9bf23e2f714c9226283c77a92e5,
serializedUdonProgramAsset: {fileID: 11400000, guid: 52ecc8a73071e8e40928c3609699fcf4,
type: 2}
udonAssembly:
assemblyError:

2
Assets/UdonSharp/UtilityScripts/InteractToggle.asset
View File

@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
m_Name: InteractToggle
m_EditorClassIdentifier:
serializedUdonProgramAsset: {fileID: 11400000, guid: 405e38d3dfb2f514daeed0e28fbb4864,
serializedUdonProgramAsset: {fileID: 11400000, guid: 873dfce61b1514e429c92e0d2fded7de,
type: 2}
udonAssembly:
assemblyError:

2
Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset
View File

@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
m_Name: PlayerModSetter
m_EditorClassIdentifier:
serializedUdonProgramAsset: {fileID: 11400000, guid: f938e6c4ff027a74da405a1f9353fd2b,
serializedUdonProgramAsset: {fileID: 11400000, guid: e81558796a212ab4d88e305e2010f24b,
type: 2}
udonAssembly:
assemblyError:

2
Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset
View File

@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
m_Name: GlobalToggleObject
m_EditorClassIdentifier:
serializedUdonProgramAsset: {fileID: 11400000, guid: c49c9265a3ef24642a6a4465d0a78872,
serializedUdonProgramAsset: {fileID: 11400000, guid: 2fe8ced6184000f49bca526cd2c5891c,
type: 2}
udonAssembly:
assemblyError:

2
Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset
View File

@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
m_Name: MasterToggleObject
m_EditorClassIdentifier:
serializedUdonProgramAsset: {fileID: 11400000, guid: 04024a76ab1924042ba521e11cb76d91,
serializedUdonProgramAsset: {fileID: 11400000, guid: a2d01d9f36ac6df49831be249e48ecc4,
type: 2}
udonAssembly:
assemblyError:

2
Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset
View File

@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
m_Name: TrackingDataFollower
m_EditorClassIdentifier:
serializedUdonProgramAsset: {fileID: 11400000, guid: 17f8fbbe6cc186d4f8dbb057b01a4ec2,
serializedUdonProgramAsset: {fileID: 11400000, guid: 1b89d4552983c0448a7389decec3b555,
type: 2}
udonAssembly:
assemblyError:

2
Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset
View File

@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
m_Name: WorldAudioSettings
m_EditorClassIdentifier:
serializedUdonProgramAsset: {fileID: 11400000, guid: 128d924a3066b7546b2d1c73e61006ab,
serializedUdonProgramAsset: {fileID: 11400000, guid: 994b559b0f158b4499f8937980ed8694,
type: 2}
udonAssembly:
assemblyError:

BIN
Raw Files/Music/Round 2 Win.aup3 Normal file
View File

Binary file not shown.