diff --git a/GQ_URP/GQ/.vs/GQ/v16/.suo b/GQ_URP/GQ/.vs/GQ/v16/.suo index 04a3e59ee..697a8c0a5 100644 Binary files a/GQ_URP/GQ/.vs/GQ/v16/.suo and b/GQ_URP/GQ/.vs/GQ/v16/.suo differ diff --git a/GQ_URP/GQ/Assets/Model/Materials/boli.mat b/GQ_URP/GQ/Assets/Model/Materials/boli.mat index 4b937a013..19e36589e 100644 --- a/GQ_URP/GQ/Assets/Model/Materials/boli.mat +++ b/GQ_URP/GQ/Assets/Model/Materials/boli.mat @@ -96,7 +96,7 @@ Material: - _GlossMapScale: 1 - _Glossiness: 1 - _GlossyReflections: 1 - - _Metallic: 0.441 + - _Metallic: 0.551 - _Mode: 3 - _OcclusionStrength: 1 - _Parallax: 0.02 diff --git a/GQ_URP/GQ/Assets/Model/Materials/dz.mat b/GQ_URP/GQ/Assets/Model/Materials/dz.mat index 25d342c57..2456eba95 100644 --- a/GQ_URP/GQ/Assets/Model/Materials/dz.mat +++ b/GQ_URP/GQ/Assets/Model/Materials/dz.mat @@ -106,13 +106,13 @@ Material: - _GlossMapScale: 1 - _Glossiness: 0.639 - _GlossyReflections: 1 - - _Metallic: 0.44 + - _Metallic: 0.111 - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - _QueueOffset: 0 - _ReceiveShadows: 1 - - _Smoothness: 0.5 + - _Smoothness: 0.311 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/GQ_URP/GQ/Assets/Model/Materials/gq_142.mat b/GQ_URP/GQ/Assets/Model/Materials/gq_142.mat index 6ad90f10d..348cb5258 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: 5.992157, g: 5.9607844, b: 5.866667, a: 1} + - _EmissionColor: {r: 2.1185474, g: 2.1074555, b: 2.07418, 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 cc665c044..e55d3886e 100644 --- a/GQ_URP/GQ/Assets/Model/Materials/gq_20.mat +++ b/GQ_URP/GQ/Assets/Model/Materials/gq_20.mat @@ -112,7 +112,7 @@ Material: - _Parallax: 0.02 - _QueueOffset: 0 - _ReceiveShadows: 1 - - _Smoothness: 0.5 + - _Smoothness: 0 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/GQ_URP/GQ/Assets/Packages/PostProcessing/Profile/New Post-Processing Profile.asset b/GQ_URP/GQ/Assets/Packages/PostProcessing/Profile/New Post-Processing Profile.asset index 59be70d38..48afe0436 100644 --- a/GQ_URP/GQ/Assets/Packages/PostProcessing/Profile/New Post-Processing Profile.asset +++ b/GQ_URP/GQ/Assets/Packages/PostProcessing/Profile/New Post-Processing Profile.asset @@ -41,7 +41,7 @@ MonoBehaviour: stationaryBlending: 0.094 motionBlending: 0.588 ambientOcclusion: - m_Enabled: 1 + m_Enabled: 0 m_Settings: intensity: 0.88 radius: 0.46 @@ -98,7 +98,7 @@ MonoBehaviour: logMin: -8 logMax: 6 bloom: - m_Enabled: 1 + m_Enabled: 0 m_Settings: bloom: intensity: 0.000006 @@ -110,7 +110,7 @@ MonoBehaviour: texture: {fileID: 0} intensity: 3 colorGrading: - m_Enabled: 1 + m_Enabled: 0 m_Settings: tonemapping: tonemapper: 1 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 d0012e346..a90bc180a 100644 --- a/GQ_URP/GQ/Assets/Scenes/SampleSceneG/PP Profile_YCJ.asset +++ b/GQ_URP/GQ/Assets/Scenes/SampleSceneG/PP Profile_YCJ.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5485954d14dfb9a4c8ead8edb0ded5b1, type: 3} m_Name: LiftGammaGain m_EditorClassIdentifier: - active: 1 + active: 0 lift: m_OverrideState: 1 m_Value: {x: 1, y: 1, z: 1, w: 0} @@ -34,7 +34,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: cdfbdbb87d3286943a057f7791b43141, type: 3} m_Name: ChannelMixer m_EditorClassIdentifier: - active: 1 + active: 0 redOutRedIn: m_OverrideState: 1 m_Value: 91.7 @@ -98,7 +98,7 @@ MonoBehaviour: m_Value: 1 intensity: m_OverrideState: 1 - m_Value: 0.12 + m_Value: 0.52 scatter: m_OverrideState: 1 m_Value: 0.7 @@ -132,7 +132,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 558a8e2b6826cf840aae193990ba9f2e, type: 3} m_Name: ShadowsMidtonesHighlights m_EditorClassIdentifier: - active: 1 + active: 0 shadows: m_OverrideState: 1 m_Value: {x: 1, y: 1, z: 1, w: -0.5877343} @@ -166,7 +166,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 70afe9e12c7a7ed47911bb608a23a8ff, type: 3} m_Name: SplitToning m_EditorClassIdentifier: - active: 1 + active: 0 shadows: m_OverrideState: 1 m_Value: {r: 0.20754719, g: 0.20754719, b: 0.20754719, a: 1} diff --git a/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP.unity b/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP.unity index 969c28d57..b55c89a58 100644 --- a/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP.unity +++ b/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP.unity @@ -2187,7 +2187,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!215 &12730416 ReflectionProbe: m_ObjectHideFlags: 0 @@ -2198,7 +2198,7 @@ ReflectionProbe: m_Enabled: 1 serializedVersion: 2 m_Type: 0 - m_Mode: 1 + m_Mode: 0 m_RefreshMode: 0 m_TimeSlicingMode: 0 m_Resolution: 128 @@ -12048,6 +12048,42 @@ MonoBehaviour: ID: 0 instruct: {fileID: 251077682} uPosManager: {fileID: 0} +--- !u!1 &97814874 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 97814875} + m_Layer: 0 + m_Name: "\u76F8\u673A\u89C6\u89D2\u5907\u4EFD" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &97814875 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 97814874} + m_LocalRotation: {x: 0, y: 0.8335389, z: -0.55246085, w: 0} + m_LocalPosition: {x: 0, y: 0, z: -4.708548} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 67.072, y: 180, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 4.638855, y: 19.239876} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &98568256 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7811894221733824622, guid: c8f09218a803c944e84c2336104ca2f9, @@ -15428,7 +15464,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 14 + m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &137188656 MonoBehaviour: @@ -15955,7 +15991,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 17 + m_RootOrder: 18 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &140293605 MonoBehaviour: @@ -24935,7 +24971,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 11 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &219085156 MonoBehaviour: @@ -35538,7 +35574,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 8 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 89.98, y: 0, z: 0} --- !u!1 &310105883 stripped GameObject: @@ -40729,121 +40765,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &363373586 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 363373589} - - component: {fileID: 363373588} - - component: {fileID: 363373587} - 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 &363373587 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 363373586} - 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 &363373588 -Light: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 363373586} - m_Enabled: 1 - serializedVersion: 10 - m_Type: 3 - m_Shape: 0 - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_Intensity: 2 - 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.02 - m_NormalBias: 0.1 - m_NearPlane: 0.1 - 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: 12.4664955, y: 10.805708} - m_BounceIntensity: 1 - m_ColorTemperature: 6570 - m_UseColorTemperature: 0 - m_BoundingSphereOverride: {x: 0.0234375, y: 33, z: 12, w: 0} - m_UseBoundingSphereOverride: 0 - m_UseViewFrustumForShadowCasterCull: 1 - m_ShadowRadius: 0 - m_ShadowAngle: 0 ---- !u!4 &363373589 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 363373586} - m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} - m_LocalPosition: {x: -5.38, y: 7.96, z: -10.72} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 36 - m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!1 &363527957 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7812594069478712587, guid: c8f09218a803c944e84c2336104ca2f9, @@ -52125,7 +52046,7 @@ Transform: - {fileID: 1675120013} - {fileID: 611096075} m_Father: {fileID: 0} - m_RootOrder: 22 + m_RootOrder: 23 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &472276999 stripped GameObject: @@ -78981,7 +78902,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 26 + m_RootOrder: 27 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &690575359 stripped GameObject: @@ -80372,6 +80293,7 @@ GameObject: m_Component: - component: {fileID: 705507995} - component: {fileID: 705507994} + - component: {fileID: 705507996} m_Layer: 0 m_Name: Directional Light m_TagString: Untagged @@ -80454,8 +80376,28 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!114 &705507996 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 705507993} + 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!1 &706742395 GameObject: m_ObjectHideFlags: 0 @@ -86245,7 +86187,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 15 + m_RootOrder: 16 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &749989404 MonoBehaviour: @@ -91239,7 +91181,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &794743473 MonoBehaviour: m_ObjectHideFlags: 0 @@ -91314,7 +91256,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 30 + m_RootOrder: 31 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -100764,7 +100706,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 27 + m_RootOrder: 28 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &875466700 stripped GameObject: @@ -111384,6 +111326,7 @@ GameObject: - component: {fileID: 963194231} - component: {fileID: 963194232} - component: {fileID: 963194233} + - component: {fileID: 963194234} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -111455,7 +111398,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 67.072, y: 180, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -111553,7 +111496,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 963194225} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: ff26db721962cdf4a8edcdfa9a767d2a, type: 3} m_Name: @@ -111608,6 +111551,23 @@ MonoBehaviour: m_RequiresDepthTexture: 0 m_RequiresColorTexture: 0 m_Version: 2 +--- !u!114 &963194234 +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: 172515602e62fb746b5d573b38a5fe58, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IsGlobal: 1 + priority: 0 + blendDistance: 0 + weight: 1 + sharedProfile: {fileID: 11400000, guid: e086930db568b364d94a83978a60a87c, type: 2} --- !u!1 &963723682 GameObject: m_ObjectHideFlags: 0 @@ -120023,7 +119983,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 16 + m_RootOrder: 17 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1036835678 MonoBehaviour: @@ -122312,7 +122272,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 12 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1056840580 MonoBehaviour: @@ -124617,7 +124577,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1078124711 GameObject: @@ -133997,7 +133957,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 31 + m_RootOrder: 32 m_LocalEulerAnglesHint: {x: 18.578, y: -129.436, z: 0} --- !u!1 &1161967865 GameObject: @@ -135259,7 +135219,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 20 + m_RootOrder: 21 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1168817491 MonoBehaviour: @@ -141661,121 +141621,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &1222986648 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1222986651} - - component: {fileID: 1222986650} - - component: {fileID: 1222986649} - m_Layer: 0 - m_Name: Area Light (2) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1222986649 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1222986648} - 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 &1222986650 -Light: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1222986648} - m_Enabled: 1 - serializedVersion: 10 - m_Type: 3 - m_Shape: 0 - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_Intensity: 0.2 - 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: 18.243937, y: 11.088329} - m_BounceIntensity: 1 - m_ColorTemperature: 6570 - m_UseColorTemperature: 0 - m_BoundingSphereOverride: {x: 1.05e-43, y: 2.6562857e+20, z: 1.0691825e-38, w: -1.4570757e+31} - m_UseBoundingSphereOverride: 0 - m_UseViewFrustumForShadowCasterCull: 1 - m_ShadowRadius: 0 - m_ShadowAngle: 0 ---- !u!4 &1222986651 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1222986648} - m_LocalRotation: {x: 0.70710677, y: -0, z: -0, w: 0.7071068} - m_LocalPosition: {x: 9.91, y: 7.4559994, z: -10.88} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 37 - m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!1 &1223348455 GameObject: m_ObjectHideFlags: 0 @@ -159851,7 +159696,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 89.98, y: 0, z: 0} --- !u!1 &1399839689 GameObject: @@ -166613,7 +166458,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &1459556437 Transform: m_ObjectHideFlags: 0 @@ -166632,7 +166477,7 @@ Transform: - {fileID: 743945424} - {fileID: 442675218} m_Father: {fileID: 0} - m_RootOrder: 24 + m_RootOrder: 25 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1459980779 stripped GameObject: @@ -175474,7 +175319,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 25 + m_RootOrder: 26 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1536359357 stripped GameObject: @@ -182188,55 +182033,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1588082435} m_CullTransparentMesh: 1 ---- !u!1 &1588152445 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1588152447} - - component: {fileID: 1588152446} - m_Layer: 0 - m_Name: PP - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!114 &1588152446 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1588152445} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IsGlobal: 1 - priority: 0 - blendDistance: 0 - weight: 1 - sharedProfile: {fileID: 11400000, guid: e086930db568b364d94a83978a60a87c, type: 2} ---- !u!4 &1588152447 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1588152445} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 1.1933616, y: 1.0370241, z: -1.7730203} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 32 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1588960397 GameObject: m_ObjectHideFlags: 0 @@ -185658,7 +185454,7 @@ Transform: m_Children: - {fileID: 986575409} m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1621147864 GameObject: @@ -194735,7 +194531,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 13 + m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1706230386 MonoBehaviour: @@ -196884,7 +196680,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &1725712531 Transform: m_ObjectHideFlags: 0 @@ -196898,7 +196694,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 29 + m_RootOrder: 30 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1726352922 stripped GameObject: @@ -208356,7 +208152,7 @@ MonoBehaviour: xlz_sc: xllx_sc: arguments: - token: eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE2OTUwNDIyMjMsInVzZXJuYW1lIjoiMTgzMTIzNDU2NzgifQ._3-ZJ7rgPNig-TgIKT04DiTzjuHOIS0cErMMhZQTaww + token: eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE2OTUwNTcwNDEsInVzZXJuYW1lIjoiMTgzMTIzNDU2NzgifQ.dvuYxWa6EQwREqPHjMQLSHdl8FpOygJ6yJycFnq4i9s heatThresholdValueMax: heatThresholdValueMin: humidityThresholdValueMax: @@ -213048,7 +212844,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 19 + m_RootOrder: 20 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1859118122 MonoBehaviour: @@ -215396,7 +215192,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 10 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1877492179 MonoBehaviour: @@ -227061,7 +226857,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 23 + m_RootOrder: 24 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1982429805 GameObject: @@ -231249,7 +231045,7 @@ Light: m_Type: 3 m_Shape: 0 m_Color: {r: 1, g: 1, b: 1, a: 1} - m_Intensity: 0.2 + m_Intensity: 1 m_Range: 10 m_SpotAngle: 30 m_InnerSpotAngle: 21.80208 @@ -231294,7 +231090,7 @@ Light: m_BounceIntensity: 1 m_ColorTemperature: 6570 m_UseColorTemperature: 0 - m_BoundingSphereOverride: {x: 1.02e-43, y: 0, z: 0, w: -0.0000006957921} + m_BoundingSphereOverride: {x: 1.02e-43, y: 0, z: 0, w: -0.000000010988167} m_UseBoundingSphereOverride: 0 m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 @@ -231307,7 +231103,7 @@ 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.4489996, z: -10.88} + m_LocalPosition: {x: 9.59, y: 3.255, z: -10.88} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -238567,7 +238363,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 18 + m_RootOrder: 19 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2098930745 MonoBehaviour: @@ -244384,7 +244180,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1175681072998445385 GameObject: @@ -325990,7 +325786,7 @@ Transform: - {fileID: 1332666220984907239} - {fileID: 4362348816139420719} m_Father: {fileID: 0} - m_RootOrder: 21 + m_RootOrder: 22 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &4362348816935953891 GameObject: @@ -337278,7 +337074,7 @@ PrefabInstance: - target: {fileID: 2073144591439938601, guid: 0c742c3c63315cf46ae653a665155f5d, type: 3} propertyPath: m_RootOrder - value: 28 + value: 29 objectReference: {fileID: 0} - target: {fileID: 2073144591439938601, guid: 0c742c3c63315cf46ae653a665155f5d, type: 3} @@ -371593,7 +371389,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 9 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &6550617821253441484 MeshRenderer: @@ -371926,7 +371722,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 6 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 07093bf3b..e4bb08196 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 571139d80..a6cb0b011 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 571c03a7e..7f1caddb7 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 99ebcb54e..2af35c6d3 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 13c8b6133..6750ff0db 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 deleted file mode 100644 index d46c067f7..000000000 Binary files a/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP/ReflectionProbe-0.exr and /dev/null differ diff --git a/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP/ReflectionProbe-0.exr.meta b/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP/ReflectionProbe-0.exr.meta deleted file mode 100644 index a09f315b8..000000000 --- a/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP/ReflectionProbe-0.exr.meta +++ /dev/null @@ -1,98 +0,0 @@ -fileFormatVersion: 2 -guid: dc5a7b52702ebf643ae8932f661c10ae -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/Settings/SampleSceneProfile.asset b/GQ_URP/GQ/Assets/Settings/SampleSceneProfile.asset index 37e401d5e..adf6aed9e 100644 --- a/GQ_URP/GQ/Assets/Settings/SampleSceneProfile.asset +++ b/GQ_URP/GQ/Assets/Settings/SampleSceneProfile.asset @@ -12,46 +12,34 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0b2db86121404754db890f4c8dfe81b2, type: 3} m_Name: Bloom m_EditorClassIdentifier: - active: 1 - m_AdvancedMode: 0 + active: 0 threshold: m_OverrideState: 1 m_Value: 1 - min: 0 intensity: m_OverrideState: 1 m_Value: 1 - min: 0 scatter: m_OverrideState: 0 m_Value: 0.7 - min: 0 - max: 1 clamp: m_OverrideState: 0 m_Value: 65472 - min: 0 tint: m_OverrideState: 0 m_Value: {r: 1, g: 1, b: 1, a: 1} - hdr: 0 - showAlpha: 0 - showEyeDropper: 1 highQualityFiltering: m_OverrideState: 0 m_Value: 0 skipIterations: m_OverrideState: 0 m_Value: 1 - min: 0 - max: 16 dirtTexture: m_OverrideState: 0 m_Value: {fileID: 0} dirtIntensity: m_OverrideState: 0 m_Value: 0 - min: 0 --- !u!114 &-7011558710299706105 MonoBehaviour: m_ObjectHideFlags: 3 @@ -64,27 +52,19 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 899c54efeace73346a0a16faa3afe726, type: 3} m_Name: Vignette m_EditorClassIdentifier: - active: 1 - m_AdvancedMode: 0 + active: 0 color: m_OverrideState: 0 m_Value: {r: 0, g: 0, b: 0, a: 1} - hdr: 0 - showAlpha: 0 - showEyeDropper: 1 center: m_OverrideState: 0 m_Value: {x: 0.5, y: 0.5} intensity: m_OverrideState: 1 m_Value: 0.25 - min: 0 - max: 1 smoothness: m_OverrideState: 1 m_Value: 0.4 - min: 0.01 - max: 1 rounded: m_OverrideState: 0 m_Value: 0 @@ -116,8 +96,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 97c23e3b12dc18c42a140437e53d3951, type: 3} m_Name: Tonemapping m_EditorClassIdentifier: - active: 1 - m_AdvancedMode: 0 + active: 0 mode: m_OverrideState: 1 m_Value: 1