From 7bd6a33505ffd307615d97efd8378f5ab0fce0ea Mon Sep 17 00:00:00 2001 From: Legonzaur Date: Thu, 26 Jan 2023 15:18:48 +0100 Subject: [PATCH] fix walls for the 5th fucking time --- Assets/Models/Blender/Base_Station.blend.meta | 2 +- Assets/Models/Blender/shelf.blend.meta | 106 +++++ Assets/Models/laser_cutter Variant.prefab | 120 ++++++ .../Models/laser_cutter Variant.prefab.meta | 7 + Assets/Scenes/FabLab/FabLab.unity | 374 +++++------------- .../FabLab/Lightmap-0_comp_dir.png.meta | 40 +- .../FabLab/Lightmap-0_comp_light.exr.meta | 40 +- .../FabLab/Lightmap-1_comp_dir.png.meta | 40 +- .../FabLab/Lightmap-1_comp_light.exr.meta | 40 +- .../FabLab/Lightmap-2_comp_dir.png.meta | 40 +- .../FabLab/Lightmap-2_comp_light.exr.meta | 40 +- .../FabLab/FabLab/ReflectionProbe-0.png.meta | 42 +- .../FabLab/FabLab/ReflectionProbe-1.exr.meta | 42 +- 13 files changed, 391 insertions(+), 542 deletions(-) create mode 100644 Assets/Models/Blender/shelf.blend.meta create mode 100644 Assets/Models/laser_cutter Variant.prefab create mode 100644 Assets/Models/laser_cutter Variant.prefab.meta diff --git a/Assets/Models/Blender/Base_Station.blend.meta b/Assets/Models/Blender/Base_Station.blend.meta index 70a9784..0914ae8 100644 --- a/Assets/Models/Blender/Base_Station.blend.meta +++ b/Assets/Models/Blender/Base_Station.blend.meta @@ -32,7 +32,7 @@ ModelImporter: extraExposedTransformPaths: [] extraUserProperties: [] clipAnimations: [] - isReadable: 1 + isReadable: 0 meshes: lODScreenPercentages: [] globalScale: 1 diff --git a/Assets/Models/Blender/shelf.blend.meta b/Assets/Models/Blender/shelf.blend.meta new file mode 100644 index 0000000..4d32eea --- /dev/null +++ b/Assets/Models/Blender/shelf.blend.meta @@ -0,0 +1,106 @@ +fileFormatVersion: 2 +guid: 7872fdb3a4e3059189918ec37835ceaf +ModelImporter: + serializedVersion: 21300 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 1 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/laser_cutter Variant.prefab b/Assets/Models/laser_cutter Variant.prefab new file mode 100644 index 0000000..98b60e1 --- /dev/null +++ b/Assets/Models/laser_cutter Variant.prefab @@ -0,0 +1,120 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &4313590370818001808 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: f094d17760f73b04cadf055698f721fd, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: f094d17760f73b04cadf055698f721fd, type: 3} + propertyPath: m_LocalPosition.x + value: 1.2375174 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: f094d17760f73b04cadf055698f721fd, type: 3} + propertyPath: m_LocalPosition.y + value: 5.514353 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: f094d17760f73b04cadf055698f721fd, type: 3} + propertyPath: m_LocalPosition.z + value: -15.980917 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: f094d17760f73b04cadf055698f721fd, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: f094d17760f73b04cadf055698f721fd, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: f094d17760f73b04cadf055698f721fd, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: f094d17760f73b04cadf055698f721fd, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: f094d17760f73b04cadf055698f721fd, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: f094d17760f73b04cadf055698f721fd, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: f094d17760f73b04cadf055698f721fd, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7635826562936255635, guid: f094d17760f73b04cadf055698f721fd, type: 3} + propertyPath: m_Materials.Array.data[6] + value: + objectReference: {fileID: 1379711075021050917, guid: 5418bb5e5c84f514a8af64db2f8d7445, type: 3} + - target: {fileID: -7635826562936255635, guid: f094d17760f73b04cadf055698f721fd, type: 3} + propertyPath: m_Materials.Array.data[7] + value: + objectReference: {fileID: -1362402942781197322, guid: 5418bb5e5c84f514a8af64db2f8d7445, type: 3} + - target: {fileID: -7635826562936255635, guid: f094d17760f73b04cadf055698f721fd, type: 3} + propertyPath: m_Materials.Array.data[8] + value: + objectReference: {fileID: -7252675926552702154, guid: 5418bb5e5c84f514a8af64db2f8d7445, type: 3} + - target: {fileID: -7635826562936255635, guid: f094d17760f73b04cadf055698f721fd, type: 3} + propertyPath: m_Materials.Array.data[9] + value: + objectReference: {fileID: 2100000, guid: e7f8455d46288cb12b49d5367b543018, type: 2} + - target: {fileID: 919132149155446097, guid: f094d17760f73b04cadf055698f721fd, type: 3} + propertyPath: m_Name + value: laser_cutter Variant + objectReference: {fileID: 0} + - target: {fileID: 1151388028547126963, guid: f094d17760f73b04cadf055698f721fd, type: 3} + propertyPath: m_LocalPosition.x + value: 0.305 + objectReference: {fileID: 0} + - target: {fileID: 1151388028547126963, guid: f094d17760f73b04cadf055698f721fd, type: 3} + propertyPath: m_LocalPosition.z + value: 0.356 + objectReference: {fileID: 0} + - target: {fileID: 1151388028547126963, guid: f094d17760f73b04cadf055698f721fd, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 1151388028547126963, guid: f094d17760f73b04cadf055698f721fd, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1151388028547126963, guid: f094d17760f73b04cadf055698f721fd, type: 3} + propertyPath: m_LocalRotation.y + value: 0.70710677 + objectReference: {fileID: 0} + - target: {fileID: 1151388028547126963, guid: f094d17760f73b04cadf055698f721fd, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: f094d17760f73b04cadf055698f721fd, type: 3} +--- !u!1 &3971500078747236033 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: f094d17760f73b04cadf055698f721fd, type: 3} + m_PrefabInstance: {fileID: 4313590370818001808} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1703295072119626799 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3971500078747236033} + 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 diff --git a/Assets/Models/laser_cutter Variant.prefab.meta b/Assets/Models/laser_cutter Variant.prefab.meta new file mode 100644 index 0000000..5848c28 --- /dev/null +++ b/Assets/Models/laser_cutter Variant.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: b193c053d289cac43b3ddd2b6c501447 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/FabLab/FabLab.unity b/Assets/Scenes/FabLab/FabLab.unity index eb480e5..2e8b4b4 100644 --- a/Assets/Scenes/FabLab/FabLab.unity +++ b/Assets/Scenes/FabLab/FabLab.unity @@ -123,107 +123,10 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1001 &3349737 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 45957245} - m_Modifications: - - target: {fileID: -8679921383154817045, guid: f094d17760f73b04cadf055698f721fd, type: 3} - propertyPath: m_RootOrder - value: 24 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: f094d17760f73b04cadf055698f721fd, type: 3} - propertyPath: m_LocalPosition.x - value: 1.2375174 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: f094d17760f73b04cadf055698f721fd, type: 3} - propertyPath: m_LocalPosition.y - value: 5.514353 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: f094d17760f73b04cadf055698f721fd, type: 3} - propertyPath: m_LocalPosition.z - value: -15.980917 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: f094d17760f73b04cadf055698f721fd, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: f094d17760f73b04cadf055698f721fd, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: f094d17760f73b04cadf055698f721fd, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: f094d17760f73b04cadf055698f721fd, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: f094d17760f73b04cadf055698f721fd, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: f094d17760f73b04cadf055698f721fd, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: f094d17760f73b04cadf055698f721fd, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -7635826562936255635, guid: f094d17760f73b04cadf055698f721fd, type: 3} - propertyPath: m_Materials.Array.data[6] - value: - objectReference: {fileID: 1379711075021050917, guid: 5418bb5e5c84f514a8af64db2f8d7445, type: 3} - - target: {fileID: -7635826562936255635, guid: f094d17760f73b04cadf055698f721fd, type: 3} - propertyPath: m_Materials.Array.data[7] - value: - objectReference: {fileID: -1362402942781197322, guid: 5418bb5e5c84f514a8af64db2f8d7445, type: 3} - - target: {fileID: -7635826562936255635, guid: f094d17760f73b04cadf055698f721fd, type: 3} - propertyPath: m_Materials.Array.data[8] - value: - objectReference: {fileID: -7252675926552702154, guid: 5418bb5e5c84f514a8af64db2f8d7445, type: 3} - - target: {fileID: -7635826562936255635, guid: f094d17760f73b04cadf055698f721fd, type: 3} - propertyPath: m_Materials.Array.data[9] - value: - objectReference: {fileID: 2100000, guid: e7f8455d46288cb12b49d5367b543018, type: 2} - - target: {fileID: 919132149155446097, guid: f094d17760f73b04cadf055698f721fd, type: 3} - propertyPath: m_Name - value: laser_cutter - objectReference: {fileID: 0} - - target: {fileID: 1151388028547126963, guid: f094d17760f73b04cadf055698f721fd, type: 3} - propertyPath: m_LocalPosition.x - value: 0.305 - objectReference: {fileID: 0} - - target: {fileID: 1151388028547126963, guid: f094d17760f73b04cadf055698f721fd, type: 3} - propertyPath: m_LocalPosition.z - value: 0.356 - objectReference: {fileID: 0} - - target: {fileID: 1151388028547126963, guid: f094d17760f73b04cadf055698f721fd, type: 3} - propertyPath: m_LocalRotation.w - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 1151388028547126963, guid: f094d17760f73b04cadf055698f721fd, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1151388028547126963, guid: f094d17760f73b04cadf055698f721fd, type: 3} - propertyPath: m_LocalRotation.y - value: 0.70710677 - objectReference: {fileID: 0} - - target: {fileID: 1151388028547126963, guid: f094d17760f73b04cadf055698f721fd, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 90 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: f094d17760f73b04cadf055698f721fd, type: 3} --- !u!4 &3349738 stripped Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: f094d17760f73b04cadf055698f721fd, type: 3} - m_PrefabInstance: {fileID: 3349737} + m_CorrespondingSourceObject: {fileID: 4347744863477460091, guid: b193c053d289cac43b3ddd2b6c501447, type: 3} + m_PrefabInstance: {fileID: 4313590370816759673} m_PrefabAsset: {fileID: 0} --- !u!1 &13513594 GameObject: @@ -2494,21 +2397,21 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 260182308} - - {fileID: 1290121936} - - {fileID: 1527984575637916538} - {fileID: 1173886246} - {fileID: 1705480523} - {fileID: 808552922} + - {fileID: 260182308} - {fileID: 146814758} + - {fileID: 1290121936} + - {fileID: 1527984575637916538} - {fileID: 896101879} - {fileID: 1455652491} - {fileID: 1672585692} - {fileID: 435302310} - {fileID: 336078038} + - {fileID: 1003212931} - {fileID: 502061653} - {fileID: 3349738} - - {fileID: 1003212931} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -5931,7 +5834,7 @@ Transform: - {fileID: 899232842} - {fileID: 497015422} m_Father: {fileID: 45957245} - m_RootOrder: 6 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &175085081 PrefabInstance: @@ -6592,170 +6495,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 5262755222010251265, guid: 481a02167edfebe44883f5868f8a27f9, type: 3} m_PrefabInstance: {fileID: 645919105} m_PrefabAsset: {fileID: 0} ---- !u!43 &297351363 -Mesh: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh23790 - serializedVersion: 10 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 396 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 245 - localAABB: - m_Center: {x: 0.4999977, y: 6.0007734, z: -3.5} - m_Extent: {x: 0.5000018, y: 7.000003, 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: 000001000200010003000200040005000600050007000600080009000a0009000b000a000c000d000e000d000f000e00100011001200110013001200140015001600150017001600180019001a0019001b001a001c0018001d0018001a001d0019001e001b001e001f001b00200021002200210023002200240025002600250027002600280029002a0029002b002a001b001f002c001f002d002c002e002f0030002f00310030003200330034003300350034003600370038003700390038003a003b003c003b003d003c003e003f0040003f00410040001d001a0042001a00430042004400450046004500470046002400260048002600490048004a004b004c004b004d004c004e004f0050004f00510050005200530054005300550054005600570058005700590058005a005b005c005b005d005c001e001c005e001c005f005e001f001e0060001e005e0060001c00610062006300640065006600670068006700690068006a006b006c006b006d006c006e002f006f002f0070006f002e0071007200710073007200740075007600750077007600780079007a0079007b007a007c007d007e007d007f007e00800081008200810083008200840085008600850087008600880089008a0089008b008a008c008d008e008d008f008e00900091009200910093009200940095009600950097009600980099009a0099009b009a0060005e009c005e009d009c009e009f00a0009f00a100a000a200a300a400a300a500a400a600a700a800a700a900a8009b00aa00ab00aa00ac00ab00ad00ae00af00ae00b000af00b100b200b300b200b400b300b500b600b700b600b800b700b900ba00bb00ba00bc00bb00bd00be00bf00be00c000bf00c100c200c300c200c400c300c500c600c700c600c800c700c900ca00cb00ca00cc00cb00cd00ce00cf00ce00d000cf00d100d200d300d200d400d300d500d600d700d600d800d700d900da00db00da00dc00db00dd00de00df00de00e000df00e100e200e300e200e400e300e500e600e700e600e800e700e900ea00eb00ea00ec00eb00ed00ee00ef00ee00f000ef00f100f200f300f200f400f300 - m_VertexData: - serializedVersion: 3 - m_VertexCount: 245 - 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: 13720 - _typelessdata: f2ffafb57ecd7fbf0000803f00000000000000000000803f000080bf0000000000000000000080bff2ffaf357ecd7fbfdc2b163f7af9ce3ef4ff7f3f80cd7fbf0000803f00000000000000000000803f000080bf0000000000000000000080bff4ff7fbf80cd7fbfdc2b163f37b2e33ef0ff8fb52e0350410000803f00000000000000000000803f000080bf0000000000000000000080bff0ff8f352e0350410bd7a33c7bf9ce3ef8ff7f3f2e0350410000803f00000000000000000000803f000080bf0000000000000000000080bff8ff7fbf2e03504110d7a33c36b2e33ef4ff7f3f80cd7fbf0000803f0000803f214992b21d0882261d0882a6000000000000803f000080bf0000803f80cd7fbf64d7a33c0abcc43ef4ff7f3f88cd7fbf000000c10000803f224992b2258a2227258a22a7000000000000803f000080bf000000c188cd7fbf0bd7a33c19d7a33cf8ff7f3f2e0350410000803f0000803f224992b2258a2227258a22a7000000000000803f000080bf0000803f2e035041dd2b163f09bcc43ef8ff7f3f2b035041000000c10000803f224992b21e0882271e0882a7000000000000803f000080bf000000c12b035041d82b163f0bd7a33cf4ff7f3f88cd7fbf000000c10000000000000000000080bf0000803f0000000000000000000080bff4ff7f3f88cd7fbf0bd7a33c35b2633ff2ff8fb586cd7fbf000000c10000000000000000000080bf0000803f0000000000000000000080bff2ff8fb586cd7fbf0ed7a33cd855593ff8ff7f3f2b035041000000c10000000000000000000080bf0000803f0000000000000000000080bff8ff7f3f2b035041da2b163f35b2633fe4ff5fb52b035041000000c10000000000000000000080bf0000803f0000000000000000000080bfe4ff5fb52b035041da2b163fd755593f2f57843e6f81b33f620117c0000080bf3cefd133000000000000000000000000000080bf000080bf620117406f81b33fa621423f7af9ce3e2f57843e6f81b33f64cebfbf000080bf3cefd133000000000000000000000000000080bf000080bf64cebf3f6f81b33fa621423fb6d0e03e3257843e0c491440620117c0000080bf3cefd133000000000000000000000000000080bf000080bf620117400c491440dfa7383f7af9ce3e3257843e0c49144064cebfbf000080bf3cefd133000000000000000000000000000080bf000080bf64cebf3f0c491440dfa7383fb6d0e03ef0ff8fb52e0350410000803f000000000000803fabaaaab40000803f0000000000000000000080bff0ff8fb52300803fe289783f0bd7a33cf8ff7f3f2e0350410000803f000000000000803fabaaaab40000803f0000000000000000000080bff8ff7f3f2300803fe389783f62b1773de4ff5fb52b035041000000c1000000000000803fabaaaab40000803f0000000000000000000080bfe4ff5fb5f7ffffc0954a1b3f1dd7a33cf8ff7f3f2b035041000000c1000000000000803fabaaaab40000803f0000000000000000000080bff8ff7f3ff7ffffc0954a1b3f69b1773df2ff8fb586cd7fbf000000c1fbffffb3000080bf388e6333000080bffbffff33388ee39b000080bf1a038035000000c1e089783f78cea43df4ff7f3f88cd7fbf000000c1f8ffffb3000080bf388e6333000080bff8ffff3300000000000080bff6ff7fbf000000c1e089783f67b1f73df2ffafb57ecd7fbf0000803ff8ffffb3000080bf388e6333000080bff8ffff3300000000000080bf1a03a035ffff7f3f954a1b3f77cea43df4ff7f3f80cd7fbf0000803ff5ffffb3000080bf388e6333000080bff5ffff33388ee31b000080bff6ff7fbfffff7f3f954a1b3f68b1f73df2ff8fb586cd7fbf000000c1000080bf69086134408ee3b2408ee33200000000000080bf000080bf0000004186cd7fbfdc2b163fa8efed3ef2ffafb57ecd7fbf0000803f000080bf46348834408e63b2408e63324634889b000080bf000080bf000080bf7ecd7fbfdb2b163f1f37543f020020b56981b33f0000e0c0000080bf46348834408e63b2408e63324634889b000080bf000080bf0000e0406981b33fc993fa3e3154013f020020b56981b33f00000000000080bf57e49f34000000000000000000000000000080bf000080bfea388ea86981b33fc993fa3ec1da493fe4ff5fb52b035041000000c1000080bf23499232f8b78633f8b786b32349129b000080bf000080bf000000412b03504152d7a33ca8efed3e010080b50b4914400000e0c0000080bfa5ca48b416774635167746b5a5ca481e000080bf000080bf0000e0400b4914403ba0e73e3154013ff0ff8fb52e0350410000803f000080bf5e5773b302984134029841b45e57f31c000080bf000080bf000080bf2e0350410bd7a33c1f37543f020040b50a49144000000000000080bfd4f40bb4a7e88a35a7e88ab5d4f48b1e000080bf000080bffbc307ab0a4914403ca0e73ec1da493f66ff7f3e57a82841f2c1c5bf000080bfbc853435000000000000000000000000000080bf000080bff2c1c53f57a8284103502c3ece7a793f66ff7f3e57a8284133fb1ac0000080bf37957e35c2049234c20492b400000000000080bf000080bf33fb1a4057a82841bdfb073ece7a793f3fff7f3ebfd41a41f2c1c5bf000080bf37957e35c2049234c20492b400000000000080bf000080bff2c1c53fbfd41a4103502c3ebe86703f1fff7f3ebfd41a4133fb1ac0000080bf5952a435c2041235c20412b500000000000080bf000080bf33fb1a40bfd41a41bdfb073ebe86703f020020b56981b33f0000e0c000000000000000000000000000000000000080bf00000000000080bf020020b50000e0c00000000000000000020020b56981b33f0000000000000000000000000000000000000000000080bf00000000000080bf020020b5000000000000000000000000d82553b57381b33f620117c000000000000000000000000000000000000080bf00000000000080bfd82553b5620117c00000000000000000d82553b57381b33f64cebfbf00000000000000000000000000000000000080bf00000000000080bfd82553b564cebfbf0000000000000000c5ff7f3e07491440a8f5acc0000080bfe3f40b34b4d9bfaab4d9bf2ae3f48b13000080bf000080bfa8f5ac4007491440620f2a3f7af9ce3ebdff7f3e7381b33fadd4acc0000080bfdcf40b34237786aa2377862adcf48b13000080bf000080bfadd4ac407381b33f2789333fd50ecf3ec5ff7f3e114914407cc78fc0000080bfdcf40b34237786aa2377862adcf48b13000080bf000080bf7cc78f4011491440600f2a3fcadee13ebdff7f3e7b81b33f7cc78fc0000080bfd5f40b3423291aaa23291a2ad5f40b13000080bf000080bf7cc78f407b81b33f2789333fc9dee13ed82553b57381b33f64cebfbf000080bf004dbfb14a0b5b334a0b5bb3004d3f9a000080bf000080bf64cebf3f7381b33fc893fa3e38543a3fafe135b50b49144064cebfbf000080bf010000340a14d8b20a14d83200000000000080bf000080bf64cebf3f0b4914403ba0e73e39543a3f020040b50a49144000000000000000000000000000000000000000000000803f000000000000803f020040b5000000000000000000000000010080b50b4914400000e0c0000000000000000000000000000000000000803f000000000000803f010080b50000e0c00000000000000000afe135b50b49144064cebfbf000000000000000000000000000000000000803f000000000000803fafe135b564cebfbf0000000000000000afe135b50b491440620117c0000000000000000000000000000000800000803f000000000000803fafe135b5620117c00000000000000000d82553b57381b33f620117c0559af7350000803f000000000000803f559af7b500000000000080bf936762b6620117c05e67993eeed0683fd82553b57381b33f64cebfbf559af7350000803f000000000000803f559af7b500000000000080bf936762b664cebfbf9a3eab3eeed0683f2f57843e6f81b33f620117c0559af7350000803f000000000000803f559af7b500000000000080bfd856843e620117c05d67993e827e6b3f2f57843e6f81b33f64cebfbf559af7350000803f000000000000803f559af7b500000000000080bfd856843e64cebfbf993eab3e827e6b3fafe135b50b491440620117c000000000000000000000803f000080bf0000000000000000000080bfafe135350b491440dfe66b3f8a2eb63ed82553b57381b33f620117c000000000000000000000803f000080bf0000000000000000000080bfd82553357381b33fa560753f8a2eb63e3257843e0c491440620117c000000000000000000000803f000080bf0000000000000000000080bf325784be0c491440dfe66b3fb289bb3e2f57843e6f81b33f620117c000000000000000000000803f000080bf0000000000000000000080bf2f5784be6f81b33fa560753fb289bb3ed82553b57381b33f64cebfbf0000000000000000000080bf0000803f0000000000000000000080bfd82553b57381b33fbb46513f892eb63eafe135b50b49144064cebfbf0000000000000000000080bf0000803f0000000000000000000080bfafe135b50b49144082c05a3f892eb63e2f57843e6f81b33f64cebfbf0000000000000000000080bf0000803f0000000000000000000080bf2f57843e6f81b33fbb46513fb289bb3e3257843e0c49144064cebfbf0000000000000000000080bf0000803f0000000000000000000080bf3257843e0c49144081c05a3fb289bb3eafe135b50b49144064cebfbf559a7735000080bf00000000000080bf559a77b500000000000080bfe6e6c3b564cebfbf5e67993e3a9d703fafe135b50b491440620117c0559a7735000080bf00000000000080bf559a77b500000000000080bfe6e6c3b5620117c09a3eab3e3a9d703f3257843e0c49144064cebfbf559a7735000080bf00000000000080bf559a77b500000000000080bf7a5784be64cebfbf5d67993ecf4a733f3257843e0c491440620117c0559a7735000080bf00000000000080bf559a77b500000000000080bf7a5784be620117c0993eab3ecf4a733fb2e135b504491440a8f5acc0000080bfa093d3b1e8554cb3e8554c3300000000000080bf000080bfa8f5ac40044914403ea0e73ec0da113fec9289b56f81b33fadd4acc0000080bf9852cb34790590b47905903400000000000080bf000080bfadd4ac406f81b33fc893fa3e6ee5113fafe135b50b491440620117c000000000000000000000000000000000000080bf00000000000080bfafe135b5620117c00000000000000000010080b50b4914400000e0c000000000000000000000000000000000000080bf00000000000080bf010080b50000e0c00000000000000000aee175b50e4914407cc78fc000000000000000000000000000000000000080bf00000000000080bfaee175b57cc78fc00000000000000000b2e135b504491440a8f5acc000000000000000000000000000000000000080bf00000000000080bfb2e135b5a8f5acc00000000000000000ec9289b56f81b33fadd4acc000000000000000000000000000000000000080bf00000000000080bfec9289b5add4acc00000000000000000ec9289b57781b33f7cc78fc000000000000000000000000000000000000080bf00000000000080bfec9289b57cc78fc00000000000000000d82553b57381b33f620117c0000080bf0200003423f7ef3323f7efb300000000000080bf000080bf620117407381b33fc965313f2f52993eafe135b50b491440620117c0000080bf0200003422f7ef3322f7efb30200801c000080bf000080bf620117400b491440c965313fbc45ac3eec9289b57781b33f7cc78fc0000080bf0200003422f7ef3322f7efb30200801c000080bf000080bf7cc78f407781b33f954a1b3f3152993eaee175b50e4914407cc78fc0000080bf0300003420f7ef3320f7efb300000000000080bf000080bf7cc78f400e491440964a1b3fbe45ac3eb2e135b504491440a8f5acc0885d58b2533e903b5dff7f3f000080bfea03f6ad875d58b2000080bf8d27483577ce15408184363fd577b53eec9289b56f81b33fadd4acc0ec4d34b2523e903b5dff7f3f000080bf3c03cdadeb4d34b2000080bf1bb492350a8cb63f4dfe3f3fd277b53ec5ff7f3e07491440a8f5acc0ec4d34b2523e903b5dff7f3f000080bf3c03cdadeb4d34b2000080bfc0ff7fbe7ace15408184363f04a6ba3ebdff7f3e7381b33fadd4acc04f3e10b2503e903b5dff7f3f000080bf9102a4ad4f3e10b2000080bfb8ff7fbe0e8cb63f4dfe3f3f00a6ba3eaee175b50e4914407cc78fc0feff3f36000080bfe5752f36000080bffeff3fb6e5752fa1000080bf5db1bfb66fc78fc05f40473f1a65de3eb2e135b504491440a8f5acc004004036000080bfe4752f36000080bf040040b600000000000080bf4db1c7b69bf5acc007b3503f1b65de3ec5ff7f3e114914407cc78fc004004036000080bfe4752f36000080bf040040b600000000000080bfc10080be6fc78fc05f40473f4993e33ec5ff7f3e07491440a8f5acc00b004036000080bfe2752f36000080bf0b0040b600000000000080bfc10080be9bf5acc006b3503f4993e33eec9289b56f81b33fadd4acc0feffffb50000803fa9fd8cb50000803ffeffff3500000000000080bfef6fdd35aad4acc0ded8553f7af9ce3eec9289b57781b33f7cc78fc0feffffb50000803fa9fd8cb50000803ffeffff3500000000000080bfff6fdd3579c78fc0d8405f3f7af9ce3ebdff7f3e7381b33fadd4acc0feffffb50000803fa9fd8cb50000803ffeffff3500000000000080bf3800803eaad4acc0ddd8553fa927d43ebdff7f3e7b81b33f7cc78fc0feffffb50000803fa9fd8cb50000803ffeffff3500000000000080bf3800803e79c78fc0d7405f3fa927d43eec9289b57781b33f7cc78fc00000000000000000000080bf0000803f0000000000000000000080bfec9289b57781b33f5f40473f7bf9ce3eaee175b50e4914407cc78fc00000000000000000000080bf0000803f0000000000000000000080bfaee175b50e49144025ba503f7af9ce3ebdff7f3e7b81b33f7cc78fc00000000000000000000080bf0000803f0000000000000000000080bfbdff7f3e7b81b33f5f40473faa27d43ec5ff7f3e114914407cc78fc00000000000000000000080bf0000803f0000000000000000000080bfc5ff7f3e1149144025ba503fa927d43ed85a97b545a8284100000000000080bf787ca333318e63b2318e633200000000000080bf000080bf9f8906a945a82841dad5f43dc1da493fd85a97b545a828410000e0c0000080bf00000034000000000000000000000000000080bf000080bf0000e04045a82841d9d5f43d3154013f702ee5b5add41a4100000000000080bf21ee8f3422ad89b422ad893400000000000080bf000080bf7c1a022cadd41a412f3b1e3ec1da493f010080b50b4914400000e0c0000000bf3ebf35b2425c39b43ebfb532000080bf000000000000803f0000e0400b4914403ba0e73e3154013fd85a97b545a828410000e0c0000000bf3ebf35b2425c39b43ebfb532000080bf000000000000803f0000e04045a82841d9d5f43d3154013f010080b50b4914400000e0c0000000bf3ebf35b2425c39b43ebfb532000080bf000000000000803f0000e0400b4914400000000000000000389702b6add41a410000e0c0000000000000000000000000000000800000803f000000000000803f0000e040add41a410000000000000000d85a97b545a828410000e0c0000000bf3ebf35b2425c39b43ebfb532000080bf000000000000803f0000e04045a8284100000000000000003dff7f3ea463ab40c1911bc0000080bfd190deb4e91076aae910762ad190de93000080bf000080bfc1911b40a463ab40905f643f7bf9ce3e3dff7f3ea363ab40fe5cc3bf000080bfce90deb4e910f6a9e910f629ce905e93000080bf000080bffe5cc33fa363ab409ebe6d3f7af9ce3e24ff7f3e1025c840c1911bc0000080bfce90deb4e910f6a9e910f629ce905e93000080bf000080bfc1911b401025c840905f643f5e98e13e24ff7f3e1025c840fe5cc3bf000080bfca90deb4000000000000000000000000000080bf000080bffe5cc33f1025c8409ebe6d3f5e98e13e010080b50b4914400000e0c0000080bffb2de0b421491233214912b300000000000080bf000080bf0000e0400b491440944a1b3fa8efed3e020040b50a49144000000000000080bffb2de0b41e4912331e4912b3fb2de01c000080bf000080bfb46ddb280a49144024d1633fa8efed3ea82815b69863ab400000e0c0000080bffb2de0b41e4912331e4912b3fb2de01c000080bf000080bf0000e0409863ab40944a1b3f3c74163fa82805b69763ab4000000000000080bffb2de0b41c4912331c4912b3fb2de01c000080bf000080bf732e98299763ab4024d1633f3b74163f389702b6add41a410000e0c0000000000000000000000000000000800000803f000000000000803f389702b60000e0c000000000000000004ff82db60025c8400000e0c0000000000000000000000000000000800000803f000000000000803f4ff82db60000e0c00000000000000000a82815b69863ab400000e0c0000000000000000000000000000000800000803f000000000000803fa82815b60000e0c00000000000000000702ee5b5add41a4100000000000000000000000000000000000000800000803f000000000000803f702ee5b5000000000000000000000000a82805b69763ab4000000000000000000000000000000000000000800000803f000000000000803fa82805b60000000000000000000000004ef81db60025c84000000000000000000000000000000000000000800000803f000000000000803f4ef81db6000000000000000000000000702ee5b5add41a4100000000000080bf17cd4a3424491233244912b317cd4a9c000080bf000080bff6f58229add41a4123d1633fbf148f3e389702b6add41a410000e0c0000080bf19cd4a3429491233294912b300000000000080bf000080bf0000e040add41a41954a1b3fbf148f3e4ef81db60025c84000000000000080bf19cd4a3429491233294912b300000000000080bf000080bf7d89b4290025c84027d1633f9553103e4ff82db60025c8400000e0c0000080bf1bcd4a342e4912332e4912b300000000000080bf000080bf0000e0400025c840994a1b3f9553103ea82815b69863ab400000e0c082897bbff35e3ebe0ab0b232a5dbb5b200000000000080bf000080bf0000e040b666a8400000000000000000a82805b69763ab40000000008289fbbef35ebebd0ab032320cd2d2b298129932000080bf000080bffd2f3d29b566a8400000000000000000a62845b6a163ab40c1911bc08289fbbef35ebebd0ab032320cd2d2b298129932000080bf000080bfc1911b40bf66a8400000000000000000a72835b6a063ab40fe5cc3bf0000000000000000000000000000000000000000000080bf0000803ffe5cc33fbe66a840000000000000000024ff7f3e1025c8401c02adc0000080bfd190deb4c6350eb5c6350e35d190de9e000080bf000080bf1c02ad401025c8400bd7a33c6020723f3dff7f3ea463ab401c02adc0000080bfca90deb4ca350eb5ca350e35ca90de9e000080bf000080bf1c02ad40a463ab400bd7a33ceed0683f04ff7f3e1825c840b43490c0000080bfca90deb4ca350eb5ca350e35ca90de9e000080bf000080bfb43490401825c840bb20673d6220723f1dff7f3eaa63ab40b43490c0000080bfc290deb4ce350eb5ce350e35c290de9e000080bf000080bfb4349040aa63ab40ba20673df0d0683fa82805b69763ab4000000000000080bf73e2dcb49897fb349897fbb473e25c1e000080bf000080bfb7dd822b9763ab401cb77b3f2f52993e4ef81db60025c84000000000000080bf64e2dcb49097fb349097fbb464e25c9e000080bf000080bf00409b2b0025c8401db77b3f11f1ab3ea72835b6a063ab40fe5cc3bf000080bf64e2dcb49097fb349097fbb464e25c9e000080bf000080bffe5cc33fa063ab40dfe66b3f3552993e4cf84db60c25c840fe5cc3bf000080bf54e2dcb48797fb348797fbb454e2dc9e000080bf000080bffe5cc33f0c25c840dfe66b3f19f1ab3e4ef81db60025c840000000001c4c7e3f99d0eb3d195011b32e491233000000000000803f000080bf8989b4a937d0c64000000000000000004ff82db60025c8400000e0c01c4cfe3e99d06b3d195091b22ed21833368461b20000803f000080bf0000e0c037d0c64000000000000000004cf84db60c25c840fe5cc3bf1c4cfe3e99d06b3d195091b22ed21833368461b20000803f000080bffe5cc3bf44d0c64000000000000000004cf85db60c25c840c1911bc000000000000000000000000000000000000000000000803f000080bfc1911bc044d0c64000000000000000004ff82db60025c8400000e0c0000080bf85e2dcb4a5faf0b4a5faf03485e25c9e000080bf000080bf0000e0400025c840dfef683f5891353ea82815b69863ab400000e0c0000080bf74e2dcb4aefaf0b4aefaf03474e25c9e000080bf000080bf0000e0409863ab40dfef683f9553103e4cf85db60c25c8401c02adc0000080bf74e2dcb4aefaf0b4aefaf03474e25c9e000080bf000080bf1c02ad400c25c8406672793f6891353ea62845b6a163ab401c02adc0000080bf64e2dcb4b8faf0b4b8faf03400000000000080bf000080bf1c02ad40a163ab406672793fa153103e4cf85db60c25c840c1911bc0ed057e3fde05fe3d0000000000000000000000000000803f000080bfc1911bc06599c64000000000000000004ff82db60025c8400000e0c0ed05fe3ede057e3d0000000000000000000000000000803f000080bf0000e0c05999c64000000000000000004af87db61425c840b43490c0ed05fe3ede057e3d0000000000000000000000000000803f000080bfb43490c06d99c64000000000000000004cf85db60c25c8401c02adc000000000000000000000000000000000000000000000803f000080bf1c02adc06599c6400000000000000000a82815b69863ab400000e0c050847cbf2e5828be000000000000000000000000000080bf000080bf0000e0409f0ea9400000000000000000a62845b6a163ab40c1911bc05084fcbe2e58a8bd000000000000000000000000000080bf000080bfc1911b40a80ea9400000000000000000a62845b6a163ab401c02adc05084fcbe2e58a8bd000000000000000000000000000080bf000080bf1c02ad40a80ea9400000000000000000a52865b6a763ab40b43490c00000000000000000000000000000000000000000000080bf0000803fb4349040af0ea9400000000000000000a62845b6a163ab40c1911bc0000080bf65e2dcb4e3aa7634e3aa76b400000000000080bf000080bfc1911b40a163ab4026c8663f2f52993e4cf85db60c25c840c1911bc0000080bf58e2dcb4d8aa7634d8aa76b400000000000080bf000080bfc1911b400c25c84026c8663f12f1ab3ea52865b6a763ab40b43490c0000080bf58e2dcb4d8aa7634d8aa76b400000000000080bf000080bfb4349040a763ab40bb46513f3452993e4af87db61425c840b43490c0000080bf4be2dcb4cdaa7634cdaa76b44be2dc1d000080bf000080bfb43490401425c840bb46513f18f1ab3ed85a97b545a8284100000000a01d7f3fb213aa3d0000000000000000000000000000803f000080bf00000000211328410000000000000000d85a97b545a828410000e0c0a01d7f3fb213aa3d0000000000000000000000000000803f000080bf0000e0c021132841000000000000000065ad1bb654a82841f2c1c5bfa01d7f3fb213aa3d0000000000000000000000000000803f000080bff2c1c5bf30132841000000000000000065ad1bb654a8284133fb1ac0a01d7f3fb113aa3d0000000000000000000000000000803f000080bf33fb1ac0301328410000000000000000319742b6bcd41a41f2c1c5bf000080bff71e3435a81f4f35a81f4fb5f71e341f000080bf000080bff2c1c53fbcd41a41083b1e3ee6d8393f65ad1bb654a82841f2c1c5bf000080bff71e3435a81f4f35a81f4fb5f71e341f000080bf000080bff2c1c53f54a828418fd5f43de6d8393f66ff7f3e54a82841ad1faec0000080bfbd853435a77289b5a7728935bd85b41f000080bf000080bfae1fae4054a82841954a1b3f9ce1e03e3fff7f3ebcd41a41ad1faec0000080bf38957e3560cfabb560cfab3500000000000080bf000080bfae1fae40bcd41a41954a1b3f7af9ce3e26ff7f3e63a82841b35290c0000080bf38957e3560cfabb560cfab3500000000000080bf000080bfb452904063a82841a7f0243fafe1e03edffe7f3ecbd41a41b35290c0000080bf5952a435182cceb5182cce3559522420000080bf000080bfb4529040cbd41a41a7f0243f8ef9ce3e389702b6add41a410000e0c0f1de7ebff723c0bdf8a31133254912b300000000000080bf000080bf0000e040da251a410000000000000000702ee5b5add41a4100000000e03f7fbf643e97bdfd0224342c7e24b499a564ad000080bf000080bff7f58229da251a410000000000000000329752b6bcd41a4133fb1ac0e03f7fbf643e97bdfd0224342c7e24b499a564ad000080bf000080bf33fb1a40e9251a410000000000000000319742b6bcd41a41f2c1c5bfcea07fbfa0b15cbd7ece9134ca0492b4a0b1dc26000080bf000080bff2c1c53fe9251a410000000000000000d85a97b545a828410000e0c0000080bf732e7e35833f24b5833f243500000000000080bf000080bf0000e04045a82841dfef683f8bdc6d3e389702b6add41a410000e0c0000080bf752e7e35843f24b5843f243500000000000080bf000080bf0000e040add41a41dfef683f490c4a3e66ad0bb651a82841ad1faec0000080bf752e7e35843f24b5843f243500000000000080bf000080bfad1fae4051a82841f015793faadc6d3e339742b6b9d41a41ad1faec0000080bf772e7e35853f24b5853f243500000000000080bf000080bfad1fae40b9d41a41f015793f680c4a3ed85a97b545a828410000e0c000000000000040b2c5d32e2a00000000000000000000803f000080bf0000e0c021132841000000000000000060ad5bb660a82841b35290c000000000000040b2c5d32e2a00000000000000000000803f000080bfb35290c03c132841000000000000000066ad0bb651a82841ad1faec0a01d7fbfb613aabd7d22bc2a6ec9bc2a000000000000803f0000803fad1faec02d1328410000000000000000389702b6add41a410000e0c0a01d7fbfb213aabdbbfec1a8dfaac228b2132a9b000080bf000080bf0000e040c34b1a410000000000000000329752b6bcd41a4133fb1ac0a01d7fbfb213aabd880df1a86de3f128b2132a9b000080bf000080bf33fb1a40d24b1a410000000000000000339742b6b9d41a41ad1faec0a01d7fbfb213aabd880df1a86de3f128b2132a9b000080bf000080bfad1fae40cf4b1a410000000000000000964b89b6c8d41a41b35290c0a01d7fbfb113aabd2a0e10a9fe8d102900000000000080bf000080bfb3529040de4b1a410000000000000000329752b6bcd41a4133fb1ac0000080bf772e7e352527f5342527f5b400000000000080bf000080bf33fb1a40bcd41a4102284c3f2f52993e65ad1bb654a8284133fb1ac0000080bf742e7e352627f5342627f5b4742efe9e000080bf000080bf33fb1a4054a8284103284c3f503aab3e964b89b6c8d41a41b35290c0000080bf742e7e352627f5342627f5b4742efe9e000080bf000080bfb3529040c8d41a418184363f4052993e60ad5bb660a82841b35290c0000080bf712e7e352827f5342827f5b4712efe9e000080bf000080bfb352904060a828418284363f613aab3e66ad0bb651a82841ad1faec000000000000000000000803f000080bf0000000000000000000080bf66ad0b3651a8284197837a3eeed0683f339742b6b9d41a41ad1faec000000000000000000000803f000080bf0000000000000000000080bf33974236b9d41a41ed298f3eeed0683f66ff7f3e54a82841ad1faec000000000000000000000803f000080bf0000000000000000000080bf66ff7fbe54a828418f837a3e05686b3f3fff7f3ebcd41a41ad1faec000000000000000000000803f000080bf0000000000000000000080bf3fff7fbebcd41a41e9298f3e05686b3f60ad5bb660a82841b35290c0feff3f37000080bf30db8037000080bffeff3fb730db80a3000080bf221ff6b85f5190c0e0ef683fc52b813e66ad0bb651a82841ad1faec004004037000080bf2fdb8037000080bf040040b700000000000080bf0c9ff8b8591eaec0f295723fc72b813e26ff7f3e63a82841b35290c004004037000080bf2fdb8037000080bf040040b700000000000080bf630f80be5f5190c0dfef683ff459863e66ff7f3e54a82841ad1faec00a004037000080bf2edb8037000080bf0a0040b700000000000080bf830f80be591eaec0f295723ff659863e339742b6b9d41a41ad1faec0feff3fb70000803f30db80b70000803ffeff3f3730db8023000080bf592ae238751eaec0954a1b3f3083b63e964b89b6c8d41a41b35290c0040040b70000803f31db80b70000803f0400403700000000000080bf70aadf387b5190c0a8f0243f2e83b63e3fff7f3ebcd41a41ad1faec0040040b70000803f31db80b70000803f0400403700000000000080bf230e803e751eaec0954a1b3f5fb1bb3edffe7f3ecbd41a41b35290c00a0040b70000803f32db80b70000803f0a00403700000000000080bff30d803e7b5190c0a8f0243f5db1bb3e964b89b6c8d41a41b35290c00000000000000000000080bf0000803f0000000000000000000080bf964b89b6c8d41a418f837a3e8e3c783f60ad5bb660a82841b35290c00000000000000000000080bf0000803f0000000000000000000080bf60ad5bb660a82841e8298f3e8e3c783fdffe7f3ecbd41a41b35290c00000000000000000000080bf0000803f0000000000000000000080bfdffe7f3ecbd41a4195837a3ea5d37a3f26ff7f3e63a82841b35290c00000000000000000000080bf0000803f0000000000000000000080bf26ff7f3e63a82841eb298f3ea6d37a3f65ad1bb654a82841f2c1c5bffeff3f37000080bf00000000000080bffeff3fb700000000000080bf101ff8b8f2c1c5bf6bb4413eeed0683f65ad1bb654a8284133fb1ac0feff3f37000080bf00000000000080bffeff3fb700000000000080bf101ff8b833fb1ac0ae08663eeed0683f66ff7f3e57a82841f2c1c5bffeff3f37000080bf00000000000080bffeff3fb700000000000080bf830f80bef2c1c5bf69b4413e05686b3f66ff7f3e57a8284133fb1ac0feff3f37000080bf00000000000080bffeff3fb700000000000080bf830f80be33fb1ac0ac08663e05686b3f319742b6bcd41a41f2c1c5bf0000000000000000000080bf0000803f0000000000000000000080bf319742b6bcd41a418f837a3ebe86703f65ad1bb654a82841f2c1c5bf0000000000000000000080bf0000803f0000000000000000000080bf65ad1bb654a82841e8298f3ebe86703f3fff7f3ebfd41a41f2c1c5bf0000000000000000000080bf0000803f0000000000000000000080bf3fff7f3ebfd41a4196837a3ed51d733f66ff7f3e57a82841f2c1c5bf0000000000000000000080bf0000803f0000000000000000000080bf66ff7f3e57a82841eb298f3ed51d733f65ad1bb654a8284133fb1ac000000000000000000000803f000080bf0000000000000000000080bf65ad1b3654a8284171b4413e8e3c783f329752b6bcd41a4133fb1ac000000000000000000000803f000080bf0000000000000000000080bf32975236bcd41a41b484653e8d3c783f66ff7f3e57a8284133fb1ac000000000000000000000803f000080bf0000000000000000000080bf66ff7fbe57a8284169b4413ea5d37a3f1fff7f3ebfd41a4133fb1ac000000000000000000000803f000080bf0000000000000000000080bf1fff7fbebfd41a41ac84653ea5d37a3f329752b6bcd41a4133fb1ac00a0040b70000803f3c075b2c0000803f0a00403700000000000080bf6daae13833fb1ac06bb4413ebd86703f319742b6bcd41a41f2c1c5bf040040b70000803f6045a42c0000803f0400403700000000000080bf6d2ae238f2c1c5bfae08663ebe86703f1fff7f3ebfd41a4133fb1ac0040040b70000803f6045a42c0000803f0400403700000000000080bf130e803e33fb1ac069b4413ed51d733f3fff7f3ebfd41a41f2c1c5bffeff3fb70000803f2107db2c0000803ffeff3f372107db98000080bf230e803ef2c1c5bfac08663ed51d733fa62845b6a163ab40c1911bc0feffbfb60000803f06840d350000803ffeffbf3606848da0000080bf5a70e837cd911bc0ded8553f1a65de3ea72835b6a063ab40fe5cc3bf0400c0b60000803ff9830d350000803f0400c036f9838da0000080bf5870ea37165dc3bfeb375f3f1a65de3e3dff7f3ea463ab40c1911bc00400c0b60000803ff9830d350000803f0400c036f9838da0000080bfa303803ecd911bc0ddd8553f4993e33e3dff7f3ea363ab40fe5cc3bf0b00c0b60000803fec830d350000803f0b00c03600000000000080bfa303803e165dc3bfeb375f3f4993e33e4cf85db60c25c840c1911bc000000000000000000000803f000080bf0000000000000000000080bf4cf85d360c25c8402a869c3deed0683fa62845b6a163ab40c1911bc000000000000000000000803f000080bf0000000000000000000080bfa6284536a163ab40b801e73deed0683f24ff7f3e1025c840c1911bc000000000000000000000803f000080bf0000000000000000000080bf24ff7fbe1025c84020869c3d05686b3f3dff7f3ea463ab40c1911bc000000000000000000000803f000080bf0000000000000000000080bf3dff7fbea463ab40b001e73d05686b3fa72835b6a063ab40fe5cc3bf0000000000000000000080bf0000803f0000000000000000000080bfa72835b6a063ab40bdfb073eeed0683f4cf84db60c25c840fe5cc3bf0000000000000000000080bf0000803f0000000000000000000080bf4cf84db60c25c84084392d3eeed0683f3dff7f3ea363ab40fe5cc3bf0000000000000000000080bf0000803f0000000000000000000080bf3dff7f3ea363ab40bffb073e05686b3f24ff7f3e1025c840fe5cc3bf0000000000000000000080bf0000803f0000000000000000000080bf24ff7f3e1025c84088392d3e05686b3f4cf84db60c25c840fe5cc3bf07000037000080bff4830dac000080bf070000b700000000000080bf92453bb8fe5cc3bf57dd723f7bf9ce3e4cf85db60c25c840c1911bc003000037000080bff4838dab000080bf030000b700000000000080bf92453ab8c1911bc0653c7c3f7af9ce3e24ff7f3e1025c840fe5cc3bf03000037000080bff4838dab000080bf030000b700000000000080bfd30580befe5cc3bf57dd723fa927d43e24ff7f3e1025c840c1911bc0feffff36000080bf00000000000080bffeffffb600000000000080bfd30580bec1911bc0643c7c3fa927d43e4cf85db60c25c8401c02adc000000000000000000000803f000080bf0000000000000000000080bf4cf85d360c25c8402a869c3dbe86703fa62845b6a163ab401c02adc000000000000000000000803f000080bf0000000000000000000080bfa6284536a163ab40b801e73dbe86703f24ff7f3e1025c8401c02adc000000000000000000000803f000080bf0000000000000000000080bf24ff7fbe1025c84020869c3dd51d733f3dff7f3ea463ab401c02adc000000000000000000000803f000080bf0000000000000000000080bf3dff7fbea463ab40b001e73dd51d733f4af87db61425c840b43490c0feffff36000080bfee358e36000080bffeffffb600000000000080bf8e4538b87c3490c057dd723f1a65de3e4cf85db60c25c8401c02adc0feffff36000080bfee358e36000080bffeffffb600000000000080bf86453ab8e401adc0aa307c3f1b65de3e04ff7f3e1825c840b43490c0feffff36000080bfee358e36000080bffeffffb600000000000080bfc30580be7c3490c057dd723f4993e33e24ff7f3e1025c8401c02adc0feffff36000080bfee358e36000080bffeffffb600000000000080bfd30580bee401adc0aa307c3f4a93e33ea62845b6a163ab401c02adc0feffbfb60000803fe45055b60000803ffeffbf3600000000000080bf5a70e837f801adc00bd7a33c1b3f773fa52865b6a763ab40b43490c0feffbfb60000803fe55055b60000803ffeffbf3600000000000080bf6370e437903490c0ba20673d1b3f773f3dff7f3ea463ab401c02adc0feffbfb60000803fe55055b60000803ffeffbf3600000000000080bfa303803ef801adc00bd7a33c32d6793f1dff7f3eaa63ab40b43490c0feffbfb60000803fe65055b60000803ffeffbf3600000000000080bf9303803e903490c0ba20673d32d6793fa52865b6a763ab40b43490c00000000000000000000080bf0000803f0000000000000000000080bfa52865b6a763ab4020869c3d8e3c783f4af87db61425c840b43490c00000000000000000000080bf0000803f0000000000000000000080bf4af87db61425c840b101e73d8e3c783f1dff7f3eaa63ab40b43490c00000000000000000000080bf0000803f0000000000000000000080bf1dff7f3eaa63ab4024869c3da6d37a3f04ff7f3e1825c840b43490c00000000000000000000080bf0000803f0000000000000000000080bf04ff7f3e1825c840b801e73da5d37a3f - 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: 0.4999977, y: 6.0007734, z: -3.5} - m_Extent: {x: 0.5000018, y: 7.000003, 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!1001 &300551154 PrefabInstance: m_ObjectHideFlags: 0 @@ -8703,9 +8442,13 @@ PrefabInstance: propertyPath: m_Name value: NetworkBox objectReference: {fileID: 0} + - target: {fileID: 2838372129594135989, guid: 45459df2bf234d23182a573a1308c331, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} - target: {fileID: 3181859954724409103, guid: 45459df2bf234d23182a573a1308c331, type: 3} propertyPath: m_RootOrder - value: 23 + value: 13 objectReference: {fileID: 0} - target: {fileID: 3181859954724409103, guid: 45459df2bf234d23182a573a1308c331, type: 3} propertyPath: m_LocalPosition.x @@ -8747,6 +8490,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 6552217979737648492, guid: 45459df2bf234d23182a573a1308c331, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 45459df2bf234d23182a573a1308c331, type: 3} --- !u!4 &502061653 stripped @@ -11171,7 +10918,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh24390 + m_Name: pb_Mesh38610 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -14418,7 +14165,7 @@ Transform: - {fileID: 2128333932} - {fileID: 197140882} m_Father: {fileID: 45957245} - m_RootOrder: 5 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &815680570 PrefabInstance: @@ -16023,7 +15770,7 @@ Transform: m_GameObject: {fileID: 915677069} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 6.032, y: -0.003, z: -0.001} - m_LocalScale: {x: 0.038434, y: 4.022701, z: 7.1114306} + m_LocalScale: {x: 0.10810331, y: 4.022701, z: 7.1114306} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1173886246} @@ -16062,7 +15809,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: dc56e50f367c1ca43a1562b07d1cbfc5, type: 2} + - {fileID: 2100000, guid: a5290ed10ae30ac4985f699c2e7a149c, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -16753,7 +16500,7 @@ Transform: - {fileID: 1782748918} - {fileID: 670219875} m_Father: {fileID: 45957245} - m_RootOrder: 14 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1003372808 PrefabInstance: @@ -18117,7 +17864,7 @@ Transform: - {fileID: 60326086} - {fileID: 373875250} m_Father: {fileID: 45957245} - m_RootOrder: 3 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1180503447 PrefabInstance: @@ -22133,7 +21880,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: bc2effa48845a644e9d3a70ee743cba2, type: 3} propertyPath: m_LocalPosition.x - value: -2.9756002 + value: -2.9436002 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: bc2effa48845a644e9d3a70ee743cba2, type: 3} propertyPath: m_LocalPosition.y @@ -23195,7 +22942,7 @@ Transform: - {fileID: 1695254331} - {fileID: 1180503448} m_Father: {fileID: 45957245} - m_RootOrder: 4 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1727196003 PrefabInstance: @@ -23459,7 +23206,7 @@ Transform: m_GameObject: {fileID: 1757592330} m_LocalRotation: {x: -0, y: -1, z: -0, w: 0.00000058114523} m_LocalPosition: {x: -6.082, y: -0.0029997826, z: -0} - m_LocalScale: {x: 0.12212861, y: 4.022701, z: 7.1114306} + m_LocalScale: {x: 0.21234502, y: 4.022701, z: 7.1114306} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1173886246} @@ -26357,7 +26104,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: dc56e50f367c1ca43a1562b07d1cbfc5, type: 2} + - {fileID: 2100000, guid: a5290ed10ae30ac4985f699c2e7a149c, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -29948,8 +29695,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2039536872} m_LocalRotation: {x: -0, y: -0.70710677, z: -0, w: 0.7071069} - m_LocalPosition: {x: -0.044, y: -0.0029997826, z: 3.534} - m_LocalScale: {x: 0.038434, y: 4.022701, z: 12.063211} + m_LocalPosition: {x: -0.012, y: -0.0029997826, z: 3.534} + m_LocalScale: {x: 0.04446901, y: 4.022701, z: 12.063211} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1173886246} @@ -33208,7 +32955,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh23962 + m_Name: pb_Mesh37998 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -33372,7 +33119,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh24560 + m_Name: pb_Mesh38780 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -33982,6 +33729,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 1527984575184472645, guid: 1805c511e7b7f0e49afb0651e27725b4, type: 3} + propertyPath: Furnitures.Array.data[4] + value: + objectReference: {fileID: 3971500078747236033, guid: b193c053d289cac43b3ddd2b6c501447, type: 3} - target: {fileID: 1770972119431807744, guid: 1805c511e7b7f0e49afb0651e27725b4, type: 3} propertyPath: m_LocalScale.x value: 0.04 @@ -34009,6 +33760,63 @@ Transform: m_CorrespondingSourceObject: {fileID: 1527984575184472644, guid: 1805c511e7b7f0e49afb0651e27725b4, type: 3} m_PrefabInstance: {fileID: 1527984575637916537} m_PrefabAsset: {fileID: 0} +--- !u!1001 &4313590370816759673 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 45957245} + m_Modifications: + - target: {fileID: 3971500078747236033, guid: b193c053d289cac43b3ddd2b6c501447, type: 3} + propertyPath: m_Name + value: laser_cutter + objectReference: {fileID: 0} + - target: {fileID: 4347744863477460091, guid: b193c053d289cac43b3ddd2b6c501447, type: 3} + propertyPath: m_RootOrder + value: 14 + objectReference: {fileID: 0} + - target: {fileID: 4347744863477460091, guid: b193c053d289cac43b3ddd2b6c501447, type: 3} + propertyPath: m_LocalPosition.x + value: 1.2375174 + objectReference: {fileID: 0} + - target: {fileID: 4347744863477460091, guid: b193c053d289cac43b3ddd2b6c501447, type: 3} + propertyPath: m_LocalPosition.y + value: 5.514353 + objectReference: {fileID: 0} + - target: {fileID: 4347744863477460091, guid: b193c053d289cac43b3ddd2b6c501447, type: 3} + propertyPath: m_LocalPosition.z + value: -15.980917 + objectReference: {fileID: 0} + - target: {fileID: 4347744863477460091, guid: b193c053d289cac43b3ddd2b6c501447, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4347744863477460091, guid: b193c053d289cac43b3ddd2b6c501447, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4347744863477460091, guid: b193c053d289cac43b3ddd2b6c501447, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4347744863477460091, guid: b193c053d289cac43b3ddd2b6c501447, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4347744863477460091, guid: b193c053d289cac43b3ddd2b6c501447, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4347744863477460091, guid: b193c053d289cac43b3ddd2b6c501447, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4347744863477460091, guid: b193c053d289cac43b3ddd2b6c501447, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b193c053d289cac43b3ddd2b6c501447, type: 3} --- !u!1001 &7278954555104977257 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/FabLab/FabLab/Lightmap-0_comp_dir.png.meta b/Assets/Scenes/FabLab/FabLab/Lightmap-0_comp_dir.png.meta index b3e76f7..9b86c45 100644 --- a/Assets/Scenes/FabLab/FabLab/Lightmap-0_comp_dir.png.meta +++ b/Assets/Scenes/FabLab/FabLab/Lightmap-0_comp_dir.png.meta @@ -7,7 +7,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 1 - sRGBTexture: 0 + sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -21,7 +21,7 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 - streamingMipmaps: 1 + streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 ignoreMasterTextureLimit: 0 @@ -34,11 +34,11 @@ TextureImporter: textureSettings: serializedVersion: 2 filterMode: 1 - aniso: 3 + aniso: 1 mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -53,7 +53,7 @@ TextureImporter: alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 12 + textureType: 0 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -70,7 +70,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -113,18 +113,6 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: iPhone - 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 @@ -137,18 +125,6 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Windows Store Apps - 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: [] diff --git a/Assets/Scenes/FabLab/FabLab/Lightmap-0_comp_light.exr.meta b/Assets/Scenes/FabLab/FabLab/Lightmap-0_comp_light.exr.meta index 192f468..933fff4 100644 --- a/Assets/Scenes/FabLab/FabLab/Lightmap-0_comp_light.exr.meta +++ b/Assets/Scenes/FabLab/FabLab/Lightmap-0_comp_light.exr.meta @@ -21,7 +21,7 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 - streamingMipmaps: 1 + streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 ignoreMasterTextureLimit: 0 @@ -34,11 +34,11 @@ TextureImporter: textureSettings: serializedVersion: 2 filterMode: 1 - aniso: 3 + aniso: 1 mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -50,10 +50,10 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 0 + alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 6 + textureType: 0 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -70,7 +70,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -113,18 +113,6 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: iPhone - 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 @@ -137,18 +125,6 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Windows Store Apps - 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: [] diff --git a/Assets/Scenes/FabLab/FabLab/Lightmap-1_comp_dir.png.meta b/Assets/Scenes/FabLab/FabLab/Lightmap-1_comp_dir.png.meta index b0a2627..40b937a 100644 --- a/Assets/Scenes/FabLab/FabLab/Lightmap-1_comp_dir.png.meta +++ b/Assets/Scenes/FabLab/FabLab/Lightmap-1_comp_dir.png.meta @@ -7,7 +7,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 1 - sRGBTexture: 0 + sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -21,7 +21,7 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 - streamingMipmaps: 1 + streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 ignoreMasterTextureLimit: 0 @@ -34,11 +34,11 @@ TextureImporter: textureSettings: serializedVersion: 2 filterMode: 1 - aniso: 3 + aniso: 1 mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -53,7 +53,7 @@ TextureImporter: alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 12 + textureType: 0 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -70,7 +70,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -113,18 +113,6 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: iPhone - 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 @@ -137,18 +125,6 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Windows Store Apps - 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: [] diff --git a/Assets/Scenes/FabLab/FabLab/Lightmap-1_comp_light.exr.meta b/Assets/Scenes/FabLab/FabLab/Lightmap-1_comp_light.exr.meta index c59d802..7dc5435 100644 --- a/Assets/Scenes/FabLab/FabLab/Lightmap-1_comp_light.exr.meta +++ b/Assets/Scenes/FabLab/FabLab/Lightmap-1_comp_light.exr.meta @@ -21,7 +21,7 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 - streamingMipmaps: 1 + streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 ignoreMasterTextureLimit: 0 @@ -34,11 +34,11 @@ TextureImporter: textureSettings: serializedVersion: 2 filterMode: 1 - aniso: 3 + aniso: 1 mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -50,10 +50,10 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 0 + alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 6 + textureType: 0 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -70,7 +70,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -113,18 +113,6 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: iPhone - 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 @@ -137,18 +125,6 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Windows Store Apps - 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: [] diff --git a/Assets/Scenes/FabLab/FabLab/Lightmap-2_comp_dir.png.meta b/Assets/Scenes/FabLab/FabLab/Lightmap-2_comp_dir.png.meta index e61a392..74fcc11 100644 --- a/Assets/Scenes/FabLab/FabLab/Lightmap-2_comp_dir.png.meta +++ b/Assets/Scenes/FabLab/FabLab/Lightmap-2_comp_dir.png.meta @@ -7,7 +7,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 1 - sRGBTexture: 0 + sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -21,7 +21,7 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 - streamingMipmaps: 1 + streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 ignoreMasterTextureLimit: 0 @@ -34,11 +34,11 @@ TextureImporter: textureSettings: serializedVersion: 2 filterMode: 1 - aniso: 3 + aniso: 1 mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -53,7 +53,7 @@ TextureImporter: alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 12 + textureType: 0 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -70,7 +70,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -113,18 +113,6 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: iPhone - 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 @@ -137,18 +125,6 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Windows Store Apps - 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: [] diff --git a/Assets/Scenes/FabLab/FabLab/Lightmap-2_comp_light.exr.meta b/Assets/Scenes/FabLab/FabLab/Lightmap-2_comp_light.exr.meta index 3f6fd19..894dd73 100644 --- a/Assets/Scenes/FabLab/FabLab/Lightmap-2_comp_light.exr.meta +++ b/Assets/Scenes/FabLab/FabLab/Lightmap-2_comp_light.exr.meta @@ -21,7 +21,7 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 - streamingMipmaps: 1 + streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 ignoreMasterTextureLimit: 0 @@ -34,11 +34,11 @@ TextureImporter: textureSettings: serializedVersion: 2 filterMode: 1 - aniso: 3 + aniso: 1 mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -50,10 +50,10 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 0 + alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 6 + textureType: 0 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -70,7 +70,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -113,18 +113,6 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: iPhone - 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 @@ -137,18 +125,6 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Windows Store Apps - 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: [] diff --git a/Assets/Scenes/FabLab/FabLab/ReflectionProbe-0.png.meta b/Assets/Scenes/FabLab/FabLab/ReflectionProbe-0.png.meta index 11ea295..9612db9 100644 --- a/Assets/Scenes/FabLab/FabLab/ReflectionProbe-0.png.meta +++ b/Assets/Scenes/FabLab/FabLab/ReflectionProbe-0.png.meta @@ -27,18 +27,18 @@ TextureImporter: ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 - cubemapConvolution: 1 - seamlessCubemap: 1 + cubemapConvolution: 0 + seamlessCubemap: 0 textureFormat: 1 maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 2 - aniso: 0 + filterMode: 1 + aniso: 1 mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -54,7 +54,7 @@ TextureImporter: alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 - textureShape: 2 + textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 flipbookColumns: 1 @@ -71,7 +71,7 @@ TextureImporter: resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 - compressionQuality: 100 + compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 @@ -113,18 +113,6 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: iPhone - 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 @@ -137,18 +125,6 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Windows Store Apps - 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: [] diff --git a/Assets/Scenes/FabLab/FabLab/ReflectionProbe-1.exr.meta b/Assets/Scenes/FabLab/FabLab/ReflectionProbe-1.exr.meta index d7220d7..51786cb 100644 --- a/Assets/Scenes/FabLab/FabLab/ReflectionProbe-1.exr.meta +++ b/Assets/Scenes/FabLab/FabLab/ReflectionProbe-1.exr.meta @@ -27,18 +27,18 @@ TextureImporter: ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 - cubemapConvolution: 1 - seamlessCubemap: 1 + cubemapConvolution: 0 + seamlessCubemap: 0 textureFormat: 1 maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 2 - aniso: 0 + filterMode: 1 + aniso: 1 mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -54,7 +54,7 @@ TextureImporter: alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 - textureShape: 2 + textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 flipbookColumns: 1 @@ -71,7 +71,7 @@ TextureImporter: resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 - compressionQuality: 100 + compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 @@ -113,18 +113,6 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: iPhone - 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 @@ -137,18 +125,6 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Windows Store Apps - 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: []