diff --git a/.gitattributes b/.gitattributes index c8cb4a6c..68407b88 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,5 +1,4 @@ * text=auto - # Unity files *.meta -text merge=unityyamlmerge diff *.unity -text merge=unityyamlmerge diff @@ -23,7 +22,6 @@ *.terrainlayer -text merge=unityyamlmerge diff *.mixer -text merge=unityyamlmerge diff *.shadervariants -text merge=unityyamlmerge diff - # Image formats *.psd filter=lfs diff=lfs merge=lfs -text *.jpg filter=lfs diff=lfs merge=lfs -text @@ -37,7 +35,6 @@ *.pict filter=lfs diff=lfs merge=lfs -text *.dds filter=lfs diff=lfs merge=lfs -text *.xcf filter=lfs diff=lfs merge=lfs -text - # Audio formats *.mp3 filter=lfs diff=lfs merge=lfs -text *.ogg filter=lfs diff=lfs merge=lfs -text @@ -48,7 +45,6 @@ *.it filter=lfs diff=lfs merge=lfs -text *.s3m filter=lfs diff=lfs merge=lfs -text *.xm filter=lfs diff=lfs merge=lfs -text - # Video formats *.mov filter=lfs diff=lfs merge=lfs -text *.avi filter=lfs diff=lfs merge=lfs -text @@ -56,7 +52,6 @@ *.mpg filter=lfs diff=lfs merge=lfs -text *.mpeg filter=lfs diff=lfs merge=lfs -text *.mp4 filter=lfs diff=lfs merge=lfs -text - # 3D formats *.fbx filter=lfs diff=lfs merge=lfs -text *.obj filter=lfs diff=lfs merge=lfs -text @@ -72,15 +67,14 @@ *.lwo2 filter=lfs diff=lfs merge=lfs -text *.abc filter=lfs diff=lfs merge=lfs -text *.3dm filter=lfs diff=lfs merge=lfs -text - # Build *.dll filter=lfs diff=lfs merge=lfs -text *.pdb filter=lfs diff=lfs merge=lfs -text *.mdb filter=lfs diff=lfs merge=lfs -text - # Packaging *.zip filter=lfs diff=lfs merge=lfs -text *.7z filter=lfs diff=lfs merge=lfs -text *.gz filter=lfs diff=lfs merge=lfs -text *.rar filter=lfs diff=lfs merge=lfs -text *.tar filter=lfs diff=lfs merge=lfs -text +*.exr filter=lfs diff=lfs merge=lfs -text diff --git a/Assets/Scenes/Main_scene/LightingData.asset b/Assets/Scenes/Main_scene/LightingData.asset index 8f0592fa..454792ef 100644 Binary files a/Assets/Scenes/Main_scene/LightingData.asset and b/Assets/Scenes/Main_scene/LightingData.asset differ diff --git a/Assets/Scenes/Main_scene/Lightmap-0_comp_light.exr b/Assets/Scenes/Main_scene/Lightmap-0_comp_light.exr index 85c4088a..15d4bf4a 100644 Binary files a/Assets/Scenes/Main_scene/Lightmap-0_comp_light.exr and b/Assets/Scenes/Main_scene/Lightmap-0_comp_light.exr differ diff --git a/Assets/Scenes/Main_scene/Lightmap-10_comp_light.exr b/Assets/Scenes/Main_scene/Lightmap-10_comp_light.exr new file mode 100644 index 00000000..e42a6b22 --- /dev/null +++ b/Assets/Scenes/Main_scene/Lightmap-10_comp_light.exr @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:74de24bb50ef1d4dc0504b7f795a1f7f63b81d496a8b3e79b927a8c3184a6657 +size 7666510 diff --git a/Assets/Scenes/Main_scene/Lightmap-10_comp_light.exr.meta b/Assets/Scenes/Main_scene/Lightmap-10_comp_light.exr.meta new file mode 100644 index 00000000..b3a5d585 --- /dev/null +++ b/Assets/Scenes/Main_scene/Lightmap-10_comp_light.exr.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: a9495a4b6c642a745933009cdbd8990a +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 1 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 3 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + 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: 0 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 6 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + 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: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Main_scene/Lightmap-11_comp_light.exr b/Assets/Scenes/Main_scene/Lightmap-11_comp_light.exr new file mode 100644 index 00000000..ce49327a --- /dev/null +++ b/Assets/Scenes/Main_scene/Lightmap-11_comp_light.exr @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c4a7d3abbe45f700fb4de08e2ca937c8dddf3f3d0858a0d0b51275be6a429ed2 +size 8292585 diff --git a/Assets/Scenes/Main_scene/Lightmap-11_comp_light.exr.meta b/Assets/Scenes/Main_scene/Lightmap-11_comp_light.exr.meta new file mode 100644 index 00000000..6a0d1dd7 --- /dev/null +++ b/Assets/Scenes/Main_scene/Lightmap-11_comp_light.exr.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: b682e83fafbdd174d81e045f4bc4675f +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 1 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 3 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + 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: 0 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 6 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + 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: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Main_scene/Lightmap-12_comp_light.exr b/Assets/Scenes/Main_scene/Lightmap-12_comp_light.exr new file mode 100644 index 00000000..b59e6513 --- /dev/null +++ b/Assets/Scenes/Main_scene/Lightmap-12_comp_light.exr @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:950fddcb350906e9bd7c07158ba209b36441386d80a3af3feab074a866ceeb23 +size 12878408 diff --git a/Assets/Scenes/Main_scene/Lightmap-12_comp_light.exr.meta b/Assets/Scenes/Main_scene/Lightmap-12_comp_light.exr.meta new file mode 100644 index 00000000..282356ee --- /dev/null +++ b/Assets/Scenes/Main_scene/Lightmap-12_comp_light.exr.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: ec325b5dbb33efb40b87278b5d9eec2e +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 1 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 3 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + 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: 0 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 6 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + 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: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Main_scene/Lightmap-13_comp_light.exr b/Assets/Scenes/Main_scene/Lightmap-13_comp_light.exr new file mode 100644 index 00000000..4ec0aad9 --- /dev/null +++ b/Assets/Scenes/Main_scene/Lightmap-13_comp_light.exr @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:407d041680c6ee8a6634137029f9573f5c96162eb2d64843e28ccaec4175a3bd +size 4049820 diff --git a/Assets/Scenes/Main_scene/Lightmap-13_comp_light.exr.meta b/Assets/Scenes/Main_scene/Lightmap-13_comp_light.exr.meta new file mode 100644 index 00000000..2fb378b7 --- /dev/null +++ b/Assets/Scenes/Main_scene/Lightmap-13_comp_light.exr.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: a6ca64ea32289e847b0e814d682202ec +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 1 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 3 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + 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: 0 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 6 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + 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: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Main_scene/Lightmap-1_comp_light.exr b/Assets/Scenes/Main_scene/Lightmap-1_comp_light.exr index 6bb3b582..0f4c3e33 100644 Binary files a/Assets/Scenes/Main_scene/Lightmap-1_comp_light.exr and b/Assets/Scenes/Main_scene/Lightmap-1_comp_light.exr differ diff --git a/Assets/Scenes/Main_scene/Lightmap-2_comp_light.exr b/Assets/Scenes/Main_scene/Lightmap-2_comp_light.exr index 73ea0584..2bbbe0b0 100644 Binary files a/Assets/Scenes/Main_scene/Lightmap-2_comp_light.exr and b/Assets/Scenes/Main_scene/Lightmap-2_comp_light.exr differ diff --git a/Assets/Scenes/Main_scene/Lightmap-3_comp_light.exr b/Assets/Scenes/Main_scene/Lightmap-3_comp_light.exr index 11c6f489..02b6f024 100644 Binary files a/Assets/Scenes/Main_scene/Lightmap-3_comp_light.exr and b/Assets/Scenes/Main_scene/Lightmap-3_comp_light.exr differ diff --git a/Assets/Scenes/Main_scene/Lightmap-4_comp_light.exr b/Assets/Scenes/Main_scene/Lightmap-4_comp_light.exr index 3a52248e..f5f41e27 100644 Binary files a/Assets/Scenes/Main_scene/Lightmap-4_comp_light.exr and b/Assets/Scenes/Main_scene/Lightmap-4_comp_light.exr differ diff --git a/Assets/Scenes/Main_scene/Lightmap-5_comp_light.exr b/Assets/Scenes/Main_scene/Lightmap-5_comp_light.exr index 4ffe59f7..19f22010 100644 Binary files a/Assets/Scenes/Main_scene/Lightmap-5_comp_light.exr and b/Assets/Scenes/Main_scene/Lightmap-5_comp_light.exr differ diff --git a/Assets/Scenes/Main_scene/Lightmap-6_comp_light.exr b/Assets/Scenes/Main_scene/Lightmap-6_comp_light.exr index fb20ef5f..7a180151 100644 Binary files a/Assets/Scenes/Main_scene/Lightmap-6_comp_light.exr and b/Assets/Scenes/Main_scene/Lightmap-6_comp_light.exr differ diff --git a/Assets/Scenes/Main_scene/Lightmap-7_comp_light.exr b/Assets/Scenes/Main_scene/Lightmap-7_comp_light.exr index f94805d2..3afece26 100644 Binary files a/Assets/Scenes/Main_scene/Lightmap-7_comp_light.exr and b/Assets/Scenes/Main_scene/Lightmap-7_comp_light.exr differ diff --git a/Assets/Scenes/Main_scene/Lightmap-8_comp_light.exr b/Assets/Scenes/Main_scene/Lightmap-8_comp_light.exr new file mode 100644 index 00000000..55fdc26a --- /dev/null +++ b/Assets/Scenes/Main_scene/Lightmap-8_comp_light.exr @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:12435ae527005ff3d2c12180bf76510fd4827d7f1d00fcfd1cad8a90014ba3ca +size 8163084 diff --git a/Assets/Scenes/Main_scene/Lightmap-8_comp_light.exr.meta b/Assets/Scenes/Main_scene/Lightmap-8_comp_light.exr.meta new file mode 100644 index 00000000..42396eda --- /dev/null +++ b/Assets/Scenes/Main_scene/Lightmap-8_comp_light.exr.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 1e57ba5cdc185f34fa68ce14ebc69627 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 1 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 3 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + 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: 0 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 6 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + 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: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Main_scene/Lightmap-9_comp_light.exr b/Assets/Scenes/Main_scene/Lightmap-9_comp_light.exr new file mode 100644 index 00000000..3c8b7ee8 --- /dev/null +++ b/Assets/Scenes/Main_scene/Lightmap-9_comp_light.exr @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:57115b3cba49b6fa3f8eed5edb9e9a32a69ef489e36d1699697111ca671e5957 +size 9047184 diff --git a/Assets/Scenes/Main_scene/Lightmap-9_comp_light.exr.meta b/Assets/Scenes/Main_scene/Lightmap-9_comp_light.exr.meta new file mode 100644 index 00000000..d2a50c70 --- /dev/null +++ b/Assets/Scenes/Main_scene/Lightmap-9_comp_light.exr.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: fed9df6572e8aa14da82f12cceeb0245 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 1 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 3 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + 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: 0 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 6 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + 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: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Main_scene/ReflectionProbe-0.exr b/Assets/Scenes/Main_scene/ReflectionProbe-0.exr index 00309d78..f1228310 100644 Binary files a/Assets/Scenes/Main_scene/ReflectionProbe-0.exr and b/Assets/Scenes/Main_scene/ReflectionProbe-0.exr differ diff --git a/Assets/Scenes/Main_scene/ReflectionProbe-1.exr b/Assets/Scenes/Main_scene/ReflectionProbe-1.exr index 0a536906..efb1f3ec 100644 Binary files a/Assets/Scenes/Main_scene/ReflectionProbe-1.exr and b/Assets/Scenes/Main_scene/ReflectionProbe-1.exr differ diff --git a/Assets/Scenes/Main_sceneSettings.lighting b/Assets/Scenes/Main_sceneSettings.lighting index ffe6341b..90e4995f 100644 --- a/Assets/Scenes/Main_sceneSettings.lighting +++ b/Assets/Scenes/Main_sceneSettings.lighting @@ -18,7 +18,7 @@ LightingSettings: m_UsingShadowmask: 1 m_BakeBackend: 2 m_LightmapMaxSize: 2048 - m_BakeResolution: 16 + m_BakeResolution: 32 m_Padding: 2 m_TextureCompression: 0 m_AO: 1 @@ -45,7 +45,7 @@ LightingSettings: m_PVREnvironmentSampleCount: 256 m_PVREnvironmentReferencePointCount: 2048 m_LightProbeSampleCountMultiplier: 4 - m_PVRBounces: 2 + m_PVRBounces: 10 m_PVRMinBounces: 1 m_PVREnvironmentMIS: 0 m_PVRFilteringMode: 2 diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 07f7e321..0096a1d6 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -196,7 +196,7 @@ "depth": 1, "source": "registry", "dependencies": { - "com.unity.subsystemregistration": "1.0.5" + "com.unity.subsystemregistration": "1.0.6" }, "url": "https://packages.unity.com" },