123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607608609610611612613614615616617618619620621622623624625626627628629630631632633634635636637638639640641642643644645646647648 |
- 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,
|