Skip to content

Commit f658190

Browse files
kstjxykstjxy
committed
Updated unity version for Benchmark demo
1 parent 8528158 commit f658190

File tree

6 files changed

+61
-30
lines changed

6 files changed

+61
-30
lines changed

‎Demo/Benchmark/Assets/Editor/BuildReportInspector/BuildReportInspector.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -406,9 +406,9 @@ void OnAssetsGUI()
406406

407407
void OnOutputFilesGUI()
408408
{
409-
var longestCommonRoot = report.files[0].path;
409+
var longestCommonRoot = report.GetFiles()[0].path;
410410
var tempRoot = Path.GetFullPath("Temp");
411-
foreach (var file in report.files)
411+
foreach (var file in report.GetFiles())
412412
{
413413
if (file.path.StartsWith(tempRoot))
414414
continue;
@@ -422,7 +422,7 @@ void OnOutputFilesGUI()
422422
}
423423
}
424424
bool odd = false;
425-
foreach (var file in report.files)
425+
foreach (var file in report.GetFiles())
426426
{
427427
if (file.path.StartsWith(tempRoot))
428428
continue;

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

Lines changed: 42 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,10 @@
1010
"version": "1.0.0",
1111
"depth": 0,
1212
"source": "builtin",
13-
"dependencies": {}
13+
"dependencies": {
14+
"com.unity.modules.tilemap": "1.0.0",
15+
"com.unity.modules.uielements": "1.0.0"
16+
}
1417
},
1518
"com.unity.collab-proxy": {
1619
"version": "1.15.13",
@@ -19,14 +22,14 @@
1922
"dependencies": {
2023
"com.unity.services.core": "1.0.1"
2124
},
22-
"url": "https://packages.unity.cn"
25+
"url": "https://packages.unity.com"
2326
},
2427
"com.unity.ext.nunit": {
2528
"version": "1.0.6",
2629
"depth": 1,
2730
"source": "registry",
2831
"dependencies": {},
29-
"url": "https://packages.unity.cn"
32+
"url": "https://packages.unity.com"
3033
},
3134
"com.unity.ide.rider": {
3235
"version": "3.0.12",
@@ -35,7 +38,7 @@
3538
"dependencies": {
3639
"com.unity.ext.nunit": "1.0.6"
3740
},
38-
"url": "https://packages.unity.cn"
41+
"url": "https://packages.unity.com"
3942
},
4043
"com.unity.ide.visualstudio": {
4144
"version": "2.0.14",
@@ -44,23 +47,32 @@
4447
"dependencies": {
4548
"com.unity.test-framework": "1.1.9"
4649
},
47-
"url": "https://packages.unity.cn"
50+
"url": "https://packages.unity.com"
4851
},
4952
"com.unity.ide.vscode": {
5053
"version": "1.2.5",
5154
"depth": 0,
5255
"source": "registry",
5356
"dependencies": {},
54-
"url": "https://packages.unity.cn"
57+
"url": "https://packages.unity.com"
58+
},
59+
"com.unity.nuget.newtonsoft-json": {
60+
"version": "3.2.1",
61+
"depth": 2,
62+
"source": "registry",
63+
"dependencies": {},
64+
"url": "https://packages.unity.com"
5565
},
5666
"com.unity.services.core": {
57-
"version": "1.0.1",
67+
"version": "1.12.0",
5868
"depth": 1,
5969
"source": "registry",
6070
"dependencies": {
61-
"com.unity.modules.unitywebrequest": "1.0.0"
71+
"com.unity.modules.unitywebrequest": "1.0.0",
72+
"com.unity.nuget.newtonsoft-json": "3.2.1",
73+
"com.unity.modules.androidjni": "1.0.0"
6274
},
63-
"url": "https://packages.unity.cn"
75+
"url": "https://packages.unity.com"
6476
},
6577
"com.unity.test-framework": {
6678
"version": "1.1.31",
@@ -71,7 +83,7 @@
7183
"com.unity.modules.imgui": "1.0.0",
7284
"com.unity.modules.jsonserialize": "1.0.0"
7385
},
74-
"url": "https://packages.unity.cn"
86+
"url": "https://packages.unity.com"
7587
},
7688
"com.unity.timeline": {
7789
"version": "1.6.4",
@@ -83,7 +95,7 @@
8395
"com.unity.modules.audio": "1.0.0",
8496
"com.unity.modules.particlesystem": "1.0.0"
8597
},
86-
"url": "https://packages.unity.cn"
98+
"url": "https://packages.unity.com"
8799
},
88100
"com.unity.ugui": {
89101
"version": "1.0.0",
@@ -102,7 +114,7 @@
102114
"com.unity.modules.vr": "1.0.0",
103115
"com.unity.modules.xr": "1.0.0"
104116
},
105-
"url": "https://packages.unity.cn"
117+
"url": "https://packages.unity.com"
106118
},
107119
"com.unity.modules.ai": {
108120
"version": "1.0.0",
@@ -175,12 +187,30 @@
175187
"com.unity.modules.jsonserialize": "1.0.0"
176188
}
177189
},
190+
"com.unity.modules.tilemap": {
191+
"version": "1.0.0",
192+
"depth": 1,
193+
"source": "builtin",
194+
"dependencies": {
195+
"com.unity.modules.physics2d": "1.0.0"
196+
}
197+
},
178198
"com.unity.modules.ui": {
179199
"version": "1.0.0",
180200
"depth": 0,
181201
"source": "builtin",
182202
"dependencies": {}
183203
},
204+
"com.unity.modules.uielements": {
205+
"version": "1.0.0",
206+
"depth": 1,
207+
"source": "builtin",
208+
"dependencies": {
209+
"com.unity.modules.ui": "1.0.0",
210+
"com.unity.modules.imgui": "1.0.0",
211+
"com.unity.modules.jsonserialize": "1.0.0"
212+
}
213+
},
184214
"com.unity.modules.unitywebrequest": {
185215
"version": "1.0.0",
186216
"depth": 0,

‎Demo/Benchmark/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: -830
35+
m_OriginalInstanceId: -832
36+
m_LoadAssets: 0

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

File renamed without changes.

‎Demo/Benchmark/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)

‎Demo/Benchmark/UserSettings/EditorUserSettings.asset

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ EditorUserSettings:
88
RecentlyUsedSceneGuid-0:
99
value: 51500105570c0d0a0f5e5f2615770940464e482e292c2535747d1f6bb0b76d3b
1010
flags: 0
11+
RecentlyUsedSceneGuid-1:
12+
value: 0254560451500c5e5b5e557a477b5e44404f4e72782b27607b714d62b1e5373d
13+
flags: 0
1114
vcSharedLogLevel:
1215
value: 0d5e400f0650
1316
flags: 0

0 commit comments

Comments
 (0)