From e3fb0584c73901efff90346c0509c0a0c05f5525 Mon Sep 17 00:00:00 2001 From: StarBeats <977663818@qq.com> Date: Fri, 27 Feb 2026 14:50:38 +0800 Subject: [PATCH] sync --- Assets/Scenes/Oasis/OasisScene.unity | 4 ++-- Assets/Settings/Mobile/Mobile_High_Renderer.asset | 8 ++++---- .../Shaders/Lit.shader | 5 ++++- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Assets/Scenes/Oasis/OasisScene.unity b/Assets/Scenes/Oasis/OasisScene.unity index 4b6f6a8..afcdf46 100644 --- a/Assets/Scenes/Oasis/OasisScene.unity +++ b/Assets/Scenes/Oasis/OasisScene.unity @@ -140,7 +140,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &964126 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5281,7 +5281,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8508310942573128499, guid: c708a3b79cd542b42bbfedb17e213bc1, type: 3} propertyPath: m_RenderShadows - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8508310942573128499, guid: c708a3b79cd542b42bbfedb17e213bc1, type: 3} propertyPath: m_RenderPostProcessing diff --git a/Assets/Settings/Mobile/Mobile_High_Renderer.asset b/Assets/Settings/Mobile/Mobile_High_Renderer.asset index 8ce3621..72ad0e3 100644 --- a/Assets/Settings/Mobile/Mobile_High_Renderer.asset +++ b/Assets/Settings/Mobile/Mobile_High_Renderer.asset @@ -418,7 +418,7 @@ MonoBehaviour: - {fileID: -8044648393505963816} - {fileID: -7198069835786880352} m_RendererFeatureMap: bc3f630842f2e70dd6a559c442a94bfd4529d15534f2d3de228858dca8d12222716523fbf3439fdb7a327b7bff4bdd446ac59dfa966ffa88ca6373cd5da9013d6cff55ca297e5e908a7b3653203b82383b2141bb05fbe69aec5704e48e2763e90bc6ff9f19caa7686c79a6bb3bb89a50faad0fe75217cdb485d6fa85ff9adc9c41710d3c4a991609d8002992e8aa5b90a0fa77119f511b9c - m_UseNativeRenderPass: 1 + m_UseNativeRenderPass: 0 postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} shaders: blitPS: {fileID: 4800000, guid: c17132b1f77d20942aa75f8429c0f8bc, type: 3} @@ -667,7 +667,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Active: 0 settings: - BlurMask: 1 + BlurMask: 0 MaskMat: {fileID: 2100000, guid: 1368366248809f24e9a110be3075d1b8, type: 2} BlurMat: {fileID: 2100000, guid: 0487cfddca141924d8a1736f6c0b9b7b, type: 2} BlurIterations: 3 @@ -711,8 +711,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e32e72b6a3f58a24c9033e2b9275eea0, type: 3} m_Name: ScreenSpaceShadows m_EditorClassIdentifier: - m_Active: 0 + m_Active: 1 m_Shader: {fileID: 4800000, guid: 0f854b35a0cf61a429bd5dcfea30eddd, type: 3} m_Settings: - UseLowResolution: 1 + UseLowResolution: 0 UseLowResolutionPCF: 1 diff --git a/Packages/com.unity.render-pipelines.universal@14.0.11/Shaders/Lit.shader b/Packages/com.unity.render-pipelines.universal@14.0.11/Shaders/Lit.shader index 81ca138..91413f5 100644 --- a/Packages/com.unity.render-pipelines.universal@14.0.11/Shaders/Lit.shader +++ b/Packages/com.unity.render-pipelines.universal@14.0.11/Shaders/Lit.shader @@ -161,6 +161,7 @@ Shader "Universal Render Pipeline/Lit" #pragma multi_compile _ LIGHTMAP_ON #pragma multi_compile _ DYNAMICLIGHTMAP_ON #pragma multi_compile_fragment _ LOD_FADE_CROSSFADE + #pragma multi_compile_fragment _ _DITHER_CLIP #pragma multi_compile_fog #pragma multi_compile_fragment _ DEBUG_DISPLAY @@ -337,12 +338,13 @@ Shader "Universal Render Pipeline/Lit" InitializeStandardLitSurfaceData(input.uv, surfaceData); #ifdef LOD_FADE_CROSSFADE - LODFadeCrossFade(input.positionCS); + LODFadeCrossFade(input.positionCS); #endif InputData inputData; InitializeInputData(input, surfaceData.normalTS, inputData); SETUP_DEBUG_TEXTURE_DATA(inputData, input.uv, _BaseMap); +#ifdef _DITHER_CLIP float2 screenPos = inputData.normalizedScreenSpaceUV * _ScreenParams.xy; const float DITHER_THRESHOLDS[4][4] = { @@ -353,6 +355,7 @@ Shader "Universal Render Pipeline/Lit" }; clip(_Dither - DITHER_THRESHOLDS[floor(fmod(screenPos.x, 4))][floor(fmod(screenPos.y, 4))]); +#endif #ifdef _DBUFFER ApplyDecalToSurfaceData(input.positionCS, surfaceData, inputData); #endif