diff --git a/Assets/Models/chair.prefab b/Assets/Models/chair.prefab index 582d426..a2d9115 100644 --- a/Assets/Models/chair.prefab +++ b/Assets/Models/chair.prefab @@ -362,22 +362,6 @@ GameObject: m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 61dd8047e5e66dc4db5c150abe38beae, type: 3} m_PrefabInstance: {fileID: 5657566221092892650} m_PrefabAsset: {fileID: 0} ---- !u!54 &1958800420 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4774624094512517819} - serializedVersion: 2 - m_Mass: 10 - m_Drag: 0 - m_AngularDrag: 0.05 - m_UseGravity: 1 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 0 --- !u!114 &1958800415 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Models/shelf_empty.prefab b/Assets/Models/shelf_empty.prefab index db8989a..6e45961 100644 --- a/Assets/Models/shelf_empty.prefab +++ b/Assets/Models/shelf_empty.prefab @@ -342,7 +342,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2996515769384266075} - - component: {fileID: 132909661356426889} + - component: {fileID: 2709258200819239477} m_Layer: 0 m_Name: shelf_empty m_TagString: Untagged @@ -374,22 +374,18 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!54 &132909661356426889 -Rigidbody: +--- !u!114 &2709258200819239477 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2512467202128557025} - serializedVersion: 2 - m_Mass: 1 - m_Drag: 0 - m_AngularDrag: 0.05 - m_UseGravity: 1 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 0 + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7310167259df75745b825087bf4c8de0, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &2602268122132683364 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/FabLab/FabLab.unity b/Assets/Scenes/FabLab/FabLab.unity index 8e398e6..418f124 100644 --- a/Assets/Scenes/FabLab/FabLab.unity +++ b/Assets/Scenes/FabLab/FabLab.unity @@ -2911,7 +2911,7 @@ Transform: - {fileID: 1378541949} - {fileID: 628386909} m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &165972124 GameObject: @@ -5561,7 +5561,7 @@ Transform: - {fileID: 223162560} - {fileID: 1031756479} m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &544536297 GameObject: @@ -7313,7 +7313,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh70622 + m_Name: pb_Mesh162388 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -9978,7 +9978,7 @@ Transform: - {fileID: 933062238} - {fileID: 649314558} m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &933062237 PrefabInstance: @@ -10062,6 +10062,63 @@ Transform: m_CorrespondingSourceObject: {fileID: 3674349604157782260, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3} m_PrefabInstance: {fileID: 933062237} m_PrefabAsset: {fileID: 0} +--- !u!1001 &936418818 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2512467202128557025, guid: fa4ac501e4c6a288483bbfa0e81e97f6, type: 3} + propertyPath: m_Name + value: shelf_empty + objectReference: {fileID: 0} + - target: {fileID: 2996515769384266075, guid: fa4ac501e4c6a288483bbfa0e81e97f6, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2996515769384266075, guid: fa4ac501e4c6a288483bbfa0e81e97f6, type: 3} + propertyPath: m_LocalPosition.x + value: 5.361327 + objectReference: {fileID: 0} + - target: {fileID: 2996515769384266075, guid: fa4ac501e4c6a288483bbfa0e81e97f6, type: 3} + propertyPath: m_LocalPosition.y + value: 1.0100002 + objectReference: {fileID: 0} + - target: {fileID: 2996515769384266075, guid: fa4ac501e4c6a288483bbfa0e81e97f6, type: 3} + propertyPath: m_LocalPosition.z + value: 0.1915859 + objectReference: {fileID: 0} + - target: {fileID: 2996515769384266075, guid: fa4ac501e4c6a288483bbfa0e81e97f6, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 2996515769384266075, guid: fa4ac501e4c6a288483bbfa0e81e97f6, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2996515769384266075, guid: fa4ac501e4c6a288483bbfa0e81e97f6, type: 3} + propertyPath: m_LocalRotation.y + value: -0.70710677 + objectReference: {fileID: 0} + - target: {fileID: 2996515769384266075, guid: fa4ac501e4c6a288483bbfa0e81e97f6, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2996515769384266075, guid: fa4ac501e4c6a288483bbfa0e81e97f6, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2996515769384266075, guid: fa4ac501e4c6a288483bbfa0e81e97f6, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -90 + objectReference: {fileID: 0} + - target: {fileID: 2996515769384266075, guid: fa4ac501e4c6a288483bbfa0e81e97f6, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: fa4ac501e4c6a288483bbfa0e81e97f6, type: 3} --- !u!1 &1031756473 GameObject: m_ObjectHideFlags: 0 @@ -11142,7 +11199,7 @@ Transform: - {fileID: 1557224834} - {fileID: 133861093} m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1180503447 PrefabInstance: @@ -11387,7 +11444,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 447954, guid: dc06161b6d97feb419f45f03b62e14b9, type: 3} propertyPath: m_RootOrder - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 447954, guid: dc06161b6d97feb419f45f03b62e14b9, type: 3} propertyPath: m_LocalPosition.x @@ -12038,7 +12095,7 @@ Transform: - {fileID: 1620530528} - {fileID: 788326936} m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1557224832 GameObject: @@ -12205,7 +12262,7 @@ Transform: - {fileID: 1808715995} - {fileID: 1804142041} m_Father: {fileID: 0} - m_RootOrder: 10 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1695254330 PrefabInstance: @@ -12312,7 +12369,7 @@ Transform: - {fileID: 1695254331} - {fileID: 1180503448} m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1727196003 PrefabInstance: @@ -15674,7 +15731,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4000011633437892, guid: fb710a001890d9a44bb74a8ce4f20cc0, type: 3} propertyPath: m_RootOrder - value: 9 + value: 10 objectReference: {fileID: 0} - target: {fileID: 4000011633437892, guid: fb710a001890d9a44bb74a8ce4f20cc0, type: 3} propertyPath: m_LocalPosition.x