diff --git a/Assets/RoomAssets/Laboratory/_Textures/Floor/Floor.mat b/Assets/RoomAssets/Laboratory/_Textures/Floor/Floor.mat index 56277de..d797dd1 100644 --- a/Assets/RoomAssets/Laboratory/_Textures/Floor/Floor.mat +++ b/Assets/RoomAssets/Laboratory/_Textures/Floor/Floor.mat @@ -148,7 +148,7 @@ Material: - _GlossMapScale: 0 - _Glossiness: 0 - _GlossyReflections: 0 - - _HeightAmplitude: 1 + - _HeightAmplitude: 1.6 - _MaxSmoothness: 1 - _Metallic: 0 - _MinSmoothness: 0 diff --git a/Assets/RoomAssets/Office/_Textures/Floor/Fabric023_2K-JPG_Color.jpg b/Assets/RoomAssets/Office/_Textures/Floor/Fabric023_2K-JPG_Color.jpg new file mode 100644 index 0000000..a816b67 --- /dev/null +++ b/Assets/RoomAssets/Office/_Textures/Floor/Fabric023_2K-JPG_Color.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6203923d2d83b2acb381e4815be54738f1f840c56dc22ec8a0d896363c994e51 +size 5854810 diff --git a/Assets/RoomAssets/Office/_Textures/Floor/Fabric023_2K-JPG_Color.jpg.meta b/Assets/RoomAssets/Office/_Textures/Floor/Fabric023_2K-JPG_Color.jpg.meta new file mode 100644 index 0000000..06ecfa0 --- /dev/null +++ b/Assets/RoomAssets/Office/_Textures/Floor/Fabric023_2K-JPG_Color.jpg.meta @@ -0,0 +1,119 @@ +fileFormatVersion: 2 +guid: 645756359c5caa0d38fb54ded25a51cd +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + 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: 0 + 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 + spriteTessellationMethod: 0 + spriteTessellationDetail: -1 + spriteGeometrySubdivision: -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: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 2 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/RoomAssets/Office/_Textures/Floor/Fabric023_2K-JPG_Displacement.jpg b/Assets/RoomAssets/Office/_Textures/Floor/Fabric023_2K-JPG_Displacement.jpg new file mode 100644 index 0000000..1e8edc3 --- /dev/null +++ b/Assets/RoomAssets/Office/_Textures/Floor/Fabric023_2K-JPG_Displacement.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:23981a1d965704c679ee5210d5265cab6efce0bca9ac553a883ac4efe85530f4 +size 3240900 diff --git a/Assets/RoomAssets/Office/_Textures/Floor/Fabric023_2K-JPG_Displacement.jpg.meta b/Assets/RoomAssets/Office/_Textures/Floor/Fabric023_2K-JPG_Displacement.jpg.meta new file mode 100644 index 0000000..f78f863 --- /dev/null +++ b/Assets/RoomAssets/Office/_Textures/Floor/Fabric023_2K-JPG_Displacement.jpg.meta @@ -0,0 +1,119 @@ +fileFormatVersion: 2 +guid: ca432a4ac7920a22c8339d2e7bed4939 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 0 + 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: 0 + 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 + spriteTessellationMethod: 0 + spriteTessellationDetail: -1 + spriteGeometrySubdivision: -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: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 2 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/RoomAssets/Office/_Textures/Floor/Fabric023_2K-JPG_NormalGL.jpg b/Assets/RoomAssets/Office/_Textures/Floor/Fabric023_2K-JPG_NormalGL.jpg new file mode 100644 index 0000000..b861d1c --- /dev/null +++ b/Assets/RoomAssets/Office/_Textures/Floor/Fabric023_2K-JPG_NormalGL.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d75226a938767db989717329f839a8763f5b08eab24f3e02fb376871d6d552d3 +size 9430513 diff --git a/Assets/RoomAssets/Office/_Textures/Floor/Fabric023_2K-JPG_NormalGL.jpg.meta b/Assets/RoomAssets/Office/_Textures/Floor/Fabric023_2K-JPG_NormalGL.jpg.meta new file mode 100644 index 0000000..f55680e --- /dev/null +++ b/Assets/RoomAssets/Office/_Textures/Floor/Fabric023_2K-JPG_NormalGL.jpg.meta @@ -0,0 +1,119 @@ +fileFormatVersion: 2 +guid: d3f96262c49bee50eaba48e2fa9a0db1 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 0 + 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: 0 + 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 + spriteTessellationMethod: 0 + spriteTessellationDetail: -1 + spriteGeometrySubdivision: -1 + textureType: 1 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 2 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/RoomAssets/Office/_Textures/Floor/Fabric023_2K-JPG_Roughness.jpg b/Assets/RoomAssets/Office/_Textures/Floor/Fabric023_2K-JPG_Roughness.jpg new file mode 100644 index 0000000..023d651 --- /dev/null +++ b/Assets/RoomAssets/Office/_Textures/Floor/Fabric023_2K-JPG_Roughness.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:02331b416537be035f5fedc94f2104124a29ad93ecee68099eb2d3dc9671d8bd +size 2581032 diff --git a/Assets/RoomAssets/Office/_Textures/Floor/Fabric023_2K-JPG_Roughness.jpg.meta b/Assets/RoomAssets/Office/_Textures/Floor/Fabric023_2K-JPG_Roughness.jpg.meta new file mode 100644 index 0000000..b8322b9 --- /dev/null +++ b/Assets/RoomAssets/Office/_Textures/Floor/Fabric023_2K-JPG_Roughness.jpg.meta @@ -0,0 +1,119 @@ +fileFormatVersion: 2 +guid: f920d19092ef94975b3fb927851b89ce +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 0 + 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: 0 + 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 + spriteTessellationMethod: 0 + spriteTessellationDetail: -1 + spriteGeometrySubdivision: -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: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 2 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/RoomAssets/Office/_Textures/Floor/Floor_ofiice.mat b/Assets/RoomAssets/Office/_Textures/Floor/Floor_ofiice.mat index 28b9b49..07ebc0e 100644 --- a/Assets/RoomAssets/Office/_Textures/Floor/Floor_ofiice.mat +++ b/Assets/RoomAssets/Office/_Textures/Floor/Floor_ofiice.mat @@ -37,7 +37,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _ColorMap: - m_Texture: {fileID: 2800000, guid: 4781f31b6a6fb89bcb3aaf858d0c356b, type: 3} + m_Texture: {fileID: 2800000, guid: 645756359c5caa0d38fb54ded25a51cd, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _DetailAlbedoMap: @@ -53,7 +53,11 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _Displacment: - m_Texture: {fileID: 2800000, guid: ed296eff2457e391a90d65498879b2cb, type: 3} + m_Texture: {fileID: 2800000, guid: ca432a4ac7920a22c8339d2e7bed4939, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Emission: + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _EmissionMap: @@ -69,7 +73,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _NormalMap: - m_Texture: {fileID: 2800000, guid: 1b29097746d6eed938eac1fbfb9fb6f5, type: 3} + m_Texture: {fileID: 2800000, guid: d3f96262c49bee50eaba48e2fa9a0db1, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _OcclusionMap: @@ -81,7 +85,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _RoughnessMap: - m_Texture: {fileID: 2800000, guid: 9fded9ca34036f248a2e0c81e0646681, type: 3} + m_Texture: {fileID: 2800000, guid: f920d19092ef94975b3fb927851b89ce, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _SpecGlossMap: @@ -102,6 +106,7 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - _AOMultiplier: 0 - _AO_Strength: 1 - _AddPrecomputedVelocity: 0 - _AlphaClip: 0 @@ -122,7 +127,9 @@ Material: - _Glossiness: 0 - _GlossyReflections: 0 - _HeightAmplitude: 0.3 + - _MaxSmoothness: 0 - _Metallic: 0 + - _MinSmoothness: 0 - _OcclusionStrength: 1 - _Parallax: 0.005 - _QueueControl: 0 @@ -137,7 +144,7 @@ Material: - _SrcBlend: 1 - _SrcBlendAlpha: 1 - _Surface: 0 - - _Tiling: 0.25 + - _Tiling: 0.5 - _WorkflowMode: 1 - _XRMotionVectorsPass: 1 - _ZWrite: 1 diff --git a/Assets/RoomAssets/Office/_Textures/Floor/WoodFloor007_4K-JPG_AmbientOcclusion.jpg b/Assets/RoomAssets/Office/_Textures/Floor/WoodFloor007_4K-JPG_AmbientOcclusion.jpg deleted file mode 100644 index b690069..0000000 --- a/Assets/RoomAssets/Office/_Textures/Floor/WoodFloor007_4K-JPG_AmbientOcclusion.jpg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b67c4b1856370000668456395d528a98a43a5e25bbe01965ec4e3cd375829d6e -size 229096 diff --git a/Assets/RoomAssets/Office/_Textures/Floor/WoodFloor007_4K-JPG_Color.jpg b/Assets/RoomAssets/Office/_Textures/Floor/WoodFloor007_4K-JPG_Color.jpg deleted file mode 100644 index 70961c8..0000000 --- a/Assets/RoomAssets/Office/_Textures/Floor/WoodFloor007_4K-JPG_Color.jpg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8e03f6a7765e7b6d8041f1610aa39c71a135a8733533f28ff30b27383cf1e51b -size 17002140 diff --git a/Assets/RoomAssets/Office/_Textures/Floor/WoodFloor007_4K-JPG_Displacement.jpg b/Assets/RoomAssets/Office/_Textures/Floor/WoodFloor007_4K-JPG_Displacement.jpg deleted file mode 100644 index eefa0f2..0000000 --- a/Assets/RoomAssets/Office/_Textures/Floor/WoodFloor007_4K-JPG_Displacement.jpg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:43c6a590fe96910a28ecbb37b1c26c104fbfa4e59773eb6f9640e91c809b3e27 -size 5256991 diff --git a/Assets/RoomAssets/Office/_Textures/Floor/WoodFloor007_4K-JPG_NormalGL.jpg b/Assets/RoomAssets/Office/_Textures/Floor/WoodFloor007_4K-JPG_NormalGL.jpg deleted file mode 100644 index c8db127..0000000 --- a/Assets/RoomAssets/Office/_Textures/Floor/WoodFloor007_4K-JPG_NormalGL.jpg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:51b7a6f65defb688710aa615a0094bc07b0cac8ca8fd9d9eed9d3253106acd76 -size 25700312 diff --git a/Assets/RoomAssets/Office/_Textures/Floor/WoodFloor007_4K-JPG_Roughness.jpg b/Assets/RoomAssets/Office/_Textures/Floor/WoodFloor007_4K-JPG_Roughness.jpg deleted file mode 100644 index cc55089..0000000 --- a/Assets/RoomAssets/Office/_Textures/Floor/WoodFloor007_4K-JPG_Roughness.jpg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0884cd80bca379ec661914174d7c0784c144922b581fda48bb3d0fdf57b230d2 -size 4709226 diff --git a/Assets/RoomAssets/Office/_Textures/Wall.meta b/Assets/RoomAssets/Office/_Textures/Wall.meta new file mode 100644 index 0000000..497e92a --- /dev/null +++ b/Assets/RoomAssets/Office/_Textures/Wall.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: aa9944ff87b2091628c813abfbe1a859 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/RoomAssets/Office/_Textures/Wall/Wall_office.mat b/Assets/RoomAssets/Office/_Textures/Wall/Wall_office.mat new file mode 100644 index 0000000..a4dbf87 --- /dev/null +++ b/Assets/RoomAssets/Office/_Textures/Wall/Wall_office.mat @@ -0,0 +1,163 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-2946416618323330424 +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: Unity.RenderPipelines.Universal.Editor::UnityEditor.Rendering.Universal.AssetVersion + version: 10 +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Wall_office + m_Shader: {fileID: -6465566751694194690, guid: 51dd303bafe2f22c9af50cf59ea942ff, 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: {} + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _AO: + m_Texture: {fileID: 2800000, guid: 39954ddaa3decf5c49e30fb07259dd10, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _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} + - _ColorMap: + m_Texture: {fileID: 2800000, guid: e4c4ace0095ed7c259871f6a105b86b4, type: 3} + 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} + - _Displacement: + m_Texture: {fileID: 2800000, guid: e182c97181e1e04dc97e019f2858ed7f, type: 3} + 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} + - _NormalMap: + m_Texture: {fileID: 2800000, guid: fbf94f1074fbea5a9a488fbd188f908d, type: 3} + 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} + - _RoughnessMap: + m_Texture: {fileID: 2800000, guid: 85d85ad7c21512dada751e2b08c7bb52, type: 3} + 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: + - _AO_Strength: 1 + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 1 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _HeightAmplitude: -0.4 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueControl: 0 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _ScreenSpaceReflections: 1 + - _ScreenSpaceReflectionsContributeTransparent: 1 + - _Smoothness: 0.5 + - _SmoothnessMultiplier: 1 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _Tiling: 0.2 + - _WorkflowMode: 1 + - _XRMotionVectorsPass: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, 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: [] + m_AllowLocking: 1 diff --git a/Assets/RoomAssets/Office/_Textures/Wall/Wall_office.mat.meta b/Assets/RoomAssets/Office/_Textures/Wall/Wall_office.mat.meta new file mode 100644 index 0000000..cb1a959 --- /dev/null +++ b/Assets/RoomAssets/Office/_Textures/Wall/Wall_office.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 17a9ef2fa4016f63d9604b352fc3863e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/RoomAssets/Office/_Textures/Wall/concrete_0034_ao_4k.jpg b/Assets/RoomAssets/Office/_Textures/Wall/concrete_0034_ao_4k.jpg new file mode 100644 index 0000000..84ea693 --- /dev/null +++ b/Assets/RoomAssets/Office/_Textures/Wall/concrete_0034_ao_4k.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ac8eaf61663c89792a6eb60a27d329ed04777f9b4da1a05267b0b5f5a5b8cdd8 +size 1779041 diff --git a/Assets/RoomAssets/Office/_Textures/Floor/WoodFloor007_4K-JPG_Displacement.jpg.meta b/Assets/RoomAssets/Office/_Textures/Wall/concrete_0034_ao_4k.jpg.meta similarity index 98% rename from Assets/RoomAssets/Office/_Textures/Floor/WoodFloor007_4K-JPG_Displacement.jpg.meta rename to Assets/RoomAssets/Office/_Textures/Wall/concrete_0034_ao_4k.jpg.meta index 2d09617..68ae231 100644 --- a/Assets/RoomAssets/Office/_Textures/Floor/WoodFloor007_4K-JPG_Displacement.jpg.meta +++ b/Assets/RoomAssets/Office/_Textures/Wall/concrete_0034_ao_4k.jpg.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ed296eff2457e391a90d65498879b2cb +guid: 39954ddaa3decf5c49e30fb07259dd10 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/RoomAssets/Office/_Textures/Wall/concrete_0034_color_4k.jpg b/Assets/RoomAssets/Office/_Textures/Wall/concrete_0034_color_4k.jpg new file mode 100644 index 0000000..1465c3d --- /dev/null +++ b/Assets/RoomAssets/Office/_Textures/Wall/concrete_0034_color_4k.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:778ef5a78e162acf7ad7e4b7f4c00acf688fe9f66ec1f511606d43e959dba0de +size 1121535 diff --git a/Assets/RoomAssets/Office/_Textures/Floor/WoodFloor007_4K-JPG_Color.jpg.meta b/Assets/RoomAssets/Office/_Textures/Wall/concrete_0034_color_4k.jpg.meta similarity index 98% rename from Assets/RoomAssets/Office/_Textures/Floor/WoodFloor007_4K-JPG_Color.jpg.meta rename to Assets/RoomAssets/Office/_Textures/Wall/concrete_0034_color_4k.jpg.meta index fcb2795..f78ba42 100644 --- a/Assets/RoomAssets/Office/_Textures/Floor/WoodFloor007_4K-JPG_Color.jpg.meta +++ b/Assets/RoomAssets/Office/_Textures/Wall/concrete_0034_color_4k.jpg.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4781f31b6a6fb89bcb3aaf858d0c356b +guid: e4c4ace0095ed7c259871f6a105b86b4 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/RoomAssets/Office/_Textures/Wall/concrete_0034_height_4k.png b/Assets/RoomAssets/Office/_Textures/Wall/concrete_0034_height_4k.png new file mode 100644 index 0000000..3188675 --- /dev/null +++ b/Assets/RoomAssets/Office/_Textures/Wall/concrete_0034_height_4k.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:971e34f2c9de08b69a8e58a5325980a7697ee5ef6b058f8be040f28eeb9f49fb +size 1141438 diff --git a/Assets/RoomAssets/Office/_Textures/Floor/WoodFloor007_4K-JPG_AmbientOcclusion.jpg.meta b/Assets/RoomAssets/Office/_Textures/Wall/concrete_0034_height_4k.png.meta similarity index 98% rename from Assets/RoomAssets/Office/_Textures/Floor/WoodFloor007_4K-JPG_AmbientOcclusion.jpg.meta rename to Assets/RoomAssets/Office/_Textures/Wall/concrete_0034_height_4k.png.meta index 56fe144..9ca70aa 100644 --- a/Assets/RoomAssets/Office/_Textures/Floor/WoodFloor007_4K-JPG_AmbientOcclusion.jpg.meta +++ b/Assets/RoomAssets/Office/_Textures/Wall/concrete_0034_height_4k.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 11eb35e31bcc9d6c9ba1549c41f8f321 +guid: e182c97181e1e04dc97e019f2858ed7f TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/RoomAssets/Office/_Textures/Wall/concrete_0034_normal_opengl_4k.png b/Assets/RoomAssets/Office/_Textures/Wall/concrete_0034_normal_opengl_4k.png new file mode 100644 index 0000000..686a256 --- /dev/null +++ b/Assets/RoomAssets/Office/_Textures/Wall/concrete_0034_normal_opengl_4k.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:69888f58ee55ce41b5787aa1cd27252939d4da14e2bc95ae9128d86b4a07ba67 +size 105042420 diff --git a/Assets/RoomAssets/Office/_Textures/Floor/WoodFloor007_4K-JPG_NormalGL.jpg.meta b/Assets/RoomAssets/Office/_Textures/Wall/concrete_0034_normal_opengl_4k.png.meta similarity index 98% rename from Assets/RoomAssets/Office/_Textures/Floor/WoodFloor007_4K-JPG_NormalGL.jpg.meta rename to Assets/RoomAssets/Office/_Textures/Wall/concrete_0034_normal_opengl_4k.png.meta index 9299d7e..9812cd9 100644 --- a/Assets/RoomAssets/Office/_Textures/Floor/WoodFloor007_4K-JPG_NormalGL.jpg.meta +++ b/Assets/RoomAssets/Office/_Textures/Wall/concrete_0034_normal_opengl_4k.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1b29097746d6eed938eac1fbfb9fb6f5 +guid: fbf94f1074fbea5a9a488fbd188f908d TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/RoomAssets/Office/_Textures/Wall/concrete_0034_roughness_4k.jpg b/Assets/RoomAssets/Office/_Textures/Wall/concrete_0034_roughness_4k.jpg new file mode 100644 index 0000000..2ca5d1a --- /dev/null +++ b/Assets/RoomAssets/Office/_Textures/Wall/concrete_0034_roughness_4k.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e05dcad8dc47e9fe4b9a7256dc76ed034576e327f1aed07ab2967edc303f9d09 +size 913321 diff --git a/Assets/RoomAssets/Office/_Textures/Floor/WoodFloor007_4K-JPG_Roughness.jpg.meta b/Assets/RoomAssets/Office/_Textures/Wall/concrete_0034_roughness_4k.jpg.meta similarity index 98% rename from Assets/RoomAssets/Office/_Textures/Floor/WoodFloor007_4K-JPG_Roughness.jpg.meta rename to Assets/RoomAssets/Office/_Textures/Wall/concrete_0034_roughness_4k.jpg.meta index aaf0444..5c647d0 100644 --- a/Assets/RoomAssets/Office/_Textures/Floor/WoodFloor007_4K-JPG_Roughness.jpg.meta +++ b/Assets/RoomAssets/Office/_Textures/Wall/concrete_0034_roughness_4k.jpg.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9fded9ca34036f248a2e0c81e0646681 +guid: 85d85ad7c21512dada751e2b08c7bb52 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/RoomAssets/_LightAssets/Laboratoru/Fluorescent_lamps/Fluorescent_lamp_prefab.prefab b/Assets/RoomAssets/_LightAssets/Laboratoru/Fluorescent_lamps/Fluorescent_lamp_prefab.prefab index cbb315d..09a9b7d 100644 --- a/Assets/RoomAssets/_LightAssets/Laboratoru/Fluorescent_lamps/Fluorescent_lamp_prefab.prefab +++ b/Assets/RoomAssets/_LightAssets/Laboratoru/Fluorescent_lamps/Fluorescent_lamp_prefab.prefab @@ -1,132 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &8279409144401319767 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2401483345658750882} - - component: {fileID: 6400154091978395038} - - component: {fileID: 508143952678146511} - m_Layer: 0 - m_Name: Point Light - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2401483345658750882 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8279409144401319767} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0.00358} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 6454089254664525780} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!108 &6400154091978395038 -Light: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8279409144401319767} - m_Enabled: 0 - serializedVersion: 13 - m_Type: 2 - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_Intensity: 0 - m_Range: 1 - m_SpotAngle: 30 - m_InnerSpotAngle: 21.80208 - m_CookieSize2D: {x: 0.5, y: 0.5} - m_Shadows: - m_Type: 0 - m_Resolution: -1 - m_CustomResolution: -1 - m_Strength: 1 - m_Bias: 0.05 - m_NormalBias: 0.4 - m_NearPlane: 0.2 - m_CullingMatrixOverride: - e00: 1 - e01: 0 - e02: 0 - e03: 0 - e10: 0 - e11: 1 - e12: 0 - e13: 0 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 - m_UseCullingMatrixOverride: 0 - m_Cookie: {fileID: 0} - m_DrawHalo: 0 - m_Flare: {fileID: 0} - m_RenderMode: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingLayerMask: 1 - m_Lightmapping: 4 - m_LightShadowCasterMode: 0 - m_AreaSize: {x: 1, y: 1} - m_BounceIntensity: 1 - m_ColorTemperature: 6570 - m_UseColorTemperature: 0 - m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} - m_UseBoundingSphereOverride: 0 - m_UseViewFrustumForShadowCasterCull: 1 - m_ForceVisible: 0 - m_ShapeRadius: 0.025 - m_ShadowAngle: 0 - m_LightUnit: 1 - m_LuxAtDistance: 1 - m_EnableSpotReflector: 1 ---- !u!114 &508143952678146511 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8279409144401319767} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} - m_Name: - m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Runtime::UnityEngine.Rendering.Universal.UniversalAdditionalLightData - m_UsePipelineSettings: 1 - m_AdditionalLightsShadowResolutionTier: 2 - m_CustomShadowLayers: 0 - m_LightCookieSize: {x: 1, y: 1} - m_LightCookieOffset: {x: 0, y: 0} - m_SoftShadowQuality: 0 - m_RenderingLayersMask: - serializedVersion: 0 - m_Bits: 1 - m_ShadowRenderingLayersMask: - serializedVersion: 0 - m_Bits: 1 - m_Version: 4 - m_LightLayerMask: 1 - m_ShadowLayerMask: 1 - m_RenderingLayers: 1 - m_ShadowRenderingLayers: 1 --- !u!1 &8868572391117574485 GameObject: m_ObjectHideFlags: 0 @@ -336,9 +209,6 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 67b3ef2db0b4dd8468b9aedf229ef84f, type: 3} insertIndex: -1 addedObject: {fileID: 8503020076790007756} - - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 67b3ef2db0b4dd8468b9aedf229ef84f, type: 3} - insertIndex: -1 - addedObject: {fileID: 2401483345658750882} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 67b3ef2db0b4dd8468b9aedf229ef84f, type: 3} --- !u!4 &6454089254664525780 stripped diff --git a/Assets/RoomAssets/_RoomThemes/Office.asset b/Assets/RoomAssets/_RoomThemes/Office.asset index 66f136a..ae6a8c7 100644 --- a/Assets/RoomAssets/_RoomThemes/Office.asset +++ b/Assets/RoomAssets/_RoomThemes/Office.asset @@ -12,8 +12,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: db0cd7361afa447e84273406c58818df, type: 3} m_Name: Office m_EditorClassIdentifier: Assembly-CSharp::_Project.Scripts.LevelGenerating.RoomTheme - floorMaterial: {fileID: 2100000, guid: e4d8990be0d4681c2a931521991dd97e, type: 2} - wallMaterial: {fileID: 2100000, guid: 7ba770fb31b6867d0a32280ad6623549, type: 2} + floorMaterial: {fileID: 2100000, guid: 03002bcb5816164098f8897c6f0d4c51, type: 2} + wallMaterial: {fileID: 2100000, guid: 17a9ef2fa4016f63d9604b352fc3863e, type: 2} ceilingMaterial: {fileID: 5398659014882694498, guid: 5ffefc05c8840a644a89d935b25c2f3d, type: 3} lightConfig: {fileID: 11400000, guid: bbae43ec6af0a0347a9520343db6628f, type: 2} propSet: {fileID: 0} diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index ffc17a1..6cd0056 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -2630,7 +2630,7 @@ Light: m_InnerSpotAngle: 21.802082 m_CookieSize2D: {x: 10, y: 10} m_Shadows: - m_Type: 1 + m_Type: 0 m_Resolution: -1 m_CustomResolution: -1 m_Strength: 1 @@ -2661,8 +2661,8 @@ Light: m_RenderMode: 0 m_CullingMask: serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingLayerMask: 1 + m_Bits: 64 + m_RenderingLayerMask: 4294967295 m_Lightmapping: 1 m_LightShadowCasterMode: 0 m_AreaSize: {x: 1, y: 1} @@ -2686,13 +2686,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 146683184} serializedVersion: 2 - m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} - m_LocalPosition: {x: 0, y: 3.58, z: 0} + m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} + m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} --- !u!114 &146683187 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2713,7 +2713,7 @@ MonoBehaviour: m_SoftShadowQuality: 0 m_RenderingLayersMask: serializedVersion: 0 - m_Bits: 1 + m_Bits: 4294967295 m_ShadowRenderingLayersMask: serializedVersion: 0 m_Bits: 1 @@ -13844,7 +13844,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Assembly-CSharp::_Project.Scripts.LevelGenerating.WallsGenerator floorsCount: 10 - lengthWallMin: 20 + lengthWallMin: 10 lengthWallMax: 70 lengthStartRoom: 10 lengthLiftRoom: 10 @@ -13852,7 +13852,7 @@ MonoBehaviour: lengthFloor: 100 corridorLength: 4 corridorWigth: 3 - minRoomCount: 7 + minRoomCount: 10 _minDepthLiftRoom: 5 _minDistanceStartLift: 50 GameObjectA: {fileID: 8066171868259172852, guid: e46748b8eb8a6074d9bb87701cebe84b, type: 3} @@ -13861,9 +13861,9 @@ MonoBehaviour: shellSpawner: {fileID: 740097207} roomGenerators: {fileID: 740097208} maxRooms: 15 - branchChance: 0.7 + branchChance: 1 roomMargin: 2 - liftDoorAnyPosition: 1 + liftDoorAnyPosition: 0 --- !u!4 &740097205 Transform: m_ObjectHideFlags: 0 @@ -13925,6 +13925,8 @@ MonoBehaviour: theme: {fileID: 11400000, guid: 7edd14cceb4cead988d98ebb08ab60f6, type: 2} - type: 1 theme: {fileID: 11400000, guid: 4ced885841efb23e18cbc01c8dc2da8e, type: 2} + - type: 6 + theme: {fileID: 11400000, guid: 56c9041533d986320b94dfdb6af4f25f, type: 2} --- !u!1001 &740364276 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/_Project/Scripts/LevelGenerating/ShellSpawner.cs b/Assets/_Project/Scripts/LevelGenerating/ShellSpawner.cs index 20d4382..acf6fbb 100644 --- a/Assets/_Project/Scripts/LevelGenerating/ShellSpawner.cs +++ b/Assets/_Project/Scripts/LevelGenerating/ShellSpawner.cs @@ -71,6 +71,7 @@ namespace _Project.Scripts.LevelGenerating // потолок: перевёрнут, нормаль вниз var ceilingGo = Make(roomGo.transform, "Ceiling", new Vector3(c.x, wallHeight, c.z), Quaternion.Euler(180f, 0f, 0f), scale, false); + ceilingGo.layer = LayerMask.NameToLayer("Ceiling"); view.CeilingRenderers.AddRange(ceilingGo.GetComponentsInChildren()); } diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 019603c..9c23c84 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -11,7 +11,7 @@ TagManager: - Ground - Water - UI - - + - Ceiling - - -