ActualHorse/CarmenSandiego
1
0
Fork 0
Code Issues 9 Pull Requests Actions Packages Projects Releases Wiki Activity

- Jail call overlay no longer modifies the global material.

Browse Source 
- Jail player now disappears when round 2 is initialised or deinitialised.
- Phone box cover now syncs when closed automatically.
This commit is contained in:
ActualHorse
2026-05-16 01:19:10 -04:00
parent 1b167390cb
commit e7fa38058c
9 changed files with 188 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/UdonSharp/Door.cs
+2
View File
@@ -52,6 +52,8 @@ public class Door : UdonSharpBehaviour
public void CloseDoor()
{
Networking.SetOwner(Networking.LocalPlayer, gameObject);
_OpenDoor = false;
_OpenDoor_Synced();
RequestSerialization();
Assets/UdonSharp/Game Managers/GameManagerRound2.cs
+4
View File
@@ -77,6 +77,8 @@ public class GameManagerRound2 : GameManagerBase
_JailChain.Initialise();
_JailPhone.Initialise();
_JailPlayer.PlayVideo = false;
foreach (ArrivalDisplay Display in _ArrivalDisplays)
{
Display.Activate(true);
@@ -119,6 +121,8 @@ public class GameManagerRound2 : GameManagerBase
_JailPhone.Activate(false);
_JailChain.Show = false;
_JailPlayer.PlayVideo = false;
foreach (ArrivalDisplay Display in _ArrivalDisplays)
{
Display.Activate(false);
Assets/UdonSharp/JailPhone.asset
+4 -4
View File
@@ -245,25 +245,25 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _PhoneBoxCoverAnimator
Data: _PhoneBoxCover
- Name: $v
Entry: 7
Data: 16|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _PhoneBoxCoverAnimator
Data: _PhoneBoxCover
- Name: <UserType>k__BackingField
Entry: 7
Data: 17|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: UnityEngine.Animator, UnityEngine.AnimationModule
Data: Door, Assembly-CSharp
- Name:
Entry: 8
Data:
- Name: <SystemType>k__BackingField
Entry: 9
Data: 17
Data: 4
- Name: <SyncMode>k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
Assets/UdonSharp/JailPhone.cs
+5 -3
View File
@@ -14,7 +14,7 @@ public class JailPhone : UdonSharpBehaviour
[SerializeField] private PermissionsPanel _PermissionsPanel;
[Space]
[SerializeField] private VRCPickup _PhonePickup;
[SerializeField] private Animator _PhoneBoxCoverAnimator;
[SerializeField] private Door _PhoneBoxCover;
[UdonSynced] private bool _Active = false;
[UdonSynced] private string _CallRecipient = "";
@@ -33,6 +33,7 @@ public class JailPhone : UdonSharpBehaviour
public override void OnOwnershipTransferred(VRCPlayerApi Player)
{
Networking.SetOwner(Player, _PhonePickup.gameObject);
Networking.SetOwner(Player, _PhoneBoxCover.gameObject);
base.OnOwnershipTransferred(Player);
}
@@ -76,6 +77,9 @@ public class JailPhone : UdonSharpBehaviour
_CallRecipient = CallRecipient;
_Activate_Synced();
Networking.SetOwner(Networking.LocalPlayer, _PhoneBoxCover.gameObject);
_PhoneBoxCover.CloseDoor();
RequestSerialization();
}
}
@@ -91,8 +95,6 @@ public class JailPhone : UdonSharpBehaviour
{
_PhonePickup.transform.localPosition = Vector3.zero;
_PhonePickup.transform.localRotation = Quaternion.identity;
_PhoneBoxCoverAnimator.SetBool("Open", false);
}
}
Assets/UdonSharp/Overlay/JailCallOverlay.asset
+76 -22
View File
@@ -44,7 +44,7 @@ MonoBehaviour:
Data:
- Name:
Entry: 12
Data: 10
Data: 11
- Name:
Entry: 7
Data:
@@ -485,19 +485,19 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _CrookMaterial
Data: _OverlayMesh
- Name: $v
Entry: 7
Data: 31|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _CrookMaterial
Data: _OverlayMesh
- Name: <UserType>k__BackingField
Entry: 7
Data: 32|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: UnityEngine.Material, UnityEngine.CoreModule
Data: UnityEngine.MeshRenderer, UnityEngine.CoreModule
- Name:
Entry: 8
Data:
@@ -554,25 +554,19 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _CrookPortraits
Data: _CrookMaterialSlot
- Name: $v
Entry: 7
Data: 36|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _CrookPortraits
Data: _CrookMaterialSlot
- Name: <UserType>k__BackingField
Entry: 7
Data: 37|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: UnityEngine.Texture[], UnityEngine.CoreModule
- Name:
Entry: 8
Data:
Entry: 9
Data: 18
- Name: <SystemType>k__BackingField
Entry: 9
Data: 37
Data: 18
- Name: <SyncMode>k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@@ -587,13 +581,73 @@ MonoBehaviour:
Data: true
- Name: _fieldAttributes
Entry: 7
Data: 38|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
Data: 37|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 1
- Name:
Entry: 7
Data: 38|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: _CrookPortraits
- Name: $v
Entry: 7
Data: 39|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _CrookPortraits
- Name: <UserType>k__BackingField
Entry: 7
Data: 40|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: UnityEngine.Texture[], UnityEngine.CoreModule
- Name:
Entry: 8
Data:
- Name: <SystemType>k__BackingField
Entry: 9
Data: 40
- 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: 41|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 2
- Name:
Entry: 7
Data: 39|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
Data: 42|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
- Name: height
Entry: 4
Data: 8
@@ -602,7 +656,7 @@ MonoBehaviour:
Data:
- Name:
Entry: 7
Data: 40|UnityEngine.SerializeField, UnityEngine.CoreModule
Data: 43|UnityEngine.SerializeField, UnityEngine.CoreModule
- Name:
Entry: 8
Data:
@@ -626,13 +680,13 @@ MonoBehaviour:
Data: _AccusedCrook
- Name: $v
Entry: 7
Data: 41|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
Data: 44|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _AccusedCrook
- Name: <UserType>k__BackingField
Entry: 7
Data: 42|System.RuntimeType, mscorlib
Data: 45|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: AccusedCrook, Assembly-CSharp
@@ -656,13 +710,13 @@ MonoBehaviour:
Data: false
- Name: _fieldAttributes
Entry: 7
Data: 43|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
Data: 46|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 1
- Name:
Entry: 7
Data: 44|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
Data: 47|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
- Name:
Entry: 8
Data:
Assets/UdonSharp/Overlay/JailCallOverlay.cs
+3 -2
View File
@@ -11,7 +11,8 @@ using VRC.Udon.Common;
public class JailCallOverlay : CameraOverlay
{
[Space]
[SerializeField] private Material _CrookMaterial;
[SerializeField] private MeshRenderer _OverlayMesh;
[SerializeField] private int _CrookMaterialSlot;
[Space]
[SerializeField] private Texture[] _CrookPortraits;
@@ -36,7 +37,7 @@ public class JailCallOverlay : CameraOverlay
int Crook = (int)_AccusedCrook;
if (Crook >= 0 && Crook < _CrookPortraits.Length)
{
_CrookMaterial.SetTexture("_MainTex", _CrookPortraits[Crook]);
_OverlayMesh.materials[_CrookMaterialSlot].mainTexture = _CrookPortraits[Crook];
}
}
}