diff --git a/Packages/manifest.json b/Packages/manifest.json index 4a5bbb285..fc96dcdb1 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,26 +1,11 @@ { "dependencies": { - "com.unity.2d.sprite": "1.0.0", - "com.unity.2d.tilemap": "1.0.0", - "com.unity.ads": "3.7.5", - "com.unity.analytics": "3.6.12", - "com.unity.animation.rigging": "1.1.1", "com.unity.cinemachine": "2.8.4", - "com.unity.collab-proxy": "1.15.12", - "com.unity.ext.nunit": "1.0.6", - "com.unity.ide.rider": "3.0.12", - "com.unity.ide.visualstudio": "2.0.14", - "com.unity.ide.vscode": "1.2.5", - "com.unity.polybrush": "1.1.2", - "com.unity.postprocessing": "3.2.0", - "com.unity.probuilder": "5.0.3", - "com.unity.purchasing": "4.1.2", - "com.unity.test-framework": "1.1.29", + "com.unity.ide.visualstudio": "2.0.15", + "com.unity.postprocessing": "3.2.2", "com.unity.textmeshpro": "3.0.6", "com.unity.timeline": "1.6.4", "com.unity.ugui": "1.0.0", - "com.unity.xr.legacyinputhelpers": "2.1.8", - "com.unity.xr.management": "4.2.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", "com.unity.modules.animation": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 0e3a6e729..29fe371a0 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -1,54 +1,5 @@ { "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.ads": { - "version": "3.7.5", - "depth": 0, - "source": "registry", - "dependencies": { - "com.unity.ugui": "1.0.0" - }, - "url": "https://packages.unity.cn" - }, - "com.unity.analytics": { - "version": "3.6.12", - "depth": 0, - "source": "registry", - "dependencies": { - "com.unity.ugui": "1.0.0" - }, - "url": "https://packages.unity.cn" - }, - "com.unity.animation.rigging": { - "version": "1.1.1", - "depth": 0, - "source": "registry", - "dependencies": { - "com.unity.burst": "1.4.1", - "com.unity.test-framework": "1.1.24" - }, - "url": "https://packages.unity.cn" - }, - "com.unity.burst": { - "version": "1.6.4", - "depth": 1, - "source": "registry", - "dependencies": { - "com.unity.mathematics": "1.2.1" - }, - "url": "https://packages.unity.cn" - }, "com.unity.cinemachine": { "version": "2.8.4", "depth": 0, @@ -56,33 +7,15 @@ "dependencies": {}, "url": "https://packages.unity.cn" }, - "com.unity.collab-proxy": { - "version": "1.15.12", - "depth": 0, - "source": "registry", - "dependencies": { - "com.unity.services.core": "1.0.1" - }, - "url": "https://packages.unity.cn" - }, "com.unity.ext.nunit": { "version": "1.0.6", - "depth": 0, + "depth": 2, "source": "registry", "dependencies": {}, "url": "https://packages.unity.cn" }, - "com.unity.ide.rider": { - "version": "3.0.12", - "depth": 0, - "source": "registry", - "dependencies": { - "com.unity.ext.nunit": "1.0.6" - }, - "url": "https://packages.unity.cn" - }, "com.unity.ide.visualstudio": { - "version": "2.0.14", + "version": "2.0.15", "depth": 0, "source": "registry", "dependencies": { @@ -90,31 +23,8 @@ }, "url": "https://packages.unity.cn" }, - "com.unity.ide.vscode": { - "version": "1.2.5", - "depth": 0, - "source": "registry", - "dependencies": {}, - "url": "https://packages.unity.cn" - }, - "com.unity.mathematics": { - "version": "1.2.5", - "depth": 2, - "source": "registry", - "dependencies": {}, - "url": "https://packages.unity.cn" - }, - "com.unity.polybrush": { - "version": "1.1.2", - "depth": 0, - "source": "registry", - "dependencies": { - "com.unity.settings-manager": "1.0.3" - }, - "url": "https://packages.unity.cn" - }, "com.unity.postprocessing": { - "version": "3.2.0", + "version": "3.2.2", "depth": 0, "source": "registry", "dependencies": { @@ -122,59 +32,9 @@ }, "url": "https://packages.unity.cn" }, - "com.unity.probuilder": { - "version": "5.0.3", - "depth": 0, - "source": "registry", - "dependencies": { - "com.unity.settings-manager": "1.0.3", - "com.unity.modules.physics": "1.0.0", - "com.unity.modules.imgui": "1.0.0" - }, - "url": "https://packages.unity.cn" - }, - "com.unity.purchasing": { - "version": "4.1.2", - "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.cn" - }, - "com.unity.services.core": { - "version": "1.0.1", - "depth": 1, - "source": "registry", - "dependencies": { - "com.unity.modules.unitywebrequest": "1.0.0" - }, - "url": "https://packages.unity.cn" - }, - "com.unity.settings-manager": { - "version": "1.0.3", - "depth": 1, - "source": "registry", - "dependencies": {}, - "url": "https://packages.unity.cn" - }, - "com.unity.subsystemregistration": { - "version": "1.1.0", - "depth": 1, - "source": "registry", - "dependencies": { - "com.unity.modules.subsystems": "1.0.0" - }, - "url": "https://packages.unity.cn" - }, "com.unity.test-framework": { - "version": "1.1.29", - "depth": 0, + "version": "1.1.31", + "depth": 1, "source": "registry", "dependencies": { "com.unity.ext.nunit": "1.0.6", @@ -213,29 +73,6 @@ "com.unity.modules.imgui": "1.0.0" } }, - "com.unity.xr.legacyinputhelpers": { - "version": "2.1.8", - "depth": 0, - "source": "registry", - "dependencies": { - "com.unity.modules.vr": "1.0.0", - "com.unity.modules.xr": "1.0.0" - }, - "url": "https://packages.unity.cn" - }, - "com.unity.xr.management": { - "version": "4.2.0", - "depth": 0, - "source": "registry", - "dependencies": { - "com.unity.modules.subsystems": "1.0.0", - "com.unity.modules.vr": "1.0.0", - "com.unity.modules.xr": "1.0.0", - "com.unity.xr.legacyinputhelpers": "2.1.7", - "com.unity.subsystemregistration": "1.0.6" - }, - "url": "https://packages.unity.cn" - }, "com.unity.modules.ai": { "version": "1.0.0", "depth": 0, diff --git a/wg.patch b/wg.patch index cc2f8f713..0c67d71fb 100644 --- a/wg.patch +++ b/wg.patch @@ -1,390 +0,0 @@ -diff --git a/Packages/manifest.json b/Packages/manifest.json -index 4a5bbb285..8406e8b27 100644 ---- a/Packages/manifest.json -+++ b/Packages/manifest.json -@@ -1,26 +1,16 @@ - { - "dependencies": { -- "com.unity.2d.sprite": "1.0.0", -- "com.unity.2d.tilemap": "1.0.0", -- "com.unity.ads": "3.7.5", -- "com.unity.analytics": "3.6.12", -- "com.unity.animation.rigging": "1.1.1", - "com.unity.cinemachine": "2.8.4", - "com.unity.collab-proxy": "1.15.12", -- "com.unity.ext.nunit": "1.0.6", - "com.unity.ide.rider": "3.0.12", - "com.unity.ide.visualstudio": "2.0.14", - "com.unity.ide.vscode": "1.2.5", -- "com.unity.polybrush": "1.1.2", -- "com.unity.postprocessing": "3.2.0", -- "com.unity.probuilder": "5.0.3", -- "com.unity.purchasing": "4.1.2", -+ "com.unity.postprocessing": "3.2.2", - "com.unity.test-framework": "1.1.29", - "com.unity.textmeshpro": "3.0.6", - "com.unity.timeline": "1.6.4", - "com.unity.ugui": "1.0.0", -- "com.unity.xr.legacyinputhelpers": "2.1.8", -- "com.unity.xr.management": "4.2.0", -+ "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/Packages/packages-lock.json b/Packages/packages-lock.json -index 0e3a6e729..90b5382fd 100644 ---- a/Packages/packages-lock.json -+++ b/Packages/packages-lock.json -@@ -1,54 +1,5 @@ - { - "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.ads": { -- "version": "3.7.5", -- "depth": 0, -- "source": "registry", -- "dependencies": { -- "com.unity.ugui": "1.0.0" -- }, -- "url": "https://packages.unity.cn" -- }, -- "com.unity.analytics": { -- "version": "3.6.12", -- "depth": 0, -- "source": "registry", -- "dependencies": { -- "com.unity.ugui": "1.0.0" -- }, -- "url": "https://packages.unity.cn" -- }, -- "com.unity.animation.rigging": { -- "version": "1.1.1", -- "depth": 0, -- "source": "registry", -- "dependencies": { -- "com.unity.burst": "1.4.1", -- "com.unity.test-framework": "1.1.24" -- }, -- "url": "https://packages.unity.cn" -- }, -- "com.unity.burst": { -- "version": "1.6.4", -- "depth": 1, -- "source": "registry", -- "dependencies": { -- "com.unity.mathematics": "1.2.1" -- }, -- "url": "https://packages.unity.cn" -- }, - "com.unity.cinemachine": { - "version": "2.8.4", - "depth": 0, -@@ -67,7 +18,7 @@ - }, - "com.unity.ext.nunit": { - "version": "1.0.6", -- "depth": 0, -+ "depth": 1, - "source": "registry", - "dependencies": {}, - "url": "https://packages.unity.cn" -@@ -97,24 +48,8 @@ - "dependencies": {}, - "url": "https://packages.unity.cn" - }, -- "com.unity.mathematics": { -- "version": "1.2.5", -- "depth": 2, -- "source": "registry", -- "dependencies": {}, -- "url": "https://packages.unity.cn" -- }, -- "com.unity.polybrush": { -- "version": "1.1.2", -- "depth": 0, -- "source": "registry", -- "dependencies": { -- "com.unity.settings-manager": "1.0.3" -- }, -- "url": "https://packages.unity.cn" -- }, - "com.unity.postprocessing": { -- "version": "3.2.0", -+ "version": "3.2.2", - "depth": 0, - "source": "registry", - "dependencies": { -@@ -122,31 +57,6 @@ - }, - "url": "https://packages.unity.cn" - }, -- "com.unity.probuilder": { -- "version": "5.0.3", -- "depth": 0, -- "source": "registry", -- "dependencies": { -- "com.unity.settings-manager": "1.0.3", -- "com.unity.modules.physics": "1.0.0", -- "com.unity.modules.imgui": "1.0.0" -- }, -- "url": "https://packages.unity.cn" -- }, -- "com.unity.purchasing": { -- "version": "4.1.2", -- "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.cn" -- }, - "com.unity.services.core": { - "version": "1.0.1", - "depth": 1, -@@ -156,22 +66,6 @@ - }, - "url": "https://packages.unity.cn" - }, -- "com.unity.settings-manager": { -- "version": "1.0.3", -- "depth": 1, -- "source": "registry", -- "dependencies": {}, -- "url": "https://packages.unity.cn" -- }, -- "com.unity.subsystemregistration": { -- "version": "1.1.0", -- "depth": 1, -- "source": "registry", -- "dependencies": { -- "com.unity.modules.subsystems": "1.0.0" -- }, -- "url": "https://packages.unity.cn" -- }, - "com.unity.test-framework": { - "version": "1.1.29", - "depth": 0, -@@ -213,26 +107,13 @@ - "com.unity.modules.imgui": "1.0.0" - } - }, -- "com.unity.xr.legacyinputhelpers": { -- "version": "2.1.8", -+ "com.unity.visualscripting": { -+ "version": "1.7.6", - "depth": 0, - "source": "registry", - "dependencies": { -- "com.unity.modules.vr": "1.0.0", -- "com.unity.modules.xr": "1.0.0" -- }, -- "url": "https://packages.unity.cn" -- }, -- "com.unity.xr.management": { -- "version": "4.2.0", -- "depth": 0, -- "source": "registry", -- "dependencies": { -- "com.unity.modules.subsystems": "1.0.0", -- "com.unity.modules.vr": "1.0.0", -- "com.unity.modules.xr": "1.0.0", -- "com.unity.xr.legacyinputhelpers": "2.1.7", -- "com.unity.subsystemregistration": "1.0.6" -+ "com.unity.ugui": "1.0.0", -+ "com.unity.modules.jsonserialize": "1.0.0" - }, - "url": "https://packages.unity.cn" - }, -diff --git a/wg.patch b/wg.patch -index e5986aca8..08c79bfab 100644 ---- a/wg.patch -+++ b/wg.patch -@@ -1,172 +0,0 @@ --diff --git a/Packages/manifest.json b/Packages/manifest.json --index 4a5bbb285..68b3b02ef 100644 ----- a/Packages/manifest.json --+++ b/Packages/manifest.json --@@ -2,25 +2,18 @@ -- "dependencies": { -- "com.unity.2d.sprite": "1.0.0", -- "com.unity.2d.tilemap": "1.0.0", --- "com.unity.ads": "3.7.5", -- "com.unity.analytics": "3.6.12", -- "com.unity.animation.rigging": "1.1.1", -- "com.unity.cinemachine": "2.8.4", --- "com.unity.collab-proxy": "1.15.12", -- "com.unity.ext.nunit": "1.0.6", --- "com.unity.ide.rider": "3.0.12", -- "com.unity.ide.visualstudio": "2.0.14", --- "com.unity.ide.vscode": "1.2.5", -- "com.unity.polybrush": "1.1.2", -- "com.unity.postprocessing": "3.2.0", -- "com.unity.probuilder": "5.0.3", --- "com.unity.purchasing": "4.1.2", -- "com.unity.test-framework": "1.1.29", -- "com.unity.textmeshpro": "3.0.6", -- "com.unity.timeline": "1.6.4", -- "com.unity.ugui": "1.0.0", --- "com.unity.xr.legacyinputhelpers": "2.1.8", --- "com.unity.xr.management": "4.2.0", -- "com.unity.modules.ai": "1.0.0", -- "com.unity.modules.androidjni": "1.0.0", -- "com.unity.modules.animation": "1.0.0", --diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json --index 0e3a6e729..d153de494 100644 ----- a/Packages/packages-lock.json --+++ b/Packages/packages-lock.json --@@ -12,15 +12,6 @@ -- "source": "builtin", -- "dependencies": {} -- }, --- "com.unity.ads": { --- "version": "3.7.5", --- "depth": 0, --- "source": "registry", --- "dependencies": { --- "com.unity.ugui": "1.0.0" --- }, --- "url": "https://packages.unity.cn" --- }, -- "com.unity.analytics": { -- "version": "3.6.12", -- "depth": 0, --@@ -56,15 +47,6 @@ -- "dependencies": {}, -- "url": "https://packages.unity.cn" -- }, --- "com.unity.collab-proxy": { --- "version": "1.15.12", --- "depth": 0, --- "source": "registry", --- "dependencies": { --- "com.unity.services.core": "1.0.1" --- }, --- "url": "https://packages.unity.cn" --- }, -- "com.unity.ext.nunit": { -- "version": "1.0.6", -- "depth": 0, --@@ -72,15 +54,6 @@ -- "dependencies": {}, -- "url": "https://packages.unity.cn" -- }, --- "com.unity.ide.rider": { --- "version": "3.0.12", --- "depth": 0, --- "source": "registry", --- "dependencies": { --- "com.unity.ext.nunit": "1.0.6" --- }, --- "url": "https://packages.unity.cn" --- }, -- "com.unity.ide.visualstudio": { -- "version": "2.0.14", -- "depth": 0, --@@ -90,13 +63,6 @@ -- }, -- "url": "https://packages.unity.cn" -- }, --- "com.unity.ide.vscode": { --- "version": "1.2.5", --- "depth": 0, --- "source": "registry", --- "dependencies": {}, --- "url": "https://packages.unity.cn" --- }, -- "com.unity.mathematics": { -- "version": "1.2.5", -- "depth": 2, --@@ -133,29 +99,6 @@ -- }, -- "url": "https://packages.unity.cn" -- }, --- "com.unity.purchasing": { --- "version": "4.1.2", --- "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.cn" --- }, --- "com.unity.services.core": { --- "version": "1.0.1", --- "depth": 1, --- "source": "registry", --- "dependencies": { --- "com.unity.modules.unitywebrequest": "1.0.0" --- }, --- "url": "https://packages.unity.cn" --- }, -- "com.unity.settings-manager": { -- "version": "1.0.3", -- "depth": 1, --@@ -163,15 +106,6 @@ -- "dependencies": {}, -- "url": "https://packages.unity.cn" -- }, --- "com.unity.subsystemregistration": { --- "version": "1.1.0", --- "depth": 1, --- "source": "registry", --- "dependencies": { --- "com.unity.modules.subsystems": "1.0.0" --- }, --- "url": "https://packages.unity.cn" --- }, -- "com.unity.test-framework": { -- "version": "1.1.29", -- "depth": 0, --@@ -213,29 +147,6 @@ -- "com.unity.modules.imgui": "1.0.0" -- } -- }, --- "com.unity.xr.legacyinputhelpers": { --- "version": "2.1.8", --- "depth": 0, --- "source": "registry", --- "dependencies": { --- "com.unity.modules.vr": "1.0.0", --- "com.unity.modules.xr": "1.0.0" --- }, --- "url": "https://packages.unity.cn" --- }, --- "com.unity.xr.management": { --- "version": "4.2.0", --- "depth": 0, --- "source": "registry", --- "dependencies": { --- "com.unity.modules.subsystems": "1.0.0", --- "com.unity.modules.vr": "1.0.0", --- "com.unity.modules.xr": "1.0.0", --- "com.unity.xr.legacyinputhelpers": "2.1.7", --- "com.unity.subsystemregistration": "1.0.6" --- }, --- "url": "https://packages.unity.cn" --- }, -- "com.unity.modules.ai": { -- "version": "1.0.0", -- "depth": 0,