Skip to content

Commit 9ade060

Browse files
eiei114eiei114
committed
Revert "chore: Update URP global settings and Addressable asset configurations"
This reverts commit 9270abc.
1 parent dadb730 commit 9ade060

File tree

6 files changed

+99
-246
lines changed

6 files changed

+99
-246
lines changed

‎Assets/AddressableAssetsData/AddressableAssetSettings.asset

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ MonoBehaviour:
2424
m_InternalBundleIdMode: 1
2525
m_AssetLoadMode: 0
2626
m_BundledAssetProviderType:
27-
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
28-
m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider
27+
m_AssemblyName:
28+
m_ClassName:
2929
m_AssetBundleProviderType:
30-
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
31-
m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider
30+
m_AssemblyName:
31+
m_ClassName:
3232
m_IgnoreUnsupportedFilesInBuild: 0
3333
m_UniqueBundleIds: 0
3434
m_EnableJsonCatalog: 0

‎Assets/AddressableAssetsData/link.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<linker>
2+
<assembly fullname="Unity.Addressables, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" preserve="all">
3+
<type fullname="UnityEngine.AddressableAssets.Addressables" preserve="all" />
4+
</assembly>
5+
<assembly fullname="Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" preserve="all">
6+
<type fullname="UnityEngine.ResourceManagement.ResourceProviders.InstanceProvider" preserve="all" />
7+
<type fullname="UnityEngine.ResourceManagement.ResourceProviders.SceneProvider" preserve="all" />
8+
</assembly>
9+
</linker>

‎Assets/Resources.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎Assets/UniversalRenderPipelineGlobalSettings.asset

