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

- Removed final remnants of LightSync from the project.

Browse Source 
- Fixed jail chain potentially calling a GameManager function on all clients.
This commit is contained in:
ActualHorse
2026-06-05 15:02:18 -04:00
parent 13df56eb89
commit 5bb080d546
16 changed files with 5600 additions and 8503 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/UdonSharp/Cameras/CameraAutoLevel.asset
+13 -13
View File
@@ -50,31 +50,25 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: Camera
Data: _Camera
- Name: $v
Entry: 7
Data: 2|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: Camera
Data: _Camera
- Name: <UserType>k__BackingField
Entry: 7
Data: 3|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: MMMaellon.LightSync.LightSync, com.mmmaellon.lightsync
Data: VRC.SDK3.Components.VRCObjectSync, VRCSDK3
- Name:
Entry: 8
Data:
- Name: <SystemType>k__BackingField
Entry: 7
Data: 4|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: VRC.Udon.UdonBehaviour, VRC.Udon
- Name:
Entry: 8
Data:
Entry: 9
Data: 3
- Name: <SyncMode>k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@@ -89,10 +83,16 @@ MonoBehaviour:
Data: true
- Name: _fieldAttributes
Entry: 7
Data: 5|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
Data: 4|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 0
Data: 1
- Name:
Entry: 7
Data: 5|UnityEngine.SerializeField, UnityEngine.CoreModule
- Name:
Entry: 8
Data:
- Name:
Entry: 13
Data:
Assets/UdonSharp/Cameras/CameraAutoLevel.cs
+8 -9
View File
@@ -1,25 +1,24 @@
using MMMaellon.LightSync;
using UdonSharp;
using UnityEngine;
using VRC.SDK3.Components;
using VRC.SDKBase;
using VRC.Udon;
[UdonBehaviourSyncMode(BehaviourSyncMode.Manual)]
public class CameraAutoLevel : UdonSharpBehaviour
{
public LightSync Camera;
[SerializeField] private VRCObjectSync _Camera;
public override void Interact()
{
if (Utilities.IsValid(Camera))
if (Utilities.IsValid(_Camera))
{
Vector3 oldRotation = Camera.gameObject.transform.eulerAngles;
Camera.TeleportToWorldSpace(
Camera.gameObject.transform.position,
Quaternion.Euler(oldRotation.x, oldRotation.y, 0.0f),
true);
Transform TeleportLocation = _Camera.transform;
Vector3 oldRotation = TeleportLocation.eulerAngles;
TeleportLocation.eulerAngles = new Vector3(oldRotation.x, oldRotation.y, 0.0f);
_Camera.TeleportTo(TeleportLocation);
}
}
}
Assets/UdonSharp/JailChain.cs
+6 -7
View File
@@ -2,6 +2,7 @@
using UdonSharp;
using UnityEngine;
using VRC.SDK3.Components;
using VRC.SDKBase;
using VRC.Udon.Common.Interfaces;
@@ -29,7 +30,7 @@ public class JailChain : UdonSharpBehaviour
{
if (_PullChain)
{
if (!_HasBeenActivated && transform.localPosition.z < _PullTarget.transform.localPosition.z)
if (Networking.IsOwner(gameObject) && !_HasBeenActivated && _Pickup.transform.localPosition.z < _PullTarget.transform.localPosition.z)
{
_HasBeenActivated = true;
RequestSerialization();
@@ -39,7 +40,7 @@ public class JailChain : UdonSharpBehaviour
}
else
{
transform.localPosition = Vector3.Lerp(transform.localPosition, Vector3.zero, Time.deltaTime * _ReturnSpeedMultiplier);
_Pickup.transform.localPosition = Vector3.Lerp(_Pickup.transform.localPosition, Vector3.zero, Time.deltaTime * _ReturnSpeedMultiplier);
}
_ChainPivot.LookAt(_ChainHome.transform);
@@ -47,14 +48,13 @@ public class JailChain : UdonSharpBehaviour
base.PostLateUpdate();
}
public override void OnPickup()
public void ChainPickedUp()
{
_PullChain = true;
RequestSerialization();
base.OnPickup();
}
public override void OnDrop()
public void ChainDropped()
{
_PullChain = false;
if (_HasBeenActivated)
@@ -63,7 +63,6 @@ public class JailChain : UdonSharpBehaviour
SendCustomEventDelayedSeconds(nameof(HideJailChain), 3.0f);
}
RequestSerialization();
base.OnDrop();
}
public void HideJailChain()
{
@@ -76,7 +75,7 @@ public class JailChain : UdonSharpBehaviour
_PullChain = false;
_HasBeenActivated = false;
transform.localPosition = Vector3.zero;
_Pickup.transform.localPosition = Vector3.zero;
_ChainPivot.localRotation = Quaternion.identity;
Show = false;
Assets/UdonSharp/LightningRoundEffectsController.asset
+86 -23
View File
@@ -44,7 +44,7 @@ MonoBehaviour:
Data:
- Name:
Entry: 12
Data: 9
Data: 10
- Name:
Entry: 7
Data:
@@ -419,25 +419,19 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _Umbrella
Data: _UmbrellaActivator
- Name: $v
Entry: 7
Data: 27|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _Umbrella
Data: _UmbrellaActivator
- Name: <UserType>k__BackingField
Entry: 7
Data: 28|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: Umbrella, Assembly-CSharp
- Name:
Entry: 8
Data:
Entry: 9
Data: 12
- Name: <SystemType>k__BackingField
Entry: 9
Data: 4
Data: 12
- Name: <SyncMode>k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@@ -452,10 +446,19 @@ MonoBehaviour:
Data: true
- Name: _fieldAttributes
Entry: 7
Data: 29|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
Data: 28|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 1
Data: 2
- Name:
Entry: 7
Data: 29|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
- Name: height
Entry: 4
Data: 8
- Name:
Entry: 8
Data:
- Name:
Entry: 7
Data: 30|UnityEngine.SerializeField, UnityEngine.CoreModule
@@ -479,16 +482,76 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _Effect
Data: _UmbrellaManager
- Name: $v
Entry: 7
Data: 31|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _Effect
Data: _UmbrellaManager
- Name: <UserType>k__BackingField
Entry: 7
Data: 32|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: Umbrella, Assembly-CSharp
- Name:
Entry: 8
Data:
- Name: <SystemType>k__BackingField
Entry: 9
Data: 4
- 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: 33|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 1
- Name:
Entry: 7
Data: 34|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: _Effect
- Name: $v
Entry: 7
Data: 35|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _Effect
- Name: <UserType>k__BackingField
Entry: 7
Data: 36|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: LightningRoundEffect, Assembly-CSharp
@@ -497,7 +560,7 @@ MonoBehaviour:
Data:
- Name: <SystemType>k__BackingField
Entry: 7
Data: 33|System.RuntimeType, mscorlib
Data: 37|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: System.Int32, mscorlib
@@ -518,13 +581,13 @@ MonoBehaviour:
Data: false
- Name: _fieldAttributes
Entry: 7
Data: 34|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
Data: 38|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 1
- Name:
Entry: 7
Data: 35|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
Data: 39|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
- Name:
Entry: 8
Data:
@@ -548,16 +611,16 @@ MonoBehaviour:
Data: _Effect_Cached
- Name: $v
Entry: 7
Data: 36|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
Data: 40|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _Effect_Cached
- Name: <UserType>k__BackingField
Entry: 9
Data: 32
Data: 36
- Name: <SystemType>k__BackingField
Entry: 9
Data: 33
Data: 37
- Name: <SyncMode>k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@@ -572,7 +635,7 @@ MonoBehaviour:
Data: false
- Name: _fieldAttributes
Entry: 7
Data: 37|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
Data: 41|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 0
Assets/UdonSharp/LightningRoundEffectsController.cs
+10 -6
View File
@@ -25,7 +25,9 @@ public class LightningRoundEffectsController : UdonSharpBehaviour
[SerializeField] private ParticleSystem _LightningStrikeExplosion;
[SerializeField] private LightningStrikeStation _LightningStrikeStation;
[SerializeField] private ParticleSystem _PersonalRaincloud;
[SerializeField] private Umbrella _Umbrella;
[Space]
[SerializeField] private GameObject _UmbrellaActivator;
[SerializeField] private Umbrella _UmbrellaManager;
[UdonSynced] private LightningRoundEffect _Effect = LightningRoundEffect.MAX_EFFECTS;
private LightningRoundEffect _Effect_Cached = LightningRoundEffect.MAX_EFFECTS;
@@ -36,7 +38,9 @@ public class LightningRoundEffectsController : UdonSharpBehaviour
Networking.SetOwner(Player, _LightningBolt.gameObject);
Networking.SetOwner(Player, _LightningStrikeStation.gameObject);
Networking.SetOwner(Player, _PersonalRaincloud.gameObject);
Networking.SetOwner(Player, _Umbrella.gameObject);
Networking.SetOwner(Player, _UmbrellaActivator);
Networking.SetOwner(Player, _UmbrellaManager.gameObject);
base.OnOwnershipTransferred(Player);
}
@@ -58,7 +62,7 @@ public class LightningRoundEffectsController : UdonSharpBehaviour
public void PlayLightningRoundAnimation()
{
_Effect = LightningRoundEffect.LightningStrike;//(LightningRoundEffect)Random.Range(0, (int)LightningRoundEffect.MAX_EFFECTS);
_Effect = LightningRoundEffect.ThunderAndRain;//(LightningRoundEffect)Random.Range(0, (int)LightningRoundEffect.MAX_EFFECTS);
_PlayLightningRoundAnimation_Synced();
RequestSerialization();
}
@@ -128,13 +132,13 @@ public class LightningRoundEffectsController : UdonSharpBehaviour
private void _ActivateRainAndUmbrella()
{
_Umbrella.gameObject.SetActive(true);
_Umbrella.Respawn();
_UmbrellaActivator.SetActive(true);
_UmbrellaManager.Respawn();
_PersonalRaincloud.Play();
}
private void _DeactivateRainAndUmbrella()
{
_Umbrella.gameObject.SetActive(false);
_UmbrellaActivator.SetActive(false);
_PersonalRaincloud.Stop();
}
}
Assets/UdonSharp/Various Pickups/Umbrella.asset
+10 -16
View File
@@ -122,19 +122,13 @@ MonoBehaviour:
Data: 7|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: MMMaellon.LightSync.LightSync, com.mmmaellon.lightsync
Data: VRC.SDK3.Components.VRCObjectSync, VRCSDK3
- Name:
Entry: 8
Data:
- Name: <SystemType>k__BackingField
Entry: 7
Data: 8|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: VRC.Udon.UdonBehaviour, VRC.Udon
- Name:
Entry: 8
Data:
Entry: 9
Data: 7
- Name: <SyncMode>k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@@ -149,13 +143,13 @@ MonoBehaviour:
Data: true
- Name: _fieldAttributes
Entry: 7
Data: 9|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
Data: 8|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 1
- Name:
Entry: 7
Data: 10|UnityEngine.SerializeField, UnityEngine.CoreModule
Data: 9|UnityEngine.SerializeField, UnityEngine.CoreModule
- Name:
Entry: 8
Data:
@@ -179,13 +173,13 @@ MonoBehaviour:
Data: _Open
- Name: $v
Entry: 7
Data: 11|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
Data: 10|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _Open
- Name: <UserType>k__BackingField
Entry: 7
Data: 12|System.RuntimeType, mscorlib
Data: 11|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: System.Boolean, mscorlib
@@ -194,7 +188,7 @@ MonoBehaviour:
Data:
- Name: <SystemType>k__BackingField
Entry: 9
Data: 12
Data: 11
- Name: <SyncMode>k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@@ -209,13 +203,13 @@ MonoBehaviour:
Data: false
- Name: _fieldAttributes
Entry: 7
Data: 13|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
Data: 12|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 1
- Name:
Entry: 7
Data: 14|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
Data: 13|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
- Name:
Entry: 8
Data:
Assets/UdonSharp/Various Pickups/Umbrella.cs
+6 -7
View File
@@ -1,15 +1,15 @@
using MMMaellon.LightSync;
using UdonSharp;
using UnityEngine;
using VRC.SDK3.Components;
using VRC.Udon.Common;
[UdonBehaviourSyncMode(BehaviourSyncMode.Manual)]
public class Umbrella : UdonSharpBehaviour
{
[SerializeField] Animator _Animator;
[SerializeField] LightSync _ObjectSync;
[SerializeField] private Animator _Animator;
[SerializeField] private VRCObjectSync _ObjectSync;
[UdonSynced] private bool _Open = false;
@@ -22,20 +22,19 @@ public class Umbrella : UdonSharpBehaviour
}
public override void OnPickupUseDown()
public void UmbrellaUsed()
{
_Open = !_Open;
_Open_Synced();
RequestSerialization();
base.OnPickupUseDown();
}
public void Respawn()
{
Open(false);
_ObjectSync.Respawn();
_ObjectSync.transform.localPosition = Vector3.zero;
_ObjectSync.transform.localRotation = Quaternion.identity;
}
public void Open(bool Open)