From f89e261c93e26ef5c769a761a95524018e7af1af Mon Sep 17 00:00:00 2001 From: Legonzaur Date: Fri, 13 Jan 2023 17:42:22 +0100 Subject: [PATCH] Remove script component from chair --- Assets/Models/chair.prefab | 160 --------- Assets/Scenes/FabLab/FabLab.unity | 340 +++++++++--------- .../FabLab/FabLab/ReflectionProbe-0.png | 4 +- .../FabLab/FabLab/ReflectionProbe-0.png.meta | 12 + 4 files changed, 184 insertions(+), 332 deletions(-) diff --git a/Assets/Models/chair.prefab b/Assets/Models/chair.prefab index b5b4cd8..b3f14c2 100644 --- a/Assets/Models/chair.prefab +++ b/Assets/Models/chair.prefab @@ -186,38 +186,6 @@ MeshCollider: m_Convex: 1 m_CookingOptions: 30 m_Mesh: {fileID: -3183339516574119901, guid: 61dd8047e5e66dc4db5c150abe38beae, type: 3} ---- !u!114 &1204935884 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 749501648960564542} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d2fe5546f775c47d2820aa5e8a715f53, type: 3} - m_Name: - m_EditorClassIdentifier: - _data: - _json: '{"nest":{"source":"Macro","macro":0,"embed":null}}' - _objectReferences: - - {fileID: 11400000, guid: 167792fa91240014fb8100d8c0b8e71c, type: 2} ---- !u!114 &1204935885 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 749501648960564542} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e741851cba3ad425c91ecf922cc6b379, type: 3} - m_Name: - m_EditorClassIdentifier: - _data: - _json: '{"declarations":{"Kind":"Object","collection":{"$content":[{"name":"OnGround","value":{"$content":false,"$type":"System.Boolean"},"typeHandle":{"Identification":"System.Boolean, - mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089","$version":"A"},"$version":"A"}],"$version":"A"},"$version":"A"}}' - _objectReferences: [] --- !u!1 &1941168049300974042 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6085450026611476016, guid: 61dd8047e5e66dc4db5c150abe38beae, type: 3} @@ -256,38 +224,6 @@ MeshCollider: m_Convex: 1 m_CookingOptions: 30 m_Mesh: {fileID: -3183339516574119901, guid: 61dd8047e5e66dc4db5c150abe38beae, type: 3} ---- !u!114 &1243286690 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2398297990381228278} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d2fe5546f775c47d2820aa5e8a715f53, type: 3} - m_Name: - m_EditorClassIdentifier: - _data: - _json: '{"nest":{"source":"Macro","macro":0,"embed":null}}' - _objectReferences: - - {fileID: 11400000, guid: 167792fa91240014fb8100d8c0b8e71c, type: 2} ---- !u!114 &1243286695 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2398297990381228278} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e741851cba3ad425c91ecf922cc6b379, type: 3} - m_Name: - m_EditorClassIdentifier: - _data: - _json: '{"declarations":{"Kind":"Object","collection":{"$content":[{"name":"OnGround","value":{"$content":false,"$type":"System.Boolean"},"typeHandle":{"Identification":"System.Boolean, - mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089","$version":"A"},"$version":"A"}],"$version":"A"},"$version":"A"}}' - _objectReferences: [] --- !u!1 &2813751424733417823 stripped GameObject: m_CorrespondingSourceObject: {fileID: -1616859871024398667, guid: 61dd8047e5e66dc4db5c150abe38beae, type: 3} @@ -325,38 +261,6 @@ MeshCollider: m_Convex: 1 m_CookingOptions: 30 m_Mesh: {fileID: -3183339516574119901, guid: 61dd8047e5e66dc4db5c150abe38beae, type: 3} ---- !u!114 &1224994882 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3387733359169555233} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d2fe5546f775c47d2820aa5e8a715f53, type: 3} - m_Name: - m_EditorClassIdentifier: - _data: - _json: '{"nest":{"source":"Macro","macro":0,"embed":null}}' - _objectReferences: - - {fileID: 11400000, guid: 167792fa91240014fb8100d8c0b8e71c, type: 2} ---- !u!114 &1224994887 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3387733359169555233} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e741851cba3ad425c91ecf922cc6b379, type: 3} - m_Name: - m_EditorClassIdentifier: - _data: - _json: '{"declarations":{"Kind":"Object","collection":{"$content":[{"name":"OnGround","value":{"$content":false,"$type":"System.Boolean"},"typeHandle":{"Identification":"System.Boolean, - mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089","$version":"A"},"$version":"A"}],"$version":"A"},"$version":"A"}}' - _objectReferences: [] --- !u!1 &4774624094512517819 stripped GameObject: m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 61dd8047e5e66dc4db5c150abe38beae, type: 3} @@ -422,38 +326,6 @@ MeshCollider: m_Convex: 1 m_CookingOptions: 30 m_Mesh: {fileID: -3183339516574119901, guid: 61dd8047e5e66dc4db5c150abe38beae, type: 3} ---- !u!114 &2133825191 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7629644934281361513} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d2fe5546f775c47d2820aa5e8a715f53, type: 3} - m_Name: - m_EditorClassIdentifier: - _data: - _json: '{"nest":{"source":"Macro","macro":0,"embed":null}}' - _objectReferences: - - {fileID: 11400000, guid: 167792fa91240014fb8100d8c0b8e71c, type: 2} ---- !u!114 &2133825192 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7629644934281361513} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e741851cba3ad425c91ecf922cc6b379, type: 3} - m_Name: - m_EditorClassIdentifier: - _data: - _json: '{"declarations":{"Kind":"Object","collection":{"$content":[{"name":"OnGround","value":{"$content":false,"$type":"System.Boolean"},"typeHandle":{"Identification":"System.Boolean, - mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089","$version":"A"},"$version":"A"}],"$version":"A"},"$version":"A"}}' - _objectReferences: [] --- !u!1 &7802258548554580668 stripped GameObject: m_CorrespondingSourceObject: {fileID: -6718097069914690218, guid: 61dd8047e5e66dc4db5c150abe38beae, type: 3} @@ -473,35 +345,3 @@ MeshCollider: m_Convex: 1 m_CookingOptions: 30 m_Mesh: {fileID: -3183339516574119901, guid: 61dd8047e5e66dc4db5c150abe38beae, type: 3} ---- !u!114 &969457602 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7802258548554580668} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d2fe5546f775c47d2820aa5e8a715f53, type: 3} - m_Name: - m_EditorClassIdentifier: - _data: - _json: '{"nest":{"source":"Macro","macro":0,"embed":null}}' - _objectReferences: - - {fileID: 11400000, guid: 167792fa91240014fb8100d8c0b8e71c, type: 2} ---- !u!114 &969457603 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7802258548554580668} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e741851cba3ad425c91ecf922cc6b379, type: 3} - m_Name: - m_EditorClassIdentifier: - _data: - _json: '{"declarations":{"Kind":"Object","collection":{"$content":[{"name":"OnGround","value":{"$content":false,"$type":"System.Boolean"},"typeHandle":{"Identification":"System.Boolean, - mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089","$version":"A"},"$version":"A"}],"$version":"A"},"$version":"A"}}' - _objectReferences: [] diff --git a/Assets/Scenes/FabLab/FabLab.unity b/Assets/Scenes/FabLab/FabLab.unity index 23f3112..6c2a946 100644 --- a/Assets/Scenes/FabLab/FabLab.unity +++ b/Assets/Scenes/FabLab/FabLab.unity @@ -97,7 +97,7 @@ LightmapSettings: m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 112000000, guid: 986b89aa15fdd8542a030c00f020235c, type: 2} + m_LightingDataAsset: {fileID: 112000000, guid: 452b54fcc00b0c243b1dc869278097de, type: 2} m_LightingSettings: {fileID: 4890085278179872738, guid: e0d1b39396743fc4da42f1d1948a6570, type: 2} --- !u!196 &4 NavMeshSettings: @@ -5591,7 +5591,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh31124 + m_Name: pb_Mesh38424 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -8120,170 +8120,6 @@ MonoBehaviour: m_SelectedFaces: m_SelectedEdges: [] m_SelectedVertices: ---- !u!43 &702616851 -Mesh: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh31540 - serializedVersion: 10 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 6 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 4 - localAABB: - m_Center: {x: 6, y: 1, z: 3.5} - m_Extent: {x: 7, y: 0, z: 4.5} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_BonesAABB: [] - m_VariableBoneCountWeights: - m_Data: - m_MeshCompression: 0 - m_IsReadable: 1 - m_KeepVertices: 1 - m_KeepIndices: 1 - m_IndexFormat: 0 - m_IndexBuffer: 000001000200010003000200 - m_VertexData: - serializedVersion: 3 - m_VertexCount: 4 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 12 - format: 0 - dimension: 3 - - stream: 0 - offset: 24 - format: 0 - dimension: 4 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 40 - format: 0 - dimension: 2 - - stream: 0 - offset: 48 - format: 0 - dimension: 2 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 224 - _typelessdata: 000080bf0000803f00000041000000000000803f000000000000803f0000000000000000000080bf000080bf0000004117467b3f9d5c233f000050410000803f00000041000000000000803f000000000000803f0000000000000000000080bf00005041000000410bd7a33c9d5c233f000080bf0000803f000080bf000000000000803f000000000000803f0000000000000000000080bf000080bf000080bf1a467b3f0bd7a33c000050410000803f000080bf000000000000803f000000000000803f0000000000000000000080bf00005041000080bf7cd7a33c0bd7a33c - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: 6, y: 1, z: 3.5} - m_Extent: {x: 7, y: 0, z: 4.5} - m_MeshUsageFlags: 0 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - m_MeshMetrics[0]: 1 - m_MeshMetrics[1]: 1 - m_MeshOptimizationFlags: 1 - m_StreamData: - serializedVersion: 2 - offset: 0 - size: 0 - path: --- !u!1 &705507993 GameObject: m_ObjectHideFlags: 0 @@ -11539,6 +11375,170 @@ MonoBehaviour: m_SelectedFaces: m_SelectedEdges: [] m_SelectedVertices: +--- !u!43 &1128628200 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: pb_Mesh38826 + serializedVersion: 10 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 6 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 4 + localAABB: + m_Center: {x: 6, y: 1, z: 3.5} + m_Extent: {x: 7, y: 0, z: 4.5} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 1 + m_KeepIndices: 1 + m_IndexFormat: 0 + m_IndexBuffer: 000001000200010003000200 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 4 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 12 + format: 0 + dimension: 3 + - stream: 0 + offset: 24 + format: 0 + dimension: 4 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 40 + format: 0 + dimension: 2 + - stream: 0 + offset: 48 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 224 + _typelessdata: 000080bf0000803f00000041000000000000803f000000000000803f0000000000000000000080bf000080bf0000004117467b3f9d5c233f000050410000803f00000041000000000000803f000000000000803f0000000000000000000080bf00005041000000410bd7a33c9d5c233f000080bf0000803f000080bf000000000000803f000000000000803f0000000000000000000080bf000080bf000080bf1a467b3f0bd7a33c000050410000803f000080bf000000000000803f000000000000803f0000000000000000000080bf00005041000080bf7cd7a33c0bd7a33c + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 6, y: 1, z: 3.5} + m_Extent: {x: 7, y: 0, z: 4.5} + m_MeshUsageFlags: 0 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + m_MeshMetrics[0]: 1 + m_MeshMetrics[1]: 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: --- !u!1 &1140899232 GameObject: m_ObjectHideFlags: 0 @@ -16175,7 +16175,7 @@ MeshCollider: serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 - m_Mesh: {fileID: 702616851} + m_Mesh: {fileID: 1128628200} --- !u!33 &1962807158 MeshFilter: m_ObjectHideFlags: 10 @@ -16183,7 +16183,7 @@ MeshFilter: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1962807155} - m_Mesh: {fileID: 702616851} + m_Mesh: {fileID: 1128628200} --- !u!23 &1962807159 MeshRenderer: m_ObjectHideFlags: 0 @@ -16315,8 +16315,8 @@ MonoBehaviour: m_AreaError: 15 m_PreserveMeshAssetOnDestroy: 0 assetGuid: - m_Mesh: {fileID: 702616851} - m_VersionIndex: 11218 + m_Mesh: {fileID: 1128628200} + m_VersionIndex: 11221 m_IsSelectable: 1 m_SelectedFaces: m_SelectedEdges: [] diff --git a/Assets/Scenes/FabLab/FabLab/ReflectionProbe-0.png b/Assets/Scenes/FabLab/FabLab/ReflectionProbe-0.png index 5aed034..9f1afa5 100644 --- a/Assets/Scenes/FabLab/FabLab/ReflectionProbe-0.png +++ b/Assets/Scenes/FabLab/FabLab/ReflectionProbe-0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4f6077a69ce817d1c15a811f35a877bcec86edc0e6bea11aef3c68c81885db29 -size 104366 +oid sha256:da8ad6685650bd470f901b161d08dec0b0dd06638adff4aac699468d87f2a57f +size 104591 diff --git a/Assets/Scenes/FabLab/FabLab/ReflectionProbe-0.png.meta b/Assets/Scenes/FabLab/FabLab/ReflectionProbe-0.png.meta index 342878e..bb1b796 100644 --- a/Assets/Scenes/FabLab/FabLab/ReflectionProbe-0.png.meta +++ b/Assets/Scenes/FabLab/FabLab/ReflectionProbe-0.png.meta @@ -113,6 +113,18 @@ TextureImporter: 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: []