Skip to content

Commit 6f72492

Browse files
De-PantherDe-Panther
committed
Upgraded MainProject to Unity 2020.3.11f1
1 parent 07d5f00 commit 6f72492

File tree

7 files changed

+176
-62
lines changed

7 files changed

+176
-62
lines changed

‎MainProject/Packages/manifest.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,14 @@
1111
],
1212
"dependencies": {
1313
"com.de-panther.webxr-input-profiles-loader": "0.3.6",
14-
"com.unity.ide.rider": "2.0.5",
14+
"com.unity.ide.rider": "2.0.7",
15+
"com.unity.ide.visualstudio": "2.0.8",
1516
"com.unity.ide.vscode": "1.2.3",
16-
"com.unity.test-framework": "1.1.16",
17-
"com.unity.timeline": "1.2.16",
17+
"com.unity.test-framework": "1.1.24",
18+
"com.unity.timeline": "1.4.8",
1819
"com.unity.ugui": "1.0.0",
19-
"com.unity.xr.management": "3.2.13",
20-
"com.unity.xr.oculus": "1.4.3",
20+
"com.unity.xr.management": "4.0.1",
21+
"com.unity.xr.oculus": "1.9.1",
2122
"com.unity.modules.ai": "1.0.0",
2223
"com.unity.modules.androidjni": "1.0.0",
2324
"com.unity.modules.animation": "1.0.0",

‎MainProject/Packages/packages-lock.json

Lines changed: 46 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -39,21 +39,30 @@
3939
}
4040
},
4141
"com.unity.ext.nunit": {
42-
"version": "1.0.0",
42+
"version": "1.0.6",
4343
"depth": 1,
4444
"source": "registry",
4545
"dependencies": {},
4646
"url": "https://packages.unity.com"
4747
},
4848
"com.unity.ide.rider": {
49-
"version": "2.0.5",
49+
"version": "2.0.7",
5050
"depth": 0,
5151
"source": "registry",
5252
"dependencies": {
5353
"com.unity.test-framework": "1.1.1"
5454
},
5555
"url": "https://packages.unity.com"
5656
},
57+
"com.unity.ide.visualstudio": {
58+
"version": "2.0.8",
59+
"depth": 0,
60+
"source": "registry",
61+
"dependencies": {
62+
"com.unity.test-framework": "1.1.9"
63+
},
64+
"url": "https://packages.unity.com"
65+
},
5766
"com.unity.ide.vscode": {
5867
"version": "1.2.3",
5968
"depth": 0,
@@ -83,54 +92,66 @@
8392
"url": "https://packages.unity.com"
8493
},
8594
"com.unity.test-framework": {
86-
"version": "1.1.16",
95+
"version": "1.1.24",
8796
"depth": 0,
8897
"source": "registry",
8998
"dependencies": {
90-
"com.unity.ext.nunit": "1.0.0",
99+
"com.unity.ext.nunit": "1.0.6",
91100
"com.unity.modules.imgui": "1.0.0",
92101
"com.unity.modules.jsonserialize": "1.0.0"
93102
},
94103
"url": "https://packages.unity.com"
95104
},
96105
"com.unity.timeline": {
97-
"version": "1.2.16",
106+
"version": "1.4.8",
98107
"depth": 0,
99108
"source": "registry",
100-
"dependencies": {},
109+
"dependencies": {
110+
"com.unity.modules.director": "1.0.0",
111+
"com.unity.modules.animation": "1.0.0",
112+
"com.unity.modules.audio": "1.0.0",
113+
"com.unity.modules.particlesystem": "1.0.0"
114+
},
101115
"url": "https://packages.unity.com"
102116
},
103117
"com.unity.ugui": {
104118
"version": "1.0.0",
105119
"depth": 0,
106120
"source": "builtin",
107121
"dependencies": {
108-
"com.unity.modules.ui": "1.0.0"
122+
"com.unity.modules.ui": "1.0.0",
123+
"com.unity.modules.imgui": "1.0.0"
109124
}
110125
},
111126
"com.unity.xr.legacyinputhelpers": {
112-
"version": "2.1.4",
127+
"version": "2.1.7",
113128
"depth": 1,
114129
"source": "registry",
115-
"dependencies": {},
130+
"dependencies": {
131+
"com.unity.modules.vr": "1.0.0",
132+
"com.unity.modules.xr": "1.0.0"
133+
},
116134
"url": "https://packages.unity.com"
117135
},
118136
"com.unity.xr.management": {
119-
"version": "3.2.13",
137+
"version": "4.0.1",
120138
"depth": 0,
121139
"source": "registry",
122140
"dependencies": {
123-
"com.unity.xr.legacyinputhelpers": "2.1.2",
141+
"com.unity.modules.subsystems": "1.0.0",
142+
"com.unity.modules.vr": "1.0.0",
143+
"com.unity.modules.xr": "1.0.0",
144+
"com.unity.xr.legacyinputhelpers": "2.1.7",
124145
"com.unity.subsystemregistration": "1.0.6"
125146
},
126147
"url": "https://packages.unity.com"
127148
},
128149
"com.unity.xr.oculus": {
129-
"version": "1.4.3",
150+
"version": "1.9.1",
130151
"depth": 0,
131152
"source": "registry",
132153
"dependencies": {
133-
"com.unity.xr.management": "3.0.6",
154+
"com.unity.xr.management": "4.0.1",
134155
"com.unity.ugui": "1.0.0"
135156
},
136157
"url": "https://packages.unity.com"
@@ -268,6 +289,18 @@
268289
"depth": 0,
269290
"source": "builtin",
270291
"dependencies": {
292+
"com.unity.modules.ui": "1.0.0",
293+
"com.unity.modules.imgui": "1.0.0",
294+
"com.unity.modules.jsonserialize": "1.0.0",
295+
"com.unity.modules.uielementsnative": "1.0.0"
296+
}
297+
},
298+
"com.unity.modules.uielementsnative": {
299+
"version": "1.0.0",
300+
"depth": 1,
301+
"source": "builtin",
302+
"dependencies": {
303+
"com.unity.modules.ui": "1.0.0",
271304
"com.unity.modules.imgui": "1.0.0",
272305
"com.unity.modules.jsonserialize": "1.0.0"
273306
}

‎MainProject/ProjectSettings/PackageManagerSettings.asset

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &1
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 61
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 13964, guid: 0000000000000000e000000000000000, type: 0}
13+
m_Name:
14+
m_EditorClassIdentifier:
15+
m_EnablePreviewPackages: 0
16+
m_EnablePackageDependencies: 0
17+
m_AdvancedSettingsExpanded: 1
18+
m_ScopedRegistriesSettingsExpanded: 1
19+
oneTimeWarningShown: 0
20+
m_Registries:
21+
- m_Id: main
22+
m_Name:
23+
m_Url: https://packages.unity.com
24+
m_Scopes: []
25+
m_IsDefault: 1
26+
m_Capabilities: 7
27+
- m_Id: scoped:OpenUPM
28+
m_Name: OpenUPM
29+
m_Url: https://package.openupm.com
30+
m_Scopes:
31+
- com.de-panther
32+
- com.atteneder
33+
m_IsDefault: 0
34+
m_Capabilities: 0
35+
m_UserSelectedRegistryName:
36+
m_UserAddingNewScopedRegistry: 0
37+
m_RegistryInfoDraft:
38+
m_ErrorMessage:
39+
m_Original:
40+
m_Id: scoped:OpenUPM
41+
m_Name: OpenUPM
42+
m_Url: https://package.openupm.com
43+
m_Scopes:
44+
- com.de-panther
45+
- com.atteneder
46+
m_IsDefault: 0
47+
m_Capabilities: 0
48+
m_Modified: 0
49+
m_Name: OpenUPM
50+
m_Url: https://package.openupm.com
51+
m_Scopes:
52+
- com.de-panther
53+
- com.atteneder
54+
m_SelectedScopeIndex: 0

0 commit comments

Comments
 (0)