diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index 51ac20309..2e28d0846 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -1202,78 +1202,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 50431271} m_Mesh: {fileID: 3345599416590039844, guid: 0d3e86850c8455e4480e0c0df4ba9954, type: 3} ---- !u!1 &51112559 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 51112561} - - component: {fileID: 51112560} - m_Layer: 0 - m_Name: Virtual Camera (0) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &51112560 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 51112559} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ExcludedPropertiesInInspector: - - m_Script - m_LockStageInInspector: - m_StreamingVersion: 20170927 - m_Priority: 10 - m_StandbyUpdate: 0 - m_LookAt: {fileID: 0} - m_Follow: {fileID: 0} - m_Lens: - FieldOfView: 60.000004 - OrthographicSize: 5 - NearClipPlane: 0.3 - FarClipPlane: 1000 - Dutch: 0 - ModeOverride: 0 - LensShift: {x: 0, y: 0} - GateFit: 2 - FocusDistance: 10 - m_SensorSize: {x: 1, y: 1} - m_Transitions: - m_BlendHint: 0 - m_InheritPosition: 0 - m_OnCameraLive: - m_PersistentCalls: - m_Calls: [] - m_LegacyBlendHint: 0 - m_ComponentOwner: {fileID: 1314641718} ---- !u!4 &51112561 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 51112559} - serializedVersion: 2 - m_LocalRotation: {x: -0.027840808, y: -0.52912784, z: 0.017350325, w: -0.8479078} - m_LocalPosition: {x: -186.57196, y: -277.78873, z: 349.12134} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1314641718} - m_Father: {fileID: 1749806948} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &52902141 GameObject: m_ObjectHideFlags: 0 @@ -3195,78 +3123,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 87089387} m_Mesh: {fileID: -1761136395896568894, guid: 0d3e86850c8455e4480e0c0df4ba9954, type: 3} ---- !u!1 &89181486 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 89181488} - - component: {fileID: 89181487} - m_Layer: 0 - m_Name: Virtual Camera (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &89181487 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 89181486} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ExcludedPropertiesInInspector: - - m_Script - m_LockStageInInspector: - m_StreamingVersion: 20170927 - m_Priority: 10 - m_StandbyUpdate: 0 - m_LookAt: {fileID: 0} - m_Follow: {fileID: 0} - m_Lens: - FieldOfView: 60.000004 - OrthographicSize: 5 - NearClipPlane: 0.3 - FarClipPlane: 1000 - Dutch: 0 - ModeOverride: 0 - LensShift: {x: 0, y: 0} - GateFit: 2 - FocusDistance: 10 - m_SensorSize: {x: 1, y: 1} - m_Transitions: - m_BlendHint: 0 - m_InheritPosition: 0 - m_OnCameraLive: - m_PersistentCalls: - m_Calls: [] - m_LegacyBlendHint: 0 - m_ComponentOwner: {fileID: 1348056747} ---- !u!4 &89181488 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 89181486} - serializedVersion: 2 - m_LocalRotation: {x: -0.034800973, y: -0.011901004, z: 0.00039756106, w: -0.99932337} - m_LocalPosition: {x: 111.34887, y: -256.42496, z: 34.932556} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1348056747} - m_Father: {fileID: 1749806948} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &89889080 GameObject: m_ObjectHideFlags: 0 @@ -7236,111 +7092,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 200711720} m_Mesh: {fileID: 3556649021719004385, guid: 0d3e86850c8455e4480e0c0df4ba9954, type: 3} ---- !u!1 &202641185 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 202641189} - - component: {fileID: 202641188} - - component: {fileID: 202641187} - - component: {fileID: 202641186} - m_Layer: 0 - m_Name: Cube1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!65 &202641186 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 202641185} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!23 &202641187 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 202641185} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &202641188 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 202641185} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!4 &202641189 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 202641185} - serializedVersion: 2 - m_LocalRotation: {x: -0.15780099, y: -0.49608877, z: 0.09222834, w: -0.8488161} - m_LocalPosition: {x: -175.52783, y: -277.0431, z: 362.32425} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1749806948} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &203012124 GameObject: m_ObjectHideFlags: 0 @@ -18840,7 +18591,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &499201850 Transform: m_ObjectHideFlags: 0 @@ -22296,7 +22047,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &569430223 MonoBehaviour: m_ObjectHideFlags: 0 @@ -30202,6 +29953,52 @@ MonoBehaviour: NorthColor: {r: 0.46540874, g: 0.106839046, b: 0.106839046, a: 1} inputActionAsset: {fileID: -944628639613478452, guid: d5b2b155332606d44ac795422ed556b6, type: 3} +--- !u!114 &767208773 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 767208734} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 35994eddf775043c1a32f66b8670b9c5, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &767208774 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 767208734} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 72ece51f2901e7445ab60da3685d6b5f, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowDebugText: 0 + m_ShowCameraFrustum: 1 + m_IgnoreTimeScale: 0 + m_WorldUpOverride: {fileID: 0} + m_UpdateMethod: 2 + m_BlendUpdateMethod: 1 + m_DefaultBlend: + m_Style: 1 + m_Time: 2 + m_CustomCurve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_CustomBlends: {fileID: 0} + m_CameraCutEvent: + m_PersistentCalls: + m_Calls: [] + m_CameraActivatedEvent: + m_PersistentCalls: + m_Calls: [] --- !u!1 &769194498 GameObject: m_ObjectHideFlags: 0 @@ -42834,111 +42631,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1099619275} m_Mesh: {fileID: 4168981497820250969, guid: 0d3e86850c8455e4480e0c0df4ba9954, type: 3} ---- !u!1 &1103050768 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1103050772} - - component: {fileID: 1103050771} - - component: {fileID: 1103050770} - - component: {fileID: 1103050769} - m_Layer: 0 - m_Name: Cube2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!65 &1103050769 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1103050768} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!23 &1103050770 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1103050768} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &1103050771 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1103050768} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!4 &1103050772 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1103050768} - serializedVersion: 2 - m_LocalRotation: {x: -0.17745596, y: -0.18855253, z: 0.034664918, w: -0.965275} - m_LocalPosition: {x: -25.031715, y: -253.13118, z: 135.34534} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1749806948} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1104141721 GameObject: m_ObjectHideFlags: 0 @@ -53482,50 +53174,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1313080840} m_Mesh: {fileID: -8686329798276946277, guid: 0d3e86850c8455e4480e0c0df4ba9954, type: 3} ---- !u!1 &1314641717 -GameObject: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1314641718} - - component: {fileID: 1314641719} - m_Layer: 0 - m_Name: cm - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1314641718 -Transform: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1314641717} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 51112561} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1314641719 -MonoBehaviour: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1314641717} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1314804653 GameObject: m_ObjectHideFlags: 0 @@ -54854,50 +54502,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1345516711} m_Mesh: {fileID: 6431925395033506736, guid: 0d3e86850c8455e4480e0c0df4ba9954, type: 3} ---- !u!1 &1348056746 -GameObject: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1348056747} - - component: {fileID: 1348056748} - m_Layer: 0 - m_Name: cm - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1348056747 -Transform: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1348056746} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 89181488} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1348056748 -MonoBehaviour: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1348056746} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1348182821 GameObject: m_ObjectHideFlags: 0 @@ -71772,6 +71376,7 @@ GameObject: m_Component: - component: {fileID: 1749806948} - component: {fileID: 1749806947} + - component: {fileID: 1749806949} m_Layer: 0 m_Name: Animaties m_TagString: Untagged @@ -71795,14 +71400,14 @@ PlayableDirector: m_InitialTime: 0 m_SceneBindings: - key: {fileID: 4259865494955256669, guid: 7c0a4de1fca4bf94881f55a9887940f6, type: 2} - value: {fileID: 569430223} + value: {fileID: 767208774} - key: {fileID: 55711846184140728, guid: 7c0a4de1fca4bf94881f55a9887940f6, type: 2} value: {fileID: 499201851} m_ExposedReferences: m_References: - - 233bde0d58f8dbb43927687913d0f0b3: {fileID: 51112560} - - 7b9a3ade1b113a541b71bb16d4ba1b9f: {fileID: 51112560} - - 906062caa11c52e4ebee6f2d72aa1469: {fileID: 89181487} + - 233bde0d58f8dbb43927687913d0f0b3: {fileID: 0} + - 7b9a3ade1b113a541b71bb16d4ba1b9f: {fileID: 0} + - 906062caa11c52e4ebee6f2d72aa1469: {fileID: 0} --- !u!4 &1749806948 Transform: m_ObjectHideFlags: 0 @@ -71817,13 +71422,21 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 499201850} - - {fileID: 202641189} - - {fileID: 1103050772} - {fileID: 569430227} - - {fileID: 89181488} - - {fileID: 51112561} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1749806949 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1749806946} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1dc3cc0a8d2be42528f78deafe0bfcd3, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1750574293 GameObject: m_ObjectHideFlags: 0 @@ -85381,6 +84994,11 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 2142188160281320149, guid: 0f6ad95dabe72044aa90eb8ae2e45366, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5315891981602308678, guid: 0f6ad95dabe72044aa90eb8ae2e45366, type: 3} propertyPath: m_TargetDisplay @@ -85409,7 +85027,7 @@ PrefabInstance: - target: {fileID: 5315891981602308680, guid: 0f6ad95dabe72044aa90eb8ae2e45366, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8068913146316752299, guid: 0f6ad95dabe72044aa90eb8ae2e45366, type: 3} @@ -85428,6 +85046,14 @@ PrefabInstance: type: 3} insertIndex: -1 addedObject: {fileID: 767208763} + - targetCorrespondingSourceObject: {fileID: 5315891981602308680, guid: 0f6ad95dabe72044aa90eb8ae2e45366, + type: 3} + insertIndex: -1 + addedObject: {fileID: 767208773} + - targetCorrespondingSourceObject: {fileID: 5315891981602308680, guid: 0f6ad95dabe72044aa90eb8ae2e45366, + type: 3} + insertIndex: -1 + addedObject: {fileID: 767208774} m_SourcePrefab: {fileID: 100100000, guid: 0f6ad95dabe72044aa90eb8ae2e45366, type: 3} --- !u!1001 &2488954073963816146 PrefabInstance: diff --git a/Assets/Scripts/CameraPositionToMarker.cs b/Assets/Scripts/CameraPositionToMarker.cs index 090f9d3d9..182175b8f 100644 --- a/Assets/Scripts/CameraPositionToMarker.cs +++ b/Assets/Scripts/CameraPositionToMarker.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.InputSystem; +using Netherlands3D.Twin.FloatingOrigin; namespace Netherlands3D.Twin { @@ -19,7 +20,8 @@ private void Update() private void CreateMarker(Transform transform) { - var marker = SavePersistentGameObject.CreatePlayModeObject("Marker"); + var marker = SavePersistentGameObject.CreatePlayModeObject("Virtual Camera Marker"); + marker.AddComponent(); marker.transform.position = transform.position; marker.transform.rotation = transform.rotation; marker.transform.localScale = transform.localScale; diff --git a/Assets/Timeline/AnimatiesTimeline.playable b/Assets/Timeline/AnimatiesTimeline.playable index 30817dae1..5a884cabf 100644 --- a/Assets/Timeline/AnimatiesTimeline.playable +++ b/Assets/Timeline/AnimatiesTimeline.playable @@ -31,54 +31,12 @@ MonoBehaviour: m_Version: 0 m_Tracks: - {fileID: 4259865494955256669} - - {fileID: 55711846184140728} m_FixedDuration: 0 m_EditorSettings: m_Framerate: 60 m_ScenePreview: 1 m_DurationMode: 0 m_MarkerTrack: {fileID: 0} ---- !u!114 &55711846184140728 -MonoBehaviour: - m_ObjectHideFlags: 1 - 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: d21dcc2386d650c4597f3633c75a1f98, type: 3} - m_Name: Animation Track - m_EditorClassIdentifier: - m_Version: 3 - m_AnimClip: {fileID: 0} - m_Locked: 0 - m_Muted: 0 - m_CustomPlayableFullTypename: - m_Curves: {fileID: 0} - m_Parent: {fileID: 11400000} - m_Children: [] - m_Clips: [] - m_Markers: - m_Objects: [] - m_InfiniteClipPreExtrapolation: 1 - m_InfiniteClipPostExtrapolation: 1 - m_InfiniteClipOffsetPosition: {x: 537, y: -103.26001, z: 766} - m_InfiniteClipOffsetEulerAngles: {x: -0, y: 0, z: 0} - m_InfiniteClipTimeOffset: 0 - m_InfiniteClipRemoveOffset: 0 - m_InfiniteClipApplyFootIK: 1 - mInfiniteClipLoop: 0 - m_MatchTargetFields: 63 - m_Position: {x: 0, y: 0, z: 0} - m_EulerAngles: {x: 0, y: 0, z: 0} - m_AvatarMask: {fileID: 0} - m_ApplyAvatarMask: 1 - m_TrackOffset: 0 - m_InfiniteClip: {fileID: 8722785339174963897} - m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1} - m_Rotation: {x: 0, y: 0, z: 0, w: 1} - m_ApplyOffsets: 0 --- !u!114 &3717277431690443007 MonoBehaviour: m_ObjectHideFlags: 1 @@ -135,25 +93,7 @@ MonoBehaviour: m_RotationOrder: 4 m_MixOutCurve: serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 + m_Curve: [] m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -249,25 +189,7 @@ MonoBehaviour: m_BlendOutDuration: -1 m_MixInCurve: serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 + m_Curve: [] m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -305,178 +227,3 @@ MonoBehaviour: VirtualCamera: exposedName: 906062caa11c52e4ebee6f2d72aa1469 defaultValue: {fileID: 0} ---- !u!74 &8722785339174963897 -AnimationClip: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Recorded - serializedVersion: 7 - m_Legacy: 0 - m_Compressed: 0 - m_UseHighQualityCurve: 1 - m_RotationCurves: [] - m_CompressedRotationCurves: [] - m_EulerCurves: [] - m_PositionCurves: - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: {x: 4, y: 0, z: 0} - inSlope: {x: -30.664072, y: 0, z: 0} - outSlope: {x: -30.664072, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.008274143, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 17.983334 - value: {x: -798, y: 0, z: 0} - inSlope: {x: -28.792837, y: 0, z: 0} - outSlope: {x: -28.792837, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.008481885, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - path: - m_ScaleCurves: [] - m_FloatCurves: [] - m_PPtrCurves: [] - m_SampleRate: 60 - m_WrapMode: 0 - m_Bounds: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - m_ClipBindingConstant: - genericBindings: - - serializedVersion: 2 - path: 0 - attribute: 1 - script: {fileID: 0} - typeID: 4 - customType: 0 - isPPtrCurve: 0 - isIntCurve: 0 - isSerializeReferenceCurve: 0 - pptrCurveMapping: [] - m_AnimationClipSettings: - serializedVersion: 2 - m_AdditiveReferencePoseClip: {fileID: 0} - m_AdditiveReferencePoseTime: 0 - m_StartTime: 0 - m_StopTime: 17.983334 - m_OrientationOffsetY: 0 - m_Level: 0 - m_CycleOffset: 0 - m_HasAdditiveReferencePose: 0 - m_LoopTime: 0 - m_LoopBlend: 0 - m_LoopBlendOrientation: 0 - m_LoopBlendPositionY: 0 - m_LoopBlendPositionXZ: 0 - m_KeepOriginalOrientation: 0 - m_KeepOriginalPositionY: 1 - m_KeepOriginalPositionXZ: 0 - m_HeightFromFeet: 0 - m_Mirror: 0 - m_EditorCurves: - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 4 - inSlope: -30.664072 - outSlope: -30.664072 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.008274143 - - serializedVersion: 3 - time: 17.983334 - value: -798 - inSlope: -28.792837 - outSlope: -28.792837 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.008481885 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.x - path: - classID: 4 - script: {fileID: 0} - flags: 0 - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 17.983334 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.y - path: - classID: 4 - script: {fileID: 0} - flags: 0 - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 17.983334 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.z - path: - classID: 4 - script: {fileID: 0} - flags: 0 - m_EulerEditorCurves: [] - m_HasGenericRootTransform: 1 - m_HasMotionFloatCurves: 0 - m_Events: []