Lines changed: 86 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -34,25 +34,25 @@ MonoBehaviour:
3434
m_SettingsList:
3535
m_List:
3636
- rid: 7752762179098771456
37-
- rid: 404630758195200114
38-
- rid: 404630758195200115
37+
- rid: 8416581642899947520
38+
- rid: 8416581642899947521
3939
- rid: 7752762179098771459
40-
- rid: 404630758195200116
40+
- rid: 8416581642899947522
4141
- rid: 7752762179098771461
4242
- rid: 7752762179098771462
4343
- rid: 4582708665665192129
4444
- rid: 7752762179098771464
45-
- rid: 404630758195200117
45+
- rid: 8416581642899947523
4646
- rid: 7752762179098771466
47-
- rid: 404630758195200118
47+
- rid: 8416581642899947524
4848
- rid: 7752762179098771468
49-
- rid: 404630758195200119
50-
- rid: 404630758195200120
51-
- rid: 404630758195200121
49+
- rid: 8416581642899947525
50+
- rid: 8416581642899947526
51+
- rid: 8416581642899947527
5252
- rid: 7752762179098771472
53-
- rid: 404630758195200122
54-
- rid: 404630758195200123
55-
- rid: 404630758195200124
53+
- rid: 8416581642899947528
54+
- rid: 8416581642899947529
55+
- rid: 8416581642899947530
5656
- rid: 7752762179098771476
5757
m_RuntimeSettings:
5858
m_List:
@@ -89,7 +89,71 @@ MonoBehaviour:
8989
references:
9090
version: 2
9191
RefIds:
92-
- rid: 404630758195200114
92+
- rid: 4582708665665192129
93+
type: {class: UniversalRendererResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
94+
data:
95+
m_Version: 0
96+
m_CopyDepthPS: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3}
97+
m_CameraMotionVector: {fileID: 4800000, guid: c56b7e0d4c7cb484e959caeeedae9bbf, type: 3}
98+
m_StencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3}
99+
m_DBufferClear: {fileID: 4800000, guid: f056d8bd2a1c7e44e9729144b4c70395, type: 3}
100+
- rid: 7752762179098771456
101+
type: {class: UniversalRenderPipelineRuntimeTextures, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
102+
data:
103+
m_Version: 1
104+
m_BlueNoise64LTex: {fileID: 2800000, guid: e3d24661c1e055f45a7560c033dbb837, type: 3}
105+
m_BayerMatrixTex: {fileID: 2800000, guid: f9ee4ed84c1d10c49aabb9b210b0fc44, type: 3}
106+
m_DebugFontTex: {fileID: 2800000, guid: 26a413214480ef144b2915d6ff4d0beb, type: 3}
107+
- rid: 7752762179098771459
108+
type: {class: URPDefaultVolumeProfileSettings, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
109+
data:
110+
m_Version: 0
111+
m_VolumeProfile: {fileID: 11400000, guid: 3f9215ea0144899419cfbc0957140d3f, type: 2}
112+
- rid: 7752762179098771461
113+
type: {class: RenderGraphSettings, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
114+
data:
115+
m_Version: 0
116+
m_EnableRenderCompatibilityMode: 0
117+
- rid: 7752762179098771462
118+
type: {class: UniversalRenderPipelineDebugShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
119+
data:
120+
m_DebugReplacementPS: {fileID: 4800000, guid: cf852408f2e174538bcd9b7fda1c5ae7, type: 3}
121+
m_HdrDebugViewPS: {fileID: 4800000, guid: 573620ae32aec764abd4d728906d2587, type: 3}
122+
m_ProbeVolumeSamplingDebugComputeShader: {fileID: 7200000, guid: 53626a513ea68ce47b59dc1299fe3959, type: 3}
123+
- rid: 7752762179098771464
124+
type: {class: UniversalRenderPipelineRuntimeXRResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
125+
data:
126+
m_xrOcclusionMeshPS: {fileID: 4800000, guid: 4431b1f1f743fbf4eb310a967890cbea, type: 3}
127+
m_xrMirrorViewPS: {fileID: 4800000, guid: d5a307c014552314b9f560906d708772, type: 3}
128+
m_xrMotionVector: {fileID: 4800000, guid: f89aac1e4f84468418fe30e611dff395, type: 3}
129+
- rid: 7752762179098771466
130+
type: {class: UniversalRenderPipelineRuntimeShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
131+
data:
132+
m_Version: 0
133+
m_FallbackErrorShader: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3}
134+
m_BlitHDROverlay: {fileID: 4800000, guid: a89bee29cffa951418fc1e2da94d1959, type: 3}
135+
m_CoreBlitPS: {fileID: 4800000, guid: 93446b5c5339d4f00b85c159e1159b7c, type: 3}
136+
m_CoreBlitColorAndDepthPS: {fileID: 4800000, guid: d104b2fc1ca6445babb8e90b0758136b, type: 3}
137+
m_SamplingPS: {fileID: 4800000, guid: 04c410c9937594faa893a11dceb85f7e, type: 3}
138+
- rid: 7752762179098771468
139+
type: {class: RenderGraphGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
140+
data:
141+
m_version: 0
142+
m_EnableCompilationCaching: 1
143+
m_EnableValidityChecks: 1
144+
- rid: 7752762179098771472
145+
type: {class: RenderGraphUtilsResources, ns: UnityEngine.Rendering.RenderGraphModule.Util, asm: Unity.RenderPipelines.Core.Runtime}
146+
data:
147+
m_Version: 0
148+
m_CoreCopyPS: {fileID: 4800000, guid: 12dc59547ea167a4ab435097dd0f9add, type: 3}
149+
- rid: 7752762179098771476
150+
type: {class: ShaderStrippingSetting, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
151+
data:
152+
m_Version: 0
153+
m_ExportShaderVariants: 1
154+
m_ShaderVariantLogLevel: 0
155+
m_StripRuntimeDebugShaders: 1
156+
- rid: 8416581642899947520
93157
type: {class: Renderer2DResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
94158
data:
95159
m_Version: 0
@@ -104,7 +168,7 @@ MonoBehaviour:
104168
m_DefaultLitMaterial: {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
105169
m_DefaultUnlitMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
106170
m_DefaultMaskMaterial: {fileID: 2100000, guid: 15d0c3709176029428a0da2f8cecf0b5, type: 2}
107-
- rid: 404630758195200115
171+
- rid: 8416581642899947521
108172
type: {class: UniversalRenderPipelineEditorShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
109173
data:
110174
m_AutodeskInteractive: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f, type: 3}
@@ -116,22 +180,22 @@ MonoBehaviour:
116180
m_DefaultSpeedTree7Shader: {fileID: 4800000, guid: 0f4122b9a743b744abe2fb6a0a88868b, type: 3}
117181
m_DefaultSpeedTree8Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec, type: 3}
118182
m_DefaultSpeedTree9Shader: {fileID: -6465566751694194690, guid: cbd3e1cc4ae141c42a30e33b4d666a61, type: 3}
119-
- rid: 404630758195200116
183+
- rid: 8416581642899947522
120184
type: {class: URPShaderStrippingSetting, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
121185
data:
122186
m_Version: 0
123187
m_StripUnusedPostProcessingVariants: 0
124188
m_StripUnusedVariants: 1
125189
m_StripScreenCoordOverrideVariants: 1
126-
- rid: 404630758195200117
190+
- rid: 8416581642899947523
127191
type: {class: UniversalRenderPipelineEditorMaterials, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
128192
data:
129193
m_DefaultMaterial: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
130194
m_DefaultParticleMaterial: {fileID: 2100000, guid: e823cd5b5d27c0f4b8256e7c12ee3e6d, type: 2}
131195
m_DefaultLineMaterial: {fileID: 2100000, guid: e823cd5b5d27c0f4b8256e7c12ee3e6d, type: 2}
132196
m_DefaultTerrainMaterial: {fileID: 2100000, guid: 594ea882c5a793440b60ff72d896021e, type: 2}
133197
m_DefaultDecalMaterial: {fileID: 2100000, guid: 31d0dcc6f2dd4e4408d18036a2c93862, type: 2}
134-
- rid: 404630758195200118
198+
- rid: 8416581642899947524
135199
type: {class: GPUResidentDrawerResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.GPUDriven.Runtime}
136200
data:
137201
m_Version: 0
@@ -144,21 +208,21 @@ MonoBehaviour:
144208
m_OcclusionCullingDebugKernels: {fileID: 7200000, guid: b23e766bcf50ca4438ef186b174557df, type: 3}
145209
m_DebugOcclusionTestPS: {fileID: 4800000, guid: d3f0849180c2d0944bc71060693df100, type: 3}
146210
m_DebugOccluderPS: {fileID: 4800000, guid: b3c92426a88625841ab15ca6a7917248, type: 3}
147-
- rid: 404630758195200119
211+
- rid: 8416581642899947525
148212
type: {class: ProbeVolumeRuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
149213
data:
150214
m_Version: 1
151215
probeVolumeBlendStatesCS: {fileID: 7200000, guid: a3f7b8c99de28a94684cb1daebeccf5d, type: 3}
152216
probeVolumeUploadDataCS: {fileID: 7200000, guid: 0951de5992461754fa73650732c4954c, type: 3}
153217
probeVolumeUploadDataL2CS: {fileID: 7200000, guid: 6196f34ed825db14b81fb3eb0ea8d931, type: 3}
154-
- rid: 404630758195200120
218+
- rid: 8416581642899947526
155219
type: {class: IncludeAdditionalRPAssets, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
156220
data:
157221
m_version: 0
158222
m_IncludeReferencedInScenes: 0
159223
m_IncludeAssetsByLabel: 0
160224
m_LabelToInclude:
161-
- rid: 404630758195200121
225+
- rid: 8416581642899947527
162226
type: {class: ProbeVolumeBakingResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
163227
data:
164228
m_Version: 1
@@ -171,7 +235,7 @@ MonoBehaviour:
171235
skyOcclusionRT: {fileID: -5126288278712620388, guid: 5a2a534753fbdb44e96c3c78b5a6999d, type: 3}
172236
renderingLayerCS: {fileID: -6772857160820960102, guid: 94a070d33e408384bafc1dea4a565df9, type: 3}
173237
renderingLayerRT: {fileID: -5126288278712620388, guid: 94a070d33e408384bafc1dea4a565df9, type: 3}
174-
- rid: 404630758195200122
238+
- rid: 8416581642899947528
175239
type: {class: ProbeVolumeDebugResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
176240
data:
177241
m_Version: 1
@@ -181,78 +245,14 @@ MonoBehaviour:
181245
probeVolumeOffsetDebugShader: {fileID: 4800000, guid: db8bd7436dc2c5f4c92655307d198381, type: 3}
182246
probeSamplingDebugMesh: {fileID: -3555484719484374845, guid: 20be25aac4e22ee49a7db76fb3df6de2, type: 3}
183247
numbersDisplayTex: {fileID: 2800000, guid: 73fe53b428c5b3440b7e87ee830b608a, type: 3}
184-
- rid: 404630758195200123
248+
- rid: 8416581642899947529
185249
type: {class: STP/RuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
186250
data:
187251
m_setupCS: {fileID: 7200000, guid: 33be2e9a5506b2843bdb2bdff9cad5e1, type: 3}
188252
m_preTaaCS: {fileID: 7200000, guid: a679dba8ec4d9ce45884a270b0e22dda, type: 3}
189253
m_taaCS: {fileID: 7200000, guid: 3923900e2b41b5e47bc25bfdcbcdc9e6, type: 3}
190-
- rid: 404630758195200124
254+
- rid: 8416581642899947530
191255
type: {class: ProbeVolumeGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
192256
data:
193257
m_Version: 1
194258
m_ProbeVolumeDisableStreamingAssets: 0
195-
- rid: 4582708665665192129
196-
type: {class: UniversalRendererResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
197-
data:
198-
m_Version: 0
199-
m_CopyDepthPS: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3}
200-
m_CameraMotionVector: {fileID: 4800000, guid: c56b7e0d4c7cb484e959caeeedae9bbf, type: 3}
201-
m_StencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3}
202-
m_DBufferClear: {fileID: 4800000, guid: f056d8bd2a1c7e44e9729144b4c70395, type: 3}
203-
- rid: 7752762179098771456
204-
type: {class: UniversalRenderPipelineRuntimeTextures, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
205-
data:
206-
m_Version: 1
207-
m_BlueNoise64LTex: {fileID: 2800000, guid: e3d24661c1e055f45a7560c033dbb837, type: 3}
208-
m_BayerMatrixTex: {fileID: 2800000, guid: f9ee4ed84c1d10c49aabb9b210b0fc44, type: 3}
209-
m_DebugFontTex: {fileID: 2800000, guid: 26a413214480ef144b2915d6ff4d0beb, type: 3}
210-
- rid: 7752762179098771459
211-
type: {class: URPDefaultVolumeProfileSettings, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
212-
data:
213-
m_Version: 0
214-
m_VolumeProfile: {fileID: 11400000, guid: 3f9215ea0144899419cfbc0957140d3f, type: 2}
215-
- rid: 7752762179098771461
216-
type: {class: RenderGraphSettings, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
217-
data:
218-
m_Version: 0
219-
m_EnableRenderCompatibilityMode: 0
220-
- rid: 7752762179098771462
221-
type: {class: UniversalRenderPipelineDebugShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
222-
data:
223-
m_DebugReplacementPS: {fileID: 4800000, guid: cf852408f2e174538bcd9b7fda1c5ae7, type: 3}
224-
m_HdrDebugViewPS: {fileID: 4800000, guid: 573620ae32aec764abd4d728906d2587, type: 3}
225-
m_ProbeVolumeSamplingDebugComputeShader: {fileID: 7200000, guid: 53626a513ea68ce47b59dc1299fe3959, type: 3}
226-
- rid: 7752762179098771464
227-
type: {class: UniversalRenderPipelineRuntimeXRResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
228-
data:
229-
m_xrOcclusionMeshPS: {fileID: 4800000, guid: 4431b1f1f743fbf4eb310a967890cbea, type: 3}
230-
m_xrMirrorViewPS: {fileID: 4800000, guid: d5a307c014552314b9f560906d708772, type: 3}
231-
m_xrMotionVector: {fileID: 4800000, guid: f89aac1e4f84468418fe30e611dff395, type: 3}
232-
- rid: 7752762179098771466
233-
type: {class: UniversalRenderPipelineRuntimeShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
234-
data:
235-
m_Version: 0
236-
m_FallbackErrorShader: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3}
237-
m_BlitHDROverlay: {fileID: 4800000, guid: a89bee29cffa951418fc1e2da94d1959, type: 3}
238-
m_CoreBlitPS: {fileID: 4800000, guid: 93446b5c5339d4f00b85c159e1159b7c, type: 3}
239-
m_CoreBlitColorAndDepthPS: {fileID: 4800000, guid: d104b2fc1ca6445babb8e90b0758136b, type: 3}
240-
m_SamplingPS: {fileID: 4800000, guid: 04c410c9937594faa893a11dceb85f7e, type: 3}
241-
- rid: 7752762179098771468
242-
type: {class: RenderGraphGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
243-
data:
244-
m_version: 0
245-
m_EnableCompilationCaching: 1
246-
m_EnableValidityChecks: 1
247-
- rid: 7752762179098771472
248-
type: {class: RenderGraphUtilsResources, ns: UnityEngine.Rendering.RenderGraphModule.Util, asm: Unity.RenderPipelines.Core.Runtime}
249-
data:
250-
m_Version: 0
251-
m_CoreCopyPS: {fileID: 4800000, guid: 12dc59547ea167a4ab435097dd0f9add, type: 3}
252-
- rid: 7752762179098771476
253-
type: {class: ShaderStrippingSetting, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
254-
data:
255-
m_Version: 0
256-
m_ExportShaderVariants: 1
257-
m_ShaderVariantLogLevel: 0
258-
m_StripRuntimeDebugShaders: 1

‎Assets/uDesktopMascot/Document.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)