diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound3.cs b/Assets/UdonSharp/Game Managers/GameManagerRound3.cs index 4344cfe..aa61e33 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound3.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound3.cs @@ -1,7 +1,6 @@  using UdonSharp; using UnityEngine; -using UnityEngine.Video; using VRC.SDK3.Data; using VRC.SDK3.UdonNetworkCalling; using VRC.SDKBase; diff --git a/Assets/UdonSharp/MissingPoster.asset b/Assets/UdonSharp/MissingPoster.asset index 78d7357..9477b79 100644 --- a/Assets/UdonSharp/MissingPoster.asset +++ b/Assets/UdonSharp/MissingPoster.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 7 + Data: 6 - Name: Entry: 7 Data: @@ -299,70 +299,10 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _LootImageURL + Data: _Name - Name: $v Entry: 7 Data: 19|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _LootImageURL - - Name: k__BackingField - Entry: 7 - Data: 20|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: VRC.SDKBase.VRCUrl, VRCSDKBase - - 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: 21|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 22|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: _Name - - Name: $v - Entry: 7 - Data: 23|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _Name @@ -386,13 +326,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 24|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 20|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 25|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 21|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -416,13 +356,13 @@ MonoBehaviour: Data: _PortraitMaterial - Name: $v Entry: 7 - Data: 26|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 22|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _PortraitMaterial - Name: k__BackingField Entry: 7 - Data: 27|System.RuntimeType, mscorlib + Data: 23|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.Material, UnityEngine.CoreModule @@ -431,7 +371,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 27 + Data: 23 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -446,7 +386,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 28|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 24|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 diff --git a/Assets/UdonSharp/MissingPoster.cs b/Assets/UdonSharp/MissingPoster.cs index afb7d76..064c583 100644 --- a/Assets/UdonSharp/MissingPoster.cs +++ b/Assets/UdonSharp/MissingPoster.cs @@ -2,8 +2,6 @@ using TMPro; using UdonSharp; using UnityEngine; -using VRC.SDK3.Image; -using VRC.SDKBase; using VRC.Udon.Common; @@ -16,7 +14,6 @@ public class MissingPoster : UdonSharpBehaviour [SerializeField] private Texture _DefaultPortrait; [SerializeField] private string _DefaultLootName; - [UdonSynced] private VRCUrl _LootImageURL; [UdonSynced] private string _Name = ""; private Material _PortraitMaterial = null; diff --git a/Assets/UdonSharp/WantedPoster.cs b/Assets/UdonSharp/WantedPoster.cs index e8280eb..10ccc64 100644 --- a/Assets/UdonSharp/WantedPoster.cs +++ b/Assets/UdonSharp/WantedPoster.cs @@ -2,8 +2,6 @@ using TMPro; using UdonSharp; using UnityEngine; -using VRC.SDKBase; -using VRC.Udon; using VRC.Udon.Common; @@ -54,7 +52,7 @@ public class WantedPoster : UdonSharpBehaviour private void _ApplyNewConfiguration() { - if (_SelectedCrook == (int)AccusedCrook.INDEX_MAX) + if (_SelectedCrook >= (int)AccusedCrook.INDEX_MAX) { _PortraitMaterial.SetTexture("_MainTex", _DefaultPortrait); _RewardText.text = "Reward: " + _DefaultReward;