diff --git a/com.unity.template-hd/Assets/Scenes/SampleScene.unity b/com.unity.template-hd/Assets/Scenes/SampleScene.unity index 3f853931aac..7d7297989ac 100644 --- a/com.unity.template-hd/Assets/Scenes/SampleScene.unity +++ b/com.unity.template-hd/Assets/Scenes/SampleScene.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 1894.7034, g: 2066.2678, b: 2536.3518, a: 1} + m_IndirectSpecularColor: {r: 1793.1008, g: 1931.4788, b: 2430.6096, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -853,7 +853,7 @@ MonoBehaviour: m_Shape: 0 m_BoxSize: {x: 1, y: 1, z: 1} m_SphereRadius: 1 - m_CSVersion: 1 + m_CSVersion: 2 m_ObsoleteSphereInfiniteProjection: 0 m_ObsoleteBoxInfiniteProjection: 0 proxySettings: @@ -1964,7 +1964,7 @@ MonoBehaviour: m_Shape: 1 m_BoxSize: {x: 1, y: 1, z: 1} m_SphereRadius: 19.4 - m_CSVersion: 1 + m_CSVersion: 2 m_ObsoleteSphereInfiniteProjection: 0 m_ObsoleteBoxInfiniteProjection: 0 --- !u!1 &248024620 @@ -3065,7 +3065,7 @@ MonoBehaviour: m_Shape: 0 m_BoxSize: {x: 1, y: 1, z: 1} m_SphereRadius: 1 - m_CSVersion: 1 + m_CSVersion: 2 m_ObsoleteSphereInfiniteProjection: 0 m_ObsoleteBoxInfiniteProjection: 0 proxySettings: @@ -3582,7 +3582,7 @@ MonoBehaviour: m_Shape: 0 m_BoxSize: {x: 1, y: 1, z: 1} m_SphereRadius: 1 - m_CSVersion: 1 + m_CSVersion: 2 m_ObsoleteSphereInfiniteProjection: 0 m_ObsoleteBoxInfiniteProjection: 0 proxySettings: @@ -4114,7 +4114,7 @@ MonoBehaviour: m_Shape: 0 m_BoxSize: {x: 1, y: 1, z: 1} m_SphereRadius: 1 - m_CSVersion: 1 + m_CSVersion: 2 m_ObsoleteSphereInfiniteProjection: 0 m_ObsoleteBoxInfiniteProjection: 0 proxySettings: @@ -5519,7 +5519,7 @@ MonoBehaviour: m_Shape: 0 m_BoxSize: {x: 1, y: 1, z: 1} m_SphereRadius: 1 - m_CSVersion: 1 + m_CSVersion: 2 m_ObsoleteSphereInfiniteProjection: 0 m_ObsoleteBoxInfiniteProjection: 0 proxySettings: @@ -6089,7 +6089,6 @@ MonoBehaviour: m_ShutterSpeed: 0.005 m_Aperture: 16 m_FocusDistance: 10 - m_GateFit: 1 m_BladeCount: 5 m_Curvature: {x: 2, y: 11} m_BarrelClipping: 0.25 @@ -8618,7 +8617,6 @@ MonoBehaviour: m_ShutterSpeed: 0.005 m_Aperture: 16 m_FocusDistance: 10 - m_GateFit: 1 m_BladeCount: 5 m_Curvature: {x: 2, y: 11} m_BarrelClipping: 0.25 @@ -9381,7 +9379,6 @@ MonoBehaviour: m_ShutterSpeed: -1.1198855e+12 m_Aperture: 7.7e-43 m_FocusDistance: -1.6625298e+12 - m_GateFit: 1 m_BladeCount: 549 m_Curvature: {x: -2.1494218e+29, y: 7.68e-43} m_BarrelClipping: -1.4816295e+12 @@ -12403,7 +12400,7 @@ MonoBehaviour: m_Shape: 0 m_BoxSize: {x: 1, y: 1, z: 1} m_SphereRadius: 1 - m_CSVersion: 1 + m_CSVersion: 2 m_ObsoleteSphereInfiniteProjection: 0 m_ObsoleteBoxInfiniteProjection: 0 proxySettings: @@ -13065,7 +13062,7 @@ MonoBehaviour: m_Shape: 0 m_BoxSize: {x: 1, y: 1, z: 1} m_SphereRadius: 1 - m_CSVersion: 1 + m_CSVersion: 2 m_ObsoleteSphereInfiniteProjection: 0 m_ObsoleteBoxInfiniteProjection: 0 proxySettings: @@ -14840,7 +14837,7 @@ MonoBehaviour: m_Shape: 0 m_BoxSize: {x: 31.523247, y: 9.7582245, z: 16.467924} m_SphereRadius: 1 - m_CSVersion: 1 + m_CSVersion: 2 m_ObsoleteSphereInfiniteProjection: 0 m_ObsoleteBoxInfiniteProjection: 0 --- !u!4 &1177610900 @@ -15081,7 +15078,6 @@ MonoBehaviour: m_ShutterSpeed: 0.005 m_Aperture: 16 m_FocusDistance: 10 - m_GateFit: 1 m_BladeCount: 5 m_Curvature: {x: 2, y: 11} m_BarrelClipping: 0.25 @@ -17406,7 +17402,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 738646681595172698, guid: 573ac53c334415945bf239de2c2f0511, type: 3} propertyPath: m_Version - value: 8 + value: 9 objectReference: {fileID: 0} - target: {fileID: 738646681744756154, guid: 573ac53c334415945bf239de2c2f0511, type: 3} propertyPath: m_Name @@ -17874,7 +17870,6 @@ MonoBehaviour: m_ShutterSpeed: 0.005 m_Aperture: 16 m_FocusDistance: 10 - m_GateFit: 1 m_BladeCount: 5 m_Curvature: {x: 2, y: 11} m_BarrelClipping: 0.25 @@ -18168,8 +18163,6 @@ MonoBehaviour: parameters: albedo: {r: 0.9686873, g: 1, b: 0.83647794, a: 1} meanFreePath: 150 - blendingMode: 2 - priority: 0 anisotropy: 0 volumeMask: {fileID: 11700000, guid: 836429d92e1b49443b7743362fdeb1fe, type: 3} textureScrollingSpeed: {x: 0, y: 0.05, z: 0} @@ -18184,10 +18177,8 @@ MonoBehaviour: invertFade: 0 distanceFadeStart: 50 distanceFadeEnd: 60 - textureOffset: {x: -0, y: -0.81085175, z: -0} + textureOffset: {x: -0, y: -0, z: -0} falloffMode: 0 - maskMode: 0 - materialMask: {fileID: 0} m_Version: 2 --- !u!1001 &1504255721 PrefabInstance: @@ -18483,7 +18474,6 @@ MonoBehaviour: m_ShutterSpeed: 0.005 m_Aperture: 16 m_FocusDistance: 10 - m_GateFit: 1 m_BladeCount: 5 m_Curvature: {x: 2, y: 11} m_BarrelClipping: 0.25 @@ -19056,7 +19046,7 @@ MonoBehaviour: m_Shape: 0 m_BoxSize: {x: 1, y: 1, z: 1} m_SphereRadius: 1 - m_CSVersion: 1 + m_CSVersion: 2 m_ObsoleteSphereInfiniteProjection: 0 m_ObsoleteBoxInfiniteProjection: 0 proxySettings: @@ -19575,7 +19565,6 @@ MonoBehaviour: m_ShutterSpeed: 0.005 m_Aperture: 2 m_FocusDistance: 10 - m_GateFit: 1 m_BladeCount: 9 m_Curvature: {x: 2, y: 11} m_BarrelClipping: 0.25 @@ -20254,7 +20243,7 @@ MonoBehaviour: m_Shape: 0 m_BoxSize: {x: 1, y: 1, z: 1} m_SphereRadius: 1 - m_CSVersion: 1 + m_CSVersion: 2 m_ObsoleteSphereInfiniteProjection: 0 m_ObsoleteBoxInfiniteProjection: 0 proxySettings: @@ -20723,7 +20712,7 @@ MonoBehaviour: m_Shape: 0 m_BoxSize: {x: 1, y: 1, z: 1} m_SphereRadius: 1 - m_CSVersion: 1 + m_CSVersion: 2 m_ObsoleteSphereInfiniteProjection: 0 m_ObsoleteBoxInfiniteProjection: 0 proxySettings: @@ -21533,7 +21522,7 @@ MonoBehaviour: m_Shape: 0 m_BoxSize: {x: 1, y: 1, z: 1} m_SphereRadius: 1 - m_CSVersion: 1 + m_CSVersion: 2 m_ObsoleteSphereInfiniteProjection: 0 m_ObsoleteBoxInfiniteProjection: 0 proxySettings: @@ -22194,7 +22183,7 @@ MonoBehaviour: m_Shape: 0 m_BoxSize: {x: 1, y: 1, z: 1} m_SphereRadius: 1 - m_CSVersion: 1 + m_CSVersion: 2 m_ObsoleteSphereInfiniteProjection: 0 m_ObsoleteBoxInfiniteProjection: 0 proxySettings: @@ -22972,7 +22961,7 @@ MonoBehaviour: m_Shape: 0 m_BoxSize: {x: 26.010788, y: 4.120904, z: 5.484947} m_SphereRadius: 1 - m_CSVersion: 1 + m_CSVersion: 2 m_ObsoleteSphereInfiniteProjection: 0 m_ObsoleteBoxInfiniteProjection: 0 --- !u!1 &1754039346 @@ -23579,7 +23568,6 @@ MonoBehaviour: m_ShutterSpeed: 0.005 m_Aperture: 16 m_FocusDistance: 10 - m_GateFit: 1 m_BladeCount: 5 m_Curvature: {x: 2, y: 11} m_BarrelClipping: 0.25 @@ -24331,7 +24319,7 @@ MonoBehaviour: m_Shape: 0 m_BoxSize: {x: 1, y: 1, z: 1} m_SphereRadius: 1 - m_CSVersion: 1 + m_CSVersion: 2 m_ObsoleteSphereInfiniteProjection: 0 m_ObsoleteBoxInfiniteProjection: 0 proxySettings: @@ -26118,7 +26106,7 @@ MonoBehaviour: m_Shape: 0 m_BoxSize: {x: 1, y: 1, z: 1} m_SphereRadius: 1 - m_CSVersion: 1 + m_CSVersion: 2 m_ObsoleteSphereInfiniteProjection: 0 m_ObsoleteBoxInfiniteProjection: 0 proxySettings: @@ -26567,7 +26555,6 @@ MonoBehaviour: m_ShutterSpeed: 0.005 m_Aperture: 16 m_FocusDistance: 10 - m_GateFit: 1 m_BladeCount: 5 m_Curvature: {x: 2, y: 11} m_BarrelClipping: 0.25 @@ -26787,7 +26774,6 @@ MonoBehaviour: m_ShutterSpeed: 0.005 m_Aperture: 16 m_FocusDistance: 10 - m_GateFit: 1 m_BladeCount: 5 m_Curvature: {x: 2, y: 11} m_BarrelClipping: 0.25 @@ -27062,7 +27048,6 @@ MonoBehaviour: m_ShutterSpeed: 0.005 m_Aperture: 2 m_FocusDistance: 10 - m_GateFit: 1 m_BladeCount: 9 m_Curvature: {x: 2, y: 11} m_BarrelClipping: 0.25 @@ -28196,7 +28181,6 @@ MonoBehaviour: m_ShutterSpeed: 0.005 m_Aperture: 16 m_FocusDistance: 10 - m_GateFit: 1 m_BladeCount: 5 m_Curvature: {x: 2, y: 11} m_BarrelClipping: 0.25 @@ -28421,7 +28405,7 @@ MonoBehaviour: m_Shape: 0 m_BoxSize: {x: 1, y: 1, z: 1} m_SphereRadius: 1 - m_CSVersion: 1 + m_CSVersion: 2 m_ObsoleteSphereInfiniteProjection: 0 m_ObsoleteBoxInfiniteProjection: 0 proxySettings: @@ -29024,7 +29008,7 @@ MonoBehaviour: m_Shape: 0 m_BoxSize: {x: 20.886688, y: 3.3194675, z: 6.5367713} m_SphereRadius: 1 - m_CSVersion: 1 + m_CSVersion: 2 m_ObsoleteSphereInfiniteProjection: 0 m_ObsoleteBoxInfiniteProjection: 0 --- !u!1001 &2029157704 @@ -30844,7 +30828,7 @@ MonoBehaviour: m_Shape: 0 m_BoxSize: {x: 1, y: 1, z: 1} m_SphereRadius: 1 - m_CSVersion: 1 + m_CSVersion: 2 m_ObsoleteSphereInfiniteProjection: 0 m_ObsoleteBoxInfiniteProjection: 0 proxySettings: @@ -31683,7 +31667,7 @@ MonoBehaviour: m_Shape: 0 m_BoxSize: {x: 1, y: 1, z: 1} m_SphereRadius: 1 - m_CSVersion: 1 + m_CSVersion: 2 m_ObsoleteSphereInfiniteProjection: 0 m_ObsoleteBoxInfiniteProjection: 0 proxySettings: @@ -32086,7 +32070,7 @@ MonoBehaviour: m_Shape: 0 m_BoxSize: {x: 1, y: 1, z: 1} m_SphereRadius: 1 - m_CSVersion: 1 + m_CSVersion: 2 m_ObsoleteSphereInfiniteProjection: 0 m_ObsoleteBoxInfiniteProjection: 0 proxySettings: diff --git a/com.unity.template-hd/Packages/com.unity.template.hd/package.json b/com.unity.template-hd/Packages/com.unity.template.hd/package.json index 505974c70b7..727eb1aab7c 100644 --- a/com.unity.template-hd/Packages/com.unity.template.hd/package.json +++ b/com.unity.template-hd/Packages/com.unity.template.hd/package.json @@ -7,14 +7,14 @@ "unity": "2022.1", "description": "This template utilizes the High Definition Render Pipeline. Making it a good starting point for people focused on high-end graphics that want to develop games for platforms that support Shader Model 5.0 (DX11 and above). \n\nBeyond being tuned for High End visuals this project includes\n\u25aa Shadergraph \n\u25aa Visual Effect Graph \n\u25aa Presets \n\u25aa Example content", "dependencies": { - "com.unity.collab-proxy": "1.9.0", + "com.unity.collab-proxy": "1.15.16", "com.unity.feature.development": "1.0.1", "com.unity.textmeshpro": "3.0.6", - "com.unity.cinemachine": "2.8.1", - "com.unity.inputsystem": "1.1.1", - "com.unity.learn.iet-framework": "2.1.1", - "com.unity.render-pipelines.high-definition": "13.1.0", - "com.unity.timeline": "1.6.2", + "com.unity.cinemachine": "2.8.4", + "com.unity.inputsystem": "1.3.0", + "com.unity.learn.iet-framework": "2.2.1", + "com.unity.render-pipelines.high-definition": "14.0.2", + "com.unity.timeline": "1.7.1", "com.unity.ugui": "1.0.0", "com.unity.visualscripting": "1.7.6" } diff --git a/com.unity.template-hd/Packages/manifest.json b/com.unity.template-hd/Packages/manifest.json index edecdeff7c9..5ff61d03b55 100644 --- a/com.unity.template-hd/Packages/manifest.json +++ b/com.unity.template-hd/Packages/manifest.json @@ -1,16 +1,16 @@ { "dependencies": { - "com.unity.cinemachine": "2.8.1", - "com.unity.collab-proxy": "1.9.0", + "com.unity.cinemachine": "2.8.4", + "com.unity.collab-proxy": "1.15.16", "com.unity.feature.development": "1.0.1", - "com.unity.inputsystem": "1.1.1", - "com.unity.learn.iet-framework": "2.1.1", - "com.unity.learn.iet-framework.authoring": "1.0.0", - "com.unity.render-pipelines.high-definition": "13.1.0", + "com.unity.inputsystem": "1.3.0", + "com.unity.learn.iet-framework": "2.2.1", + "com.unity.learn.iet-framework.authoring": "1.0.2", + "com.unity.render-pipelines.high-definition": "14.0.2", "com.unity.textmeshpro": "3.0.6", - "com.unity.timeline": "1.6.2", + "com.unity.timeline": "1.7.1", "com.unity.ugui": "1.0.0", - "com.unity.visualscripting": "1.7.6", + "com.unity.visualscripting": "1.7.6", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", "com.unity.modules.animation": "1.0.0", diff --git a/com.unity.template-hd/ProjectSettings/ProjectVersion.txt b/com.unity.template-hd/ProjectSettings/ProjectVersion.txt index 6d95bf2a250..71fbe498a0e 100644 --- a/com.unity.template-hd/ProjectSettings/ProjectVersion.txt +++ b/com.unity.template-hd/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2021.2.0b10 -m_EditorVersionWithRevision: 2021.2.0b10 (1eff71c2186b) +m_EditorVersion: 2022.2.0a12 +m_EditorVersionWithRevision: 2022.2.0a12 (752dd7c427d5) diff --git a/com.unity.template-hd/ProjectSettings/VFXManager.asset b/com.unity.template-hd/ProjectSettings/VFXManager.asset index c49b66a354f..471ccf74cc1 100644 --- a/com.unity.template-hd/ProjectSettings/VFXManager.asset +++ b/com.unity.template-hd/ProjectSettings/VFXManager.asset @@ -10,6 +10,7 @@ VFXManager: m_RenderPipeSettingsPath: m_FixedTimeStep: 0.016666668 m_MaxDeltaTime: 0.05 - m_CompiledVersion: 3 - m_RuntimeVersion: 20 + m_MaxScrubTime: 30 + m_CompiledVersion: 5 + m_RuntimeVersion: 23 m_RuntimeResources: {fileID: 11400000, guid: bc10b42afe3813544bffd38ae2cd893d, type: 2} diff --git a/com.unity.template-hd/ProjectSettings/boot.config b/com.unity.template-hd/ProjectSettings/boot.config deleted file mode 100644 index e69de29bb2d..00000000000