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

- ACME Crimenet Computer's pickups now sync and spawn correctly.

Browse Source 
- Video Music Clue camera anchor now syncs attachments properly.
- Fixed painting on the door jamb in the engineering room.
This commit is contained in:
ActualHorse
2026-06-25 01:54:39 -04:00
parent 9f7f2ea92f
commit 7b22f71a54
55 changed files with 1542 additions and 750 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Animations/Video Music Clue/Swooce Right Back Out Again.anim
+5 -5
View File
@@ -34,10 +34,10 @@ AnimationClip:
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_IsActive
path: SM_Skateboard
path: SM_Skateboard/Skateboard Model
classID: 1
script: {fileID: 0}
flags: 0
flags: 16
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
@@ -47,7 +47,7 @@ AnimationClip:
m_ClipBindingConstant:
genericBindings:
- serializedVersion: 2
path: 2961225309
path: 1646165447
attribute: 2086281974
script: {fileID: 0}
typeID: 1
@@ -94,10 +94,10 @@ AnimationClip:
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_IsActive
path: SM_Skateboard
path: SM_Skateboard/Skateboard Model
classID: 1
script: {fileID: 0}
flags: 0
flags: 16
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
Assets/Animations/Video Music Clue/Swooce Right In.anim
+42 -24
View File
@@ -55,14 +55,23 @@ AnimationClip:
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1.6666666
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_IsActive
path: SM_Skateboard
path: SM_Skateboard/Skateboard Model
classID: 1
script: {fileID: 0}
flags: 0
flags: 16
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
@@ -81,7 +90,7 @@ AnimationClip:
isIntCurve: 0
isSerializeReferenceCurve: 0
- serializedVersion: 2
path: 2961225309
path: 1646165447
attribute: 2086281974
script: {fileID: 0}
typeID: 1
@@ -111,27 +120,6 @@ AnimationClip:
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves:
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_IsActive
path: SM_Skateboard
classID: 1
script: {fileID: 0}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
@@ -222,6 +210,36 @@ AnimationClip:
classID: 4
script: {fileID: 0}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1.6666666
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_IsActive
path: SM_Skateboard/Skateboard Model
classID: 1
script: {fileID: 0}
flags: 16
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
Assets/Prefabs/Video Music Clue Skateboard.prefab
+144 -11
View File
@@ -32,10 +32,10 @@ RectTransform:
m_Children: []
m_Father: {fileID: 1536226202226680415}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 52.44}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 320, y: -26.22}
m_SizeDelta: {x: 640, y: 52.44}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5249794858879863418
CanvasRenderer:
@@ -168,10 +168,10 @@ RectTransform:
m_Children: []
m_Father: {fileID: 1536226202226680415}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 261.12}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 320, y: -193}
m_SizeDelta: {x: 640, y: 261.12}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4617982991613254492
CanvasRenderer:
@@ -387,7 +387,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 588643223867270423}
- {fileID: 7933870476227364200}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!95 &7023755158255401478
@@ -990,13 +990,46 @@ MonoBehaviour:
serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF
publicVariablesUnityEngineObjects: []
publicVariablesSerializationDataFormat: 0
--- !u!1 &9079512395768367235
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7933870476227364200}
m_Layer: 0
m_Name: SM_Skateboard
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &7933870476227364200
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9079512395768367235}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 588643223867270423}
- {fileID: 867517934453916644}
m_Father: {fileID: 4892633996270911554}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1126461318336987900
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 4892633996270911554}
m_TransformParent: {fileID: 7933870476227364200}
m_Modifications:
- target: {fileID: -8679921383154817045, guid: 8e803d46c9eb6fe4492b2ca6008a4f05,
type: 3}
@@ -1086,7 +1119,7 @@ PrefabInstance:
- target: {fileID: 919132149155446097, guid: 8e803d46c9eb6fe4492b2ca6008a4f05,
type: 3}
propertyPath: m_Name
value: SM_Skateboard
value: Skateboard Model
objectReference: {fileID: 0}
- target: {fileID: 4331158463068053724, guid: 8e803d46c9eb6fe4492b2ca6008a4f05,
type: 3}
@@ -1129,6 +1162,106 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 1126461318336987900}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &5177485799661152909
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 7933870476227364200}
m_Modifications:
- target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829,
type: 3}
propertyPath: FOV
value: 25.5
objectReference: {fileID: 0}
- target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829,
type: 3}
propertyPath: FarClippingPlane
value: 12
objectReference: {fileID: 0}
- target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829,
type: 3}
propertyPath: NearClippingPlane
value: 0.2
objectReference: {fileID: 0}
- target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829,
type: 3}
propertyPath: CameraSystemManager
value:
objectReference: {fileID: 0}
- target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829,
type: 3}
propertyPath: serializationData.Prefab
value:
objectReference: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829,
type: 3}
- target: {fileID: 4175776851245093875, guid: b7be9e74a7f7fe24cb526bc367e85829,
type: 3}
propertyPath: m_Name
value: Skateboard Camera Anchor
objectReference: {fileID: 0}
- target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829,
type: 3}
propertyPath: m_LocalPosition.y
value: 0.162
objectReference: {fileID: 0}
- target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829,
type: 3}
propertyPath: m_LocalPosition.z
value: -0.52600026
objectReference: {fileID: 0}
- target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829,
type: 3}
propertyPath: m_LocalRotation.y
value: -0.000000059604638
objectReference: {fileID: 0}
- target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3}
--- !u!4 &867517934453916644 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829,
type: 3}
m_PrefabInstance: {fileID: 5177485799661152909}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &8626103086438023737
PrefabInstance:
m_ObjectHideFlags: 0
Assets/Scenes/witwics.unity
+584 -219
View File
File diff suppressed because it is too large Load Diff
Assets/Scenes/witwics/LightingData.asset
BIN
View File
Binary file not shown.
Assets/Scenes/witwics/Lightmap-0_comp_dir.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 786 KiB

