Skip to content

Commit 5aa79ae

Browse files
committed
Update Unity
1 parent a2b853b commit 5aa79ae

File tree

6 files changed

+67
-28
lines changed

6 files changed

+67
-28
lines changed

GoingHyper2021/Assets/Plugins/Editor/Hierarchy 2/Editor/ObjectCustomization.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using UnityEngine;
22
using UnityEngine.UIElements;
33
using UnityEditor;
4-
using UnityEditor.Experimental.SceneManagement;
4+
55
using UnityEditor.UIElements;
66

77
namespace Hierarchy2
@@ -27,7 +27,7 @@ public VisualElement CreateShelfElement()
2727

2828
shelfButton.RegisterCallback<MouseDownEvent>((evt) =>
2929
{
30-
var isPrefabMode = PrefabStageUtility.GetCurrentPrefabStage() != null ? true : false;
30+
var isPrefabMode = UnityEditor.SceneManagement.PrefabStageUtility.GetCurrentPrefabStage() != null ? true : false;
3131
if (isPrefabMode)
3232
{
3333
Debug.LogWarning("Cannot custom object in prefab.");

GoingHyper2021/Packages/manifest.json

+9-9
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,17 @@
2626
"com.unity.2d.sprite": "1.0.0",
2727
"com.unity.2d.tilemap": "1.0.0",
2828
"com.unity.build-report-inspector": "0.2.2-preview",
29-
"com.unity.cinemachine": "2.7.1",
30-
"com.unity.connect.share": "4.1.0",
31-
"com.unity.ide.rider": "2.0.7",
32-
"com.unity.ide.visualstudio": "2.0.8",
33-
"com.unity.inputsystem": "1.1.0-preview.2",
29+
"com.unity.cinemachine": "2.8.2",
30+
"com.unity.connect.share": "4.2.2",
31+
"com.unity.ide.rider": "3.0.7",
32+
"com.unity.ide.visualstudio": "2.0.12",
33+
"com.unity.inputsystem": "1.2.0",
3434
"com.unity.memoryprofiler": "0.2.6-preview.1",
35-
"com.unity.performance.profile-analyzer": "1.0.3",
36-
"com.unity.postprocessing": "3.0.1",
37-
"com.unity.recorder": "2.5.5",
35+
"com.unity.performance.profile-analyzer": "1.1.1",
36+
"com.unity.postprocessing": "3.2.0",
37+
"com.unity.recorder": "3.0.3",
3838
"com.unity.textmeshpro": "3.0.6",
39-
"com.unity.timeline": "1.4.8",
39+
"com.unity.timeline": "1.6.3",
4040
"com.unity.toolchain.win-x86_64-linux-x86_64": "0.1.17-preview",
4141
"com.unity.ugui": "1.0.0",
4242
"com.unity.uiextensions": "https://github.com/JohannesDeml/unity-ui-extensions.git",

GoingHyper2021/Packages/packages-lock.json

+19-15
Original file line numberDiff line numberDiff line change
@@ -185,14 +185,14 @@
185185
"url": "https://packages.unity.com"
186186
},
187187
"com.unity.cinemachine": {
188-
"version": "2.7.1",
188+
"version": "2.8.2",
189189
"depth": 0,
190190
"source": "registry",
191191
"dependencies": {},
192192
"url": "https://packages.unity.com"
193193
},
194194
"com.unity.connect.share": {
195-
"version": "4.1.0",
195+
"version": "4.2.2",
196196
"depth": 0,
197197
"source": "registry",
198198
"dependencies": {
@@ -210,22 +210,22 @@
210210
},
211211
"com.unity.ext.nunit": {
212212
"version": "1.0.6",
213-
"depth": 2,
213+
"depth": 1,
214214
"source": "registry",
215215
"dependencies": {},
216216
"url": "https://packages.unity.com"
217217
},
218218
"com.unity.ide.rider": {
219-
"version": "2.0.7",
219+
"version": "3.0.7",
220220
"depth": 0,
221221
"source": "registry",
222222
"dependencies": {
223-
"com.unity.test-framework": "1.1.1"
223+
"com.unity.ext.nunit": "1.0.6"
224224
},
225225
"url": "https://packages.unity.com"
226226
},
227227
"com.unity.ide.visualstudio": {
228-
"version": "2.0.8",
228+
"version": "2.0.12",
229229
"depth": 0,
230230
"source": "registry",
231231
"dependencies": {
@@ -234,10 +234,12 @@
234234
"url": "https://packages.unity.com"
235235
},
236236
"com.unity.inputsystem": {
237-
"version": "1.1.0-preview.2",
237+
"version": "1.2.0",
238238
"depth": 0,
239239
"source": "registry",
240-
"dependencies": {},
240+
"dependencies": {
241+
"com.unity.modules.uielements": "1.0.0"
242+
},
241243
"url": "https://packages.unity.com"
242244
},
243245
"com.unity.memoryprofiler": {
@@ -257,21 +259,23 @@
257259
"url": "https://packages.unity.com"
258260
},
259261
"com.unity.performance.profile-analyzer": {
260-
"version": "1.0.3",
262+
"version": "1.1.1",
261263
"depth": 0,
262264
"source": "registry",
263265
"dependencies": {},
264266
"url": "https://packages.unity.com"
265267
},
266268
"com.unity.postprocessing": {
267-
"version": "3.0.1",
269+
"version": "3.2.0",
268270
"depth": 0,
269271
"source": "registry",
270-
"dependencies": {},
272+
"dependencies": {
273+
"com.unity.modules.physics": "1.0.0"
274+
},
271275
"url": "https://packages.unity.com"
272276
},
273277
"com.unity.recorder": {
274-
"version": "2.5.5",
278+
"version": "3.0.3",
275279
"depth": 0,
276280
"source": "registry",
277281
"dependencies": {
@@ -280,7 +284,7 @@
280284
"url": "https://packages.unity.com"
281285
},
282286
"com.unity.settings-manager": {
283-
"version": "1.0.2",
287+
"version": "1.0.3",
284288
"depth": 1,
285289
"source": "registry",
286290
"dependencies": {},
@@ -303,7 +307,7 @@
303307
"url": "https://packages.unity.com"
304308
},
305309
"com.unity.test-framework": {
306-
"version": "1.1.24",
310+
"version": "1.1.29",
307311
"depth": 1,
308312
"source": "registry",
309313
"dependencies": {
@@ -323,7 +327,7 @@
323327
"url": "https://packages.unity.com"
324328
},
325329
"com.unity.timeline": {
326-
"version": "1.4.8",
330+
"version": "1.6.3",
327331
"depth": 0,
328332
"source": "registry",
329333
"dependencies": {

GoingHyper2021/ProjectSettings/MemorySettings.asset

+35
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
m_EditorVersion: 2020.3.10f1
2-
m_EditorVersionWithRevision: 2020.3.10f1 (297d780c91bc)
1+
m_EditorVersion: 2021.2.7f1
2+
m_EditorVersionWithRevision: 2021.2.7f1 (6bd9e232123f)

GoingHyper2021/ProjectSettings/boot.config

Whitespace-only changes.

0 commit comments

Comments
 (0)