diff --git a/Assets/Models/Blender/Indoor_plant_02.blend1.meta b/Assets/Editor.meta similarity index 67% rename from Assets/Models/Blender/Indoor_plant_02.blend1.meta rename to Assets/Editor.meta index de39661..b29757e 100644 --- a/Assets/Models/Blender/Indoor_plant_02.blend1.meta +++ b/Assets/Editor.meta @@ -1,5 +1,6 @@ fileFormatVersion: 2 -guid: f4154d993193adf4184e2bd352c41503 +guid: 88c951c75d8d97540908f1edc66613c9 +folderAsset: yes DefaultImporter: externalObjects: {} userData: diff --git a/Assets/Editor/ProjectAuditorConfig.asset b/Assets/Editor/ProjectAuditorConfig.asset new file mode 100644 index 0000000..371d281 --- /dev/null +++ b/Assets/Editor/ProjectAuditorConfig.asset @@ -0,0 +1,20 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + 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: 424c5a33b3bea46f3bd7ae461a273b6d, type: 3} + m_Name: ProjectAuditorConfig + m_EditorClassIdentifier: + AnalyzeOnBuild: 0 + AnalyzeInBackground: 1 + CompilationMode: 0 + UseRoslynAnalyzers: 0 + FailBuildOnIssues: 0 + m_Rules: [] diff --git a/Assets/Editor/ProjectAuditorConfig.asset.meta b/Assets/Editor/ProjectAuditorConfig.asset.meta new file mode 100644 index 0000000..d1425a1 --- /dev/null +++ b/Assets/Editor/ProjectAuditorConfig.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c164f01698d742e4983083d92a7fe2cd +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/Material.mat b/Assets/Materials/Material.mat new file mode 100644 index 0000000..755a537 --- /dev/null +++ b/Assets/Materials/Material.mat @@ -0,0 +1,80 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Material + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 0aff3df6854d11b4599b809d07bd3ed2, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Materials/Material.mat.meta b/Assets/Materials/Material.mat.meta new file mode 100644 index 0000000..cbec18a --- /dev/null +++ b/Assets/Materials/Material.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1cee05d88bdf344479c996b827ad201c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/Blender/Indoor_plant_02.blend1 b/Assets/Models/Blender/Indoor_plant_02.blend1 deleted file mode 100644 index 5dc62b5..0000000 Binary files a/Assets/Models/Blender/Indoor_plant_02.blend1 and /dev/null differ diff --git a/Assets/Models/Blender/Logitech_G603_Turbosquid.blend b/Assets/Models/Blender/Logitech_G603_Turbosquid.blend index 7bb7704..cd7d390 100644 --- a/Assets/Models/Blender/Logitech_G603_Turbosquid.blend +++ b/Assets/Models/Blender/Logitech_G603_Turbosquid.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a4dd77c3b5a68092cc9083ecf751c5b91c8f1506ccea3a863cc665772c03ac26 -size 1199840 +oid sha256:2f221424ad990e18317190631d5a27c53d9718881ae1c9342f1b2e6585aec6dc +size 941640 diff --git a/Assets/Models/Blender/keyboard.blend1.meta b/Assets/Models/Blender/Materials/Circuitboard.meta similarity index 67% rename from Assets/Models/Blender/keyboard.blend1.meta rename to Assets/Models/Blender/Materials/Circuitboard.meta index 9710abc..7a2cdb0 100644 --- a/Assets/Models/Blender/keyboard.blend1.meta +++ b/Assets/Models/Blender/Materials/Circuitboard.meta @@ -1,5 +1,6 @@ fileFormatVersion: 2 -guid: 7e271bd70c7d61e4bb2480882dfde12c +guid: 0c4061bc82225b74489c77b544450c46 +folderAsset: yes DefaultImporter: externalObjects: {} userData: diff --git a/Assets/Models/Blender/circuitboard.blend b/Assets/Models/Blender/circuitboard.blend index 1420586..88042f2 100644 --- a/Assets/Models/Blender/circuitboard.blend +++ b/Assets/Models/Blender/circuitboard.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:49e4d6f33899ab9770db6ba705620f605812a58b4a082ef131409d6d1c77b580 -size 2985300 +oid sha256:2dfbce3f042dd7699ba755d2247c59db6d5841d7e75c738d68f97be5de1ec1dc +size 1465128 diff --git a/Assets/Models/Blender/circuitboard.blend.meta b/Assets/Models/Blender/circuitboard.blend.meta index b3b7dc9..871762f 100644 --- a/Assets/Models/Blender/circuitboard.blend.meta +++ b/Assets/Models/Blender/circuitboard.blend.meta @@ -3,7 +3,12 @@ guid: 49362df3fa9630d41bbc0bd46629331f ModelImporter: serializedVersion: 21300 internalIDToNameTable: [] - externalObjects: {} + externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: Material + second: {fileID: 2100000, guid: 1cee05d88bdf344479c996b827ad201c, type: 2} materials: materialImportMode: 2 materialName: 0 diff --git a/Assets/Models/Blender/hammer.blend b/Assets/Models/Blender/hammer.blend index 4e17665..8568418 100644 --- a/Assets/Models/Blender/hammer.blend +++ b/Assets/Models/Blender/hammer.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c87de503d1971995679f31a62db4912f8fe9d87065ee4c24b9e6f175d09bb2f5 -size 51059856 +oid sha256:44eadc6fb268d843156298bb7c6a28424e513259926be589bb0ac44fe647e3bd +size 51075472 diff --git a/Assets/Models/Blender/keyboard.blend b/Assets/Models/Blender/keyboard.blend index 259956a..b524c0e 100644 --- a/Assets/Models/Blender/keyboard.blend +++ b/Assets/Models/Blender/keyboard.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6d5c6952b8918317b405aa7f2f8830a7fdc723e9d5fcd96eb8f94a77dd982821 -size 6873132 +oid sha256:5b53c068c1cda9eefad8b9d7a61a7ceb024d2c86cafa694db3d4955e984d2594 +size 2933440 diff --git a/Assets/Models/Blender/keyboard.blend1 b/Assets/Models/Blender/keyboard.blend1 deleted file mode 100644 index 278aa64..0000000 Binary files a/Assets/Models/Blender/keyboard.blend1 and /dev/null differ diff --git a/Assets/Models/Blender/pliers.blend b/Assets/Models/Blender/pliers.blend index 14a62ff..4c27b6a 100644 --- a/Assets/Models/Blender/pliers.blend +++ b/Assets/Models/Blender/pliers.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ec682a8af10cfcf1ff3703bcf8a256f07232099a4eb4633f12fc6cd669287815 -size 985540 +oid sha256:5e28ef3a24ed5f0cf918d8f02d72ab7f493f01d52c77c6fb58361d95622c6a5d +size 914296 diff --git a/Assets/Models/Blender/pliers.blend.meta b/Assets/Models/Blender/pliers.blend.meta index 903cf27..9079e41 100644 --- a/Assets/Models/Blender/pliers.blend.meta +++ b/Assets/Models/Blender/pliers.blend.meta @@ -68,8 +68,8 @@ ModelImporter: secondaryUVPackMargin: 4 useFileScale: 1 tangentSpace: - normalSmoothAngle: 60 - normalImportMode: 0 + normalSmoothAngle: 45 + normalImportMode: 1 tangentImportMode: 3 normalCalculationMode: 4 legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 diff --git a/Assets/Models/Keyboard.prefab b/Assets/Models/Keyboard.prefab index cf23c41..5f74191 100644 --- a/Assets/Models/Keyboard.prefab +++ b/Assets/Models/Keyboard.prefab @@ -67,9 +67,21 @@ PrefabInstance: propertyPath: m_ConstrainProportionsScale value: 1 objectReference: {fileID: 0} + - target: {fileID: -3393059317818742671, guid: 6989f565337da034f98d0b5a0898d245, type: 3} + propertyPath: m_Materials.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -3393059317818742671, guid: 6989f565337da034f98d0b5a0898d245, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: d409ee3fc36caaa48af46d3417777a49, type: 2} - target: {fileID: 919132149155446097, guid: 6989f565337da034f98d0b5a0898d245, type: 3} propertyPath: m_Name value: keyboard objectReference: {fileID: 0} + - target: {fileID: 1290268953411352940, guid: 6989f565337da034f98d0b5a0898d245, type: 3} + propertyPath: m_LocalPosition.y + value: 0.069 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6989f565337da034f98d0b5a0898d245, type: 3} diff --git a/Assets/Models/Mouse.prefab b/Assets/Models/Mouse.prefab index f40634b..e9248a1 100644 --- a/Assets/Models/Mouse.prefab +++ b/Assets/Models/Mouse.prefab @@ -41,7 +41,7 @@ MeshFilter: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6605845652538914080} - m_Mesh: {fileID: -3796887150266652070, guid: 2c680f33e3b2a354795f5bb9d9c1f65c, type: 3} + m_Mesh: {fileID: 6605384932166185756, guid: 2c680f33e3b2a354795f5bb9d9c1f65c, type: 3} --- !u!23 &9198014314391204201 MeshRenderer: m_ObjectHideFlags: 0 diff --git a/Assets/Models/hammer 1.prefab b/Assets/Models/hammer 1.prefab index fbf0eda..dbb99f2 100644 --- a/Assets/Models/hammer 1.prefab +++ b/Assets/Models/hammer 1.prefab @@ -369,7 +369,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4692477033812591368} m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071067} - m_LocalPosition: {x: 0, y: 0, z: 0.06175232} + m_LocalPosition: {x: 0, y: 2.48, z: 0.06175232} m_LocalScale: {x: 1.4781778, y: 1.4781778, z: 1.4781778} m_ConstrainProportionsScale: 0 m_Children: [] diff --git a/Assets/Models/pliers.prefab b/Assets/Models/pliers.prefab index 28723d6..24efe33 100644 --- a/Assets/Models/pliers.prefab +++ b/Assets/Models/pliers.prefab @@ -13,15 +13,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: d8f1959686ece1243846f554fdcd7273, type: 3} propertyPath: m_LocalScale.x - value: 0.10131945 + value: 0.2 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: d8f1959686ece1243846f554fdcd7273, type: 3} propertyPath: m_LocalScale.y - value: 0.10131945 + value: 0.2 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: d8f1959686ece1243846f554fdcd7273, type: 3} propertyPath: m_LocalScale.z - value: 0.10131945 + value: 0.2 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: d8f1959686ece1243846f554fdcd7273, type: 3} propertyPath: m_LocalPosition.x @@ -63,50 +63,16 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: d8f1959686ece1243846f554fdcd7273, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: d8f1959686ece1243846f554fdcd7273, type: 3} propertyPath: m_Name value: pliers objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d8f1959686ece1243846f554fdcd7273, type: 3} ---- !u!1 &301319348876434176 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: -7640558969779515294, guid: d8f1959686ece1243846f554fdcd7273, type: 3} - m_PrefabInstance: {fileID: 1286279349039090530} - m_PrefabAsset: {fileID: 0} ---- !u!136 &7688451815724401248 -CapsuleCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 301319348876434176} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - m_Radius: 0.9883504 - m_Height: 11.624478 - m_Direction: 2 - m_Center: {x: 0.0035420142, y: 0.5332932, z: 3.5446324} ---- !u!1 &940052642335090451 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: -7146521406498821007, guid: d8f1959686ece1243846f554fdcd7273, type: 3} - m_PrefabInstance: {fileID: 1286279349039090530} - m_PrefabAsset: {fileID: 0} ---- !u!136 &2602164159852921622 -CapsuleCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 940052642335090451} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - m_Radius: 0.975318 - m_Height: 11.624478 - m_Direction: 2 - m_Center: {x: 0.016420316, y: -0.49450693, z: 3.5446322} --- !u!1 &1897611713971714310 stripped GameObject: m_CorrespondingSourceObject: {fileID: -8391222552659086748, guid: d8f1959686ece1243846f554fdcd7273, type: 3} @@ -239,6 +205,33 @@ MonoBehaviour: highlightOnHover: 1 hideHighlight: [] hoverPriority: 0 +--- !u!114 &3960184586102675806 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2096603271310898739} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e7418c7dd8f977d4e969202d3fa7e926, type: 3} + m_Name: + m_EditorClassIdentifier: + poseEditorExpanded: 1 + blendEditorExpanded: 1 + poseNames: + - Pliers (MAIN) + overridePreviewLeftHandPrefab: {fileID: 1000013348574242, guid: 638779290bce1af49b356f33dcc6fccf, type: 3} + overridePreviewRightHandPrefab: {fileID: 1000010304998954, guid: 6def53d002137b747aec0b29551e0e25, type: 3} + skeletonMainPose: {fileID: 11400000, guid: 6ab30d9290ee9ef429794473765f9019, type: 2} + skeletonAdditionalPoses: [] + showLeftPreview: 0 + showRightPreview: 0 + previewLeftInstance: {fileID: 0} + previewRightInstance: {fileID: 0} + previewPoseSelection: 0 + blendingBehaviours: [] + scale: 1 --- !u!114 &4983244824993224224 MonoBehaviour: m_ObjectHideFlags: 0 @@ -308,49 +301,3 @@ MonoBehaviour: velocityAverageFrames: 5 angularVelocityAverageFrames: 11 estimateOnAwake: 0 ---- !u!114 &3960184586102675806 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2096603271310898739} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e7418c7dd8f977d4e969202d3fa7e926, type: 3} - m_Name: - m_EditorClassIdentifier: - poseEditorExpanded: 1 - blendEditorExpanded: 1 - poseNames: - - Pliers (MAIN) - overridePreviewLeftHandPrefab: {fileID: 1000013348574242, guid: 638779290bce1af49b356f33dcc6fccf, type: 3} - overridePreviewRightHandPrefab: {fileID: 1000010304998954, guid: 6def53d002137b747aec0b29551e0e25, type: 3} - skeletonMainPose: {fileID: 11400000, guid: 6ab30d9290ee9ef429794473765f9019, type: 2} - skeletonAdditionalPoses: [] - showLeftPreview: 0 - showRightPreview: 0 - previewLeftInstance: {fileID: 0} - previewRightInstance: {fileID: 0} - previewPoseSelection: 0 - blendingBehaviours: [] - scale: 1 ---- !u!1 &7570475958632844146 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: -516098083770646512, guid: d8f1959686ece1243846f554fdcd7273, type: 3} - m_PrefabInstance: {fileID: 1286279349039090530} - m_PrefabAsset: {fileID: 0} ---- !u!136 &8228600816443438243 -CapsuleCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7570475958632844146} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - m_Radius: 2.4462943 - m_Height: 18.52887 - m_Direction: 2 - m_Center: {x: 2.5, y: -8.697551e-15, z: -3.736883} diff --git a/Assets/Scenes/FabLab/FabLab.unity b/Assets/Scenes/FabLab/FabLab.unity index 58ef412..4f46985 100644 --- a/Assets/Scenes/FabLab/FabLab.unity +++ b/Assets/Scenes/FabLab/FabLab.unity @@ -2854,7 +2854,7 @@ Transform: - {fileID: 1378541949} - {fileID: 363747407} m_Father: {fileID: 0} - m_RootOrder: 10 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &165972124 GameObject: @@ -3225,11 +3225,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5569992116628908473, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} propertyPath: m_LocalPosition.x - value: 1.7307487 + value: 1.6129999 objectReference: {fileID: 0} - target: {fileID: 5569992116628908473, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} propertyPath: m_LocalPosition.y - value: -0.3028674 + value: -0.431 objectReference: {fileID: 0} - target: {fileID: 5569992116628908473, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} propertyPath: m_LocalPosition.z @@ -3267,7 +3267,8 @@ PrefabInstance: propertyPath: m_Name value: UM3_UM3_Ultimaker (2) objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 2376179122941027147, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} --- !u!4 &197140882 stripped Transform: @@ -4948,71 +4949,6 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 140bd0e59d9bee94f9f0284c9eef5b32, type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7a135b1a2cb9c8f488d4dd00c55ab283, type: 3} ---- !u!1001 &260965694 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 435302310} - m_Modifications: - - target: {fileID: 1221833868461810861, guid: b6e04371fb6e5d4488dd1167ef14299f, type: 3} - propertyPath: m_Name - value: keyboard - objectReference: {fileID: 0} - - target: {fileID: 1999320893792550423, guid: b6e04371fb6e5d4488dd1167ef14299f, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1999320893792550423, guid: b6e04371fb6e5d4488dd1167ef14299f, type: 3} - propertyPath: m_LocalPosition.x - value: 0.22997427 - objectReference: {fileID: 0} - - target: {fileID: 1999320893792550423, guid: b6e04371fb6e5d4488dd1167ef14299f, type: 3} - propertyPath: m_LocalPosition.y - value: -0.39752162 - objectReference: {fileID: 0} - - target: {fileID: 1999320893792550423, guid: b6e04371fb6e5d4488dd1167ef14299f, type: 3} - propertyPath: m_LocalPosition.z - value: 1.525877 - objectReference: {fileID: 0} - - target: {fileID: 1999320893792550423, guid: b6e04371fb6e5d4488dd1167ef14299f, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1999320893792550423, guid: b6e04371fb6e5d4488dd1167ef14299f, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1999320893792550423, guid: b6e04371fb6e5d4488dd1167ef14299f, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1999320893792550423, guid: b6e04371fb6e5d4488dd1167ef14299f, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1999320893792550423, guid: b6e04371fb6e5d4488dd1167ef14299f, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1999320893792550423, guid: b6e04371fb6e5d4488dd1167ef14299f, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1999320893792550423, guid: b6e04371fb6e5d4488dd1167ef14299f, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3452304748108344397, guid: b6e04371fb6e5d4488dd1167ef14299f, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5427629757743743106, guid: b6e04371fb6e5d4488dd1167ef14299f, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: b6e04371fb6e5d4488dd1167ef14299f, type: 3} --- !u!4 &296012511 stripped Transform: m_CorrespondingSourceObject: {fileID: 5262755222010251265, guid: 481a02167edfebe44883f5868f8a27f9, type: 3} @@ -5862,10 +5798,10 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1888977164} - - {fileID: 712723490} - {fileID: 1288997560} + - {fileID: 7278954555104977258} m_Father: {fileID: 0} - m_RootOrder: 12 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &466555361 GameObject: @@ -6201,7 +6137,7 @@ Transform: - {fileID: 223162560} - {fileID: 1031756479} m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &520683835 GameObject: @@ -6249,7 +6185,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &527112787 PrefabInstance: @@ -8217,40 +8153,6 @@ Transform: m_Father: {fileID: 503451125} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} ---- !u!1 &712723489 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 4618723092965333560, guid: b6e04371fb6e5d4488dd1167ef14299f, type: 3} - m_PrefabInstance: {fileID: 260965694} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 712723490} - m_Layer: 0 - m_Name: keyboard - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &712723490 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 5427629757743743106, guid: b6e04371fb6e5d4488dd1167ef14299f, type: 3} - m_PrefabInstance: {fileID: 260965694} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 712723489} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 4.124803, y: 1.9152629, z: 2.9281483} - m_LocalScale: {x: 0.16, y: 0.16, z: 0.16} - m_ConstrainProportionsScale: 1 - m_Children: - - {fileID: 2117302372} - - {fileID: 1599006601} - - {fileID: 1140899233} - m_Father: {fileID: 435302310} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!43 &738051101 Mesh: m_ObjectHideFlags: 0 @@ -9180,31 +9082,31 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5367457311287030540, guid: ab468a82ad445da4e9a084297505261f, type: 3} propertyPath: m_LocalPosition.x - value: -0.47966242 + value: -1.5334125 objectReference: {fileID: 0} - target: {fileID: 5367457311287030540, guid: ab468a82ad445da4e9a084297505261f, type: 3} propertyPath: m_LocalPosition.y - value: -0.9956628 + value: -0.9956597 objectReference: {fileID: 0} - target: {fileID: 5367457311287030540, guid: ab468a82ad445da4e9a084297505261f, type: 3} propertyPath: m_LocalPosition.z - value: 1.8058307 + value: 1.7768617 objectReference: {fileID: 0} - target: {fileID: 5367457311287030540, guid: ab468a82ad445da4e9a084297505261f, type: 3} propertyPath: m_LocalRotation.w - value: 0.70710784 + value: 0.00000033527613 objectReference: {fileID: 0} - target: {fileID: 5367457311287030540, guid: ab468a82ad445da4e9a084297505261f, type: 3} propertyPath: m_LocalRotation.x - value: -0 + value: -0.7071079 objectReference: {fileID: 0} - target: {fileID: 5367457311287030540, guid: ab468a82ad445da4e9a084297505261f, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: -0.70710576 objectReference: {fileID: 0} - target: {fileID: 5367457311287030540, guid: ab468a82ad445da4e9a084297505261f, type: 3} propertyPath: m_LocalRotation.z - value: 0.70710576 + value: 0.0000003327573 objectReference: {fileID: 0} - target: {fileID: 5367457311287030540, guid: ab468a82ad445da4e9a084297505261f, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -9212,7 +9114,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5367457311287030540, guid: ab468a82ad445da4e9a084297505261f, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 0 + value: -180 objectReference: {fileID: 0} - target: {fileID: 5367457311287030540, guid: ab468a82ad445da4e9a084297505261f, type: 3} propertyPath: m_LocalEulerAnglesHint.z @@ -9616,7 +9518,7 @@ Transform: - {fileID: 2128333932} - {fileID: 197140882} m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &817029044 stripped Transform: @@ -10250,11 +10152,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5569992116628908473, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} propertyPath: m_LocalPosition.x - value: 1.7307487 + value: 1.613 objectReference: {fileID: 0} - target: {fileID: 5569992116628908473, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} propertyPath: m_LocalPosition.y - value: -0.3028674 + value: -0.431 objectReference: {fileID: 0} - target: {fileID: 5569992116628908473, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} propertyPath: m_LocalPosition.z @@ -10292,7 +10194,8 @@ PrefabInstance: propertyPath: m_Name value: UM3_UM3_Ultimaker objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 2376179122941027147, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} --- !u!4 &891532972 stripped Transform: @@ -10367,7 +10270,7 @@ Transform: - {fileID: 360260910} - {fileID: 671061970} m_Father: {fileID: 0} - m_RootOrder: 8 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &933062237 PrefabInstance: @@ -10464,7 +10367,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2996515769384266075, guid: fa4ac501e4c6a288483bbfa0e81e97f6, type: 3} propertyPath: m_RootOrder - value: 13 + value: 12 objectReference: {fileID: 0} - target: {fileID: 2996515769384266075, guid: fa4ac501e4c6a288483bbfa0e81e97f6, type: 3} propertyPath: m_LocalPosition.x @@ -11576,89 +11479,6 @@ Mesh: offset: 0 size: 0 path: ---- !u!1 &1140899232 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1140899233} - - component: {fileID: 1140899235} - - component: {fileID: 1140899234} - m_Layer: 0 - m_Name: Plane.018 (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1140899233 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1140899232} - m_LocalRotation: {x: 0.4999982, y: -0.5000018, z: -0.50000155, w: -0.4999985} - m_LocalPosition: {x: -2.1, y: 0.057533078, z: 0.65722483} - m_LocalScale: {x: 0.013949569, y: 0.013949569, z: 0.013949569} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 712723490} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: -90, y: 0, z: -270} ---- !u!23 &1140899234 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1140899232} - 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: d409ee3fc36caaa48af46d3417777a49, 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 &1140899235 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1140899232} - m_Mesh: {fileID: -6761583154040148038, guid: 6989f565337da034f98d0b5a0898d245, type: 3} --- !u!4 &1163077229 stripped Transform: m_CorrespondingSourceObject: {fileID: 3674349604157782260, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3} @@ -11703,7 +11523,7 @@ Transform: - {fileID: 1557224834} - {fileID: 133861093} m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1180503447 PrefabInstance: @@ -11944,7 +11764,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 6291597597410968062, guid: fde4367ea6917fe43b9f69a154c145c1, type: 3} propertyPath: m_RootOrder - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6291597597410968062, guid: fde4367ea6917fe43b9f69a154c145c1, type: 3} propertyPath: m_LocalScale.y @@ -12018,7 +11838,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 447954, guid: dc06161b6d97feb419f45f03b62e14b9, type: 3} propertyPath: m_RootOrder - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 447954, guid: dc06161b6d97feb419f45f03b62e14b9, type: 3} propertyPath: m_LocalPosition.x @@ -12863,7 +12683,7 @@ Transform: - {fileID: 1620530528} - {fileID: 788326936} m_Father: {fileID: 0} - m_RootOrder: 9 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1557224832 GameObject: @@ -13042,89 +12862,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 5262755222010251265, guid: 481a02167edfebe44883f5868f8a27f9, type: 3} m_PrefabInstance: {fileID: 1051499707} m_PrefabAsset: {fileID: 0} ---- !u!1 &1599006600 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 1328060123795043371, guid: b6e04371fb6e5d4488dd1167ef14299f, type: 3} - m_PrefabInstance: {fileID: 260965694} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1599006601} - - component: {fileID: 1599006603} - - component: {fileID: 1599006602} - m_Layer: 0 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1599006601 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 6719262039695875589, guid: b6e04371fb6e5d4488dd1167ef14299f, type: 3} - m_PrefabInstance: {fileID: 260965694} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1599006600} - m_LocalRotation: {x: -0.7071068, y: -0.00000023040465, z: -0.00000023040471, w: 0.7071067} - m_LocalPosition: {x: -2.0883987, y: 0.057532914, z: 0.29480234} - m_LocalScale: {x: 0.01594651, y: 0.013049402, z: 0.018641315} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 712723490} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!23 &1599006602 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 2031413120769920792, guid: b6e04371fb6e5d4488dd1167ef14299f, type: 3} - m_PrefabInstance: {fileID: 260965694} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1599006600} - 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: 6aa4ab55e397ef343829a33464c473af, 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 &1599006603 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 5610614528396630189, guid: b6e04371fb6e5d4488dd1167ef14299f, type: 3} - m_PrefabInstance: {fileID: 260965694} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1599006600} - m_Mesh: {fileID: 6686097678407549244, guid: 6989f565337da034f98d0b5a0898d245, type: 3} --- !u!4 &1620530528 stripped Transform: m_CorrespondingSourceObject: {fileID: 5262755222010251265, guid: 481a02167edfebe44883f5868f8a27f9, type: 3} @@ -13170,7 +12907,7 @@ Transform: - {fileID: 1403294835} - {fileID: 527112788} m_Father: {fileID: 0} - m_RootOrder: 11 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1695254330 PrefabInstance: @@ -13277,7 +13014,7 @@ Transform: - {fileID: 1695254331} - {fileID: 1180503448} m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1727196003 PrefabInstance: @@ -16887,90 +16624,6 @@ MonoBehaviour: m_DeselectOnBackgroundClick: 1 m_PointerBehavior: 0 m_CursorLockBehavior: 0 ---- !u!1 &2117302371 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 6346329204487432465, guid: b6e04371fb6e5d4488dd1167ef14299f, type: 3} - m_PrefabInstance: {fileID: 260965694} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2117302372} - - component: {fileID: 2117302374} - - component: {fileID: 2117302373} - m_Layer: 0 - m_Name: Keyboard - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2117302372 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 6865381199869836135, guid: b6e04371fb6e5d4488dd1167ef14299f, type: 3} - m_PrefabInstance: {fileID: 260965694} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2117302371} - m_LocalRotation: {x: -0.5, y: 0.49999997, z: 0.5, w: 0.5} - m_LocalPosition: {x: -0, y: 0, z: 0} - m_LocalScale: {x: 0.053375605, y: 0.060548496, z: 0.053375605} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 712723490} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!23 &2117302373 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 2667871572618520955, guid: b6e04371fb6e5d4488dd1167ef14299f, type: 3} - m_PrefabInstance: {fileID: 260965694} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2117302371} - 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: 85f929bc6eaffbd409c800bb37efb5a8, type: 2} - - {fileID: 2100000, guid: 79a99cd6e1eda5b4da339568fbbe83cb, 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 &2117302374 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 1775826665084644934, guid: b6e04371fb6e5d4488dd1167ef14299f, type: 3} - m_PrefabInstance: {fileID: 260965694} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2117302371} - m_Mesh: {fileID: -327218276259777663, guid: 6989f565337da034f98d0b5a0898d245, type: 3} --- !u!1001 &2128333931 PrefabInstance: m_ObjectHideFlags: 0 @@ -16996,11 +16649,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5569992116628908473, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} propertyPath: m_LocalPosition.x - value: 1.7307487 + value: 1.6129999 objectReference: {fileID: 0} - target: {fileID: 5569992116628908473, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} propertyPath: m_LocalPosition.y - value: -0.3028674 + value: -0.431 objectReference: {fileID: 0} - target: {fileID: 5569992116628908473, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} propertyPath: m_LocalPosition.z @@ -17038,7 +16691,8 @@ PrefabInstance: propertyPath: m_Name value: UM3_UM3_Ultimaker (1) objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 2376179122941027147, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} --- !u!4 &2128333932 stripped Transform: @@ -17050,23 +16704,23 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 435302310} m_Modifications: - target: {fileID: 7101811468694509626, guid: cbdff3e37c153cc48b95d4374a38eed9, type: 3} propertyPath: m_RootOrder - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 7101811468694509626, guid: cbdff3e37c153cc48b95d4374a38eed9, type: 3} propertyPath: m_LocalPosition.x - value: 3.636 + value: -0.16844964 objectReference: {fileID: 0} - target: {fileID: 7101811468694509626, guid: cbdff3e37c153cc48b95d4374a38eed9, type: 3} propertyPath: m_LocalPosition.y - value: 1.9152628 + value: -0.25695884 objectReference: {fileID: 0} - target: {fileID: 7101811468694509626, guid: cbdff3e37c153cc48b95d4374a38eed9, type: 3} propertyPath: m_LocalPosition.z - value: 2.917 + value: 1.518877 objectReference: {fileID: 0} - target: {fileID: 7101811468694509626, guid: cbdff3e37c153cc48b95d4374a38eed9, type: 3} propertyPath: m_LocalRotation.w @@ -17102,6 +16756,11 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: cbdff3e37c153cc48b95d4374a38eed9, type: 3} +--- !u!4 &7278954555104977258 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7101811468694509626, guid: cbdff3e37c153cc48b95d4374a38eed9, type: 3} + m_PrefabInstance: {fileID: 7278954555104977257} + m_PrefabAsset: {fileID: 0} --- !u!1001 &8736913158087471388 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Texture/CircuitBoard_Metallic.png b/Assets/Texture/CircuitBoard_Metallic.png new file mode 100644 index 0000000..c6e3c57 --- /dev/null +++ b/Assets/Texture/CircuitBoard_Metallic.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7068b86634de0694ed69b64632410afa8a2d20acc030fbe5ef32bd76e745f0f6 +size 218044 diff --git a/Assets/Texture/CircuitBoard_Metallic.png.meta b/Assets/Texture/CircuitBoard_Metallic.png.meta new file mode 100644 index 0000000..a47aa81 --- /dev/null +++ b/Assets/Texture/CircuitBoard_Metallic.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: 5b29c9a0366077d4189769da5151bef2 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Texture/CircuitBoard_Metallic_2.png b/Assets/Texture/CircuitBoard_Metallic_2.png new file mode 100644 index 0000000..08ef11b --- /dev/null +++ b/Assets/Texture/CircuitBoard_Metallic_2.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1ced488aa4633468a4183a0a4bb4b3363c1b13773d38383bea69ebf8dc174553 +size 183268 diff --git a/Assets/Texture/CircuitBoard_Metallic_2.png.meta b/Assets/Texture/CircuitBoard_Metallic_2.png.meta new file mode 100644 index 0000000..551a7be --- /dev/null +++ b/Assets/Texture/CircuitBoard_Metallic_2.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: 33ef2905e65468c4a8bdbf7613c47218 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Texture/CircuitBoard_diffuse.png b/Assets/Texture/CircuitBoard_diffuse.png new file mode 100644 index 0000000..25cb0f7 --- /dev/null +++ b/Assets/Texture/CircuitBoard_diffuse.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eb32b1422cc4064a7c143f74e885bd210a5dee32cb5f9ea35d5630710d273a48 +size 423659 diff --git a/Assets/Texture/CircuitBoard_diffuse.png.meta b/Assets/Texture/CircuitBoard_diffuse.png.meta new file mode 100644 index 0000000..d7112df --- /dev/null +++ b/Assets/Texture/CircuitBoard_diffuse.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: 0aff3df6854d11b4599b809d07bd3ed2 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/manifest.json b/Packages/manifest.json index 9911326..a65b8be 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -7,6 +7,7 @@ "com.unity.ide.visualstudio": "2.0.17", "com.unity.ide.vscode": "1.2.5", "com.unity.probuilder": "5.0.6", + "com.unity.project-auditor": "https://github.com/Unity-Technologies/ProjectAuditor.git", "com.unity.test-framework": "1.1.33", "com.unity.textmeshpro": "3.0.6", "com.unity.timeline": "1.6.4", @@ -15,7 +16,6 @@ "com.unity.ugui": "1.0.0", "com.unity.visualscripting": "1.7.8", "com.unity.xr.management": "4.3.1", - "com.unity.xr.mock-hmd": "1.3.0-preview.1", "com.unity.xr.oculus": "3.2.2", "com.unity.xr.openxr": "1.5.3", "com.valvesoftware.unity.openvr": "file:../Assets/SteamVR/OpenVRUnityXRPackage/Editor/com.valvesoftware.unity.openvr-1.1.4.tgz", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 47cc0d8..bf8df19 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -78,6 +78,13 @@ }, "url": "https://packages.unity.com" }, + "com.unity.nuget.mono-cecil": { + "version": "1.10.2", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, "com.unity.nuget.newtonsoft-json": { "version": "3.0.2", "depth": 2, @@ -103,6 +110,15 @@ }, "url": "https://packages.unity.com" }, + "com.unity.project-auditor": { + "version": "https://github.com/Unity-Technologies/ProjectAuditor.git", + "depth": 0, + "source": "git", + "dependencies": { + "com.unity.nuget.mono-cecil": "1.10.2" + }, + "hash": "70023efe8ae2b28076b3f52719b4fd082732edd2" + }, "com.unity.services.core": { "version": "1.6.0", "depth": 1, @@ -240,15 +256,6 @@ }, "url": "https://packages.unity.com" }, - "com.unity.xr.mock-hmd": { - "version": "1.3.0-preview.1", - "depth": 0, - "source": "registry", - "dependencies": { - "com.unity.xr.management": "4.0.1" - }, - "url": "https://packages.unity.com" - }, "com.unity.xr.oculus": { "version": "3.2.2", "depth": 0,