diff --git a/GQ_URP/GQ/Assets/Model/Materials/gq_142.mat b/GQ_URP/GQ/Assets/Model/Materials/gq_142.mat index 9c35427fd..9ea6a7667 100644 --- a/GQ_URP/GQ/Assets/Model/Materials/gq_142.mat +++ b/GQ_URP/GQ/Assets/Model/Materials/gq_142.mat @@ -124,6 +124,6 @@ Material: m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0.8559341, g: 0.8559341, b: 0.8440461, a: 1} + - _EmissionColor: {r: 5.2164755, g: 5.2164755, b: 5.189163, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/GQ_URP/GQ/Assets/Model/Materials/gq_20.mat b/GQ_URP/GQ/Assets/Model/Materials/gq_20.mat index e55d3886e..523ebf295 100644 --- a/GQ_URP/GQ/Assets/Model/Materials/gq_20.mat +++ b/GQ_URP/GQ/Assets/Model/Materials/gq_20.mat @@ -22,9 +22,10 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: gq_20 m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - m_ValidKeywords: [] + m_ValidKeywords: + - _EMISSION m_InvalidKeywords: [] - m_LightmapFlags: 4 + m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 @@ -123,6 +124,6 @@ Material: m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _EmissionColor: {r: 0.09411765, g: 0.09411765, b: 0.09411765, 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/PP Profile_YCJ.asset b/GQ_URP/GQ/Assets/Scenes/SampleSceneG/PP Profile_YCJ.asset index d02371862..8342fdaf8 100644 --- a/GQ_URP/GQ/Assets/Scenes/SampleSceneG/PP Profile_YCJ.asset +++ b/GQ_URP/GQ/Assets/Scenes/SampleSceneG/PP Profile_YCJ.asset @@ -18,10 +18,51 @@ MonoBehaviour: m_Value: {x: 1, y: 1, z: 1, w: 0} gamma: m_OverrideState: 1 - m_Value: {x: 1, y: 1, z: 1, w: 0.3236797} + m_Value: {x: 1, y: 1, z: 1, w: 0.28092638} gain: m_OverrideState: 1 - m_Value: {x: 1, y: 1, z: 1, w: -0.08517886} + m_Value: {x: 1, y: 1, z: 1, w: 0.05163173} +--- !u!114 &-8147568881321564271 +MonoBehaviour: + m_ObjectHideFlags: 3 + 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: 81180773991d8724ab7f2d216912b564, type: 3} + m_Name: ChromaticAberration + m_EditorClassIdentifier: + active: 1 + intensity: + m_OverrideState: 1 + m_Value: 0.109 +--- !u!114 &-3815690716579302335 +MonoBehaviour: + m_ObjectHideFlags: 3 + 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: 29fa0085f50d5e54f8144f766051a691, type: 3} + m_Name: FilmGrain + m_EditorClassIdentifier: + active: 0 + type: + m_OverrideState: 1 + m_Value: 1 + intensity: + m_OverrideState: 1 + m_Value: 0.287 + response: + m_OverrideState: 1 + m_Value: 0.99 + texture: + m_OverrideState: 0 + m_Value: {fileID: 0} --- !u!114 &-3479103148383972483 MonoBehaviour: m_ObjectHideFlags: 3 @@ -80,6 +121,8 @@ MonoBehaviour: - {fileID: -9109986005977236243} - {fileID: 7825107694741062558} - {fileID: -3479103148383972483} + - {fileID: -3815690716579302335} + - {fileID: -8147568881321564271} --- !u!114 &2962224411705097507 MonoBehaviour: m_ObjectHideFlags: 3 @@ -98,7 +141,7 @@ MonoBehaviour: m_Value: 1 intensity: m_OverrideState: 1 - m_Value: 3.67 + m_Value: 1 scatter: m_OverrideState: 1 m_Value: 0.7 @@ -117,6 +160,7 @@ MonoBehaviour: dirtTexture: m_OverrideState: 0 m_Value: {fileID: 0} + dimension: 1 dirtIntensity: m_OverrideState: 0 m_Value: 0 @@ -172,7 +216,7 @@ MonoBehaviour: m_Value: {r: 0.20754719, g: 0.20754719, b: 0.20754719, a: 1} highlights: m_OverrideState: 1 - m_Value: {r: 0.65882355, g: 0.558445, b: 0.52156866, a: 1} + m_Value: {r: 0.5660378, g: 0.5455331, b: 0.4565682, a: 1} balance: m_OverrideState: 1 m_Value: 47.2 diff --git a/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP.unity b/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP.unity index 637c668ec..959e661c3 100644 --- a/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP.unity +++ b/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP.unity @@ -1299,6 +1299,71 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &8064311 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8064313} + - component: {fileID: 8064312} + m_Layer: 0 + m_Name: Reflection Probe (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!215 &8064312 +ReflectionProbe: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8064311} + m_Enabled: 1 + serializedVersion: 2 + m_Type: 0 + m_Mode: 0 + m_RefreshMode: 0 + m_TimeSlicingMode: 0 + m_Resolution: 1024 + m_UpdateFrequency: 0 + m_BoxSize: {x: 0.7214041, y: 1.1034918, z: 0.8635988} + m_BoxOffset: {x: -0.36070204, y: -0.5517459, z: -0.4317994} + m_NearClip: 0.3 + m_FarClip: 1000 + m_ShadowDistance: 100 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_IntensityMultiplier: 1 + m_BlendDistance: 1 + m_HDR: 1 + m_BoxProjection: 0 + m_RenderDynamicObjects: 0 + m_UseOcclusionCulling: 1 + m_Importance: 1 + m_CustomBakedTexture: {fileID: 0} +--- !u!4 &8064313 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8064311} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 18.24, y: 1.111, z: -12.953} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 16 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &8112146 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4746964813134735361, guid: c8f09218a803c944e84c2336104ca2f9, @@ -2201,7 +2266,7 @@ ReflectionProbe: m_Mode: 0 m_RefreshMode: 0 m_TimeSlicingMode: 0 - m_Resolution: 128 + m_Resolution: 2048 m_UpdateFrequency: 0 m_BoxSize: {x: 28.321762, y: 6.2816143, z: 9.2203865} m_BoxOffset: {x: -12.60717, y: 0.07746625, z: -0.8546047} @@ -2234,7 +2299,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 34 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &13474923 stripped GameObject: @@ -15464,7 +15529,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 20 + m_RootOrder: 25 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &137188656 MonoBehaviour: @@ -15473,7 +15538,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 137188653} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: dda2647c5b2efd54ca9422f5e246bd75, type: 3} m_Name: @@ -15991,7 +16056,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 23 + m_RootOrder: 28 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &140293605 MonoBehaviour: @@ -16000,7 +16065,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 140293602} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: dda2647c5b2efd54ca9422f5e246bd75, type: 3} m_Name: @@ -24971,7 +25036,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 17 + m_RootOrder: 22 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &219085156 MonoBehaviour: @@ -24980,7 +25045,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 219085153} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: dda2647c5b2efd54ca9422f5e246bd75, type: 3} m_Name: @@ -78888,7 +78953,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &690094444 Transform: m_ObjectHideFlags: 0 @@ -78902,7 +78967,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 29 + m_RootOrder: 34 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &690575359 stripped GameObject: @@ -80376,7 +80441,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 15 + m_RootOrder: 20 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!114 &705507996 MonoBehaviour: @@ -86187,7 +86252,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 21 + m_RootOrder: 26 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &749989404 MonoBehaviour: @@ -86196,7 +86261,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 749989401} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: dda2647c5b2efd54ca9422f5e246bd75, type: 3} m_Name: @@ -91256,7 +91321,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 32 + m_RootOrder: 37 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -100692,7 +100757,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &875165850 Transform: m_ObjectHideFlags: 0 @@ -100706,7 +100771,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 30 + m_RootOrder: 35 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &875466700 stripped GameObject: @@ -111336,6 +111401,7 @@ GameObject: - component: {fileID: 963194232} - component: {fileID: 963194233} - component: {fileID: 963194234} + - component: {fileID: 963194235} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -111564,6 +111630,23 @@ MonoBehaviour: blendDistance: 0 weight: 1 sharedProfile: {fileID: 11400000, guid: e086930db568b364d94a83978a60a87c, type: 2} +--- !u!114 &963194235 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 963194225} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8b9a305e18de0c04dbd257a21cd47087, type: 3} + m_Name: + m_EditorClassIdentifier: + sharedProfile: {fileID: 11400000, guid: 6b1e9f503d70f3041a15a0043c31ae8e, type: 2} + isGlobal: 0 + blendDistance: 0 + weight: 1 + priority: 0 --- !u!1 &963723682 GameObject: m_ObjectHideFlags: 0 @@ -119979,7 +120062,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 22 + m_RootOrder: 27 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1036835678 MonoBehaviour: @@ -119988,7 +120071,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1036835675} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: dda2647c5b2efd54ca9422f5e246bd75, type: 3} m_Name: @@ -122268,7 +122351,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 18 + m_RootOrder: 23 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1056840580 MonoBehaviour: @@ -122277,7 +122360,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1056840577} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: dda2647c5b2efd54ca9422f5e246bd75, type: 3} m_Name: @@ -133953,7 +134036,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 33 + m_RootOrder: 38 m_LocalEulerAnglesHint: {x: 18.578, y: -129.436, z: 0} --- !u!1 &1161967865 GameObject: @@ -136096,7 +136179,7 @@ Light: m_Type: 3 m_Shape: 0 m_Color: {r: 1, g: 1, b: 1, a: 1} - m_Intensity: 1.1 + m_Intensity: 1.3 m_Range: 10 m_SpotAngle: 30 m_InnerSpotAngle: 21.80208 @@ -136159,7 +136242,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 35 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!1 &1179204583 stripped GameObject: @@ -166473,7 +166556,7 @@ Transform: - {fileID: 743945424} - {fileID: 442675218} m_Father: {fileID: 0} - m_RootOrder: 27 + m_RootOrder: 32 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1459980779 stripped GameObject: @@ -175301,7 +175384,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &1535147233 Transform: m_ObjectHideFlags: 0 @@ -175315,7 +175398,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 28 + m_RootOrder: 33 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1536359357 stripped GameObject: @@ -194527,7 +194610,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 19 + m_RootOrder: 24 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1706230386 MonoBehaviour: @@ -194536,7 +194619,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1706230383} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: dda2647c5b2efd54ca9422f5e246bd75, type: 3} m_Name: @@ -209435,6 +209518,121 @@ MonoBehaviour: ID: 0 instruct: {fileID: 710588974} uPosManager: {fileID: 0} +--- !u!1 &1829015040 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1829015043} + - component: {fileID: 1829015042} + - component: {fileID: 1829015041} + m_Layer: 0 + m_Name: Area Light (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1829015041 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1829015040} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Version: 1 + m_UsePipelineSettings: 1 + m_AdditionalLightsShadowResolutionTier: 2 + m_LightLayerMask: 1 + m_CustomShadowLayers: 0 + m_ShadowLayerMask: 1 + m_LightCookieSize: {x: 1, y: 1} + m_LightCookieOffset: {x: 0, y: 0} +--- !u!108 &1829015042 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1829015040} + m_Enabled: 1 + serializedVersion: 10 + m_Type: 3 + m_Shape: 0 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Intensity: 1.3 + m_Range: 10 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize: 10 + m_Shadows: + m_Type: 2 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 2 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 17.146526, y: 8.54649} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 1.02e-43, y: 0, z: 0, w: 3.775098e-10} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ShadowRadius: 0 + m_ShadowAngle: 0 +--- !u!4 &1829015043 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1829015040} + m_LocalRotation: {x: 0.70710677, y: -0, z: -0, w: 0.7071068} + m_LocalPosition: {x: 9.59, y: 3.449, z: -10.88} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 15 + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!1 &1829928731 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7850233565244512468, guid: c8f09218a803c944e84c2336104ca2f9, @@ -212840,7 +213038,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 25 + m_RootOrder: 30 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1859118122 MonoBehaviour: @@ -212849,7 +213047,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1859118119} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: dda2647c5b2efd54ca9422f5e246bd75, type: 3} m_Name: @@ -215188,7 +215386,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 16 + m_RootOrder: 21 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1877492179 MonoBehaviour: @@ -215197,7 +215395,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1877492176} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: dda2647c5b2efd54ca9422f5e246bd75, type: 3} m_Name: @@ -226853,7 +227051,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 26 + m_RootOrder: 31 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1982429805 GameObject: @@ -230747,7 +230945,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 12 + m_RootOrder: 17 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2017627543 GameObject: @@ -231072,7 +231270,7 @@ Light: m_Type: 3 m_Shape: 0 m_Color: {r: 1, g: 1, b: 1, a: 1} - m_Intensity: 1 + m_Intensity: 0.2 m_Range: 10 m_SpotAngle: 30 m_InnerSpotAngle: 21.80208 @@ -231117,7 +231315,7 @@ Light: m_BounceIntensity: 1 m_ColorTemperature: 6570 m_UseColorTemperature: 0 - m_BoundingSphereOverride: {x: 1.02e-43, y: 0, z: 0, w: 6.3293505e+30} + m_BoundingSphereOverride: {x: 1.02e-43, y: 0, z: 0, w: 3.775098e-10} m_UseBoundingSphereOverride: 0 m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 @@ -231130,12 +231328,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2020136225} m_LocalRotation: {x: 0.70710677, y: -0, z: -0, w: 0.7071068} - m_LocalPosition: {x: 9.59, y: 3.25, z: -10.88} + m_LocalPosition: {x: 9.59, y: 3.249, z: -10.88} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 36 + m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!114 &2020136228 MonoBehaviour: @@ -238390,7 +238588,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 24 + m_RootOrder: 29 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2098930745 MonoBehaviour: @@ -238399,7 +238597,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2098930742} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: dda2647c5b2efd54ca9422f5e246bd75, type: 3} m_Name: @@ -337101,7 +337299,7 @@ PrefabInstance: - target: {fileID: 2073144591439938601, guid: 0c742c3c63315cf46ae653a665155f5d, type: 3} propertyPath: m_RootOrder - value: 31 + value: 36 objectReference: {fileID: 0} - target: {fileID: 2073144591439938601, guid: 0c742c3c63315cf46ae653a665155f5d, type: 3} @@ -371416,7 +371614,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 14 + m_RootOrder: 19 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &6550617821253441484 MeshRenderer: @@ -371749,7 +371947,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 13 + m_RootOrder: 18 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &7127680886251290947 MonoBehaviour: diff --git a/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP/LightingData.asset b/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP/LightingData.asset index 8595be69b..ac7db2c19 100644 Binary files a/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP/LightingData.asset and b/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP/LightingData.asset differ diff --git a/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP/Lightmap-0_comp_light.exr b/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP/Lightmap-0_comp_light.exr index 416f37f08..51481cb2e 100644 Binary files a/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP/Lightmap-0_comp_light.exr and b/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP/Lightmap-0_comp_light.exr differ diff --git a/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP/Lightmap-1_comp_light.exr b/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP/Lightmap-1_comp_light.exr index 258df882f..8ab1335c9 100644 Binary files a/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP/Lightmap-1_comp_light.exr and b/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP/Lightmap-1_comp_light.exr differ diff --git a/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP/Lightmap-2_comp_light.exr b/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP/Lightmap-2_comp_light.exr index 3afa26a60..b082ba64b 100644 Binary files a/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP/Lightmap-2_comp_light.exr and b/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP/Lightmap-2_comp_light.exr differ diff --git a/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP/Lightmap-3_comp_light.exr b/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP/Lightmap-3_comp_light.exr index 73b2cabb9..b70b283e1 100644 Binary files a/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP/Lightmap-3_comp_light.exr and b/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP/Lightmap-3_comp_light.exr differ diff --git a/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP/ReflectionProbe-0.exr b/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP/ReflectionProbe-0.exr index b1fbbed5c..6e01a089b 100644 Binary files a/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP/ReflectionProbe-0.exr and b/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP/ReflectionProbe-0.exr differ diff --git a/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP/ReflectionProbe-1.exr b/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP/ReflectionProbe-1.exr new file mode 100644 index 000000000..615649e4e Binary files /dev/null and b/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP/ReflectionProbe-1.exr differ diff --git a/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP/ReflectionProbe-1.exr.meta b/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP/ReflectionProbe-1.exr.meta new file mode 100644 index 000000000..3bc3a7007 --- /dev/null +++ b/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP/ReflectionProbe-1.exr.meta @@ -0,0 +1,98 @@ +fileFormatVersion: 2 +guid: dfe6e664e444fba4dbfd12b06e7390ef +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 1 + seamlessCubemap: 1 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 0 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 2 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 100 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP/ReflectionProbe-2.exr b/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP/ReflectionProbe-2.exr new file mode 100644 index 000000000..b58898a98 Binary files /dev/null and b/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP/ReflectionProbe-2.exr differ diff --git a/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP/ReflectionProbe-2.exr.meta b/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP/ReflectionProbe-2.exr.meta new file mode 100644 index 000000000..48cb37696 --- /dev/null +++ b/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP/ReflectionProbe-2.exr.meta @@ -0,0 +1,98 @@ +fileFormatVersion: 2 +guid: adf594de3ad13c64cb6bf4ba42a02390 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP_Profiles.meta b/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP_Profiles.meta new file mode 100644 index 000000000..37cdda11c --- /dev/null +++ b/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP_Profiles.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fa5e73a404e3d6546bce8f2e9406214e +folderAsset: yes +DefaultImporter: + externalObjects: {} + 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 e94643241..9af98352c 100644 --- a/GQ_URP/GQ/Assets/Settings/URP-Balanced-Renderer.asset +++ b/GQ_URP/GQ/Assets/Settings/URP-Balanced-Renderer.asset @@ -43,6 +43,7 @@ MonoBehaviour: m_RendererFeatureMap: adc0de57c6d2eee5 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} diff --git a/GQ_URP/GQ/Assets/Settings/URP-HighFidelity-Renderer.asset b/GQ_URP/GQ/Assets/Settings/URP-HighFidelity-Renderer.asset index 27f8691cc..cdda76a25 100644 --- a/GQ_URP/GQ/Assets/Settings/URP-HighFidelity-Renderer.asset +++ b/GQ_URP/GQ/Assets/Settings/URP-HighFidelity-Renderer.asset @@ -12,16 +12,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f62c9c65cf3354c93be831c8bc075510, type: 3} m_Name: SSAO m_EditorClassIdentifier: - m_Active: 0 + m_Active: 1 m_Shader: {fileID: 4800000, guid: 0849e84e3d62649e8882e9d6f056a017, type: 3} m_Settings: Downsample: 0 AfterOpaque: 0 - Source: 1 - NormalSamples: 1 - Intensity: 0.5 - DirectLightingStrength: 0.25 - Radius: 0.25 + Source: 0 + NormalSamples: 2 + Intensity: 0.1 + DirectLightingStrength: 0.4 + Radius: 0.04 SampleCount: 12 --- !u!114 &11400000 MonoBehaviour: @@ -59,7 +59,7 @@ MonoBehaviour: type: 3} objectMotionVector: {fileID: 4800000, guid: 7b3ede40266cd49a395def176e1bc486, type: 3} - m_AssetVersion: 1 + m_AssetVersion: 2 m_OpaqueLayerMask: serializedVersion: 2 m_Bits: 4294967295 @@ -76,6 +76,7 @@ MonoBehaviour: m_ShadowTransparentReceive: 1 m_RenderingMode: 0 m_DepthPrimingMode: 1 + m_CopyDepthMode: 0 m_AccurateGbufferNormals: 0 m_ClusteredRendering: 0 m_TileSize: 32 diff --git a/GQ_URP/GQ/Assets/Settings/URP-Performant-Renderer.asset b/GQ_URP/GQ/Assets/Settings/URP-Performant-Renderer.asset index 7cda1074e..e6486d2c0 100644 --- a/GQ_URP/GQ/Assets/Settings/URP-Performant-Renderer.asset +++ b/GQ_URP/GQ/Assets/Settings/URP-Performant-Renderer.asset @@ -19,6 +19,7 @@ MonoBehaviour: m_RendererFeatureMap: 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} @@ -34,7 +35,7 @@ MonoBehaviour: type: 3} objectMotionVector: {fileID: 4800000, guid: 7b3ede40266cd49a395def176e1bc486, type: 3} - m_AssetVersion: 1 + m_AssetVersion: 2 m_OpaqueLayerMask: serializedVersion: 2 m_Bits: 4294967295 @@ -51,6 +52,7 @@ MonoBehaviour: m_ShadowTransparentReceive: 1 m_RenderingMode: 0 m_DepthPrimingMode: 1 + m_CopyDepthMode: 0 m_AccurateGbufferNormals: 0 m_ClusteredRendering: 0 m_TileSize: 32 diff --git a/GQ_URP/GQ/Assets/Settings/URP-Performant.asset b/GQ_URP/GQ/Assets/Settings/URP-Performant.asset index 5e53341b8..62004be46 100644 --- a/GQ_URP/GQ/Assets/Settings/URP-Performant.asset +++ b/GQ_URP/GQ/Assets/Settings/URP-Performant.asset @@ -27,6 +27,9 @@ MonoBehaviour: m_SupportsHDR: 0 m_MSAA: 1 m_RenderScale: 1 + m_UpscalingFilter: 0 + m_FsrOverrideSharpness: 0 + m_FsrSharpness: 0.92 m_MainLightRenderingMode: 1 m_MainLightShadowsSupported: 0 m_MainLightShadowmapResolution: 1024 @@ -47,7 +50,10 @@ MonoBehaviour: m_CascadeBorder: 0.1 m_ShadowDepthBias: 1 m_ShadowNormalBias: 1 + m_AnyShadowsSupported: 1 m_SoftShadowsSupported: 0 + m_ConservativeEnclosingSphere: 0 + m_NumIterationsEnclosingSphere: 64 m_AdditionalLightsCookieResolution: 2048 m_AdditionalLightsCookieFormat: 3 m_UseSRPBatcher: 1 diff --git a/GQ_URP/GQ/ProjectSettings/GraphicsSettings.asset b/GQ_URP/GQ/ProjectSettings/GraphicsSettings.asset index 182f3ae9d..b2fbb1b79 100644 --- a/GQ_URP/GQ/ProjectSettings/GraphicsSettings.asset +++ b/GQ_URP/GQ/ProjectSettings/GraphicsSettings.asset @@ -41,8 +41,7 @@ GraphicsSettings: m_PreloadShadersBatchTimeLimit: -1 m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_CustomRenderPipeline: {fileID: 11400000, guid: 7b7fd9122c28c4d15b667c7040e3b3fd, - type: 2} + m_CustomRenderPipeline: {fileID: 0} m_TransparencySortMode: 0 m_TransparencySortAxis: {x: 0, y: 0, z: 1} m_DefaultRenderingPath: 1