diff --git a/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/ServerV2+console.mtl b/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/ServerV2+console.mtl deleted file mode 100644 index 8caf24ed..00000000 --- a/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/ServerV2+console.mtl +++ /dev/null @@ -1,31 +0,0 @@ -# Exported from Wings 3D 1.5.3 -newmtl Cube12_auv -Ns 100.0 -d 1.0 -illum 2 -Kd 1.0 1.0 1.0 -Ka 1.0 1.0 1.0 -Ks 1.0 1.0 1.0 -Ke 0.0 0.0 0.0 -map_Kd servers.png - -newmtl Cube1_auv -Ns 100.0 -d 1.0 -illum 2 -Kd 1.0 1.0 1.0 -Ka 1.0 1.0 1.0 -Ks 1.0 1.0 1.0 -Ke 0.0 0.0 0.0 -map_Kd rack.png - -newmtl console_auv -Ns 100.0 -d 1.0 -illum 2 -Kd 1.0 1.0 1.0 -Ka 1.0 1.0 1.0 -Ks 1.0 1.0 1.0 -Ke 0.0 0.0 0.0 -map_Kd console.png - diff --git a/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/ServerV2+console.mtl.meta b/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/ServerV2+console.mtl.meta deleted file mode 100644 index de4a648b..00000000 --- a/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/ServerV2+console.mtl.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 9384df04c9ae9dc4c950a33b8f712c37 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/ServerV2+console.obj b/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/ServerV2+console.obj deleted file mode 100644 index 23f50757..00000000 --- a/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/ServerV2+console.obj +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a27abe76f08c643fb3b52f76188099eba745f9483e5f9387e3fa220b8f9423cb -size 96342 diff --git a/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/ServerV2+console.obj.meta b/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/ServerV2+console.obj.meta deleted file mode 100644 index 6aac4e98..00000000 --- a/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/ServerV2+console.obj.meta +++ /dev/null @@ -1,108 +0,0 @@ -fileFormatVersion: 2 -guid: 2fe3213fc6b7124479e4fd3181b52e79 -ModelImporter: - serializedVersion: 22200 - internalIDToNameTable: [] - externalObjects: {} - materials: - materialImportMode: 2 - materialName: 0 - materialSearch: 1 - materialLocation: 1 - animations: - legacyGenerateAnimations: 4 - bakeSimulation: 0 - resampleCurves: 1 - optimizeGameObjects: 0 - removeConstantScaleCurves: 0 - 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 - strictVertexDataChecks: 0 - 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 - importBlendShapeDeformPercent: 1 - remapMaterialsIfMaterialImportModeIsNone: 0 - additionalBone: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/texture.meta b/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/Textures.meta similarity index 77% rename from Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/texture.meta rename to Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/Textures.meta index 5e979fa5..8d5d7aff 100644 --- a/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/texture.meta +++ b/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/Textures.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ee8d6fde23d9c49499c4b91476c52acf +guid: 7e2eda854856c934e8a3b0ae797d3fed folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/texture/Mat.mat b/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/Textures/glass.mat similarity index 87% rename from Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/texture/Mat.mat rename to Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/Textures/glass.mat index 4bfe522b..7f7a3c68 100644 --- a/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/texture/Mat.mat +++ b/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/Textures/glass.mat @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!114 &-5377965993113115023 +--- !u!114 &-6647325962189745248 MonoBehaviour: m_ObjectHideFlags: 11 m_CorrespondingSourceObject: {fileID: 0} @@ -20,19 +20,23 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Mat + m_Name: glass m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] + m_ValidKeywords: + - _ALPHAPREMULTIPLY_ON + - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: - RenderType: Opaque - disabledShaderPasses: [] + RenderType: Transparent + disabledShaderPasses: + - DepthOnly + - SHADOWCASTER m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -106,11 +110,11 @@ Material: - _Cutoff: 0.5 - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _DstBlendAlpha: 0 + - _DstBlend: 10 + - _DstBlendAlpha: 10 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - - _Glossiness: 0 + - _Glossiness: 1 - _GlossyReflections: 1 - _Metallic: 0 - _Mode: 0 @@ -123,13 +127,13 @@ Material: - _SpecularHighlights: 1 - _SrcBlend: 1 - _SrcBlendAlpha: 1 - - _Surface: 0 + - _Surface: 1 - _UVSec: 0 - _WorkflowMode: 1 - - _ZWrite: 1 + - _ZWrite: 0 m_Colors: - - _BaseColor: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} - - _Color: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} + - _BaseColor: {r: 0.33490568, g: 0.81638545, b: 1, a: 0.050980393} + - _Color: {r: 0.33490565, g: 0.81638545, b: 1, a: 0.050980393} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/texture/Mat.mat.meta b/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/Textures/glass.mat.meta similarity index 79% rename from Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/texture/Mat.mat.meta rename to Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/Textures/glass.mat.meta index 144dfd87..6aba734a 100644 --- a/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/texture/Mat.mat.meta +++ b/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/Textures/glass.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: fe12bb496a73f374fb7858757ce68107 +guid: 9683b065e82ad1245bb59a5705b0786f NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 diff --git a/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/texture/Mat_2.mat b/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/Textures/metal.mat similarity index 93% rename from Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/texture/Mat_2.mat rename to Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/Textures/metal.mat index 0a47e7db..f0ee66f9 100644 --- a/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/texture/Mat_2.mat +++ b/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/Textures/metal.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Mat_2 + m_Name: metal m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 @@ -97,7 +97,7 @@ Material: - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - - _Glossiness: 0 + - _Glossiness: 0.41363633 - _GlossyReflections: 1 - _Metallic: 0 - _Mode: 0 @@ -105,7 +105,7 @@ Material: - _Parallax: 0.02 - _QueueOffset: 0 - _ReceiveShadows: 1 - - _Smoothness: 0 + - _Smoothness: 0.41363633 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 @@ -115,12 +115,12 @@ Material: - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - - _BaseColor: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} - - _Color: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} + - _BaseColor: {r: 0.059996948, g: 0.059996948, b: 0.059996948, a: 1} + - _Color: {r: 0.059996925, g: 0.059996925, b: 0.059996925, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] ---- !u!114 &7525153192594156837 +--- !u!114 &163071428094842028 MonoBehaviour: m_ObjectHideFlags: 11 m_CorrespondingSourceObject: {fileID: 0} diff --git a/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/texture/Mat_1.mat.meta b/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/Textures/metal.mat.meta similarity index 79% rename from Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/texture/Mat_1.mat.meta rename to Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/Textures/metal.mat.meta index 57c77526..c2da497e 100644 --- a/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/texture/Mat_1.mat.meta +++ b/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/Textures/metal.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d7460ad30d4d4f54ca629273db62b0a0 +guid: 80cf41bdb3b9c8e4aaaa3b56a1691149 NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 diff --git a/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/texture/default.mat b/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/Textures/server.mat similarity index 92% rename from Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/texture/default.mat rename to Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/Textures/server.mat index 828e510c..eebcd8a7 100644 --- a/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/texture/default.mat +++ b/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/Textures/server.mat @@ -1,18 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!114 &-2095117461926808970 -MonoBehaviour: - m_ObjectHideFlags: 11 - 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} - m_Name: - m_EditorClassIdentifier: - version: 7 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -20,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: default + m_Name: server m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 @@ -38,7 +25,7 @@ Material: serializedVersion: 3 m_TexEnvs: - _BaseMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: db51058672ac5ea4caa0ea8f697ab355, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BumpMap: @@ -62,7 +49,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: db51058672ac5ea4caa0ea8f697ab355, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -110,7 +97,7 @@ Material: - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - - _Glossiness: 0 + - _Glossiness: 0.76818186 - _GlossyReflections: 1 - _Metallic: 0 - _Mode: 0 @@ -118,7 +105,7 @@ Material: - _Parallax: 0.02 - _QueueOffset: 0 - _ReceiveShadows: 1 - - _Smoothness: 0 + - _Smoothness: 0.76818186 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 @@ -133,3 +120,16 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] +--- !u!114 &6701373129932224431 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 7 diff --git a/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/texture/Mat_2.mat.meta b/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/Textures/server.mat.meta similarity index 79% rename from Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/texture/Mat_2.mat.meta rename to Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/Textures/server.mat.meta index 1a1a6e96..26533495 100644 --- a/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/texture/Mat_2.mat.meta +++ b/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/Textures/server.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 825ec6fefd8ccaf4295672ccea406ea7 +guid: bc7ccc03efe602c4aac5b3670fa03b64 NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 diff --git a/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/Textures/server.png b/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/Textures/server.png new file mode 100644 index 00000000..fcbb1695 --- /dev/null +++ b/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/Textures/server.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:812197f29134058103f3727e1b4a44e01de790e3c32d40310b3fd24ea480e6c3 +size 15542 diff --git a/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/console.png.meta b/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/Textures/server.png.meta similarity index 98% rename from Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/console.png.meta rename to Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/Textures/server.png.meta index a034e047..c698d0f0 100644 --- a/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/console.png.meta +++ b/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/Textures/server.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 394b32900e0238a438f261a5ea95119d +guid: db51058672ac5ea4caa0ea8f697ab355 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/Textures/server_bump.png b/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/Textures/server_bump.png new file mode 100644 index 00000000..76ae95b3 --- /dev/null +++ b/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/Textures/server_bump.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:26bea5d42e1828741983e96089bcb4b1f011e5389947f2c89b0df9dedf963451 +size 12520 diff --git a/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/rack.png.meta b/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/Textures/server_bump.png.meta similarity index 98% rename from Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/rack.png.meta rename to Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/Textures/server_bump.png.meta index 4ec338be..1fa6ab2d 100644 --- a/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/rack.png.meta +++ b/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/Textures/server_bump.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 25bcc3b22fb12674891cf8fbaad49af4 +guid: 7c7aa7168cb215447ae810b7138dfaa7 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/console.png b/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/console.png deleted file mode 100644 index d016c5b6..00000000 --- a/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/console.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4a82bf0a1a86bdb61f7d176d3c878540378839d10a873eb23e9130d075d29ed3 -size 272645 diff --git a/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/rack.png b/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/rack.png deleted file mode 100644 index e6f686cb..00000000 --- a/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/rack.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e267b5c1de881fba8c91c96812587a43338e9653ecabd5ace38d268c38fd64f7 -size 331444 diff --git a/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/server computer.c4d b/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/server computer.c4d deleted file mode 100644 index 468b7171..00000000 --- a/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/server computer.c4d +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9df84c6eb95db088ebcbb8f1425745c73ecd8ef470d2dc0de9511ef7cd1282c3 -size 229258 diff --git a/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/server computer.c4d.meta b/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/server computer.c4d.meta deleted file mode 100644 index fb4f3359..00000000 --- a/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/server computer.c4d.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: be8bde10338e38f42b269f2bd7197367 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/server computer.obj b/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/server computer.obj deleted file mode 100644 index 52b9fe6d..00000000 --- a/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/server computer.obj +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:94a9cb81dc69477d146f37d1a1d15a8bf956b2e4b9675b025e4f29403d643df5 -size 9182 diff --git a/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/server_computer.mtl b/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/server_computer.mtl deleted file mode 100644 index aebbe345..00000000 --- a/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/server_computer.mtl +++ /dev/null @@ -1,29 +0,0 @@ -# WaveFront *.mtl file (generated by CINEMA 4D) - -newmtl default -Kd 1 1 1 - -newmtl Mat -Ka 1 1 1 -Kd 0.80000001192093 0.80000001192093 0.80000001192093 -map_Kd w609_4.jpg -Ks 1 1 1 -Ns 50 -illum 7 - -newmtl Mat_1 -Ka 1 1 1 -Kd 0.80000001192093 0.80000001192093 0.80000001192093 -map_Kd serverguy-dedicated-servers.png -Ks 1 1 1 -Ns 50 -illum 7 - -newmtl Mat_2 -Ka 1 1 1 -Kd 0.80000001192093 0.80000001192093 0.80000001192093 -map_Kd 4U36_back.jpg -Ks 1 1 1 -Ns 50 -illum 7 - diff --git a/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/server_computer.mtl.meta b/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/server_computer.mtl.meta deleted file mode 100644 index ead0935f..00000000 --- a/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/server_computer.mtl.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 5e5d7ba4b92315d4197b3d48c8198c95 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/servers.png b/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/servers.png deleted file mode 100644 index 96764bd0..00000000 --- a/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/servers.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7f905a5ebfa79e4cfc44f424bfb3e9015556cd86b3c1665b62c454f591ff4f19 -size 1322447 diff --git a/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/servers.png.meta b/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/servers.png.meta deleted file mode 100644 index 53a73cca..00000000 --- a/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/servers.png.meta +++ /dev/null @@ -1,148 +0,0 @@ -fileFormatVersion: 2 -guid: c4f431d58f8c59144ae332235ab75e6f -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 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 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 - swizzle: 50462976 - 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: WebGL - 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: 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: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/texture/Mat_1.mat b/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/texture/Mat_1.mat deleted file mode 100644 index 4d9885d8..00000000 --- a/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/texture/Mat_1.mat +++ /dev/null @@ -1,135 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &-2703150200203734887 -MonoBehaviour: - m_ObjectHideFlags: 11 - 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} - m_Name: - m_EditorClassIdentifier: - version: 7 ---- !u!21 &2100000 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Mat_1 - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BaseMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _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: 0} - 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} - - _SpecGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_Lightmaps: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_LightmapsInd: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_ShadowMasks: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _AlphaClip: 0 - - _AlphaToMask: 0 - - _Blend: 0 - - _BlendModePreserveSpecular: 1 - - _BumpScale: 1 - - _ClearCoatMask: 0 - - _ClearCoatSmoothness: 0 - - _Cull: 2 - - _Cutoff: 0.5 - - _DetailAlbedoMapScale: 1 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _DstBlendAlpha: 0 - - _EnvironmentReflections: 1 - - _GlossMapScale: 1 - - _Glossiness: 0 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _QueueOffset: 0 - - _ReceiveShadows: 1 - - _Smoothness: 0 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _SrcBlendAlpha: 1 - - _Surface: 0 - - _UVSec: 0 - - _WorkflowMode: 1 - - _ZWrite: 1 - m_Colors: - - _BaseColor: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} - - _Color: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - m_BuildTextureStacks: [] diff --git a/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/texture/Server_back side.jpg b/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/texture/Server_back side.jpg deleted file mode 100644 index 8d4c9638..00000000 --- a/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/texture/Server_back side.jpg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:821d7611826c08ed48e7b4ce11e80f0ef9e5c74100dc010c456b567cc41329f5 -size 105277 diff --git a/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/texture/Server_back side.jpg.meta b/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/texture/Server_back side.jpg.meta deleted file mode 100644 index 69965514..00000000 --- a/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/texture/Server_back side.jpg.meta +++ /dev/null @@ -1,148 +0,0 @@ -fileFormatVersion: 2 -guid: 5307e48248ec46d4da92208886d53bb5 -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 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 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 - swizzle: 50462976 - 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: WebGL - 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: 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: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/texture/default.mat.meta b/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/texture/default.mat.meta deleted file mode 100644 index 9436deef..00000000 --- a/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/texture/default.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 17c47e22aef11854e9c68d71accbf1dd -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/texture/server front.png b/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/texture/server front.png deleted file mode 100644 index 9c63a9d2..00000000 --- a/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/texture/server front.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:41c6462f595acb93b39c785bb8ebde341e32e6e929522e6b7fba2acb12be498a -size 116795 diff --git a/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/texture/server front.png.meta b/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/texture/server front.png.meta deleted file mode 100644 index a067a6a3..00000000 --- a/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/texture/server front.png.meta +++ /dev/null @@ -1,148 +0,0 @@ -fileFormatVersion: 2 -guid: e16a2b089450a0e4983036f5e89b109c -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 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 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 - swizzle: 50462976 - 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: WebGL - 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: 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: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/texture/server top, bottom, side.jpg b/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/texture/server top, bottom, side.jpg deleted file mode 100644 index 224efe17..00000000 --- a/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/texture/server top, bottom, side.jpg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f9569e6737ebe67f1ffb16dea244c4ea3fe61478ce5c7cbfcc2ec431af966e2c -size 229978 diff --git a/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/texture/server top, bottom, side.jpg.meta b/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/texture/server top, bottom, side.jpg.meta deleted file mode 100644 index 9d654256..00000000 --- a/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/texture/server top, bottom, side.jpg.meta +++ /dev/null @@ -1,148 +0,0 @@ -fileFormatVersion: 2 -guid: bac9c245a3c438f4996c333095c00435 -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 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 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 - swizzle: 50462976 - 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: WebGL - 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: 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: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/uploads_files_2840457_server.fbx b/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/uploads_files_2840457_server.fbx new file mode 100644 index 00000000..32ba8758 --- /dev/null +++ b/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/uploads_files_2840457_server.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3e1dc7529d51b7d239a2e59b38c4fdee618ec3bbc8721e77cb4bd7a64e75f4f9 +size 29100 diff --git a/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/server computer.obj.meta b/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/uploads_files_2840457_server.fbx.meta similarity index 85% rename from Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/server computer.obj.meta rename to Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/uploads_files_2840457_server.fbx.meta index 9b957574..e760ad34 100644 --- a/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/server computer.obj.meta +++ b/Assets/_PROJECT/Models/Furniture/Imported_Models/Server room/uploads_files_2840457_server.fbx.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0a10ca2ecd0e9da4f833f21cfdbcbc3a +guid: ac65e655dd40bcd48b72b3f8ddcf45bd ModelImporter: serializedVersion: 22200 internalIDToNameTable: [] @@ -7,23 +7,18 @@ ModelImporter: - first: type: UnityEngine:Material assembly: UnityEngine.CoreModule - name: Mat - second: {fileID: 2100000, guid: fe12bb496a73f374fb7858757ce68107, type: 2} + name: glass + second: {fileID: 2100000, guid: 9683b065e82ad1245bb59a5705b0786f, type: 2} - first: type: UnityEngine:Material assembly: UnityEngine.CoreModule - name: Mat_1 - second: {fileID: 2100000, guid: d7460ad30d4d4f54ca629273db62b0a0, type: 2} + name: metal + second: {fileID: 2100000, guid: 80cf41bdb3b9c8e4aaaa3b56a1691149, type: 2} - first: type: UnityEngine:Material assembly: UnityEngine.CoreModule - name: Mat_2 - second: {fileID: 2100000, guid: 825ec6fefd8ccaf4295672ccea406ea7, type: 2} - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: default - second: {fileID: 2100000, guid: 17c47e22aef11854e9c68d71accbf1dd, type: 2} + name: server + second: {fileID: 2100000, guid: bc7ccc03efe602c4aac5b3670fa03b64, type: 2} materials: materialImportMode: 2 materialName: 0 diff --git a/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity b/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity index e05b4325..05a78ce0 100644 --- a/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity +++ b/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:42cf97847671fbcdeab259cbba1043122bb00314cadcdba51b7b16b124519043 -size 127160315 +oid sha256:5c5fdb2b888d76fb308f11a7e1cc1f7e4ea6e65c39235bd6a50ce523141da3fe +size 127321811