Skip to content

Commit f03d139

Browse files
committed
Upgraded to Unity 2020 and updated packages
1 parent 3301586 commit f03d139

File tree

6 files changed

+56
-16
lines changed

6 files changed

+56
-16
lines changed

Packages/manifest.json

+6-5
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22
"dependencies": {
33
"com.unity.2d.sprite": "1.0.0",
44
"com.unity.2d.tilemap": "1.0.0",
5-
"com.unity.ide.rider": "1.1.4",
6-
"com.unity.ide.vscode": "1.2.3",
7-
"com.unity.test-framework": "1.1.19",
8-
"com.unity.textmeshpro": "2.0.1",
9-
"com.unity.timeline": "1.2.6",
5+
"com.unity.ide.rider": "2.0.7",
6+
"com.unity.ide.visualstudio": "2.0.14",
7+
"com.unity.ide.vscode": "1.2.4",
8+
"com.unity.test-framework": "1.1.29",
9+
"com.unity.textmeshpro": "3.0.6",
10+
"com.unity.timeline": "1.4.8",
1011
"com.unity.ugui": "1.0.0",
1112
"com.unity.modules.ai": "1.0.0",
1213
"com.unity.modules.androidjni": "1.0.0",

Packages/packages-lock.json

+34-8
Original file line numberDiff line numberDiff line change
@@ -13,41 +13,50 @@
1313
"dependencies": {}
1414
},
1515
"com.unity.ext.nunit": {
16-
"version": "1.0.5",
16+
"version": "1.0.6",
1717
"depth": 1,
1818
"source": "registry",
1919
"dependencies": {},
2020
"url": "https://packages.unity.com"
2121
},
2222
"com.unity.ide.rider": {
23-
"version": "1.1.4",
23+
"version": "2.0.7",
2424
"depth": 0,
2525
"source": "registry",
2626
"dependencies": {
2727
"com.unity.test-framework": "1.1.1"
2828
},
2929
"url": "https://packages.unity.com"
3030
},
31+
"com.unity.ide.visualstudio": {
32+
"version": "2.0.14",
33+
"depth": 0,
34+
"source": "registry",
35+
"dependencies": {
36+
"com.unity.test-framework": "1.1.9"
37+
},
38+
"url": "https://packages.unity.com"
39+
},
3140
"com.unity.ide.vscode": {
32-
"version": "1.2.3",
41+
"version": "1.2.4",
3342
"depth": 0,
3443
"source": "registry",
3544
"dependencies": {},
3645
"url": "https://packages.unity.com"
3746
},
3847
"com.unity.test-framework": {
39-
"version": "1.1.19",
48+
"version": "1.1.29",
4049
"depth": 0,
4150
"source": "registry",
4251
"dependencies": {
43-
"com.unity.ext.nunit": "1.0.5",
52+
"com.unity.ext.nunit": "1.0.6",
4453
"com.unity.modules.imgui": "1.0.0",
4554
"com.unity.modules.jsonserialize": "1.0.0"
4655
},
4756
"url": "https://packages.unity.com"
4857
},
4958
"com.unity.textmeshpro": {
50-
"version": "2.0.1",
59+
"version": "3.0.6",
5160
"depth": 0,
5261
"source": "registry",
5362
"dependencies": {
@@ -56,10 +65,15 @@
5665
"url": "https://packages.unity.com"
5766
},
5867
"com.unity.timeline": {
59-
"version": "1.2.6",
68+
"version": "1.4.8",
6069
"depth": 0,
6170
"source": "registry",
62-
"dependencies": {},
71+
"dependencies": {
72+
"com.unity.modules.director": "1.0.0",
73+
"com.unity.modules.animation": "1.0.0",
74+
"com.unity.modules.audio": "1.0.0",
75+
"com.unity.modules.particlesystem": "1.0.0"
76+
},
6377
"url": "https://packages.unity.com"
6478
},
6579
"com.unity.ugui": {
@@ -204,6 +218,18 @@
204218
"depth": 0,
205219
"source": "builtin",
206220
"dependencies": {
221+
"com.unity.modules.ui": "1.0.0",
222+
"com.unity.modules.imgui": "1.0.0",
223+
"com.unity.modules.jsonserialize": "1.0.0",
224+
"com.unity.modules.uielementsnative": "1.0.0"
225+
}
226+
},
227+
"com.unity.modules.uielementsnative": {
228+
"version": "1.0.0",
229+
"depth": 1,
230+
"source": "builtin",
231+
"dependencies": {
232+
"com.unity.modules.ui": "1.0.0",
207233
"com.unity.modules.imgui": "1.0.0",
208234
"com.unity.modules.jsonserialize": "1.0.0"
209235
}

ProjectSettings/PackageManagerSettings.asset

+6-1
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,12 @@ MonoBehaviour:
99
m_GameObject: {fileID: 0}
1010
m_Enabled: 1
1111
m_EditorHideFlags: 0
12-
m_Script: {fileID: 13960, guid: 0000000000000000e000000000000000, type: 0}
12+
m_Script: {fileID: 13964, guid: 0000000000000000e000000000000000, type: 0}
1313
m_Name:
1414
m_EditorClassIdentifier:
15+
m_EnablePreviewPackages: 0
16+
m_EnablePackageDependencies: 0
17+
m_AdvancedSettingsExpanded: 1
1518
m_ScopedRegistriesSettingsExpanded: 1
1619
oneTimeWarningShown: 0
1720
m_Registries:
@@ -20,6 +23,7 @@ MonoBehaviour:
2023
m_Url: https://packages.unity.com
2124
m_Scopes: []
2225
m_IsDefault: 1
26+
m_Capabilities: 7
2327
m_UserSelectedRegistryName:
2428
m_UserAddingNewScopedRegistry: 0
2529
m_RegistryInfoDraft:
@@ -30,6 +34,7 @@ MonoBehaviour:
3034
m_Url:
3135
m_Scopes: []
3236
m_IsDefault: 0
37+
m_Capabilities: 0
3338
m_Modified: 0
3439
m_Name:
3540
m_Url:

ProjectSettings/ProjectVersion.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
m_EditorVersion: 2019.4.17f1
2-
m_EditorVersionWithRevision: 2019.4.17f1 (667c8606c536)
1+
m_EditorVersion: 2020.3.25f1
2+
m_EditorVersionWithRevision: 2020.3.25f1 (9b9180224418)
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!890905787 &1
4+
VersionControlSettings:
5+
m_ObjectHideFlags: 0
6+
m_Mode: Visible Meta Files
7+
m_CollabEditorSettings:
8+
inProgressEnabled: 1

UserSettings/EditorUserSettings.asset

4.06 KB
Binary file not shown.

0 commit comments

Comments
 (0)