diff --git a/Assets/Models/SM_Buzzer.fbx b/Assets/Models/SM_Buzzer.fbx index 1c29261..82d8c09 100644 Binary files a/Assets/Models/SM_Buzzer.fbx and b/Assets/Models/SM_Buzzer.fbx differ diff --git a/Assets/Models/SM_SquareCrate.fbx b/Assets/Models/SM_SquareCrate.fbx index bbeafa0..4c818c8 100644 Binary files a/Assets/Models/SM_SquareCrate.fbx and b/Assets/Models/SM_SquareCrate.fbx differ diff --git a/Assets/Scenes/witwics.unity b/Assets/Scenes/witwics.unity index cbb230f..d357879 100644 --- a/Assets/Scenes/witwics.unity +++ b/Assets/Scenes/witwics.unity @@ -4416,11 +4416,6 @@ PrefabInstance: propertyPath: m_ScaleInLightmap value: 2 objectReference: {fileID: 0} - - target: {fileID: -7511558181221131132, guid: 76f9097b80e037f4fb610c22e157ec62, - type: 3} - propertyPath: m_StitchLightmapSeams - value: 0 - objectReference: {fileID: 0} - target: {fileID: -7511558181221131132, guid: 76f9097b80e037f4fb610c22e157ec62, type: 3} propertyPath: m_Materials.Array.data[0] @@ -46858,22 +46853,22 @@ PrefabInstance: - target: {fileID: -8679921383154817045, guid: 994d51ba1f20a4543bb632dcd772135e, type: 3} propertyPath: m_LocalRotation.w - value: 0.9996278 + value: 0.68755025 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 994d51ba1f20a4543bb632dcd772135e, type: 3} propertyPath: m_LocalRotation.x - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 994d51ba1f20a4543bb632dcd772135e, type: 3} propertyPath: m_LocalRotation.y - value: 0.027281728 + value: 0.7261368 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 994d51ba1f20a4543bb632dcd772135e, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 994d51ba1f20a4543bb632dcd772135e, type: 3} @@ -46883,7 +46878,7 @@ PrefabInstance: - target: {fileID: -8679921383154817045, guid: 994d51ba1f20a4543bb632dcd772135e, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 3.127 + value: 93.127 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 994d51ba1f20a4543bb632dcd772135e, type: 3} @@ -67527,11 +67522,6 @@ PrefabInstance: propertyPath: m_ScaleInLightmap value: 2 objectReference: {fileID: 0} - - target: {fileID: -7511558181221131132, guid: 76f9097b80e037f4fb610c22e157ec62, - type: 3} - propertyPath: m_StitchLightmapSeams - value: 0 - objectReference: {fileID: 0} - target: {fileID: -7511558181221131132, guid: 76f9097b80e037f4fb610c22e157ec62, type: 3} propertyPath: m_Materials.Array.data[0] @@ -86799,22 +86789,22 @@ PrefabInstance: - target: {fileID: -8679921383154817045, guid: 994d51ba1f20a4543bb632dcd772135e, type: 3} propertyPath: m_LocalRotation.w - value: 0.9998144 + value: 0.69335157 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 994d51ba1f20a4543bb632dcd772135e, type: 3} propertyPath: m_LocalRotation.x - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 994d51ba1f20a4543bb632dcd772135e, type: 3} propertyPath: m_LocalRotation.y - value: 0.01926574 + value: 0.7205995 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 994d51ba1f20a4543bb632dcd772135e, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 994d51ba1f20a4543bb632dcd772135e, type: 3} @@ -86824,7 +86814,7 @@ PrefabInstance: - target: {fileID: -8679921383154817045, guid: 994d51ba1f20a4543bb632dcd772135e, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 2.208 + value: 92.208 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 994d51ba1f20a4543bb632dcd772135e, type: 3} diff --git a/Assets/Scenes/witwics/LightingData.asset b/Assets/Scenes/witwics/LightingData.asset index 6fee24e..9ab668f 100644 Binary files a/Assets/Scenes/witwics/LightingData.asset and b/Assets/Scenes/witwics/LightingData.asset differ diff --git a/Assets/Scenes/witwics/Lightmap-0_comp_dir.png b/Assets/Scenes/witwics/Lightmap-0_comp_dir.png index 1a54433..9f1a957 100644 Binary files a/Assets/Scenes/witwics/Lightmap-0_comp_dir.png and b/Assets/Scenes/witwics/Lightmap-0_comp_dir.png differ diff --git a/Assets/Scenes/witwics/Lightmap-0_comp_light.exr b/Assets/Scenes/witwics/Lightmap-0_comp_light.exr index 1ecdca5..71ef005 100644 Binary files a/Assets/Scenes/witwics/Lightmap-0_comp_light.exr and b/Assets/Scenes/witwics/Lightmap-0_comp_light.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-0.exr b/Assets/Scenes/witwics/ReflectionProbe-0.exr index 7524542..8a922a4 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-0.exr and b/Assets/Scenes/witwics/ReflectionProbe-0.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-1.exr b/Assets/Scenes/witwics/ReflectionProbe-1.exr index 018d600..6e4ee7a 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-1.exr and b/Assets/Scenes/witwics/ReflectionProbe-1.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-10.exr b/Assets/Scenes/witwics/ReflectionProbe-10.exr index d7d1d5c..e1ce265 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-10.exr and b/Assets/Scenes/witwics/ReflectionProbe-10.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-11.exr b/Assets/Scenes/witwics/ReflectionProbe-11.exr index ea2aa72..bd4a9f9 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-11.exr and b/Assets/Scenes/witwics/ReflectionProbe-11.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-12.exr b/Assets/Scenes/witwics/ReflectionProbe-12.exr index 6ad0ff9..a10e2a2 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-12.exr and b/Assets/Scenes/witwics/ReflectionProbe-12.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-13.exr b/Assets/Scenes/witwics/ReflectionProbe-13.exr index 987d365..3fe7e2b 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-13.exr and b/Assets/Scenes/witwics/ReflectionProbe-13.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-14.exr b/Assets/Scenes/witwics/ReflectionProbe-14.exr index fd4ba1d..f488e3b 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-14.exr and b/Assets/Scenes/witwics/ReflectionProbe-14.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-2.exr b/Assets/Scenes/witwics/ReflectionProbe-2.exr index 196be9d..d759e33 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-2.exr and b/Assets/Scenes/witwics/ReflectionProbe-2.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-3.exr b/Assets/Scenes/witwics/ReflectionProbe-3.exr index 2ef4d4e..5a20ad5 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-3.exr and b/Assets/Scenes/witwics/ReflectionProbe-3.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-4.exr b/Assets/Scenes/witwics/ReflectionProbe-4.exr index ce34268..9728e65 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-4.exr and b/Assets/Scenes/witwics/ReflectionProbe-4.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-5.exr b/Assets/Scenes/witwics/ReflectionProbe-5.exr index 237e699..d002a18 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-5.exr and b/Assets/Scenes/witwics/ReflectionProbe-5.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-6.exr b/Assets/Scenes/witwics/ReflectionProbe-6.exr index 599f31c..18cff2e 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-6.exr and b/Assets/Scenes/witwics/ReflectionProbe-6.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-7.exr b/Assets/Scenes/witwics/ReflectionProbe-7.exr index e20b714..33abe31 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-7.exr and b/Assets/Scenes/witwics/ReflectionProbe-7.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-8.exr b/Assets/Scenes/witwics/ReflectionProbe-8.exr index e133902..532b154 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-8.exr and b/Assets/Scenes/witwics/ReflectionProbe-8.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-9.exr b/Assets/Scenes/witwics/ReflectionProbe-9.exr index 2814e29..c10961a 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-9.exr and b/Assets/Scenes/witwics/ReflectionProbe-9.exr differ diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound1.cs b/Assets/UdonSharp/Game Managers/GameManagerRound1.cs index da8cdbb..ed74c8e 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound1.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound1.cs @@ -100,6 +100,7 @@ public class GameManagerRound1 : GameManagerBase _PlayerBuzzInAllowed = new bool[_PlayerPodiums.Length]; + _LightningRoundEffects.Initialise(); _Modem.Activate(false); foreach (ArrivalDisplay Display in _ArrivalDisplays) @@ -115,7 +116,6 @@ public class GameManagerRound1 : GameManagerBase _CameraControllerRound1.PlayOpening(true); _CameraControllerRound1.PlayModemZoom(false); - _VideoPlayer.PrepareMapsAndVideos(_CaseManager); base.InitialiseGameMode(); @@ -1248,26 +1248,28 @@ public class GameManagerRound1 : GameManagerBase _PlayerPodiums[i].SendCustomNetworkEvent(NetworkEventTarget.Owner, "ShowAuxiliaryMapScreen", false); } - HostCardMultipleChoiceInterface Interface = - (HostCardMultipleChoiceInterface)GetHostCardInterface(RoundSegmentType.FinalRound); + //HostCardMultipleChoiceInterface Interface = + // (HostCardMultipleChoiceInterface)GetHostCardInterface(RoundSegmentType.FinalRound); - Interface.HeaderUI.text = "LOCKED IN"; - for (int i = 0; i < Interface.CluesUI.Length; i++) - { - Interface.CluesUI[i].text = ""; - } + //Interface.HeaderUI.text = "LOCKED IN"; + //for (int i = 0; i < Interface.CluesUI.Length; i++) + //{ + // Interface.CluesUI[i].text = ""; + //} - for (int i = 0; i < Interface.ChoiceUI.Length; i++) - { - if (i != (_QuestionCorrectResponse - 1)) - { - Interface.ChoiceUI[i].text = ""; - } - } + //for (int i = 0; i < Interface.ChoiceUI.Length; i++) + //{ + // if (i != (_QuestionCorrectResponse - 1)) + // { + // Interface.ChoiceUI[i].text = ""; + // } + //} SortPlayersHighToLowScore(); - EnableInteraction("Reveal Third Place"); + AdvanceQuestion(); + + //EnableInteraction("Reveal Third Place"); } private void SortPlayersHighToLowScore() { @@ -1434,6 +1436,8 @@ public class GameManagerRound1 : GameManagerBase _VideoPlayer.SendCustomNetworkEvent(NetworkEventTarget.All, "ClearScreen"); + _LightningRoundEffects.Initialise(); + _QuestionIndex++; if (_QuestionIndex >= _QuestionsList.Count) { diff --git a/Assets/UdonSharp/LightningRoundEffectsController.asset b/Assets/UdonSharp/LightningRoundEffectsController.asset index 14a076e..b4cccb1 100644 --- a/Assets/UdonSharp/LightningRoundEffectsController.asset +++ b/Assets/UdonSharp/LightningRoundEffectsController.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 6 + Data: 7 - Name: Entry: 7 Data: @@ -426,6 +426,54 @@ MonoBehaviour: - Name: Entry: 8 Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _Effect_Cached + - Name: $v + Entry: 7 + Data: 29|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _Effect_Cached + - Name: k__BackingField + Entry: 9 + Data: 25 + - Name: k__BackingField + Entry: 9 + Data: 26 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 30|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: 13 Data: diff --git a/Assets/UdonSharp/LightningRoundEffectsController.cs b/Assets/UdonSharp/LightningRoundEffectsController.cs index 7072da0..3dd64b7 100644 --- a/Assets/UdonSharp/LightningRoundEffectsController.cs +++ b/Assets/UdonSharp/LightningRoundEffectsController.cs @@ -25,7 +25,8 @@ public class LightningRoundEffectsController : UdonSharpBehaviour [SerializeField] private ParticleSystem _PersonalRaincloud; [SerializeField] private Umbrella _Umbrella; - [UdonSynced] private LightningRoundEffect _Effect; + [UdonSynced] private LightningRoundEffect _Effect = LightningRoundEffect.MAX_EFFECTS; + private LightningRoundEffect _Effect_Cached = LightningRoundEffect.MAX_EFFECTS; public override void OnOwnershipTransferred(VRCPlayerApi Player) @@ -38,7 +39,6 @@ public class LightningRoundEffectsController : UdonSharpBehaviour public override void OnDeserialization(DeserializationResult Result) { - _DeactivateRain(); _PlayLightningRoundAnimation_Synced(); base.OnDeserialization(Result); @@ -47,38 +47,47 @@ public class LightningRoundEffectsController : UdonSharpBehaviour public void Initialise() { - _Umbrella.Respawn(); - + _Effect = LightningRoundEffect.MAX_EFFECTS; + _PlayLightningRoundAnimation_Synced(); RequestSerialization(); } public void PlayLightningRoundAnimation() { _Effect = (LightningRoundEffect)Random.Range(0, (int)LightningRoundEffect.MAX_EFFECTS); - _PlayLightningRoundAnimation_Synced(); RequestSerialization(); } private void _PlayLightningRoundAnimation_Synced() { - switch (_Effect) + if (_Effect != _Effect_Cached) { - case LightningRoundEffect.Thunder: - _LightningBolt.SetActive(false); - break; - case LightningRoundEffect.LightningStrike: - _LightningBolt.SetActive(true); - break; - case LightningRoundEffect.ThunderAndRain: - _LightningBolt.SetActive(false); - _ActivateRain(); - break; + switch (_Effect) + { + case LightningRoundEffect.Thunder: + _LightningBolt.SetActive(false); + break; + case LightningRoundEffect.LightningStrike: + _LightningBolt.SetActive(true); + break; + case LightningRoundEffect.ThunderAndRain: + _LightningBolt.SetActive(false); + _ActivateRain(); + break; + default: // Deactivate everything and leave + _Animator.SetBool("Lightning", false); + _LightningBolt.SetActive(false); + _DeactivateRain(); + return; + } + + _AudioManager.PlayMusic(MusicEventType.LightningRound); + _Animator.SetBool("Lightning", true); + + SendCustomEventDelayedSeconds(nameof(ResetLightningRoundAnimation), 2.0f); + + _Effect_Cached = _Effect; } - - _AudioManager.PlayMusic(MusicEventType.LightningRound); - _Animator.SetBool("Lightning", true); - - SendCustomEventDelayedSeconds(nameof(ResetLightningRoundAnimation), 2.0f); } public void ResetLightningRoundAnimation() { @@ -90,6 +99,7 @@ public class LightningRoundEffectsController : UdonSharpBehaviour private void _ActivateRain() { _Umbrella.gameObject.SetActive(true); + _Umbrella.Respawn(); _PersonalRaincloud.Play(); } private void _DeactivateRain() diff --git a/Raw Files/Buzzer.blend b/Raw Files/Buzzer.blend index 2556b1a..c1d4498 100644 Binary files a/Raw Files/Buzzer.blend and b/Raw Files/Buzzer.blend differ