diff --git a/asset-bundle-converter/Assets/Renderer/NewShaderVariants.shadervariants.meta b/asset-bundle-converter/Assets/AssetBundleConverter/LODsConverter/ExportLODToAssetBundle.meta similarity index 52% rename from asset-bundle-converter/Assets/Renderer/NewShaderVariants.shadervariants.meta rename to asset-bundle-converter/Assets/AssetBundleConverter/LODsConverter/ExportLODToAssetBundle.meta index f496332d..a4e7f48a 100644 --- a/asset-bundle-converter/Assets/Renderer/NewShaderVariants.shadervariants.meta +++ b/asset-bundle-converter/Assets/AssetBundleConverter/LODsConverter/ExportLODToAssetBundle.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 998fca07b4326e549998858809736ab9 -NativeFormatImporter: +guid: 95097712f41290a4d843055d1473310a +folderAsset: yes +DefaultImporter: externalObjects: {} - mainObjectFileID: 20000000 userData: assetBundleName: assetBundleVariant: diff --git a/asset-bundle-converter/Assets/AssetBundleConverter/VisualTestScene.unity b/asset-bundle-converter/Assets/AssetBundleConverter/VisualTestScene.unity index 6902830b..1bbde55e 100644 --- a/asset-bundle-converter/Assets/AssetBundleConverter/VisualTestScene.unity +++ b/asset-bundle-converter/Assets/AssetBundleConverter/VisualTestScene.unity @@ -14,10 +14,10 @@ OcclusionCullingSettings: RenderSettings: m_ObjectHideFlags: 0 serializedVersion: 9 - m_Fog: 0 + m_Fog: 1 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} - m_FogMode: 3 - m_FogDensity: 0.01 + m_FogMode: 2 + m_FogDensity: 0.0005 m_LinearFogStart: 0 m_LinearFogEnd: 300 m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.17608438, g: 0.22036652, b: 0.30269566, a: 1} + m_IndirectSpecularColor: {r: 0.17608409, g: 0.22036606, b: 0.302695, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -104,7 +104,7 @@ NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: - serializedVersion: 2 + serializedVersion: 3 agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 @@ -117,7 +117,7 @@ NavMeshSettings: cellSize: 0.16666667 manualTileSize: 0 tileSize: 256 - accuratePlacement: 0 + buildHeightMesh: 0 maxJobWorkers: 0 preserveTilesOutsideBounds: 0 debug: @@ -172,9 +172,20 @@ MonoBehaviour: m_Dithering: 0 m_ClearDepth: 1 m_AllowXRRendering: 1 + m_AllowHDROutput: 1 + m_UseScreenCoordOverride: 0 + m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} + m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} m_RequiresDepthTexture: 0 m_RequiresColorTexture: 0 m_Version: 2 + m_TaaSettings: + quality: 3 + frameInfluence: 0.1 + jitterScale: 1 + mipBias: 0 + varianceClampScale: 0.9 + contrastAdaptiveSharpening: 0 --- !u!81 &591256388 AudioListener: m_ObjectHideFlags: 0 @@ -197,9 +208,17 @@ Camera: m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 m_SensorSize: {x: 36, y: 24} m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -233,13 +252,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 591256386} + serializedVersion: 2 m_LocalRotation: {x: 0.25647432, y: 0.38446102, z: -0.112090506, w: 0.8796854} m_LocalPosition: {x: -1.5810568, y: 1.5167356, z: -1.6025124} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!84 &843750349 RenderTexture: @@ -267,10 +286,11 @@ RenderTexture: m_UseDynamicScale: 0 m_BindMS: 0 m_EnableCompatibleFormat: 1 + m_EnableRandomWrite: 0 m_TextureSettings: serializedVersion: 2 m_FilterMode: 1 - m_Aniso: 1 + m_Aniso: 0 m_MipBias: 0 m_WrapU: 1 m_WrapV: 1 @@ -365,13 +385,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1442991790} + serializedVersion: 2 m_LocalRotation: {x: -0.6048365, y: 0.37674066, z: -0.5823524, w: -0.39128628} m_LocalPosition: {x: 0, y: 3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: -245.8, y: -87.83, z: 0} --- !u!114 &1442991793 MonoBehaviour: @@ -385,11 +405,20 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 1 + m_Version: 3 m_UsePipelineSettings: 1 m_AdditionalLightsShadowResolutionTier: 2 m_LightLayerMask: 1 + m_RenderingLayers: 1 m_CustomShadowLayers: 0 m_ShadowLayerMask: 1 + m_ShadowRenderingLayers: 1 m_LightCookieSize: {x: 1, y: 1} m_LightCookieOffset: {x: 0, y: 0} + m_SoftShadowQuality: 1 +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 1442991792} + - {fileID: 591256390} diff --git a/asset-bundle-converter/Assets/Renderer/NewShaderVariants.shadervariants b/asset-bundle-converter/Assets/Renderer/NewShaderVariants.shadervariants deleted file mode 100644 index 487b15cb..00000000 --- a/asset-bundle-converter/Assets/Renderer/NewShaderVariants.shadervariants +++ /dev/null @@ -1,81 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!200 &20000000 -ShaderVariantCollection: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: NewShaderVariants - m_Shaders: - - first: {fileID: 4800000, guid: 3b75227de96217540aae9be81fbd99f6, type: 3} - second: - variants: [] - - first: {fileID: 4800000, guid: 56a9743f8d94f684190dc11bb521fb78, type: 3} - second: - variants: - - keywords: _ADDITIONAL_LIGHT_SHADOWS _EMISSION _ENVIRONMENTREFLECTIONS_OFF - _FORWARD_PLUS _MAIN_LIGHT_SHADOWS_CASCADE _NORMALMAP _OCCLUSIONMAP _SHADOWS_SOFT - passType: 13 - - keywords: _ADDITIONAL_LIGHT_SHADOWS _EMISSION _ENVIRONMENTREFLECTIONS_OFF - _FORWARD_PLUS _MAIN_LIGHT_SHADOWS_CASCADE _NORMALMAP _OCCLUSIONMAP _SHADOWS_SOFT - _SPECULARHIGHLIGHTS_OFF - passType: 13 - - keywords: _ADDITIONAL_LIGHT_SHADOWS _EMISSION _ENVIRONMENTREFLECTIONS_OFF - _FORWARD_PLUS _MAIN_LIGHT_SHADOWS_CASCADE _NORMALMAP _OCCLUSIONMAP _SHADOWS_SOFT - _SPECULARHIGHLIGHTS_OFF _SPECULAR_SETUP - passType: 13 - - keywords: _ADDITIONAL_LIGHT_SHADOWS _EMISSION _ENVIRONMENTREFLECTIONS_OFF - _FORWARD_PLUS _MAIN_LIGHT_SHADOWS_CASCADE _NORMALMAP _OCCLUSIONMAP _SHADOWS_SOFT - _SPECULAR_SETUP - passType: 13 - - keywords: _ADDITIONAL_LIGHT_SHADOWS _EMISSION _ENVIRONMENTREFLECTIONS_OFF - _FORWARD_PLUS _MAIN_LIGHT_SHADOWS_CASCADE _NORMALMAP _SHADOWS_SOFT - passType: 13 - - keywords: _ADDITIONAL_LIGHT_SHADOWS _EMISSION _ENVIRONMENTREFLECTIONS_OFF - _FORWARD_PLUS _MAIN_LIGHT_SHADOWS_CASCADE _NORMALMAP _SHADOWS_SOFT _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A - passType: 13 - - keywords: _ADDITIONAL_LIGHT_SHADOWS _EMISSION _ENVIRONMENTREFLECTIONS_OFF - _FORWARD_PLUS _MAIN_LIGHT_SHADOWS_CASCADE _NORMALMAP _SHADOWS_SOFT _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A - _SPECULAR_SETUP - passType: 13 - - keywords: _ADDITIONAL_LIGHT_SHADOWS _EMISSION _ENVIRONMENTREFLECTIONS_OFF - _FORWARD_PLUS _MAIN_LIGHT_SHADOWS_CASCADE _NORMALMAP _SHADOWS_SOFT _SPECULARHIGHLIGHTS_OFF - passType: 13 - - keywords: _ADDITIONAL_LIGHT_SHADOWS _EMISSION _ENVIRONMENTREFLECTIONS_OFF - _FORWARD_PLUS _MAIN_LIGHT_SHADOWS_CASCADE _NORMALMAP _SHADOWS_SOFT _SPECULARHIGHLIGHTS_OFF - _SPECULAR_SETUP - passType: 13 - - keywords: _ADDITIONAL_LIGHT_SHADOWS _EMISSION _ENVIRONMENTREFLECTIONS_OFF - _FORWARD_PLUS _MAIN_LIGHT_SHADOWS_CASCADE _NORMALMAP _SHADOWS_SOFT _SPECULAR_SETUP - passType: 13 - - keywords: _ADDITIONAL_LIGHT_SHADOWS _EMISSION _FORWARD_PLUS _MAIN_LIGHT_SHADOWS_CASCADE - _NORMALMAP _OCCLUSIONMAP _SHADOWS_SOFT - passType: 13 - - keywords: _ADDITIONAL_LIGHT_SHADOWS _EMISSION _FORWARD_PLUS _MAIN_LIGHT_SHADOWS_CASCADE - _NORMALMAP _OCCLUSIONMAP _SHADOWS_SOFT _SPECULARHIGHLIGHTS_OFF - passType: 13 - - keywords: _ADDITIONAL_LIGHT_SHADOWS _EMISSION _FORWARD_PLUS _MAIN_LIGHT_SHADOWS_CASCADE - _NORMALMAP _OCCLUSIONMAP _SHADOWS_SOFT _SPECULARHIGHLIGHTS_OFF _SPECULAR_SETUP - passType: 13 - - keywords: _ADDITIONAL_LIGHT_SHADOWS _EMISSION _FORWARD_PLUS _MAIN_LIGHT_SHADOWS_CASCADE - _NORMALMAP _OCCLUSIONMAP _SHADOWS_SOFT _SPECULAR_SETUP - passType: 13 - - keywords: _ADDITIONAL_LIGHT_SHADOWS _EMISSION _FORWARD_PLUS _MAIN_LIGHT_SHADOWS_CASCADE - _NORMALMAP _SHADOWS_SOFT - passType: 13 - - keywords: _ADDITIONAL_LIGHT_SHADOWS _EMISSION _FORWARD_PLUS _MAIN_LIGHT_SHADOWS_CASCADE - _NORMALMAP _SHADOWS_SOFT _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A - passType: 13 - - keywords: _ADDITIONAL_LIGHT_SHADOWS _EMISSION _FORWARD_PLUS _MAIN_LIGHT_SHADOWS_CASCADE - _NORMALMAP _SHADOWS_SOFT _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A _SPECULARHIGHLIGHTS_OFF - passType: 13 - - keywords: _ADDITIONAL_LIGHT_SHADOWS _EMISSION _FORWARD_PLUS _MAIN_LIGHT_SHADOWS_CASCADE - _NORMALMAP _SHADOWS_SOFT _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A _SPECULAR_SETUP - passType: 13 - - keywords: _ADDITIONAL_LIGHT_SHADOWS _EMISSION _FORWARD_PLUS _MAIN_LIGHT_SHADOWS_CASCADE - _NORMALMAP _SHADOWS_SOFT _SPECULARHIGHLIGHTS_OFF - passType: 13 - - keywords: _ADDITIONAL_LIGHT_SHADOWS _EMISSION _FORWARD_PLUS _MAIN_LIGHT_SHADOWS_CASCADE - _NORMALMAP _SHADOWS_SOFT _SPECULARHIGHLIGHTS_OFF _SPECULAR_SETUP - passType: 13 diff --git a/asset-bundle-converter/Assets/Renderer/ShaderVariants.shadervariants b/asset-bundle-converter/Assets/Renderer/ShaderVariants.shadervariants deleted file mode 100644 index c013837d..00000000 --- a/asset-bundle-converter/Assets/Renderer/ShaderVariants.shadervariants +++ /dev/null @@ -1,526 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!200 &20000000 -ShaderVariantCollection: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: ShaderVariants - m_Shaders: - - first: {fileID: 66, guid: 0000000000000000f000000000000000, type: 0} - second: - variants: - - keywords: - passType: 0 - - first: {fileID: 106, guid: 0000000000000000f000000000000000, type: 0} - second: - variants: - - keywords: _SUNDISK_SIMPLE - passType: 0 - - first: {fileID: 9000, guid: 0000000000000000f000000000000000, type: 0} - second: - variants: - - keywords: - passType: 0 - - first: {fileID: 9001, guid: 0000000000000000f000000000000000, type: 0} - second: - variants: - - keywords: - passType: 0 - - first: {fileID: 9002, guid: 0000000000000000f000000000000000, type: 0} - second: - variants: - - keywords: - passType: 0 - - first: {fileID: 9003, guid: 0000000000000000f000000000000000, type: 0} - second: - variants: - - keywords: - passType: 0 - - first: {fileID: 9004, guid: 0000000000000000f000000000000000, type: 0} - second: - variants: - - keywords: - passType: 0 - - first: {fileID: 9007, guid: 0000000000000000f000000000000000, type: 0} - second: - variants: - - keywords: - passType: 0 - - first: {fileID: 9101, guid: 0000000000000000f000000000000000, type: 0} - second: - variants: - - keywords: - passType: 0 - - first: {fileID: 9103, guid: 0000000000000000f000000000000000, type: 0} - second: - variants: - - keywords: - passType: 0 - - first: {fileID: 4800000, guid: 861f58cc229a5f449b2494095122257f, type: 3} - second: - variants: - - keywords: - passType: 0 - - keywords: - passType: 11 - - keywords: - passType: 13 - - first: {fileID: 4800000, guid: 3b75227de96217540aae9be81fbd99f6, type: 3} - second: - variants: - - keywords: - passType: 8 - - keywords: _ALPHATEST_ON - passType: 8 - - keywords: - passType: 11 - - keywords: - passType: 13 - - keywords: _ADDITIONAL_LIGHTS _ADDITIONAL_LIGHT_SHADOWS _ALPHATEST_ON _EMISSION - _MAIN_LIGHT_SHADOWS _NORMALMAP - passType: 13 - - keywords: _ADDITIONAL_LIGHTS _MAIN_LIGHT_SHADOWS _NORMALMAP - passType: 13 - - keywords: _ALPHATEST_ON - passType: 13 - - first: {fileID: 4800000, guid: 2f81a455fb6a38d40a93be19cf7f2d8e, type: 3} - second: - variants: - - keywords: - passType: 8 - - keywords: - passType: 11 - - keywords: - passType: 13 - - first: {fileID: 4800000, guid: c17132b1f77d20942aa75f8429c0f8bc, type: 3} - second: - variants: - - keywords: - passType: 0 - - first: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3} - second: - variants: - - keywords: - passType: 0 - - first: {fileID: 4800000, guid: 0f854b35a0cf61a429bd5dcfea30eddd, type: 3} - second: - variants: - - keywords: _MAIN_LIGHT_SHADOWS - passType: 0 - - first: {fileID: 4800000, guid: 04c410c9937594faa893a11dceb85f7e, type: 3} - second: - variants: - - keywords: - passType: 0 - - first: {fileID: 4800000, guid: 65df88701913c224d95fc554db28381a, type: 3} - second: - variants: - - keywords: - passType: 0 - - first: {fileID: 4800000, guid: ec9fec698a3456d4fb18cf8bacb7a2bc, type: 3} - second: - variants: - - keywords: - passType: 0 - - first: {fileID: 4800000, guid: e7857e9d0c934dc4f83f270f8447b006, type: 3} - second: - variants: - - keywords: - passType: 0 - - first: {fileID: 4800000, guid: 1121bb4e615ca3c48b214e79e841e823, type: 3} - second: - variants: - - keywords: - passType: 0 - - first: {fileID: 4800000, guid: a15b78cf8ca26ca4fb2090293153c62c, type: 3} - second: - variants: - - keywords: _GENERIC - passType: 0 - - first: {fileID: 4800000, guid: e260cfa7296ee7642b167f1eb5be5023, type: 3} - second: - variants: - - keywords: - passType: 13 - - first: {fileID: 4800000, guid: 63eaba0ebfb82cc43bde059b4a8c65f6, type: 3} - second: - variants: - - keywords: _SMAA_PRESET_LOW - passType: 0 - - first: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - second: - variants: - - keywords: - passType: 8 - - keywords: - passType: 11 - - keywords: - passType: 13 - - first: {fileID: 4800000, guid: e35a31e1679aeff489e202f5cc4853d5, type: 3} - second: - variants: - - keywords: - passType: 0 - - first: {fileID: 4800000, guid: 0406db5a14f94604a8c57ccfbc9f3b46, type: 3} - second: - variants: - - keywords: - passType: 0 - - keywords: - passType: 13 - - first: {fileID: 4800000, guid: 4431b1f1f743fbf4eb310a967890cbea, type: 3} - second: - variants: - - keywords: - passType: 0 - - first: {fileID: 4800000, guid: c49e63ed1bbcb334780a3bd19dfed403, type: 3} - second: - variants: - - keywords: - passType: 0 - - first: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3} - second: - variants: - - keywords: - passType: 0 - - keywords: - passType: 11 - - keywords: - passType: 13 - - first: {fileID: 4800000, guid: 8516d7a69675844a7a0b7095af7c46af, type: 3} - second: - variants: - - keywords: - passType: 13 - - first: {fileID: 4800000, guid: d5a307c014552314b9f560906d708772, type: 3} - second: - variants: - - keywords: - passType: 0 - - first: {fileID: 4800000, guid: e507fdfead5ca47e8b9a768b51c291a1, type: 3} - second: - variants: - - keywords: - passType: 0 - - keywords: - passType: 13 - - first: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3} - second: - variants: - - keywords: - passType: 0 - - first: {fileID: 4800000, guid: f6783ab646d374f94b199774402a5144, type: 3} - second: - variants: - - keywords: - passType: 0 - - keywords: - passType: 11 - - keywords: - passType: 13 - - first: {fileID: 4800000, guid: b7839dad95683814aa64166edc107ae2, type: 3} - second: - variants: - - keywords: - passType: 13 - - first: {fileID: 4800000, guid: c7d04ca57e5449d49ad9cee1c604bc26, type: 3} - second: - variants: - - keywords: - passType: 0 - - first: {fileID: 4800000, guid: d79e1c784eaf80c4585c0be7391f757a, type: 3} - second: - variants: - - keywords: - passType: 0 - - first: {fileID: 4800000, guid: 0849e84e3d62649e8882e9d6f056a017, type: 3} - second: - variants: - - keywords: - passType: 0 - - keywords: _RECONSTRUCT_NORMAL_LOW _SOURCE_DEPTH - passType: 0 - - keywords: _SOURCE_DEPTH - passType: 0 - - first: {fileID: 4800000, guid: 29868e73b638e48ca99a19ea58c48d90, type: 3} - second: - variants: - - keywords: - passType: 0 - - keywords: - passType: 13 - - first: {fileID: 4800000, guid: 99134b1f0c27d54469a840832a28fadf, type: 3} - second: - variants: - - keywords: LOD_FADE_PERCENTAGE _WINDQUALITY_NONE - passType: 8 - - keywords: _WINDQUALITY_NONE - passType: 8 - - keywords: LOD_FADE_PERCENTAGE _WINDQUALITY_NONE - passType: 13 - - keywords: _WINDQUALITY_NONE - passType: 13 - - first: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3} - second: - variants: - - keywords: - passType: 0 - - keywords: FOG_LINEAR _FOG - passType: 0 - - keywords: _CLEAR_STENCIL_PARTIAL - passType: 0 - - keywords: _DEFERRED_STENCIL _DIRECTIONAL _LIT - passType: 0 - - keywords: _DEFERRED_STENCIL _DIRECTIONAL _SIMPLELIT - passType: 0 - - keywords: _DEFERRED_STENCIL _LIT _POINT - passType: 0 - - keywords: _DEFERRED_STENCIL _POINT _SIMPLELIT - passType: 0 - - keywords: _DIRECTIONAL - passType: 0 - - keywords: _POINT - passType: 0 - - keywords: _SSAO_ONLY - passType: 0 - - first: {fileID: 4800000, guid: 0a7e590f3cf1d4ee8a8fab5b6eff09ef, type: 3} - second: - variants: - - keywords: - passType: 13 - - first: {fileID: 4800000, guid: 2aed67ad60045d54ba3a00c91e2d2631, type: 3} - second: - variants: - - keywords: - passType: 0 - - first: {fileID: 4800000, guid: 0ca6dca7396eb48e5849247ffd444914, type: 3} - second: - variants: - - keywords: - passType: 11 - - keywords: - passType: 13 - - first: {fileID: 4800000, guid: 8d2bb70cbf9db8d4da26e15b26e74248, type: 3} - second: - variants: - - keywords: - passType: 8 - - keywords: - passType: 11 - - keywords: - passType: 13 - - first: {fileID: 4800000, guid: 1edcd131364091c46a17cbff0b1de97a, type: 3} - second: - variants: - - keywords: - passType: 0 - - first: {fileID: 4800000, guid: 5e7134d6e63e0bc47a1dd2669cedb379, type: 3} - second: - variants: - - keywords: - passType: 0 - - first: {fileID: 4800000, guid: 5ec81c81908db34429b4f6ddecadd3bd, type: 3} - second: - variants: - - keywords: - passType: 8 - - keywords: - passType: 13 - - first: {fileID: 4800000, guid: 7e60080c8cd24a2468cb08b4bfee5606, type: 3} - second: - variants: - - keywords: - passType: 0 - - first: {fileID: 4800000, guid: ee7e4c9a5f6364b688a332c67fc32cca, type: 3} - second: - variants: - - keywords: - passType: 8 - - keywords: - passType: 11 - - keywords: - passType: 13 - - first: {fileID: 4800000, guid: 0f4122b9a743b744abe2fb6a0a88868b, type: 3} - second: - variants: - - keywords: GEOM_TYPE_BRANCH - passType: 8 - - keywords: GEOM_TYPE_BRANCH LOD_FADE_PERCENTAGE - passType: 8 - - keywords: GEOM_TYPE_BRANCH - passType: 13 - - keywords: GEOM_TYPE_BRANCH LOD_FADE_PERCENTAGE - passType: 13 - - first: {fileID: 4800000, guid: 5f1864addb451f54bae8c86d230f736e, type: 3} - second: - variants: - - keywords: - passType: 0 - - first: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3} - second: - variants: - - keywords: - passType: 0 - - first: {fileID: 4800000, guid: 8fbe92a9edfe6074e841d6dd1509bc59, type: 3} - second: - variants: - - keywords: - passType: 0 - - first: {fileID: -6465566751694194690, guid: 90c26dfde11bf4ff69ef936c6e6b1ed1, type: 3} - second: - variants: - - keywords: - passType: 8 - - keywords: _ADDITIONAL_LIGHTS _ADDITIONAL_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS - passType: 13 - - keywords: _ADDITIONAL_LIGHTS _MAIN_LIGHT_SHADOWS - passType: 13 - - first: {fileID: -6465566751694194690, guid: 7954f2f1aefcf4383b97888420a84c00, type: 3} - second: - variants: - - keywords: - passType: 8 - - keywords: _ADDITIONAL_LIGHTS _ADDITIONAL_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS - passType: 13 - - keywords: _ADDITIONAL_LIGHTS _MAIN_LIGHT_SHADOWS - passType: 13 - - first: {fileID: -6465566751694194690, guid: ba6d401c74b2c4f96af7edf0fe32241e, type: 3} - second: - variants: - - keywords: - passType: 8 - - keywords: _ADDITIONAL_LIGHTS _ADDITIONAL_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS - passType: 13 - - keywords: _ADDITIONAL_LIGHTS _MAIN_LIGHT_SHADOWS - passType: 13 - - first: {fileID: -6465566751694194690, guid: f06cd296b834444abb6dbc0acccf9414, type: 3} - second: - variants: - - keywords: - passType: 8 - - keywords: _ADDITIONAL_LIGHTS _ADDITIONAL_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS - passType: 13 - - keywords: _ADDITIONAL_LIGHTS _MAIN_LIGHT_SHADOWS - passType: 13 - - first: {fileID: -6465566751694194690, guid: c9ba521fe23b44d6db1017a2d9d47a17, type: 3} - second: - variants: - - keywords: - passType: 8 - - keywords: _ADDITIONAL_LIGHTS _ADDITIONAL_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS - passType: 13 - - keywords: _ADDITIONAL_LIGHTS _MAIN_LIGHT_SHADOWS - passType: 13 - - first: {fileID: -6465566751694194690, guid: b9d29dfa1474148e792ac720cbd45122, type: 3} - second: - variants: - - keywords: - passType: 8 - - keywords: _ADDITIONAL_LIGHTS _ADDITIONAL_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS - passType: 13 - - keywords: _ADDITIONAL_LIGHTS _MAIN_LIGHT_SHADOWS - passType: 13 - - first: {fileID: 4800000, guid: 6cda457ac28612740adb23da5d39ea92, type: 3} - second: - variants: - - keywords: - passType: 0 - - first: {fileID: 4800000, guid: e8ee25143a34b8c4388709ea947055d1, type: 3} - second: - variants: - - keywords: - passType: 0 - - first: {fileID: 4800000, guid: 562b7ae4f629f144aa97780546fce7c6, type: 3} - second: - variants: - - keywords: - passType: 0 - - first: {fileID: 4800000, guid: e39bd598ce13f44ba8af997d3e42cd18, type: 3} - second: - variants: - - keywords: - passType: 13 - - first: {fileID: 4800000, guid: 60e10855641b4d84da68ec72e6f6eeb8, type: 3} - second: - variants: - - keywords: - passType: 0 - - first: {fileID: 4800000, guid: e8b802ac01d87144b91f12f40c1f2659, type: 3} - second: - variants: - - keywords: - passType: 0 - - first: {fileID: 4800000, guid: 13c02b14c4d048fa9653293d54f6e0e1, type: 3} - second: - variants: - - keywords: - passType: 13 - - first: {fileID: 4800000, guid: cf852408f2e174538bcd9b7fda1c5ae7, type: 3} - second: - variants: - - keywords: - passType: 13 - - first: {fileID: 4800000, guid: 93446b5c5339d4f00b85c159e1159b7c, type: 3} - second: - variants: - - keywords: - passType: 0 - - first: {fileID: 4800000, guid: d104b2fc1ca6445babb8e90b0758136b, type: 3} - second: - variants: - - keywords: - passType: 0 - - first: {fileID: 4800000, guid: c56b7e0d4c7cb484e959caeeedae9bbf, type: 3} - second: - variants: - - keywords: - passType: 0 - - first: {fileID: 4800000, guid: 7b3ede40266cd49a395def176e1bc486, type: 3} - second: - variants: - - keywords: - passType: 12 - - first: {fileID: 4800000, guid: f056d8bd2a1c7e44e9729144b4c70395, type: 3} - second: - variants: - - keywords: - passType: 0 - - keywords: _DBUFFER_MRT1 - passType: 0 - - first: {fileID: 4800000, guid: 44fc62292b65ab04eabcf310e799ccf6, type: 3} - second: - variants: - - keywords: - passType: 0 - - first: {fileID: 4800000, guid: c8b6a681c7b4e2e4785ffab093907f9e, type: 3} - second: - variants: - - keywords: - passType: 0 - - first: {fileID: 4800000, guid: de02b375720b5c445afe83cd483bedf3, type: 3} - second: - variants: - - keywords: - passType: 0 - - first: {fileID: 4800000, guid: 36e335017ad71d54fbb10842863188ae, type: 3} - second: - variants: - - keywords: - passType: 0 - - first: {fileID: 4800000, guid: ce09d4a80b88c5a4eb9768fab4f1ee00, type: 3} - second: - variants: - - keywords: - passType: 0 - - first: {fileID: 4800000, guid: 19dfbb09098c9584a83c956fbd6c5d79, type: 3} - second: - variants: - - keywords: - passType: 13 - - first: {fileID: 4800000, guid: 77774d9009bb81447b048c907d4c6273, type: 3} - second: - variants: - - keywords: - passType: 0 diff --git a/asset-bundle-converter/Assets/Renderer/ShaderVariants.shadervariants.meta b/asset-bundle-converter/Assets/Renderer/ShaderVariants.shadervariants.meta deleted file mode 100644 index 3d58923e..00000000 --- a/asset-bundle-converter/Assets/Renderer/ShaderVariants.shadervariants.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 66cf085b3f81ad14092df7f554f53494 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 20000000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/asset-bundle-converter/ProjectSettings/GraphicsSettings.asset b/asset-bundle-converter/ProjectSettings/GraphicsSettings.asset index e1d68385..c75e959e 100644 --- a/asset-bundle-converter/ProjectSettings/GraphicsSettings.asset +++ b/asset-bundle-converter/ProjectSettings/GraphicsSettings.asset @@ -34,7 +34,7 @@ GraphicsSettings: - {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0} m_PreloadedShaders: - - {fileID: 20000000, guid: 998fca07b4326e549998858809736ab9, type: 2} + - {fileID: 20000000, guid: 38eaf75823ad46740a266ecd7a62959f, type: 2} m_PreloadShadersBatchTimeLimit: -1 m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_CustomRenderPipeline: {fileID: 11400000, guid: f0dbb4c5151015844b60ed654cb78d6d, type: 2} @@ -53,8 +53,8 @@ GraphicsSettings: m_LightmapKeepDynamicDirCombined: 0 m_LightmapKeepShadowMask: 0 m_LightmapKeepSubtractive: 0 - m_FogKeepLinear: 1 - m_FogKeepExp: 0 + m_FogKeepLinear: 0 + m_FogKeepExp: 1 m_FogKeepExp2: 0 m_AlbedoSwatchInfos: [] m_LightsUseLinearIntensity: 1