From 51e289fe9b5a0de603036a00c82b9bd9cfd94ed3 Mon Sep 17 00:00:00 2001 From: marcgauch <34353267+marcgauch@users.noreply.github.com> Date: Fri, 5 Jan 2024 17:16:12 +0100 Subject: [PATCH] make it end --- .../Breakable Wall (just a cube).prefab | 6 +- .../Table/Tisch.prefab | 360 +----------------- .../Volume NULL.prefab | 3 +- Assets/Scenes/SampleScene.unity | 2 +- 4 files changed, 11 insertions(+), 360 deletions(-) diff --git a/Assets/Prefabs/OVR Scene Manager Overrides/Breakable Wall (just a cube).prefab b/Assets/Prefabs/OVR Scene Manager Overrides/Breakable Wall (just a cube).prefab index 3ed557f..6948432 100644 --- a/Assets/Prefabs/OVR Scene Manager Overrides/Breakable Wall (just a cube).prefab +++ b/Assets/Prefabs/OVR Scene Manager Overrides/Breakable Wall (just a cube).prefab @@ -30,8 +30,8 @@ Transform: m_GameObject: {fileID: 814842801368627604} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0.01} - m_LocalScale: {x: 1, y: 1, z: 0.01} + m_LocalPosition: {x: 0, y: 0, z: 0.2} + m_LocalScale: {x: 1, y: 1, z: 0.2} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} @@ -126,7 +126,7 @@ MonoBehaviour: PaddingY: 0 PaddingYMax: 0 ScalingZ: 3 - PaddingZ: 0 + PaddingZ: 0.226 PaddingZMax: 0 _pivotTransform: {fileID: 6455794010493476198} --- !u!114 &8707393823814613456 diff --git a/Assets/Prefabs/OVR Scene Manager Overrides/Table/Tisch.prefab b/Assets/Prefabs/OVR Scene Manager Overrides/Table/Tisch.prefab index f0fbe8f..a0e9e57 100644 --- a/Assets/Prefabs/OVR Scene Manager Overrides/Table/Tisch.prefab +++ b/Assets/Prefabs/OVR Scene Manager Overrides/Table/Tisch.prefab @@ -1,111 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &1165928219800832966 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3200069187093516586} - - component: {fileID: 5408176231715430360} - - component: {fileID: 6266893698133711884} - - component: {fileID: 8060728691439391952} - m_Layer: 0 - m_Name: Quad - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &3200069187093516586 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1165928219800832966} - serializedVersion: 2 - m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} - m_LocalPosition: {x: 0, y: 0.501, z: -0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1642946303867175033} - m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} ---- !u!33 &5408176231715430360 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1165928219800832966} - m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &6266893698133711884 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1165928219800832966} - 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: d104ea298a7657ac8b174832401ee255, 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!64 &8060728691439391952 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1165928219800832966} - 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: 5 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &4042489633374931511 GameObject: m_ObjectHideFlags: 0 @@ -119,8 +13,6 @@ GameObject: - component: {fileID: 150224158578962757} - component: {fileID: 8629508070689078297} - component: {fileID: 1683495290634348958} - - component: {fileID: 5095931424980509374} - - component: {fileID: 8810498057840475943} - component: {fileID: 7232826476857652024} - component: {fileID: 8650066521429589251} m_Layer: 0 @@ -139,13 +31,10 @@ Transform: m_GameObject: {fileID: 4042489633374931511} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0.873} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.01} + m_LocalScale: {x: 1, y: 1, z: 0.01} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 2402615261829654765} - - {fileID: 3200069187093516586} - - {fileID: 8639365344387757720} + m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &2746169216598076409 @@ -246,66 +135,6 @@ Rigidbody: m_Interpolate: 0 m_Constraints: 0 m_CollisionDetection: 1 ---- !u!114 &5095931424980509374 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4042489633374931511} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 43f86b14a27b52f4f9298c33015b5c26, type: 3} - m_Name: - m_EditorClassIdentifier: - _transferOnSecondSelection: 1 - _addNewPointsToFront: 0 - _forwardElement: {fileID: 0} - _oneGrabTransformer: {fileID: 0} - _twoGrabTransformer: {fileID: 0} - _targetTransform: {fileID: 0} - _maxGrabPoints: -1 ---- !u!114 &8810498057840475943 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4042489633374931511} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e9a7676b01585ce43908639a27765dfc, type: 3} - m_Name: - m_EditorClassIdentifier: - _interactorFilters: [] - _maxInteractors: -1 - _maxSelectingInteractors: -1 - _data: {fileID: 0} - _pointableElement: {fileID: 5095931424980509374} - _rigidbody: {fileID: 1683495290634348958} - _physicsGrabbable: {fileID: 0} - _resetGrabOnGrabsUpdated: 1 - _scoringModifier: - _positionRotationWeight: 0.8 - _slippiness: 0 - _supportedGrabTypes: 3 - _pinchGrabRules: - _thumbRequirement: 1 - _indexRequirement: 1 - _middleRequirement: 1 - _ringRequirement: 0 - _pinkyRequirement: 0 - _unselectMode: 0 - _palmGrabRules: - _thumbRequirement: 1 - _indexRequirement: 2 - _middleRequirement: 2 - _ringRequirement: 2 - _pinkyRequirement: 1 - _unselectMode: 0 - _movementProvider: {fileID: 0} - _handAligment: 1 - _handGrabPoses: [] --- !u!114 &7232826476857652024 MonoBehaviour: m_ObjectHideFlags: 0 @@ -324,10 +153,10 @@ MonoBehaviour: ScalingY: 0 PaddingY: 0 PaddingYMax: 0 - ScalingZ: 0 + ScalingZ: 3 PaddingZ: 0 PaddingZMax: 0 - _pivotTransform: {fileID: 8639365344387757720} + _pivotTransform: {fileID: 1642946303867175033} --- !u!114 &8650066521429589251 MonoBehaviour: m_ObjectHideFlags: 0 @@ -341,182 +170,3 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: dimensionPadding: {x: 0, y: 0, z: 0} ---- !u!1 &9194854504919981158 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8639365344387757720} - - component: {fileID: 5748427394974463280} - - component: {fileID: 9265421514962416} - - component: {fileID: 8433136417960465728} - m_Layer: 0 - m_Name: Transform - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &8639365344387757720 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9194854504919981158} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0.5} - m_LocalScale: {x: 0.001, y: 0.001, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1642946303867175033} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &5748427394974463280 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9194854504919981158} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &9265421514962416 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9194854504919981158} - 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: 10303, guid: 0000000000000000f000000000000000, type: 0} - 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!65 &8433136417960465728 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9194854504919981158} - 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!1001 &5200056984575638660 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1642946303867175033} - m_Modifications: - - target: {fileID: 2970849338285349673, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} - propertyPath: m_Enabled - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2970849338285349673, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} - propertyPath: m_Materials.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2970849338285349673, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} - propertyPath: m_Materials.Array.data[1] - value: - objectReference: {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} - - target: {fileID: 3078792058705529905, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} - propertyPath: m_Name - value: Cube - objectReference: {fileID: 0} - - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} - propertyPath: m_LocalPosition.x - value: 0.098 - objectReference: {fileID: 0} - - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} - propertyPath: m_LocalPosition.y - value: 0.633 - objectReference: {fileID: 0} - - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} - propertyPath: m_LocalPosition.z - value: -0.086 - objectReference: {fileID: 0} - - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} ---- !u!4 &2402615261829654765 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} - m_PrefabInstance: {fileID: 5200056984575638660} - m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/OVR Scene Manager Overrides/Volume NULL.prefab b/Assets/Prefabs/OVR Scene Manager Overrides/Volume NULL.prefab index 5565c00..c42530c 100644 --- a/Assets/Prefabs/OVR Scene Manager Overrides/Volume NULL.prefab +++ b/Assets/Prefabs/OVR Scene Manager Overrides/Volume NULL.prefab @@ -57,7 +57,8 @@ PrefabInstance: value: Volume NULL objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: [] + m_RemovedGameObjects: + - {fileID: 6073493186641658868, guid: 891349029806e4144812ff2d304d9cf9, type: 3} m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 891349029806e4144812ff2d304d9cf9, type: 3} diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index ad7920e..8188e91 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -5203,7 +5203,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 747806495401477012, guid: c813208e672e3074bbe118e1a9ee94fd, type: 3} propertyPath: PrefabOverrides.Array.size - value: 7 + value: 6 objectReference: {fileID: 0} - target: {fileID: 747806495401477012, guid: c813208e672e3074bbe118e1a9ee94fd, type: 3} propertyPath: PrefabOverrides.Array.data[0].Prefab