diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj index 1817183..0202d92 100644 --- a/Assembly-CSharp.csproj +++ b/Assembly-CSharp.csproj @@ -82,6 +82,7 @@ + diff --git a/Assets/Scenes/witwics.unity b/Assets/Scenes/witwics.unity index ca6c8e1..043147a 100644 --- a/Assets/Scenes/witwics.unity +++ b/Assets/Scenes/witwics.unity @@ -11604,7 +11604,7 @@ MonoBehaviour: _udonSharpBackingUdonBehaviour: {fileID: 515404445} _HostCard: {fileID: 379391087} _CaseManager: {fileID: 841163054} - _VideoPlayer: {fileID: 1967830429} + _VideoPlayer: {fileID: 2057791820} _PlayerPodiums: - {fileID: 4438766482650780795} - {fileID: 1993364535} @@ -21595,43 +21595,8 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1991311617} + m_TransformParent: {fileID: 2057791822} m_Modifications: - - target: {fileID: -8679921383154817045, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -36700,173 +36665,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1966821373} m_CullTransparentMesh: 1 ---- !u!1001 &1967830428 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 1439010666042059960, guid: f2d01e7f26c5bb04f8c22c15fbf7475b, - type: 3} - propertyPath: m_Material - value: - objectReference: {fileID: 2100000, guid: 35630e38b4e5ffb40b44ec5348b4333f, type: 2} - - target: {fileID: 1439010666179893535, guid: f2d01e7f26c5bb04f8c22c15fbf7475b, - type: 3} - propertyPath: m_Material - value: - objectReference: {fileID: 2100000, guid: 35630e38b4e5ffb40b44ec5348b4333f, type: 2} - - target: {fileID: 1439010666249683466, guid: f2d01e7f26c5bb04f8c22c15fbf7475b, - type: 3} - propertyPath: m_Material - value: - objectReference: {fileID: 2100000, guid: 35630e38b4e5ffb40b44ec5348b4333f, type: 2} - - target: {fileID: 1439010666864111812, guid: f2d01e7f26c5bb04f8c22c15fbf7475b, - type: 3} - propertyPath: m_Name - value: TV Screen - objectReference: {fileID: 0} - - target: {fileID: 1439010666864111818, guid: f2d01e7f26c5bb04f8c22c15fbf7475b, - type: 3} - propertyPath: targetMaterialRenderer - value: - objectReference: {fileID: 1123401066} - - target: {fileID: 1439010666864111818, guid: f2d01e7f26c5bb04f8c22c15fbf7475b, - type: 3} - propertyPath: targetAudioSources.Array.data[0] - value: - objectReference: {fileID: 158746910} - - target: {fileID: 1439010666864111820, guid: f2d01e7f26c5bb04f8c22c15fbf7475b, - type: 3} - propertyPath: serializedPublicVariablesBytesString - value: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgMAAAAAAAAAAi8CAAAAAW0AAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAVgBSAEMALgBTAEQASwAzAC4AVgBpAGQAZQBvAC4AQwBvAG0AcABvAG4AZQBuAHQAcwAuAEIAYQBzAGUALgBCAGEAcwBlAFYAUgBDAFYAaQBkAGUAbwBQAGwAYQB5AGUAcgAsACAAVgBSAEMAUwBEAEsAMwBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAQYAAABwAGwAYQB5AGUAcgAnAQQAAAB0AHkAcABlAAE2AAAAVgBSAEMALgBTAEQASwAzAC4AVgBpAGQAZQBvAC4AQwBvAG0AcABvAG4AZQBuAHQAcwAuAFYAUgBDAFUAbgBpAHQAeQBWAGkAZABlAG8AUABsAGEAeQBlAHIALAAgAFYAUgBDAFMARABLADMACwEFAAAAVgBhAGwAdQBlAAAAAAAHBQIvAwAAAAFKAAAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQBgADEAWwBbAFMAeQBzAHQAZQBtAC4AUwBpAG4AZwBsAGUALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAMAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAQ0AAABzAHkAbgBjAEYAcgBlAHEAdQBlAG4AYwB5ACcBBAAAAHQAeQBwAGUAARcAAABTAHkAcwB0AGUAbQAuAFMAaQBuAGcAbABlACwAIABtAHMAYwBvAHIAbABpAGIAHwEFAAAAVgBhAGwAdQBlAAAAcEEHBQIvBAAAAAFLAAAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQBgADEAWwBbAFMAeQBzAHQAZQBtAC4AQgBvAG8AbABlAGEAbgAsACAAbQBzAGMAbwByAGwAaQBiAF0AXQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ABAAAAAYCAAAAAAAAACcBBAAAAHQAeQBwAGUAARcAAABTAHkAcwB0AGUAbQAuAFMAdAByAGkAbgBnACwAIABtAHMAYwBvAHIAbABpAGIAJwEKAAAAUwB5AG0AYgBvAGwATgBhAG0AZQABEQAAAGEAbABsAG8AdwBHAHUAZQBzAHQAQwBvAG4AdAByAG8AbAAnAQQAAAB0AHkAcABlAAEYAAAAUwB5AHMAdABlAG0ALgBCAG8AbwBsAGUAYQBuACwAIABtAHMAYwBvAHIAbABpAGIAKwEFAAAAVgBhAGwAdQBlAAEHBQcFBwU= - objectReference: {fileID: 0} - - target: {fileID: 1439010666864111820, guid: f2d01e7f26c5bb04f8c22c15fbf7475b, - type: 3} - propertyPath: publicVariablesUnityEngineObjects.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1439010666864111820, guid: f2d01e7f26c5bb04f8c22c15fbf7475b, - type: 3} - propertyPath: publicVariablesUnityEngineObjects.Array.data[0] - value: - objectReference: {fileID: 1967830429} - - target: {fileID: 1439010666864111823, guid: f2d01e7f26c5bb04f8c22c15fbf7475b, - type: 3} - propertyPath: m_LocalPosition.x - value: 3.002 - objectReference: {fileID: 0} - - target: {fileID: 1439010666864111823, guid: f2d01e7f26c5bb04f8c22c15fbf7475b, - type: 3} - propertyPath: m_LocalPosition.y - value: 1.232 - objectReference: {fileID: 0} - - target: {fileID: 1439010666864111823, guid: f2d01e7f26c5bb04f8c22c15fbf7475b, - type: 3} - propertyPath: m_LocalPosition.z - value: 12.857 - objectReference: {fileID: 0} - - target: {fileID: 1439010666864111823, guid: f2d01e7f26c5bb04f8c22c15fbf7475b, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.3826842 - objectReference: {fileID: 0} - - target: {fileID: 1439010666864111823, guid: f2d01e7f26c5bb04f8c22c15fbf7475b, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1439010666864111823, guid: f2d01e7f26c5bb04f8c22c15fbf7475b, - type: 3} - propertyPath: m_LocalRotation.y - value: 0.92387927 - objectReference: {fileID: 0} - - target: {fileID: 1439010666864111823, guid: f2d01e7f26c5bb04f8c22c15fbf7475b, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1439010666864111823, guid: f2d01e7f26c5bb04f8c22c15fbf7475b, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1439010666864111823, guid: f2d01e7f26c5bb04f8c22c15fbf7475b, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 135 - objectReference: {fileID: 0} - - target: {fileID: 1439010666864111823, guid: f2d01e7f26c5bb04f8c22c15fbf7475b, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1439010667097516304, guid: f2d01e7f26c5bb04f8c22c15fbf7475b, - type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1439010667097516308, guid: f2d01e7f26c5bb04f8c22c15fbf7475b, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -3.41 - objectReference: {fileID: 0} - - target: {fileID: 1439010667097516310, guid: f2d01e7f26c5bb04f8c22c15fbf7475b, - type: 3} - propertyPath: m_PresetInfoIsWorld - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2749372315644709424, guid: f2d01e7f26c5bb04f8c22c15fbf7475b, - type: 3} - propertyPath: m_LocalScale.x - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 2749372315644709424, guid: f2d01e7f26c5bb04f8c22c15fbf7475b, - type: 3} - propertyPath: m_LocalScale.y - value: 5.625 - objectReference: {fileID: 0} - - target: {fileID: 2749372315644709424, guid: f2d01e7f26c5bb04f8c22c15fbf7475b, - type: 3} - propertyPath: m_LocalScale.z - value: 1.25 - objectReference: {fileID: 0} - - target: {fileID: 2749372315644709424, guid: f2d01e7f26c5bb04f8c22c15fbf7475b, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2749372315644709424, guid: f2d01e7f26c5bb04f8c22c15fbf7475b, - type: 3} - propertyPath: m_ConstrainProportionsScale - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: - - {fileID: 7639350706768358381, guid: f2d01e7f26c5bb04f8c22c15fbf7475b, type: 3} - - {fileID: 1439010667097516304, guid: f2d01e7f26c5bb04f8c22c15fbf7475b, type: 3} - - {fileID: 2749372315644709431, guid: f2d01e7f26c5bb04f8c22c15fbf7475b, type: 3} - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 1439010666864111823, guid: f2d01e7f26c5bb04f8c22c15fbf7475b, - type: 3} - insertIndex: -1 - addedObject: {fileID: 1123401067} - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: f2d01e7f26c5bb04f8c22c15fbf7475b, type: 3} ---- !u!114 &1967830429 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 1439010666864111818, guid: f2d01e7f26c5bb04f8c22c15fbf7475b, - type: 3} - m_PrefabInstance: {fileID: 1967830428} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1991311615} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -560078975, guid: 661092b4961be7145bfbe56e1e62337b, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1972356646 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1407978481101366839, guid: 899ce13087fd5974f88dcbccaea2df85, @@ -37038,18 +36836,6 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1556964902} m_PrefabAsset: {fileID: 0} ---- !u!1 &1991311615 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1439010666864111812, guid: f2d01e7f26c5bb04f8c22c15fbf7475b, - type: 3} - m_PrefabInstance: {fileID: 1967830428} - m_PrefabAsset: {fileID: 0} ---- !u!4 &1991311617 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1439010666864111823, guid: f2d01e7f26c5bb04f8c22c15fbf7475b, - type: 3} - m_PrefabInstance: {fileID: 1967830428} - m_PrefabAsset: {fileID: 0} --- !u!1 &1991362173 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7034199273745288373, guid: 126991d511ca61841a0ef899b6c038a6, @@ -38479,6 +38265,116 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 4362789101225005290} m_PrefabAsset: {fileID: 0} +--- !u!1 &2057791818 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2057791822} + - component: {fileID: 2057791821} + - component: {fileID: 2057791820} + - component: {fileID: 2057791819} + m_Layer: 0 + m_Name: Clue Video Screen + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &2057791819 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2057791818} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45115577ef41a5b4ca741ed302693907, type: 3} + m_Name: + m_EditorClassIdentifier: + interactTextPlacement: {fileID: 0} + interactText: Use + interactTextGO: {fileID: 0} + proximity: 2 + SynchronizePosition: 0 + AllowCollisionOwnershipTransfer: 0 + Reliable: 0 + _syncMethod: 3 + serializedProgramAsset: {fileID: 11400000, guid: c6cd9c3f50320a84bb381f84198b7f41, + type: 2} + programSource: {fileID: 11400000, guid: 16d6ecfcfa76a4e4abc298cf18be9ae7, type: 2} + serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgMAAAAAAAAAAi8CAAAAAW0AAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAVgBSAEMALgBTAEQASwAzAC4AVgBpAGQAZQBvAC4AQwBvAG0AcABvAG4AZQBuAHQAcwAuAEIAYQBzAGUALgBCAGEAcwBlAFYAUgBDAFYAaQBkAGUAbwBQAGwAYQB5AGUAcgAsACAAVgBSAEMAUwBEAEsAMwBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAQsAAABWAGkAZABlAG8AUABsAGEAeQBlAHIAJwEEAAAAdAB5AHAAZQABFwAAAFMAeQBzAHQAZQBtAC4ATwBiAGoAZQBjAHQALAAgAG0AcwBjAG8AcgBsAGkAYgAtAQUAAABWAGEAbAB1AGUABwUCLwMAAAABSgAAAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAC4AVQBkAG8AbgBWAGEAcgBpAGEAYgBsAGUAYAAxAFsAWwBTAHkAcwB0AGUAbQAuAFMAaQBuAGcAbABlACwAIABtAHMAYwBvAHIAbABpAGIAXQBdACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgADAAAABgIAAAAAAAAAJwEEAAAAdAB5AHAAZQABFwAAAFMAeQBzAHQAZQBtAC4AUwB0AHIAaQBuAGcALAAgAG0AcwBjAG8AcgBsAGkAYgAnAQoAAABTAHkAbQBiAG8AbABOAGEAbQBlAAENAAAAUwB5AG4AYwBGAHIAZQBxAHUAZQBuAGMAeQAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAGkAbgBnAGwAZQAsACAAbQBzAGMAbwByAGwAaQBiAB8BBQAAAFYAYQBsAHUAZQAAAHBBBwUCLwQAAAABSQAAAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAC4AVQBkAG8AbgBWAGEAcgBpAGEAYgBsAGUAYAAxAFsAWwBTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiAF0AXQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ABAAAAAYCAAAAAAAAACcBBAAAAHQAeQBwAGUAARcAAABTAHkAcwB0AGUAbQAuAFMAdAByAGkAbgBnACwAIABtAHMAYwBvAHIAbABpAGIAJwEKAAAAUwB5AG0AYgBvAGwATgBhAG0AZQABHwAAAF8AXwBfAFUAZABvAG4AUwBoAGEAcgBwAEIAZQBoAGEAdgBpAG8AdQByAFYAZQByAHMAaQBvAG4AXwBfAF8AJwEEAAAAdAB5AHAAZQABFgAAAFMAeQBzAHQAZQBtAC4ASQBuAHQAMwAyACwAIABtAHMAYwBvAHIAbABpAGIAFwEFAAAAVgBhAGwAdQBlAAIAAAAHBQcFBwU= + publicVariablesUnityEngineObjects: [] + publicVariablesSerializationDataFormat: 0 +--- !u!114 &2057791820 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2057791818} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6e7dbaee3b57f2e4fbdc7204cc644995, type: 3} + m_Name: + m_EditorClassIdentifier: + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: [] + _udonSharpBackingUdonBehaviour: {fileID: 2057791819} + VideoPlayer: {fileID: 2057791821} + SyncFrequency: 15 +--- !u!114 &2057791821 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2057791818} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -560078975, guid: 661092b4961be7145bfbe56e1e62337b, type: 3} + m_Name: + m_EditorClassIdentifier: + EnableAutomaticResync: 0 + videoURL: + url: + autoPlay: 0 + loop: 0 + renderMode: 1 + targetTexture: {fileID: 0} + targetMaterialRenderer: {fileID: 1123401066} + targetMaterialProperty: _MainTex + aspectRatio: 1 + targetAudioSources: + - {fileID: 2018849108} + maximumResolution: 480 +--- !u!4 &2057791822 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2057791818} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0.9238792, z: 0, w: 0.3826842} + m_LocalPosition: {x: 3.002, y: 1.232, z: 12.857} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1123401067} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2059107781 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1233416562922120989, guid: 126991d511ca61841a0ef899b6c038a6, @@ -43956,33 +43852,34 @@ MonoBehaviour: useAssignedLayers: 0 DynamicPrefabs: [] DynamicMaterials: + - {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2} + - {fileID: 2100000, guid: 4877371455c14a9459593994036db53b, type: 2} + - {fileID: 2100000, guid: c1b531b2f1a7dab43b46daa7546cfda7, type: 2} - {fileID: 2100000, guid: 0c3dfdcd7a2a6ac408ec3d431f9a4932, type: 2} - {fileID: 2100000, guid: accd304c49b7d6d43b97738e8e118342, type: 2} - {fileID: 2100000, guid: 2c0cd617d97924748a9d5e2eeb2039b5, type: 2} - - {fileID: 2100000, guid: cba30de4550b90f4f8ef7bc7d94faf95, type: 2} - - {fileID: 2100000, guid: c1b531b2f1a7dab43b46daa7546cfda7, type: 2} - - {fileID: 2100000, guid: 5a56ded101f363e46861c8fe1c4f360e, type: 2} - - {fileID: 2100000, guid: f025bfafc9ecec74aa3aab468ef837d7, type: 2} - - {fileID: 2100000, guid: 49170bf20870c7c45873b3c1966d86af, type: 2} - - {fileID: 2100000, guid: 95dd396b63c6ad4429ad37eedc63f20c, type: 2} - - {fileID: 2100000, guid: 74aa3dbc50df9464e8d9d11815b389a7, type: 2} - - {fileID: 2100000, guid: 79cb8dae66bc60241b5964b24ff1ac7e, type: 2} - {fileID: 2100000, guid: 50e427994e5b0224f966b200c577b78b, type: 2} + - {fileID: 2100000, guid: 220d5a1f1701e674794a1083cc2f0bac, type: 2} + - {fileID: 2100000, guid: 49170bf20870c7c45873b3c1966d86af, type: 2} + - {fileID: 2100000, guid: f025bfafc9ecec74aa3aab468ef837d7, type: 2} - {fileID: 2100000, guid: d811246c848733b4c8310b4dec5a5fdf, type: 2} - {fileID: 2100000, guid: 82bace4c334919c4f92e87905c39fdf8, type: 2} - {fileID: 2100000, guid: c4382cc6d54262b46913ae6fe8a3740e, type: 2} - {fileID: 2100000, guid: 7eb7cd9bfc12d4c4198d1874ca5a1aa4, type: 2} + - {fileID: 2100000, guid: 95dd396b63c6ad4429ad37eedc63f20c, type: 2} + - {fileID: 2100000, guid: 74aa3dbc50df9464e8d9d11815b389a7, type: 2} + - {fileID: 2100000, guid: 79cb8dae66bc60241b5964b24ff1ac7e, type: 2} + - {fileID: 2100000, guid: 5a56ded101f363e46861c8fe1c4f360e, type: 2} - {fileID: 2100000, guid: bd8b723337ae5824fa61f693f76e943f, type: 2} - {fileID: 2100000, guid: faae26a849699fc4b804b74882a344df, type: 2} + - {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2} - {fileID: 2100000, guid: a793cd1d5fe89c440900d816c7b8c323, type: 2} - {fileID: 2100000, guid: af0c1cbaaffed304ba0e3a1fbac41e7e, type: 2} - {fileID: 2100000, guid: cc22c7f9de95cab4488b30fe8699a82a, type: 2} - {fileID: 2100000, guid: fe872fb72ad98da4dbb868481468e848, type: 2} - - {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2} - {fileID: 2100000, guid: 71ede89a28bd60e4ca2918572046ba90, type: 2} - - {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2} - {fileID: 2100000, guid: 80746b095abb6ce41a1c737df3649172, type: 2} - - {fileID: 2100000, guid: 220d5a1f1701e674794a1083cc2f0bac, type: 2} + - {fileID: 2100000, guid: cba30de4550b90f4f8ef7bc7d94faf95, type: 2} - {fileID: 2100000, guid: 341141e903fac3e4ca54a62259c6d01d, type: 2} - {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2} LightMapsNear: [] @@ -46425,10 +46322,6 @@ MonoBehaviour: ID: 648 SerializedTypeNames: - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 1991311615} - ID: 649 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - gameObject: {fileID: 1018072943} ID: 650 SerializedTypeNames: @@ -46635,6 +46528,10 @@ MonoBehaviour: ID: 688 SerializedTypeNames: - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 2057791818} + ID: 689 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour portraitCameraPositionOffset: {x: 0, y: 0, z: 0} portraitCameraRotationOffset: {x: 0, y: 1, z: 0, w: -0.00000004371139} PlayerPersistence: [] @@ -47011,4 +46908,4 @@ SceneRoots: - {fileID: 6044205050412544512} - {fileID: 875814628} - {fileID: 938262255} - - {fileID: 1967830428} + - {fileID: 2057791822} diff --git a/Assets/UdonSharp/CaseVideoSyncPlayer.asset b/Assets/UdonSharp/CaseVideoSyncPlayer.asset new file mode 100644 index 0000000..dd58733 --- /dev/null +++ b/Assets/UdonSharp/CaseVideoSyncPlayer.asset @@ -0,0 +1,299 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} + m_Name: CaseVideoSyncPlayer + m_EditorClassIdentifier: + serializedUdonProgramAsset: {fileID: 11400000, guid: c6cd9c3f50320a84bb381f84198b7f41, + type: 2} + udonAssembly: + assemblyError: + sourceCsScript: {fileID: 11500000, guid: 6e7dbaee3b57f2e4fbdc7204cc644995, type: 3} + scriptVersion: 2 + compiledVersion: 2 + behaviourSyncMode: 4 + hasInteractEvent: 0 + scriptID: 6603328812358155820 + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: + - Name: fieldDefinitions + Entry: 7 + Data: 0|System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[UdonSharp.Compiler.FieldDefinition, + UdonSharp.Editor]], mscorlib + - Name: comparer + Entry: 7 + Data: 1|System.Collections.Generic.GenericEqualityComparer`1[[System.String, + mscorlib]], mscorlib + - Name: + Entry: 8 + Data: + - Name: + Entry: 12 + Data: 4 + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: VideoPlayer + - Name: $v + Entry: 7 + Data: 2|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: VideoPlayer + - Name: k__BackingField + Entry: 7 + Data: 3|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: VRC.SDK3.Video.Components.Base.BaseVRCVideoPlayer, VRCSDK3 + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 3 + - 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: true + - Name: _fieldAttributes + Entry: 7 + Data: 4|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 5|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: _VideoURL + - Name: $v + Entry: 7 + Data: 6|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _VideoURL + - Name: k__BackingField + Entry: 7 + Data: 7|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: VRC.SDKBase.VRCUrl, VRCSDKBase + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 7 + - 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: 8|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 2 + - Name: + Entry: 7 + Data: 9|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 10|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: _TimeAndOffset + - Name: $v + Entry: 7 + Data: 11|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _TimeAndOffset + - Name: k__BackingField + Entry: 7 + Data: 12|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.Vector2, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 12 + - 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: 13|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 2 + - Name: + Entry: 7 + Data: 14|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 15|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: SyncFrequency + - Name: $v + Entry: 7 + Data: 16|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: SyncFrequency + - Name: k__BackingField + Entry: 7 + Data: 17|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Single, mscorlib + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 17 + - 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: true + - Name: _fieldAttributes + Entry: 7 + Data: 18|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: 13 + Data: + - Name: + Entry: 8 + Data: diff --git a/Assets/UdonSharp/CaseVideoSyncPlayer.asset.meta b/Assets/UdonSharp/CaseVideoSyncPlayer.asset.meta new file mode 100644 index 0000000..96bd8ed --- /dev/null +++ b/Assets/UdonSharp/CaseVideoSyncPlayer.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 16d6ecfcfa76a4e4abc298cf18be9ae7 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UdonSharp/CaseVideoSyncPlayer.cs b/Assets/UdonSharp/CaseVideoSyncPlayer.cs new file mode 100644 index 0000000..b0fed1f --- /dev/null +++ b/Assets/UdonSharp/CaseVideoSyncPlayer.cs @@ -0,0 +1,72 @@ + +using UdonSharp; +using UnityEngine; +using VRC.SDK3.Video.Components.Base; +using VRC.SDKBase; + + +[UdonBehaviourSyncMode(BehaviourSyncMode.Manual)] +public class CaseVideoSyncPlayer : UdonSharpBehaviour +{ + [SerializeField] private BaseVRCVideoPlayer VideoPlayer; + [UdonSynced, FieldChangeCallback(nameof(VideoURL))] private VRCUrl _VideoURL; + [UdonSynced, FieldChangeCallback(nameof(TimeAndOffset))] private Vector2 _TimeAndOffset; + public float SyncFrequency = 15.0f; + + + public override void OnVideoStart() + { + UpdateTimeAndOffset(); + } + + private void UpdateTimeAndOffset() + { + if (Networking.IsOwner(gameObject)) + { + TimeAndOffset = new Vector2(VideoPlayer.GetTime(), (float)Networking.GetServerTimeInSeconds()); + RequestSerialization(); + + if (SyncFrequency > 0.0f) + { + SendCustomEventDelayedSeconds(nameof(UpdateTimeAndOffset), SyncFrequency); + } + } + else + { + SendCustomEvent(nameof(Resync)); + } + } + + public void Resync() + { + VideoPlayer.SetTime(TimeAndOffset.x + ((float)Networking.GetServerTimeInSeconds() - TimeAndOffset.y)); + } + + + public VRCUrl VideoURL + { + set + { + if (_VideoURL != value) + { + _VideoURL = value; + VideoPlayer.PlayURL(_VideoURL); + RequestSerialization(); + } + } + get => _VideoURL; + } + + public Vector2 TimeAndOffset + { + set + { + _TimeAndOffset = value; + if (!Networking.IsOwner(gameObject)) + { + SendCustomEvent(nameof(Resync)); + } + } + get => _TimeAndOffset; + } +} diff --git a/Assets/UdonSharp/CaseVideoSyncPlayer.cs.meta b/Assets/UdonSharp/CaseVideoSyncPlayer.cs.meta new file mode 100644 index 0000000..58fca3b --- /dev/null +++ b/Assets/UdonSharp/CaseVideoSyncPlayer.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 6e7dbaee3b57f2e4fbdc7204cc644995 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UdonSharp/Game Managers/CaseManager.cs b/Assets/UdonSharp/Game Managers/CaseManager.cs index 3cba6ec..738eb1a 100644 --- a/Assets/UdonSharp/Game Managers/CaseManager.cs +++ b/Assets/UdonSharp/Game Managers/CaseManager.cs @@ -96,7 +96,7 @@ public class CaseManager : UdonSharpBehaviour ErrorString = "Ensure the 'Round 3' dictionary entry is a dictionary with a key called 'Continent' and an integer value."; } - ContinueToRound3(); + ContinueToRound1(); } else { diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound1.asset b/Assets/UdonSharp/Game Managers/GameManagerRound1.asset index f206787..103c595 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound1.asset +++ b/Assets/UdonSharp/Game Managers/GameManagerRound1.asset @@ -242,19 +242,13 @@ MonoBehaviour: Data: 15|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: VRC.SDK3.Video.Components.VRCUnityVideoPlayer, VRCSDK3 + Data: CaseVideoSyncPlayer, Assembly-CSharp - Name: Entry: 8 Data: - Name: k__BackingField - Entry: 7 - Data: 16|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: VRC.SDK3.Video.Components.Base.BaseVRCVideoPlayer, VRCSDK3 - - Name: - Entry: 8 - Data: + Entry: 9 + Data: 4 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -269,13 +263,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 17|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 16|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 18|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 17|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -299,7 +293,7 @@ MonoBehaviour: Data: _GameHasBegun - Name: $v Entry: 7 - Data: 19|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 18|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _GameHasBegun @@ -323,13 +317,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 20|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 19|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 21|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 20|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -353,13 +347,13 @@ MonoBehaviour: Data: _QuestionIndex - Name: $v Entry: 7 - Data: 22|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 21|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _QuestionIndex - Name: k__BackingField Entry: 7 - Data: 23|System.RuntimeType, mscorlib + Data: 22|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Int32, mscorlib @@ -368,7 +362,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 23 + Data: 22 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -383,13 +377,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 24|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 23|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 25|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 24|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -413,16 +407,16 @@ MonoBehaviour: Data: _QuestionStage - Name: $v Entry: 7 - Data: 26|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 25|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _QuestionStage - Name: k__BackingField Entry: 9 - Data: 23 + Data: 22 - Name: k__BackingField Entry: 9 - Data: 23 + Data: 22 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -437,13 +431,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 27|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 26|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 28|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 27|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -467,16 +461,16 @@ MonoBehaviour: Data: _QuestionSubstage - Name: $v Entry: 7 - Data: 29|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 28|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _QuestionSubstage - Name: k__BackingField Entry: 9 - Data: 23 + Data: 22 - Name: k__BackingField Entry: 9 - Data: 23 + Data: 22 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -491,13 +485,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 30|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 29|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 31|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 30|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -521,16 +515,16 @@ MonoBehaviour: Data: _QuestionCorrectResponse - Name: $v Entry: 7 - Data: 32|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 31|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _QuestionCorrectResponse - Name: k__BackingField Entry: 9 - Data: 23 + Data: 22 - Name: k__BackingField Entry: 9 - Data: 23 + Data: 22 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -545,13 +539,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 33|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 32|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 34|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 33|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -575,13 +569,13 @@ MonoBehaviour: Data: _QuestionsList - Name: $v Entry: 7 - Data: 35|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 34|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _QuestionsList - Name: k__BackingField Entry: 7 - Data: 36|System.RuntimeType, mscorlib + Data: 35|System.RuntimeType, mscorlib - Name: Entry: 1 Data: VRC.SDK3.Data.DataList, VRCSDK3 @@ -590,7 +584,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 36 + Data: 35 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -605,7 +599,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 37|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 36|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -629,13 +623,13 @@ MonoBehaviour: Data: _CurrentQuestion - Name: $v Entry: 7 - Data: 38|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 37|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _CurrentQuestion - Name: k__BackingField Entry: 7 - Data: 39|System.RuntimeType, mscorlib + Data: 38|System.RuntimeType, mscorlib - Name: Entry: 1 Data: VRC.SDK3.Data.DataDictionary, VRCSDK3 @@ -644,7 +638,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 39 + Data: 38 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -659,7 +653,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 40|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 39|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -683,7 +677,7 @@ MonoBehaviour: Data: _BuzzInAllowed - Name: $v Entry: 7 - Data: 41|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 40|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _BuzzInAllowed @@ -707,13 +701,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 42|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 41|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 43|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 42|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -737,13 +731,13 @@ MonoBehaviour: Data: _PlayerBuzzInAllowed - Name: $v Entry: 7 - Data: 44|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 43|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _PlayerBuzzInAllowed - Name: k__BackingField Entry: 7 - Data: 45|System.RuntimeType, mscorlib + Data: 44|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Boolean[], mscorlib @@ -752,7 +746,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 45 + Data: 44 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -767,13 +761,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 46|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 45|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 47|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 46|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -797,16 +791,16 @@ MonoBehaviour: Data: _BuzzedInPlayer - Name: $v Entry: 7 - Data: 48|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 47|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _BuzzedInPlayer - Name: k__BackingField Entry: 9 - Data: 23 + Data: 22 - Name: k__BackingField Entry: 9 - Data: 23 + Data: 22 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -821,13 +815,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 49|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 48|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 50|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 49|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -851,13 +845,13 @@ MonoBehaviour: Data: _FinalRoundPlayersSortedByScore - Name: $v Entry: 7 - Data: 51|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 50|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _FinalRoundPlayersSortedByScore - Name: k__BackingField Entry: 7 - Data: 52|System.RuntimeType, mscorlib + Data: 51|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Int32[], mscorlib @@ -866,7 +860,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 52 + Data: 51 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -881,7 +875,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 53|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 52|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -905,13 +899,13 @@ MonoBehaviour: Data: _PlayerPodiums - Name: $v Entry: 7 - Data: 54|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 53|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _PlayerPodiums - Name: k__BackingField Entry: 7 - Data: 55|System.RuntimeType, mscorlib + Data: 54|System.RuntimeType, mscorlib - Name: Entry: 1 Data: PlayerPodium[], Assembly-CSharp @@ -920,7 +914,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 7 - Data: 56|System.RuntimeType, mscorlib + Data: 55|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.Component[], UnityEngine.CoreModule @@ -941,13 +935,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 57|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 56|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 58|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 57|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -971,13 +965,13 @@ MonoBehaviour: Data: _AudioManager - Name: $v Entry: 7 - Data: 59|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 58|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _AudioManager - Name: k__BackingField Entry: 7 - Data: 60|System.RuntimeType, mscorlib + Data: 59|System.RuntimeType, mscorlib - Name: Entry: 1 Data: AudioManager, Assembly-CSharp @@ -1001,13 +995,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 61|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 60|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 62|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 61|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound1.cs b/Assets/UdonSharp/Game Managers/GameManagerRound1.cs index 5981623..9e8a10e 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound1.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound1.cs @@ -20,7 +20,7 @@ public enum PresentationMedium public class GameManagerRound1 : GameManagerBase { [SerializeField] private CaseManager _CaseManager; - [SerializeField] private VRCUnityVideoPlayer _VideoPlayer; + [SerializeField] private CaseVideoSyncPlayer _VideoPlayer; [UdonSynced] protected bool _GameHasBegun = false; @@ -97,12 +97,11 @@ public class GameManagerRound1 : GameManagerBase private void PlayIntroVideo() { - //HostCardIntroInterface Interface = - // (HostCardIntroInterface)GetHostCardInterface(RoundSegmentType.Intro); - //Interface.HeaderUI.text = _CaseManager.GetCaseTitle(); - //Interface.IntroUI.text = _CaseManager.GetCaseDescription(); + HostCardBetweenRoundsInterface Interface = + (HostCardBetweenRoundsInterface)GetHostCardInterface(RoundSegmentType.BetweenSegments); + Interface.HeaderUI.text = "Playing intro video..."; - _VideoPlayer.PlayURL(_CaseManager.GetIntroVideo()); + _VideoPlayer.VideoURL = _CaseManager.GetIntroVideo(); EnableInteraction("Assign Points"); } @@ -167,7 +166,7 @@ public class GameManagerRound1 : GameManagerBase (HostCardBetweenRoundsInterface)GetHostCardInterface(RoundSegmentType.BetweenSegments); Interface.HeaderUI.text = "Playing video..."; - _VideoPlayer.PlayURL(_CaseManager.GetVideo((int)Videos[_QuestionSubstage].Number)); + _VideoPlayer.VideoURL = _CaseManager.GetVideo((int)Videos[_QuestionSubstage].Number); _QuestionSubstage++; EnableInteraction("Play Video"); diff --git a/Assets/UdonSharp/Location Board/LocationBoard.cs b/Assets/UdonSharp/Location Board/LocationBoard.cs index be2d77d..7bb4977 100644 --- a/Assets/UdonSharp/Location Board/LocationBoard.cs +++ b/Assets/UdonSharp/Location Board/LocationBoard.cs @@ -37,16 +37,20 @@ public class LocationBoard : UdonSharpBehaviour [UdonSynced, FieldChangeCallback(nameof(RandomMaterialSettings))] private int[] _RandomMaterialSettings; - private void Start() + void Start() { _HasBeenCheckedBefore = new bool[LocationPanelsEmpty.Length]; - - _Animator = GetComponent(); _LootImageDownloader = new VRCImageDownloader(); } + void OnDestroy() + { + _LootImageDownloader.Dispose(); + } + + [NetworkCallable] public void RevealPanel(int Panel) { 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: diff --git a/ProjectSettings/Packages/com.vrchat.base/settings.json b/ProjectSettings/Packages/com.vrchat.base/settings.json index f2f3db1..08a3844 100644 --- a/ProjectSettings/Packages/com.vrchat.base/settings.json +++ b/ProjectSettings/Packages/com.vrchat.base/settings.json @@ -3,6 +3,6 @@ "allowVRCPackageChanges": false, "samplesHintCreated": false, "debugVCCConnection": false, - "dpidMipmaps": false, + "dpidMipmaps": true, "dpidConservative": true } \ No newline at end of file diff --git a/Raw Files/T_WorldShapes.svg b/Raw Files/T_WorldShapes.svg index e8f281e..64a8019 100644 --- a/Raw Files/T_WorldShapes.svg +++ b/Raw Files/T_WorldShapes.svg @@ -8,7 +8,7 @@ viewBox="0 0 800 800" xml:space="preserve" id="svg334" - sodipodi:docname="world_shapes.svg" + sodipodi:docname="T_WorldShapes.svg" inkscape:export-filename="world.lines.png" inkscape:export-xdpi="1966.08" inkscape:export-ydpi="1966.08" @@ -45,15 +45,15 @@ inkscape:pageopacity="0.0" inkscape:pagecheckerboard="0" inkscape:deskcolor="#d1d1d1" - inkscape:zoom="1" - inkscape:cx="272.5" - inkscape:cy="406.5" + inkscape:zoom="2.8284271" + inkscape:cx="394.38881" + inkscape:cy="386.61063" inkscape:window-width="1920" inkscape:window-height="1057" inkscape:window-x="1912" inkscape:window-y="-8" inkscape:window-maximized="1" - inkscape:current-layer="g1" /> + inkscape:current-layer="layer1" />