Skip to content

Commit 8528158

Browse files
kstjxykstjxy
committed
updated unity version for Addressable demo
1 parent c9094f7 commit 8528158

File tree

5 files changed

+36
-47
lines changed

5 files changed

+36
-47
lines changed

‎Demo/Addressable/Assets/AddressableAssetsData/link.xml.meta

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎Demo/Addressable/Packages/packages-lock.json

Lines changed: 23 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"com.unity.modules.unitywebrequest": "1.0.0",
1313
"com.unity.modules.unitywebrequestassetbundle": "1.0.0"
1414
},
15-
"url": "https://packages.unity.cn"
15+
"url": "https://packages.unity.com"
1616
},
1717
"com.unity.collab-proxy": {
1818
"version": "1.15.13",
@@ -21,14 +21,14 @@
2121
"dependencies": {
2222
"com.unity.services.core": "1.0.1"
2323
},
24-
"url": "https://packages.unity.cn"
24+
"url": "https://packages.unity.com"
2525
},
2626
"com.unity.ext.nunit": {
2727
"version": "1.0.6",
2828
"depth": 1,
2929
"source": "registry",
3030
"dependencies": {},
31-
"url": "https://packages.unity.cn"
31+
"url": "https://packages.unity.com"
3232
},
3333
"com.unity.ide.rider": {
3434
"version": "3.0.12",
@@ -37,7 +37,7 @@
3737
"dependencies": {
3838
"com.unity.ext.nunit": "1.0.6"
3939
},
40-
"url": "https://packages.unity.cn"
40+
"url": "https://packages.unity.com"
4141
},
4242
"com.unity.ide.visualstudio": {
4343
"version": "2.0.14",
@@ -46,30 +46,39 @@
4646
"dependencies": {
4747
"com.unity.test-framework": "1.1.9"
4848
},
49-
"url": "https://packages.unity.cn"
49+
"url": "https://packages.unity.com"
5050
},
5151
"com.unity.ide.vscode": {
5252
"version": "1.2.5",
5353
"depth": 0,
5454
"source": "registry",
5555
"dependencies": {},
56-
"url": "https://packages.unity.cn"
56+
"url": "https://packages.unity.com"
57+
},
58+
"com.unity.nuget.newtonsoft-json": {
59+
"version": "3.2.1",
60+
"depth": 2,
61+
"source": "registry",
62+
"dependencies": {},
63+
"url": "https://packages.unity.com"
5764
},
5865
"com.unity.scriptablebuildpipeline": {
59-
"version": "1.19.6",
66+
"version": "1.21.21",
6067
"depth": 1,
6168
"source": "registry",
6269
"dependencies": {},
63-
"url": "https://packages.unity.cn"
70+
"url": "https://packages.unity.com"
6471
},
6572
"com.unity.services.core": {
66-
"version": "1.0.1",
73+
"version": "1.12.0",
6774
"depth": 1,
6875
"source": "registry",
6976
"dependencies": {
70-
"com.unity.modules.unitywebrequest": "1.0.0"
77+
"com.unity.modules.unitywebrequest": "1.0.0",
78+
"com.unity.nuget.newtonsoft-json": "3.2.1",
79+
"com.unity.modules.androidjni": "1.0.0"
7180
},
72-
"url": "https://packages.unity.cn"
81+
"url": "https://packages.unity.com"
7382
},
7483
"com.unity.test-framework": {
7584
"version": "1.1.31",
@@ -80,7 +89,7 @@
8089
"com.unity.modules.imgui": "1.0.0",
8190
"com.unity.modules.jsonserialize": "1.0.0"
8291
},
83-
"url": "https://packages.unity.cn"
92+
"url": "https://packages.unity.com"
8493
},
8594
"com.unity.textmeshpro": {
8695
"version": "3.0.6",
@@ -89,7 +98,7 @@
8998
"dependencies": {
9099
"com.unity.ugui": "1.0.0"
91100
},
92-
"url": "https://packages.unity.cn"
101+
"url": "https://packages.unity.com"
93102
},
94103
"com.unity.timeline": {
95104
"version": "1.6.4",
@@ -101,7 +110,7 @@
101110
"com.unity.modules.audio": "1.0.0",
102111
"com.unity.modules.particlesystem": "1.0.0"
103112
},
104-
"url": "https://packages.unity.cn"
113+
"url": "https://packages.unity.com"
105114
},
106115
"com.unity.ugui": {
107116
"version": "1.0.0",
@@ -244,17 +253,6 @@
244253
"version": "1.0.0",
245254
"depth": 0,
246255
"source": "builtin",
247-
"dependencies": {
248-
"com.unity.modules.ui": "1.0.0",
249-
"com.unity.modules.imgui": "1.0.0",
250-
"com.unity.modules.jsonserialize": "1.0.0",
251-
"com.unity.modules.uielementsnative": "1.0.0"
252-
}
253-
},
254-
"com.unity.modules.uielementsnative": {
255-
"version": "1.0.0",
256-
"depth": 1,
257-
"source": "builtin",
258256
"dependencies": {
259257
"com.unity.modules.ui": "1.0.0",
260258
"com.unity.modules.imgui": "1.0.0",

‎Demo/Addressable/ProjectSettings/PackageManagerSettings.asset

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,27 +12,25 @@ MonoBehaviour:
1212
m_Script: {fileID: 13964, guid: 0000000000000000e000000000000000, type: 0}
1313
m_Name:
1414
m_EditorClassIdentifier:
15+
m_EnablePreReleasePackages: 0
16+
m_AdvancedSettingsExpanded: 1
1517
m_ScopedRegistriesSettingsExpanded: 1
18+
m_SeeAllPackageVersions: 0
19+
m_DismissPreviewPackagesInUse: 0
1620
oneTimeWarningShown: 0
1721
m_Registries:
1822
- m_Id: main
1923
m_Name:
20-
m_Url: https://packages.unity.cn
24+
m_Url: https://packages.unity.com
2125
m_Scopes: []
2226
m_IsDefault: 1
27+
m_Capabilities: 7
28+
m_ConfigSource: 0
2329
m_UserSelectedRegistryName:
2430
m_UserAddingNewScopedRegistry: 0
2531
m_RegistryInfoDraft:
26-
m_ErrorMessage:
27-
m_Original:
28-
m_Id:
29-
m_Name:
30-
m_Url:
31-
m_Scopes: []
32-
m_IsDefault: 0
3332
m_Modified: 0
34-
m_Name:
35-
m_Url:
36-
m_Scopes:
37-
-
38-
m_SelectedScopeIndex: 0
33+
m_ErrorMessage:
34+
m_UserModificationsInstanceId: -850
35+
m_OriginalInstanceId: -852
36+
m_LoadAssets: 0

‎Demo/Addressable/ProjectSettings/boot.config renamed to ‎Demo/Addressable/ProjectSettings/Packages/com.unity.services.core/Settings.json

File renamed without changes.

‎Demo/Addressable/ProjectSettings/ProjectVersion.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
m_EditorVersion: 2021.2.18f1c1
2-
m_EditorVersionWithRevision: 2021.2.18f1c1 (20c61a5fa8bf)
1+
m_EditorVersion: 2022.3.14f1
2+
m_EditorVersionWithRevision: 2022.3.14f1 (eff2de9070d8)

0 commit comments

Comments
 (0)