diff --git a/Assets/Prefabs/Case List Entry List.prefab b/Assets/Prefabs/Case List Entry List.prefab index 9f1fcae..1a1449f 100644 --- a/Assets/Prefabs/Case List Entry List.prefab +++ b/Assets/Prefabs/Case List Entry List.prefab @@ -766,32 +766,32 @@ PrefabInstance: - target: {fileID: 6858734047833335697, guid: 3929edff864c3a84abaac327dbadaf65, type: 3} propertyPath: VideoFiles.Array.data[0].url - value: https://www.youtube.com/watch?v=v4M25yPLi68 + value: https://www.youtube.com/watch?v=jYwVEc-yY90 objectReference: {fileID: 0} - target: {fileID: 6858734047833335697, guid: 3929edff864c3a84abaac327dbadaf65, type: 3} propertyPath: VideoFiles.Array.data[1].url - value: https://www.youtube.com/watch?v=IWT_PHxurvg + value: https://www.youtube.com/watch?v=XPKzN6NA3TM objectReference: {fileID: 0} - target: {fileID: 6858734047833335697, guid: 3929edff864c3a84abaac327dbadaf65, type: 3} propertyPath: VideoFiles.Array.data[2].url - value: https://www.youtube.com/watch?v=VjWWCy0V_M4 + value: https://www.youtube.com/watch?v=9hw_z3xb23k objectReference: {fileID: 0} - target: {fileID: 6858734047833335697, guid: 3929edff864c3a84abaac327dbadaf65, type: 3} propertyPath: VideoFiles.Array.data[3].url - value: https://www.youtube.com/watch?v=OXXjadCcg_A + value: https://www.youtube.com/watch?v=mYZ7__un8c0 objectReference: {fileID: 0} - target: {fileID: 6858734047833335697, guid: 3929edff864c3a84abaac327dbadaf65, type: 3} propertyPath: VideoFiles.Array.data[4].url - value: https://www.youtube.com/watch?v=i_s4O2TkBng + value: https://www.youtube.com/watch?v=4qYCR3097j0 objectReference: {fileID: 0} - target: {fileID: 6858734047833335697, guid: 3929edff864c3a84abaac327dbadaf65, type: 3} propertyPath: VideoFiles.Array.data[5].url - value: https://www.youtube.com/watch?v=iCUbU12yNKI + value: https://www.youtube.com/watch?v=kRGE3aMt1ew objectReference: {fileID: 0} - target: {fileID: 7635005722111176880, guid: 3929edff864c3a84abaac327dbadaf65, type: 3} diff --git a/Assets/Scenes/witwics.unity b/Assets/Scenes/witwics.unity index 8e63c12..d289f76 100644 --- a/Assets/Scenes/witwics.unity +++ b/Assets/Scenes/witwics.unity @@ -7347,6 +7347,16 @@ PrefabInstance: propertyPath: PlayerNumber value: 2 objectReference: {fileID: 0} + - target: {fileID: 1226214083704227558, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: _AuxiliaryMapScreen + value: + objectReference: {fileID: 1033573179} + - target: {fileID: 1226214083704227558, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: _AuxiliaryVideoScreen + value: + objectReference: {fileID: 1284602869} - target: {fileID: 1226214083704227558, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -14916,7 +14926,7 @@ PrefabInstance: - target: {fileID: 919132149155446097, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -22611,6 +22621,12 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 4362789101225005290} m_PrefabAsset: {fileID: 0} +--- !u!1 &695641899 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, + type: 3} + m_PrefabInstance: {fileID: 1062128159} + m_PrefabAsset: {fileID: 0} --- !u!1 &696726627 stripped GameObject: m_CorrespondingSourceObject: {fileID: 8697969830841627821, guid: be33bc7f6c414e6409becfa348b9310d, @@ -27075,6 +27091,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 901508271} m_PrefabAsset: {fileID: 0} +--- !u!1 &901874611 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, + type: 3} + m_PrefabInstance: {fileID: 413014351} + m_PrefabAsset: {fileID: 0} --- !u!1 &905017120 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6252298826817455165, guid: be33bc7f6c414e6409becfa348b9310d, @@ -27850,6 +27872,16 @@ PrefabInstance: propertyPath: PlayerNumber value: 3 objectReference: {fileID: 0} + - target: {fileID: 1226214083704227558, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: _AuxiliaryMapScreen + value: + objectReference: {fileID: 2092406339} + - target: {fileID: 1226214083704227558, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: _AuxiliaryVideoScreen + value: + objectReference: {fileID: 695641899} - target: {fileID: 1226214083704227558, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -31007,6 +31039,12 @@ Transform: - {fileID: 1831074713} m_Father: {fileID: 937910638} m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} +--- !u!1 &1033573179 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, + type: 3} + m_PrefabInstance: {fileID: 1587075297} + m_PrefabAsset: {fileID: 0} --- !u!1 &1033844166 stripped GameObject: m_CorrespondingSourceObject: {fileID: 2622315012130038381, guid: be33bc7f6c414e6409becfa348b9310d, @@ -38965,6 +39003,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1282089586} m_PrefabAsset: {fileID: 0} +--- !u!1 &1284602869 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, + type: 3} + m_PrefabInstance: {fileID: 1934543460} + m_PrefabAsset: {fileID: 0} --- !u!1 &1285256767 stripped GameObject: m_CorrespondingSourceObject: {fileID: 5532816500041768831, guid: be33bc7f6c414e6409becfa348b9310d, @@ -44056,7 +44100,7 @@ PrefabInstance: - target: {fileID: 919132149155446097, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -53344,7 +53388,7 @@ PrefabInstance: - target: {fileID: 919132149155446097, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -62112,6 +62156,12 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1499591484} m_PrefabAsset: {fileID: 0} +--- !u!1 &1978971599 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, + type: 3} + m_PrefabInstance: {fileID: 1804159804} + m_PrefabAsset: {fileID: 0} --- !u!1 &1983328789 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7147581531654102366, guid: e9914385266bca24db809c39e395f03c, @@ -65169,6 +65219,12 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 4362789101225005290} m_PrefabAsset: {fileID: 0} +--- !u!1 &2092406339 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, + type: 3} + m_PrefabInstance: {fileID: 1481802713} + m_PrefabAsset: {fileID: 0} --- !u!1 &2093851730 stripped GameObject: m_CorrespondingSourceObject: {fileID: 725179814551981341, guid: e9914385266bca24db809c39e395f03c, @@ -68741,6 +68797,16 @@ PrefabInstance: propertyPath: PlayerNumber value: 1 objectReference: {fileID: 0} + - target: {fileID: 1226214083704227558, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: _AuxiliaryMapScreen + value: + objectReference: {fileID: 901874611} + - target: {fileID: 1226214083704227558, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: _AuxiliaryVideoScreen + value: + objectReference: {fileID: 1978971599} - target: {fileID: 1226214083704227558, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -70050,44 +70116,44 @@ MonoBehaviour: DynamicPrefabs: [] DynamicMaterials: - {fileID: 2100000, guid: 1c987494452b85f4ab4cac3322415907, type: 2} - - {fileID: 2100000, guid: 4fb0b8cdca56f5d47be970c7490cb7a1, type: 2} - - {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2} - - {fileID: 2100000, guid: c3186340e03d26341969d34663dbf8f3, type: 2} - - {fileID: 2100000, guid: 82f2961c9baa48a45ac897be257fd655, type: 2} - - {fileID: 2100000, guid: 885429151ec5f6a4a926f6aaabd7e001, type: 2} - - {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2} - - {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2} + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 0c3dfdcd7a2a6ac408ec3d431f9a4932, type: 2} + - {fileID: 2100000, guid: 35c2a316ece610b4b963e047e5238337, type: 2} + - {fileID: 2100000, guid: c1b531b2f1a7dab43b46daa7546cfda7, type: 2} - {fileID: 2100000, guid: accd304c49b7d6d43b97738e8e118342, type: 2} - {fileID: 2100000, guid: 2c0cd617d97924748a9d5e2eeb2039b5, type: 2} - - {fileID: 2100000, guid: 0c3dfdcd7a2a6ac408ec3d431f9a4932, type: 2} - - {fileID: 2100000, guid: c1b531b2f1a7dab43b46daa7546cfda7, type: 2} - - {fileID: 2100000, guid: 35c2a316ece610b4b963e047e5238337, type: 2} - - {fileID: 2100000, guid: faae26a849699fc4b804b74882a344df, type: 2} - - {fileID: 2100000, guid: bd8b723337ae5824fa61f693f76e943f, type: 2} - - {fileID: 2100000, guid: 7eb7cd9bfc12d4c4198d1874ca5a1aa4, type: 2} - - {fileID: 2100000, guid: 79cb8dae66bc60241b5964b24ff1ac7e, type: 2} - - {fileID: 2100000, guid: c4382cc6d54262b46913ae6fe8a3740e, type: 2} - - {fileID: 2100000, guid: 82bace4c334919c4f92e87905c39fdf8, type: 2} - - {fileID: 2100000, guid: d811246c848733b4c8310b4dec5a5fdf, type: 2} - - {fileID: 2100000, guid: f025bfafc9ecec74aa3aab468ef837d7, type: 2} - - {fileID: 2100000, guid: 50e427994e5b0224f966b200c577b78b, type: 2} - - {fileID: 2100000, guid: 5a56ded101f363e46861c8fe1c4f360e, type: 2} - - {fileID: 2100000, guid: 95dd396b63c6ad4429ad37eedc63f20c, type: 2} - - {fileID: 2100000, guid: 74aa3dbc50df9464e8d9d11815b389a7, type: 2} - - {fileID: 2100000, guid: 220d5a1f1701e674794a1083cc2f0bac, type: 2} - - {fileID: 2100000, guid: 49170bf20870c7c45873b3c1966d86af, type: 2} - - {fileID: 2100000, guid: cac39def7281c5c488b6a3465ec1951b, type: 2} - - {fileID: 2100000, guid: 332daba92d0976f4d86bdcdc1a94179e, type: 2} - - {fileID: 2100000, guid: 80746b095abb6ce41a1c737df3649172, type: 2} - - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 2100000, guid: af0c1cbaaffed304ba0e3a1fbac41e7e, type: 2} - {fileID: 2100000, guid: cc22c7f9de95cab4488b30fe8699a82a, type: 2} - {fileID: 2100000, guid: fe872fb72ad98da4dbb868481468e848, type: 2} + - {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2} + - {fileID: 2100000, guid: 4fb0b8cdca56f5d47be970c7490cb7a1, type: 2} + - {fileID: 2100000, guid: 80746b095abb6ce41a1c737df3649172, type: 2} + - {fileID: 2100000, guid: 332daba92d0976f4d86bdcdc1a94179e, type: 2} + - {fileID: 2100000, guid: c4382cc6d54262b46913ae6fe8a3740e, type: 2} + - {fileID: 2100000, guid: c3186340e03d26341969d34663dbf8f3, type: 2} + - {fileID: 2100000, guid: 49170bf20870c7c45873b3c1966d86af, type: 2} + - {fileID: 2100000, guid: 885429151ec5f6a4a926f6aaabd7e001, type: 2} + - {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2} - {fileID: 2100000, guid: 1405028e0b3126f4f9b049697458b13c, type: 2} + - {fileID: 2100000, guid: bd8b723337ae5824fa61f693f76e943f, type: 2} + - {fileID: 2100000, guid: faae26a849699fc4b804b74882a344df, type: 2} - {fileID: 2100000, guid: a793cd1d5fe89c440900d816c7b8c323, type: 2} - {fileID: 2100000, guid: 98166ed003d332e488319f662c3b4429, type: 2} - {fileID: 2100000, guid: 71ede89a28bd60e4ca2918572046ba90, type: 2} + - {fileID: 2100000, guid: cac39def7281c5c488b6a3465ec1951b, type: 2} + - {fileID: 2100000, guid: 79cb8dae66bc60241b5964b24ff1ac7e, type: 2} + - {fileID: 2100000, guid: f025bfafc9ecec74aa3aab468ef837d7, type: 2} + - {fileID: 2100000, guid: 50e427994e5b0224f966b200c577b78b, type: 2} + - {fileID: 2100000, guid: 82bace4c334919c4f92e87905c39fdf8, type: 2} + - {fileID: 2100000, guid: 220d5a1f1701e674794a1083cc2f0bac, type: 2} + - {fileID: 2100000, guid: d811246c848733b4c8310b4dec5a5fdf, type: 2} + - {fileID: 2100000, guid: 7eb7cd9bfc12d4c4198d1874ca5a1aa4, type: 2} + - {fileID: 2100000, guid: 95dd396b63c6ad4429ad37eedc63f20c, type: 2} + - {fileID: 2100000, guid: 74aa3dbc50df9464e8d9d11815b389a7, type: 2} + - {fileID: 2100000, guid: 5a56ded101f363e46861c8fe1c4f360e, type: 2} - {fileID: 2100000, guid: 341141e903fac3e4ca54a62259c6d01d, type: 2} + - {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2} + - {fileID: 2100000, guid: 82f2961c9baa48a45ac897be257fd655, type: 2} LightMapsNear: [] LightMapsFar: [] LightMode: 0 diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound1.cs b/Assets/UdonSharp/Game Managers/GameManagerRound1.cs index 2070dda..ccea606 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound1.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound1.cs @@ -52,10 +52,7 @@ public class GameManagerRound1 : GameManagerBase for (int i = 0; i < _PlayerPodiums.Length; i++) { - NetworkCalling.SendCustomNetworkEvent( - (IUdonEventReceiver)_PlayerPodiums[i], - NetworkEventTarget.All, - "ResetPodium"); + _PlayerPodiums[i].SendCustomNetworkEvent(NetworkEventTarget.All, "ResetPodium"); } _PlayerBuzzInAllowed = new bool[_PlayerPodiums.Length]; @@ -128,7 +125,7 @@ public class GameManagerRound1 : GameManagerBase MapIndices[i] = (int)Maps[i].Number; } - NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)_VideoPlayer, NetworkEventTarget.All, + _VideoPlayer.SendCustomNetworkEvent(NetworkEventTarget.All, "QueueMapDownloads", MapIndices); } } @@ -139,13 +136,10 @@ public class GameManagerRound1 : GameManagerBase for (int i = 0; i < _PlayerPodiums.Length; i++) { - NetworkCalling.SendCustomNetworkEvent( - (IUdonEventReceiver)_PlayerPodiums[i], - NetworkEventTarget.All, - "DisplayScore"); + _PlayerPodiums[i].SendCustomNetworkEvent(NetworkEventTarget.All, "DisplayScore"); } - NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)_AudioManager, NetworkEventTarget.All, + _AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "PlaySFXAtPitch", SFXEventType.Ding, AudioManager.D6); ShowBetweenQuestionsInterface(); @@ -279,7 +273,7 @@ public class GameManagerRound1 : GameManagerBase Interface.ChoiceButtonImages[0].color = (_QuestionCorrectResponse == 1) ? Color.green : Color.red; - NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)_AudioManager, NetworkEventTarget.All, + _AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "PlaySFXAtPitch", SFXEventType.Ding, AudioManager.As5); EnableInteraction("Reveal Choice 2"); @@ -293,7 +287,7 @@ public class GameManagerRound1 : GameManagerBase Interface.ChoiceButtonImages[1].color = (_QuestionCorrectResponse == 2) ? Color.green : Color.red; - NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)_AudioManager, NetworkEventTarget.All, + _AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "PlaySFXAtPitch", SFXEventType.Ding, AudioManager.C6); EnableInteraction("Reveal Choice 3"); @@ -331,10 +325,11 @@ public class GameManagerRound1 : GameManagerBase Indices[Choice3Index] = -1; string[] ChoiceStrings = { Choices[0].ToString(), Choices[1].ToString(), Choices[2].ToString() }; - NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)_PlayerPodiums[i], NetworkEventTarget.All, "SetCardChoices", ChoiceStrings, ChoiceOrder); + _PlayerPodiums[i].SendCustomNetworkEvent(NetworkEventTarget.All, + "SetCardChoices", ChoiceStrings, ChoiceOrder); } - NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)_AudioManager, NetworkEventTarget.All, + _AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "PlaySFXAtPitch", SFXEventType.Ding, AudioManager.D6); EnableInteraction("Lock Answers"); @@ -344,7 +339,7 @@ public class GameManagerRound1 : GameManagerBase { for (int i = 0; i < _PlayerPodiums.Length; i++) { - NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)_PlayerPodiums[i], NetworkEventTarget.All, "LockInChoice"); + _PlayerPodiums[i].SendCustomNetworkEvent(NetworkEventTarget.All, "LockInChoice"); } HostCardMultipleChoiceInterface Interface = @@ -383,12 +378,12 @@ public class GameManagerRound1 : GameManagerBase if (IsSomeoneCorrect) { - NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)_AudioManager, NetworkEventTarget.All, + _AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "PlaySFX", SFXEventType.Round1Correct); } else { - NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)_AudioManager, NetworkEventTarget.All, + _AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "PlaySFX", SFXEventType.Round1Incorrect); } @@ -521,7 +516,7 @@ public class GameManagerRound1 : GameManagerBase HostCardTheChaseInterface Interface = (HostCardTheChaseInterface)GetHostCardInterface(RoundSegmentType.TheChase); - NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)_AudioManager, NetworkEventTarget.All, + _AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "PlayMusic", MusicEventType.TheChase); Interface.HeaderUI.text = RoundSegmentTypeToString(RoundSegmentType.TheChase); @@ -602,7 +597,7 @@ public class GameManagerRound1 : GameManagerBase } public void TheChaseEndClue() { - NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)_AudioManager, NetworkEventTarget.All, + _AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "PlaySFXAtPitch", SFXEventType.Ding, AudioManager.D6); HostCardTheChaseInterface Interface = @@ -656,7 +651,7 @@ public class GameManagerRound1 : GameManagerBase (HostCardBetweenRoundsInterface)GetHostCardInterface(RoundSegmentType.BetweenSegments); Interface.HeaderUI.text = "Think about it..."; - NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)_AudioManager, NetworkEventTarget.All, + _AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "PlayMusic", MusicEventType.ThinkAboutIt); SendCustomEventDelayedSeconds(nameof(ThinkAboutItCountdownFinished), 15.0f); } @@ -683,7 +678,7 @@ public class GameManagerRound1 : GameManagerBase for (int i = 0; i < _PlayerPodiums.Length; i++) { - NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)_PlayerPodiums[i], NetworkEventTarget.All, "LockInRisk"); + _PlayerPodiums[i].SendCustomNetworkEvent(NetworkEventTarget.All, "LockInRisk"); } EnableInteraction("Present Clues"); @@ -703,7 +698,7 @@ public class GameManagerRound1 : GameManagerBase (HostCardMultipleChoiceInterface)GetHostCardInterface(RoundSegmentType.FinalRound); Interface.ChoiceButtonImages[0].color = (_QuestionCorrectResponse == 1) ? Color.green : Color.red; - NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)_AudioManager, NetworkEventTarget.All, + _AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "PlaySFXAtPitch", SFXEventType.Ding, AudioManager.As5); EnableInteraction("Reveal Choice 2"); @@ -716,7 +711,7 @@ public class GameManagerRound1 : GameManagerBase (HostCardMultipleChoiceInterface)GetHostCardInterface(RoundSegmentType.FinalRound); Interface.ChoiceButtonImages[1].color = (_QuestionCorrectResponse == 2) ? Color.green : Color.red; - NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)_AudioManager, NetworkEventTarget.All, + _AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "PlaySFXAtPitch", SFXEventType.Ding, AudioManager.C6); EnableInteraction("Reveal Choice 3"); @@ -754,10 +749,11 @@ public class GameManagerRound1 : GameManagerBase Indices[Choice3Index] = -1; string[] ChoiceStrings = { Choices[0].ToString(), Choices[1].ToString(), Choices[2].ToString() }; - NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)_PlayerPodiums[i], NetworkEventTarget.All, "SetCardChoices", ChoiceStrings, ChoiceOrder); + _PlayerPodiums[i].SendCustomNetworkEvent(NetworkEventTarget.All, + "SetCardChoices", ChoiceStrings, ChoiceOrder); } - NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)_AudioManager, NetworkEventTarget.All, + _AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "PlaySFXAtPitch", SFXEventType.Ding, AudioManager.D6); EnableInteraction("Lock Answers"); @@ -767,7 +763,7 @@ public class GameManagerRound1 : GameManagerBase { for (int i = 0; i < _PlayerPodiums.Length; i++) { - NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)_PlayerPodiums[i], NetworkEventTarget.All, "LockInChoice"); + _PlayerPodiums[i].SendCustomNetworkEvent(NetworkEventTarget.All, "LockInChoice"); } HostCardMultipleChoiceInterface Interface = @@ -1065,9 +1061,7 @@ public class GameManagerRound1 : GameManagerBase int PodiumIndex = _BuzzedInPlayer - 1; if (PodiumIndex >= 0 && PodiumIndex < _PlayerPodiums.Length) { - NetworkCalling.SendCustomNetworkEvent( - (IUdonEventReceiver)_PlayerPodiums[PodiumIndex], - NetworkEventTarget.All, + _PlayerPodiums[PodiumIndex].SendCustomNetworkEvent(NetworkEventTarget.All, "EnableBuzzInEffect", false); } @@ -1120,7 +1114,7 @@ public class GameManagerRound1 : GameManagerBase { for (int i = 0; i < _PlayerPodiums.Length; i++) { - NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)_PlayerPodiums[i], NetworkEventTarget.All, "EnableChoiceCards", true); + _PlayerPodiums[i].SendCustomNetworkEvent(NetworkEventTarget.All, "EnableChoiceCards", true); } } @@ -1128,7 +1122,7 @@ public class GameManagerRound1 : GameManagerBase { for (int i = 0; i < _PlayerPodiums.Length; i++) { - NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)_PlayerPodiums[i], NetworkEventTarget.All, "EnableChoiceCards", false); + _PlayerPodiums[i].SendCustomNetworkEvent(NetworkEventTarget.All, "EnableChoiceCards", false); } } @@ -1137,7 +1131,7 @@ public class GameManagerRound1 : GameManagerBase { for (int i = 0; i < _PlayerPodiums.Length; i++) { - NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)_PlayerPodiums[i], NetworkEventTarget.All, "EnableRiskCards", true); + _PlayerPodiums[i].SendCustomNetworkEvent(NetworkEventTarget.All, "EnableRiskCards", true); } } @@ -1145,7 +1139,7 @@ public class GameManagerRound1 : GameManagerBase { for (int i = 0; i < _PlayerPodiums.Length; i++) { - NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)_PlayerPodiums[i], NetworkEventTarget.All, "EnableRiskCards", false); + _PlayerPodiums[i].SendCustomNetworkEvent(NetworkEventTarget.All, "EnableRiskCards", false); } } @@ -1154,7 +1148,7 @@ public class GameManagerRound1 : GameManagerBase { for (int i = 0; i < _PlayerPodiums.Length; i++) { - NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)_PlayerPodiums[i], NetworkEventTarget.All, "EnableBuzzer", true); + _PlayerPodiums[i].SendCustomNetworkEvent(NetworkEventTarget.All, "EnableBuzzer", true); } } @@ -1162,7 +1156,7 @@ public class GameManagerRound1 : GameManagerBase { for (int i = 0; i < _PlayerPodiums.Length; i++) { - NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)_PlayerPodiums[i], NetworkEventTarget.All, "EnableBuzzer", false); + _PlayerPodiums[i].SendCustomNetworkEvent(NetworkEventTarget.All, "EnableBuzzer", false); } } @@ -1179,7 +1173,7 @@ public class GameManagerRound1 : GameManagerBase if (_PlayerPodiums[i].PlayerNumber == PlayerNumber) { _PlayerBuzzInAllowed[i] = true; - NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)_PlayerPodiums[i], NetworkEventTarget.All, "EnableBuzzer", true); + _PlayerPodiums[i].SendCustomNetworkEvent(NetworkEventTarget.All, "EnableBuzzer", true); _BuzzedInPlayer = -1; break; } @@ -1193,9 +1187,7 @@ public class GameManagerRound1 : GameManagerBase int PodiumIndex = _BuzzedInPlayer - 1; if (PodiumIndex >= 0 && PodiumIndex < _PlayerPodiums.Length) { - NetworkCalling.SendCustomNetworkEvent( - (IUdonEventReceiver)_PlayerPodiums[PodiumIndex], - NetworkEventTarget.All, + _PlayerPodiums[PodiumIndex].SendCustomNetworkEvent(NetworkEventTarget.All, "EnableBuzzInEffect", false); _BuzzedInPlayer = -1; } @@ -1215,13 +1207,11 @@ public class GameManagerRound1 : GameManagerBase _BuzzedInPlayer = PlayerNumber; RequestSerialization(); - NetworkCalling.SendCustomNetworkEvent( - (IUdonEventReceiver)_PlayerPodiums[PlayerIndex], - NetworkEventTarget.All, + _PlayerPodiums[PlayerIndex].SendCustomNetworkEvent(NetworkEventTarget.All, "EnableBuzzInEffect", true); // Play the buzzer sound globally. - NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)_AudioManager, NetworkEventTarget.All, + _AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "PlaySFX", SFXEventType.Buzzer); } @@ -1236,7 +1226,7 @@ public class GameManagerRound1 : GameManagerBase for (int i = 0; i < _PlayerPodiums.Length; i++) { _PlayerBuzzInAllowed[i] = true; - NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)_PlayerPodiums[i], NetworkEventTarget.All, "EnableBuzzInEffect", false); + _PlayerPodiums[i].SendCustomNetworkEvent(NetworkEventTarget.All, "EnableBuzzInEffect", false); } _BuzzedInPlayer = -1; } diff --git a/Assets/UdonSharp/Podium/PlayerPodium.cs b/Assets/UdonSharp/Podium/PlayerPodium.cs index 992ae4d..6703744 100644 --- a/Assets/UdonSharp/Podium/PlayerPodium.cs +++ b/Assets/UdonSharp/Podium/PlayerPodium.cs @@ -115,10 +115,7 @@ public class PlayerPodium : UdonSharpBehaviour { _ChoiceCards.gameObject.SetActive(Enable); _ChoiceCards.ResetCards(); - NetworkCalling.SendCustomNetworkEvent( - (IUdonEventReceiver)_ChoiceCards, - NetworkEventTarget.Owner, - "MakeChoiceTextVisible"); + _ChoiceCards.SendCustomNetworkEvent(NetworkEventTarget.Owner, "MakeChoiceTextVisible"); } [NetworkCallable] @@ -131,10 +128,7 @@ public class PlayerPodium : UdonSharpBehaviour public void LockInChoice() { _ChoiceCards.LockInChoice(); - NetworkCalling.SendCustomNetworkEvent( - (IUdonEventReceiver)_ChoiceCards, - NetworkEventTarget.All, - "MakeChoiceTextVisible"); + _ChoiceCards.SendCustomNetworkEvent(NetworkEventTarget.All, "MakeChoiceTextVisible"); } public bool VerifyMultipleChoiceResponse(int CorrectResponse) @@ -154,20 +148,14 @@ public class PlayerPodium : UdonSharpBehaviour { _RiskCards.gameObject.SetActive(Enable); _RiskCards.ResetCards(); - NetworkCalling.SendCustomNetworkEvent( - (IUdonEventReceiver)_RiskCards, - NetworkEventTarget.Owner, - "MakeRiskTextVisible"); + _RiskCards.SendCustomNetworkEvent(NetworkEventTarget.Owner, "MakeRiskTextVisible"); } [NetworkCallable] public void LockInRisk() { _RiskCards.LockInChoice(); - NetworkCalling.SendCustomNetworkEvent( - (IUdonEventReceiver)_RiskCards, - NetworkEventTarget.All, - "MakeRiskTextVisible"); + _RiskCards.SendCustomNetworkEvent(NetworkEventTarget.All, "MakeRiskTextVisible"); } [NetworkCallable]