From 208632567ea81f0c574827f9dd7e652cede5fa92 Mon Sep 17 00:00:00 2001 From: Legonzaur Date: Thu, 26 Jan 2023 14:42:05 +0100 Subject: [PATCH] Fix some models --- Assets/Models/circuitboard.prefab | 2 +- Assets/Models/screwdriver.prefab | 110 ++++++++-------- Assets/Scenes/FabLab/FabLab.unity | 211 +++++++++++++++++++++++------- 3 files changed, 220 insertions(+), 103 deletions(-) diff --git a/Assets/Models/circuitboard.prefab b/Assets/Models/circuitboard.prefab index f9d3d0d..8957e75 100644 --- a/Assets/Models/circuitboard.prefab +++ b/Assets/Models/circuitboard.prefab @@ -109,7 +109,7 @@ MonoBehaviour: m_EditorClassIdentifier: activateActionSetOnAttach: actionSetPath: - hideHandOnAttach: 1 + hideHandOnAttach: 0 hideSkeletonOnAttach: 0 hideControllerOnAttach: 0 handAnimationOnPickup: 0 diff --git a/Assets/Models/screwdriver.prefab b/Assets/Models/screwdriver.prefab index 83284ba..beb0dd7 100644 --- a/Assets/Models/screwdriver.prefab +++ b/Assets/Models/screwdriver.prefab @@ -175,7 +175,7 @@ MonoBehaviour: m_EditorClassIdentifier: activateActionSetOnAttach: actionSetPath: - hideHandOnAttach: 1 + hideHandOnAttach: 0 hideSkeletonOnAttach: 0 hideControllerOnAttach: 0 handAnimationOnPickup: 0 @@ -213,6 +213,60 @@ MonoBehaviour: highlightOnHover: 1 hideHighlight: [] hoverPriority: 0 +--- !u!114 &1486307381670797623 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1880102723515332267} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ffefbea063cab884ca33e5a449e5c22c, type: 3} + m_Name: + m_EditorClassIdentifier: + attachmentFlags: 341 + attachmentOffset: {fileID: 0} + catchingSpeedThreshold: -1 + releaseVelocityStyle: 3 + releaseVelocityTimeOffset: -0.011 + scaleReleaseVelocity: 1.1 + scaleReleaseVelocityThreshold: -1 + scaleReleaseVelocityCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.1 + 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_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + restoreOriginalParent: 0 + onPickUp: + m_PersistentCalls: + m_Calls: [] + onDetachFromHand: + m_PersistentCalls: + m_Calls: [] + onHeldUpdate: + m_PersistentCalls: + m_Calls: [] + interactable: {fileID: 0} --- !u!114 &1904605114195921641 MonoBehaviour: m_ObjectHideFlags: 0 @@ -280,60 +334,6 @@ MonoBehaviour: spawnObjectOnCollision: {fileID: 1000012514662164, guid: ada35c93b68ad004d9b4e7bd686cf189, type: 3} colorSpawnedObject: 1 destroyOnTargetCollision: 1 ---- !u!114 &1486307381670797623 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1880102723515332267} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ffefbea063cab884ca33e5a449e5c22c, type: 3} - m_Name: - m_EditorClassIdentifier: - attachmentFlags: 341 - attachmentOffset: {fileID: 0} - catchingSpeedThreshold: -1 - releaseVelocityStyle: 3 - releaseVelocityTimeOffset: -0.011 - scaleReleaseVelocity: 1.1 - scaleReleaseVelocityThreshold: -1 - scaleReleaseVelocityCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0.1 - 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_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - restoreOriginalParent: 0 - onPickUp: - m_PersistentCalls: - m_Calls: [] - onDetachFromHand: - m_PersistentCalls: - m_Calls: [] - onHeldUpdate: - m_PersistentCalls: - m_Calls: [] - interactable: {fileID: 0} --- !u!1 &3509871167403709943 stripped GameObject: m_CorrespondingSourceObject: {fileID: 2766212503428324877, guid: 21eef4e05fdb69a4a8aa0e4ef1007bab, type: 3} diff --git a/Assets/Scenes/FabLab/FabLab.unity b/Assets/Scenes/FabLab/FabLab.unity index 07d28a3..ed8af21 100644 --- a/Assets/Scenes/FabLab/FabLab.unity +++ b/Assets/Scenes/FabLab/FabLab.unity @@ -7265,7 +7265,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 363747407} - - component: {fileID: 363747408} m_Layer: 0 m_Name: Computer Rig m_TagString: Untagged @@ -7293,22 +7292,6 @@ Transform: m_Father: {fileID: 146814758} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &363747408 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 363747406} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7310167259df75745b825087bf4c8de0, type: 3} - m_Name: - m_EditorClassIdentifier: - combinedBounds: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - wallMount: 0 --- !u!1001 &366020801 PrefabInstance: m_ObjectHideFlags: 0 @@ -7610,15 +7593,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5367457311287030540, guid: ab468a82ad445da4e9a084297505261f, type: 3} propertyPath: m_LocalPosition.x - value: -1.5043453 + value: -1.5 objectReference: {fileID: 0} - target: {fileID: 5367457311287030540, guid: ab468a82ad445da4e9a084297505261f, type: 3} propertyPath: m_LocalPosition.y - value: 1.4918169 + value: 0.11 objectReference: {fileID: 0} - target: {fileID: 5367457311287030540, guid: ab468a82ad445da4e9a084297505261f, type: 3} propertyPath: m_LocalPosition.z - value: -15.434761 + value: -12.81 objectReference: {fileID: 0} - target: {fileID: 5367457311287030540, guid: ab468a82ad445da4e9a084297505261f, type: 3} propertyPath: m_LocalRotation.w @@ -8452,10 +8435,9 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7152506842566364840, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3} propertyPath: m_Enabled - value: 0 + value: 1 objectReference: {fileID: 0} - m_RemovedComponents: - - {fileID: 7152506842566364840, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3} + m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3} --- !u!4 &472164268 stripped Transform: @@ -10715,7 +10697,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh50646 + m_Name: pb_Mesh24722 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -11192,7 +11174,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7152506842566364840, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3} propertyPath: m_Enabled - value: 0 + value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3} @@ -13806,6 +13788,14 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 90 objectReference: {fileID: 0} + - target: {fileID: 9082827438125951081, guid: ab468a82ad445da4e9a084297505261f, type: 3} + propertyPath: m_LocalPosition.x + value: -0.025 + objectReference: {fileID: 0} + - target: {fileID: 9082827438125951081, guid: ab468a82ad445da4e9a084297505261f, type: 3} + propertyPath: m_LocalPosition.y + value: 0.723 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ab468a82ad445da4e9a084297505261f, type: 3} --- !u!4 &802860442 stripped @@ -14090,6 +14080,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 808552922} + - component: {fileID: 808552923} m_Layer: 0 m_Name: Imprimantes 3D m_TagString: Untagged @@ -14116,6 +14107,22 @@ Transform: m_Father: {fileID: 45957245} m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &808552923 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 808552921} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7310167259df75745b825087bf4c8de0, type: 3} + m_Name: + m_EditorClassIdentifier: + combinedBounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + wallMount: 0 --- !u!1001 &815680570 PrefabInstance: m_ObjectHideFlags: 0 @@ -17838,6 +17845,27 @@ Transform: m_CorrespondingSourceObject: {fileID: 3674349604157782260, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3} m_PrefabInstance: {fileID: 743326945} m_PrefabAsset: {fileID: 0} +--- !u!1 &1164507841 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: d8a039318f27391cdb025c7bd542c092, type: 3} + m_PrefabInstance: {fileID: 670219874} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1164507842 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1164507841} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7310167259df75745b825087bf4c8de0, type: 3} + m_Name: + m_EditorClassIdentifier: + combinedBounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + wallMount: 0 --- !u!1 &1173886245 GameObject: m_ObjectHideFlags: 0 @@ -18788,7 +18816,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh50254 + m_Name: pb_Mesh24330 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -18952,7 +18980,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh50046 + m_Name: pb_Mesh24114 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -19185,7 +19213,8 @@ PrefabInstance: propertyPath: m_StaticEditorFlags value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 7152506842566364840, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3} m_SourcePrefab: {fileID: 100100000, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3} --- !u!4 &1317084064 stripped Transform: @@ -19260,7 +19289,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh50200 + m_Name: pb_Mesh24276 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -20497,6 +20526,27 @@ Transform: m_CorrespondingSourceObject: {fileID: 4812896578459389604, guid: 7c648947d00d08049bf9af26d1bc3db8, type: 3} m_PrefabInstance: {fileID: 1481052597} m_PrefabAsset: {fileID: 0} +--- !u!1 &1530350375 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: d8a039318f27391cdb025c7bd542c092, type: 3} + m_PrefabInstance: {fileID: 765875806} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1530350376 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1530350375} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7310167259df75745b825087bf4c8de0, type: 3} + m_Name: + m_EditorClassIdentifier: + combinedBounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + wallMount: 0 --- !u!1001 &1532826547 PrefabInstance: m_ObjectHideFlags: 0 @@ -22838,6 +22888,11 @@ Transform: m_Father: {fileID: 794063582} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1670271076 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: d8a039318f27391cdb025c7bd542c092, type: 3} + m_PrefabInstance: {fileID: 1821824933} + m_PrefabAsset: {fileID: 0} --- !u!1 &1672585691 GameObject: m_ObjectHideFlags: 0 @@ -22989,6 +23044,32 @@ Transform: m_Father: {fileID: 45957245} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1710850078 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: d8a039318f27391cdb025c7bd542c092, type: 3} + m_PrefabInstance: {fileID: 293073268} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1710850079 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1710850078} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7310167259df75745b825087bf4c8de0, type: 3} + m_Name: + m_EditorClassIdentifier: + combinedBounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + wallMount: 0 +--- !u!1 &1721687456 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: d8a039318f27391cdb025c7bd542c092, type: 3} + m_PrefabInstance: {fileID: 1782748917} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1727196003 PrefabInstance: m_ObjectHideFlags: 0 @@ -26241,6 +26322,22 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: d8a039318f27391cdb025c7bd542c092, type: 3} m_PrefabInstance: {fileID: 1782748917} m_PrefabAsset: {fileID: 0} +--- !u!114 &1782748919 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1721687456} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7310167259df75745b825087bf4c8de0, type: 3} + m_Name: + m_EditorClassIdentifier: + combinedBounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + wallMount: 0 --- !u!1 &1796368673 GameObject: m_ObjectHideFlags: 0 @@ -26582,6 +26679,22 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: d8a039318f27391cdb025c7bd542c092, type: 3} m_PrefabInstance: {fileID: 1821824933} m_PrefabAsset: {fileID: 0} +--- !u!114 &1821824935 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1670271076} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7310167259df75745b825087bf4c8de0, type: 3} + m_Name: + m_EditorClassIdentifier: + combinedBounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + wallMount: 0 --- !u!4 &1822718828 stripped Transform: m_CorrespondingSourceObject: {fileID: 5554971243091150254, guid: 124ae331af1b2e845b7de5a2ccb168d4, type: 3} @@ -27416,7 +27529,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1888977164} - - component: {fileID: 1888977165} m_Layer: 0 m_Name: Computer Rig m_TagString: Untagged @@ -27444,22 +27556,6 @@ Transform: m_Father: {fileID: 435302310} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1888977165 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1888977163} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7310167259df75745b825087bf4c8de0, type: 3} - m_Name: - m_EditorClassIdentifier: - combinedBounds: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - wallMount: 0 --- !u!4 &1889890278 stripped Transform: m_CorrespondingSourceObject: {fileID: 5262755222010251265, guid: 481a02167edfebe44883f5868f8a27f9, type: 3} @@ -27994,6 +28090,27 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 9ec9220eced66b242bbf76145f380cd4, type: 3} m_PrefabInstance: {fileID: 1916827214} m_PrefabAsset: {fileID: 0} +--- !u!1 &1929959350 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: d8a039318f27391cdb025c7bd542c092, type: 3} + m_PrefabInstance: {fileID: 1329833007} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1929959351 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1929959350} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7310167259df75745b825087bf4c8de0, type: 3} + m_Name: + m_EditorClassIdentifier: + combinedBounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + wallMount: 0 --- !u!1 &1941597267 GameObject: m_ObjectHideFlags: 0 @@ -29023,7 +29140,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh50174 + m_Name: pb_Mesh24250 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2