diff --git a/GQ_URP/GQ/Assets/GameAssets/Materials/机柜内设备/Material #2763.mat b/GQ_URP/GQ/Assets/GameAssets/Materials/机柜内设备/Material #2763.mat index 1b3890dff..465de9d54 100644 --- a/GQ_URP/GQ/Assets/GameAssets/Materials/机柜内设备/Material #2763.mat +++ b/GQ_URP/GQ/Assets/GameAssets/Materials/机柜内设备/Material #2763.mat @@ -122,7 +122,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.49056602, g: 0.49056602, b: 0.49056602, a: 1} - - _Color: {r: 0.49056602, g: 0.49056602, b: 0.49056602, a: 1} + - _Color: {r: 0.49056596, g: 0.49056596, b: 0.49056596, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/GQ_URP/GQ/Assets/GameAssets/Materials/机柜内设备/dz2.mat b/GQ_URP/GQ/Assets/GameAssets/Materials/机柜内设备/dz2.mat index cd2ea794a..50edfee17 100644 --- a/GQ_URP/GQ/Assets/GameAssets/Materials/机柜内设备/dz2.mat +++ b/GQ_URP/GQ/Assets/GameAssets/Materials/机柜内设备/dz2.mat @@ -122,7 +122,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.07450981, g: 0.32941177, b: 0.23137255, a: 0.5019608} - - _Color: {r: 0.07450981, g: 0.32941177, b: 0.23137255, a: 0.5019608} + - _Color: {r: 0.07450979, g: 0.32941175, b: 0.2313725, a: 0.5019608} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/GQ_URP/GQ/Assets/GameAssets/Materials/机柜内设备/gq_03.mat b/GQ_URP/GQ/Assets/GameAssets/Materials/机柜内设备/gq_03.mat index 73442e47b..f31200d16 100644 --- a/GQ_URP/GQ/Assets/GameAssets/Materials/机柜内设备/gq_03.mat +++ b/GQ_URP/GQ/Assets/GameAssets/Materials/机柜内设备/gq_03.mat @@ -123,7 +123,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.8113208, g: 0.8113208, b: 0.8113208, a: 1} - - _Color: {r: 0.8113208, g: 0.8113208, b: 0.8113208, a: 1} + - _Color: {r: 0.8113207, g: 0.8113207, b: 0.8113207, a: 1} - _EmissionColor: {r: 0.2924528, g: 0.2924528, b: 0.2924528, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/GQ_URP/GQ/Assets/GameAssets/Materials/机柜内设备/gq_141.mat b/GQ_URP/GQ/Assets/GameAssets/Materials/机柜内设备/gq_141.mat index beaf7d80d..be87b0493 100644 --- a/GQ_URP/GQ/Assets/GameAssets/Materials/机柜内设备/gq_141.mat +++ b/GQ_URP/GQ/Assets/GameAssets/Materials/机柜内设备/gq_141.mat @@ -123,7 +123,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.9575472, g: 0.96185535, b: 1, a: 1} - - _Color: {r: 0.9575472, g: 0.96185535, b: 1, a: 1} + - _Color: {r: 0.9575471, g: 0.96185535, b: 1, a: 1} - _EmissionColor: {r: 0.14150941, g: 0.14150941, b: 0.14150941, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/GQ_URP/GQ/Assets/GameAssets/Materials/机柜内设备/gq_20.mat b/GQ_URP/GQ/Assets/GameAssets/Materials/机柜内设备/gq_20.mat index 5034751ed..58d86ec22 100644 --- a/GQ_URP/GQ/Assets/GameAssets/Materials/机柜内设备/gq_20.mat +++ b/GQ_URP/GQ/Assets/GameAssets/Materials/机柜内设备/gq_20.mat @@ -123,7 +123,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.97723174, g: 0.9669811, b: 1, a: 1} - - _Color: {r: 0.97723174, g: 0.9669811, b: 1, a: 1} + - _Color: {r: 0.9772317, g: 0.9669811, b: 1, a: 1} - _EmissionColor: {r: 0.10811279, g: 0.10811279, b: 0.10811279, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/GQ_URP/GQ/Assets/GameAssets/Materials/机柜内设备/gq_79.mat b/GQ_URP/GQ/Assets/GameAssets/Materials/机柜内设备/gq_79.mat index f674b8f26..f218ee5b6 100644 --- a/GQ_URP/GQ/Assets/GameAssets/Materials/机柜内设备/gq_79.mat +++ b/GQ_URP/GQ/Assets/GameAssets/Materials/机柜内设备/gq_79.mat @@ -122,7 +122,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.7830189, g: 0.7830189, b: 0.7830189, a: 1} - - _Color: {r: 0.7830189, g: 0.7830189, b: 0.7830189, a: 1} + - _Color: {r: 0.7830188, g: 0.7830188, b: 0.7830188, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/GQ_URP/GQ/Assets/GameAssets/Models/机房结构/摄像头/Materials/hei kaoqi 01.mat b/GQ_URP/GQ/Assets/GameAssets/Models/机房结构/摄像头/Materials/hei kaoqi 01.mat index b714f276f..f79053fd4 100644 --- a/GQ_URP/GQ/Assets/GameAssets/Models/机房结构/摄像头/Materials/hei kaoqi 01.mat +++ b/GQ_URP/GQ/Assets/GameAssets/Models/机房结构/摄像头/Materials/hei kaoqi 01.mat @@ -112,7 +112,7 @@ Material: - _ZWrite: 0 m_Colors: - _BaseColor: {r: 0.4233268, g: 0.559804, b: 0.5943396, a: 0.52991533} - - _Color: {r: 0.4233268, g: 0.559804, b: 0.5943396, a: 0.52991533} + - _Color: {r: 0.42332676, g: 0.559804, b: 0.5943396, a: 0.52991533} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/GQ_URP/GQ/Assets/Resources/Materials/C4.mat b/GQ_URP/GQ/Assets/Resources/Materials/C4.mat index 5eeccafdf..9bdc03357 100644 --- a/GQ_URP/GQ/Assets/Resources/Materials/C4.mat +++ b/GQ_URP/GQ/Assets/Resources/Materials/C4.mat @@ -122,7 +122,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.43921566, g: 0.9411765, b: 0.2862745, a: 1} - - _Color: {r: 0.43921566, g: 0.9411765, b: 0.2862745, a: 1} + - _Color: {r: 0.43921563, g: 0.9411765, b: 0.28627446, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP4.unity b/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP4.unity index 6b6516291..5c7fde25b 100644 --- a/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP4.unity +++ b/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP4.unity @@ -19306,8 +19306,8 @@ MonoBehaviour: m_TargetGraphic: {fileID: 59510595} m_HandleRect: {fileID: 59510594} m_Direction: 2 - m_Value: 0 - m_Size: 0.9999919 + m_Value: -0.008547009 + m_Size: 0.99999195 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -20513,7 +20513,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: 0.0035793786} + m_AnchoredPosition: {x: -0.015625, y: 0.003532614} m_SizeDelta: {x: 318.95, y: 443.74} m_Pivot: {x: 0.5, y: 1} --- !u!114 &413199003 @@ -50363,7 +50363,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 162051362} m_HandleRect: {fileID: 162051361} m_Direction: 2 - m_Value: 0 + m_Value: 1 m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: @@ -83825,8 +83825,8 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1327205619} m_HandleRect: {fileID: 1327205618} m_Direction: 0 - m_Value: 0.5 - m_Size: 0.9999916 + m_Value: 6.3965516 + m_Size: 0.99999166 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -159511,7 +159511,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -63.99951, y: 487} + m_AnchoredPosition: {x: -63.999756, y: 487} m_SizeDelta: {x: -1303.1125, y: -1040} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1332666221677478668 @@ -164977,7 +164977,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: -802, y: -2} + m_AnchoredPosition: {x: -802.0001, y: -1.999939} m_SizeDelta: {x: 216, y: 581} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1332666221965688364 @@ -171028,7 +171028,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 441.40015, y: -23.899902} + m_AnchoredPosition: {x: 441.40015, y: -23.899841} m_SizeDelta: {x: 709, y: 664} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1332666222344351225 diff --git a/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP4/LightingData.asset b/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP4/LightingData.asset index 57438c8bb..8be19fc13 100644 Binary files a/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP4/LightingData.asset and b/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP4/LightingData.asset differ diff --git a/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP4/Lightmap-0_comp_light.exr b/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP4/Lightmap-0_comp_light.exr index d619d8f0e..e9da89a29 100644 Binary files a/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP4/Lightmap-0_comp_light.exr and b/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP4/Lightmap-0_comp_light.exr differ diff --git a/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP4/Lightmap-1_comp_light.exr b/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP4/Lightmap-1_comp_light.exr index 3002a2f6b..74e75698a 100644 Binary files a/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP4/Lightmap-1_comp_light.exr and b/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP4/Lightmap-1_comp_light.exr differ diff --git a/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP4/Lightmap-2_comp_light.exr b/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP4/Lightmap-2_comp_light.exr index 3b17593f5..2f45dcf39 100644 Binary files a/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP4/Lightmap-2_comp_light.exr and b/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP4/Lightmap-2_comp_light.exr differ diff --git a/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP4/Lightmap-3_comp_light.exr b/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP4/Lightmap-3_comp_light.exr index 7f7e4d49a..6d5fb920c 100644 Binary files a/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP4/Lightmap-3_comp_light.exr and b/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP4/Lightmap-3_comp_light.exr differ diff --git a/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP4/Lightmap-4_comp_light.exr b/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP4/Lightmap-4_comp_light.exr index 02d3be52e..190de045f 100644 Binary files a/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP4/Lightmap-4_comp_light.exr and b/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP4/Lightmap-4_comp_light.exr differ diff --git a/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP4/ReflectionProbe-0.exr b/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP4/ReflectionProbe-0.exr index c1bef52c5..ce6b6eb79 100644 Binary files a/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP4/ReflectionProbe-0.exr and b/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP4/ReflectionProbe-0.exr differ diff --git a/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP4/ReflectionProbe-1.exr b/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP4/ReflectionProbe-1.exr index b6623b116..4fe7707de 100644 Binary files a/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP4/ReflectionProbe-1.exr and b/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP4/ReflectionProbe-1.exr differ diff --git a/GQ_URP/GQ/Assets/Scenes/Volume/GQ Profile Global.asset b/GQ_URP/GQ/Assets/Scenes/Volume/GQ Profile Global.asset index fc07c7154..3c9b6e03e 100644 --- a/GQ_URP/GQ/Assets/Scenes/Volume/GQ Profile Global.asset +++ b/GQ_URP/GQ/Assets/Scenes/Volume/GQ Profile Global.asset @@ -53,7 +53,7 @@ MonoBehaviour: active: 1 postExposure: m_OverrideState: 1 - m_Value: 0 + m_Value: 0.1 contrast: m_OverrideState: 0 m_Value: 0 @@ -100,10 +100,10 @@ MonoBehaviour: active: 1 threshold: m_OverrideState: 1 - m_Value: 1 + m_Value: 0.95 intensity: m_OverrideState: 1 - m_Value: 1 + m_Value: 2 scatter: m_OverrideState: 1 m_Value: 0.5 diff --git a/GQ_URP/GQ/Assets/Settings/New Custom Universal Renderer Data.asset b/GQ_URP/GQ/Assets/Settings/New Custom Universal Renderer Data.asset new file mode 100644 index 000000000..3c813ba7d --- /dev/null +++ b/GQ_URP/GQ/Assets/Settings/New Custom Universal Renderer Data.asset @@ -0,0 +1,82 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: de640fe3d0db1804a85f9fc8f5cadab6, type: 3} + m_Name: New Custom Universal Renderer Data + m_EditorClassIdentifier: + debugShaders: + debugReplacementPS: {fileID: 4800000, guid: cf852408f2e174538bcd9b7fda1c5ae7, + type: 3} + m_RendererFeatures: + - {fileID: 6811753016355927131} + m_RendererFeatureMap: 5b3497354735885e + m_UseNativeRenderPass: 0 + postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} + xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2} + shaders: + blitPS: {fileID: 4800000, guid: c17132b1f77d20942aa75f8429c0f8bc, type: 3} + copyDepthPS: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3} + screenSpaceShadowPS: {fileID: 0} + samplingPS: {fileID: 4800000, guid: 04c410c9937594faa893a11dceb85f7e, type: 3} + stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3} + fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3} + materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3} + coreBlitPS: {fileID: 4800000, guid: 93446b5c5339d4f00b85c159e1159b7c, type: 3} + coreBlitColorAndDepthPS: {fileID: 4800000, guid: d104b2fc1ca6445babb8e90b0758136b, + type: 3} + cameraMotionVector: {fileID: 4800000, guid: c56b7e0d4c7cb484e959caeeedae9bbf, + type: 3} + objectMotionVector: {fileID: 4800000, guid: 7b3ede40266cd49a395def176e1bc486, + type: 3} + m_AssetVersion: 1 + m_OpaqueLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_TransparentLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_DefaultStencilState: + overrideStencilState: 0 + stencilReference: 0 + stencilCompareFunction: 8 + passOperation: 2 + failOperation: 0 + zFailOperation: 0 + m_ShadowTransparentReceive: 1 + m_RenderingMode: 0 + m_DepthPrimingMode: 0 + m_AccurateGbufferNormals: 0 + m_ClusteredRendering: 0 + m_TileSize: 32 + m_IntermediateTextureMode: 1 +--- !u!114 &6811753016355927131 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f62c9c65cf3354c93be831c8bc075510, type: 3} + m_Name: ScreenSpaceAmbientOcclusion + m_EditorClassIdentifier: + m_Active: 1 + m_Shader: {fileID: 4800000, guid: 0849e84e3d62649e8882e9d6f056a017, type: 3} + m_Settings: + Downsample: 0 + AfterOpaque: 0 + Source: 1 + NormalSamples: 1 + Intensity: 3 + DirectLightingStrength: 0.25 + Radius: 0.035 + SampleCount: 4 diff --git a/GQ_URP/GQ/Assets/Settings/New Custom Universal Renderer Data.asset.meta b/GQ_URP/GQ/Assets/Settings/New Custom Universal Renderer Data.asset.meta new file mode 100644 index 000000000..8e59cfbc0 --- /dev/null +++ b/GQ_URP/GQ/Assets/Settings/New Custom Universal Renderer Data.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: de1b57f425f79ed4eb84abbaf58a8b95 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/GQ_URP/GQ/Assets/Settings/URP-Balanced-Renderer.asset b/GQ_URP/GQ/Assets/Settings/URP-Balanced-Renderer.asset index 9af98352c..1ab791934 100644 --- a/GQ_URP/GQ/Assets/Settings/URP-Balanced-Renderer.asset +++ b/GQ_URP/GQ/Assets/Settings/URP-Balanced-Renderer.asset @@ -15,13 +15,13 @@ MonoBehaviour: m_Active: 1 m_Shader: {fileID: 4800000, guid: 0849e84e3d62649e8882e9d6f056a017, type: 3} m_Settings: - Downsample: 1 + Downsample: 0 AfterOpaque: 0 Source: 0 - NormalSamples: 0 - Intensity: 0.5 - DirectLightingStrength: 0.25 - Radius: 0.25 + NormalSamples: 2 + Intensity: 1 + DirectLightingStrength: 1 + Radius: 0.05 SampleCount: 4 --- !u!114 &11400000 MonoBehaviour: @@ -62,7 +62,7 @@ MonoBehaviour: m_AssetVersion: 1 m_OpaqueLayerMask: serializedVersion: 2 - m_Bits: 4294967295 + m_Bits: 2147483647 m_TransparentLayerMask: serializedVersion: 2 m_Bits: 4294967295 @@ -75,7 +75,7 @@ MonoBehaviour: zFailOperation: 0 m_ShadowTransparentReceive: 1 m_RenderingMode: 0 - m_DepthPrimingMode: 1 + m_DepthPrimingMode: 2 m_AccurateGbufferNormals: 0 m_ClusteredRendering: 0 m_TileSize: 32 diff --git a/GQ_URP/GQ/Assets/Settings/URP-Balanced.asset b/GQ_URP/GQ/Assets/Settings/URP-Balanced.asset index a4c84ef4a..068fd20f9 100644 --- a/GQ_URP/GQ/Assets/Settings/URP-Balanced.asset +++ b/GQ_URP/GQ/Assets/Settings/URP-Balanced.asset @@ -17,7 +17,7 @@ MonoBehaviour: m_RendererType: 1 m_RendererData: {fileID: 0} m_RendererDataList: - - {fileID: 11400000, guid: e634585d5c4544dd297acaee93dc2beb, type: 2} + - {fileID: 11400000, guid: de1b57f425f79ed4eb84abbaf58a8b95, type: 2} m_DefaultRendererIndex: 0 m_RequireDepthTexture: 0 m_RequireOpaqueTexture: 0 @@ -25,7 +25,7 @@ MonoBehaviour: m_SupportsTerrainHoles: 1 m_StoreActionsOptimization: 0 m_SupportsHDR: 1 - m_MSAA: 1 + m_MSAA: 2 m_RenderScale: 1 m_UpscalingFilter: 0 m_FsrOverrideSharpness: 0 diff --git a/GQ_URP/GQ/Assets/Settings/URP-HighFidelity.asset b/GQ_URP/GQ/Assets/Settings/URP-HighFidelity.asset index 7dc1b097e..17f8fb449 100644 --- a/GQ_URP/GQ/Assets/Settings/URP-HighFidelity.asset +++ b/GQ_URP/GQ/Assets/Settings/URP-HighFidelity.asset @@ -31,21 +31,12 @@ MonoBehaviour: m_FsrOverrideSharpness: 0 m_FsrSharpness: 0.92 m_MainLightRenderingMode: 1 -<<<<<<< HEAD - m_MainLightShadowsSupported: 0 - m_MainLightShadowmapResolution: 4096 - m_AdditionalLightsRenderingMode: 1 - m_AdditionalLightsPerObjectLimit: 8 - m_AdditionalLightShadowsSupported: 0 - m_AdditionalLightsShadowmapResolution: 4096 -======= m_MainLightShadowsSupported: 1 m_MainLightShadowmapResolution: 1024 m_AdditionalLightsRenderingMode: 1 m_AdditionalLightsPerObjectLimit: 8 m_AdditionalLightShadowsSupported: 1 m_AdditionalLightsShadowmapResolution: 1024 ->>>>>>> 6c707e873994467ed701b9ec347fe34bce7f3560 m_AdditionalLightsShadowResolutionTierLow: 128 m_AdditionalLightsShadowResolutionTierMedium: 256 m_AdditionalLightsShadowResolutionTierHigh: 512 @@ -62,11 +53,7 @@ MonoBehaviour: m_SoftShadowsSupported: 1 m_ConservativeEnclosingSphere: 0 m_NumIterationsEnclosingSphere: 64 -<<<<<<< HEAD - m_AdditionalLightsCookieResolution: 4096 -======= m_AdditionalLightsCookieResolution: 1024 ->>>>>>> 6c707e873994467ed701b9ec347fe34bce7f3560 m_AdditionalLightsCookieFormat: 4 m_UseSRPBatcher: 1 m_SupportsDynamicBatching: 0 diff --git a/GQ_URP/GQ/ProjectSettings/EditorBuildSettings.asset b/GQ_URP/GQ/ProjectSettings/EditorBuildSettings.asset index 7f5a0729d..124ad786d 100644 --- a/GQ_URP/GQ/ProjectSettings/EditorBuildSettings.asset +++ b/GQ_URP/GQ/ProjectSettings/EditorBuildSettings.asset @@ -6,11 +6,6 @@ EditorBuildSettings: serializedVersion: 2 m_Scenes: - enabled: 1 -<<<<<<< HEAD - path: Assets/Scenes/SampleSceneG_URP5.unity - guid: 81458b866be8c5a4cb8d1e08fdf11d6c -======= path: Assets/Scenes/SampleSceneG_URP4.unity guid: ba70b4e71ee362f48950028ee70572fa ->>>>>>> 6c707e873994467ed701b9ec347fe34bce7f3560 m_configObjects: {} diff --git a/GQ_URP/GQ/ProjectSettings/GraphicsSettings.asset b/GQ_URP/GQ/ProjectSettings/GraphicsSettings.asset index b2fbb1b79..4108b461b 100644 --- a/GQ_URP/GQ/ProjectSettings/GraphicsSettings.asset +++ b/GQ_URP/GQ/ProjectSettings/GraphicsSettings.asset @@ -60,7 +60,7 @@ GraphicsSettings: m_FogKeepExp: 1 m_FogKeepExp2: 1 m_AlbedoSwatchInfos: [] - m_LightsUseLinearIntensity: 0 + m_LightsUseLinearIntensity: 1 m_LightsUseColorTemperature: 1 m_DefaultRenderingLayerMask: 1 m_LogWhenShaderIsCompiled: 0 diff --git a/GQ_URP/GQ/ProjectSettings/ProjectSettings.asset b/GQ_URP/GQ/ProjectSettings/ProjectSettings.asset index 368c5fc40..32da1bc44 100644 --- a/GQ_URP/GQ/ProjectSettings/ProjectSettings.asset +++ b/GQ_URP/GQ/ProjectSettings/ProjectSettings.asset @@ -53,7 +53,7 @@ PlayerSettings: defaultScreenWidthWeb: 1920 defaultScreenHeightWeb: 1080 m_StereoRenderingPath: 0 - m_ActiveColorSpace: 0 + m_ActiveColorSpace: 1 m_MTRendering: 1 mipStripping: 0 numberOfMipsStripped: 0 @@ -178,7 +178,7 @@ PlayerSettings: AndroidTargetSdkVersion: 0 AndroidPreferredInstallLocation: 1 aotOptions: - stripEngineCode: 1 + stripEngineCode: 0 iPhoneStrippingLevel: 0 iPhoneScriptCallOptimization: 0 ForceInternetPermission: 0 diff --git a/GQ_URP/GQ/ProjectSettings/QualitySettings.asset b/GQ_URP/GQ/ProjectSettings/QualitySettings.asset index bf593ffe5..a15ad7271 100644 --- a/GQ_URP/GQ/ProjectSettings/QualitySettings.asset +++ b/GQ_URP/GQ/ProjectSettings/QualitySettings.asset @@ -4,7 +4,7 @@ QualitySettings: m_ObjectHideFlags: 0 serializedVersion: 5 - m_CurrentQuality: 2 + m_CurrentQuality: 1 m_QualitySettings: - serializedVersion: 2 name: Performant @@ -54,11 +54,11 @@ QualitySettings: shadowNearPlaneOffset: 3 shadowCascade2Split: 0.33333334 shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} - shadowmaskMode: 0 + shadowmaskMode: 1 skinWeights: 4 textureQuality: 0 - anisotropicTextures: 1 - antiAliasing: 0 + anisotropicTextures: 2 + antiAliasing: 2 softParticles: 0 softVegetation: 0 realtimeReflectionProbes: 0 @@ -95,7 +95,7 @@ QualitySettings: skinWeights: 255 textureQuality: 0 anisotropicTextures: 2 - antiAliasing: 2 + antiAliasing: 0 softParticles: 0 softVegetation: 1 realtimeReflectionProbes: 1 @@ -114,7 +114,7 @@ QualitySettings: asyncUploadBufferSize: 16 asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 - customRenderPipeline: {fileID: 11400000, guid: 7b7fd9122c28c4d15b667c7040e3b3fd, + customRenderPipeline: {fileID: 11400000, guid: e1260c1148f6143b28bae5ace5e9c5d1, type: 2} excludedTargetPlatforms: [] m_PerPlatformDefaultQuality: @@ -128,7 +128,7 @@ QualitySettings: PS5: 2 Server: 1 Stadia: 2 - Standalone: 2 + Standalone: 1 WebGL: 1 Windows Store Apps: 2 XboxOne: 2