- Added an umbrella and rain to the "Thunder And Rain" lightning round intro.

- Buzzer model has been updated, and includes a trigger pull animation.
- Lightning round intro sound is now music instead of a sound effect.
- Fixed a bug that made the host card interactable on round start.
This commit is contained in:
2026-05-10 22:11:01 -04:00
parent 09cca84bed
commit 16dc6c79d8
52 changed files with 8658 additions and 817 deletions
+85 -85
View File
@@ -350,13 +350,13 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _TheChase
Data: _LightningRound
- Name: $v
Entry: 7
Data: 21|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _TheChase
Data: _LightningRound
- Name: <UserType>k__BackingField
Entry: 9
Data: 10
@@ -404,13 +404,13 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _ThinkAboutIt
Data: _TheChase
- Name: $v
Entry: 7
Data: 24|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _ThinkAboutIt
Data: _TheChase
- Name: <UserType>k__BackingField
Entry: 9
Data: 10
@@ -458,13 +458,13 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _CapitalLoop
Data: _ThinkAboutIt
- Name: $v
Entry: 7
Data: 27|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _CapitalLoop
Data: _ThinkAboutIt
- Name: <UserType>k__BackingField
Entry: 9
Data: 10
@@ -512,13 +512,13 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _RecoverTheLoot
Data: _CapitalLoop
- Name: $v
Entry: 7
Data: 30|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _RecoverTheLoot
Data: _CapitalLoop
- Name: <UserType>k__BackingField
Entry: 9
Data: 10
@@ -566,13 +566,13 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _YoureWinner
Data: _RecoverTheLoot
- Name: $v
Entry: 7
Data: 33|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _YoureWinner
Data: _RecoverTheLoot
- Name: <UserType>k__BackingField
Entry: 9
Data: 10
@@ -620,13 +620,13 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _IFeelGood
Data: _YoureWinner
- Name: $v
Entry: 7
Data: 36|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _IFeelGood
Data: _YoureWinner
- Name: <UserType>k__BackingField
Entry: 9
Data: 10
@@ -674,13 +674,13 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _CarmenChaseMusic
Data: _IFeelGood
- Name: $v
Entry: 7
Data: 39|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _CarmenChaseMusic
Data: _IFeelGood
- Name: <UserType>k__BackingField
Entry: 9
Data: 10
@@ -728,13 +728,13 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _WhereInTheWorld
Data: _CarmenChaseMusic
- Name: $v
Entry: 7
Data: 42|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _WhereInTheWorld
Data: _CarmenChaseMusic
- Name: <UserType>k__BackingField
Entry: 9
Data: 10
@@ -782,13 +782,13 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _RockapellaIdent
Data: _WhereInTheWorld
- Name: $v
Entry: 7
Data: 45|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _RockapellaIdent
Data: _WhereInTheWorld
- Name: <UserType>k__BackingField
Entry: 9
Data: 10
@@ -836,13 +836,13 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _Ding
Data: _RockapellaIdent
- Name: $v
Entry: 7
Data: 48|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _Ding
Data: _RockapellaIdent
- Name: <UserType>k__BackingField
Entry: 9
Data: 10
@@ -866,28 +866,10 @@ MonoBehaviour:
Data: 49|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 3
Data: 1
- Name:
Entry: 7
Data: 50|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
- Name: height
Entry: 4
Data: 8
- Name:
Entry: 8
Data:
- Name:
Entry: 7
Data: 51|UnityEngine.HeaderAttribute, UnityEngine.CoreModule
- Name: header
Entry: 1
Data: SFX
- Name:
Entry: 8
Data:
- Name:
Entry: 7
Data: 52|UnityEngine.SerializeField, UnityEngine.CoreModule
Data: 50|UnityEngine.SerializeField, UnityEngine.CoreModule
- Name:
Entry: 8
Data:
@@ -908,13 +890,13 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _Buzzer
Data: _Ding
- Name: $v
Entry: 7
Data: 53|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
Data: 51|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _Buzzer
Data: _Ding
- Name: <UserType>k__BackingField
Entry: 9
Data: 10
@@ -935,10 +917,28 @@ MonoBehaviour:
Data: true
- Name: _fieldAttributes
Entry: 7
Data: 54|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
Data: 52|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 1
Data: 3
- Name:
Entry: 7
Data: 53|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
- Name: height
Entry: 4
Data: 8
- Name:
Entry: 8
Data:
- Name:
Entry: 7
Data: 54|UnityEngine.HeaderAttribute, UnityEngine.CoreModule
- Name: header
Entry: 1
Data: SFX
- Name:
Entry: 8
Data:
- Name:
Entry: 7
Data: 55|UnityEngine.SerializeField, UnityEngine.CoreModule
@@ -962,13 +962,13 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _Round1Correct
Data: _Buzzer
- Name: $v
Entry: 7
Data: 56|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _Round1Correct
Data: _Buzzer
- Name: <UserType>k__BackingField
Entry: 9
Data: 10
@@ -1016,13 +1016,13 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _Round1Incorrect
Data: _Round1Correct
- Name: $v
Entry: 7
Data: 59|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _Round1Incorrect
Data: _Round1Correct
- Name: <UserType>k__BackingField
Entry: 9
Data: 10
@@ -1070,13 +1070,13 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _ACMECrimenetComputerIdle
Data: _Round1Incorrect
- Name: $v
Entry: 7
Data: 62|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _ACMECrimenetComputerIdle
Data: _Round1Incorrect
- Name: <UserType>k__BackingField
Entry: 9
Data: 10
@@ -1124,13 +1124,13 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _VideoMusicClue
Data: _ACMECrimenetComputerIdle
- Name: $v
Entry: 7
Data: 65|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _VideoMusicClue
Data: _ACMECrimenetComputerIdle
- Name: <UserType>k__BackingField
Entry: 9
Data: 10
@@ -1178,13 +1178,13 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _FileCabinetOpen
Data: _VideoMusicClue
- Name: $v
Entry: 7
Data: 68|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _FileCabinetOpen
Data: _VideoMusicClue
- Name: <UserType>k__BackingField
Entry: 9
Data: 10
@@ -1232,13 +1232,13 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _FileCabinetClose
Data: _FileCabinetOpen
- Name: $v
Entry: 7
Data: 71|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _FileCabinetClose
Data: _FileCabinetOpen
- Name: <UserType>k__BackingField
Entry: 9
Data: 10
@@ -1286,13 +1286,13 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _ModemOperation
Data: _FileCabinetClose
- Name: $v
Entry: 7
Data: 74|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _ModemOperation
Data: _FileCabinetClose
- Name: <UserType>k__BackingField
Entry: 9
Data: 10
@@ -1340,13 +1340,13 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _TheLoot
Data: _ModemOperation
- Name: $v
Entry: 7
Data: 77|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _TheLoot
Data: _ModemOperation
- Name: <UserType>k__BackingField
Entry: 9
Data: 10
@@ -1394,13 +1394,13 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _TheWarrant
Data: _TheLoot
- Name: $v
Entry: 7
Data: 80|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _TheWarrant
Data: _TheLoot
- Name: <UserType>k__BackingField
Entry: 9
Data: 10
@@ -1448,13 +1448,13 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _FogHorn
Data: _TheWarrant
- Name: $v
Entry: 7
Data: 83|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _FogHorn
Data: _TheWarrant
- Name: <UserType>k__BackingField
Entry: 9
Data: 10
@@ -1502,13 +1502,13 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _JailDoorSlam
Data: _FogHorn
- Name: $v
Entry: 7
Data: 86|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _JailDoorSlam
Data: _FogHorn
- Name: <UserType>k__BackingField
Entry: 9
Data: 10
@@ -1556,13 +1556,13 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _MapCorrect
Data: _JailDoorSlam
- Name: $v
Entry: 7
Data: 89|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _MapCorrect
Data: _JailDoorSlam
- Name: <UserType>k__BackingField
Entry: 9
Data: 10
@@ -1610,13 +1610,13 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _MapIncorrect
Data: _MapCorrect
- Name: $v
Entry: 7
Data: 92|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _MapIncorrect
Data: _MapCorrect
- Name: <UserType>k__BackingField
Entry: 9
Data: 10
@@ -1664,13 +1664,13 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _CarmenInJail
Data: _MapIncorrect
- Name: $v
Entry: 7
Data: 95|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _CarmenInJail
Data: _MapIncorrect
- Name: <UserType>k__BackingField
Entry: 9
Data: 10
@@ -1718,13 +1718,13 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _CarmenEscape
Data: _CarmenInJail
- Name: $v
Entry: 7
Data: 98|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _CarmenEscape
Data: _CarmenInJail
- Name: <UserType>k__BackingField
Entry: 9
Data: 10
@@ -1772,13 +1772,13 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _LeverCartoon
Data: _CarmenEscape
- Name: $v
Entry: 7
Data: 101|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _LeverCartoon
Data: _CarmenEscape
- Name: <UserType>k__BackingField
Entry: 9
Data: 10
@@ -1827,13 +1827,13 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _Boing
Data: _LeverCartoon
- Name: $v
Entry: 7
Data: 104|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _Boing
Data: _LeverCartoon
- Name: <UserType>k__BackingField
Entry: 9
Data: 10
@@ -1882,13 +1882,13 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _Boing2
Data: _Boing
- Name: $v
Entry: 7
Data: 107|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _Boing2
Data: _Boing
- Name: <UserType>k__BackingField
Entry: 9
Data: 10
@@ -1937,13 +1937,13 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _Printer
Data: _Boing2
- Name: $v
Entry: 7
Data: 110|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _Printer
Data: _Boing2
- Name: <UserType>k__BackingField
Entry: 9
Data: 10
@@ -1992,13 +1992,13 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _Thunder
Data: _Printer
- Name: $v
Entry: 7
Data: 113|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _Thunder
Data: _Printer
- Name: <UserType>k__BackingField
Entry: 9
Data: 10
+3 -3
View File
@@ -11,6 +11,7 @@ public enum MusicEventType
CarmenSandiegoTheme,
CarmenSandiegoWindDown,
LightningRound,
TheChase,
ACMECrimenetComputerIdle, // So that the computer can play other sounds
ThinkAboutIt,
@@ -53,7 +54,6 @@ public enum SFXEventType
Boing,
Boing2,
Printer,
Thunder,
DistantFoghorn,
LightSwitch,
PhoneRing,
@@ -73,6 +73,7 @@ public class AudioManager : UdonSharpBehaviour
[SerializeField] private AudioClip _CarmenSandiegoTheme = null;
[SerializeField] private AudioClip _CarmenSandiegoWindDown = null;
[SerializeField] private AudioClip _LightningRound = null;
[SerializeField] private AudioClip _TheChase = null;
[SerializeField] private AudioClip _ThinkAboutIt = null;
@@ -111,7 +112,6 @@ public class AudioManager : UdonSharpBehaviour
[SerializeField] private AudioClip _Boing = null;
[SerializeField] private AudioClip _Boing2 = null;
[SerializeField] private AudioClip _Printer = null;
[SerializeField] private AudioClip _Thunder = null;
[SerializeField] private AudioClip _DistantFoghorn = null;
[SerializeField] private AudioClip _LightSwitch = null;
[SerializeField] private AudioClip _PhoneRing = null;
@@ -276,6 +276,7 @@ public class AudioManager : UdonSharpBehaviour
case MusicEventType.CarmenSandiegoWindDown: _MusicPlayer.clip = _CarmenSandiegoWindDown; break;
case MusicEventType.ACMECrimenetComputerIdle: _MusicPlayer.clip = _ACMECrimenetComputerIdle; break;
case MusicEventType.LightningRound: _MusicPlayer.clip = _LightningRound; break;
case MusicEventType.TheChase: _MusicPlayer.clip = _TheChase; break;
case MusicEventType.ThinkAboutIt: _MusicPlayer.clip = _ThinkAboutIt; break;
@@ -376,7 +377,6 @@ public class AudioManager : UdonSharpBehaviour
case SFXEventType.Boing: _SFXPlayer.clip = _Boing; break;
case SFXEventType.Boing2: _SFXPlayer.clip = _Boing2; break;
case SFXEventType.Printer: _SFXPlayer.clip = _Printer; break;
case SFXEventType.Thunder: _SFXPlayer.clip = _Thunder; break;
case SFXEventType.DistantFoghorn: _SFXPlayer.clip = _DistantFoghorn; break;
case SFXEventType.LightSwitch: _SFXPlayer.clip = _LightSwitch; break;
case SFXEventType.PhoneRing: _SFXPlayer.clip = _PhoneRing; break;
@@ -115,12 +115,12 @@ public class GameManagerRound1 : GameManagerBase
_CameraControllerRound1.PlayOpening(true);
_CameraControllerRound1.PlayModemZoom(false);
DisableInteraction();
_VideoPlayer.PrepareMapsAndVideos(_CaseManager);
base.InitialiseGameMode();
DisableInteraction();
RequestSerialization();
}
@@ -167,10 +167,11 @@ public class GameManagerRound1 : GameManagerBase
public void PlaySecondPartOfThemeMusic()
{
EnableInteraction("Start Game");
_AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "PlayMusicLoop", MusicEventType.OpeningLoop);
_CameraControllerRound1.PlayOpeningDoorway(true);
EnableInteraction("Start Game");
}
@@ -44,7 +44,7 @@ MonoBehaviour:
Data:
- Name:
Entry: 12
Data: 4
Data: 6
- Name:
Entry: 7
Data:
@@ -210,12 +210,141 @@ MonoBehaviour:
- Name: _fieldAttributes
Entry: 7
Data: 13|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 2
- Name:
Entry: 7
Data: 14|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
- Name: height
Entry: 4
Data: 8
- Name:
Entry: 8
Data:
- Name:
Entry: 7
Data: 15|UnityEngine.SerializeField, UnityEngine.CoreModule
- 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: _PersonalRaincloud
- Name: $v
Entry: 7
Data: 16|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _PersonalRaincloud
- Name: <UserType>k__BackingField
Entry: 7
Data: 17|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: UnityEngine.ParticleSystem, UnityEngine.ParticleSystemModule
- Name:
Entry: 8
Data:
- Name: <SystemType>k__BackingField
Entry: 9
Data: 17
- 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: 18|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 1
- Name:
Entry: 7
Data: 14|UnityEngine.SerializeField, UnityEngine.CoreModule
Data: 19|UnityEngine.SerializeField, UnityEngine.CoreModule
- 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: _Umbrella
- Name: $v
Entry: 7
Data: 20|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _Umbrella
- Name: <UserType>k__BackingField
Entry: 7
Data: 21|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: Umbrella, Assembly-CSharp
- Name:
Entry: 8
Data:
- Name: <SystemType>k__BackingField
Entry: 9
Data: 4
- 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: 22|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 1
- Name:
Entry: 7
Data: 23|UnityEngine.SerializeField, UnityEngine.CoreModule
- Name:
Entry: 8
Data:
@@ -239,13 +368,13 @@ MonoBehaviour:
Data: _Effect
- Name: $v
Entry: 7
Data: 15|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
Data: 24|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _Effect
- Name: <UserType>k__BackingField
Entry: 7
Data: 16|System.RuntimeType, mscorlib
Data: 25|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: LightningRoundEffect, Assembly-CSharp
@@ -254,7 +383,7 @@ MonoBehaviour:
Data:
- Name: <SystemType>k__BackingField
Entry: 7
Data: 17|System.RuntimeType, mscorlib
Data: 26|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: System.Int32, mscorlib
@@ -275,13 +404,13 @@ MonoBehaviour:
Data: false
- Name: _fieldAttributes
Entry: 7
Data: 18|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
Data: 27|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 1
- Name:
Entry: 7
Data: 19|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
Data: 28|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
- Name:
Entry: 8
Data:
@@ -2,7 +2,6 @@
using UdonSharp;
using UnityEngine;
using VRC.SDKBase;
using VRC.Udon;
using VRC.Udon.Common;
@@ -21,23 +20,41 @@ public class LightningRoundEffectsController : UdonSharpBehaviour
{
[SerializeField] private AudioManager _AudioManager;
[SerializeField] private Animator _Animator;
[Space]
[SerializeField] private GameObject _LightningBolt;
[SerializeField] private ParticleSystem _PersonalRaincloud;
[SerializeField] private Umbrella _Umbrella;
[UdonSynced] private LightningRoundEffect _Effect = LightningRoundEffect.Thunder;
[UdonSynced] private LightningRoundEffect _Effect;
public override void OnOwnershipTransferred(VRCPlayerApi Player)
{
Networking.SetOwner(Player, _LightningBolt.gameObject);
Networking.SetOwner(Player, _Umbrella.gameObject);
base.OnOwnershipTransferred(Player);
}
public override void OnDeserialization(DeserializationResult Result)
{
_DeactivateRain();
_PlayLightningRoundAnimation_Synced();
base.OnDeserialization(Result);
}
public void Initialise()
{
_Umbrella.Respawn();
RequestSerialization();
}
public void PlayLightningRoundAnimation()
{
//_Effect = (LightningRoundEffect)Random.Range(0, (int)LightningRoundEffect.MAX_EFFECTS);
_Effect = LightningRoundEffect.Thunder;
_Effect = (LightningRoundEffect)Random.Range(0, (int)LightningRoundEffect.MAX_EFFECTS);
_PlayLightningRoundAnimation_Synced();
RequestSerialization();
@@ -48,24 +65,36 @@ public class LightningRoundEffectsController : UdonSharpBehaviour
{
case LightningRoundEffect.Thunder:
_LightningBolt.SetActive(false);
_AudioManager.PlaySFX(SFXEventType.Thunder);
break;
case LightningRoundEffect.LightningStrike:
_LightningBolt.SetActive(true);
_AudioManager.PlaySFX(SFXEventType.Thunder);
break;
case LightningRoundEffect.ThunderAndRain:
_LightningBolt.SetActive(false);
_AudioManager.PlaySFX(SFXEventType.Thunder);
_ActivateRain();
break;
}
_AudioManager.PlayMusic(MusicEventType.LightningRound);
_Animator.SetBool("Lightning", true);
SendCustomEventDelayedSeconds(nameof(ResetLightningRoundAnimation), 2.0f);
}
public void ResetLightningRoundAnimation()
{
_LightningBolt.SetActive(false);
_Animator.SetBool("Lightning", false);
}
private void _ActivateRain()
{
_Umbrella.gameObject.SetActive(true);
_PersonalRaincloud.Play();
}
private void _DeactivateRain()
{
_Umbrella.gameObject.SetActive(false);
_PersonalRaincloud.Stop();
}
}
+73 -7
View File
@@ -44,19 +44,19 @@ MonoBehaviour:
Data:
- Name:
Entry: 12
Data: 2
Data: 3
- Name:
Entry: 7
Data:
- Name: $k
Entry: 1
Data: Podium
Data: _Podium
- Name: $v
Entry: 7
Data: 2|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: Podium
Data: _Podium
- Name: <UserType>k__BackingField
Entry: 7
Data: 3|System.RuntimeType, mscorlib
@@ -92,7 +92,73 @@ MonoBehaviour:
Data: 5|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 0
Data: 1
- Name:
Entry: 7
Data: 6|UnityEngine.SerializeField, UnityEngine.CoreModule
- 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: _Animator
- Name: $v
Entry: 7
Data: 7|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _Animator
- Name: <UserType>k__BackingField
Entry: 7
Data: 8|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: UnityEngine.Animator, UnityEngine.AnimationModule
- Name:
Entry: 8
Data:
- Name: <SystemType>k__BackingField
Entry: 9
Data: 8
- 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: 9|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 1
- Name:
Entry: 7
Data: 10|UnityEngine.SerializeField, UnityEngine.CoreModule
- Name:
Entry: 8
Data:
- Name:
Entry: 13
Data:
@@ -113,13 +179,13 @@ MonoBehaviour:
Data: _GameManager
- Name: $v
Entry: 7
Data: 6|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
Data: 11|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _GameManager
- Name: <UserType>k__BackingField
Entry: 7
Data: 7|System.RuntimeType, mscorlib
Data: 12|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: GameManagerRound1, Assembly-CSharp
@@ -143,7 +209,7 @@ MonoBehaviour:
Data: false
- Name: _fieldAttributes
Entry: 7
Data: 8|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
Data: 13|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 0
+13 -3
View File
@@ -8,7 +8,8 @@ using VRC.Udon;
public class Buzzer : UdonSharpBehaviour
{
public PlayerPodium Podium;
[SerializeField] private PlayerPodium _Podium;
[SerializeField] private Animator _Animator;
private GameManagerRound1 _GameManager;
@@ -21,12 +22,21 @@ public class Buzzer : UdonSharpBehaviour
public override void OnPickupUseDown()
{
VRCPlayerApi LocalPlayer = Networking.LocalPlayer;
if (Podium.GetPlayerID() == LocalPlayer.playerId)
if (_Podium.GetPlayerID() == LocalPlayer.playerId)
{
_GameManager.SendCustomNetworkEvent(NetworkEventTarget.Owner,
"PlayerBuzzedIn", Podium.PlayerNumber);
"PlayerBuzzedIn", _Podium.PlayerNumber);
}
_Animator.SetBool("Trigger Pull", true);
base.OnPickupUseDown();
}
public override void OnPickupUseUp()
{
_Animator.SetBool("Trigger Pull", false);
base.OnPickupUseUp();
}
}
+8
View File
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: bf8419f46b6a6a4409bac17cada1eae6
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
@@ -0,0 +1,233 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
m_Name: Umbrella
m_EditorClassIdentifier:
serializedUdonProgramAsset: {fileID: 11400000, guid: a5f82eaa69f173543b4fd9442f04d35c,
type: 2}
udonAssembly:
assemblyError:
sourceCsScript: {fileID: 11500000, guid: 83a3ceb662d9c9c4fae97e2a447d4ffe, type: 3}
scriptVersion: 2
compiledVersion: 2
behaviourSyncMode: 4
hasInteractEvent: 0
scriptID: -5798547940079970332
serializationData:
SerializedFormat: 2
SerializedBytes:
ReferencedUnityObjects: []
SerializedBytesString:
Prefab: {fileID: 0}
PrefabModificationsReferencedUnityObjects: []
PrefabModifications: []
SerializationNodes:
- Name: fieldDefinitions
Entry: 7
Data: 0|System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[UdonSharp.Compiler.FieldDefinition,
UdonSharp.Editor]], mscorlib
- Name: comparer
Entry: 7
Data: 1|System.Collections.Generic.GenericEqualityComparer`1[[System.String,
mscorlib]], mscorlib
- Name:
Entry: 8
Data:
- Name:
Entry: 12
Data: 3
- Name:
Entry: 7
Data:
- Name: $k
Entry: 1
Data: _Animator
- Name: $v
Entry: 7
Data: 2|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _Animator
- Name: <UserType>k__BackingField
Entry: 7
Data: 3|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: UnityEngine.Animator, UnityEngine.AnimationModule
- Name:
Entry: 8
Data:
- Name: <SystemType>k__BackingField
Entry: 9
Data: 3
- 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: 4|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 1
- Name:
Entry: 7
Data: 5|UnityEngine.SerializeField, UnityEngine.CoreModule
- 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: _ObjectSync
- Name: $v
Entry: 7
Data: 6|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _ObjectSync
- Name: <UserType>k__BackingField
Entry: 7
Data: 7|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: VRC.SDK3.Components.VRCObjectSync, VRCSDK3
- Name:
Entry: 8
Data:
- Name: <SystemType>k__BackingField
Entry: 9
Data: 7
- 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: 8|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 1
- Name:
Entry: 7
Data: 9|UnityEngine.SerializeField, UnityEngine.CoreModule
- 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: _Open
- Name: $v
Entry: 7
Data: 10|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _Open
- Name: <UserType>k__BackingField
Entry: 7
Data: 11|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: System.Boolean, mscorlib
- Name:
Entry: 8
Data:
- Name: <SystemType>k__BackingField
Entry: 9
Data: 11
- 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: 12|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 1
- Name:
Entry: 7
Data: 13|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: 13
Data:
- Name:
Entry: 8
Data:
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: fe354433c2ff4f449975e13add2485f4
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
@@ -0,0 +1,52 @@
using UdonSharp;
using UnityEngine;
using VRC.SDK3.Components;
using VRC.Udon.Common;
[UdonBehaviourSyncMode(BehaviourSyncMode.Manual)]
public class Umbrella : UdonSharpBehaviour
{
[SerializeField] Animator _Animator;
[SerializeField] VRCObjectSync _ObjectSync;
[UdonSynced] private bool _Open = false;
public override void OnDeserialization(DeserializationResult Result)
{
_Open_Synced();
base.OnDeserialization(Result);
}
public override void OnPickupUseDown()
{
_Open = !_Open;
_Open_Synced();
RequestSerialization();
base.OnPickupUseDown();
}
public void Respawn()
{
Open(false);
_ObjectSync.Respawn();
}
public void Open(bool Open)
{
_Open = Open;
_Open_Synced();
RequestSerialization();
}
private void _Open_Synced()
{
_Animator.SetBool("Open", _Open);
}
}
@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 83a3ceb662d9c9c4fae97e2a447d4ffe
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant: