diff --git a/Assets/Materials/ClueVideoScreen/M_ClueVideoScreen_Maps.mat b/Assets/Materials/ClueVideoScreen/M_ClueVideoScreen_Maps.mat index 106a0cc..7a2a985 100644 --- a/Assets/Materials/ClueVideoScreen/M_ClueVideoScreen_Maps.mat +++ b/Assets/Materials/ClueVideoScreen/M_ClueVideoScreen_Maps.mat @@ -42,13 +42,13 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _EmissionMap: - m_Texture: {fileID: 2800000, guid: 44aab33f67dfa2949a8bd0a7e20d40e7, type: 3} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 0} m_Scale: {x: 0.5, y: 0.33333334} - m_Offset: {x: 0.5, y: 0.33333334} + m_Offset: {x: 0, y: 0.6666667} - _MetallicGlossMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} diff --git a/Assets/Scenes/witwics.unity b/Assets/Scenes/witwics.unity index ff15739..05bf236 100644 --- a/Assets/Scenes/witwics.unity +++ b/Assets/Scenes/witwics.unity @@ -6887,7 +6887,11 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 5984335492357139332, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + insertIndex: -1 + addedObject: {fileID: 565536118} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} --- !u!4 &172614116 stripped @@ -8651,13 +8655,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 258191296} serializedVersion: 2 - m_LocalRotation: {x: -0, y: 1, z: -0, w: 0} - m_LocalPosition: {x: -1.5, y: 0, z: 5.0529995} + m_LocalRotation: {x: -0, y: -0.00000013411044, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.7399998} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1479296706} - m_Father: {fileID: 967863683} + m_Father: {fileID: 4438766482650780790} m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} --- !u!1 &259070621 stripped GameObject: @@ -12368,6 +12372,90 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1499591484} m_PrefabAsset: {fileID: 0} +--- !u!1001 &413014351 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1005643830} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.8919997 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.21000004 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, + type: 3} + propertyPath: m_LocalPosition.z + value: -4.1709995 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.99763656 + 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.06871185 + 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 + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 82f2961c9baa48a45ac897be257fd655, type: 2} + - target: {fileID: 919132149155446097, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, + type: 3} + propertyPath: m_Name + value: ClueScreen_Map_Player1 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, + type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, type: 3} +--- !u!4 &413014352 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, + type: 3} + m_PrefabInstance: {fileID: 413014351} + m_PrefabAsset: {fileID: 0} --- !u!1 &422534423 GameObject: m_ObjectHideFlags: 0 @@ -15435,13 +15523,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 565536117} serializedVersion: 2 - m_LocalRotation: {x: -0, y: 1, z: -0, w: 0} - m_LocalPosition: {x: 0, y: 0, z: 5.0529995} + m_LocalRotation: {x: -0, y: -0.00000013411044, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.7399998} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1742169374} - m_Father: {fileID: 967863683} + m_Father: {fileID: 172614116} m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} --- !u!1 &565647852 stripped GameObject: @@ -21010,7 +21098,7 @@ Transform: m_GameObject: {fileID: 875814627} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 9.28, y: 0, z: 9} + m_LocalPosition: {x: -1.0600004, y: 0, z: 5.8} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -21019,7 +21107,7 @@ Transform: - {fileID: 134225858} - {fileID: 1499591485} - {fileID: 1042026145} - m_Father: {fileID: 0} + m_Father: {fileID: 1343307840} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &880665909 stripped GameObject: @@ -22218,7 +22306,11 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 5984335492357139332, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1033478778} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} --- !u!4 &937910638 stripped @@ -22258,7 +22350,7 @@ Transform: m_GameObject: {fileID: 938262254} serializedVersion: 2 m_LocalRotation: {x: -0, y: 0.70710707, z: -0, w: 0.70710653} - m_LocalPosition: {x: 10.34, y: 0, z: 3.2} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -22275,7 +22367,7 @@ Transform: - {fileID: 1723193653} - {fileID: 87761582} - {fileID: 65693453} - m_Father: {fileID: 0} + m_Father: {fileID: 1343307840} m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!1 &940078611 stripped GameObject: @@ -22810,9 +22902,6 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 889528276} - - {fileID: 258191297} - - {fileID: 565536118} - - {fileID: 1033478778} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &968067202 stripped @@ -23550,7 +23639,19 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, + type: 3} + insertIndex: -1 + addedObject: {fileID: 413014352} + - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1587075298} + - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1481802714} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, type: 3} --- !u!23 &1005643829 stripped @@ -24498,13 +24599,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1033478777} serializedVersion: 2 - m_LocalRotation: {x: -0, y: 1, z: -0, w: 0} - m_LocalPosition: {x: 1.5, y: 0, z: 5.0529995} + m_LocalRotation: {x: -0, y: -0.00000013411044, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.7399998} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1831074713} - m_Father: {fileID: 967863683} + m_Father: {fileID: 937910638} m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} --- !u!1 &1033844166 stripped GameObject: @@ -27678,6 +27779,90 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 134225857} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1062128159 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1123401067} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.672 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.14999998 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, + type: 3} + propertyPath: m_LocalPosition.z + value: -1.932 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.98328674 + 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.18206395 + 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 + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 20.98 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: cba30de4550b90f4f8ef7bc7d94faf95, type: 2} + - target: {fileID: 919132149155446097, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, + type: 3} + propertyPath: m_Name + value: ClueScreen_Video_Player3 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, + type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, type: 3} +--- !u!4 &1062128160 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, + type: 3} + m_PrefabInstance: {fileID: 1062128159} + m_PrefabAsset: {fileID: 0} --- !u!1 &1063896932 GameObject: m_ObjectHideFlags: 0 @@ -28832,7 +29017,19 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1804159805} + - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1934543461} + - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1062128160} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, type: 3} --- !u!23 &1123401066 stripped @@ -32265,6 +32462,39 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 4362789101225005290} m_PrefabAsset: {fileID: 0} +--- !u!1 &1343307839 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1343307840} + m_Layer: 0 + m_Name: GameObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1343307840 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1343307839} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 10.34, y: 0, z: 3.2} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 938262255} + - {fileID: 875814628} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1344900959 stripped GameObject: m_CorrespondingSourceObject: {fileID: 2109466850552071637, guid: 126991d511ca61841a0ef899b6c038a6, @@ -35110,6 +35340,90 @@ Canvas: m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 +--- !u!1001 &1481802713 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1005643830} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.59999967 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.14999998 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, + type: 3} + propertyPath: m_LocalPosition.z + value: -1.9599993 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.98328674 + 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.18206397 + 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 + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 20.98 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 82f2961c9baa48a45ac897be257fd655, type: 2} + - target: {fileID: 919132149155446097, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, + type: 3} + propertyPath: m_Name + value: ClueScreen_Map_Player3 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, + type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, type: 3} +--- !u!4 &1481802714 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, + type: 3} + m_PrefabInstance: {fileID: 1481802713} + m_PrefabAsset: {fileID: 0} --- !u!1 &1483021933 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7077940996859628640, guid: 126991d511ca61841a0ef899b6c038a6, @@ -43355,6 +43669,90 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1584051217} m_CullTransparentMesh: 1 +--- !u!1001 &1587075297 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1005643830} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.03399992 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.21000004 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, + type: 3} + propertyPath: m_LocalPosition.z + value: -2.9309998 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.9997986 + 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.020069959 + 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 + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 82f2961c9baa48a45ac897be257fd655, type: 2} + - target: {fileID: 919132149155446097, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, + type: 3} + propertyPath: m_Name + value: ClueScreen_Map_Player2 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, + type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, type: 3} +--- !u!4 &1587075298 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, + type: 3} + m_PrefabInstance: {fileID: 1587075297} + m_PrefabAsset: {fileID: 0} --- !u!1 &1589630266 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6693907286767766257, guid: 79ebe62246f7f464e98373cb14765f9a, @@ -46366,6 +46764,90 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1801735036} m_CullTransparentMesh: 1 +--- !u!1001 &1804159804 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1123401067} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.892 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.21 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, + type: 3} + propertyPath: m_LocalPosition.z + value: -4.171 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.9976366 + 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.068711855 + 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 + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -7.88 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: cba30de4550b90f4f8ef7bc7d94faf95, type: 2} + - target: {fileID: 919132149155446097, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, + type: 3} + propertyPath: m_Name + value: ClueScreen_Video_Player1 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, + type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, type: 3} +--- !u!4 &1804159805 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, + type: 3} + m_PrefabInstance: {fileID: 1804159804} + m_PrefabAsset: {fileID: 0} --- !u!1 &1804451440 stripped GameObject: m_CorrespondingSourceObject: {fileID: 8175345911954176237, guid: 6587765855cbbb94c8cc3eb80d5956d6, @@ -48890,6 +49372,90 @@ Transform: m_Children: [] m_Father: {fileID: 379391076} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1934543460 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1123401067} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.034 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.21 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, + type: 3} + propertyPath: m_LocalPosition.z + value: -2.931 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.9997986 + 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.020069981 + 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 + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 2.3 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: cba30de4550b90f4f8ef7bc7d94faf95, type: 2} + - target: {fileID: 919132149155446097, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, + type: 3} + propertyPath: m_Name + value: ClueScreen_Video_Player2 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, + type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, type: 3} +--- !u!4 &1934543461 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, + type: 3} + m_PrefabInstance: {fileID: 1934543460} + m_PrefabAsset: {fileID: 0} --- !u!1 &1935371336 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6765471103024047190, guid: 899ce13087fd5974f88dcbccaea2df85, @@ -56034,7 +56600,11 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 5984335492357139332, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + insertIndex: -1 + addedObject: {fileID: 258191297} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} --- !u!4 &4438766482650780790 stripped @@ -61717,6 +62287,5 @@ SceneRoots: - {fileID: 824788960} - {fileID: 1855771788} - {fileID: 6044205050412544512} - - {fileID: 875814628} - - {fileID: 938262255} + - {fileID: 1343307840} - {fileID: 2057791822} diff --git a/Assets/UdonSharp/CaseVideoSyncPlayer.cs b/Assets/UdonSharp/CaseVideoSyncPlayer.cs index ed1c559..e2b9e41 100644 --- a/Assets/UdonSharp/CaseVideoSyncPlayer.cs +++ b/Assets/UdonSharp/CaseVideoSyncPlayer.cs @@ -63,22 +63,37 @@ public class CaseVideoSyncPlayer : UdonSharpBehaviour { if (_MapDownloadsInProgress) { - Debug.LogError("[CaseVideoSyncPlayer] Cannot currently requeue a map download while one is in progress."); - return; + // Concatenate both caches into a new bigger cache and await new downloads as usual + int[] NewMapIndicesCache = new int[_CachedMapIndices.Length + MapIndices.Length]; + Texture2D[] NewMapImages = new Texture2D[_CachedMapIndices.Length + MapIndices.Length]; + for (int i = 0; i < _CachedMapIndices.Length; i++) + { + NewMapIndicesCache[i] = _CachedMapIndices[i]; + NewMapImages[i] = _MapImages[i]; + } + for (int i = 0; i < MapIndices.Length; i++) + { + NewMapIndicesCache[i + _CachedMapIndices.Length] = MapIndices[i]; + NewMapImages[i + _CachedMapIndices.Length] = _PlaceholderMapTexture; + } + _CachedMapIndices = NewMapIndicesCache; + _MapImages = NewMapImages; } - - _MapDownloadsInProgress = true; - _CachedMapIndices = MapIndices; - - _MapImages = new Texture2D[_CachedMapIndices.Length]; - for (int i = 0; i < _MapImages.Length; i++) + else { - _MapImages[i] = _PlaceholderMapTexture; - } + _MapDownloadsInProgress = true; + _CachedMapIndices = MapIndices; - _SubMapIndex = 0; - _MapDownloadIndex = 0; - LoadMapFromIndex(_CachedMapIndices[_MapDownloadIndex]); + _MapImages = new Texture2D[_CachedMapIndices.Length]; + for (int i = 0; i < _MapImages.Length; i++) + { + _MapImages[i] = _PlaceholderMapTexture; + } + + _SubMapIndex = 0; + _MapDownloadIndex = 0; + LoadMapFromIndex(_CachedMapIndices[_MapDownloadIndex]); + } } private void LoadMapFromIndex(int MapIndex) { @@ -88,15 +103,14 @@ public class CaseVideoSyncPlayer : UdonSharpBehaviour AdditionalTextureInfo.WrapModeU = TextureWrapMode.Clamp; AdditionalTextureInfo.WrapModeV = TextureWrapMode.Clamp; AdditionalTextureInfo.GenerateMipMaps = true; - _MapDownloader.DownloadImage( - MapURL, null, _UdonEventReceiverThis, AdditionalTextureInfo); + _MapDownloader.DownloadImage(MapURL, null, _UdonEventReceiverThis, AdditionalTextureInfo); } public override void OnImageLoadSuccess(IVRCImageDownload Result) { _MapImages[_MapDownloadIndex] = Result.Result; int MapPage = SubMapIndex / IMAGES_PER_MAP_ATLAS; - if (MapPage == _CachedMapIndices[MapPage]) + if (MapPage == _MapDownloadIndex) { _MapScreenMesh.sharedMaterial.SetTexture("_EmissionMap", _MapImages[MapPage]); } diff --git a/Assets/UdonSharp/UtilityScripts/BoneFollower.asset b/Assets/UdonSharp/UtilityScripts/BoneFollower.asset index 036a370..b946757 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: 52ecc8a73071e8e40928c3609699fcf4, + serializedUdonProgramAsset: {fileID: 11400000, guid: ccbda9bf23e2f714c9226283c77a92e5, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/InteractToggle.asset b/Assets/UdonSharp/UtilityScripts/InteractToggle.asset index 13d78db..b35639e 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: 873dfce61b1514e429c92e0d2fded7de, + serializedUdonProgramAsset: {fileID: 11400000, guid: 405e38d3dfb2f514daeed0e28fbb4864, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset b/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset index d89a1a4..1def3de 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: e81558796a212ab4d88e305e2010f24b, + serializedUdonProgramAsset: {fileID: 11400000, guid: f938e6c4ff027a74da405a1f9353fd2b, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset b/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset index ea98aa4..8101274 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: 2fe8ced6184000f49bca526cd2c5891c, + serializedUdonProgramAsset: {fileID: 11400000, guid: c49c9265a3ef24642a6a4465d0a78872, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset b/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset index b4b3ede..901d05e 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: a2d01d9f36ac6df49831be249e48ecc4, + serializedUdonProgramAsset: {fileID: 11400000, guid: 04024a76ab1924042ba521e11cb76d91, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset b/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset index c624599..da92932 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: 1b89d4552983c0448a7389decec3b555, + serializedUdonProgramAsset: {fileID: 11400000, guid: 17f8fbbe6cc186d4f8dbb057b01a4ec2, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset b/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset index 5226f4f..ee4621f 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: 994b559b0f158b4499f8937980ed8694, + serializedUdonProgramAsset: {fileID: 11400000, guid: 128d924a3066b7546b2d1c73e61006ab, type: 2} udonAssembly: assemblyError: