diff --git a/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset b/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset index dd772f512..1287b8615 100644 --- a/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset +++ b/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset @@ -73,22 +73,7 @@ MonoBehaviour: - rid: 6670095651985424593 - rid: 6670095651985424594 m_RuntimeSettings: - m_List: - - rid: 6852985685364965378 - - rid: 6852985685364965379 - - rid: 6852985685364965380 - - rid: 6852985685364965381 - - rid: 6852985685364965384 - - rid: 6852985685364965392 - - rid: 6852985685364965394 - - rid: 8712630790384254976 - - rid: 6670095613664165896 - - rid: 6670095613664165897 - - rid: 6670095613664165898 - - rid: 6670095613664165902 - - rid: 6670095613664165904 - - rid: 6670095651985424593 - - rid: 6670095651985424594 + m_List: [] m_AssetVersion: 10 m_ObsoleteDefaultVolumeProfile: {fileID: 0} m_RenderingLayerNames: @@ -267,6 +252,11 @@ MonoBehaviour: type: {class: RenderingDebuggerRuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_version: 0 + m_PanelSettings: {fileID: 11400000, guid: fa69697be3070b04a893666f5947f18c, type: 2} + m_StyleSheets: + - {fileID: 7433441132597879392, guid: 0ff99fd36f66f1a41bcc1d3c90e0922a, type: 3} + - {fileID: 7433441132597879392, guid: 3a8aa4d508da46d4dace18b280f064aa, type: 3} + m_VisualTreeAsset: {fileID: 9197481963319205126, guid: b647ceb1e15264943b9b439971e71110, type: 3} - rid: 6670095613664165904 type: {class: LightmapSamplingSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: @@ -370,6 +360,7 @@ MonoBehaviour: type: {class: UniversalRenderPipelineEditorMaterials, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_DefaultMaterial: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_SimpleLitMaterial: {fileID: 2100000, guid: 6a1143ee683302f4aa628c052723efc1, type: 2} m_DefaultParticleMaterial: {fileID: 2100000, guid: e823cd5b5d27c0f4b8256e7c12ee3e6d, type: 2} m_DefaultLineMaterial: {fileID: 2100000, guid: e823cd5b5d27c0f4b8256e7c12ee3e6d, type: 2} m_DefaultTerrainMaterial: {fileID: 2100000, guid: 594ea882c5a793440b60ff72d896021e, type: 2} diff --git a/Packages/manifest.json b/Packages/manifest.json index bfeeefa11..40a77f7ce 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,28 +1,28 @@ { "dependencies": { "com.coplaydev.unity-mcp": "https://github.com/CoplayDev/unity-mcp.git?path=/MCPForUnity#main", - "com.unity.ai.navigation": "2.0.12", + "com.unity.ai.navigation": "2.0.13", "com.unity.charactercontroller": "1.4.2", "com.unity.cinemachine": "3.1.6", "com.unity.collab-proxy": "2.12.4", - "com.unity.entities": "6.4.0", - "com.unity.entities.graphics": "6.4.0", + "com.unity.entities": "6.5.0", + "com.unity.entities.graphics": "6.5.0", "com.unity.ide.rider": "3.0.40", "com.unity.ide.visualstudio": "2.0.27", "com.unity.inputsystem": "1.19.0", "com.unity.multiplayer.center": "1.0.1", "com.unity.multiplayer.playmode": "2.0.2", "com.unity.multiplayer.tools": "2.2.8", - "com.unity.netcode": "1.13.2", - "com.unity.physics": "1.4.6", + "com.unity.netcode": "6.5.0", + "com.unity.physics": "6.5.0", "com.unity.probuilder": "6.0.9", - "com.unity.render-pipelines.universal": "17.4.0", + "com.unity.render-pipelines.universal": "17.5.0", "com.unity.services.multiplayer": "2.1.3", - "com.unity.shadergraph": "17.4.0", - "com.unity.test-framework": "1.6.0", + "com.unity.shadergraph": "17.5.0", + "com.unity.test-framework": "1.7.0", "com.unity.timeline": "1.8.12", - "com.unity.ugui": "2.0.0", - "com.unity.visualeffectgraph": "17.4.0", + "com.unity.ugui": "2.5.0", + "com.unity.visualeffectgraph": "17.5.0", "com.unity.modules.accessibility": "1.0.0", "com.unity.modules.adaptiveperformance": "1.0.0", "com.unity.modules.ai": "1.0.0", @@ -38,6 +38,7 @@ "com.unity.modules.particlesystem": "1.0.0", "com.unity.modules.physics": "1.0.0", "com.unity.modules.physics2d": "1.0.0", + "com.unity.modules.physicscore2d": "1.0.0", "com.unity.modules.screencapture": "1.0.0", "com.unity.modules.terrain": "1.0.0", "com.unity.modules.terrainphysics": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index cc0c8cad6..ceb933883 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -5,10 +5,17 @@ "depth": 0, "source": "git", "dependencies": { + "com.unity.modules.animation": "1.0.0", + "com.unity.modules.imageconversion": "1.0.0", + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.physics2d": "1.0.0", + "com.unity.modules.uielements": "1.0.0", + "com.unity.modules.screencapture": "1.0.0", + "com.unity.modules.unitywebrequest": "1.0.0", "com.unity.nuget.newtonsoft-json": "3.0.2", "com.unity.test-framework": "1.1.31" }, - "hash": "78ee5418415953b79c358bfe6355fcc3fde7912b" + "hash": "85c101f5329ec1b0c6f70cba44614166dd78f53c" }, "com.rukhanka.animation": { "version": "file:com.rukhanka.animation", @@ -33,7 +40,7 @@ "dependencies": {} }, "com.unity.ai.navigation": { - "version": "2.0.12", + "version": "2.0.13", "depth": 0, "source": "registry", "dependencies": { @@ -81,50 +88,49 @@ "url": "https://packages.unity.com" }, "com.unity.collections": { - "version": "6.4.0", + "version": "6.5.0", "depth": 1, "source": "builtin", "dependencies": { - "com.unity.burst": "1.8.23", - "com.unity.mathematics": "1.3.2", - "com.unity.nuget.mono-cecil": "1.11.5", + "com.unity.burst": "1.8.25", + "com.unity.nuget.mono-cecil": "1.11.6", "com.unity.test-framework": "1.4.6", - "com.unity.test-framework.performance": "3.0.3" + "com.unity.test-framework.performance": "3.2.0" } }, "com.unity.entities": { - "version": "6.4.0", + "version": "6.5.0", "depth": 0, "source": "builtin", "dependencies": { - "com.unity.burst": "1.8.23", - "com.unity.collections": "6.4.0", - "com.unity.mathematics": "1.3.2", - "com.unity.nuget.mono-cecil": "1.11.5", - "com.unity.profiling.core": "1.0.2", - "com.unity.scriptablebuildpipeline": "2.4.3", - "com.unity.serialization": "3.1.2", - "com.unity.test-framework.performance": "3.0.3", + "com.unity.burst": "1.8.25", + "com.unity.collections": "6.5.0", + "com.unity.nuget.mono-cecil": "1.11.6", + "com.unity.profiling.core": "1.0.3", + "com.unity.scriptablebuildpipeline": "1.23.1", + "com.unity.serialization": "6.5.0", + "com.unity.test-framework.performance": "3.2.0", "com.unity.modules.assetbundle": "1.0.0", "com.unity.modules.audio": "1.0.0", "com.unity.modules.physics": "1.0.0", "com.unity.modules.uielements": "1.0.0", "com.unity.modules.unityanalytics": "1.0.0", - "com.unity.modules.unitywebrequest": "1.0.0" + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.hierarchy": "1.0.0" } }, "com.unity.entities.graphics": { - "version": "6.4.0", + "version": "6.5.0", "depth": 0, "source": "builtin", "dependencies": { - "com.unity.entities": "6.4.0", + "com.unity.entities": "6.5.0", "com.unity.modules.particlesystem": "1.0.0", "com.unity.render-pipelines.core": "14.0.10" } }, "com.unity.ext.nunit": { - "version": "2.0.5", + "version": "2.1.0", "depth": 1, "source": "builtin", "dependencies": {} @@ -157,11 +163,10 @@ "url": "https://packages.unity.com" }, "com.unity.mathematics": { - "version": "1.3.3", + "version": "1.4.0", "depth": 1, - "source": "registry", - "dependencies": {}, - "url": "https://packages.unity.com" + "source": "builtin", + "dependencies": {} }, "com.unity.multiplayer.center": { "version": "1.0.1", @@ -196,15 +201,14 @@ "url": "https://packages.unity.com" }, "com.unity.netcode": { - "version": "1.13.2", + "version": "6.5.0", "depth": 0, - "source": "registry", + "source": "builtin", "dependencies": { - "com.unity.entities": "1.4.4", - "com.unity.transport": "2.5.3", + "com.unity.transport": "6.5.0", + "com.unity.entities": "6.5.0", "com.unity.modules.animation": "1.0.0" - }, - "url": "https://packages.unity.com" + } }, "com.unity.nuget.mono-cecil": { "version": "1.11.6", @@ -221,19 +225,18 @@ "url": "https://packages.unity.com" }, "com.unity.physics": { - "version": "1.4.6", + "version": "6.5.0", "depth": 0, - "source": "registry", + "source": "builtin", "dependencies": { - "com.unity.burst": "1.8.28", - "com.unity.entities": "1.4.6", - "com.unity.collections": "2.6.6", + "com.unity.burst": "1.8.26", + "com.unity.collections": "6.5.0", "com.unity.mathematics": "1.3.2", + "com.unity.entities": "6.5.0", + "com.unity.test-framework": "1.6.0", "com.unity.modules.imgui": "1.0.0", - "com.unity.test-framework": "1.4.6", "com.unity.modules.jsonserialize": "1.0.0" - }, - "url": "https://packages.unity.com" + } }, "com.unity.probuilder": { "version": "6.0.9", @@ -255,34 +258,32 @@ "url": "https://packages.unity.com" }, "com.unity.render-pipelines.core": { - "version": "17.4.0", + "version": "17.5.0", "depth": 1, "source": "builtin", "dependencies": { "com.unity.burst": "1.8.14", - "com.unity.mathematics": "1.3.2", - "com.unity.ugui": "2.0.0", "com.unity.collections": "2.4.3", "com.unity.modules.terrain": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" } }, "com.unity.render-pipelines.universal": { - "version": "17.4.0", + "version": "17.5.0", "depth": 0, "source": "builtin", "dependencies": { - "com.unity.render-pipelines.core": "17.4.0", - "com.unity.shadergraph": "17.4.0", - "com.unity.render-pipelines.universal-config": "17.4.0" + "com.unity.render-pipelines.core": "17.5.0", + "com.unity.shadergraph": "17.5.0", + "com.unity.render-pipelines.universal-config": "17.5.0" } }, "com.unity.render-pipelines.universal-config": { - "version": "17.4.0", + "version": "17.5.0", "depth": 1, "source": "builtin", "dependencies": { - "com.unity.render-pipelines.core": "17.4.0" + "com.unity.render-pipelines.core": "17.5.0" } }, "com.unity.scriptablebuildpipeline": { @@ -303,14 +304,13 @@ "url": "https://packages.unity.com" }, "com.unity.serialization": { - "version": "3.1.5", + "version": "6.5.0", "depth": 1, - "source": "registry", + "source": "builtin", "dependencies": { - "com.unity.burst": "1.8.13", - "com.unity.collections": "2.4.2" - }, - "url": "https://packages.unity.com" + "com.unity.collections": "2.1.2", + "com.unity.burst": "1.7.2" + } }, "com.unity.services.authentication": { "version": "3.6.1", @@ -325,12 +325,12 @@ "url": "https://packages.unity.com" }, "com.unity.services.core": { - "version": "1.16.0", + "version": "1.18.0", "depth": 1, "source": "registry", "dependencies": { "com.unity.modules.androidjni": "1.0.0", - "com.unity.nuget.newtonsoft-json": "3.2.1", + "com.unity.nuget.newtonsoft-json": "3.2.2", "com.unity.modules.unitywebrequest": "1.0.0" }, "url": "https://packages.unity.com" @@ -401,11 +401,11 @@ "url": "https://packages.unity.com" }, "com.unity.shadergraph": { - "version": "17.4.0", + "version": "17.5.0", "depth": 0, "source": "builtin", "dependencies": { - "com.unity.render-pipelines.core": "17.4.0", + "com.unity.render-pipelines.core": "17.5.0", "com.unity.searcher": "4.9.3" } }, @@ -421,17 +421,17 @@ "url": "https://packages.unity.com" }, "com.unity.test-framework": { - "version": "1.6.0", + "version": "1.7.0", "depth": 0, "source": "builtin", "dependencies": { - "com.unity.ext.nunit": "2.0.3", + "com.unity.ext.nunit": "2.1.0", "com.unity.modules.imgui": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" } }, "com.unity.test-framework.performance": { - "version": "3.4.0", + "version": "3.5.0", "depth": 1, "source": "registry", "dependencies": { @@ -453,32 +453,34 @@ "url": "https://packages.unity.com" }, "com.unity.transport": { - "version": "2.7.2", + "version": "6.5.0", "depth": 1, - "source": "registry", + "source": "builtin", "dependencies": { + "com.unity.collections": "6.5.0", "com.unity.burst": "1.8.24", - "com.unity.collections": "2.2.1", - "com.unity.mathematics": "1.3.2" - }, - "url": "https://packages.unity.com" + "com.unity.mathematics": "1.4.0" + } }, "com.unity.ugui": { - "version": "2.0.0", + "version": "2.5.0", "depth": 0, "source": "builtin", "dependencies": { "com.unity.modules.ui": "1.0.0", - "com.unity.modules.imgui": "1.0.0" + "com.unity.modules.imgui": "1.0.0", + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.physics2d": "1.0.0", + "com.unity.modules.physics": "1.0.0" } }, "com.unity.visualeffectgraph": { - "version": "17.4.0", + "version": "17.5.0", "depth": 0, "source": "builtin", "dependencies": { - "com.unity.shadergraph": "17.4.0", - "com.unity.render-pipelines.core": "17.4.0" + "com.unity.shadergraph": "17.5.0", + "com.unity.render-pipelines.core": "17.5.0" } }, "com.unity.modules.accessibility": { @@ -505,7 +507,9 @@ "version": "1.0.0", "depth": 0, "source": "builtin", - "dependencies": {} + "dependencies": { + "com.unity.modules.jsonserialize": "1.0.0" + } }, "com.unity.modules.animation": { "version": "1.0.0", @@ -542,6 +546,16 @@ "com.unity.modules.animation": "1.0.0" } }, + "com.unity.modules.hierarchy": { + "version": "1.0.0", + "depth": 1, + "source": "builtin", + "dependencies": { + "com.unity.modules.hierarchycore": "1.0.0", + "com.unity.modules.uielements": "1.0.0", + "com.unity.modules.imgui": "1.0.0" + } + }, "com.unity.modules.hierarchycore": { "version": "1.0.0", "depth": 1, @@ -579,6 +593,14 @@ "dependencies": {} }, "com.unity.modules.physics2d": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.physicscore2d": "1.0.0" + } + }, + "com.unity.modules.physicscore2d": { "version": "1.0.0", "depth": 0, "source": "builtin", @@ -638,7 +660,8 @@ "com.unity.modules.imgui": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0", "com.unity.modules.hierarchycore": "1.0.0", - "com.unity.modules.physics": "1.0.0" + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.animation": "1.0.0" } }, "com.unity.modules.umbra": { diff --git a/ProjectSettings/PackageManagerSettings.asset b/ProjectSettings/PackageManagerSettings.asset index aea27c290..4b3c9237e 100644 --- a/ProjectSettings/PackageManagerSettings.asset +++ b/ProjectSettings/PackageManagerSettings.asset @@ -19,24 +19,26 @@ MonoBehaviour: m_DismissPreviewPackagesInUse: 0 oneTimeWarningShown: 0 oneTimePackageErrorsPopUpShown: 0 - m_Registries: - - m_Id: main + m_MainRegistry: + m_Id: main m_Name: m_Url: https://packages.unity.com m_Scopes: [] m_IsDefault: 1 + m_IsUnityRegistry: 1 m_Capabilities: 7 m_ConfigSource: 0 m_Compliance: m_Status: 0 m_Violations: [] + m_ScopedRegistries: [] m_UserSelectedRegistryName: m_UserAddingNewScopedRegistry: 0 m_RegistryInfoDraft: m_Modified: 0 m_ErrorMessage: m_UserModificationsEntityId: - m_Data: -930 + m_rawData: 568105589213756514 m_OriginalEntityId: - m_Data: -932 + m_rawData: 568105589213756512 m_LoadAssets: 0 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 14cc1a9b9..a9e6af38a 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 6000.4.7f1 -m_EditorVersionWithRevision: 6000.4.7f1 (f3c3c4248748) +m_EditorVersion: 6000.5.0f1 +m_EditorVersionWithRevision: 6000.5.0f1 (88b47c5e7076) diff --git a/ProjectSettings/VFXManager.asset b/ProjectSettings/VFXManager.asset index de5f0266d..9ab635ee8 100644 --- a/ProjectSettings/VFXManager.asset +++ b/ProjectSettings/VFXManager.asset @@ -15,7 +15,6 @@ VFXManager: m_MaxScrubTime: 30 m_MaxCapacity: 100000000 m_CompiledVersion: 7 - m_RuntimeVersion: 39 + m_RuntimeVersion: 40 m_RuntimeResources: {fileID: 11400000, guid: bc10b42afe3813544bffd38ae2cd893d, type: 2} - m_EditorResources: {fileID: 11400000, guid: 64142473281487e4da1e5eb23da2ab2d, type: 2} m_BatchEmptyLifetime: 300 diff --git a/ProjectSettings/VirtualProjectsConfig.json b/ProjectSettings/VirtualProjectsConfig.json index e76ea5ed1..803922192 100644 --- a/ProjectSettings/VirtualProjectsConfig.json +++ b/ProjectSettings/VirtualProjectsConfig.json @@ -1,4 +1,4 @@ { "PlayerTags": [], - "version": "6000.4.7f1" + "version": "6000.5.0f1" } \ No newline at end of file