From a1d2af517025d841a0050c28b7d306d7bd307c64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Penavaire?= Date: Mon, 2 May 2022 09:31:20 +0200 Subject: [PATCH 1/8] Regenerate project files --- com.unity.template-hd/Packages/manifest.json | 16 +- .../Packages/packages-lock.json | 541 +++++++++++++ .../ProjectSettings/VFXManager.asset | 5 +- .../UserSettings/EditorUserSettings.asset | 28 + .../UserSettings/Layouts/default-2022.dwlt | 746 ++++++++++++++++++ 5 files changed, 1326 insertions(+), 10 deletions(-) create mode 100644 com.unity.template-hd/Packages/packages-lock.json create mode 100644 com.unity.template-hd/UserSettings/EditorUserSettings.asset create mode 100644 com.unity.template-hd/UserSettings/Layouts/default-2022.dwlt 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/Packages/packages-lock.json b/com.unity.template-hd/Packages/packages-lock.json new file mode 100644 index 00000000000..2a35887d1f3 --- /dev/null +++ b/com.unity.template-hd/Packages/packages-lock.json @@ -0,0 +1,541 @@ +{ + "dependencies": { + "com.unity.burst": { + "version": "1.7.1", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.mathematics": "1.2.1" + }, + "url": "https://packages.unity.com" + }, + "com.unity.cinemachine": { + "version": "2.8.4", + "depth": 0, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.collab-proxy": { + "version": "1.15.16", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.services.core": "1.0.1" + }, + "url": "https://packages.unity.com" + }, + "com.unity.editorcoroutines": { + "version": "1.0.0", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.ext.nunit": { + "version": "1.0.6", + "depth": 2, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.feature.development": { + "version": "1.0.1", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.ide.visualstudio": "2.0.15", + "com.unity.ide.rider": "3.0.13", + "com.unity.ide.vscode": "1.2.5", + "com.unity.editorcoroutines": "1.0.0", + "com.unity.performance.profile-analyzer": "1.1.1", + "com.unity.test-framework": "1.1.31", + "com.unity.testtools.codecoverage": "1.1.1" + } + }, + "com.unity.ide.rider": { + "version": "3.0.13", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.ext.nunit": "1.0.6" + }, + "url": "https://packages.unity.com" + }, + "com.unity.ide.visualstudio": { + "version": "2.0.15", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.test-framework": "1.1.9" + }, + "url": "https://packages.unity.com" + }, + "com.unity.ide.vscode": { + "version": "1.2.5", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.inputsystem": { + "version": "1.3.0", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.modules.uielements": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.learn.iet-framework": { + "version": "2.2.1", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.editorcoroutines": "1.0.0", + "com.unity.settings-manager": "1.0.3" + }, + "url": "https://packages.unity.com" + }, + "com.unity.learn.iet-framework.authoring": { + "version": "1.0.2", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.learn.iet-framework": "2.2.1" + }, + "url": "https://packages.unity.com" + }, + "com.unity.mathematics": { + "version": "1.2.6", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.nuget.newtonsoft-json": { + "version": "3.0.2", + "depth": 2, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.performance.profile-analyzer": { + "version": "1.1.1", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.render-pipelines.core": { + "version": "14.0.2", + "depth": 1, + "source": "builtin", + "dependencies": { + "com.unity.ugui": "1.0.0", + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0" + } + }, + "com.unity.render-pipelines.high-definition": { + "version": "14.0.2", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.mathematics": "1.2.4", + "com.unity.burst": "1.6.4", + "com.unity.modules.video": "1.0.0", + "com.unity.modules.animation": "1.0.0", + "com.unity.modules.imageconversion": "1.0.0", + "com.unity.modules.terrain": "1.0.0", + "com.unity.render-pipelines.core": "14.0.2", + "com.unity.shadergraph": "14.0.2", + "com.unity.visualeffectgraph": "14.0.2", + "com.unity.render-pipelines.high-definition-config": "14.0.2" + } + }, + "com.unity.render-pipelines.high-definition-config": { + "version": "14.0.2", + "depth": 1, + "source": "builtin", + "dependencies": { + "com.unity.render-pipelines.core": "14.0.2" + } + }, + "com.unity.searcher": { + "version": "4.9.2", + "depth": 2, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.services.core": { + "version": "1.3.1", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.nuget.newtonsoft-json": "3.0.2", + "com.unity.modules.androidjni": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.settings-manager": { + "version": "2.0.1", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.shadergraph": { + "version": "14.0.2", + "depth": 1, + "source": "builtin", + "dependencies": { + "com.unity.render-pipelines.core": "14.0.2", + "com.unity.searcher": "4.9.2" + } + }, + "com.unity.template.hd": { + "version": "file:com.unity.template.hd", + "depth": 0, + "source": "embedded", + "dependencies": { + "com.unity.collab-proxy": "1.9.0", + "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.ugui": "1.0.0", + "com.unity.visualscripting": "1.7.6" + } + }, + "com.unity.test-framework": { + "version": "1.1.31", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.ext.nunit": "1.0.6", + "com.unity.modules.imgui": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.testtools.codecoverage": { + "version": "1.1.1", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.test-framework": "1.0.16", + "com.unity.settings-manager": "1.0.1" + }, + "url": "https://packages.unity.com" + }, + "com.unity.textmeshpro": { + "version": "3.0.6", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.ugui": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.timeline": { + "version": "1.7.1", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.modules.director": "1.0.0", + "com.unity.modules.animation": "1.0.0", + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.particlesystem": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.ugui": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.imgui": "1.0.0" + } + }, + "com.unity.visualeffectgraph": { + "version": "14.0.2", + "depth": 1, + "source": "builtin", + "dependencies": { + "com.unity.shadergraph": "14.0.2", + "com.unity.render-pipelines.core": "14.0.2" + } + }, + "com.unity.visualscripting": { + "version": "1.7.6", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.ugui": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.modules.ai": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.androidjni": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.animation": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.assetbundle": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.audio": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.cloth": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.physics": "1.0.0" + } + }, + "com.unity.modules.director": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.animation": "1.0.0" + } + }, + "com.unity.modules.imageconversion": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.imgui": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.jsonserialize": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.particlesystem": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.physics": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.physics2d": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.screencapture": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.imageconversion": "1.0.0" + } + }, + "com.unity.modules.subsystems": { + "version": "1.0.0", + "depth": 1, + "source": "builtin", + "dependencies": { + "com.unity.modules.jsonserialize": "1.0.0" + } + }, + "com.unity.modules.terrain": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.terrainphysics": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.terrain": "1.0.0" + } + }, + "com.unity.modules.tilemap": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.physics2d": "1.0.0" + } + }, + "com.unity.modules.ui": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.uielements": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.imgui": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.uielementsnative": "1.0.0" + } + }, + "com.unity.modules.uielementsnative": { + "version": "1.0.0", + "depth": 1, + "source": "builtin", + "dependencies": { + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.imgui": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0" + } + }, + "com.unity.modules.umbra": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.unityanalytics": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0" + } + }, + "com.unity.modules.unitywebrequest": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.unitywebrequestassetbundle": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.assetbundle": "1.0.0", + "com.unity.modules.unitywebrequest": "1.0.0" + } + }, + "com.unity.modules.unitywebrequestaudio": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.audio": "1.0.0" + } + }, + "com.unity.modules.unitywebrequesttexture": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.imageconversion": "1.0.0" + } + }, + "com.unity.modules.unitywebrequestwww": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.unitywebrequestassetbundle": "1.0.0", + "com.unity.modules.unitywebrequestaudio": "1.0.0", + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.assetbundle": "1.0.0", + "com.unity.modules.imageconversion": "1.0.0" + } + }, + "com.unity.modules.vehicles": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.physics": "1.0.0" + } + }, + "com.unity.modules.video": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.unitywebrequest": "1.0.0" + } + }, + "com.unity.modules.vr": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.xr": "1.0.0" + } + }, + "com.unity.modules.wind": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.xr": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.subsystems": "1.0.0" + } + } + } +} 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/UserSettings/EditorUserSettings.asset b/com.unity.template-hd/UserSettings/EditorUserSettings.asset new file mode 100644 index 00000000000..5868d5f14f6 --- /dev/null +++ b/com.unity.template-hd/UserSettings/EditorUserSettings.asset @@ -0,0 +1,28 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!162 &1 +EditorUserSettings: + m_ObjectHideFlags: 0 + serializedVersion: 4 + m_ConfigSettings: + RecentlyUsedSceneGuid-0: + value: 505556575d065e580e575b2349765a44154e407c7d787f667b2f1c30b0e2643a + flags: 0 + vcSharedLogLevel: + value: 0d5e400f0650 + flags: 0 + m_VCAutomaticAdd: 1 + m_VCDebugCom: 0 + m_VCDebugCmd: 0 + m_VCDebugOut: 0 + m_SemanticMergeMode: 2 + m_DesiredImportWorkerCount: 4 + m_StandbyImportWorkerCount: 2 + m_IdleImportWorkerShutdownDelay: 60000 + m_VCShowFailedCheckout: 1 + m_VCOverwriteFailedCheckoutAssets: 1 + m_VCProjectOverlayIcons: 1 + m_VCHierarchyOverlayIcons: 1 + m_VCOtherOverlayIcons: 1 + m_VCAllowAsyncUpdate: 1 + m_ArtifactGarbageCollection: 1 diff --git a/com.unity.template-hd/UserSettings/Layouts/default-2022.dwlt b/com.unity.template-hd/UserSettings/Layouts/default-2022.dwlt new file mode 100644 index 00000000000..6a0b8ede359 --- /dev/null +++ b/com.unity.template-hd/UserSettings/Layouts/default-2022.dwlt @@ -0,0 +1,746 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &1 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12004, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_PixelRect: + serializedVersion: 2 + x: 2249 + y: 302.5 + width: 1206 + height: 715 + m_ShowMode: 4 + m_Title: + m_RootView: {fileID: 6} + m_MinSize: {x: 875, y: 300} + m_MaxSize: {x: 10000, y: 10000} + m_Maximized: 0 +--- !u!114 &2 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 9} + - {fileID: 3} + m_Position: + serializedVersion: 2 + x: 0 + y: 30 + width: 1206 + height: 665 + m_MinSize: {x: 679, y: 492} + m_MaxSize: {x: 14002, y: 14042} + vertical: 0 + controlID: 119 +--- !u!114 &3 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 921 + y: 0 + width: 285 + height: 665 + m_MinSize: {x: 276, y: 71} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 13} + m_Panes: + - {fileID: 13} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &4 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 228 + height: 394 + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 14} + m_Panes: + - {fileID: 14} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &5 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: ProjectBrowser + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 394 + width: 921 + height: 271 + m_MinSize: {x: 231, y: 271} + m_MaxSize: {x: 10001, y: 10021} + m_ActualView: {fileID: 12} + m_Panes: + - {fileID: 12} + - {fileID: 17} + m_Selected: 0 + m_LastSelected: 1 +--- !u!114 &6 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12008, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 7} + - {fileID: 2} + - {fileID: 8} + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 1206 + height: 715 + m_MinSize: {x: 875, y: 300} + m_MaxSize: {x: 10000, y: 10000} +--- !u!114 &7 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12011, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 1206 + height: 30 + m_MinSize: {x: 0, y: 0} + m_MaxSize: {x: 0, y: 0} + m_LoadedToolbars: [] + m_MainToolbar: {fileID: 18} + m_LastLoadedLayoutName: Default +--- !u!114 &8 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12042, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 695 + width: 1206 + height: 20 + m_MinSize: {x: 0, y: 0} + m_MaxSize: {x: 0, y: 0} +--- !u!114 &9 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 10} + - {fileID: 5} + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 921 + height: 665 + m_MinSize: {x: 403, y: 492} + m_MaxSize: {x: 10001, y: 14042} + vertical: 1 + controlID: 92 +--- !u!114 &10 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 4} + - {fileID: 11} + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 921 + height: 394 + m_MinSize: {x: 403, y: 221} + m_MaxSize: {x: 8003, y: 4021} + vertical: 0 + controlID: 93 +--- !u!114 &11 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 228 + y: 0 + width: 693 + height: 394 + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} + m_ActualView: {fileID: 15} + m_Panes: + - {fileID: 15} + - {fileID: 16} + m_Selected: 0 + m_LastSelected: 1 +--- !u!114 &12 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12014, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 230, y: 250} + m_MaxSize: {x: 10000, y: 10000} + m_TitleContent: + m_Text: Project + m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 2249 + y: 726.5 + width: 920 + height: 250 + m_ViewDataDictionary: {fileID: 0} + m_SearchFilter: + m_NameFilter: + m_ClassNames: [] + m_AssetLabels: [] + m_AssetBundleNames: [] + m_VersionControlStates: [] + m_SoftLockControlStates: [] + m_ReferencingInstanceIDs: + m_SceneHandles: + m_ShowAllHits: 0 + m_SkipHidden: 0 + m_SearchArea: 1 + m_Folders: + - Assets + m_Globs: [] + m_ViewMode: 1 + m_StartGridSize: 64 + m_LastFolders: + - Assets + m_LastFoldersGridSize: -1 + m_LastProjectPath: U:\layout + m_LockTracker: + m_IsLocked: 0 + m_FolderTreeState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: f4350000 + m_LastClickedID: 13812 + m_ExpandedIDs: 00000000f435000000ca9a3b + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 0} + m_SearchString: + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_AssetTreeState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: 00000000f4350000 + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 0} + m_SearchString: + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_ListAreaState: + m_SelectedInstanceIDs: + m_LastClickedInstanceID: 0 + m_HadKeyboardFocusLastEvent: 0 + m_ExpandedInstanceIDs: c6230000 + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 0} + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_NewAssetIndexInList: -1 + m_ScrollPosition: {x: 0, y: 0} + m_GridSize: 64 + m_SkipHiddenPackages: 0 + m_DirectoriesAreaWidth: 207 +--- !u!114 &13 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12019, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Inspector + m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 3170 + y: 332.5 + width: 284 + height: 644 + m_ViewDataDictionary: {fileID: 0} + m_ObjectsLockedBeforeSerialization: [] + m_InstanceIDsLockedBeforeSerialization: + m_PreviewResizer: + m_CachedPref: 160 + m_ControlHash: -371814159 + m_PrefName: Preview_InspectorPreview + m_LastInspectedObjectInstanceID: -1 + m_LastVerticalScrollValue: 0 + m_AssetGUID: + m_InstanceID: 0 + m_LockTracker: + m_IsLocked: 0 + m_PreviewWindow: {fileID: 0} +--- !u!114 &14 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12061, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Hierarchy + m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 2249 + y: 332.5 + width: 227 + height: 373 + m_ViewDataDictionary: {fileID: 0} + m_SceneHierarchy: + m_TreeViewState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: 42fbffff + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 0 + m_ClientGUIView: {fileID: 0} + m_SearchString: + m_ExpandedScenes: [] + m_CurrenRootInstanceID: 0 + m_LockTracker: + m_IsLocked: 0 + m_CurrentSortingName: TransformSorting + m_WindowGUID: 4c969a2b90040154d917609493e03593 +--- !u!114 &15 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12013, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Scene + m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 2477 + y: 332.5 + width: 691 + height: 373 + m_ViewDataDictionary: {fileID: 0} + m_ShowContextualTools: 0 + m_WindowGUID: cc27987af1a868c49b0894db9c0f5429 + m_Gizmos: 1 + m_OverrideSceneCullingMask: 6917529027641081856 + m_SceneIsLit: 1 + m_SceneLighting: 1 + m_2DMode: 0 + m_isRotationLocked: 0 + m_PlayAudio: 0 + m_AudioPlay: 0 + m_Position: + m_Target: {x: 0, y: 0, z: 0} + speed: 2 + m_Value: {x: 0, y: 0, z: 0} + m_RenderMode: 0 + m_CameraMode: + drawMode: 0 + name: Shaded + section: Shading Mode + m_ValidateTrueMetals: 0 + m_DoValidateTrueMetals: 0 + m_ExposureSliderValue: 0 + m_SceneViewState: + showFog: 1 + showMaterialUpdate: 0 + showSkybox: 1 + showFlares: 1 + showImageEffects: 1 + showParticleSystems: 1 + showVisualEffectGraphs: 1 + m_Grid: + xGrid: + m_Fade: + m_Target: 0 + speed: 2 + m_Value: 0 + m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} + m_Pivot: {x: 0, y: 0, z: 0} + m_Size: {x: 0, y: 0} + yGrid: + m_Fade: + m_Target: 1 + speed: 2 + m_Value: 1 + m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} + m_Pivot: {x: 0, y: 0, z: 0} + m_Size: {x: 1, y: 1} + zGrid: + m_Fade: + m_Target: 0 + speed: 2 + m_Value: 0 + m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} + m_Pivot: {x: 0, y: 0, z: 0} + m_Size: {x: 0, y: 0} + m_ShowGrid: 1 + m_GridAxis: 1 + m_gridOpacity: 0.5 + m_Rotation: + m_Target: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} + speed: 2 + m_Value: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} + m_Size: + m_Target: 10 + speed: 2 + m_Value: 10 + m_Ortho: + m_Target: 0 + speed: 2 + m_Value: 0 + m_CameraSettings: + m_Speed: 1 + m_SpeedNormalized: 0.5 + m_SpeedMin: 0.001 + m_SpeedMax: 2 + m_EasingEnabled: 1 + m_EasingDuration: 0.4 + m_AccelerationEnabled: 1 + m_FieldOfView: 90 + m_NearClip: 0.03 + m_FarClip: 10000 + m_DynamicClip: 1 + m_OcclusionCulling: 0 + m_LastSceneViewRotation: {x: 0, y: 0, z: 0, w: 0} + m_LastSceneViewOrtho: 0 + m_ReplacementShader: {fileID: 0} + m_ReplacementString: + m_SceneVisActive: 1 + m_LastLockedObject: {fileID: 0} + m_ViewIsLockedToObject: 0 +--- !u!114 &16 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Game + m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 507 + y: 94 + width: 1532 + height: 790 + m_ViewDataDictionary: {fileID: 0} + m_SerializedViewsNames: [] + m_SerializedViewsValues: [] + m_PlayModeViewName: GameView + m_ShowGizmos: 0 + m_TargetDisplay: 0 + m_ClearColor: {r: 0, g: 0, b: 0, a: 0} + m_TargetSize: {x: 640, y: 480} + m_TextureFilterMode: 0 + m_TextureHideFlags: 61 + m_RenderIMGUI: 0 + m_MaximizeOnPlay: 0 + m_UseMipMap: 0 + m_VSyncEnabled: 0 + m_Gizmos: 0 + m_Stats: 0 + m_SelectedSizes: 00000000000000000000000000000000000000000000000000000000000000000000000000000000 + m_ZoomArea: + m_HRangeLocked: 0 + m_VRangeLocked: 0 + hZoomLockedByDefault: 0 + vZoomLockedByDefault: 0 + m_HBaseRangeMin: -766 + m_HBaseRangeMax: 766 + m_VBaseRangeMin: -395 + m_VBaseRangeMax: 395 + m_HAllowExceedBaseRangeMin: 1 + m_HAllowExceedBaseRangeMax: 1 + m_VAllowExceedBaseRangeMin: 1 + m_VAllowExceedBaseRangeMax: 1 + m_ScaleWithWindow: 0 + m_HSlider: 0 + m_VSlider: 0 + m_IgnoreScrollWheelUntilClicked: 0 + m_EnableMouseInput: 1 + m_EnableSliderZoomHorizontal: 0 + m_EnableSliderZoomVertical: 0 + m_UniformScale: 1 + m_UpDirection: 1 + m_DrawArea: + serializedVersion: 2 + x: 0 + y: 0 + width: 1532 + height: 790 + m_Scale: {x: 1, y: 1} + m_Translation: {x: 766, y: 395} + m_MarginLeft: 0 + m_MarginRight: 0 + m_MarginTop: 0 + m_MarginBottom: 0 + m_LastShownAreaInsideMargins: + serializedVersion: 2 + x: -766 + y: -395 + width: 1532 + height: 790 + m_MinimalGUI: 1 + m_defaultScale: 1 + m_LastWindowPixelSize: {x: 1532, y: 790} + m_ClearInEditMode: 1 + m_NoCameraWarning: 1 + m_LowResolutionForAspectRatios: 01000000000000000000 + m_XRRenderMode: 0 + m_RenderTexture: {fileID: 0} +--- !u!114 &17 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12003, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Console + m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 2249 + y: 726.5 + width: 920 + height: 250 + m_ViewDataDictionary: {fileID: 0} +--- !u!114 &18 +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: 13963, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_DontSaveToLayout: 0 From 13d64daa388e555fb217f7d40fa5db055a8a0371 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Penavaire?= Date: Mon, 2 May 2022 10:17:30 +0200 Subject: [PATCH 2/8] Bump HD template to 14.0.0 --- .../com.unity.template.hd/CHANGELOG.md | 5 + .../com.unity.template.hd/package.json | 14 +- .../Packages/packages-lock.json | 12 +- .../ProjectSettings/ProjectVersion.txt | 4 +- .../UserSettings/Layouts/default-2022.dwlt | 713 ++++++++++++++---- 5 files changed, 578 insertions(+), 170 deletions(-) diff --git a/com.unity.template-hd/Packages/com.unity.template.hd/CHANGELOG.md b/com.unity.template-hd/Packages/com.unity.template.hd/CHANGELOG.md index 559c03b1f0d..5becc6d16d7 100644 --- a/com.unity.template-hd/Packages/com.unity.template.hd/CHANGELOG.md +++ b/com.unity.template-hd/Packages/com.unity.template.hd/CHANGELOG.md @@ -4,6 +4,11 @@ All notable changes to this project template will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## [14.0.0] - 2022-05-02 + +### Changed +- Update SRP package to 14.0.2 + ## [13.4.1] - 2022-03-16 ### Added 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..f87fec4ad7a 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 @@ -1,20 +1,20 @@ { "name": "com.unity.template.hd", "displayName": "High Definition RP", - "version": "13.4.1", + "version": "14.0.0", "type": "template", "host": "hub", "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/packages-lock.json b/com.unity.template-hd/Packages/packages-lock.json index 2a35887d1f3..2ce846853d1 100644 --- a/com.unity.template-hd/Packages/packages-lock.json +++ b/com.unity.template-hd/Packages/packages-lock.json @@ -201,14 +201,14 @@ "depth": 0, "source": "embedded", "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/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/UserSettings/Layouts/default-2022.dwlt b/com.unity.template-hd/UserSettings/Layouts/default-2022.dwlt index 6a0b8ede359..9517be73fb9 100644 --- a/com.unity.template-hd/UserSettings/Layouts/default-2022.dwlt +++ b/com.unity.template-hd/UserSettings/Layouts/default-2022.dwlt @@ -14,17 +14,43 @@ MonoBehaviour: m_EditorClassIdentifier: m_PixelRect: serializedVersion: 2 - x: 2249 - y: 302.5 - width: 1206 - height: 715 + x: 0 + y: 42 + width: 1920 + height: 998 m_ShowMode: 4 - m_Title: - m_RootView: {fileID: 6} + m_Title: Inspector + m_RootView: {fileID: 7} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} - m_Maximized: 0 + m_Maximized: 1 --- !u!114 &2 +MonoBehaviour: + m_ObjectHideFlags: 52 + 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: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: TutorialWindow + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 1481 + y: 0 + width: 439 + height: 948 + m_MinSize: {x: 301, y: 321} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 13} + m_Panes: + - {fileID: 13} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -37,19 +63,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 9} - - {fileID: 3} + - {fileID: 10} + - {fileID: 4} + - {fileID: 2} m_Position: serializedVersion: 2 x: 0 y: 30 - width: 1206 - height: 665 - m_MinSize: {x: 679, y: 492} - m_MaxSize: {x: 14002, y: 14042} + width: 1920 + height: 948 + m_MinSize: {x: 400, y: 200} + m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 119 ---- !u!114 &3 + controlID: 46 +--- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -59,23 +86,23 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: + m_Name: InspectorWindow m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 - x: 921 + x: 1102 y: 0 - width: 285 - height: 665 - m_MinSize: {x: 276, y: 71} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 13} + width: 379 + height: 948 + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 15} m_Panes: - - {fileID: 13} + - {fileID: 15} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &4 +--- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -92,16 +119,16 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 228 - height: 394 + width: 274 + height: 561.5 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 14} + m_ActualView: {fileID: 16} m_Panes: - - {fileID: 14} + - {fileID: 16} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &5 +--- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -111,24 +138,24 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ProjectBrowser + m_Name: ConsoleWindow m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 0 - y: 394 - width: 921 - height: 271 - m_MinSize: {x: 231, y: 271} - m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 12} + y: 561.5 + width: 1102 + height: 386.5 + m_MinSize: {x: 101, y: 121} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 19} m_Panes: - - {fileID: 12} - - {fileID: 17} - m_Selected: 0 - m_LastSelected: 1 ---- !u!114 &6 + - {fileID: 14} + - {fileID: 19} + m_Selected: 1 + m_LastSelected: 0 +--- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -141,18 +168,22 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 7} - - {fileID: 2} - {fileID: 8} + - {fileID: 3} + - {fileID: 9} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 1206 - height: 715 + width: 1920 + height: 998 m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} ---- !u!114 &7 + m_UseTopView: 1 + m_TopViewHeight: 30 + m_UseBottomView: 1 + m_BottomViewHeight: 20 +--- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -169,14 +200,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1206 + width: 1920 height: 30 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} - m_LoadedToolbars: [] - m_MainToolbar: {fileID: 18} - m_LastLoadedLayoutName: Default ---- !u!114 &8 + m_LastLoadedLayoutName: +--- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -192,12 +221,12 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 695 - width: 1206 + y: 978 + width: 1920 height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} ---- !u!114 &9 +--- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -210,19 +239,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 10} - - {fileID: 5} + - {fileID: 11} + - {fileID: 6} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 921 - height: 665 - m_MinSize: {x: 403, y: 492} - m_MaxSize: {x: 10001, y: 14042} + width: 1102 + height: 948 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 92 ---- !u!114 &10 + controlID: 47 +--- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -235,19 +264,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 4} - - {fileID: 11} + - {fileID: 5} + - {fileID: 12} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 921 - height: 394 - m_MinSize: {x: 403, y: 221} - m_MaxSize: {x: 8003, y: 4021} + width: 1102 + height: 561.5 + m_MinSize: {x: 200, y: 100} + m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 93 ---- !u!114 &11 + controlID: 48 +--- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -262,19 +291,56 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 228 + x: 274 y: 0 - width: 693 - height: 394 + width: 828 + height: 561.5 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 15} + m_ActualView: {fileID: 17} m_Panes: - - {fileID: 15} - - {fileID: 16} + - {fileID: 17} + - {fileID: 18} m_Selected: 0 m_LastSelected: 1 ---- !u!114 &12 +--- !u!114 &13 +MonoBehaviour: + m_ObjectHideFlags: 52 + 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: ba8f85f9d6bbb46d180610e6061865df, type: 3} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 300, y: 300} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Tutorials + m_Image: {fileID: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 1481 + y: 72 + width: 438 + height: 927 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_AllParagraphs: [] + m_ActiveContainer: {fileID: 11400000, guid: 938ffbc4ff2eabb48a668123d363dfe1, type: 2} + m_TutorialProjects: [] + m_VisibleContainers: + - {fileID: 11400000, guid: 938ffbc4ff2eabb48a668123d363dfe1, type: 2} + m_ChildContainers: [] + m_MaskingEnabled: 1 + m_FarthestPageCompleted: -1 + m_PlayModeChanging: 0 +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -290,15 +356,18 @@ MonoBehaviour: m_MaxSize: {x: 10000, y: 10000} m_TitleContent: m_Text: Project - m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 2249 - y: 726.5 - width: 920 - height: 250 + x: 0 + y: 633.5 + width: 1101 + height: 365.5 m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] m_SearchFilter: m_NameFilter: m_ClassNames: [] @@ -314,19 +383,20 @@ MonoBehaviour: m_Folders: - Assets m_Globs: [] + m_OriginalText: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - Assets m_LastFoldersGridSize: -1 - m_LastProjectPath: U:\layout + m_LastProjectPath: C:\Users\theop\Documents\Projects\Graphics\Graphics\com.unity.template-hd m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: f4350000 - m_LastClickedID: 13812 - m_ExpandedIDs: 00000000f435000000ca9a3b + m_SelectedIDs: 0e060000 + m_LastClickedID: 1550 + m_ExpandedIDs: 000000008c9b0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -354,7 +424,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000f4350000 + m_ExpandedIDs: 000000008c9b0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -410,7 +480,7 @@ MonoBehaviour: m_GridSize: 64 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 207 ---- !u!114 &13 +--- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -426,15 +496,18 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Inspector - m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 3170 - y: 332.5 - width: 284 - height: 644 + x: 1102 + y: 72 + width: 377 + height: 927 m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] m_ObjectsLockedBeforeSerialization: [] m_InstanceIDsLockedBeforeSerialization: m_PreviewResizer: @@ -443,12 +516,12 @@ MonoBehaviour: m_PrefName: Preview_InspectorPreview m_LastInspectedObjectInstanceID: -1 m_LastVerticalScrollValue: 0 - m_AssetGUID: - m_InstanceID: 0 + m_GlobalObjectId: + m_InspectorMode: 0 m_LockTracker: m_IsLocked: 0 m_PreviewWindow: {fileID: 0} ---- !u!114 &14 +--- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -464,21 +537,24 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Hierarchy - m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: -3734745235275155857, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 2249 - y: 332.5 - width: 227 - height: 373 + x: 0 + y: 72 + width: 273 + height: 540.5 m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 42fbffff + m_ExpandedIDs: 0efbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -502,7 +578,7 @@ MonoBehaviour: m_IsLocked: 0 m_CurrentSortingName: TransformSorting m_WindowGUID: 4c969a2b90040154d917609493e03593 ---- !u!114 &15 +--- !u!114 &17 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -518,16 +594,343 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Scene - m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: 8634526014445323508, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 2477 - y: 332.5 - width: 691 - height: 373 + x: 274 + y: 72 + width: 826 + height: 540.5 m_ViewDataDictionary: {fileID: 0} - m_ShowContextualTools: 0 + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: + - dockPosition: 0 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: -163, y: -26} + snapCorner: 3 + id: Tool Settings + index: 0 + layout: 1 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 0 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: -141, y: 149} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 1 + id: unity-grid-and-snap-toolbar + index: 1 + layout: 1 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: unity-scene-view-toolbar + index: 0 + layout: 1 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 1 + id: unity-search-toolbar + index: 1 + layout: 1 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 0 + containerId: overlay-container--left + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: unity-transform-toolbar + index: 0 + layout: 2 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 0 + containerId: overlay-container--left + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 0, y: 197} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: unity-component-tools + index: 1 + layout: 2 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 0 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 67.5, y: 86} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Orientation + index: 0 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Light Settings + index: 0 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Camera + index: 1 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Cloth Constraints + index: 2 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Cloth Collisions + index: 3 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Navmesh Display + index: 4 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Agent Display + index: 5 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Obstacle Display + index: 6 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Occlusion Culling + index: 7 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Physics Debugger + index: 8 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Scene Visibility + index: 9 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Particles + index: 10 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Tilemap + index: 11 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Tilemap Palette Helper + index: 12 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 0 + containerId: overlay-toolbar__left + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Visual Effect Model + index: 0 + layout: 0 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 0 + containerId: overlay-toolbar__left + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Visual Effect + index: 1 + layout: 0 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 0 + containerId: overlay-toolbar__left + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Visual Effect Event Tester + index: 2 + layout: 0 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Visual Effect Timeline Control + index: 11 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/TrailRenderer + index: 12 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 m_WindowGUID: cc27987af1a868c49b0894db9c0f5429 m_Gizmos: 1 m_OverrideSceneCullingMask: 6917529027641081856 @@ -538,9 +941,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 0, y: 0, z: 0} + m_Target: {x: 10.733542, y: 5.8572855, z: -6.401824} speed: 2 - m_Value: {x: 0, y: 0, z: 0} + m_Value: {x: 10.733542, y: 5.8572855, z: -6.401824} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -548,15 +951,15 @@ MonoBehaviour: section: Shading Mode m_ValidateTrueMetals: 0 m_DoValidateTrueMetals: 0 - m_ExposureSliderValue: 0 m_SceneViewState: + m_AlwaysRefresh: 0 showFog: 1 - showMaterialUpdate: 0 showSkybox: 1 showFlares: 1 showImageEffects: 1 showParticleSystems: 1 showVisualEffectGraphs: 1 + m_FxEnabled: 1 m_Grid: xGrid: m_Fade: @@ -586,9 +989,9 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} + m_Target: {x: -0.015144774, y: 0.88569325, z: 0.028964305, w: 0.46313074} speed: 2 - m_Value: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} + m_Value: {x: -0.015144691, y: 0.8856884, z: 0.028964147, w: 0.4631282} m_Size: m_Target: 10 speed: 2 @@ -605,7 +1008,7 @@ MonoBehaviour: m_EasingEnabled: 1 m_EasingDuration: 0.4 m_AccelerationEnabled: 1 - m_FieldOfView: 90 + m_FieldOfViewHorizontalOrVertical: 60 m_NearClip: 0.03 m_FarClip: 10000 m_DynamicClip: 1 @@ -617,7 +1020,7 @@ MonoBehaviour: m_SceneVisActive: 1 m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 ---- !u!114 &16 +--- !u!114 &18 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -633,7 +1036,7 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Game - m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: 4621777727084837110, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 @@ -642,19 +1045,27 @@ MonoBehaviour: width: 1532 height: 790 m_ViewDataDictionary: {fileID: 0} - m_SerializedViewsNames: [] - m_SerializedViewsValues: [] + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_SerializedViewNames: [] + m_SerializedViewValues: [] m_PlayModeViewName: GameView m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 640, y: 480} + m_TargetSize: {x: 1532, y: 769} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 0 - m_MaximizeOnPlay: 0 + m_EnterPlayModeBehavior: 0 + m_fullscreenMonitorIdx: 0 + m_playModeBehaviorIdx: 0 m_UseMipMap: 0 + m_isFullscreen: 0 + m_suppressRenderingForFullscreen: 0 m_VSyncEnabled: 0 + m_PlayFocused: 0 m_Gizmos: 0 m_Stats: 0 m_SelectedSizes: 00000000000000000000000000000000000000000000000000000000000000000000000000000000 @@ -663,10 +1074,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -766 - m_HBaseRangeMax: 766 - m_VBaseRangeMin: -395 - m_VBaseRangeMax: 395 + m_HBaseRangeMin: -383 + m_HBaseRangeMax: 383 + m_VBaseRangeMin: -192.25 + m_VBaseRangeMax: 192.25 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -683,30 +1094,32 @@ MonoBehaviour: m_DrawArea: serializedVersion: 2 x: 0 - y: 0 + y: 21 width: 1532 - height: 790 - m_Scale: {x: 1, y: 1} - m_Translation: {x: 766, y: 395} + height: 769 + m_Scale: {x: 2, y: 2} + m_Translation: {x: 766, y: 384.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -766 - y: -395 - width: 1532 - height: 790 + x: -383 + y: -192.25 + width: 766 + height: 384.5 m_MinimalGUI: 1 - m_defaultScale: 1 - m_LastWindowPixelSize: {x: 1532, y: 790} + m_defaultScale: 2 + m_LastWindowPixelSize: {x: 3064, y: 1580} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 m_XRRenderMode: 0 m_RenderTexture: {fileID: 0} ---- !u!114 &17 + m_showToolbar: 1 + m_showToolbarOnFullscreen: 0 +--- !u!114 &19 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -722,25 +1135,15 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Console - m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: -4950941429401207979, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 2249 - y: 726.5 - width: 920 - height: 250 + x: 0 + y: 633.5 + width: 1101 + height: 365.5 m_ViewDataDictionary: {fileID: 0} ---- !u!114 &18 -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: 13963, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_DontSaveToLayout: 0 + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] From cf62f15cd1526f4ad0337e648f1e8cd574b0d53e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Penavaire?= Date: Mon, 2 May 2022 10:19:37 +0200 Subject: [PATCH 3/8] Bump urp template to 14.0.0 --- .../Packages/com.unity.template.universal/CHANGELOG.md | 5 +++++ .../Packages/com.unity.template.universal/package.json | 4 ++-- com.unity.template-universal/Packages/manifest.json | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/com.unity.template-universal/Packages/com.unity.template.universal/CHANGELOG.md b/com.unity.template-universal/Packages/com.unity.template.universal/CHANGELOG.md index 1cc15ee3c52..d3886392e9a 100644 --- a/com.unity.template-universal/Packages/com.unity.template.universal/CHANGELOG.md +++ b/com.unity.template-universal/Packages/com.unity.template.universal/CHANGELOG.md @@ -4,6 +4,11 @@ All notable changes to this project template will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## [14.0.0] - 2022-05-02 + +### Changed +- Update SRP package to 14.0.2 + ## [13.2.2] - 2022-03-16 ### Added diff --git a/com.unity.template-universal/Packages/com.unity.template.universal/package.json b/com.unity.template-universal/Packages/com.unity.template.universal/package.json index 22f58bbea48..c054eb5c593 100644 --- a/com.unity.template-universal/Packages/com.unity.template.universal/package.json +++ b/com.unity.template-universal/Packages/com.unity.template.universal/package.json @@ -1,7 +1,7 @@ { "name": "com.unity.template.universal", "displayName": "Universal Render Pipeline", - "version": "13.2.2", + "version": "14.0.0", "type": "template", "unity": "2022.1", "host": "hub", @@ -11,7 +11,7 @@ "com.unity.2d.tilemap": "1.0.0", "com.unity.collab-proxy": "1.7.1", "com.unity.feature.development": "1.0.1", - "com.unity.render-pipelines.universal": "13.1.0", + "com.unity.render-pipelines.universal": "14.0.2", "com.unity.textmeshpro": "3.0.6", "com.unity.timeline": "1.6.2", "com.unity.ugui": "1.0.0", diff --git a/com.unity.template-universal/Packages/manifest.json b/com.unity.template-universal/Packages/manifest.json index 58103d0b877..59f4542b62c 100644 --- a/com.unity.template-universal/Packages/manifest.json +++ b/com.unity.template-universal/Packages/manifest.json @@ -4,7 +4,7 @@ "com.unity.2d.tilemap": "1.0.0", "com.unity.collab-proxy": "1.7.1", "com.unity.feature.development": "1.0.1", - "com.unity.render-pipelines.universal": "13.1.0", + "com.unity.render-pipelines.universal": "14.0.02", "com.unity.test-framework": "1.1.29", "com.unity.textmeshpro": "3.0.6", "com.unity.timeline": "1.6.2", From fb4e28e756970f7ec44d1348322fed44598e505d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Penavaire?= Date: Mon, 2 May 2022 10:31:53 +0200 Subject: [PATCH 4/8] Regenerate URP template files --- .../com.unity.template.hd/package.json | 2 +- .../com.unity.template.universal/package.json | 8 +- .../Packages/manifest.json | 16 +- .../Packages/packages-lock.json | 550 ++++++++++++++++++ .../ProjectSettings/ProjectVersion.txt | 2 + .../ProjectSettings/URPProjectSettings.asset | 2 +- 6 files changed, 569 insertions(+), 11 deletions(-) create mode 100644 com.unity.template-universal/Packages/packages-lock.json create mode 100644 com.unity.template-universal/ProjectSettings/ProjectVersion.txt 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 f87fec4ad7a..e23ae737e03 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 @@ -4,7 +4,7 @@ "version": "14.0.0", "type": "template", "host": "hub", - "unity": "2022.1", + "unity": "2022.2", "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.15.16", diff --git a/com.unity.template-universal/Packages/com.unity.template.universal/package.json b/com.unity.template-universal/Packages/com.unity.template.universal/package.json index c054eb5c593..db56339aab0 100644 --- a/com.unity.template-universal/Packages/com.unity.template.universal/package.json +++ b/com.unity.template-universal/Packages/com.unity.template.universal/package.json @@ -3,19 +3,19 @@ "displayName": "Universal Render Pipeline", "version": "14.0.0", "type": "template", - "unity": "2022.1", + "unity": "2022.2", "host": "hub", "description": "The Universal Render Pipeline Template configures Project settings for Projects where performance, wide platform support, and ease of customizing graphics are the primary considerations.\n\nThis Template uses the Universal Render Pipeline (URP) and Shader Graph. URP is prebuilt Scriptable Render Pipeline that is quick and easy to customize, and lets you create optimized graphics across a wide range of platforms. URP also includes an optimized 2D renderer complete with 2D lights and pixel perfect rendering, and an integrated post-processing solution. Shader Graph is a tool that allows you to create shaders using a visual node editor instead of writing code.\n\nThis template contains a sample Scene that contains examples of how to configure lighting settings, Materials, Shaders, and post-processing effects in URP, several preconfigured Universal Render Pipeline Assets that let you quickly swap between graphics quality levels, and Presets that have been optimized for use with URP.", "dependencies": { "com.unity.2d.sprite": "1.0.0", "com.unity.2d.tilemap": "1.0.0", - "com.unity.collab-proxy": "1.7.1", + "com.unity.collab-proxy": "1.15.16", "com.unity.feature.development": "1.0.1", "com.unity.render-pipelines.universal": "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.xr.legacyinputhelpers": "2.1.8", + "com.unity.xr.legacyinputhelpers": "2.1.9", "com.unity.visualscripting": "1.7.7" } } diff --git a/com.unity.template-universal/Packages/manifest.json b/com.unity.template-universal/Packages/manifest.json index 59f4542b62c..bb6b32d46f5 100644 --- a/com.unity.template-universal/Packages/manifest.json +++ b/com.unity.template-universal/Packages/manifest.json @@ -2,15 +2,21 @@ "dependencies": { "com.unity.2d.sprite": "1.0.0", "com.unity.2d.tilemap": "1.0.0", - "com.unity.collab-proxy": "1.7.1", + "com.unity.ads": "4.1.0", + "com.unity.analytics": "3.8.1", + "com.unity.collab-proxy": "1.15.16", "com.unity.feature.development": "1.0.1", - "com.unity.render-pipelines.universal": "14.0.02", - "com.unity.test-framework": "1.1.29", + "com.unity.ide.rider": "3.0.13", + "com.unity.ide.visualstudio": "2.0.15", + "com.unity.ide.vscode": "1.2.5", + "com.unity.purchasing": "4.1.3", + "com.unity.render-pipelines.universal": "14.0.2", + "com.unity.test-framework": "1.1.31", "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.7", - "com.unity.xr.legacyinputhelpers": "2.1.8", + "com.unity.xr.legacyinputhelpers": "2.1.9", "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-universal/Packages/packages-lock.json b/com.unity.template-universal/Packages/packages-lock.json new file mode 100644 index 00000000000..482e16e53ec --- /dev/null +++ b/com.unity.template-universal/Packages/packages-lock.json @@ -0,0 +1,550 @@ +{ + "dependencies": { + "com.unity.2d.sprite": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.2d.tilemap": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.tilemap": "1.0.0", + "com.unity.modules.uielements": "1.0.0" + } + }, + "com.unity.ads": { + "version": "4.1.0", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.ugui": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.analytics": { + "version": "3.8.1", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.services.analytics": "1.0.4", + "com.unity.ugui": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.burst": { + "version": "1.7.1", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.mathematics": "1.2.1" + }, + "url": "https://packages.unity.com" + }, + "com.unity.collab-proxy": { + "version": "1.15.16", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.services.core": "1.0.1" + }, + "url": "https://packages.unity.com" + }, + "com.unity.editorcoroutines": { + "version": "1.0.0", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.ext.nunit": { + "version": "1.0.6", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.feature.development": { + "version": "1.0.1", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.ide.visualstudio": "2.0.15", + "com.unity.ide.rider": "3.0.13", + "com.unity.ide.vscode": "1.2.5", + "com.unity.editorcoroutines": "1.0.0", + "com.unity.performance.profile-analyzer": "1.1.1", + "com.unity.test-framework": "1.1.31", + "com.unity.testtools.codecoverage": "1.1.1" + } + }, + "com.unity.ide.rider": { + "version": "3.0.13", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.ext.nunit": "1.0.6" + }, + "url": "https://packages.unity.com" + }, + "com.unity.ide.visualstudio": { + "version": "2.0.15", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.test-framework": "1.1.9" + }, + "url": "https://packages.unity.com" + }, + "com.unity.ide.vscode": { + "version": "1.2.5", + "depth": 0, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.mathematics": { + "version": "1.2.6", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.nuget.newtonsoft-json": { + "version": "3.0.2", + "depth": 2, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.performance.profile-analyzer": { + "version": "1.1.1", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.purchasing": { + "version": "4.1.3", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.ugui": "1.0.0", + "com.unity.modules.unityanalytics": "1.0.0", + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.androidjni": "1.0.0", + "com.unity.services.core": "1.0.1" + }, + "url": "https://packages.unity.com" + }, + "com.unity.render-pipelines.core": { + "version": "14.0.2", + "depth": 1, + "source": "builtin", + "dependencies": { + "com.unity.ugui": "1.0.0", + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0" + } + }, + "com.unity.render-pipelines.universal": { + "version": "14.0.2", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.mathematics": "1.2.1", + "com.unity.burst": "1.6.4", + "com.unity.render-pipelines.core": "14.0.2", + "com.unity.shadergraph": "14.0.2" + } + }, + "com.unity.searcher": { + "version": "4.9.2", + "depth": 2, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.services.analytics": { + "version": "1.0.5", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.services.core": "1.0.1" + }, + "url": "https://packages.unity.com" + }, + "com.unity.services.core": { + "version": "1.3.1", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.nuget.newtonsoft-json": "3.0.2", + "com.unity.modules.androidjni": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.settings-manager": { + "version": "2.0.1", + "depth": 2, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.shadergraph": { + "version": "14.0.2", + "depth": 1, + "source": "builtin", + "dependencies": { + "com.unity.render-pipelines.core": "14.0.2", + "com.unity.searcher": "4.9.2" + } + }, + "com.unity.template.universal": { + "version": "file:com.unity.template.universal", + "depth": 0, + "source": "embedded", + "dependencies": { + "com.unity.2d.sprite": "1.0.0", + "com.unity.2d.tilemap": "1.0.0", + "com.unity.collab-proxy": "1.7.1", + "com.unity.feature.development": "1.0.1", + "com.unity.render-pipelines.universal": "14.0.2", + "com.unity.textmeshpro": "3.0.6", + "com.unity.timeline": "1.6.2", + "com.unity.ugui": "1.0.0", + "com.unity.xr.legacyinputhelpers": "2.1.8", + "com.unity.visualscripting": "1.7.7" + } + }, + "com.unity.test-framework": { + "version": "1.1.31", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.ext.nunit": "1.0.6", + "com.unity.modules.imgui": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.testtools.codecoverage": { + "version": "1.1.1", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.test-framework": "1.0.16", + "com.unity.settings-manager": "1.0.1" + }, + "url": "https://packages.unity.com" + }, + "com.unity.textmeshpro": { + "version": "3.0.6", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.ugui": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.timeline": { + "version": "1.7.1", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.modules.director": "1.0.0", + "com.unity.modules.animation": "1.0.0", + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.particlesystem": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.ugui": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.imgui": "1.0.0" + } + }, + "com.unity.visualscripting": { + "version": "1.7.7", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.ugui": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.xr.legacyinputhelpers": { + "version": "2.1.9", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.modules.vr": "1.0.0", + "com.unity.modules.xr": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.modules.ai": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.androidjni": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.animation": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.assetbundle": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.audio": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.cloth": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.physics": "1.0.0" + } + }, + "com.unity.modules.director": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.animation": "1.0.0" + } + }, + "com.unity.modules.imageconversion": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.imgui": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.jsonserialize": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.particlesystem": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.physics": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.physics2d": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.screencapture": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.imageconversion": "1.0.0" + } + }, + "com.unity.modules.subsystems": { + "version": "1.0.0", + "depth": 1, + "source": "builtin", + "dependencies": { + "com.unity.modules.jsonserialize": "1.0.0" + } + }, + "com.unity.modules.terrain": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.terrainphysics": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.terrain": "1.0.0" + } + }, + "com.unity.modules.tilemap": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.physics2d": "1.0.0" + } + }, + "com.unity.modules.ui": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.uielements": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.imgui": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.uielementsnative": "1.0.0" + } + }, + "com.unity.modules.uielementsnative": { + "version": "1.0.0", + "depth": 1, + "source": "builtin", + "dependencies": { + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.imgui": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0" + } + }, + "com.unity.modules.umbra": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.unityanalytics": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0" + } + }, + "com.unity.modules.unitywebrequest": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.unitywebrequestassetbundle": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.assetbundle": "1.0.0", + "com.unity.modules.unitywebrequest": "1.0.0" + } + }, + "com.unity.modules.unitywebrequestaudio": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.audio": "1.0.0" + } + }, + "com.unity.modules.unitywebrequesttexture": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.imageconversion": "1.0.0" + } + }, + "com.unity.modules.unitywebrequestwww": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.unitywebrequestassetbundle": "1.0.0", + "com.unity.modules.unitywebrequestaudio": "1.0.0", + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.assetbundle": "1.0.0", + "com.unity.modules.imageconversion": "1.0.0" + } + }, + "com.unity.modules.vehicles": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.physics": "1.0.0" + } + }, + "com.unity.modules.video": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.unitywebrequest": "1.0.0" + } + }, + "com.unity.modules.vr": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.xr": "1.0.0" + } + }, + "com.unity.modules.wind": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.xr": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.subsystems": "1.0.0" + } + } + } +} diff --git a/com.unity.template-universal/ProjectSettings/ProjectVersion.txt b/com.unity.template-universal/ProjectSettings/ProjectVersion.txt new file mode 100644 index 00000000000..71fbe498a0e --- /dev/null +++ b/com.unity.template-universal/ProjectSettings/ProjectVersion.txt @@ -0,0 +1,2 @@ +m_EditorVersion: 2022.2.0a12 +m_EditorVersionWithRevision: 2022.2.0a12 (752dd7c427d5) diff --git a/com.unity.template-universal/ProjectSettings/URPProjectSettings.asset b/com.unity.template-universal/ProjectSettings/URPProjectSettings.asset index c1f118ad3f6..4fae4e6e977 100644 --- a/com.unity.template-universal/ProjectSettings/URPProjectSettings.asset +++ b/com.unity.template-universal/ProjectSettings/URPProjectSettings.asset @@ -12,4 +12,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 247994e1f5a72c2419c26a37e9334c01, type: 3} m_Name: m_EditorClassIdentifier: - m_LastMaterialVersion: 5 + m_LastMaterialVersion: 6 From 85b2bde3b6f13075fff9a93a423bcb3a2d3f50e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Penavaire?= Date: Mon, 2 May 2022 11:46:17 +0200 Subject: [PATCH 5/8] Bump exception --- .../Packages/com.unity.template.hd/ValidationExceptions.json | 2 +- .../com.unity.template.universal/ValidationExceptions.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/com.unity.template-hd/Packages/com.unity.template.hd/ValidationExceptions.json b/com.unity.template-hd/Packages/com.unity.template.hd/ValidationExceptions.json index de990db9724..7696fc60576 100644 --- a/com.unity.template-hd/Packages/com.unity.template.hd/ValidationExceptions.json +++ b/com.unity.template-hd/Packages/com.unity.template.hd/ValidationExceptions.json @@ -2,7 +2,7 @@ "ErrorExceptions": [ { "ValidationTest": "Primed Library Validation", - "PackageVersion": "13.4.1" + "PackageVersion": "14.0.0" } ], "WarningExceptions": [] diff --git a/com.unity.template-universal/Packages/com.unity.template.universal/ValidationExceptions.json b/com.unity.template-universal/Packages/com.unity.template.universal/ValidationExceptions.json index 16445f88050..7696fc60576 100644 --- a/com.unity.template-universal/Packages/com.unity.template.universal/ValidationExceptions.json +++ b/com.unity.template-universal/Packages/com.unity.template.universal/ValidationExceptions.json @@ -2,7 +2,7 @@ "ErrorExceptions": [ { "ValidationTest": "Primed Library Validation", - "PackageVersion": "13.2.2" + "PackageVersion": "14.0.0" } ], "WarningExceptions": [] From d8eefc160dfe8d248c7060c6b8c7b23f63b14e79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Penavaire?= Date: Mon, 2 May 2022 13:37:21 +0200 Subject: [PATCH 6/8] Use old utr version --- .yamato/_templates.yml | 64 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/.yamato/_templates.yml b/.yamato/_templates.yml index b77b25fb9f3..e90caaa2f19 100644 --- a/.yamato/_templates.yml +++ b/.yamato/_templates.yml @@ -9,6 +9,8 @@ pre_pack_hdrp_template_Win_trunk: name: Pre-Pack HDRP Template Win trunk + variables: + UTR_VERSION: 1.5.0 agent: type: Unity::VM image: package-ci/win10:stable @@ -30,6 +32,8 @@ pre_pack_hdrp_template_Win_trunk: - "Editor.log" pack_hdrp_template_Win_trunk: name: Pack HDRP Template Win trunk + variables: + UTR_VERSION: 1.5.0 agent: type: Unity::VM image: package-ci/win10:v2.2.1-1064078 @@ -44,6 +48,8 @@ pack_hdrp_template_Win_trunk: - "upm-ci~/templates/**/*" test_hdrp_template_Win_trunk: name: Test HDRP Template Win trunk + variables: + UTR_VERSION: 1.5.0 agent: type: Unity::VM image: package-ci/win10:stable @@ -62,6 +68,8 @@ test_hdrp_template_Win_trunk: - "**/test-results/**" pre_pack_hdrp_template_OSX_trunk: name: Pre-Pack HDRP Template OSX trunk + variables: + UTR_VERSION: 1.5.0 agent: type: Unity::VM::osx image: package-ci/mac:stable @@ -82,6 +90,8 @@ pre_pack_hdrp_template_OSX_trunk: - "Editor.log" pack_hdrp_template_OSX_trunk: name: Pack HDRP Template OSX trunk + variables: + UTR_VERSION: 1.5.0 agent: type: Unity::VM image: package-ci/win10:v2.2.1-1064078 @@ -96,6 +106,8 @@ pack_hdrp_template_OSX_trunk: - "upm-ci~/templates/**/*" test_hdrp_template_OSX_trunk: name: Test HDRP Template OSX trunk + variables: + UTR_VERSION: 1.5.0 agent: type: Unity::VM::osx image: package-ci/mac:stable @@ -117,6 +129,8 @@ publish_hdrp_template_trunk: image: package-ci/win10:v2.2.1-1064078 flavor: b1.large name: Publish HDRP Template trunk + variables: + UTR_VERSION: 1.5.0 commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - upm-ci template publish --project-path com.unity.template-hd @@ -136,6 +150,8 @@ publish_hdrp_template_trunk_dry_run: image: package-ci/win10:v2.2.1-1064078 flavor: b1.large name: Publish HDRP Template trunk Dry Run + variables: + UTR_VERSION: 1.5.0 commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - upm-ci template publish --project-path com.unity.template-hd --dry-run @@ -151,6 +167,8 @@ publish_hdrp_template_trunk_dry_run: - "upm-ci~/templates/**/*" pre_pack_hdrp_template_Win_CUSTOM-REVISION: name: Pre-Pack HDRP Template Win CUSTOM-REVISION + variables: + UTR_VERSION: 1.5.0 agent: type: Unity::VM image: package-ci/win10:stable @@ -172,6 +190,8 @@ pre_pack_hdrp_template_Win_CUSTOM-REVISION: - "Editor.log" pack_hdrp_template_Win_CUSTOM-REVISION: name: Pack HDRP Template Win CUSTOM-REVISION + variables: + UTR_VERSION: 1.5.0 agent: type: Unity::VM image: package-ci/win10:v2.2.1-1064078 @@ -186,6 +206,8 @@ pack_hdrp_template_Win_CUSTOM-REVISION: - "upm-ci~/templates/**/*" test_hdrp_template_Win_CUSTOM-REVISION: name: Test HDRP Template Win CUSTOM-REVISION + variables: + UTR_VERSION: 1.5.0 agent: type: Unity::VM image: package-ci/win10:stable @@ -204,6 +226,8 @@ test_hdrp_template_Win_CUSTOM-REVISION: - "**/test-results/**" pre_pack_hdrp_template_OSX_CUSTOM-REVISION: name: Pre-Pack HDRP Template OSX CUSTOM-REVISION + variables: + UTR_VERSION: 1.5.0 agent: type: Unity::VM::osx image: package-ci/mac:stable @@ -224,6 +248,8 @@ pre_pack_hdrp_template_OSX_CUSTOM-REVISION: - "Editor.log" pack_hdrp_template_OSX_CUSTOM-REVISION: name: Pack HDRP Template OSX CUSTOM-REVISION + variables: + UTR_VERSION: 1.5.0 agent: type: Unity::VM image: package-ci/win10:v2.2.1-1064078 @@ -238,6 +264,8 @@ pack_hdrp_template_OSX_CUSTOM-REVISION: - "upm-ci~/templates/**/*" test_hdrp_template_OSX_CUSTOM-REVISION: name: Test HDRP Template OSX CUSTOM-REVISION + variables: + UTR_VERSION: 1.5.0 agent: type: Unity::VM::osx image: package-ci/mac:stable @@ -259,6 +287,8 @@ publish_hdrp_template_CUSTOM-REVISION: image: package-ci/win10:v2.2.1-1064078 flavor: b1.large name: Publish HDRP Template CUSTOM-REVISION + variables: + UTR_VERSION: 1.5.0 commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - upm-ci template publish --project-path com.unity.template-hd @@ -278,6 +308,8 @@ publish_hdrp_template_CUSTOM-REVISION_dry_run: image: package-ci/win10:v2.2.1-1064078 flavor: b1.large name: Publish HDRP Template CUSTOM-REVISION Dry Run + variables: + UTR_VERSION: 1.5.0 commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - upm-ci template publish --project-path com.unity.template-hd --dry-run @@ -293,6 +325,8 @@ publish_hdrp_template_CUSTOM-REVISION_dry_run: - "upm-ci~/templates/**/*" pre_pack_universal_template_Win_trunk: name: Pre-Pack Universal Template Win trunk + variables: + UTR_VERSION: 1.5.0 agent: type: Unity::VM image: package-ci/win10:stable @@ -314,6 +348,8 @@ pre_pack_universal_template_Win_trunk: - "Editor.log" pack_universal_template_Win_trunk: name: Pack Universal Template Win trunk + variables: + UTR_VERSION: 1.5.0 agent: type: Unity::VM image: package-ci/win10:v2.2.1-1064078 @@ -328,6 +364,8 @@ pack_universal_template_Win_trunk: - "upm-ci~/templates/**/*" test_universal_template_Win_trunk: name: Test Universal Template Win trunk + variables: + UTR_VERSION: 1.5.0 agent: type: Unity::VM image: package-ci/win10:stable @@ -346,6 +384,8 @@ test_universal_template_Win_trunk: - "**/test-results/**" pre_pack_universal_template_OSX_trunk: name: Pre-Pack Universal Template OSX trunk + variables: + UTR_VERSION: 1.5.0 agent: type: Unity::VM::osx image: package-ci/mac:stable @@ -366,6 +406,8 @@ pre_pack_universal_template_OSX_trunk: - "Editor.log" pack_universal_template_OSX_trunk: name: Pack Universal Template OSX trunk + variables: + UTR_VERSION: 1.5.0 agent: type: Unity::VM image: package-ci/win10:v2.2.1-1064078 @@ -380,6 +422,8 @@ pack_universal_template_OSX_trunk: - "upm-ci~/templates/**/*" test_universal_template_OSX_trunk: name: Test Universal Template OSX trunk + variables: + UTR_VERSION: 1.5.0 agent: type: Unity::VM::osx image: package-ci/mac:stable @@ -401,6 +445,8 @@ publish_universal_template_trunk: image: package-ci/win10:v2.2.1-1064078 flavor: b1.large name: Publish Universal Template trunk + variables: + UTR_VERSION: 1.5.0 commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - upm-ci template publish --project-path com.unity.template-universal @@ -420,6 +466,8 @@ publish_universal_template_trunk_dry_run: image: package-ci/win10:v2.2.1-1064078 flavor: b1.large name: Publish Universal Template trunk Dry Run + variables: + UTR_VERSION: 1.5.0 commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - upm-ci template publish --project-path com.unity.template-universal --dry-run @@ -435,6 +483,8 @@ publish_universal_template_trunk_dry_run: - "upm-ci~/templates/**/*" pre_pack_universal_template_Win_CUSTOM-REVISION: name: Pre-Pack Universal Template Win CUSTOM-REVISION + variables: + UTR_VERSION: 1.5.0 agent: type: Unity::VM image: package-ci/win10:stable @@ -456,6 +506,8 @@ pre_pack_universal_template_Win_CUSTOM-REVISION: - "Editor.log" pack_universal_template_Win_CUSTOM-REVISION: name: Pack Universal Template Win CUSTOM-REVISION + variables: + UTR_VERSION: 1.5.0 agent: type: Unity::VM image: package-ci/win10:v2.2.1-1064078 @@ -470,6 +522,8 @@ pack_universal_template_Win_CUSTOM-REVISION: - "upm-ci~/templates/**/*" test_universal_template_Win_CUSTOM-REVISION: name: Test Universal Template Win CUSTOM-REVISION + variables: + UTR_VERSION: 1.5.0 agent: type: Unity::VM image: package-ci/win10:stable @@ -488,6 +542,8 @@ test_universal_template_Win_CUSTOM-REVISION: - "**/test-results/**" pre_pack_universal_template_OSX_CUSTOM-REVISION: name: Pre-Pack Universal Template OSX CUSTOM-REVISION + variables: + UTR_VERSION: 1.5.0 agent: type: Unity::VM::osx image: package-ci/mac:stable @@ -508,6 +564,8 @@ pre_pack_universal_template_OSX_CUSTOM-REVISION: - "Editor.log" pack_universal_template_OSX_CUSTOM-REVISION: name: Pack Universal Template OSX CUSTOM-REVISION + variables: + UTR_VERSION: 1.5.0 agent: type: Unity::VM image: package-ci/win10:v2.2.1-1064078 @@ -522,6 +580,8 @@ pack_universal_template_OSX_CUSTOM-REVISION: - "upm-ci~/templates/**/*" test_universal_template_OSX_CUSTOM-REVISION: name: Test Universal Template OSX CUSTOM-REVISION + variables: + UTR_VERSION: 1.5.0 agent: type: Unity::VM::osx image: package-ci/mac:stable @@ -577,6 +637,8 @@ publish_universal_template_CUSTOM-REVISION_dry_run: - "upm-ci~/templates/**/*" all_template_ci_trunk: name: Pack and test all templates - trunk + variables: + UTR_VERSION: 1.5.0 agent: type: Unity::VM image: package-ci/win10:v2.2.1-1064078 @@ -592,6 +654,8 @@ all_template_ci_trunk: - upm-ci package izon -d all_template_ci_CUSTOM-REVISION: name: Pack and test all templates - CUSTOM-REVISION + variables: + UTR_VERSION: 1.5.0 agent: type: Unity::VM image: package-ci/win10:v2.2.1-1064078 From bfd33058bd1322d620092b641ebe23476d4938c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Penavaire?= Date: Mon, 2 May 2022 15:43:00 +0200 Subject: [PATCH 7/8] Save scene --- .../Assets/Scenes/SampleScene.unity | 66 +++++++------------ 1 file changed, 25 insertions(+), 41 deletions(-) diff --git a/com.unity.template-hd/Assets/Scenes/SampleScene.unity b/com.unity.template-hd/Assets/Scenes/SampleScene.unity index 3f853931aac..27c20abd5df 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: 1894.717, g: 2066.2717, b: 2536.3127, 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: From 677329e6e42cfa846112b37ca68065be4bb7fd2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Penavaire?= Date: Mon, 2 May 2022 15:43:20 +0200 Subject: [PATCH 8/8] Revert "Use old utr version" This reverts commit d8eefc160dfe8d248c7060c6b8c7b23f63b14e79. --- .yamato/_templates.yml | 64 ------------------------------------------ 1 file changed, 64 deletions(-) diff --git a/.yamato/_templates.yml b/.yamato/_templates.yml index e90caaa2f19..b77b25fb9f3 100644 --- a/.yamato/_templates.yml +++ b/.yamato/_templates.yml @@ -9,8 +9,6 @@ pre_pack_hdrp_template_Win_trunk: name: Pre-Pack HDRP Template Win trunk - variables: - UTR_VERSION: 1.5.0 agent: type: Unity::VM image: package-ci/win10:stable @@ -32,8 +30,6 @@ pre_pack_hdrp_template_Win_trunk: - "Editor.log" pack_hdrp_template_Win_trunk: name: Pack HDRP Template Win trunk - variables: - UTR_VERSION: 1.5.0 agent: type: Unity::VM image: package-ci/win10:v2.2.1-1064078 @@ -48,8 +44,6 @@ pack_hdrp_template_Win_trunk: - "upm-ci~/templates/**/*" test_hdrp_template_Win_trunk: name: Test HDRP Template Win trunk - variables: - UTR_VERSION: 1.5.0 agent: type: Unity::VM image: package-ci/win10:stable @@ -68,8 +62,6 @@ test_hdrp_template_Win_trunk: - "**/test-results/**" pre_pack_hdrp_template_OSX_trunk: name: Pre-Pack HDRP Template OSX trunk - variables: - UTR_VERSION: 1.5.0 agent: type: Unity::VM::osx image: package-ci/mac:stable @@ -90,8 +82,6 @@ pre_pack_hdrp_template_OSX_trunk: - "Editor.log" pack_hdrp_template_OSX_trunk: name: Pack HDRP Template OSX trunk - variables: - UTR_VERSION: 1.5.0 agent: type: Unity::VM image: package-ci/win10:v2.2.1-1064078 @@ -106,8 +96,6 @@ pack_hdrp_template_OSX_trunk: - "upm-ci~/templates/**/*" test_hdrp_template_OSX_trunk: name: Test HDRP Template OSX trunk - variables: - UTR_VERSION: 1.5.0 agent: type: Unity::VM::osx image: package-ci/mac:stable @@ -129,8 +117,6 @@ publish_hdrp_template_trunk: image: package-ci/win10:v2.2.1-1064078 flavor: b1.large name: Publish HDRP Template trunk - variables: - UTR_VERSION: 1.5.0 commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - upm-ci template publish --project-path com.unity.template-hd @@ -150,8 +136,6 @@ publish_hdrp_template_trunk_dry_run: image: package-ci/win10:v2.2.1-1064078 flavor: b1.large name: Publish HDRP Template trunk Dry Run - variables: - UTR_VERSION: 1.5.0 commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - upm-ci template publish --project-path com.unity.template-hd --dry-run @@ -167,8 +151,6 @@ publish_hdrp_template_trunk_dry_run: - "upm-ci~/templates/**/*" pre_pack_hdrp_template_Win_CUSTOM-REVISION: name: Pre-Pack HDRP Template Win CUSTOM-REVISION - variables: - UTR_VERSION: 1.5.0 agent: type: Unity::VM image: package-ci/win10:stable @@ -190,8 +172,6 @@ pre_pack_hdrp_template_Win_CUSTOM-REVISION: - "Editor.log" pack_hdrp_template_Win_CUSTOM-REVISION: name: Pack HDRP Template Win CUSTOM-REVISION - variables: - UTR_VERSION: 1.5.0 agent: type: Unity::VM image: package-ci/win10:v2.2.1-1064078 @@ -206,8 +186,6 @@ pack_hdrp_template_Win_CUSTOM-REVISION: - "upm-ci~/templates/**/*" test_hdrp_template_Win_CUSTOM-REVISION: name: Test HDRP Template Win CUSTOM-REVISION - variables: - UTR_VERSION: 1.5.0 agent: type: Unity::VM image: package-ci/win10:stable @@ -226,8 +204,6 @@ test_hdrp_template_Win_CUSTOM-REVISION: - "**/test-results/**" pre_pack_hdrp_template_OSX_CUSTOM-REVISION: name: Pre-Pack HDRP Template OSX CUSTOM-REVISION - variables: - UTR_VERSION: 1.5.0 agent: type: Unity::VM::osx image: package-ci/mac:stable @@ -248,8 +224,6 @@ pre_pack_hdrp_template_OSX_CUSTOM-REVISION: - "Editor.log" pack_hdrp_template_OSX_CUSTOM-REVISION: name: Pack HDRP Template OSX CUSTOM-REVISION - variables: - UTR_VERSION: 1.5.0 agent: type: Unity::VM image: package-ci/win10:v2.2.1-1064078 @@ -264,8 +238,6 @@ pack_hdrp_template_OSX_CUSTOM-REVISION: - "upm-ci~/templates/**/*" test_hdrp_template_OSX_CUSTOM-REVISION: name: Test HDRP Template OSX CUSTOM-REVISION - variables: - UTR_VERSION: 1.5.0 agent: type: Unity::VM::osx image: package-ci/mac:stable @@ -287,8 +259,6 @@ publish_hdrp_template_CUSTOM-REVISION: image: package-ci/win10:v2.2.1-1064078 flavor: b1.large name: Publish HDRP Template CUSTOM-REVISION - variables: - UTR_VERSION: 1.5.0 commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - upm-ci template publish --project-path com.unity.template-hd @@ -308,8 +278,6 @@ publish_hdrp_template_CUSTOM-REVISION_dry_run: image: package-ci/win10:v2.2.1-1064078 flavor: b1.large name: Publish HDRP Template CUSTOM-REVISION Dry Run - variables: - UTR_VERSION: 1.5.0 commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - upm-ci template publish --project-path com.unity.template-hd --dry-run @@ -325,8 +293,6 @@ publish_hdrp_template_CUSTOM-REVISION_dry_run: - "upm-ci~/templates/**/*" pre_pack_universal_template_Win_trunk: name: Pre-Pack Universal Template Win trunk - variables: - UTR_VERSION: 1.5.0 agent: type: Unity::VM image: package-ci/win10:stable @@ -348,8 +314,6 @@ pre_pack_universal_template_Win_trunk: - "Editor.log" pack_universal_template_Win_trunk: name: Pack Universal Template Win trunk - variables: - UTR_VERSION: 1.5.0 agent: type: Unity::VM image: package-ci/win10:v2.2.1-1064078 @@ -364,8 +328,6 @@ pack_universal_template_Win_trunk: - "upm-ci~/templates/**/*" test_universal_template_Win_trunk: name: Test Universal Template Win trunk - variables: - UTR_VERSION: 1.5.0 agent: type: Unity::VM image: package-ci/win10:stable @@ -384,8 +346,6 @@ test_universal_template_Win_trunk: - "**/test-results/**" pre_pack_universal_template_OSX_trunk: name: Pre-Pack Universal Template OSX trunk - variables: - UTR_VERSION: 1.5.0 agent: type: Unity::VM::osx image: package-ci/mac:stable @@ -406,8 +366,6 @@ pre_pack_universal_template_OSX_trunk: - "Editor.log" pack_universal_template_OSX_trunk: name: Pack Universal Template OSX trunk - variables: - UTR_VERSION: 1.5.0 agent: type: Unity::VM image: package-ci/win10:v2.2.1-1064078 @@ -422,8 +380,6 @@ pack_universal_template_OSX_trunk: - "upm-ci~/templates/**/*" test_universal_template_OSX_trunk: name: Test Universal Template OSX trunk - variables: - UTR_VERSION: 1.5.0 agent: type: Unity::VM::osx image: package-ci/mac:stable @@ -445,8 +401,6 @@ publish_universal_template_trunk: image: package-ci/win10:v2.2.1-1064078 flavor: b1.large name: Publish Universal Template trunk - variables: - UTR_VERSION: 1.5.0 commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - upm-ci template publish --project-path com.unity.template-universal @@ -466,8 +420,6 @@ publish_universal_template_trunk_dry_run: image: package-ci/win10:v2.2.1-1064078 flavor: b1.large name: Publish Universal Template trunk Dry Run - variables: - UTR_VERSION: 1.5.0 commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - upm-ci template publish --project-path com.unity.template-universal --dry-run @@ -483,8 +435,6 @@ publish_universal_template_trunk_dry_run: - "upm-ci~/templates/**/*" pre_pack_universal_template_Win_CUSTOM-REVISION: name: Pre-Pack Universal Template Win CUSTOM-REVISION - variables: - UTR_VERSION: 1.5.0 agent: type: Unity::VM image: package-ci/win10:stable @@ -506,8 +456,6 @@ pre_pack_universal_template_Win_CUSTOM-REVISION: - "Editor.log" pack_universal_template_Win_CUSTOM-REVISION: name: Pack Universal Template Win CUSTOM-REVISION - variables: - UTR_VERSION: 1.5.0 agent: type: Unity::VM image: package-ci/win10:v2.2.1-1064078 @@ -522,8 +470,6 @@ pack_universal_template_Win_CUSTOM-REVISION: - "upm-ci~/templates/**/*" test_universal_template_Win_CUSTOM-REVISION: name: Test Universal Template Win CUSTOM-REVISION - variables: - UTR_VERSION: 1.5.0 agent: type: Unity::VM image: package-ci/win10:stable @@ -542,8 +488,6 @@ test_universal_template_Win_CUSTOM-REVISION: - "**/test-results/**" pre_pack_universal_template_OSX_CUSTOM-REVISION: name: Pre-Pack Universal Template OSX CUSTOM-REVISION - variables: - UTR_VERSION: 1.5.0 agent: type: Unity::VM::osx image: package-ci/mac:stable @@ -564,8 +508,6 @@ pre_pack_universal_template_OSX_CUSTOM-REVISION: - "Editor.log" pack_universal_template_OSX_CUSTOM-REVISION: name: Pack Universal Template OSX CUSTOM-REVISION - variables: - UTR_VERSION: 1.5.0 agent: type: Unity::VM image: package-ci/win10:v2.2.1-1064078 @@ -580,8 +522,6 @@ pack_universal_template_OSX_CUSTOM-REVISION: - "upm-ci~/templates/**/*" test_universal_template_OSX_CUSTOM-REVISION: name: Test Universal Template OSX CUSTOM-REVISION - variables: - UTR_VERSION: 1.5.0 agent: type: Unity::VM::osx image: package-ci/mac:stable @@ -637,8 +577,6 @@ publish_universal_template_CUSTOM-REVISION_dry_run: - "upm-ci~/templates/**/*" all_template_ci_trunk: name: Pack and test all templates - trunk - variables: - UTR_VERSION: 1.5.0 agent: type: Unity::VM image: package-ci/win10:v2.2.1-1064078 @@ -654,8 +592,6 @@ all_template_ci_trunk: - upm-ci package izon -d all_template_ci_CUSTOM-REVISION: name: Pack and test all templates - CUSTOM-REVISION - variables: - UTR_VERSION: 1.5.0 agent: type: Unity::VM image: package-ci/win10:v2.2.1-1064078