From 06e078f5931aac2da63646bd56afd8beb09ce16e Mon Sep 17 00:00:00 2001 From: Jamie Greunbaum Date: Tue, 27 May 2025 03:33:12 -0400 Subject: [PATCH] Buzz-in system has been fully implemented. --- Assets/Audio/SFX/Buzzer.wav | Bin 0 -> 36272 bytes Assets/Audio/SFX/Buzzer.wav.meta | 23 + Assets/Materials/BuzzedInPodiumOutline.mat | 83 ++ .../Materials/BuzzedInPodiumOutline.mat.meta | 8 + Assets/Prefabs/Player Podium.prefab | 1039 ++--------------- Assets/Scenes/witwics.unity | 311 ++++- Assets/UdonSharp/Buzzer.cs | 6 +- Assets/UdonSharp/GameManager.asset | 356 +++--- Assets/UdonSharp/GameManager.cs | 138 +-- Assets/UdonSharp/PlayerPodium.asset | 113 +- Assets/UdonSharp/PlayerPodium.cs | 39 +- Packages/vpm-manifest.json | 33 +- Poi.Tools.csproj | 8 +- Thry/Config.json | 2 +- Thry/presets_known_materials.txt | 1 + ThryAssemblyDefinition.csproj | 8 +- UdonSharp.Editor.csproj | 8 +- UdonSharp.Lib.csproj | 8 +- UdonSharp.Runtime.csproj | 8 +- UniTask.Addressables.csproj | 8 +- UniTask.DOTween.csproj | 8 +- UniTask.Editor.csproj | 8 +- UniTask.Linq.csproj | 8 +- UniTask.TextMeshPro.csproj | 8 +- UniTask.csproj | 8 +- UnityEditorTests.csproj | 8 +- VRC.ClientSim.Editor.csproj | 8 +- VRC.ClientSim.csproj | 11 +- VRC.ExampleCentral.Editor.csproj | 8 +- VRC.SDK3.Editor.csproj | 8 +- VRC.SDK3.csproj | 8 +- VRC.SDKBase.Editor.BuildPipeline.csproj | 8 +- VRC.SDKBase.Editor.ShaderStripping.csproj | 8 +- VRC.SDKBase.Editor.csproj | 11 +- VRC.SDKBase.csproj | 18 +- VRC.Udon.Editor.csproj | 8 +- VRC.Udon.Serialization.OdinSerializer.csproj | 8 +- VRC.Udon.csproj | 8 +- VRWorldToolkit.Editor.csproj | 8 +- com.vrchat.core.vpm-resolver.Editor.csproj | 8 +- vrchat.jordo.easyquestswitch.Editor.csproj | 8 +- vrchat.jordo.easyquestswitch.csproj | 8 +- 42 files changed, 988 insertions(+), 1404 deletions(-) create mode 100644 Assets/Audio/SFX/Buzzer.wav create mode 100644 Assets/Audio/SFX/Buzzer.wav.meta create mode 100644 Assets/Materials/BuzzedInPodiumOutline.mat create mode 100644 Assets/Materials/BuzzedInPodiumOutline.mat.meta diff --git a/Assets/Audio/SFX/Buzzer.wav b/Assets/Audio/SFX/Buzzer.wav new file mode 100644 index 0000000000000000000000000000000000000000..2938eaa84021b4c831e50f13ddfa07e085a77fef GIT binary patch literal 36272 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 Entry: 1 Data: WhereInTheWorld @@ -209,10 +215,16 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 12|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 + Data: 1 + - Name: + Entry: 7 + Data: 14|UnityEngine.SerializeField, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: - Name: Entry: 13 Data: @@ -231,63 +243,69 @@ MonoBehaviour: - Name: $k Entry: 1 Data: RockapellaIdent - - Name: $v - Entry: 7 - Data: 13|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: RockapellaIdent - - Name: k__BackingField - Entry: 9 - Data: 8 - - Name: k__BackingField - Entry: 9 - Data: 8 - - 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: true - - Name: _fieldAttributes - Entry: 7 - Data: 14|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: MusicPlayer - Name: $v Entry: 7 Data: 15|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: RockapellaIdent + - Name: k__BackingField + Entry: 9 + Data: 8 + - Name: k__BackingField + Entry: 9 + Data: 8 + - 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: true + - Name: _fieldAttributes + Entry: 7 + Data: 16|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 17|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: MusicPlayer + - Name: $v + Entry: 7 + Data: 18|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: MusicPlayer - Name: k__BackingField Entry: 7 - Data: 16|System.RuntimeType, mscorlib + Data: 19|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.AudioSource, UnityEngine.AudioModule @@ -296,7 +314,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 16 + Data: 19 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -311,79 +329,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 17|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 20|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: _MusicEvent - - Name: $v - Entry: 7 - Data: 18|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _MusicEvent - - Name: k__BackingField - Entry: 7 - Data: 19|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: MusicEventType, Assembly-CSharp - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 7 - Data: 20|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: System.Int32, mscorlib - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 7 - Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - - Name: - Entry: 3 Data: 1 - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 5 - Data: false - - Name: _fieldAttributes Entry: 7 - Data: 21|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 2 - - Name: - Entry: 7 - Data: 22|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 23|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: 21|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -407,16 +359,16 @@ MonoBehaviour: Data: SFXPlayer - Name: $v Entry: 7 - Data: 24|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 22|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: SFXPlayer - Name: k__BackingField Entry: 9 - Data: 16 + Data: 19 - Name: k__BackingField Entry: 9 - Data: 16 + Data: 19 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -431,73 +383,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 25|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 23|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: _SFXEvent - - Name: $v - Entry: 7 - Data: 26|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _SFXEvent - - Name: k__BackingField - Entry: 7 - Data: 27|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: SFXEventType, Assembly-CSharp - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 9 - Data: 20 - - Name: k__BackingField - Entry: 7 - Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - - Name: - Entry: 3 Data: 1 - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 5 - Data: false - - Name: _fieldAttributes Entry: 7 - Data: 28|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 2 - - Name: - Entry: 7 - Data: 29|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 30|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: 24|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -521,13 +413,13 @@ MonoBehaviour: Data: BuzzInAllowed - Name: $v Entry: 7 - Data: 31|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 25|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: BuzzInAllowed - Name: k__BackingField Entry: 7 - Data: 32|System.RuntimeType, mscorlib + Data: 26|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Boolean, mscorlib @@ -536,7 +428,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 32 + Data: 26 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -551,13 +443,73 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 33|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: 34|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 28|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: PlayerBuzzInAllowed + - Name: $v + Entry: 7 + Data: 29|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: PlayerBuzzInAllowed + - Name: k__BackingField + Entry: 7 + Data: 30|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Boolean[], mscorlib + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 30 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 3 + Data: 1 + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 31|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 32|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -581,16 +533,22 @@ MonoBehaviour: Data: _BuzzedInPlayer - Name: $v Entry: 7 - Data: 35|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 33|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _BuzzedInPlayer - Name: k__BackingField - Entry: 9 - Data: 20 + Entry: 7 + Data: 34|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Int32, mscorlib + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 9 - Data: 20 + Data: 34 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -605,13 +563,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 36|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 35|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 37|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 36|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: diff --git a/Assets/UdonSharp/GameManager.cs b/Assets/UdonSharp/GameManager.cs index 5bd151d..35ddaba 100644 --- a/Assets/UdonSharp/GameManager.cs +++ b/Assets/UdonSharp/GameManager.cs @@ -1,12 +1,13 @@  using UdonSharp; using UnityEngine; +using VRC.SDK3.UdonNetworkCalling; +using VRC.Udon.Common.Interfaces; using VRC.SDKBase; -using VRC.Udon; +using System.Linq; public enum MusicEventType { - INTERNAL = -1, None, WhereInTheWorld, RockapellaIdent @@ -14,7 +15,6 @@ public enum MusicEventType public enum SFXEventType { - INTERNAL = -1, None, Buzzer } @@ -26,112 +26,102 @@ public class GameManager : UdonSharpBehaviour public PlayerPodium[] PlayerPodiums; [Header("Audio")] - public AudioClip BuzzerSound = null; + [SerializeField] private AudioClip BuzzerSound = null; - public AudioClip WhereInTheWorld = null; - public AudioClip RockapellaIdent = null; + [SerializeField] private AudioClip WhereInTheWorld = null; + [SerializeField] private AudioClip RockapellaIdent = null; - public AudioSource MusicPlayer = null; - [UdonSynced, FieldChangeCallback(nameof(MusicEvent))] private MusicEventType _MusicEvent = MusicEventType.None; - - public AudioSource SFXPlayer = null; - [UdonSynced, FieldChangeCallback(nameof(SFXEvent))] private SFXEventType _SFXEvent = SFXEventType.None; + [SerializeField] private AudioSource MusicPlayer = null; + [SerializeField] private AudioSource SFXPlayer = null; [UdonSynced] private bool BuzzInAllowed = true; - [UdonSynced] private int _BuzzedInPlayer = 0; + [UdonSynced] private bool[] PlayerBuzzInAllowed; + [UdonSynced] private int _BuzzedInPlayer = -1; + + void Start() + { + PlayerBuzzInAllowed = new bool[PlayerPodiums.Length]; + } + [NetworkCallable] public void PlayerBuzzedIn(int PlayerNumber) { - if (!BuzzInAllowed) { return; } + int PlayerIndex = PlayerNumber - 1; + if (!BuzzInAllowed || !PlayerBuzzInAllowed[PlayerIndex]) { return; } + // Prevent new buzz-ins and store which player is currently buzzed in. BuzzInAllowed = false; + PlayerBuzzInAllowed[PlayerIndex] = false; _BuzzedInPlayer = PlayerNumber; - SFXEvent = SFXEventType.Buzzer; RequestSerialization(); - PlayerPodiums[PlayerNumber - 1].IncreaseScoreBy10(); - PlayerPodiums[PlayerNumber - 1].RequestSerialization(); + NetworkCalling.SendCustomNetworkEvent( + (IUdonEventReceiver)PlayerPodiums[PlayerIndex], + NetworkEventTarget.All, + "EnableBuzzInEffect", true); + + // Play the buzzer sound globally. + SendCustomNetworkEvent(NetworkEventTarget.All, nameof(PlaySFX), SFXEventType.Buzzer); } - public void CancelBuzzIn() { + public void CancelPlayerBuzzIn() { BuzzInAllowed = true; - _BuzzedInPlayer = 0; + NetworkCalling.SendCustomNetworkEvent( + (IUdonEventReceiver)PlayerPodiums[_BuzzedInPlayer - 1], + NetworkEventTarget.All, + "EnableBuzzInEffect", false); + _BuzzedInPlayer = -1; RequestSerialization(); } - public void StartGame() + public void ResetBuzzers() { - for (int i = 0; i < PlayerPodiums.Length; i++) - { - Networking.SetOwner(Networking.InstanceOwner, PlayerPodiums[i].gameObject); - - } - - PlayerPodiums[0].IncreaseScoreBy10(); - PlayerPodiums[0].RequestSerialization(); - - PlayerPodiums[1].IncreaseScoreBy5(); - PlayerPodiums[1].RequestSerialization(); - - PlayerPodiums[2].DecreaseScoreBy5(); - PlayerPodiums[2].RequestSerialization(); + BuzzInAllowed = true; + for (int i = 0; i < PlayerPodiums.Length; i++) { PlayerBuzzInAllowed[i] = true; } + _BuzzedInPlayer = -1; } public void PlayWhereInTheWorld() { - MusicEvent = MusicEventType.WhereInTheWorld; + SendCustomNetworkEvent(NetworkEventTarget.All, nameof(PlayMusic), MusicEventType.WhereInTheWorld); } public void PlayRockapellaIdent() { - MusicEvent = MusicEventType.RockapellaIdent; + SendCustomNetworkEvent(NetworkEventTarget.All, nameof(PlayMusic), MusicEventType.RockapellaIdent); + } + + [NetworkCallable] + public void PlayMusic(MusicEventType MusicEvent) + { + MusicPlayer.Stop(); + + switch (MusicEvent) + { + case MusicEventType.WhereInTheWorld: MusicPlayer.clip = WhereInTheWorld; break; + case MusicEventType.RockapellaIdent: MusicPlayer.clip = RockapellaIdent; break; + default: MusicPlayer.clip = null; break; + } + + if (MusicPlayer.clip != null) + MusicPlayer.Play(); } - public MusicEventType MusicEvent + [NetworkCallable] + public void PlaySFX(SFXEventType SFXEvent) { - set + SFXPlayer.Stop(); + + switch (SFXEvent) { - _MusicEvent = value; - - MusicPlayer.Stop(); - - switch(_MusicEvent) - { - case MusicEventType.WhereInTheWorld: MusicPlayer.clip = WhereInTheWorld; break; - case MusicEventType.RockapellaIdent: MusicPlayer.clip = RockapellaIdent; break; - default: break; - } - - if (_MusicEvent != MusicEventType.None) - MusicPlayer.Play(); - - RequestSerialization(); + case SFXEventType.Buzzer: SFXPlayer.clip = BuzzerSound; break; + default: SFXPlayer.clip = null; break; } - get => _MusicEvent; - } - public SFXEventType SFXEvent - { - set - { - _SFXEvent = value; - - SFXPlayer.Stop(); - - switch (_SFXEvent) - { - case SFXEventType.Buzzer: SFXPlayer.clip = BuzzerSound; break; - default: break; - } - - if (_SFXEvent != SFXEventType.None) - SFXPlayer.Play(); - - RequestSerialization(); - } - get => _SFXEvent; + if (SFXPlayer.clip != null) + SFXPlayer.Play(); } } diff --git a/Assets/UdonSharp/PlayerPodium.asset b/Assets/UdonSharp/PlayerPodium.asset index 9f219b0..0a811c6 100644 --- a/Assets/UdonSharp/PlayerPodium.asset +++ b/Assets/UdonSharp/PlayerPodium.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 7 + Data: 8 - Name: Entry: 7 Data: @@ -230,13 +230,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: PlayerID + Data: _PlayerID - Name: $v Entry: 7 Data: 14|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: PlayerID + Data: _PlayerID - Name: k__BackingField Entry: 9 Data: 3 @@ -254,7 +254,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 5 - Data: true + Data: false - Name: _fieldAttributes Entry: 7 Data: 15|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib @@ -344,19 +344,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: Nameplate + Data: _BuzzedInEffect - Name: $v Entry: 7 Data: 21|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: Nameplate + Data: _BuzzedInEffect - Name: k__BackingField Entry: 7 Data: 22|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: TMPro.TextMeshProUGUI, Unity.TextMeshPro + Data: UnityEngine.GameObject, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -380,7 +380,22 @@ MonoBehaviour: Data: 23|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 0 + Data: 2 + - Name: + Entry: 7 + Data: 24|UnityEngine.HeaderAttribute, UnityEngine.CoreModule + - Name: header + Entry: 1 + Data: Effects + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 25|UnityEngine.SerializeField, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: - Name: Entry: 13 Data: @@ -398,19 +413,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: Scorecard + Data: _Nameplate - Name: $v Entry: 7 - Data: 24|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 26|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: Scorecard + Data: _Nameplate - Name: k__BackingField - Entry: 9 - Data: 22 + Entry: 7 + Data: 27|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: TMPro.TextMeshProUGUI, Unity.TextMeshPro + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 9 - Data: 22 + Data: 27 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -425,10 +446,70 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 25|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 28|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 0 + Data: 1 + - Name: + Entry: 7 + Data: 29|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: _Scorecard + - Name: $v + Entry: 7 + Data: 30|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _Scorecard + - Name: k__BackingField + Entry: 9 + Data: 27 + - Name: k__BackingField + Entry: 9 + Data: 27 + - 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: true + - Name: _fieldAttributes + Entry: 7 + Data: 31|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 32|UnityEngine.SerializeField, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: - Name: Entry: 13 Data: diff --git a/Assets/UdonSharp/PlayerPodium.cs b/Assets/UdonSharp/PlayerPodium.cs index 38eb5be..59a42e3 100644 --- a/Assets/UdonSharp/PlayerPodium.cs +++ b/Assets/UdonSharp/PlayerPodium.cs @@ -1,10 +1,9 @@  using UdonSharp; -using UnityEngine; using VRC.SDKBase; -using VRC.Udon; +using VRC.SDK3.UdonNetworkCalling; using TMPro; -using VRC.SDK3.Components; +using UnityEngine; [UdonBehaviourSyncMode(BehaviourSyncMode.Manual)] public class PlayerPodium : UdonSharpBehaviour @@ -14,11 +13,14 @@ public class PlayerPodium : UdonSharpBehaviour public GameManager GameManager; [UdonSynced, FieldChangeCallback(nameof(PlayerName))] private string _PlayerName = "Player"; - [UdonSynced] public int PlayerID = -1; + [UdonSynced] private int _PlayerID = -1; [UdonSynced, FieldChangeCallback(nameof(PlayerScore))] private int _PlayerScore = 50; - public TextMeshProUGUI Nameplate; - public TextMeshProUGUI Scorecard; + [Header("Effects")] + [SerializeField] private GameObject _BuzzedInEffect; + + [SerializeField] private TextMeshProUGUI _Nameplate; + [SerializeField] private TextMeshProUGUI _Scorecard; void Start() { @@ -28,16 +30,15 @@ public class PlayerPodium : UdonSharpBehaviour public void SetPlayerName() { - if (PlayerID != -1) { return; } + if (_PlayerID != -1) { return; } Networking.SetOwner(Networking.LocalPlayer, gameObject); PlayerName = Networking.LocalPlayer.displayName; - PlayerID = Networking.LocalPlayer.playerId; + _PlayerID = Networking.LocalPlayer.playerId; + RequestSerialization(); } - public void BuzzIn() - { - GameManager.PlayerBuzzedIn(PlayerNumber); - } + public int GetPlayerID() { return _PlayerID; } + public void DecreaseScoreBy5() { @@ -49,20 +50,26 @@ public class PlayerPodium : UdonSharpBehaviour PlayerScore += 5; } + [NetworkCallable] public void IncreaseScoreBy10() { PlayerScore += 10; } + [NetworkCallable] + public void EnableBuzzInEffect(bool Enable) + { + _BuzzedInEffect.SetActive(Enable); + } + + public string PlayerName { set { _PlayerName = value; - Nameplate.text = value; - - RequestSerialization(); + _Nameplate.text = value; } get => _PlayerName; } @@ -72,7 +79,7 @@ public class PlayerPodium : UdonSharpBehaviour set { _PlayerScore = value; - Scorecard.text = PlayerScore.ToString(); + _Scorecard.text = PlayerScore.ToString(); RequestSerialization(); } get => _PlayerScore; diff --git a/Packages/vpm-manifest.json b/Packages/vpm-manifest.json index 65a0a71..f65686f 100644 --- a/Packages/vpm-manifest.json +++ b/Packages/vpm-manifest.json @@ -6,12 +6,6 @@ "vrchat.jordo.easyquestswitch": { "version": "1.4.0" }, - "com.vrchat.base": { - "version": "3.8.0" - }, - "com.vrchat.worlds": { - "version": "3.8.0" - }, "dev.onevr.vrworldtoolkit": { "version": "3.2.1" }, @@ -19,7 +13,10 @@ "version": "1.5.0" }, "com.poiyomi.toon": { - "version": "9.2.40" + "version": "9.2.41" + }, + "com.vrchat.worlds": { + "version": "3.8.1" } }, "locked": { @@ -31,16 +28,6 @@ "version": "1.4.0", "dependencies": {} }, - "com.vrchat.base": { - "version": "3.8.0", - "dependencies": {} - }, - "com.vrchat.worlds": { - "version": "3.8.0", - "dependencies": { - "com.vrchat.base": "3.8.0" - } - }, "dev.onevr.vrworldtoolkit": { "version": "3.2.1", "dependencies": {} @@ -52,7 +39,17 @@ } }, "com.poiyomi.toon": { - "version": "9.2.40", + "version": "9.2.41", + "dependencies": {} + }, + "com.vrchat.worlds": { + "version": "3.8.1", + "dependencies": { + "com.vrchat.base": "3.8.1" + } + }, + "com.vrchat.base": { + "version": "3.8.1", "dependencies": {} } } diff --git a/Poi.Tools.csproj b/Poi.Tools.csproj index 6b2a38b..b6a9c14 100644 --- a/Poi.Tools.csproj +++ b/Poi.Tools.csproj @@ -1149,14 +1149,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/Thry/Config.json b/Thry/Config.json index af280b6..4318429 100644 --- a/Thry/Config.json +++ b/Thry/Config.json @@ -1,6 +1,6 @@ { "lastVersion": { - "_stringValue": "2.64.0" + "_stringValue": "2.64.1" }, "loggingLevel": 1, "default_texture_type": 0, diff --git a/Thry/presets_known_materials.txt b/Thry/presets_known_materials.txt index d4e6a7a..ed0a33c 100644 --- a/Thry/presets_known_materials.txt +++ b/Thry/presets_known_materials.txt @@ -353,3 +353,4 @@ a6c1d9564b56ecd47b82dfa7a8f11cbe d419d3432b8a0a24b986e614c57c2039 21221da753878694b9b9518a540dda85 70108d78e82c2ec488d6b504865508e0 +d93ea6d5213349a4aa01b00d77edba61 diff --git a/ThryAssemblyDefinition.csproj b/ThryAssemblyDefinition.csproj index 30de29b..043956c 100644 --- a/ThryAssemblyDefinition.csproj +++ b/ThryAssemblyDefinition.csproj @@ -1249,14 +1249,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/UdonSharp.Editor.csproj b/UdonSharp.Editor.csproj index 835468e..ac6db56 100644 --- a/UdonSharp.Editor.csproj +++ b/UdonSharp.Editor.csproj @@ -1121,14 +1121,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/UdonSharp.Lib.csproj b/UdonSharp.Lib.csproj index fdd42af..474574e 100644 --- a/UdonSharp.Lib.csproj +++ b/UdonSharp.Lib.csproj @@ -1121,14 +1121,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + diff --git a/UdonSharp.Runtime.csproj b/UdonSharp.Runtime.csproj index 62564ab..ba74349 100644 --- a/UdonSharp.Runtime.csproj +++ b/UdonSharp.Runtime.csproj @@ -1127,14 +1127,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + diff --git a/UniTask.Addressables.csproj b/UniTask.Addressables.csproj index bae8e93..fb0f47b 100644 --- a/UniTask.Addressables.csproj +++ b/UniTask.Addressables.csproj @@ -1118,14 +1118,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + diff --git a/UniTask.DOTween.csproj b/UniTask.DOTween.csproj index 478d57b..dabbbec 100644 --- a/UniTask.DOTween.csproj +++ b/UniTask.DOTween.csproj @@ -1118,14 +1118,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + diff --git a/UniTask.Editor.csproj b/UniTask.Editor.csproj index a39cffe..473d503 100644 --- a/UniTask.Editor.csproj +++ b/UniTask.Editor.csproj @@ -1128,14 +1128,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/UniTask.Linq.csproj b/UniTask.Linq.csproj index d608348..fd7ad68 100644 --- a/UniTask.Linq.csproj +++ b/UniTask.Linq.csproj @@ -1189,14 +1189,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + diff --git a/UniTask.TextMeshPro.csproj b/UniTask.TextMeshPro.csproj index 8de78ee..cc5e8cf 100644 --- a/UniTask.TextMeshPro.csproj +++ b/UniTask.TextMeshPro.csproj @@ -1123,14 +1123,14 @@ Library\ScriptAssemblies\Unity.TextMeshPro.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + diff --git a/UniTask.csproj b/UniTask.csproj index ff2c404..c1c2d15 100644 --- a/UniTask.csproj +++ b/UniTask.csproj @@ -1189,14 +1189,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + diff --git a/UnityEditorTests.csproj b/UnityEditorTests.csproj index fd56b97..f57b82f 100644 --- a/UnityEditorTests.csproj +++ b/UnityEditorTests.csproj @@ -990,14 +990,14 @@ Library\ScriptAssemblies\UnityEditor.TestRunner.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + diff --git a/VRC.ClientSim.Editor.csproj b/VRC.ClientSim.Editor.csproj index 20834b5..2cc0fd2 100644 --- a/VRC.ClientSim.Editor.csproj +++ b/VRC.ClientSim.Editor.csproj @@ -1159,14 +1159,14 @@ Library\ScriptAssemblies\Unity.InputSystem.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/VRC.ClientSim.csproj b/VRC.ClientSim.csproj index 6bf3faa..c4619f3 100644 --- a/VRC.ClientSim.csproj +++ b/VRC.ClientSim.csproj @@ -65,7 +65,6 @@ - @@ -138,6 +137,7 @@ + @@ -166,6 +166,7 @@ + @@ -1263,14 +1264,14 @@ Library\ScriptAssemblies\Unity.InputSystem.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + diff --git a/VRC.ExampleCentral.Editor.csproj b/VRC.ExampleCentral.Editor.csproj index 73b783a..c33d7fd 100644 --- a/VRC.ExampleCentral.Editor.csproj +++ b/VRC.ExampleCentral.Editor.csproj @@ -1138,14 +1138,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/VRC.SDK3.Editor.csproj b/VRC.SDK3.Editor.csproj index 088871a..e8c1069 100644 --- a/VRC.SDK3.Editor.csproj +++ b/VRC.SDK3.Editor.csproj @@ -1181,14 +1181,14 @@ Library\ScriptAssemblies\Unity.TextMeshPro.Editor.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/VRC.SDK3.csproj b/VRC.SDK3.csproj index 66ee270..80863e5 100644 --- a/VRC.SDK3.csproj +++ b/VRC.SDK3.csproj @@ -1149,14 +1149,14 @@ Library\ScriptAssemblies\Cinemachine.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + diff --git a/VRC.SDKBase.Editor.BuildPipeline.csproj b/VRC.SDKBase.Editor.BuildPipeline.csproj index 29cfdf4..ed626b7 100644 --- a/VRC.SDKBase.Editor.BuildPipeline.csproj +++ b/VRC.SDKBase.Editor.BuildPipeline.csproj @@ -1118,14 +1118,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + diff --git a/VRC.SDKBase.Editor.ShaderStripping.csproj b/VRC.SDKBase.Editor.ShaderStripping.csproj index 208cd12..76e0eff 100644 --- a/VRC.SDKBase.Editor.ShaderStripping.csproj +++ b/VRC.SDKBase.Editor.ShaderStripping.csproj @@ -1127,14 +1127,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/VRC.SDKBase.Editor.csproj b/VRC.SDKBase.Editor.csproj index 281c2bc..221ccd3 100644 --- a/VRC.SDKBase.Editor.csproj +++ b/VRC.SDKBase.Editor.csproj @@ -84,6 +84,7 @@ + @@ -111,6 +112,7 @@ + @@ -123,6 +125,7 @@ + @@ -1255,14 +1258,14 @@ Library\ScriptAssemblies\Unity.XR.Oculus.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/VRC.SDKBase.csproj b/VRC.SDKBase.csproj index 15e61ca..457487c 100644 --- a/VRC.SDKBase.csproj +++ b/VRC.SDKBase.csproj @@ -67,6 +67,7 @@ + @@ -83,21 +84,28 @@ + + + + + + + @@ -108,12 +116,14 @@ + + @@ -1175,14 +1185,14 @@ Library\ScriptAssemblies\Unity.Timeline.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + diff --git a/VRC.Udon.Editor.csproj b/VRC.Udon.Editor.csproj index 2a48698..a9bee13 100644 --- a/VRC.Udon.Editor.csproj +++ b/VRC.Udon.Editor.csproj @@ -1206,14 +1206,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/VRC.Udon.Serialization.OdinSerializer.csproj b/VRC.Udon.Serialization.OdinSerializer.csproj index dea0bb8..c19e98a 100644 --- a/VRC.Udon.Serialization.OdinSerializer.csproj +++ b/VRC.Udon.Serialization.OdinSerializer.csproj @@ -1305,14 +1305,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + diff --git a/VRC.Udon.csproj b/VRC.Udon.csproj index 6252443..48b5212 100644 --- a/VRC.Udon.csproj +++ b/VRC.Udon.csproj @@ -1143,14 +1143,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + diff --git a/VRWorldToolkit.Editor.csproj b/VRWorldToolkit.Editor.csproj index 6586dc2..c8493d8 100644 --- a/VRWorldToolkit.Editor.csproj +++ b/VRWorldToolkit.Editor.csproj @@ -1146,14 +1146,14 @@ Library\ScriptAssemblies\Unity.Postprocessing.Runtime.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/com.vrchat.core.vpm-resolver.Editor.csproj b/com.vrchat.core.vpm-resolver.Editor.csproj index ee65efd..7071a0e 100644 --- a/com.vrchat.core.vpm-resolver.Editor.csproj +++ b/com.vrchat.core.vpm-resolver.Editor.csproj @@ -1142,14 +1142,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/vrchat.jordo.easyquestswitch.Editor.csproj b/vrchat.jordo.easyquestswitch.Editor.csproj index 436bfe1..efa55bb 100644 --- a/vrchat.jordo.easyquestswitch.Editor.csproj +++ b/vrchat.jordo.easyquestswitch.Editor.csproj @@ -1129,14 +1129,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/vrchat.jordo.easyquestswitch.csproj b/vrchat.jordo.easyquestswitch.csproj index 8c0c6db..5925cbf 100644 --- a/vrchat.jordo.easyquestswitch.csproj +++ b/vrchat.jordo.easyquestswitch.csproj @@ -1151,14 +1151,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False +