After

Width:  |  Height:  |  Size: 788 KiB

Assets/Scenes/witwics/Lightmap-0_comp_light.exr
BIN
View File
Binary file not shown.
Assets/Scenes/witwics/OcclusionCullingData.asset
+481 -463
View File
File diff suppressed because one or more lines are too long
Assets/Scenes/witwics/ReflectionProbe-0.exr
BIN
View File
Binary file not shown.
Assets/Scenes/witwics/ReflectionProbe-1.exr
BIN
View File
Binary file not shown.
Assets/Scenes/witwics/ReflectionProbe-10.exr
BIN
View File
Binary file not shown.
Assets/Scenes/witwics/ReflectionProbe-11.exr
BIN
View File
Binary file not shown.
Assets/Scenes/witwics/ReflectionProbe-12.exr
BIN
View File
Binary file not shown.
Assets/Scenes/witwics/ReflectionProbe-13.exr
BIN
View File
Binary file not shown.
Assets/Scenes/witwics/ReflectionProbe-14.exr
BIN
View File
Binary file not shown.
Assets/Scenes/witwics/ReflectionProbe-2.exr
BIN
View File
Binary file not shown.
Assets/Scenes/witwics/ReflectionProbe-3.exr
BIN
View File
Binary file not shown.
Assets/Scenes/witwics/ReflectionProbe-4.exr
BIN
View File
Binary file not shown.
Assets/Scenes/witwics/ReflectionProbe-5.exr
BIN
View File
Binary file not shown.
Assets/Scenes/witwics/ReflectionProbe-6.exr
BIN
View File
Binary file not shown.
Assets/Scenes/witwics/ReflectionProbe-7.exr
BIN
View File
Binary file not shown.
Assets/Scenes/witwics/ReflectionProbe-8.exr
BIN
View File
Binary file not shown.
Assets/Scenes/witwics/ReflectionProbe-9.exr
BIN
View File
Binary file not shown.
Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset
+32 -9
View File
File diff suppressed because one or more lines are too long
Assets/UdonSharp/ACME Crimenet Computer/ACMECrimenetComputer.cs
+14 -14
View File
@@ -56,10 +56,12 @@ public class ACMECrimenetComputer : UdonSharpBehaviour
private Animator _Animator;
private void Start()
void Start()
{
_ClueImageDownloader = new VRCImageDownloader();
_Animator = GetComponent<Animator>();
_DisableAllCardSync();
}
void OnDestroy()
@@ -101,7 +103,6 @@ public class ACMECrimenetComputer : UdonSharpBehaviour
Interactable.SetActive(true);
}
_EnableCards(false);
_DisableAllCardSync();
_AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "PlayMusicLoop", MusicEventType.ACMECrimenetComputerIdle);
@@ -129,8 +130,6 @@ public class ACMECrimenetComputer : UdonSharpBehaviour
_TranslatedCard.transform.SetParent(_TranslatedCardAnimator);
_TranslatedCard.transform.localPosition = Vector3.zero;
_TranslatedCard.transform.localRotation = Quaternion.identity;
_EnableCards(false);
}
public void EnableClueImageCardSync()
@@ -151,15 +150,18 @@ public class ACMECrimenetComputer : UdonSharpBehaviour
private void _DisableAllCardSync()
{
_ClueImageCard.enabled = false;
_UntranslatedCard.enabled = false;
_TranslatedCard.enabled = false;
}
_ClueImageCard.transform.localPosition = Vector3.zero;
_ClueImageCard.transform.localRotation = Quaternion.identity;
private void _EnableCards(bool Enable)
{
_ClueImageCard.gameObject.SetActive(Enable);
_UntranslatedCard.gameObject.SetActive(Enable);
_TranslatedCard.gameObject.SetActive(Enable);
_UntranslatedCard.enabled = false;
_UntranslatedCard.transform.SetParent(_UntranslatedCardSpawn);
_UntranslatedCard.transform.localPosition = Vector3.zero;
_UntranslatedCard.transform.localRotation = Quaternion.identity;
_TranslatedCard.enabled = false;
_TranslatedCard.transform.SetParent(_TranslatedCardAnimator);
_TranslatedCard.transform.localPosition = Vector3.zero;
_TranslatedCard.transform.localRotation = Quaternion.identity;
}
@@ -218,8 +220,6 @@ public class ACMECrimenetComputer : UdonSharpBehaviour
_TranslatedCard.transform.localRotation = Quaternion.identity;
_Animator.SetBool("Run Translator", true);
_UntranslatedCard.enabled = false;
}
Assets/UdonSharp/Video Music Clue/VideoMusicClueSkateboard.cs
+5
View File
@@ -19,6 +19,11 @@ public class VideoMusicClueSkateboard : UdonSharpBehaviour
[SerializeField] private TextMeshProUGUI _ClueTextGUI;
void Start()
{
ResetSkateboard();
}
[NetworkCallable]
public void ResetSkateboard()