diff --git a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket.unity b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket.unity index 17e9c7c32..ceed08212 100644 --- a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket.unity +++ b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket.unity @@ -420,7 +420,7 @@ Light: serializedVersion: 2 m_Bits: 4294967295 m_RenderingLayerMask: 1 - m_Lightmapping: 2 + m_Lightmapping: 1 m_LightShadowCasterMode: 0 m_AreaSize: {x: 1, y: 1} m_BounceIntensity: 1 diff --git a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/LightingData.asset b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/LightingData.asset index cf678a381..8bfe79a1d 100644 Binary files a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/LightingData.asset and b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/LightingData.asset differ diff --git a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-0_comp_light.exr b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-0_comp_light.exr index f6b2b0865..04da4d692 100644 Binary files a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-0_comp_light.exr and b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-0_comp_light.exr differ diff --git a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-10_comp_light.exr b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-10_comp_light.exr index 7d8ce7f40..78c070428 100644 Binary files a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-10_comp_light.exr and b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-10_comp_light.exr differ diff --git a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-11_comp_light.exr b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-11_comp_light.exr index 65740c2e1..ea94ad2bc 100644 Binary files a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-11_comp_light.exr and b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-11_comp_light.exr differ diff --git a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-12_comp_light.exr b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-12_comp_light.exr index 2669b89db..3428b69da 100644 Binary files a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-12_comp_light.exr and b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-12_comp_light.exr differ diff --git a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-13_comp_light.exr b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-13_comp_light.exr index 0acaf4894..9e108a322 100644 Binary files a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-13_comp_light.exr and b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-13_comp_light.exr differ diff --git a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-14_comp_light.exr b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-14_comp_light.exr index c902e0337..7f9768189 100644 Binary files a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-14_comp_light.exr and b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-14_comp_light.exr differ diff --git a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-15_comp_light.exr b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-15_comp_light.exr index be0164e3f..b1a1c6581 100644 Binary files a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-15_comp_light.exr and b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-15_comp_light.exr differ diff --git a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-16_comp_light.exr b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-16_comp_light.exr index ba96c057b..9b74b6981 100644 Binary files a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-16_comp_light.exr and b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-16_comp_light.exr differ diff --git a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-17_comp_light.exr b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-17_comp_light.exr index 5b7c8bbff..a02f06e84 100644 Binary files a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-17_comp_light.exr and b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-17_comp_light.exr differ diff --git a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-18_comp_light.exr b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-18_comp_light.exr index 6dbd686dd..5ce93bbb5 100644 Binary files a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-18_comp_light.exr and b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-18_comp_light.exr differ diff --git a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-19_comp_light.exr b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-19_comp_light.exr index fc2c90539..0c3f1f735 100644 Binary files a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-19_comp_light.exr and b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-19_comp_light.exr differ diff --git a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-1_comp_light.exr b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-1_comp_light.exr index 6f998bb56..c8f6e456c 100644 Binary files a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-1_comp_light.exr and b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-1_comp_light.exr differ diff --git a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-20_comp_light.exr b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-20_comp_light.exr index 6dfaa5db6..4cd9a32dc 100644 Binary files a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-20_comp_light.exr and b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-20_comp_light.exr differ diff --git a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-21_comp_light.exr b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-21_comp_light.exr index c34b85a2b..09cae173f 100644 Binary files a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-21_comp_light.exr and b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-21_comp_light.exr differ diff --git a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-22_comp_light.exr b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-22_comp_light.exr index 996126c9c..39229633a 100644 Binary files a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-22_comp_light.exr and b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-22_comp_light.exr differ diff --git a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-23_comp_light.exr b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-23_comp_light.exr index 04baf736a..6b9629514 100644 Binary files a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-23_comp_light.exr and b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-23_comp_light.exr differ diff --git a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-24_comp_light.exr b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-24_comp_light.exr index 60e1e9273..64d094084 100644 Binary files a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-24_comp_light.exr and b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-24_comp_light.exr differ diff --git a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-25_comp_light.exr b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-25_comp_light.exr index 06de8a807..a004c687c 100644 Binary files a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-25_comp_light.exr and b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-25_comp_light.exr differ diff --git a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-26_comp_light.exr b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-26_comp_light.exr index 1cc648170..05aa639b7 100644 Binary files a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-26_comp_light.exr and b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-26_comp_light.exr differ diff --git a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-27_comp_light.exr b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-27_comp_light.exr index 4be259774..4e949cf03 100644 Binary files a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-27_comp_light.exr and b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-27_comp_light.exr differ diff --git a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-28_comp_light.exr b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-28_comp_light.exr index c547e3503..815ea8d4e 100644 Binary files a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-28_comp_light.exr and b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-28_comp_light.exr differ diff --git a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-29_comp_light.exr b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-29_comp_light.exr index 9171d2f92..ff9e663ab 100644 Binary files a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-29_comp_light.exr and b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-29_comp_light.exr differ diff --git a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-2_comp_light.exr b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-2_comp_light.exr index b0296b501..916fe8af2 100644 Binary files a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-2_comp_light.exr and b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-2_comp_light.exr differ diff --git a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-30_comp_light.exr b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-30_comp_light.exr index f00efb65f..b9d31e863 100644 Binary files a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-30_comp_light.exr and b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-30_comp_light.exr differ diff --git a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-31_comp_light.exr b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-31_comp_light.exr index 43f55f017..7be051674 100644 Binary files a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-31_comp_light.exr and b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-31_comp_light.exr differ diff --git a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-32_comp_light.exr b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-32_comp_light.exr index 46eb35290..2f4fef5cf 100644 Binary files a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-32_comp_light.exr and b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-32_comp_light.exr differ diff --git a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-33_comp_light.exr b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-33_comp_light.exr index ca2be5a0b..71eb4fe1b 100644 Binary files a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-33_comp_light.exr and b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-33_comp_light.exr differ diff --git a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-34_comp_light.exr b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-34_comp_light.exr index 95b73efd2..ebf9df968 100644 Binary files a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-34_comp_light.exr and b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-34_comp_light.exr differ diff --git a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-35_comp_light.exr b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-35_comp_light.exr deleted file mode 100644 index e93e0f6f4..000000000 Binary files a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-35_comp_light.exr and /dev/null differ diff --git a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-35_comp_light.exr.meta b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-35_comp_light.exr.meta deleted file mode 100644 index a7374f785..000000000 --- a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-35_comp_light.exr.meta +++ /dev/null @@ -1,117 +0,0 @@ -fileFormatVersion: 2 -guid: 3408ae6473a550f48a08286c75c0d0aa -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: 1 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 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 - 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/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-36_comp_light.exr b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-36_comp_light.exr deleted file mode 100644 index 4c2b89dbc..000000000 Binary files a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-36_comp_light.exr and /dev/null differ diff --git a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-36_comp_light.exr.meta b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-36_comp_light.exr.meta deleted file mode 100644 index 684bf0677..000000000 --- a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-36_comp_light.exr.meta +++ /dev/null @@ -1,117 +0,0 @@ -fileFormatVersion: 2 -guid: 22cdec5150ff6d24c8f8415c31e21b1b -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: 1 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 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 - 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/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-37_comp_light.exr b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-37_comp_light.exr deleted file mode 100644 index b93d1ce05..000000000 Binary files a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-37_comp_light.exr and /dev/null differ diff --git a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-37_comp_light.exr.meta b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-37_comp_light.exr.meta deleted file mode 100644 index 677b0d433..000000000 --- a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-37_comp_light.exr.meta +++ /dev/null @@ -1,117 +0,0 @@ -fileFormatVersion: 2 -guid: e99c87d8e2df3b741bdf5499e54e61d6 -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: 1 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 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 - 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/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-38_comp_light.exr b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-38_comp_light.exr deleted file mode 100644 index 78ed71802..000000000 Binary files a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-38_comp_light.exr and /dev/null differ diff --git a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-38_comp_light.exr.meta b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-38_comp_light.exr.meta deleted file mode 100644 index 24dbb5b5c..000000000 --- a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-38_comp_light.exr.meta +++ /dev/null @@ -1,117 +0,0 @@ -fileFormatVersion: 2 -guid: 7b6d0d81da0e2644a8b5178fafba07f9 -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: 1 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 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 - 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/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-39_comp_light.exr b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-39_comp_light.exr deleted file mode 100644 index bea38438b..000000000 Binary files a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-39_comp_light.exr and /dev/null differ diff --git a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-39_comp_light.exr.meta b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-39_comp_light.exr.meta deleted file mode 100644 index 568305682..000000000 --- a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-39_comp_light.exr.meta +++ /dev/null @@ -1,117 +0,0 @@ -fileFormatVersion: 2 -guid: 94af79482c683884d89ac2efce72c60e -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: 1 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 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 - 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/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-3_comp_light.exr b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-3_comp_light.exr index 3ef0c45d9..7d5726bbc 100644 Binary files a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-3_comp_light.exr and b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-3_comp_light.exr differ diff --git a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-40_comp_light.exr b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-40_comp_light.exr deleted file mode 100644 index 264186b37..000000000 Binary files a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-40_comp_light.exr and /dev/null differ diff --git a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-40_comp_light.exr.meta b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-40_comp_light.exr.meta deleted file mode 100644 index b6d71a323..000000000 --- a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-40_comp_light.exr.meta +++ /dev/null @@ -1,117 +0,0 @@ -fileFormatVersion: 2 -guid: 995aa4fd31aa9614f9332bcc1c72f2ea -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: 1 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 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 - 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/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-41_comp_light.exr b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-41_comp_light.exr deleted file mode 100644 index 35904cdf4..000000000 Binary files a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-41_comp_light.exr and /dev/null differ diff --git a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-41_comp_light.exr.meta b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-41_comp_light.exr.meta deleted file mode 100644 index 972a4b258..000000000 --- a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-41_comp_light.exr.meta +++ /dev/null @@ -1,117 +0,0 @@ -fileFormatVersion: 2 -guid: cc841cbda434c3246b4199e674c4721d -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: 1 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 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 - 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/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-42_comp_light.exr b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-42_comp_light.exr deleted file mode 100644 index 89ce4169e..000000000 Binary files a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-42_comp_light.exr and /dev/null differ diff --git a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-42_comp_light.exr.meta b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-42_comp_light.exr.meta deleted file mode 100644 index 3c8e2a636..000000000 --- a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-42_comp_light.exr.meta +++ /dev/null @@ -1,117 +0,0 @@ -fileFormatVersion: 2 -guid: e76dbec1113809347ab4257c35fa482d -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: 1 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 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 - 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/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-43_comp_light.exr b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-43_comp_light.exr deleted file mode 100644 index 211457ef0..000000000 Binary files a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-43_comp_light.exr and /dev/null differ diff --git a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-43_comp_light.exr.meta b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-43_comp_light.exr.meta deleted file mode 100644 index 60a1f63d9..000000000 --- a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-43_comp_light.exr.meta +++ /dev/null @@ -1,117 +0,0 @@ -fileFormatVersion: 2 -guid: 65ac7279bd66736489d909326438751e -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: 1 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 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 - 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/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-44_comp_light.exr b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-44_comp_light.exr deleted file mode 100644 index 50f3bd77e..000000000 Binary files a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-44_comp_light.exr and /dev/null differ diff --git a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-44_comp_light.exr.meta b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-44_comp_light.exr.meta deleted file mode 100644 index a5e5c1275..000000000 --- a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-44_comp_light.exr.meta +++ /dev/null @@ -1,117 +0,0 @@ -fileFormatVersion: 2 -guid: c6134073a5343294ea1a70933413d591 -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: 1 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 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 - 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/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-45_comp_light.exr b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-45_comp_light.exr deleted file mode 100644 index 9eab4631b..000000000 Binary files a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-45_comp_light.exr and /dev/null differ diff --git a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-45_comp_light.exr.meta b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-45_comp_light.exr.meta deleted file mode 100644 index b8630820d..000000000 --- a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-45_comp_light.exr.meta +++ /dev/null @@ -1,117 +0,0 @@ -fileFormatVersion: 2 -guid: dbbd17caebdb17c4cbec0dcc39b8e35c -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: 1 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 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 - 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/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-46_comp_light.exr b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-46_comp_light.exr deleted file mode 100644 index b440a7c28..000000000 Binary files a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-46_comp_light.exr and /dev/null differ diff --git a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-46_comp_light.exr.meta b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-46_comp_light.exr.meta deleted file mode 100644 index 84f6c3684..000000000 --- a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-46_comp_light.exr.meta +++ /dev/null @@ -1,117 +0,0 @@ -fileFormatVersion: 2 -guid: 062c624b661f3184d894199c00a1cab0 -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: 1 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 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 - 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/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-47_comp_light.exr b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-47_comp_light.exr deleted file mode 100644 index 060775433..000000000 Binary files a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-47_comp_light.exr and /dev/null differ diff --git a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-47_comp_light.exr.meta b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-47_comp_light.exr.meta deleted file mode 100644 index f24e26096..000000000 --- a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-47_comp_light.exr.meta +++ /dev/null @@ -1,117 +0,0 @@ -fileFormatVersion: 2 -guid: 5740471526f61d34a9e39d0464d72043 -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: 1 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 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 - 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/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-48_comp_light.exr b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-48_comp_light.exr deleted file mode 100644 index 39006291f..000000000 Binary files a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-48_comp_light.exr and /dev/null differ diff --git a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-48_comp_light.exr.meta b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-48_comp_light.exr.meta deleted file mode 100644 index a55650a25..000000000 --- a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-48_comp_light.exr.meta +++ /dev/null @@ -1,117 +0,0 @@ -fileFormatVersion: 2 -guid: 445c6eff0fa06e84ebb6658b169a8290 -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: 1 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 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 - 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/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-49_comp_light.exr b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-49_comp_light.exr deleted file mode 100644 index add83d290..000000000 Binary files a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-49_comp_light.exr and /dev/null differ diff --git a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-49_comp_light.exr.meta b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-49_comp_light.exr.meta deleted file mode 100644 index 4663ed45c..000000000 --- a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-49_comp_light.exr.meta +++ /dev/null @@ -1,117 +0,0 @@ -fileFormatVersion: 2 -guid: da7d06f6c7ee94e47acc56495b47ce4d -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: 1 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 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 - 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/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-4_comp_light.exr b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-4_comp_light.exr index 2aa0d3e09..af7374347 100644 Binary files a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-4_comp_light.exr and b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-4_comp_light.exr differ diff --git a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-5_comp_light.exr b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-5_comp_light.exr index 1e71b4cfa..73e62aca2 100644 Binary files a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-5_comp_light.exr and b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-5_comp_light.exr differ diff --git a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-6_comp_light.exr b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-6_comp_light.exr index dd8e98262..dc1fcc686 100644 Binary files a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-6_comp_light.exr and b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-6_comp_light.exr differ diff --git a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-7_comp_light.exr b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-7_comp_light.exr index 49fdc84b9..faec26ee2 100644 Binary files a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-7_comp_light.exr and b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-7_comp_light.exr differ diff --git a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-8_comp_light.exr b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-8_comp_light.exr index 59260df5f..2fa2ffc72 100644 Binary files a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-8_comp_light.exr and b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-8_comp_light.exr differ diff --git a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-9_comp_light.exr b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-9_comp_light.exr index 8eaea8534..282a50e43 100644 Binary files a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-9_comp_light.exr and b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/Lightmap-9_comp_light.exr differ diff --git a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/ReflectionProbe-0.exr b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/ReflectionProbe-0.exr index f38e70227..c8a332a00 100644 Binary files a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/ReflectionProbe-0.exr and b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket/ReflectionProbe-0.exr differ diff --git a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/MainMenu.unity b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/MainMenu.unity index 8789b718e..c6fe04f46 100644 --- a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/MainMenu.unity +++ b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/MainMenu.unity @@ -718,8 +718,8 @@ Light: m_Enabled: 1 serializedVersion: 11 m_Type: 1 - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_Intensity: 1 + m_Color: {r: 1, g: 0.9092675, b: 0.65723264, a: 1} + m_Intensity: 2 m_Range: 10 m_SpotAngle: 30 m_InnerSpotAngle: 21.80208 diff --git a/Basic/DistributedAuthoritySocialHub/Assets/Settings/Mobile_RPAsset.asset b/Basic/DistributedAuthoritySocialHub/Assets/Settings/Mobile_RPAsset.asset index 0fdefd13e..29cdf6fe8 100644 --- a/Basic/DistributedAuthoritySocialHub/Assets/Settings/Mobile_RPAsset.asset +++ b/Basic/DistributedAuthoritySocialHub/Assets/Settings/Mobile_RPAsset.asset @@ -19,8 +19,8 @@ MonoBehaviour: m_RendererDataList: - {fileID: 11400000, guid: 65bc7dbf4170f435aa868c779acfb082, type: 2} m_DefaultRendererIndex: 0 - m_RequireDepthTexture: 0 - m_RequireOpaqueTexture: 0 + m_RequireDepthTexture: 1 + m_RequireOpaqueTexture: 1 m_OpaqueDownsampling: 0 m_SupportsTerrainHoles: 1 m_SupportsHDR: 1 @@ -54,15 +54,15 @@ MonoBehaviour: m_ReflectionProbeBlending: 1 m_ReflectionProbeBoxProjection: 1 m_ShadowDistance: 50 - m_ShadowCascadeCount: 1 + m_ShadowCascadeCount: 4 m_Cascade2Split: 0.25 m_Cascade3Split: {x: 0.1, y: 0.3} - m_Cascade4Split: {x: 0.067, y: 0.2, z: 0.467} - m_CascadeBorder: 0.2 - m_ShadowDepthBias: 1 - m_ShadowNormalBias: 1 + m_Cascade4Split: {x: 0.12299999, y: 0.2926, z: 0.53599995} + m_CascadeBorder: 0.107758604 + m_ShadowDepthBias: 0.1 + m_ShadowNormalBias: 0.5 m_AnyShadowsSupported: 1 - m_SoftShadowsSupported: 0 + m_SoftShadowsSupported: 1 m_ConservativeEnclosingSphere: 1 m_NumIterationsEnclosingSphere: 64 m_SoftShadowQuality: 2 @@ -78,11 +78,11 @@ MonoBehaviour: m_UseAdaptivePerformance: 1 m_ColorGradingMode: 0 m_ColorGradingLutSize: 32 + m_AllowPostProcessAlphaOutput: 0 m_UseFastSRGBLinearConversion: 1 m_SupportDataDrivenLensFlare: 1 m_SupportScreenSpaceLensFlare: 1 m_GPUResidentDrawerMode: 0 - m_UseLegacyLightmaps: 0 m_SmallMeshScreenPercentage: 0 m_GPUResidentDrawerEnableOcclusionCullingInCameras: 0 m_ShadowType: 1 @@ -100,23 +100,24 @@ MonoBehaviour: m_Keys: [] m_Values: m_PrefilteringModeMainLightShadows: 3 - m_PrefilteringModeAdditionalLight: 4 + m_PrefilteringModeAdditionalLight: 0 m_PrefilteringModeAdditionalLightShadows: 0 m_PrefilterXRKeywords: 1 - m_PrefilteringModeForwardPlus: 1 + m_PrefilteringModeForwardPlus: 2 m_PrefilteringModeDeferredRendering: 0 m_PrefilteringModeScreenSpaceOcclusion: 0 m_PrefilterDebugKeywords: 1 m_PrefilterWriteRenderingLayers: 1 m_PrefilterHDROutput: 1 + m_PrefilterAlphaOutput: 1 m_PrefilterSSAODepthNormals: 1 m_PrefilterSSAOSourceDepthLow: 1 - m_PrefilterSSAOSourceDepthMedium: 0 + m_PrefilterSSAOSourceDepthMedium: 1 m_PrefilterSSAOSourceDepthHigh: 1 - m_PrefilterSSAOInterleaved: 0 + m_PrefilterSSAOInterleaved: 1 m_PrefilterSSAOBlueNoise: 1 m_PrefilterSSAOSampleCountLow: 1 - m_PrefilterSSAOSampleCountMedium: 0 + m_PrefilterSSAOSampleCountMedium: 1 m_PrefilterSSAOSampleCountHigh: 1 m_PrefilterDBufferMRT1: 1 m_PrefilterDBufferMRT2: 1 diff --git a/Basic/DistributedAuthoritySocialHub/Assets/Settings/PC_RPAsset.asset b/Basic/DistributedAuthoritySocialHub/Assets/Settings/PC_RPAsset.asset index 2f6c5ab0a..f016cb0f4 100644 --- a/Basic/DistributedAuthoritySocialHub/Assets/Settings/PC_RPAsset.asset +++ b/Basic/DistributedAuthoritySocialHub/Assets/Settings/PC_RPAsset.asset @@ -100,16 +100,16 @@ MonoBehaviour: m_Keys: [] m_Values: m_PrefilteringModeMainLightShadows: 3 - m_PrefilteringModeAdditionalLight: 4 - m_PrefilteringModeAdditionalLightShadows: 0 + m_PrefilteringModeAdditionalLight: 0 + m_PrefilteringModeAdditionalLightShadows: 2 m_PrefilterXRKeywords: 1 - m_PrefilteringModeForwardPlus: 1 + m_PrefilteringModeForwardPlus: 2 m_PrefilteringModeDeferredRendering: 0 - m_PrefilteringModeScreenSpaceOcclusion: 1 + m_PrefilteringModeScreenSpaceOcclusion: 2 m_PrefilterDebugKeywords: 1 - m_PrefilterWriteRenderingLayers: 0 + m_PrefilterWriteRenderingLayers: 1 m_PrefilterHDROutput: 1 - m_PrefilterAlphaOutput: 0 + m_PrefilterAlphaOutput: 1 m_PrefilterSSAODepthNormals: 0 m_PrefilterSSAOSourceDepthLow: 1 m_PrefilterSSAOSourceDepthMedium: 1 @@ -121,10 +121,10 @@ MonoBehaviour: m_PrefilterSSAOSampleCountHigh: 1 m_PrefilterDBufferMRT1: 1 m_PrefilterDBufferMRT2: 1 - m_PrefilterDBufferMRT3: 0 - m_PrefilterSoftShadowsQualityLow: 0 - m_PrefilterSoftShadowsQualityMedium: 0 - m_PrefilterSoftShadowsQualityHigh: 0 + m_PrefilterDBufferMRT3: 1 + m_PrefilterSoftShadowsQualityLow: 1 + m_PrefilterSoftShadowsQualityMedium: 1 + m_PrefilterSoftShadowsQualityHigh: 1 m_PrefilterSoftShadows: 0 m_PrefilterScreenCoord: 1 m_PrefilterNativeRenderPass: 1 diff --git a/Basic/DistributedAuthoritySocialHub/Assets/Shaders/CustomHLSL/CustomLighting.hlsl b/Basic/DistributedAuthoritySocialHub/Assets/Shaders/CustomHLSL/CustomLighting.hlsl index 843a4e936..e74b60d85 100644 --- a/Basic/DistributedAuthoritySocialHub/Assets/Shaders/CustomHLSL/CustomLighting.hlsl +++ b/Basic/DistributedAuthoritySocialHub/Assets/Shaders/CustomHLSL/CustomLighting.hlsl @@ -1,18 +1,18 @@ -#ifndef CUSTOM_LIGHTING_INCLUDED +#ifndef CUSTOM_LIGHTING_INCLUDED #define CUSTOM_LIGHTING_INCLUDED -#if defined(SHADERGRAPH_PREVIEW) -#else -#pragma multi_compile _ _MAIN_LIGHT_SHADOWS -#pragma multi_compile _ _MAIN_LIGHT_SHADOWS_CASCADE -#pragma multi_compile _ _ADDITIONAL_LIGHTS_VERTEX _ADDITIONAL_LIGHTS -#pragma multi_compile_fragment _ _ADDITIONAL_LIGHT_SHADOWS -#pragma multi_compile_fragment _ _SHADOWS_SOFT -#pragma multi_compile _ SHADOWS_SHADOWMASK -#pragma multi_compile_fragment _ _SCREEN_SPACE_OCCLUSION -#pragma multi_compile _ LIGHTMAP_ON -#pragma multi_compile _ LIGHTMAP_SHADOW_MIXING -#endif +//#if defined(SHADERGRAPH_PREVIEW) +//#else +//#pragma multi_compile _ _MAIN_LIGHT_SHADOWS +//#pragma multi_compile _ _MAIN_LIGHT_SHADOWS_CASCADE +//#pragma multi_compile _ _ADDITIONAL_LIGHTS_VERTEX _ADDITIONAL_LIGHTS +//#pragma multi_compile_fragment _ _ADDITIONAL_LIGHT_SHADOWS +//#pragma multi_compile_fragment _ _SHADOWS_SOFT +//#pragma multi_compile _ SHADOWS_SHADOWMASK +//#pragma multi_compile_fragment _ _SCREEN_SPACE_OCCLUSION +//#pragma multi_compile _ LIGHTMAP_ON +//#pragma multi_compile _ LIGHTMAP_SHADOW_MIXING +//#endif void MainLight_float(float3 WorldPos, out float3 Direction, out float3 Color, out float ShadowAtten) { @@ -27,15 +27,17 @@ void MainLight_float(float3 WorldPos, out float3 Direction, out float3 Color, ou Direction = mainLight.direction; Color = mainLight.color; - #if !defined(_MAIN_LIGHT_SHADOWS) || defined(_RECEIVE_SHADOWS_OFF) - ShadowAtten = 1.0h; - #else - ShadowSamplingData shadowSamplingData = GetMainLightShadowSamplingData(); - float shadowStrength = GetMainLightShadowStrength(); - ShadowAtten = SampleShadowmap(shadowCoord, TEXTURE2D_ARGS(_MainLightShadowmapTexture, - sampler_MainLightShadowmapTexture), - shadowSamplingData, shadowStrength, false); - #endif + //#if !defined(_MAIN_LIGHT_SHADOWS) || defined(_RECEIVE_SHADOWS_OFF) + // ShadowAtten = 1.0h; + //#else + //ShadowSamplingData shadowSamplingData = GetMainLightShadowSamplingData(); + //float shadowStrength = GetMainLightShadowStrength(); + //ShadowAtten = SampleShadowmap(shadowCoord, TEXTURE2D_ARGS(_MainLightShadowmapTexture, + //sampler_MainLightShadowmapTexture), + //shadowSamplingData, shadowStrength, false); + + ShadowAtten = mainLight.shadowAttenuation; + //#endif #endif } diff --git a/Basic/DistributedAuthoritySocialHub/Assets/Shaders/SubGraphs/ToonLightingModel.shadersubgraph b/Basic/DistributedAuthoritySocialHub/Assets/Shaders/SubGraphs/ToonLightingModel.shadersubgraph index ef6067f14..9b3116c63 100644 --- a/Basic/DistributedAuthoritySocialHub/Assets/Shaders/SubGraphs/ToonLightingModel.shadersubgraph +++ b/Basic/DistributedAuthoritySocialHub/Assets/Shaders/SubGraphs/ToonLightingModel.shadersubgraph @@ -10,18 +10,6 @@ "m_Keywords": [ { "m_Id": "eb2cc880a42142209fc9fb57647f9f96" - }, - { - "m_Id": "cb0430fd9fd74674ada9f5e6f80299cd" - }, - { - "m_Id": "5da3a8ad712446cd943834d7dc41e38e" - }, - { - "m_Id": "48e56da6d59847eebf14fdad544e0ac3" - }, - { - "m_Id": "af8179c6fb6444d1ab8a7902f7af29b5" } ], "m_Dropdowns": [], @@ -76,9 +64,6 @@ { "m_Id": "2fc8dd439fd7af858bca45c02f8205e5" }, - { - "m_Id": "0458efac5733c08fac8ebb6d98c10400" - }, { "m_Id": "39b5e9ab1a693f8a8b5f8780b4557a5a" }, @@ -144,6 +129,15 @@ }, { "m_Id": "fd8ab183c80748ac8fb98187fb91413f" + }, + { + "m_Id": "f1a70586cdf343f29f9ef074c481bd5c" + }, + { + "m_Id": "0c961880d00246039b2fb242b82f46eb" + }, + { + "m_Id": "7d4dd8f8318242338626c6d97db54b45" } ], "m_GroupDatas": [ @@ -180,13 +174,13 @@ { "m_OutputSlot": { "m_Node": { - "m_Id": "0458efac5733c08fac8ebb6d98c10400" + "m_Id": "0c961880d00246039b2fb242b82f46eb" }, "m_SlotId": 0 }, "m_InputSlot": { "m_Node": { - "m_Id": "f731d57ebb3d1780ba5b19b6ef6f9cb2" + "m_Id": "f1a70586cdf343f29f9ef074c481bd5c" }, "m_SlotId": 1 } @@ -345,6 +339,20 @@ "m_SlotId": 0 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "1f285f55a33149399f793ddb48e62d03" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "e4d4adecce41473a9c0ee6224e1f63c7" + }, + "m_SlotId": 0 + } + }, { "m_OutputSlot": { "m_Node": { @@ -572,27 +580,27 @@ { "m_OutputSlot": { "m_Node": { - "m_Id": "6bf52d7bc2bd4cf290939534fa1bb45f" + "m_Id": "7c9b48a7843fb785bba97968ec6f351c" }, - "m_SlotId": 2 + "m_SlotId": 0 }, "m_InputSlot": { "m_Node": { - "m_Id": "e4d4adecce41473a9c0ee6224e1f63c7" + "m_Id": "188c26489abaaa848b60159cd31736e6" }, - "m_SlotId": 0 + "m_SlotId": 1 } }, { "m_OutputSlot": { "m_Node": { - "m_Id": "7c9b48a7843fb785bba97968ec6f351c" + "m_Id": "7d4dd8f8318242338626c6d97db54b45" }, - "m_SlotId": 0 + "m_SlotId": 2 }, "m_InputSlot": { "m_Node": { - "m_Id": "188c26489abaaa848b60159cd31736e6" + "m_Id": "f731d57ebb3d1780ba5b19b6ef6f9cb2" }, "m_SlotId": 1 } @@ -676,9 +684,9 @@ }, "m_InputSlot": { "m_Node": { - "m_Id": "0458efac5733c08fac8ebb6d98c10400" + "m_Id": "f1a70586cdf343f29f9ef074c481bd5c" }, - "m_SlotId": 1 + "m_SlotId": 0 } }, { @@ -760,9 +768,9 @@ }, "m_InputSlot": { "m_Node": { - "m_Id": "0458efac5733c08fac8ebb6d98c10400" + "m_Id": "7d4dd8f8318242338626c6d97db54b45" }, - "m_SlotId": 2 + "m_SlotId": 1 } }, { @@ -779,6 +787,20 @@ "m_SlotId": 0 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "f1a70586cdf343f29f9ef074c481bd5c" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "7d4dd8f8318242338626c6d97db54b45" + }, + "m_SlotId": 0 + } + }, { "m_OutputSlot": { "m_Node": { @@ -914,56 +936,14 @@ ] } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.KeywordNode", - "m_ObjectId": "0458efac5733c08fac8ebb6d98c10400", - "m_Group": { - "m_Id": "" - }, - "m_Name": "LIGHTMAP2", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": 934.9998779296875, - "y": -155.99998474121095, - "width": 144.0, - "height": 117.99999237060547 - } - }, - "m_Slots": [ - { - "m_Id": "de6948b2e5bccf86bc3f9131e42b20a4" - }, - { - "m_Id": "50b2db238a0c8988a2dd0d11d02ca821" - }, - { - "m_Id": "be27700cfb321f8ca676aec89987d707" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": false, - "m_DismissedVersion": 0, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_Keyword": { - "m_Id": "eb2cc880a42142209fc9fb57647f9f96" - } -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.GroupData", "m_ObjectId": "06d92e7d723f410aaf10a0968386d371", "m_Title": "Lightmap ramping", "m_Position": { - "x": -589.999755859375, - "y": -1830.4000244140625 + "x": -590.0, + "y": -1830.66650390625 } } @@ -1018,6 +998,49 @@ ] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1Node", + "m_ObjectId": "0c961880d00246039b2fb242b82f46eb", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Float", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 826.6666870117188, + "y": -507.3333435058594, + "width": 127.33331298828125, + "height": 78.66665649414063 + } + }, + "m_Slots": [ + { + "m_Id": "40cd57eab13f442487dc1c69f1402ae2" + }, + { + "m_Id": "8dc1d635fe094fbfb19a1bac0eeae0ae" + } + ], + "synonyms": [ + "Vector 1", + "1", + "v1", + "vec1", + "scalar" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Value": 0.0 +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -1636,8 +1659,8 @@ "m_ObjectId": "2500228f56d14826a7f7e32e67cf0fce", "m_Title": "Main Light", "m_Position": { - "x": -1079.999755859375, - "y": -175.199951171875 + "x": -1080.0, + "y": -175.3333740234375 } } @@ -1911,8 +1934,8 @@ "b": 0.0, "a": 0.0 }, - "ctime0": 11750, - "ctime1": 13504, + "ctime0": 11731, + "ctime1": 13500, "ctime2": 65535, "ctime3": 0, "ctime4": 0, @@ -2005,6 +2028,54 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "2fad0aed10f9474d9063bfebe3eedead", + "m_Id": 0, + "m_DisplayName": "A", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 3, + "m_Value": { + "e00": 0.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 0.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 0.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 0.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.BakedGINode", @@ -2017,10 +2088,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1696.5714111328125, - "y": -2383.4287109375, - "width": 186.28578186035157, - "height": 184.0 + "x": -1645.3333740234375, + "y": -2321.999755859375, + "width": 184.0, + "height": 186.66650390625 } }, "m_Slots": [ @@ -2232,10 +2303,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -139.428466796875, - "y": 454.8571472167969, - "width": 131.42857360839845, - "height": 93.7142562866211 + "x": -203.33331298828126, + "y": 454.6666564941406, + "width": 209.33331298828126, + "height": 279.9999694824219 } }, "m_Slots": [ @@ -2248,7 +2319,7 @@ ], "synonyms": [], "m_Precision": 0, - "m_PreviewExpanded": false, + "m_PreviewExpanded": true, "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { @@ -2424,6 +2495,21 @@ "m_Value": 0.0 } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "40cd57eab13f442487dc1c69f1402ae2", + "m_Id": 1, + "m_DisplayName": "X", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "X", + "m_StageCapability": 3, + "m_Value": 3.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -2637,31 +2723,6 @@ } } -{ - "m_SGVersion": 1, - "m_Type": "UnityEditor.ShaderGraph.ShaderKeyword", - "m_ObjectId": "48e56da6d59847eebf14fdad544e0ac3", - "m_Guid": { - "m_GuidSerialized": "0fc68e1c-7057-4268-af4a-8f9c6d5e1fa0" - }, - "m_Name": "_SHADOWS_SOFT", - "m_DefaultRefNameVersion": 0, - "m_RefNameGeneratedByDisplayName": "", - "m_DefaultReferenceName": "BOOLEAN_F6073402_ON", - "m_OverrideReferenceName": "_SHADOWS_SOFT", - "m_GeneratePropertyBlock": false, - "m_UseCustomSlotLabel": false, - "m_CustomSlotLabel": "", - "m_DismissedVersion": 0, - "m_KeywordType": 0, - "m_KeywordDefinition": 0, - "m_KeywordScope": 1, - "m_KeywordStages": 63, - "m_Entries": [], - "m_Value": 1, - "m_IsEditable": true -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.ColorspaceConversionNode", @@ -2755,30 +2816,6 @@ "m_Labels": [] } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", - "m_ObjectId": "50b2db238a0c8988a2dd0d11d02ca821", - "m_Id": 1, - "m_DisplayName": "On", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "On", - "m_StageCapability": 3, - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - } -} - { "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", @@ -3207,31 +3244,6 @@ } } -{ - "m_SGVersion": 1, - "m_Type": "UnityEditor.ShaderGraph.ShaderKeyword", - "m_ObjectId": "5da3a8ad712446cd943834d7dc41e38e", - "m_Guid": { - "m_GuidSerialized": "72cfd800-a792-4d30-809b-ae73d94dc421" - }, - "m_Name": "_MAIN_LIGHT_SHADOWS_CASCADE", - "m_DefaultRefNameVersion": 0, - "m_RefNameGeneratedByDisplayName": "", - "m_DefaultReferenceName": "BOOLEAN_5E740DA9_ON", - "m_OverrideReferenceName": "_MAIN_LIGHT_SHADOWS_CASCADE", - "m_GeneratePropertyBlock": false, - "m_UseCustomSlotLabel": false, - "m_CustomSlotLabel": "", - "m_DismissedVersion": 0, - "m_KeywordType": 0, - "m_KeywordDefinition": 0, - "m_KeywordScope": 1, - "m_KeywordStages": 63, - "m_Entries": [], - "m_Value": 1, - "m_IsEditable": true -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -3329,10 +3341,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 608.0, - "y": -12.79998779296875, - "width": 130.4000244140625, - "height": 117.59999084472656 + "x": 528.6666870117188, + "y": 56.0, + "width": 209.33331298828126, + "height": 304.0000305175781 } }, "m_Slots": [ @@ -3348,7 +3360,7 @@ ], "synonyms": [], "m_Precision": 0, - "m_PreviewExpanded": false, + "m_PreviewExpanded": true, "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { @@ -3425,17 +3437,65 @@ } { - "m_SGVersion": 1, - "m_Type": "UnityEditor.ShaderGraph.PositionNode", - "m_ObjectId": "7c9b48a7843fb785bba97968ec6f351c", - "m_Group": { - "m_Id": "dc68886e50b149f88f16295bbc59eb59" - }, - "m_Name": "Position", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "766df52f56804f3ca60447b5f2d72fd8", + "m_Id": 1, + "m_DisplayName": "B", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 3, + "m_Value": { + "e00": 2.0, + "e01": 2.0, + "e02": 2.0, + "e03": 2.0, + "e10": 2.0, + "e11": 2.0, + "e12": 2.0, + "e13": 2.0, + "e20": 2.0, + "e21": 2.0, + "e22": 2.0, + "e23": 2.0, + "e30": 2.0, + "e31": 2.0, + "e32": 2.0, + "e33": 2.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.ShaderGraph.PositionNode", + "m_ObjectId": "7c9b48a7843fb785bba97968ec6f351c", + "m_Group": { + "m_Id": "dc68886e50b149f88f16295bbc59eb59" + }, + "m_Name": "Position", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", "x": -1171.0, "y": -982.9999389648438, "width": 206.0, @@ -3459,6 +3519,49 @@ "m_PositionSource": 0 } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.MultiplyNode", + "m_ObjectId": "7d4dd8f8318242338626c6d97db54b45", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Multiply", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 1555.9998779296875, + "y": -248.0, + "width": 209.3333740234375, + "height": 303.9999694824219 + } + }, + "m_Slots": [ + { + "m_Id": "2fad0aed10f9474d9063bfebe3eedead" + }, + { + "m_Id": "766df52f56804f3ca60447b5f2d72fd8" + }, + { + "m_Id": "e32a154e2ef448e7b9b68159e2e12df1" + } + ], + "synonyms": [ + "multiplication", + "times", + "x" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", @@ -3737,7 +3840,7 @@ ], "synonyms": [], "m_Precision": 0, - "m_PreviewExpanded": false, + "m_PreviewExpanded": true, "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { @@ -3838,6 +3941,21 @@ ] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "8dc1d635fe094fbfb19a1bac0eeae0ae", + "m_Id": 0, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -3971,8 +4089,8 @@ "m_ObjectId": "9629946bb6024424b2df457d6745aaa1", "m_Title": "Main light ramping", "m_Position": { - "x": -339.199951171875, - "y": -140.4000244140625 + "x": -339.333251953125, + "y": -140.66668701171876 } } @@ -4030,8 +4148,8 @@ "m_ObjectId": "971527164602421988b2e492128913f0", "m_Title": "No probes fallback", "m_Position": { - "x": -164.7998046875, - "y": 396.4000244140625 + "x": -228.66661071777345, + "y": 395.9998779296875 } } @@ -4198,8 +4316,8 @@ "m_ObjectId": "a33f8a99d9ec4d7f83fa6f9068a20939", "m_Title": "Light Probes contribution", "m_Position": { - "x": -729.19970703125, - "y": 190.800048828125 + "x": -729.3333129882813, + "y": 190.66668701171876 } } @@ -4238,7 +4356,7 @@ "m_Hidden": false, "m_ShaderOutputName": "X", "m_StageCapability": 3, - "m_Value": 3.0, + "m_Value": 0.0, "m_DefaultValue": 0.0, "m_Labels": [ "X" @@ -4362,31 +4480,6 @@ } } -{ - "m_SGVersion": 1, - "m_Type": "UnityEditor.ShaderGraph.ShaderKeyword", - "m_ObjectId": "af8179c6fb6444d1ab8a7902f7af29b5", - "m_Guid": { - "m_GuidSerialized": "a49ffee7-615b-439e-919e-e08aab76452a" - }, - "m_Name": "_ADDITIONAL_LIGHT_SHADOWS", - "m_DefaultRefNameVersion": 0, - "m_RefNameGeneratedByDisplayName": "", - "m_DefaultReferenceName": "BOOLEAN_5E705385_ON", - "m_OverrideReferenceName": "_ADDITIONAL_LIGHT_SHADOWS", - "m_GeneratePropertyBlock": false, - "m_UseCustomSlotLabel": false, - "m_CustomSlotLabel": "", - "m_DismissedVersion": 0, - "m_KeywordType": 0, - "m_KeywordDefinition": 0, - "m_KeywordScope": 1, - "m_KeywordStages": 63, - "m_Entries": [], - "m_Value": 1, - "m_IsEditable": true -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -4504,18 +4597,6 @@ }, { "m_Id": "eb2cc880a42142209fc9fb57647f9f96" - }, - { - "m_Id": "cb0430fd9fd74674ada9f5e6f80299cd" - }, - { - "m_Id": "5da3a8ad712446cd943834d7dc41e38e" - }, - { - "m_Id": "48e56da6d59847eebf14fdad544e0ac3" - }, - { - "m_Id": "af8179c6fb6444d1ab8a7902f7af29b5" } ] } @@ -4550,8 +4631,8 @@ "m_ObjectId": "bc6063cec21744b9a88dfd8f9c3d3a72", "m_Title": "Direct Specular", "m_Position": { - "x": 434.800048828125, - "y": 959.5997314453125 + "x": 434.6666259765625, + "y": 959.333251953125 } } @@ -4580,30 +4661,6 @@ "m_Labels": [] } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", - "m_ObjectId": "be27700cfb321f8ca676aec89987d707", - "m_Id": 2, - "m_DisplayName": "Off", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "Off", - "m_StageCapability": 3, - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - } -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", @@ -4739,10 +4796,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 591.0, - "y": -933.0, - "width": 130.0, - "height": 118.0 + "x": 581.333251953125, + "y": -922.6665649414063, + "width": 209.3333740234375, + "height": 303.99993896484377 } }, "m_Slots": [ @@ -4758,7 +4815,7 @@ ], "synonyms": [], "m_Precision": 0, - "m_PreviewExpanded": false, + "m_PreviewExpanded": true, "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { @@ -4839,8 +4896,8 @@ "m_ObjectId": "ca3eb4888ee747deb5c92a5e322633d3", "m_Title": "Subtractive shadows ramping", "m_Position": { - "x": -675.999755859375, - "y": -718.39990234375 + "x": -676.0, + "y": -718.6666870117188 } } @@ -4865,36 +4922,11 @@ "m_ObjectId": "ca716526107d46478678fa90dff24e6e", "m_Title": "Main Light colour", "m_Position": { - "x": -57.99974822998047, - "y": -355.199951171875 + "x": -57.99998474121094, + "y": -355.3333435058594 } } -{ - "m_SGVersion": 1, - "m_Type": "UnityEditor.ShaderGraph.ShaderKeyword", - "m_ObjectId": "cb0430fd9fd74674ada9f5e6f80299cd", - "m_Guid": { - "m_GuidSerialized": "08c18a75-3044-4886-902c-4a896e7df4c5" - }, - "m_Name": "_MAIN_LIGHT_SHADOWS", - "m_DefaultRefNameVersion": 0, - "m_RefNameGeneratedByDisplayName": "", - "m_DefaultReferenceName": "BOOLEAN_8B1E63E0_ON", - "m_OverrideReferenceName": "_MAIN_LIGHT_SHADOWS", - "m_GeneratePropertyBlock": false, - "m_UseCustomSlotLabel": false, - "m_CustomSlotLabel": "", - "m_DismissedVersion": 0, - "m_KeywordType": 0, - "m_KeywordDefinition": 0, - "m_KeywordScope": 1, - "m_KeywordStages": 63, - "m_Entries": [], - "m_Value": 1, - "m_IsEditable": true -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.UVMaterialSlot", @@ -5110,10 +5142,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -443.9999084472656, - "y": 287.4285583496094, - "width": 129.14285278320313, - "height": 118.28573608398438 + "x": -487.3333435058594, + "y": 276.0, + "width": 209.33334350585938, + "height": 304.0 } }, "m_Slots": [ @@ -5129,7 +5161,7 @@ ], "synonyms": [], "m_Precision": 0, - "m_PreviewExpanded": false, + "m_PreviewExpanded": true, "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { @@ -5168,7 +5200,7 @@ ], "synonyms": [], "m_Precision": 0, - "m_PreviewExpanded": false, + "m_PreviewExpanded": true, "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { @@ -5342,7 +5374,7 @@ "m_Title": "Distance-based shadow attenuation", "m_Position": { "x": -1196.0, - "y": -1133.1998291015625 + "y": -1133.3333740234375 } } @@ -5394,30 +5426,6 @@ } } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", - "m_ObjectId": "de6948b2e5bccf86bc3f9131e42b20a4", - "m_Id": 0, - "m_DisplayName": "LIGHTMAP2", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "Out", - "m_StageCapability": 3, - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - } -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.BakedGINode", @@ -5464,6 +5472,54 @@ "m_ApplyScaling": true } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "e32a154e2ef448e7b9b68159e2e12df1", + "m_Id": 2, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "e00": 0.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 0.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 0.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 0.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -5500,10 +5556,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 748.0, - "y": -12.79998779296875, - "width": 132.79998779296876, - "height": 94.39999389648438 + "x": 868.6666259765625, + "y": 31.33332061767578, + "width": 133.33331298828126, + "height": 95.99999237060547 } }, "m_Slots": [ @@ -5629,6 +5685,54 @@ "m_Channel": 2 } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "ea1ad6b5b43a4d4fa0f7added71650df", + "m_Id": 2, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "e00": 0.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 0.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 0.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 0.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + { "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.ShaderKeyword", @@ -5671,6 +5775,54 @@ ] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "ef2d7e02f4ec4b288b33f9a32e169b6f", + "m_Id": 0, + "m_DisplayName": "A", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 3, + "m_Value": { + "e00": 0.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 0.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 0.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 0.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.CombineNode", @@ -5747,6 +5899,49 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.MultiplyNode", + "m_ObjectId": "f1a70586cdf343f29f9ef074c481bd5c", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Multiply", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 986.6666259765625, + "y": -618.6666259765625, + "width": 209.333251953125, + "height": 303.99993896484377 + } + }, + "m_Slots": [ + { + "m_Id": "ef2d7e02f4ec4b288b33f9a32e169b6f" + }, + { + "m_Id": "fbf57ded126f46deb85866b1775f7c95" + }, + { + "m_Id": "ea1ad6b5b43a4d4fa0f7added71650df" + } + ], + "synonyms": [ + "multiplication", + "times", + "x" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", @@ -5890,6 +6085,54 @@ ] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "fbf57ded126f46deb85866b1775f7c95", + "m_Id": 1, + "m_DisplayName": "B", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 3, + "m_Value": { + "e00": 2.0, + "e01": 2.0, + "e02": 2.0, + "e03": 2.0, + "e10": 2.0, + "e11": 2.0, + "e12": 2.0, + "e13": 2.0, + "e20": 2.0, + "e21": 2.0, + "e22": 2.0, + "e23": 2.0, + "e30": 2.0, + "e31": 2.0, + "e32": 2.0, + "e33": 2.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + { "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.CustomFunctionNode", diff --git a/Basic/DistributedAuthoritySocialHub/Assets/Shaders/SubGraphs/ToonShading.shadersubgraph b/Basic/DistributedAuthoritySocialHub/Assets/Shaders/SubGraphs/ToonShading.shadersubgraph index 246fcd050..9b24a4328 100644 --- a/Basic/DistributedAuthoritySocialHub/Assets/Shaders/SubGraphs/ToonShading.shadersubgraph +++ b/Basic/DistributedAuthoritySocialHub/Assets/Shaders/SubGraphs/ToonShading.shadersubgraph @@ -1,5 +1,5 @@ { - "m_SGVersion": 2, + "m_SGVersion": 3, "m_Type": "UnityEditor.ShaderGraph.GraphData", "m_ObjectId": "d1dd709ec3d449d595d958b96e871c8a", "m_Properties": [ @@ -16,7 +16,23 @@ "m_Id": "fdee2b62b9462689a4e539b9cd7be624" } ], - "m_Keywords": [], + "m_Keywords": [ + { + "m_Id": "6c07a028187c488f94325aefacd51977" + }, + { + "m_Id": "4f9c35621bb646019e97b753e48fe39f" + }, + { + "m_Id": "3c9e8fba080848279a7b46e354c83fd7" + } + ], + "m_Dropdowns": [], + "m_CategoryData": [ + { + "m_Id": "044c3c6cf0de4c519bb244ee47b67190" + } + ], "m_Nodes": [ { "m_Id": "63ee59e9ed8fcf82a40b6aff5d953a99" @@ -459,14 +475,16 @@ "serializedMesh": { "m_SerializedMesh": "{\"mesh\":{\"instanceID\":0}}", "m_Guid": "" - } + }, + "preventRotation": false }, "m_Path": "Sub Graphs", - "m_ConcretePrecision": 0, + "m_GraphPrecision": 0, "m_PreviewMode": 2, "m_OutputNode": { "m_Id": "2dd4c05742e7428699ccf7c5ace9a019" }, + "m_SubDatas": [], "m_ActiveTargets": [] } @@ -555,6 +573,36 @@ ] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.CategoryData", + "m_ObjectId": "044c3c6cf0de4c519bb244ee47b67190", + "m_Name": "", + "m_ChildObjectList": [ + { + "m_Id": "e70dfe96c72b258da8a3806d2c0b289b" + }, + { + "m_Id": "f6c248d86db81887906d80be5774179e" + }, + { + "m_Id": "a697f5591dd0f0848e9fee74f1999e14" + }, + { + "m_Id": "fdee2b62b9462689a4e539b9cd7be624" + }, + { + "m_Id": "6c07a028187c488f94325aefacd51977" + }, + { + "m_Id": "4f9c35621bb646019e97b753e48fe39f" + }, + { + "m_Id": "3c9e8fba080848279a7b46e354c83fd7" + } + ] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.PropertyNode", @@ -581,6 +629,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -656,6 +705,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -884,8 +934,8 @@ "m_ObjectId": "25a947b55d184a228766684844bd484d", "m_Title": "Specular from all lights", "m_Position": { - "x": -3617.0, - "y": -62.0 + "x": -3617.33349609375, + "y": -61.33338165283203 } } @@ -915,6 +965,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -1017,12 +1068,40 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, "m_TextureType": 0, - "m_NormalMapSpace": 0 + "m_NormalMapSpace": 0, + "m_EnableGlobalMipBias": true, + "m_MipSamplingMode": 0 +} + +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.ShaderGraph.ShaderKeyword", + "m_ObjectId": "3c9e8fba080848279a7b46e354c83fd7", + "m_Guid": { + "m_GuidSerialized": "ff7f9b6c-43bb-453d-bd07-4e19f773fcdd" + }, + "m_Name": "_SHADOWS_SOFT", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "_SHADOWS_SOFT", + "m_DefaultReferenceName": "_SHADOWS_SOFT", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, + "m_KeywordType": 0, + "m_KeywordDefinition": 1, + "m_KeywordScope": 1, + "m_KeywordStages": 63, + "m_Entries": [], + "m_Value": 1, + "m_IsEditable": true } { @@ -1123,6 +1202,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -1141,7 +1221,9 @@ -1979614210, 1110902579, 1218271513 - ] + ], + "m_Dropdowns": [], + "m_DropdownSelectedEntries": [] } { @@ -1242,6 +1324,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -1251,14 +1334,39 @@ } } +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.ShaderGraph.ShaderKeyword", + "m_ObjectId": "4f9c35621bb646019e97b753e48fe39f", + "m_Guid": { + "m_GuidSerialized": "6557e20f-3234-4e6a-85b8-db947a32c95a" + }, + "m_Name": "_MAIN_LIGHT_SHADOWS_CASCADE", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "_MAIN_LIGHT_SHADOWS_CASCADE", + "m_DefaultReferenceName": "_MAIN_LIGHT_SHADOWS_CASCADE", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, + "m_KeywordType": 0, + "m_KeywordDefinition": 1, + "m_KeywordScope": 1, + "m_KeywordStages": 63, + "m_Entries": [], + "m_Value": 1, + "m_IsEditable": true +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.GroupData", "m_ObjectId": "50865b0f887d40b8b6d35c6c6e3cc095", "m_Title": "Additional Lights", "m_Position": { - "x": -4628.74853515625, - "y": -922.3583984375 + "x": -4629.33349609375, + "y": -923.3331909179688 } } @@ -1288,6 +1396,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -1335,6 +1444,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -1373,6 +1483,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -1389,7 +1500,9 @@ -1341880836, 1263176445, -148418382 - ] + ], + "m_Dropdowns": [], + "m_DropdownSelectedEntries": [] } { @@ -1500,6 +1613,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -1541,6 +1655,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -1583,7 +1698,7 @@ "m_StageCapability": 3, "m_BareResource": false, "m_Texture": { - "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", + "m_SerializedTexture": "", "m_Guid": "" }, "m_DefaultType": 0 @@ -1621,12 +1736,38 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } } +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.ShaderGraph.ShaderKeyword", + "m_ObjectId": "6c07a028187c488f94325aefacd51977", + "m_Guid": { + "m_GuidSerialized": "3b7f232a-6434-43a1-ac90-0ba28f102f99" + }, + "m_Name": "_MAIN_LIGHT_SHADOWS", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "_MAIN_LIGHT_SHADOWS", + "m_DefaultReferenceName": "_MAIN_LIGHT_SHADOWS", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, + "m_KeywordType": 0, + "m_KeywordDefinition": 1, + "m_KeywordScope": 1, + "m_KeywordStages": 63, + "m_Entries": [], + "m_Value": 1, + "m_IsEditable": true +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.SamplerStateMaterialSlot", @@ -1711,8 +1852,8 @@ "m_ObjectId": "77cf859510d54fd99a7ec07bf544ca7a", "m_Title": "Diffuse + Specular", "m_Position": { - "x": -1394.0, - "y": -134.0 + "x": -1394.000244140625, + "y": -134.6666259765625 } } @@ -1751,6 +1892,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -1792,8 +1934,8 @@ "m_ObjectId": "7bddd2d1023f4fd1801ff7dad3e00ed1", "m_Title": "Albedo", "m_Position": { - "x": -2030.0, - "y": -640.0 + "x": -2030.000244140625, + "y": -640.6666259765625 } } @@ -1803,8 +1945,8 @@ "m_ObjectId": "7c74a36ed8fa4f438f5c67d1121da360", "m_Title": "Lighting from all lights", "m_Position": { - "x": -3629.999755859375, - "y": -920.9999389648438 + "x": -3630.000244140625, + "y": -922.6666870117188 } } @@ -1860,6 +2002,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -1967,6 +2110,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -2076,6 +2220,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -2148,6 +2293,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -2223,17 +2369,24 @@ "m_GuidSerialized": "dc1e4197-88f8-4dac-862d-6fef2ceba882" }, "m_Name": "Specular Map", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Texture2D_75C45C06", "m_OverrideReferenceName": "", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { - "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", + "m_SerializedTexture": "", "m_Guid": "" }, + "isMainTexture": false, + "useTilingAndOffset": false, "m_Modifiable": true, "m_DefaultType": 0 } @@ -2244,8 +2397,8 @@ "m_ObjectId": "a6b2b69dfcca4c6093ca303f3bdd2d5b", "m_Title": "Main Directional Light + Lightmap", "m_Position": { - "x": -4502.0, - "y": -81.0 + "x": -4423.33349609375, + "y": -64.6666259765625 } } @@ -2370,6 +2523,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -2518,6 +2672,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -2680,8 +2835,8 @@ "m_ObjectId": "e0483321a2264b9d9a51191970761449", "m_Title": "Specular masking and tinting", "m_Position": { - "x": -3169.000244140625, - "y": -227.0001220703125 + "x": -3125.33349609375, + "y": -405.3335266113281 } } @@ -2718,9 +2873,14 @@ "m_GuidSerialized": "ee0928d0-392b-42d4-9d1c-35310a7a8f8c" }, "m_Name": "Smoothness", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Vector1_BCF55A1F", "m_OverrideReferenceName": "", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -2762,6 +2922,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -2772,7 +2933,9 @@ ], "m_PropertyIds": [ 1286794315 - ] + ], + "m_Dropdowns": [], + "m_DropdownSelectedEntries": [] } { @@ -2868,9 +3031,14 @@ "m_GuidSerialized": "36db9fb5-0bde-43e9-97fe-fd103617b570" }, "m_Name": "Specular Color", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Color_601E5129", "m_OverrideReferenceName": "", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -2881,6 +3049,7 @@ "b": 0.0, "a": 0.0 }, + "isMainColor": false, "m_ColorMode": 0 } @@ -2940,9 +3109,14 @@ "m_GuidSerialized": "281332d8-1654-4d5c-98ac-8128f9d3dfe9" }, "m_Name": "Albedo", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Vector3_E2B204B9", "m_OverrideReferenceName": "", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, diff --git a/Basic/DistributedAuthoritySocialHub/Assets/Shaders/Toon.shadergraph b/Basic/DistributedAuthoritySocialHub/Assets/Shaders/Toon.shadergraph index 67fec88d3..6d5701ca6 100644 --- a/Basic/DistributedAuthoritySocialHub/Assets/Shaders/Toon.shadergraph +++ b/Basic/DistributedAuthoritySocialHub/Assets/Shaders/Toon.shadergraph @@ -33,7 +33,7 @@ ], "m_Keywords": [ { - "m_Id": "e6fcd2c583ac4014ae9bf2e1df511bba" + "m_Id": "134f895801124c4ca59dd247e1762da3" } ], "m_Dropdowns": [], @@ -613,6 +613,31 @@ ] } +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.ShaderGraph.ShaderKeyword", + "m_ObjectId": "134f895801124c4ca59dd247e1762da3", + "m_Guid": { + "m_GuidSerialized": "a0120ea9-9c69-4d4a-8432-1d5f4edb46a3" + }, + "m_Name": "_RECEIVE_SHADOWS_OFF", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "_RECEIVE_SHADOWS_OFF", + "m_DefaultReferenceName": "_RECEIVE_SHADOWS_OFF", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, + "m_KeywordType": 0, + "m_KeywordDefinition": 1, + "m_KeywordScope": 1, + "m_KeywordStages": 63, + "m_Entries": [], + "m_Value": 1, + "m_IsEditable": true +} + { "m_SGVersion": 3, "m_Type": "UnityEditor.ShaderGraph.Internal.ColorShaderProperty", @@ -1406,8 +1431,8 @@ "m_ObjectId": "91fdea723e8a435e98d71d8800f8b735", "m_Title": "Emission", "m_Position": { - "x": 1275.5, - "y": -682.4999389648438 + "x": 1275.3336181640625, + "y": -682.666748046875 } } @@ -1417,8 +1442,8 @@ "m_ObjectId": "95bdfa9886ac4a8bb593863474c8540d", "m_Title": "Alpha clipping support", "m_Position": { - "x": 1030.0001220703125, - "y": 22.499996185302736 + "x": 1030.000244140625, + "y": 22.6666259765625 } } @@ -1585,8 +1610,8 @@ "m_ObjectId": "9e4023633c0143749ce2c4808a8bc229", "m_Title": "Main Colour", "m_Position": { - "x": -119.00001525878906, - "y": -218.50001525878907 + "x": -119.33332824707031, + "y": -218.66668701171876 } } @@ -2306,8 +2331,8 @@ "m_ObjectId": "e4cc3f09ed254e1eabbffbf44401f100", "m_Title": "Specular", "m_Position": { - "x": 199.0, - "y": -454.5 + "x": 198.66668701171876, + "y": -454.6666564941406 } } @@ -2329,31 +2354,6 @@ "m_DefaultType": 0 } -{ - "m_SGVersion": 1, - "m_Type": "UnityEditor.ShaderGraph.ShaderKeyword", - "m_ObjectId": "e6fcd2c583ac4014ae9bf2e1df511bba", - "m_Guid": { - "m_GuidSerialized": "87aab91e-56f6-4751-b9f3-5e0144f8e971" - }, - "m_Name": "ADDITIONAL_LIGHTS", - "m_DefaultRefNameVersion": 1, - "m_RefNameGeneratedByDisplayName": "ADDITIONAL_LIGHTS", - "m_DefaultReferenceName": "_ADDITIONAL_LIGHTS", - "m_OverrideReferenceName": "", - "m_GeneratePropertyBlock": false, - "m_UseCustomSlotLabel": false, - "m_CustomSlotLabel": "", - "m_DismissedVersion": 0, - "m_KeywordType": 0, - "m_KeywordDefinition": 1, - "m_KeywordScope": 1, - "m_KeywordStages": 2, - "m_Entries": [], - "m_Value": 0, - "m_IsEditable": true -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot", @@ -2412,7 +2412,7 @@ "m_Id": "c7ddee4b9eaed98cb315fda2eafd5e7a" }, { - "m_Id": "e6fcd2c583ac4014ae9bf2e1df511bba" + "m_Id": "134f895801124c4ca59dd247e1762da3" } ] } diff --git a/CHANGELOG.md b/CHANGELOG.md index fc3488071..abc4d5f84 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ #### Changed - Player spawning has been deferred to be performed manually by an in-scene placed NetworkObject (#257) Player spawn has been moved to coincide with NetworkManager's OnNetworkSessionSynchronized callback, ensuring the player is spawned after synchronizing the game scene's NetworkObjects. +- Adjusted lighting and shadow settings and custom shaders to improve the overall look of the sample, also water transparency issue has been fixed (#265) ### 2D Space Shooter