Commit 90677405 authored by SherryChaos's avatar SherryChaos

Refactor and consolidate post-processing profiles

Removed 'Global Volume.asset' and merged its post-processing settings into 'DefaultVolumeProfile.asset'. Updated URP asset and quality settings, and cleaned up link.xml to remove unused type preservations. This streamlines post-processing configuration and reduces redundancy in volume profiles.
parent df791130
...@@ -242,69 +242,10 @@ ...@@ -242,69 +242,10 @@
<type fullname="UnityEngine.InputSystem.PlayerInput/DeviceLostEvent" preserve="nothing" serialized="true" /> <type fullname="UnityEngine.InputSystem.PlayerInput/DeviceLostEvent" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.InputSystem.PlayerInput/DeviceRegainedEvent" preserve="nothing" serialized="true" /> <type fullname="UnityEngine.InputSystem.PlayerInput/DeviceRegainedEvent" preserve="nothing" serialized="true" />
</assembly> </assembly>
<assembly fullname="Unity.RenderPipelines.Core.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<type fullname="UnityEngine.Rendering.ProbeVolumesOptions" preserve="all" />
<type fullname="UnityEngine.Rendering.VolumeProfile" preserve="all" />
<type fullname="UnityEngine.Rendering.APVLeakReductionModeParameter" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.Rendering.BoolParameter" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.Rendering.ClampedFloatParameter" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.Rendering.ClampedIntParameter" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.Rendering.ColorParameter" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.Rendering.FloatParameter" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.Rendering.MinFloatParameter" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.Rendering.NoInterpTextureParameter" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.Rendering.ProbeVolumeBlendingTextureMemoryBudget" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.Rendering.ProbeVolumeSHBands" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.Rendering.ProbeVolumeSceneData" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.Rendering.ProbeVolumeTextureMemoryBudget" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.Rendering.SerializedDictionary`2" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.Rendering.TextureCurve" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.Rendering.TextureCurveParameter" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.Rendering.TextureParameter" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.Rendering.Vector2Parameter" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.Rendering.Vector3Parameter" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.Rendering.Vector4Parameter" preserve="nothing" serialized="true" />
</assembly>
<assembly fullname="Unity.RenderPipelines.Universal.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"> <assembly fullname="Unity.RenderPipelines.Universal.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<type fullname="UnityEngine.Rendering.Universal.Bloom" preserve="all" />
<type fullname="UnityEngine.Rendering.Universal.ChannelMixer" preserve="all" />
<type fullname="UnityEngine.Rendering.Universal.ChromaticAberration" preserve="all" />
<type fullname="UnityEngine.Rendering.Universal.ColorAdjustments" preserve="all" />
<type fullname="UnityEngine.Rendering.Universal.ColorCurves" preserve="all" />
<type fullname="UnityEngine.Rendering.Universal.ColorLookup" preserve="all" />
<type fullname="UnityEngine.Rendering.Universal.DepthOfField" preserve="all" />
<type fullname="UnityEngine.Rendering.Universal.FilmGrain" preserve="all" />
<type fullname="UnityEngine.Rendering.Universal.LensDistortion" preserve="all" />
<type fullname="UnityEngine.Rendering.Universal.LiftGammaGain" preserve="all" />
<type fullname="UnityEngine.Rendering.Universal.MotionBlur" preserve="all" />
<type fullname="UnityEngine.Rendering.Universal.PaniniProjection" preserve="all" />
<type fullname="UnityEngine.Rendering.Universal.PostProcessData" preserve="all" />
<type fullname="UnityEngine.Rendering.Universal.ScreenSpaceLensFlare" preserve="all" />
<type fullname="UnityEngine.Rendering.Universal.ShadowsMidtonesHighlights" preserve="all" />
<type fullname="UnityEngine.Rendering.Universal.SplitToning" preserve="all" />
<type fullname="UnityEngine.Rendering.Universal.Tonemapping" preserve="all" />
<type fullname="UnityEngine.Rendering.Universal.UniversalAdditionalCameraData" preserve="all" /> <type fullname="UnityEngine.Rendering.Universal.UniversalAdditionalCameraData" preserve="all" />
<type fullname="UnityEngine.Rendering.Universal.UniversalAdditionalLightData" preserve="all" /> <type fullname="UnityEngine.Rendering.Universal.UniversalAdditionalLightData" preserve="all" />
<type fullname="UnityEngine.Rendering.Universal.UniversalRendererData" preserve="all" />
<type fullname="UnityEngine.Rendering.Universal.UniversalRenderPipelineAsset" preserve="all" />
<type fullname="UnityEngine.Rendering.Universal.Vignette" preserve="all" />
<type fullname="UnityEngine.Rendering.Universal.WhiteBalance" preserve="all" />
<type fullname="UnityEngine.Rendering.Universal.TemporalAA/Settings" preserve="nothing" serialized="true" /> <type fullname="UnityEngine.Rendering.Universal.TemporalAA/Settings" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.Rendering.Universal.DepthOfFieldModeParameter" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.Rendering.Universal.DownscaleParameter" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.Rendering.Universal.FilmGrainLookupParameter" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.Rendering.Universal.HDRACESPresetParameter" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.Rendering.Universal.MotionBlurModeParameter" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.Rendering.Universal.MotionBlurQualityParameter" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.Rendering.Universal.NeutralRangeReductionModeParameter" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.Rendering.Universal.PostProcessData/ShaderResources" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.Rendering.Universal.PostProcessData/TextureResources" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.Rendering.Universal.ScreenSpaceLensFlareResolutionParameter" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.Rendering.Universal.ScriptableRendererData/DebugShaderResources" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.Rendering.Universal.ScriptableRendererData/ProbeVolumeResources" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.Rendering.Universal.StencilStateData" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.Rendering.Universal.TonemappingModeParameter" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.Rendering.Universal.UniversalRenderPipelineAsset/TextureResources" preserve="nothing" serialized="true" />
</assembly> </assembly>
<assembly fullname="Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" preserve="all"> <assembly fullname="Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" preserve="all">
<type fullname="UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider" preserve="all" /> <type fullname="UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider" preserve="all" />
...@@ -371,7 +312,6 @@ ...@@ -371,7 +312,6 @@
<type fullname="UnityEngine.Events.PersistentListenerMode" preserve="nothing" serialized="true" /> <type fullname="UnityEngine.Events.PersistentListenerMode" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.Events.UnityEvent" preserve="nothing" serialized="true" /> <type fullname="UnityEngine.Events.UnityEvent" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.RectOffset" preserve="nothing" serialized="true" /> <type fullname="UnityEngine.RectOffset" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.Bounds" preserve="nothing" serialized="true" />
</assembly> </assembly>
<assembly fullname="UnityEngine.PhysicsModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"> <assembly fullname="UnityEngine.PhysicsModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<type fullname="UnityEngine.MeshCollider" preserve="all" /> <type fullname="UnityEngine.MeshCollider" preserve="all" />
......
fileFormatVersion: 2 fileFormatVersion: 2
guid: 33b77ee770f46e9448d922b23ab74ba3 guid: 40f12719edb053d4092f60886d3dcb93
TextScriptImporter: TextScriptImporter:
externalObjects: {} externalObjects: {}
userData: userData:
......
...@@ -84,7 +84,7 @@ MonoBehaviour: ...@@ -84,7 +84,7 @@ MonoBehaviour:
m_SupportScreenSpaceLensFlare: 1 m_SupportScreenSpaceLensFlare: 1
m_GPUResidentDrawerMode: 0 m_GPUResidentDrawerMode: 0
m_SmallMeshScreenPercentage: 0 m_SmallMeshScreenPercentage: 0
m_GPUResidentDrawerEnableOcclusionCullingInCameras: 0 m_GPUResidentDrawerEnableOcclusionCullingInCameras: 1
m_ShadowType: 1 m_ShadowType: 1
m_LocalShadowsSupported: 0 m_LocalShadowsSupported: 0
m_LocalShadowsAtlasResolution: 256 m_LocalShadowsAtlasResolution: 256
......
This diff is collapsed.
fileFormatVersion: 2
guid: 1e241ba92e25f5942832856af4a9e983
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
...@@ -91,7 +91,7 @@ MonoBehaviour: ...@@ -91,7 +91,7 @@ MonoBehaviour:
m_MaxPixelLights: 0 m_MaxPixelLights: 0
m_ShadowAtlasResolution: 256 m_ShadowAtlasResolution: 256
m_VolumeFrameworkUpdateMode: 0 m_VolumeFrameworkUpdateMode: 0
m_VolumeProfile: {fileID: 11400000, guid: 1e241ba92e25f5942832856af4a9e983, type: 2} m_VolumeProfile: {fileID: 11400000, guid: 498b6d892ab31ac47a686468f68fc6c3, type: 2}
apvScenesData: apvScenesData:
obsoleteSceneBounds: obsoleteSceneBounds:
m_Keys: [] m_Keys: []
......
...@@ -36,21 +36,21 @@ MonoBehaviour: ...@@ -36,21 +36,21 @@ MonoBehaviour:
- rid: 5650211206403981510 - rid: 5650211206403981510
- rid: 5650211206403981511 - rid: 5650211206403981511
- rid: 5650211206403981512 - rid: 5650211206403981512
- rid: 5304719407440199853 - rid: 5304719454487445515
- rid: 5650211206403981514 - rid: 5650211206403981514
- rid: 5650211206403981515 - rid: 5650211206403981515
- rid: 5304719407440199854 - rid: 5304719454487445516
- rid: 5304719407440199855 - rid: 5304719454487445517
- rid: 5650211206403981518 - rid: 5650211206403981518
- rid: 5304719407440199856 - rid: 5304719454487445518
- rid: 5650211206403981520 - rid: 5650211206403981520
- rid: 5304719407440199857 - rid: 5304719454487445519
- rid: 5304719407440199858 - rid: 5304719454487445520
- rid: 5304719407440199859 - rid: 5304719454487445521
- rid: 5304719407440199860 - rid: 5304719454487445522
- rid: 5304719407440199861 - rid: 5304719454487445523
- rid: 5304719407440199862 - rid: 5304719454487445524
- rid: 5304719407440199863 - rid: 5304719454487445525
- rid: 5650211206403981528 - rid: 5650211206403981528
- rid: 5650211206403981529 - rid: 5650211206403981529
- rid: 5650211206403981530 - rid: 5650211206403981530
...@@ -96,7 +96,7 @@ MonoBehaviour: ...@@ -96,7 +96,7 @@ MonoBehaviour:
type: {class: UniversalRenderPipelineEditorAssets, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} type: {class: UniversalRenderPipelineEditorAssets, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data: data:
m_DefaultSettingsVolumeProfile: {fileID: 11400000, guid: eda47df5b85f4f249abf7abd73db2cb2, type: 2} m_DefaultSettingsVolumeProfile: {fileID: 11400000, guid: eda47df5b85f4f249abf7abd73db2cb2, type: 2}
- rid: 5304719407440199853 - rid: 5304719454487445515
type: {class: Renderer2DResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} type: {class: Renderer2DResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data: data:
m_Version: 0 m_Version: 0
...@@ -111,14 +111,14 @@ MonoBehaviour: ...@@ -111,14 +111,14 @@ MonoBehaviour:
m_DefaultLitMaterial: {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} m_DefaultLitMaterial: {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
m_DefaultUnlitMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} m_DefaultUnlitMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
m_DefaultMaskMaterial: {fileID: 2100000, guid: 15d0c3709176029428a0da2f8cecf0b5, type: 2} m_DefaultMaskMaterial: {fileID: 2100000, guid: 15d0c3709176029428a0da2f8cecf0b5, type: 2}
- rid: 5304719407440199854 - rid: 5304719454487445516
type: {class: URPShaderStrippingSetting, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} type: {class: URPShaderStrippingSetting, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data: data:
m_Version: 0 m_Version: 0
m_StripUnusedPostProcessingVariants: 0 m_StripUnusedPostProcessingVariants: 0
m_StripUnusedVariants: 1 m_StripUnusedVariants: 1
m_StripScreenCoordOverrideVariants: 1 m_StripScreenCoordOverrideVariants: 1
- rid: 5304719407440199855 - rid: 5304719454487445517
type: {class: UniversalRenderPipelineEditorMaterials, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} type: {class: UniversalRenderPipelineEditorMaterials, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data: data:
m_DefaultMaterial: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} m_DefaultMaterial: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
...@@ -126,7 +126,7 @@ MonoBehaviour: ...@@ -126,7 +126,7 @@ MonoBehaviour:
m_DefaultLineMaterial: {fileID: 2100000, guid: e823cd5b5d27c0f4b8256e7c12ee3e6d, type: 2} m_DefaultLineMaterial: {fileID: 2100000, guid: e823cd5b5d27c0f4b8256e7c12ee3e6d, type: 2}
m_DefaultTerrainMaterial: {fileID: 2100000, guid: 594ea882c5a793440b60ff72d896021e, type: 2} m_DefaultTerrainMaterial: {fileID: 2100000, guid: 594ea882c5a793440b60ff72d896021e, type: 2}
m_DefaultDecalMaterial: {fileID: 2100000, guid: 31d0dcc6f2dd4e4408d18036a2c93862, type: 2} m_DefaultDecalMaterial: {fileID: 2100000, guid: 31d0dcc6f2dd4e4408d18036a2c93862, type: 2}
- rid: 5304719407440199856 - rid: 5304719454487445518
type: {class: UniversalRenderPipelineEditorShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} type: {class: UniversalRenderPipelineEditorShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data: data:
m_AutodeskInteractive: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f, type: 3} m_AutodeskInteractive: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f, type: 3}
...@@ -138,7 +138,7 @@ MonoBehaviour: ...@@ -138,7 +138,7 @@ MonoBehaviour:
m_DefaultSpeedTree7Shader: {fileID: 4800000, guid: 0f4122b9a743b744abe2fb6a0a88868b, type: 3} m_DefaultSpeedTree7Shader: {fileID: 4800000, guid: 0f4122b9a743b744abe2fb6a0a88868b, type: 3}
m_DefaultSpeedTree8Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec, type: 3} m_DefaultSpeedTree8Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec, type: 3}
m_DefaultSpeedTree9Shader: {fileID: -6465566751694194690, guid: cbd3e1cc4ae141c42a30e33b4d666a61, type: 3} m_DefaultSpeedTree9Shader: {fileID: -6465566751694194690, guid: cbd3e1cc4ae141c42a30e33b4d666a61, type: 3}
- rid: 5304719407440199857 - rid: 5304719454487445519
type: {class: GPUResidentDrawerResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.GPUDriven.Runtime} type: {class: GPUResidentDrawerResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.GPUDriven.Runtime}
data: data:
m_Version: 0 m_Version: 0
...@@ -151,13 +151,13 @@ MonoBehaviour: ...@@ -151,13 +151,13 @@ MonoBehaviour:
m_OcclusionCullingDebugKernels: {fileID: 7200000, guid: b23e766bcf50ca4438ef186b174557df, type: 3} m_OcclusionCullingDebugKernels: {fileID: 7200000, guid: b23e766bcf50ca4438ef186b174557df, type: 3}
m_DebugOcclusionTestPS: {fileID: 4800000, guid: d3f0849180c2d0944bc71060693df100, type: 3} m_DebugOcclusionTestPS: {fileID: 4800000, guid: d3f0849180c2d0944bc71060693df100, type: 3}
m_DebugOccluderPS: {fileID: 4800000, guid: b3c92426a88625841ab15ca6a7917248, type: 3} m_DebugOccluderPS: {fileID: 4800000, guid: b3c92426a88625841ab15ca6a7917248, type: 3}
- rid: 5304719407440199858 - rid: 5304719454487445520
type: {class: STP/RuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} type: {class: STP/RuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data: data:
m_setupCS: {fileID: 7200000, guid: 33be2e9a5506b2843bdb2bdff9cad5e1, type: 3} m_setupCS: {fileID: 7200000, guid: 33be2e9a5506b2843bdb2bdff9cad5e1, type: 3}
m_preTaaCS: {fileID: 7200000, guid: a679dba8ec4d9ce45884a270b0e22dda, type: 3} m_preTaaCS: {fileID: 7200000, guid: a679dba8ec4d9ce45884a270b0e22dda, type: 3}
m_taaCS: {fileID: 7200000, guid: 3923900e2b41b5e47bc25bfdcbcdc9e6, type: 3} m_taaCS: {fileID: 7200000, guid: 3923900e2b41b5e47bc25bfdcbcdc9e6, type: 3}
- rid: 5304719407440199859 - rid: 5304719454487445521
type: {class: ProbeVolumeBakingResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} type: {class: ProbeVolumeBakingResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data: data:
m_Version: 1 m_Version: 1
...@@ -170,12 +170,12 @@ MonoBehaviour: ...@@ -170,12 +170,12 @@ MonoBehaviour:
skyOcclusionRT: {fileID: -5126288278712620388, guid: 5a2a534753fbdb44e96c3c78b5a6999d, type: 3} skyOcclusionRT: {fileID: -5126288278712620388, guid: 5a2a534753fbdb44e96c3c78b5a6999d, type: 3}
renderingLayerCS: {fileID: -6772857160820960102, guid: 94a070d33e408384bafc1dea4a565df9, type: 3} renderingLayerCS: {fileID: -6772857160820960102, guid: 94a070d33e408384bafc1dea4a565df9, type: 3}
renderingLayerRT: {fileID: -5126288278712620388, guid: 94a070d33e408384bafc1dea4a565df9, type: 3} renderingLayerRT: {fileID: -5126288278712620388, guid: 94a070d33e408384bafc1dea4a565df9, type: 3}
- rid: 5304719407440199860 - rid: 5304719454487445522
type: {class: ProbeVolumeGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} type: {class: ProbeVolumeGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data: data:
m_Version: 1 m_Version: 1
m_ProbeVolumeDisableStreamingAssets: 0 m_ProbeVolumeDisableStreamingAssets: 0
- rid: 5304719407440199861 - rid: 5304719454487445523
type: {class: ProbeVolumeDebugResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} type: {class: ProbeVolumeDebugResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data: data:
m_Version: 1 m_Version: 1
...@@ -185,14 +185,14 @@ MonoBehaviour: ...@@ -185,14 +185,14 @@ MonoBehaviour:
probeVolumeOffsetDebugShader: {fileID: 4800000, guid: db8bd7436dc2c5f4c92655307d198381, type: 3} probeVolumeOffsetDebugShader: {fileID: 4800000, guid: db8bd7436dc2c5f4c92655307d198381, type: 3}
probeSamplingDebugMesh: {fileID: -3555484719484374845, guid: 20be25aac4e22ee49a7db76fb3df6de2, type: 3} probeSamplingDebugMesh: {fileID: -3555484719484374845, guid: 20be25aac4e22ee49a7db76fb3df6de2, type: 3}
numbersDisplayTex: {fileID: 2800000, guid: 73fe53b428c5b3440b7e87ee830b608a, type: 3} numbersDisplayTex: {fileID: 2800000, guid: 73fe53b428c5b3440b7e87ee830b608a, type: 3}
- rid: 5304719407440199862 - rid: 5304719454487445524
type: {class: IncludeAdditionalRPAssets, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} type: {class: IncludeAdditionalRPAssets, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data: data:
m_version: 0 m_version: 0
m_IncludeReferencedInScenes: 0 m_IncludeReferencedInScenes: 0
m_IncludeAssetsByLabel: 0 m_IncludeAssetsByLabel: 0
m_LabelToInclude: m_LabelToInclude:
- rid: 5304719407440199863 - rid: 5304719454487445525
type: {class: ProbeVolumeRuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} type: {class: ProbeVolumeRuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data: data:
m_Version: 1 m_Version: 1
...@@ -231,7 +231,7 @@ MonoBehaviour: ...@@ -231,7 +231,7 @@ MonoBehaviour:
type: {class: URPDefaultVolumeProfileSettings, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} type: {class: URPDefaultVolumeProfileSettings, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data: data:
m_Version: 0 m_Version: 0
m_VolumeProfile: {fileID: 11400000, guid: 1e241ba92e25f5942832856af4a9e983, type: 2} m_VolumeProfile: {fileID: 11400000, guid: 498b6d892ab31ac47a686468f68fc6c3, type: 2}
- rid: 5650211206403981518 - rid: 5650211206403981518
type: {class: UniversalRenderPipelineDebugShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} type: {class: UniversalRenderPipelineDebugShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data: data:
......
...@@ -537,10 +537,10 @@ MonoBehaviour: ...@@ -537,10 +537,10 @@ MonoBehaviour:
text: {fileID: 1398959084} text: {fileID: 1398959084}
input: {fileID: 1775272994} input: {fileID: 1775272994}
mode_Window: 0 mode_Window: 0
mode_Android: 0 mode_Android: 1
mode_IOS: 0 mode_IOS: 0
mode_Swtich: 1 mode_Swtich: 0
fullCopy: 1 fullCopy: 0
--- !u!114 &916768208 --- !u!114 &916768208
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
......
...@@ -2665,7 +2665,7 @@ Camera: ...@@ -2665,7 +2665,7 @@ Camera:
m_TargetEye: 3 m_TargetEye: 3
m_HDR: 1 m_HDR: 1
m_AllowMSAA: 1 m_AllowMSAA: 1
m_AllowDynamicResolution: 0 m_AllowDynamicResolution: 1
m_ForceIntoRT: 0 m_ForceIntoRT: 0
m_OcclusionCulling: 1 m_OcclusionCulling: 1
m_StereoConvergence: 10 m_StereoConvergence: 10
...@@ -3390,9 +3390,9 @@ Camera: ...@@ -3390,9 +3390,9 @@ Camera:
m_TargetEye: 3 m_TargetEye: 3
m_HDR: 1 m_HDR: 1
m_AllowMSAA: 1 m_AllowMSAA: 1
m_AllowDynamicResolution: 0 m_AllowDynamicResolution: 1
m_ForceIntoRT: 0 m_ForceIntoRT: 0
m_OcclusionCulling: 0 m_OcclusionCulling: 1
m_StereoConvergence: 10 m_StereoConvergence: 10
m_StereoSeparation: 0.022 m_StereoSeparation: 0.022
--- !u!1 &705142027 --- !u!1 &705142027
...@@ -3690,7 +3690,7 @@ Camera: ...@@ -3690,7 +3690,7 @@ Camera:
m_TargetEye: 3 m_TargetEye: 3
m_HDR: 1 m_HDR: 1
m_AllowMSAA: 1 m_AllowMSAA: 1
m_AllowDynamicResolution: 0 m_AllowDynamicResolution: 1
m_ForceIntoRT: 0 m_ForceIntoRT: 0
m_OcclusionCulling: 1 m_OcclusionCulling: 1
m_StereoConvergence: 10 m_StereoConvergence: 10
...@@ -4299,7 +4299,7 @@ Camera: ...@@ -4299,7 +4299,7 @@ Camera:
m_TargetEye: 3 m_TargetEye: 3
m_HDR: 1 m_HDR: 1
m_AllowMSAA: 1 m_AllowMSAA: 1
m_AllowDynamicResolution: 0 m_AllowDynamicResolution: 1
m_ForceIntoRT: 0 m_ForceIntoRT: 0
m_OcclusionCulling: 1 m_OcclusionCulling: 1
m_StereoConvergence: 10 m_StereoConvergence: 10
...@@ -4321,7 +4321,7 @@ MonoBehaviour: ...@@ -4321,7 +4321,7 @@ MonoBehaviour:
m_RequiresOpaqueTextureOption: 2 m_RequiresOpaqueTextureOption: 2
m_CameraType: 1 m_CameraType: 1
m_Cameras: [] m_Cameras: []
m_RendererIndex: -1 m_RendererIndex: 0
m_VolumeLayerMask: m_VolumeLayerMask:
serializedVersion: 2 serializedVersion: 2
m_Bits: 0 m_Bits: 0
...@@ -6685,10 +6685,10 @@ MonoBehaviour: ...@@ -6685,10 +6685,10 @@ MonoBehaviour:
cameraUIBlur: {fileID: 564072680} cameraUIBlur: {fileID: 564072680}
light: {fileID: 1837514594} light: {fileID: 1837514594}
black: {fileID: 1384027262} black: {fileID: 1384027262}
urpAsset: {fileID: 11400000, guid: 961007eb9a68c654aa0cd06256c4fc47, type: 2} urpAsset: {fileID: 0}
forwardRendererData: {fileID: 11400000, guid: 1b446f3f038169946a4c04145d7f1837, type: 2} forwardRendererData: {fileID: 0}
urpAssetForUI: {fileID: 11400000, guid: 2d5f8147be10dc44592585c07c829dc0, type: 2} urpAssetForUI: {fileID: 0}
forwardRendererDataForUI: {fileID: 11400000, guid: e807adf31d68d224680ba73301b4a8d2, type: 2} forwardRendererDataForUI: {fileID: 0}
--- !u!1 &1518747367 --- !u!1 &1518747367
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -7146,7 +7146,7 @@ MonoBehaviour: ...@@ -7146,7 +7146,7 @@ MonoBehaviour:
- {fileID: 1051530896} - {fileID: 1051530896}
- {fileID: 726873028} - {fileID: 726873028}
- {fileID: 564072680} - {fileID: 564072680}
m_RendererIndex: -1 m_RendererIndex: 0
m_VolumeLayerMask: m_VolumeLayerMask:
serializedVersion: 2 serializedVersion: 2
m_Bits: 0 m_Bits: 0
...@@ -7219,7 +7219,7 @@ Camera: ...@@ -7219,7 +7219,7 @@ Camera:
m_TargetEye: 3 m_TargetEye: 3
m_HDR: 1 m_HDR: 1
m_AllowMSAA: 1 m_AllowMSAA: 1
m_AllowDynamicResolution: 0 m_AllowDynamicResolution: 1
m_ForceIntoRT: 0 m_ForceIntoRT: 0
m_OcclusionCulling: 1 m_OcclusionCulling: 1
m_StereoConvergence: 10 m_StereoConvergence: 10
...@@ -7505,7 +7505,7 @@ Camera: ...@@ -7505,7 +7505,7 @@ Camera:
m_TargetEye: 3 m_TargetEye: 3
m_HDR: 1 m_HDR: 1
m_AllowMSAA: 1 m_AllowMSAA: 1
m_AllowDynamicResolution: 0 m_AllowDynamicResolution: 1
m_ForceIntoRT: 0 m_ForceIntoRT: 0
m_OcclusionCulling: 1 m_OcclusionCulling: 1
m_StereoConvergence: 10 m_StereoConvergence: 10
...@@ -8773,7 +8773,7 @@ Camera: ...@@ -8773,7 +8773,7 @@ Camera:
m_TargetEye: 3 m_TargetEye: 3
m_HDR: 1 m_HDR: 1
m_AllowMSAA: 1 m_AllowMSAA: 1
m_AllowDynamicResolution: 0 m_AllowDynamicResolution: 1
m_ForceIntoRT: 0 m_ForceIntoRT: 0
m_OcclusionCulling: 1 m_OcclusionCulling: 1
m_StereoConvergence: 10 m_StereoConvergence: 10
...@@ -8873,7 +8873,7 @@ Camera: ...@@ -8873,7 +8873,7 @@ Camera:
m_TargetEye: 3 m_TargetEye: 3
m_HDR: 1 m_HDR: 1
m_AllowMSAA: 1 m_AllowMSAA: 1
m_AllowDynamicResolution: 0 m_AllowDynamicResolution: 1
m_ForceIntoRT: 0 m_ForceIntoRT: 0
m_OcclusionCulling: 1 m_OcclusionCulling: 1
m_StereoConvergence: 10 m_StereoConvergence: 10
...@@ -8917,7 +8917,7 @@ MonoBehaviour: ...@@ -8917,7 +8917,7 @@ MonoBehaviour:
- {fileID: 1051530896} - {fileID: 1051530896}
- {fileID: 726873028} - {fileID: 726873028}
- {fileID: 564072680} - {fileID: 564072680}
m_RendererIndex: -1 m_RendererIndex: 0
m_VolumeLayerMask: m_VolumeLayerMask:
serializedVersion: 2 serializedVersion: 2
m_Bits: 1 m_Bits: 1
......
...@@ -531,13 +531,13 @@ namespace MDPro3 ...@@ -531,13 +531,13 @@ namespace MDPro3
{ {
mdCachedProgress = 0f; mdCachedProgress = 0f;
await CacheFromFileAsync(Program.root + "MasterDuel/Built-in/shaders"); await CacheFromFileAsync(Program.root + "MasterDuel/Built-in/shaders");
mdCachedProgress = 0.2f; mdCachedProgress = 0.3f;
mdBundleSprites = await CacheFromFileAsync(Program.root + "MasterDuel/Built-in/sprites"); mdBundleSprites = await CacheFromFileAsync(Program.root + "MasterDuel/Built-in/sprites");
mdCachedProgress = 0.4f;
mdBundleMaterials = await CacheFromFileAsync(Program.root + "MasterDuel/Built-in/materials");
mdCachedProgress = 0.6f; mdCachedProgress = 0.6f;
mdBundleMaterials = await CacheFromFileAsync(Program.root + "MasterDuel/Built-in/materials");
mdCachedProgress = 0.9f;
mdBundleOutDuel = await CacheFromFileAsync(Program.root + "MasterDuel/Built-in/outduel"); mdBundleOutDuel = await CacheFromFileAsync(Program.root + "MasterDuel/Built-in/outduel");
mdCachedProgress = 0.8f; mdCachedProgress = 1f;
mdCached = true; mdCached = true;
} }
......
using DG.Tweening; using DG.Tweening;
using MDPro3.Servant;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
...@@ -18,7 +19,6 @@ namespace MDPro3 ...@@ -18,7 +19,6 @@ namespace MDPro3
public Camera cameraDuelOverlayEffect2D; public Camera cameraDuelOverlayEffect2D;
public Camera cameraUI; public Camera cameraUI;
public Camera cameraUIBlur; public Camera cameraUIBlur;
//public Camera cameraRenderTexture;
public GameObject light; public GameObject light;
public SpriteRenderer black; public SpriteRenderer black;
...@@ -74,18 +74,8 @@ namespace MDPro3 ...@@ -74,18 +74,8 @@ namespace MDPro3
Program.instance.camera_.cameraMain.gameObject.SetActive(false); Program.instance.camera_.cameraMain.gameObject.SetActive(false);
Program.instance.camera_.light.SetActive(false); Program.instance.camera_.light.SetActive(false);
Program.instance.camera_.camera2D.gameObject.SetActive(true); Program.instance.camera_.camera2D.gameObject.SetActive(true);
//DuelOverlay3DCount = 0;
//DuelOverlay2DCount = 0;
//DuelOverlayEffect3DCount = 0;
//DuelOverlayEffect2DCount = 0;
//DuelOverlay3DMinus();
//DuelOverlayEffect3DMinus();
//DuelOverlay2DMinus();
//DuelOverlayEffect2DMinus();
QualitySettings.SetQualityLevel(6); QualitySettings.SetQualityLevel(6);
SettingServant.SetFpsToConfig();
} }
public static void ShiftTo3D() public static void ShiftTo3D()
...@@ -94,6 +84,7 @@ namespace MDPro3 ...@@ -94,6 +84,7 @@ namespace MDPro3
Program.instance.camera_.light.SetActive(true); Program.instance.camera_.light.SetActive(true);
Program.instance.camera_.camera2D.gameObject.SetActive(false); Program.instance.camera_.camera2D.gameObject.SetActive(false);
QualitySettings.SetQualityLevel((int)Config.GetFloat("Quality", 2f)); QualitySettings.SetQualityLevel((int)Config.GetFloat("Quality", 2f));
SettingServant.SetFpsToConfig();
} }
public static void Overlay3DReset() public static void Overlay3DReset()
...@@ -166,12 +157,6 @@ namespace MDPro3 ...@@ -166,12 +157,6 @@ namespace MDPro3
{ {
uiBlurCount++; uiBlurCount++;
Program.instance.camera_.cameraUIBlur.gameObject.SetActive(true); Program.instance.camera_.cameraUIBlur.gameObject.SetActive(true);
//foreach (var feature in Program.instance.camera_.forwardRendererData.rendererFeatures)
// if (feature is KawaseBlur)
// feature.SetActive(true);
//foreach (var feature in Program.instance.camera_.forwardRendererDataForUI.rendererFeatures)
// if (feature is KawaseBlur)
// feature.SetActive(true);
} }
public static void UIBlurMinus() public static void UIBlurMinus()
...@@ -182,12 +167,6 @@ namespace MDPro3 ...@@ -182,12 +167,6 @@ namespace MDPro3
if (uiBlurCount == 0) if (uiBlurCount == 0)
{ {
Program.instance.camera_.cameraUIBlur.gameObject.SetActive(false); Program.instance.camera_.cameraUIBlur.gameObject.SetActive(false);
//foreach (var feature in Program.instance.camera_.forwardRendererData.rendererFeatures)
// if (feature is KawaseBlur)
// feature.SetActive(false);
//foreach (var feature in Program.instance.camera_.forwardRendererDataForUI.rendererFeatures)
// if (feature is KawaseBlur)
// feature.SetActive(false);
} }
} }
......
...@@ -126,11 +126,16 @@ namespace MDPro3.Servant ...@@ -126,11 +126,16 @@ namespace MDPro3.Servant
// TODO FAA // TODO FAA
SettingServantUI.ChangeAAA(Config.GetFloat("AAA", 0f)); SettingServantUI.ChangeAAA(Config.GetFloat("AAA", 0f));
SettingServantUI.ChangeShadow(Config.GetFloat("Shadow", 0f)); SettingServantUI.ChangeShadow(Config.GetFloat("Shadow", 0f));
SettingServantUI.ChangeFPS(SettingServantUI.GetFPS()); SetFpsToConfig();
SettingServantUI.ChangeShowFPS(); SettingServantUI.ChangeShowFPS();
Program.instance.background_.Change(int.Parse(Config.Get("Background", "0"))); Program.instance.background_.Change(int.Parse(Config.Get("Background", "0")));
} }
public static void SetFpsToConfig()
{
SettingServantUI.ChangeFPS(SettingServantUI.GetFPS());
}
public float GetBGMVolum() public float GetBGMVolum()
{ {
if (servantUI == null) if (servantUI == null)
......
...@@ -45,7 +45,7 @@ GraphicsSettings: ...@@ -45,7 +45,7 @@ GraphicsSettings:
m_TierSettings: [] m_TierSettings: []
m_LightmapStripping: 0 m_LightmapStripping: 0
m_FogStripping: 0 m_FogStripping: 0
m_InstancingStripping: 0 m_InstancingStripping: 2
m_BrgStripping: 2 m_BrgStripping: 2
m_LightmapKeepPlain: 1 m_LightmapKeepPlain: 1
m_LightmapKeepDirCombined: 1 m_LightmapKeepDirCombined: 1
......
...@@ -186,7 +186,7 @@ PlayerSettings: ...@@ -186,7 +186,7 @@ PlayerSettings:
ForceSDCardPermission: 1 ForceSDCardPermission: 1
CreateWallpaper: 0 CreateWallpaper: 0
androidSplitApplicationBinary: 0 androidSplitApplicationBinary: 0
keepLoadedShadersAlive: 0 keepLoadedShadersAlive: 1
StripUnusedMeshComponents: 0 StripUnusedMeshComponents: 0
strictShaderVariantMatching: 0 strictShaderVariantMatching: 0
VertexChannelCompressionMask: 0 VertexChannelCompressionMask: 0
...@@ -872,7 +872,7 @@ PlayerSettings: ...@@ -872,7 +872,7 @@ PlayerSettings:
il2cppCodeGeneration: {} il2cppCodeGeneration: {}
il2cppStacktraceInformation: {} il2cppStacktraceInformation: {}
managedStrippingLevel: managedStrippingLevel:
Android: 1 Android: 4
EmbeddedLinux: 1 EmbeddedLinux: 1
GameCoreScarlett: 1 GameCoreScarlett: 1
GameCoreXboxOne: 1 GameCoreXboxOne: 1
...@@ -880,7 +880,7 @@ PlayerSettings: ...@@ -880,7 +880,7 @@ PlayerSettings:
PS4: 1 PS4: 1
PS5: 1 PS5: 1
QNX: 1 QNX: 1
Standalone: 1 Standalone: 4
VisionOS: 1 VisionOS: 1
WebGL: 1 WebGL: 1
Windows Store Apps: 1 Windows Store Apps: 1
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
QualitySettings: QualitySettings:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
serializedVersion: 5 serializedVersion: 5
m_CurrentQuality: 0 m_CurrentQuality: 5
m_QualitySettings: m_QualitySettings:
- serializedVersion: 4 - serializedVersion: 4
name: Very Low name: Very Low
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment