diff --git a/Assets/Materials/M_LocationBoard_Crook.mat b/Assets/Materials/M_LocationBoard_Crook.mat index 26158d6..9c0de23 100644 --- a/Assets/Materials/M_LocationBoard_Crook.mat +++ b/Assets/Materials/M_LocationBoard_Crook.mat @@ -46,7 +46,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: a62e19c8949d6ff40b648cb64023eb59, type: 3} + m_Texture: {fileID: 2800000, guid: 81347045e06c7034b8ec7bbca4575052, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/Prefabs/Case List/Entries/1993/Roaring Rodent Road Show.prefab b/Assets/Prefabs/Case List/Entries/1993/Roaring Rodent Road Show.prefab new file mode 100644 index 0000000..7a5e00c --- /dev/null +++ b/Assets/Prefabs/Case List/Entries/1993/Roaring Rodent Road Show.prefab @@ -0,0 +1,406 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &3468380626481506912 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1962602868978819423, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1962602868978819423, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1962602868978819423, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: m_SizeDelta.y + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 1962602868978819423, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1962602868978819423, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2357634297786518751, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: m_text + value: + objectReference: {fileID: 0} + - target: {fileID: 2357634297786518751, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: m_fontSize + value: 32 + objectReference: {fileID: 0} + - target: {fileID: 2764573716386264021, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2764573716386264021, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2764573716386264021, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: m_SizeDelta.y + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 2764573716386264021, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2764573716386264021, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4708553358522083476, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: m_Name + value: Roaring Rodent Road Show + objectReference: {fileID: 0} + - target: {fileID: 4897177162454936150, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: m_Material + value: + objectReference: {fileID: 2100000, guid: 35630e38b4e5ffb40b44ec5348b4333f, type: 2} + - target: {fileID: 5289319896243535637, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: m_text + value: + objectReference: {fileID: 0} + - target: {fileID: 5289319896243535637, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: m_fontSize + value: 32 + objectReference: {fileID: 0} + - target: {fileID: 6551736769887930211, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6551736769887930211, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6551736769887930211, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6551736769887930211, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6551736769887930211, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6551736769887930211, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6551736769887930211, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: m_SizeDelta.x + value: 1940 + objectReference: {fileID: 0} + - target: {fileID: 6551736769887930211, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: m_SizeDelta.y + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 6551736769887930211, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6551736769887930211, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6551736769887930211, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6551736769887930211, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6551736769887930211, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6551736769887930211, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6551736769887930211, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6551736769887930211, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6551736769887930211, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6551736769887930211, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6551736769887930211, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6551736769887930211, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6587367985738308803, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6587367985738308803, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6587367985738308803, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: m_SizeDelta.y + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 6587367985738308803, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6587367985738308803, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6858734047833335697, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: Crook + value: Patty Larceny + objectReference: {fileID: 0} + - target: {fileID: 6858734047833335697, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: _Crook + value: Wonder Rat + objectReference: {fileID: 0} + - target: {fileID: 6858734047833335697, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: StolenLoot + value: Colonial Williamsburg + objectReference: {fileID: 0} + - target: {fileID: 6858734047833335697, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: _StolenLoot + value: Cody, Wyoming + objectReference: {fileID: 0} + - target: {fileID: 6858734047833335697, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: LootImage.url + value: https://witwics.actual.horse/1993/roaring-rodent-road-show/LootImageS.png + objectReference: {fileID: 0} + - target: {fileID: 6858734047833335697, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: CaseFileURL.url + value: https://witwics.actual.horse/1993/roaring-rodent-road-show/Case.json + objectReference: {fileID: 0} + - target: {fileID: 6858734047833335697, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: _CaseFileURL.url + value: https://witwics-dev.github.io/TheWilliamsburglary.json + objectReference: {fileID: 0} + - target: {fileID: 6858734047833335697, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: MapFiles.Array.size + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 6858734047833335697, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: ClueImages.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6858734047833335697, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: VideoFiles.Array.size + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 6858734047833335697, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 6858734047833335697, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + - target: {fileID: 6858734047833335697, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: MapFiles.Array.data[0].url + value: https://witwics.actual.horse/1993/roaring-rodent-road-show/maps/atlas_1.png + objectReference: {fileID: 0} + - target: {fileID: 6858734047833335697, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: MapFiles.Array.data[1].url + value: https://witwics.actual.horse/1993/roaring-rodent-road-show/maps/atlas_2.png + objectReference: {fileID: 0} + - target: {fileID: 6858734047833335697, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: MapFiles.Array.data[2].url + value: https://witwics.actual.horse/1993/roaring-rodent-road-show/maps/atlas_3.png + objectReference: {fileID: 0} + - target: {fileID: 6858734047833335697, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: MapFiles.Array.data[3].url + value: https://witwics.actual.horse/1993/roaring-rodent-road-show/maps/atlas_4.png + objectReference: {fileID: 0} + - target: {fileID: 6858734047833335697, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: MapFiles.Array.data[4].url + value: https://witwics.actual.horse/1993/roaring-rodent-road-show/maps/atlas_5.png + objectReference: {fileID: 0} + - target: {fileID: 6858734047833335697, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: MapFiles.Array.data[5].url + value: https://witwics.actual.horse/1993/roaring-rodent-road-show/maps/atlas_6.png + objectReference: {fileID: 0} + - target: {fileID: 6858734047833335697, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: MapFiles.Array.data[6].url + value: https://witwics.actual.horse/1993/roaring-rodent-road-show/maps/atlas_7.png + objectReference: {fileID: 0} + - target: {fileID: 6858734047833335697, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: MapFiles.Array.data[7].url + value: https://witwics.actual.horse/1993/roaring-rodent-road-show/maps/atlas_8.png + objectReference: {fileID: 0} + - target: {fileID: 6858734047833335697, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: ClueImages.Array.data[0].url + value: https://witwics.actual.horse/1993/roaring-rodent-road-show/extra-images/0.png + objectReference: {fileID: 0} + - target: {fileID: 6858734047833335697, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: VideoFiles.Array.data[0].url + value: https://witwics.actual.horse/1993/roaring-rodent-road-show/videos/Intro.mp4 + objectReference: {fileID: 0} + - target: {fileID: 6858734047833335697, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: VideoFiles.Array.data[1].url + value: https://witwics.actual.horse/1993/roaring-rodent-road-show/videos/Lincoln.mp4 + objectReference: {fileID: 0} + - target: {fileID: 6858734047833335697, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: VideoFiles.Array.data[2].url + value: https://witwics.actual.horse/1993/roaring-rodent-road-show/videos/ACMEHomeSpendingNet.mp4 + objectReference: {fileID: 0} + - target: {fileID: 6858734047833335697, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: VideoFiles.Array.data[3].url + value: https://witwics.actual.horse/1993/roaring-rodent-road-show/videos/PhoneTap.mp4 + objectReference: {fileID: 0} + - target: {fileID: 6858734047833335697, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: VideoFiles.Array.data[4].url + value: https://witwics.actual.horse/1993/roaring-rodent-road-show/videos/WorldBandRadio.mp4 + objectReference: {fileID: 0} + - target: {fileID: 6858734047833335697, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: VideoFiles.Array.data[5].url + value: https://witwics.actual.horse/1993/roaring-rodent-road-show/videos/WilliamRagsdale.mp4 + objectReference: {fileID: 0} + - target: {fileID: 6858734047833335697, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: FallbackVideoFiles.Array.size + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 6858734047833335697, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: FallbackVideoFiles.Array.data[0].url + value: https://filehost.battybovine.com/witwics/the-williamsburglary/Intro.mp4 + objectReference: {fileID: 0} + - target: {fileID: 6858734047833335697, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: FallbackVideoFiles.Array.data[1].url + value: https://filehost.battybovine.com/witwics/the-williamsburglary/Lincoln.mp4 + objectReference: {fileID: 0} + - target: {fileID: 6858734047833335697, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: FallbackVideoFiles.Array.data[2].url + value: https://filehost.battybovine.com/witwics/the-williamsburglary/ACMEHomeSpendingNet.mp4 + objectReference: {fileID: 0} + - target: {fileID: 6858734047833335697, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: FallbackVideoFiles.Array.data[3].url + value: https://filehost.battybovine.com/witwics/the-williamsburglary/PhoneTap.mp4 + objectReference: {fileID: 0} + - target: {fileID: 6858734047833335697, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: FallbackVideoFiles.Array.data[4].url + value: https://filehost.battybovine.com/witwics/the-williamsburglary/WorldBandRadio.mp4 + objectReference: {fileID: 0} + - target: {fileID: 6858734047833335697, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: FallbackVideoFiles.Array.data[5].url + value: https://filehost.battybovine.com/witwics/the-williamsburglary/WilliamRagsdale.mp4 + objectReference: {fileID: 0} + - target: {fileID: 7635005722111176880, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: m_Material + value: + objectReference: {fileID: 2100000, guid: 35630e38b4e5ffb40b44ec5348b4333f, type: 2} + - target: {fileID: 8359197988175629327, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: m_text + value: + objectReference: {fileID: 0} + - target: {fileID: 8359197988175629327, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: m_fontSize + value: 32 + objectReference: {fileID: 0} + - target: {fileID: 9017700041050903883, guid: 3929edff864c3a84abaac327dbadaf65, + type: 3} + propertyPath: m_Material + value: + objectReference: {fileID: 2100000, guid: 35630e38b4e5ffb40b44ec5348b4333f, type: 2} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 3929edff864c3a84abaac327dbadaf65, type: 3} diff --git a/Assets/Prefabs/Case List/Entries/1993/Roaring Rodent Road Show.prefab.meta b/Assets/Prefabs/Case List/Entries/1993/Roaring Rodent Road Show.prefab.meta new file mode 100644 index 0000000..73f6cf0 --- /dev/null +++ b/Assets/Prefabs/Case List/Entries/1993/Roaring Rodent Road Show.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 6661a41158f66f1468be702eb274b265 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Case List/Lists/1993.prefab b/Assets/Prefabs/Case List/Lists/1993.prefab index 837a287..46e7699 100644 --- a/Assets/Prefabs/Case List/Lists/1993.prefab +++ b/Assets/Prefabs/Case List/Lists/1993.prefab @@ -1,5 +1,195 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1001 &1585969810115595264 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3159152697271345712} + m_Modifications: + - target: {fileID: 1621178116704786869, guid: 6661a41158f66f1468be702eb274b265, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1621178116704786869, guid: 6661a41158f66f1468be702eb274b265, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1621178116704786869, guid: 6661a41158f66f1468be702eb274b265, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1621178116704786869, guid: 6661a41158f66f1468be702eb274b265, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3107124359549143871, guid: 6661a41158f66f1468be702eb274b265, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3107124359549143871, guid: 6661a41158f66f1468be702eb274b265, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3107124359549143871, guid: 6661a41158f66f1468be702eb274b265, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3107124359549143871, guid: 6661a41158f66f1468be702eb274b265, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7696185761847045379, guid: 6661a41158f66f1468be702eb274b265, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7696185761847045379, guid: 6661a41158f66f1468be702eb274b265, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7696185761847045379, guid: 6661a41158f66f1468be702eb274b265, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7696185761847045379, guid: 6661a41158f66f1468be702eb274b265, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7696185761847045379, guid: 6661a41158f66f1468be702eb274b265, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7696185761847045379, guid: 6661a41158f66f1468be702eb274b265, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7696185761847045379, guid: 6661a41158f66f1468be702eb274b265, + type: 3} + propertyPath: m_SizeDelta.x + value: 1940 + objectReference: {fileID: 0} + - target: {fileID: 7696185761847045379, guid: 6661a41158f66f1468be702eb274b265, + type: 3} + propertyPath: m_SizeDelta.y + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 7696185761847045379, guid: 6661a41158f66f1468be702eb274b265, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7696185761847045379, guid: 6661a41158f66f1468be702eb274b265, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7696185761847045379, guid: 6661a41158f66f1468be702eb274b265, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7696185761847045379, guid: 6661a41158f66f1468be702eb274b265, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7696185761847045379, guid: 6661a41158f66f1468be702eb274b265, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7696185761847045379, guid: 6661a41158f66f1468be702eb274b265, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7696185761847045379, guid: 6661a41158f66f1468be702eb274b265, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7696185761847045379, guid: 6661a41158f66f1468be702eb274b265, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7696185761847045379, guid: 6661a41158f66f1468be702eb274b265, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7696185761847045379, guid: 6661a41158f66f1468be702eb274b265, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7696185761847045379, guid: 6661a41158f66f1468be702eb274b265, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7696185761847045379, guid: 6661a41158f66f1468be702eb274b265, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7730747093323658915, guid: 6661a41158f66f1468be702eb274b265, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7730747093323658915, guid: 6661a41158f66f1468be702eb274b265, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7730747093323658915, guid: 6661a41158f66f1468be702eb274b265, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7730747093323658915, guid: 6661a41158f66f1468be702eb274b265, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8002113181751004657, guid: 6661a41158f66f1468be702eb274b265, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 8002113181751004657, guid: 6661a41158f66f1468be702eb274b265, + type: 3} + - target: {fileID: 8176863022479344372, guid: 6661a41158f66f1468be702eb274b265, + type: 3} + propertyPath: m_Name + value: Roaring Rodent Road Show + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6661a41158f66f1468be702eb274b265, type: 3} +--- !u!224 &8992605502003273987 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 7696185761847045379, guid: 6661a41158f66f1468be702eb274b265, + type: 3} + m_PrefabInstance: {fileID: 1585969810115595264} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4359270435400224154 PrefabInstance: m_ObjectHideFlags: 0 @@ -471,6 +661,16 @@ PrefabInstance: m_RemovedGameObjects: - {fileID: 5679527073271530007, guid: fa9de454fe013ac4e9fabd14308a4623, type: 3} - {fileID: 3205006624982819172, guid: fa9de454fe013ac4e9fabd14308a4623, type: 3} - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 1704803768580173738, guid: fa9de454fe013ac4e9fabd14308a4623, + type: 3} + insertIndex: 0 + addedObject: {fileID: 8992605502003273987} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fa9de454fe013ac4e9fabd14308a4623, type: 3} +--- !u!224 &3159152697271345712 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 1704803768580173738, guid: fa9de454fe013ac4e9fabd14308a4623, + type: 3} + m_PrefabInstance: {fileID: 4359270435400224154} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Scenes/witwics.unity b/Assets/Scenes/witwics.unity index 7c35c75..2707082 100644 --- a/Assets/Scenes/witwics.unity +++ b/Assets/Scenes/witwics.unity @@ -4055,24 +4055,24 @@ MonoBehaviour: - url: https://witwics.actual.horse/static/crook-in-jail/ContessaInJail.mp4 - url: https://witwics.actual.horse/static/crook-in-jail/DoubleTroubleInJail.mp4 - url: https://witwics.actual.horse/static/crook-in-jail/EarthaBruteInJail.mp4 + - url: https://witwics.actual.horse/static/crook-in-jail/KneemoiInJail.mp4 - url: https://witwics.actual.horse/static/crook-in-jail/PattyLarcenyInJail.mp4 - - url: https://witwics.actual.horse/static/crook-in-jail/PattyLarcenyInJail.mp4 - - url: https://witwics.actual.horse/static/crook-in-jail/PattyLarcenyInJail.mp4 - - url: https://witwics.actual.horse/static/crook-in-jail/PattyLarcenyInJail.mp4 - - url: https://witwics.actual.horse/static/crook-in-jail/PattyLarcenyInJail.mp4 - - url: https://witwics.actual.horse/static/crook-in-jail/PattyLarcenyInJail.mp4 - - url: https://witwics.actual.horse/static/crook-in-jail/PattyLarcenyInJail.mp4 + - url: https://witwics.actual.horse/static/crook-in-jail/RobocrookInJail.mp4 + - url: https://witwics.actual.horse/static/crook-in-jail/SarahNadeInJail.mp4 + - url: https://witwics.actual.horse/static/crook-in-jail/TopGrungeInJail.mp4 + - url: https://witwics.actual.horse/static/crook-in-jail/VicTheSlickInJail.mp4 + - url: https://witwics.actual.horse/static/crook-in-jail/WonderRatInJail.mp4 VideoPoolFallback: - - url: https://filehost.battybovine.com/witwics/crook-in-jail/PattyLarcenyInJail.mp4 + - url: https://filehost.battybovine.com/witwics/crook-in-jail/ContessaInJail.mp4 - url: https://filehost.battybovine.com/witwics/crook-in-jail/DoubleTroubleInJail.mp4 - url: https://filehost.battybovine.com/witwics/crook-in-jail/EarthaBruteInJail.mp4 + - url: https://filehost.battybovine.com/witwics/crook-in-jail/KneemoiInJail.mp4 - url: https://filehost.battybovine.com/witwics/crook-in-jail/PattyLarcenyInJail.mp4 - - url: https://filehost.battybovine.com/witwics/crook-in-jail/PattyLarcenyInJail.mp4 - - url: https://filehost.battybovine.com/witwics/crook-in-jail/PattyLarcenyInJail.mp4 - - url: https://filehost.battybovine.com/witwics/crook-in-jail/PattyLarcenyInJail.mp4 - - url: https://filehost.battybovine.com/witwics/crook-in-jail/PattyLarcenyInJail.mp4 - - url: https://filehost.battybovine.com/witwics/crook-in-jail/PattyLarcenyInJail.mp4 - - url: https://filehost.battybovine.com/witwics/crook-in-jail/PattyLarcenyInJail.mp4 + - url: https://filehost.battybovine.com/witwics/crook-in-jail/RobocrookInJail.mp4 + - url: https://filehost.battybovine.com/witwics/crook-in-jail/SarahNadeInJail.mp4 + - url: https://filehost.battybovine.com/witwics/crook-in-jail/TopGrungeInJail.mp4 + - url: https://filehost.battybovine.com/witwics/crook-in-jail/VicTheSlickInJail.mp4 + - url: https://filehost.battybovine.com/witwics/crook-in-jail/WonderRatInJail.mp4 --- !u!114 &115578772 MonoBehaviour: m_ObjectHideFlags: 0 @@ -42940,6 +42940,17 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -40 objectReference: {fileID: 0} + - target: {fileID: 8723270894041055729, guid: ecb9ff483d5876c428bbbc75f5716b77, + type: 3} + propertyPath: _CaseManager + value: + objectReference: {fileID: 841163054} + - target: {fileID: 8723270894041055729, guid: ecb9ff483d5876c428bbbc75f5716b77, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 8723270894041055729, guid: ecb9ff483d5876c428bbbc75f5716b77, + type: 3} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -71319,6 +71330,12 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1733351611} m_CullTransparentMesh: 1 +--- !u!1 &1733416659 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7455835331192393460, guid: ecb9ff483d5876c428bbbc75f5716b77, + type: 3} + m_PrefabInstance: {fileID: 1048246167} + m_PrefabAsset: {fileID: 0} --- !u!1 &1735519735 stripped GameObject: m_CorrespondingSourceObject: {fileID: 5595091127962403785, guid: 899ce13087fd5974f88dcbccaea2df85, @@ -77808,19 +77825,19 @@ MonoBehaviour: type: 3} _CrookInJail_EarthaBrute: {fileID: 8300000, guid: 80b9f2cbfed8dea4f8c9da8e1b2256b6, type: 3} - _CrookInJail_Kneemoi: {fileID: 8300000, guid: bb01fd60191603147a65a44a686a599e, + _CrookInJail_Kneemoi: {fileID: 8300000, guid: 632b2aad680fed3469fd75ab592dbb69, type: 3} _CrookInJail_PattyLarceny: {fileID: 8300000, guid: bb01fd60191603147a65a44a686a599e, type: 3} - _CrookInJail_Robocrook: {fileID: 8300000, guid: bb01fd60191603147a65a44a686a599e, + _CrookInJail_Robocrook: {fileID: 8300000, guid: 2fb0c78491de3c7458724ddb19afde6e, type: 3} - _CrookInJail_SarahNade: {fileID: 8300000, guid: bb01fd60191603147a65a44a686a599e, + _CrookInJail_SarahNade: {fileID: 8300000, guid: 35c6b15163d66e1499dbf35266412dab, type: 3} - _CrookInJail_TopGrunge: {fileID: 8300000, guid: bb01fd60191603147a65a44a686a599e, + _CrookInJail_TopGrunge: {fileID: 8300000, guid: 266e89261024da34ca80400b4cd59417, type: 3} - _CrookInJail_VicTheSlick: {fileID: 8300000, guid: bb01fd60191603147a65a44a686a599e, + _CrookInJail_VicTheSlick: {fileID: 8300000, guid: 9066703ea6537f944bde4748c271e38e, type: 3} - _CrookInJail_WonderRat: {fileID: 8300000, guid: bb01fd60191603147a65a44a686a599e, + _CrookInJail_WonderRat: {fileID: 8300000, guid: 7172856ea8ecd8b4c9ba92ccede586b3, type: 3} _CrookJailCall_Contessa_Africa: {fileID: 8300000, guid: bac747abcc46a3f45bbda7d7a5f0b673, type: 3} @@ -90917,6 +90934,11 @@ PrefabInstance: propertyPath: _syncMethod value: 2 objectReference: {fileID: 0} + - target: {fileID: 7734313106552464931, guid: e510a624c9e607c4bb702fa1259a213c, + type: 3} + propertyPath: _syncMethod + value: 3 + objectReference: {fileID: 0} - target: {fileID: 7847085293148026584, guid: e510a624c9e607c4bb702fa1259a213c, type: 3} propertyPath: sleepFlag @@ -92229,14 +92251,25 @@ MonoBehaviour: useAssignedLayers: 0 DynamicPrefabs: [] DynamicMaterials: - - {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2} - - {fileID: 2100000, guid: e53b90b5a4f1c3048b28024a40b455e7, type: 2} - - {fileID: 2100000, guid: 483ceb65615010745bde1d5ff9fd9dd6, type: 2} - - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 2100000, guid: 35c2a316ece610b4b963e047e5238337, type: 2} - - {fileID: 2100000, guid: 348ff3cc54305654d9eeebbbb385c262, type: 2} - - {fileID: 2100000, guid: 4fb0b8cdca56f5d47be970c7490cb7a1, type: 2} + - {fileID: 2100000, guid: 0c3dfdcd7a2a6ac408ec3d431f9a4932, type: 2} - {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2} + - {fileID: 2100000, guid: bc5888e576e9cb34bab7b7af42d2b63f, type: 2} + - {fileID: 2100000, guid: 1eb2f964062497347b887d2c940e79c5, type: 2} + - {fileID: 2100000, guid: af0c1cbaaffed304ba0e3a1fbac41e7e, type: 2} + - {fileID: 2100000, guid: cc22c7f9de95cab4488b30fe8699a82a, type: 2} + - {fileID: 2100000, guid: fe872fb72ad98da4dbb868481468e848, type: 2} + - {fileID: 2100000, guid: 4fb0b8cdca56f5d47be970c7490cb7a1, type: 2} + - {fileID: 2100000, guid: 82f2961c9baa48a45ac897be257fd655, type: 2} + - {fileID: 2100000, guid: 4de84333504452948874f4422dec7b56, type: 2} + - {fileID: 2100000, guid: 97a375a2664a65f44a74b8e0711591fb, type: 2} + - {fileID: 2100000, guid: 71fff76911e92ab43a71d15602da4c4b, type: 2} + - {fileID: 2100000, guid: 4c14b2f4b9a613f418bb1e6cf8cf68f4, type: 2} + - {fileID: 2100000, guid: ea08301eace4f164bb3aae930413a978, type: 2} + - {fileID: 2100000, guid: 6dd6b8b1c8133f04dbc23ac81f5dfded, type: 2} + - {fileID: 2100000, guid: c3186340e03d26341969d34663dbf8f3, type: 2} + - {fileID: 2100000, guid: accd304c49b7d6d43b97738e8e118342, type: 2} + - {fileID: 2100000, guid: 2c0cd617d97924748a9d5e2eeb2039b5, type: 2} + - {fileID: 2100000, guid: c1b531b2f1a7dab43b46daa7546cfda7, type: 2} - {fileID: 2100000, guid: 012e77fb6a6d69548802da3b41814618, type: 2} - {fileID: 2100000, guid: 4d875a76d6e247742b8d3d66214b2c2d, type: 2} - {fileID: 2100000, guid: 12e96dbe16f21704485645506bfc235a, type: 2} @@ -92254,39 +92287,28 @@ MonoBehaviour: - {fileID: 2100000, guid: d7188495ea0838346af40c820ec9ffc8, type: 2} - {fileID: 2100000, guid: 79cdc811085b366438fb60b12a3642ba, type: 2} - {fileID: 2100000, guid: ffd504a9168a01c459170bb8f2fcea1c, type: 2} - - {fileID: 2100000, guid: 80746b095abb6ce41a1c737df3649172, type: 2} - - {fileID: 2100000, guid: 332daba92d0976f4d86bdcdc1a94179e, type: 2} - - {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2} - - {fileID: 2100000, guid: accd304c49b7d6d43b97738e8e118342, type: 2} - - {fileID: 2100000, guid: 2c0cd617d97924748a9d5e2eeb2039b5, type: 2} - - {fileID: 2100000, guid: 0c3dfdcd7a2a6ac408ec3d431f9a4932, type: 2} - - {fileID: 2100000, guid: c1b531b2f1a7dab43b46daa7546cfda7, type: 2} - - {fileID: 2100000, guid: c10453b4aa0c864458b74f3797cb611e, type: 2} - - {fileID: 2100000, guid: c3186340e03d26341969d34663dbf8f3, type: 2} - - {fileID: 2100000, guid: dba163de40c568b48ae2ffa7c83c66b9, type: 2} - - {fileID: 2100000, guid: 82f2961c9baa48a45ac897be257fd655, type: 2} - - {fileID: 2100000, guid: 1eb2f964062497347b887d2c940e79c5, type: 2} - - {fileID: 2100000, guid: bc5888e576e9cb34bab7b7af42d2b63f, type: 2} - - {fileID: 2100000, guid: db9b2b735115eb248a189b1fdc721a50, type: 2} - - {fileID: 2100000, guid: 9d4baac78c2042b47b42fc9c92d87767, type: 2} - - {fileID: 2100000, guid: c5d2a6b0c3904c747b937dd142cbb480, type: 2} - - {fileID: 2100000, guid: cac39def7281c5c488b6a3465ec1951b, type: 2} - - {fileID: 2100000, guid: 672c36f6dbb36b5439cc0fdd2f74c531, type: 2} - - {fileID: 2100000, guid: 51b03d257a738e6468f623865f31dbec, type: 2} - - {fileID: 2100000, guid: 885429151ec5f6a4a926f6aaabd7e001, type: 2} - - {fileID: 2100000, guid: af0c1cbaaffed304ba0e3a1fbac41e7e, type: 2} - - {fileID: 2100000, guid: cc22c7f9de95cab4488b30fe8699a82a, type: 2} - - {fileID: 2100000, guid: fe872fb72ad98da4dbb868481468e848, type: 2} - - {fileID: 2100000, guid: 4de84333504452948874f4422dec7b56, type: 2} - - {fileID: 2100000, guid: 97a375a2664a65f44a74b8e0711591fb, type: 2} - - {fileID: 2100000, guid: 71fff76911e92ab43a71d15602da4c4b, type: 2} - - {fileID: 2100000, guid: 4c14b2f4b9a613f418bb1e6cf8cf68f4, type: 2} - - {fileID: 2100000, guid: ea08301eace4f164bb3aae930413a978, type: 2} - - {fileID: 2100000, guid: 6dd6b8b1c8133f04dbc23ac81f5dfded, type: 2} - {fileID: 2100000, guid: 98166ed003d332e488319f662c3b4429, type: 2} + - {fileID: 2100000, guid: c5d2a6b0c3904c747b937dd142cbb480, type: 2} + - {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2} - {fileID: 2100000, guid: 53b84df3db050264db8132d12d59ac74, type: 2} + - {fileID: 2100000, guid: e53b90b5a4f1c3048b28024a40b455e7, type: 2} + - {fileID: 2100000, guid: 9d4baac78c2042b47b42fc9c92d87767, type: 2} + - {fileID: 2100000, guid: db9b2b735115eb248a189b1fdc721a50, type: 2} - {fileID: 2100000, guid: cc8e36941dd3f2c42a157650e05b9242, type: 2} - {fileID: 2100000, guid: a94d8fe1854504e47a64e023cecaa130, type: 2} + - {fileID: 2100000, guid: 348ff3cc54305654d9eeebbbb385c262, type: 2} + - {fileID: 2100000, guid: 51b03d257a738e6468f623865f31dbec, type: 2} + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 672c36f6dbb36b5439cc0fdd2f74c531, type: 2} + - {fileID: 2100000, guid: 35c2a316ece610b4b963e047e5238337, type: 2} + - {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2} + - {fileID: 2100000, guid: cac39def7281c5c488b6a3465ec1951b, type: 2} + - {fileID: 2100000, guid: 332daba92d0976f4d86bdcdc1a94179e, type: 2} + - {fileID: 2100000, guid: dba163de40c568b48ae2ffa7c83c66b9, type: 2} + - {fileID: 2100000, guid: 80746b095abb6ce41a1c737df3649172, type: 2} + - {fileID: 2100000, guid: 885429151ec5f6a4a926f6aaabd7e001, type: 2} + - {fileID: 2100000, guid: 483ceb65615010745bde1d5ff9fd9dd6, type: 2} + - {fileID: 2100000, guid: c10453b4aa0c864458b74f3797cb611e, type: 2} LightMapsNear: [] LightMapsFar: [] LightMode: 0 @@ -97337,6 +97359,10 @@ MonoBehaviour: ID: 1521 SerializedTypeNames: - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 1733416659} + ID: 1522 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour portraitCameraPositionOffset: {x: 0, y: 0, z: 0} portraitCameraRotationOffset: {x: 0, y: 1, z: 0, w: -0.00000004371139} PlayerPersistence: [] diff --git a/Assets/UdonSharp/ACME Crimenet Computer/ACMECrimenetComputer.asset b/Assets/UdonSharp/ACME Crimenet Computer/ACMECrimenetComputer.asset index 7976c1a..12deac8 100644 --- a/Assets/UdonSharp/ACME Crimenet Computer/ACMECrimenetComputer.asset +++ b/Assets/UdonSharp/ACME Crimenet Computer/ACMECrimenetComputer.asset @@ -19,7 +19,7 @@ MonoBehaviour: sourceCsScript: {fileID: 11500000, guid: d0da7328e5367f24480c590f61700ea1, type: 3} scriptVersion: 2 compiledVersion: 2 - behaviourSyncMode: 2 + behaviourSyncMode: 4 hasInteractEvent: 0 scriptID: 2795592714782532019 serializationData: @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 15 + Data: 20 - Name: Entry: 7 Data: @@ -782,19 +782,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _ClueImageDownloader + Data: _Activate - Name: $v Entry: 7 Data: 50|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _ClueImageDownloader + Data: _Activate - Name: k__BackingField Entry: 7 Data: 51|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: VRC.SDK3.Image.VRCImageDownloader, VRCSDK3 + Data: System.Boolean, mscorlib - Name: Entry: 8 Data: @@ -805,8 +805,8 @@ MonoBehaviour: Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - Name: - Entry: 6 - Data: + Entry: 3 + Data: 1 - Name: Entry: 8 Data: @@ -818,7 +818,145 @@ MonoBehaviour: Data: 52|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 0 + Data: 2 + - Name: + Entry: 7 + Data: 53|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 54|UdonSharp.FieldChangeCallbackAttribute, 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: _UntranslatedText + - Name: $v + Entry: 7 + Data: 55|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _UntranslatedText + - Name: k__BackingField + Entry: 7 + Data: 56|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.String, mscorlib + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 56 + - 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: 57|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 2 + - Name: + Entry: 7 + Data: 58|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 59|UdonSharp.FieldChangeCallbackAttribute, 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: _TranslatedText + - Name: $v + Entry: 7 + Data: 60|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _TranslatedText + - Name: k__BackingField + Entry: 9 + Data: 56 + - Name: k__BackingField + Entry: 9 + Data: 56 + - 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: 61|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 2 + - Name: + Entry: 7 + Data: 62|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 63|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: - Name: Entry: 13 Data: @@ -839,13 +977,199 @@ MonoBehaviour: Data: _ClueImage - Name: $v Entry: 7 - Data: 53|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 64|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _ClueImage - Name: k__BackingField Entry: 7 - Data: 54|System.RuntimeType, mscorlib + Data: 65|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Int32, mscorlib + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 65 + - 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: 66|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 2 + - Name: + Entry: 7 + Data: 67|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 68|UdonSharp.FieldChangeCallbackAttribute, 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: _ClueImageScale + - Name: $v + Entry: 7 + Data: 69|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _ClueImageScale + - Name: k__BackingField + Entry: 7 + Data: 70|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Single, mscorlib + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 70 + - 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: 71|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 2 + - Name: + Entry: 7 + Data: 72|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 73|UdonSharp.FieldChangeCallbackAttribute, 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: _ClueImageDownloader + - Name: $v + Entry: 7 + Data: 74|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _ClueImageDownloader + - Name: k__BackingField + Entry: 7 + Data: 75|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: VRC.SDK3.Image.VRCImageDownloader, VRCSDK3 + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 75 + - 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: false + - Name: _fieldAttributes + Entry: 7 + Data: 76|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: _ClueImageDownload + - Name: $v + Entry: 7 + Data: 77|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _ClueImageDownload + - Name: k__BackingField + Entry: 7 + Data: 78|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.Texture2D, UnityEngine.CoreModule @@ -854,7 +1178,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 54 + Data: 78 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -869,7 +1193,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 55|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 79|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -893,13 +1217,13 @@ MonoBehaviour: Data: _Animator - Name: $v Entry: 7 - Data: 56|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 80|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _Animator - Name: k__BackingField Entry: 7 - Data: 57|System.RuntimeType, mscorlib + Data: 81|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.Animator, UnityEngine.AnimationModule @@ -908,7 +1232,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 57 + Data: 81 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -923,7 +1247,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 58|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 82|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 diff --git a/Assets/UdonSharp/ACME Crimenet Computer/ACMECrimenetComputer.cs b/Assets/UdonSharp/ACME Crimenet Computer/ACMECrimenetComputer.cs index 04e6fb0..c8e8439 100644 --- a/Assets/UdonSharp/ACME Crimenet Computer/ACMECrimenetComputer.cs +++ b/Assets/UdonSharp/ACME Crimenet Computer/ACMECrimenetComputer.cs @@ -1,7 +1,10 @@  +using System.Runtime.InteropServices; +using System.Runtime.Remoting; using TMPro; using UdonSharp; using UnityEngine; +using UnityEngine.UIElements; using VRC.SDK3.Image; using VRC.SDK3.UdonNetworkCalling; using VRC.SDKBase; @@ -9,7 +12,7 @@ using VRC.Udon; using VRC.Udon.Common.Interfaces; -[UdonBehaviourSyncMode(BehaviourSyncMode.NoVariableSync)] +[UdonBehaviourSyncMode(BehaviourSyncMode.Manual)] public class ACMECrimenetComputer : UdonSharpBehaviour { [SerializeField] private GameManagerRound1 _GameManager; @@ -35,8 +38,17 @@ public class ACMECrimenetComputer : UdonSharpBehaviour [Space] [SerializeField] private GameObject[] _Interactables; + + [UdonSynced, FieldChangeCallback(nameof(Activate))] private bool _Activate = false; + [UdonSynced, FieldChangeCallback(nameof(UntranslatedText))] private string _UntranslatedText = ""; + [UdonSynced, FieldChangeCallback(nameof(TranslatedText))] private string _TranslatedText = ""; + + [UdonSynced, FieldChangeCallback(nameof(ClueImage))] private int _ClueImage = -1; + [UdonSynced, FieldChangeCallback(nameof(ClueImageScale))] private float _ClueImageScale = 1.0f; + + private VRCImageDownloader _ClueImageDownloader; - private Texture2D _ClueImage; + private Texture2D _ClueImageDownload; private Animator _Animator; @@ -52,14 +64,42 @@ public class ACMECrimenetComputer : UdonSharpBehaviour } - [NetworkCallable] - public void ResetComputer() + private void SetUntranslatedText(string Untranslated) + { + _UntranslatedText = Untranslated; + _UntranslatedTextGUI.text = _UntranslatedText; + RequestSerialization(); + } + + private void SetTranslatedText(string Translated) + { + _TranslatedText = Translated; + _TranslatedTextGUI.text = _TranslatedText; + RequestSerialization(); + } + + + private void SwooceRightIn() + { + _Animator.SetBool("Swooce Right In", true); + foreach (GameObject Interactable in _Interactables) + { + Interactable.SetActive(true); + } + + _AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "PlayMusicLoop", MusicEventType.ACMECrimenetComputerIdle); + + } + + private void SwooceRightBackOutAgain() { foreach (GameObject Interactable in _Interactables) { Interactable.SetActive(false); } + ClueImageScale = 1.0f; + _Animator.SetBool("Swooce Right In", false); _Animator.SetBool("Open Compartment", false); _Animator.SetBool("Throw Clue Into The Air", false); @@ -79,36 +119,15 @@ public class ACMECrimenetComputer : UdonSharpBehaviour _TranslatedCard.localRotation = Quaternion.identity; } - [NetworkCallable] - public void SetCardTexts(string Untranslated, string Translated) - { - _UntranslatedTextGUI.text = Untranslated; - _TranslatedTextGUI.text = Translated; - } - - [NetworkCallable] - public void SwooceRightIn() - { - _Animator.SetBool("Swooce Right In", true); - foreach (GameObject Interactable in _Interactables) - { - Interactable.SetActive(true); - } - - _AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "PlayMusicLoop", MusicEventType.ACMECrimenetComputerIdle); - - } - - [NetworkCallable] - public void LoadClueImage(int Index) + private void LoadClueImage() { TextureInfo AdditionalTextureInfo = new TextureInfo(); AdditionalTextureInfo.WrapModeU = TextureWrapMode.Clamp; AdditionalTextureInfo.WrapModeV = TextureWrapMode.Clamp; AdditionalTextureInfo.GenerateMipMaps = true; _ClueImageDownloader.DownloadImage( - _GameManager.GetClueImageURL(Index), null, + _GameManager.GetClueImageURL(_ClueImage), null, (IUdonEventReceiver)this, AdditionalTextureInfo); } public override void OnImageLoadSuccess(IVRCImageDownload Result) @@ -117,11 +136,6 @@ public class ACMECrimenetComputer : UdonSharpBehaviour base.OnImageLoadSuccess(Result); } - [NetworkCallable] - public void SetClueImageScale(float Scale) - { - _ClueImageCard.transform.localScale = new Vector3(Scale, Scale, Scale); - } [NetworkCallable] public void OpenCompartment() @@ -152,4 +166,66 @@ public class ACMECrimenetComputer : UdonSharpBehaviour _Animator.SetBool("Run Translator", true); } + + + public bool Activate + { + set + { + _Activate = value; + if (_Activate) + { + SwooceRightIn(); + } + else + { + SwooceRightBackOutAgain(); + } + RequestSerialization(); + } + get => _Activate; + } + + public string UntranslatedText + { + set + { + SetUntranslatedText(value); + } + get => _UntranslatedText; + } + + public string TranslatedText + { + set + { + SetTranslatedText(value); + } + get => _TranslatedText; + } + + public int ClueImage + { + set + { + if (_ClueImage != value) + { + _ClueImage = value; + LoadClueImage(); + RequestSerialization(); + } + } + get => _ClueImage; + } + + public float ClueImageScale + { + set + { + _ClueImageScale = value; + _ClueImageCard.transform.localScale = new Vector3(_ClueImageScale, _ClueImageScale, _ClueImageScale); + RequestSerialization(); + } + get => _ClueImageScale; + } } diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound1.cs b/Assets/UdonSharp/Game Managers/GameManagerRound1.cs index f94910b..73ff148 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound1.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound1.cs @@ -359,41 +359,37 @@ public class GameManagerRound1 : GameManagerBase { UntranslatedText = Presentation["Clue Text"].String; } + if (Presentation.ContainsKey("Translated Text")) { TranslatedText = Presentation["Translated Text"].String; } + else + { + TranslatedText = UntranslatedText; + } if (Presentation.ContainsKey("Clue Image")) { - _ACMECrimenetComputer.SendCustomNetworkEvent(NetworkEventTarget.All, - "LoadClueImage", - (int)Presentation["Clue Image"].DataList[0].Number); + _ACMECrimenetComputer.ClueImage = (int)Presentation["Clue Image"].DataList[0].Number; if (Presentation.ContainsKey("Clue Image Scale")) { - _ACMECrimenetComputer.SendCustomNetworkEvent(NetworkEventTarget.All, - "SetClueImageScale", - (float)Presentation["Clue Image Scale"].DataList[0].Number); - } - else - { - _ACMECrimenetComputer.SendCustomNetworkEvent(NetworkEventTarget.All, - "SetClueImageScale", - 1.0f); + _ACMECrimenetComputer.ClueImageScale = (float)Presentation["Clue Image Scale"].DataList[0].Number; } } - _ACMECrimenetComputer.SendCustomNetworkEvent(NetworkEventTarget.All, - "SetCardTexts", UntranslatedText, TranslatedText); - _ACMECrimenetComputer.SendCustomNetworkEvent(NetworkEventTarget.All, "SwooceRightIn"); + _ACMECrimenetComputer.UntranslatedText = UntranslatedText; + _ACMECrimenetComputer.TranslatedText = TranslatedText; + + _ACMECrimenetComputer.Activate = true; _QuestionSubstage++; EnableInteraction("Reveal Question"); } else { - _ACMECrimenetComputer.SendCustomNetworkEvent(NetworkEventTarget.All, "ResetComputer"); + _ACMECrimenetComputer.Activate = false; MultipleChoiceRevealQuestion(); } diff --git a/Assets/UdonSharp/UtilityScripts/BoneFollower.asset b/Assets/UdonSharp/UtilityScripts/BoneFollower.asset index b946757..036a370 100644 --- a/Assets/UdonSharp/UtilityScripts/BoneFollower.asset +++ b/Assets/UdonSharp/UtilityScripts/BoneFollower.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: BoneFollower m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: ccbda9bf23e2f714c9226283c77a92e5, + serializedUdonProgramAsset: {fileID: 11400000, guid: 52ecc8a73071e8e40928c3609699fcf4, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/InteractToggle.asset b/Assets/UdonSharp/UtilityScripts/InteractToggle.asset index b35639e..13d78db 100644 --- a/Assets/UdonSharp/UtilityScripts/InteractToggle.asset +++ b/Assets/UdonSharp/UtilityScripts/InteractToggle.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: InteractToggle m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 405e38d3dfb2f514daeed0e28fbb4864, + serializedUdonProgramAsset: {fileID: 11400000, guid: 873dfce61b1514e429c92e0d2fded7de, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset b/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset index 1def3de..d89a1a4 100644 --- a/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset +++ b/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: PlayerModSetter m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: f938e6c4ff027a74da405a1f9353fd2b, + serializedUdonProgramAsset: {fileID: 11400000, guid: e81558796a212ab4d88e305e2010f24b, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset b/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset index 8101274..ea98aa4 100644 --- a/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset +++ b/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: GlobalToggleObject m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: c49c9265a3ef24642a6a4465d0a78872, + serializedUdonProgramAsset: {fileID: 11400000, guid: 2fe8ced6184000f49bca526cd2c5891c, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset b/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset index 901d05e..b4b3ede 100644 --- a/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset +++ b/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: MasterToggleObject m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 04024a76ab1924042ba521e11cb76d91, + serializedUdonProgramAsset: {fileID: 11400000, guid: a2d01d9f36ac6df49831be249e48ecc4, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset b/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset index da92932..c624599 100644 --- a/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset +++ b/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: TrackingDataFollower m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 17f8fbbe6cc186d4f8dbb057b01a4ec2, + serializedUdonProgramAsset: {fileID: 11400000, guid: 1b89d4552983c0448a7389decec3b555, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset b/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset index ee4621f..5226f4f 100644 --- a/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset +++ b/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: WorldAudioSettings m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 128d924a3066b7546b2d1c73e61006ab, + serializedUdonProgramAsset: {fileID: 11400000, guid: 994b559b0f158b4499f8937980ed8694, type: 2} udonAssembly: assemblyError: