Skip to content

Commit 01d6cfe

Browse files
jcs090218jcs090218
committed
feat: Update to Unity version 6.2
1 parent 1d7991d commit 01d6cfe

File tree

9 files changed

+49
-44
lines changed

9 files changed

+49
-44
lines changed

‎Assets/Mx/Editor/Commands/MxCObject.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public static void CollapseGameObjects()
4242
expandedSceneIDs.Add(scene.GetHashCode()); // GetHashCode returns m_Handle which in turn is used as the Scene's instanceID by SceneHierarchyWindow
4343
}
4444

45-
MxEditorUtil.CollapseTreeViewController(hierarchyWindow, hierarchyTree, (TreeViewState)hierarchyTreeOwner.GetType().GetField("m_TreeViewState", MxEditorUtil.INSTANCE_FLAGS).GetValue(hierarchyTreeOwner), expandedSceneIDs);
45+
MxEditorUtil.CollapseTreeViewController(hierarchyWindow, hierarchyTree, (TreeViewState<int>)hierarchyTreeOwner.GetType().GetField("m_TreeViewState", MxEditorUtil.INSTANCE_FLAGS).GetValue(hierarchyTreeOwner), expandedSceneIDs);
4646
}
4747
}
4848
}

‎Assets/Mx/Editor/Commands/MxCProject.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public static void CollapseFolders()
3636
{
3737
object assetTree = projectWindow.GetType().GetField("m_AssetTree", MxEditorUtil.INSTANCE_FLAGS).GetValue(projectWindow);
3838
if (assetTree != null)
39-
MxEditorUtil.CollapseTreeViewController(projectWindow, assetTree, (TreeViewState)projectWindow.GetType().GetField("m_AssetTreeState", MxEditorUtil.INSTANCE_FLAGS).GetValue(projectWindow));
39+
MxEditorUtil.CollapseTreeViewController(projectWindow, assetTree, (TreeViewState<int>)projectWindow.GetType().GetField("m_AssetTreeState", MxEditorUtil.INSTANCE_FLAGS).GetValue(projectWindow));
4040

4141
object folderTree = projectWindow.GetType().GetField("m_FolderTree", MxEditorUtil.INSTANCE_FLAGS).GetValue(projectWindow);
4242
if (folderTree != null)
@@ -45,16 +45,16 @@ public static void CollapseFolders()
4545
int searchFiltersRootInstanceID = (int)typeof(EditorWindow).Assembly.GetType("UnityEditor.SavedSearchFilters").GetMethod("GetRootInstanceID", MxEditorUtil.STATIC_FLAGS).Invoke(null, null);
4646
bool isSearchFilterRootExpanded = (bool)treeViewDataSource.GetType().GetMethod("IsExpanded", MxEditorUtil.INSTANCE_FLAGS, null, new System.Type[] { typeof(int) }, null).Invoke(treeViewDataSource, new object[] { searchFiltersRootInstanceID });
4747

48-
MxEditorUtil.CollapseTreeViewController(projectWindow, folderTree, (TreeViewState)projectWindow.GetType().GetField("m_FolderTreeState", MxEditorUtil.INSTANCE_FLAGS).GetValue(projectWindow), isSearchFilterRootExpanded ? new int[1] { searchFiltersRootInstanceID } : null);
48+
MxEditorUtil.CollapseTreeViewController(projectWindow, folderTree, (TreeViewState<int>)projectWindow.GetType().GetField("m_FolderTreeState", MxEditorUtil.INSTANCE_FLAGS).GetValue(projectWindow), isSearchFilterRootExpanded ? new int[1] { searchFiltersRootInstanceID } : null);
4949

5050
// Preserve Assets and Packages folders' expanded states because they aren't automatically preserved inside ProjectBrowserColumnOneTreeViewDataSource.SetExpandedIDs
5151
// https://github.com/Unity-Technologies/UnityCsReference/blob/e740821767d2290238ea7954457333f06e952bad/Editor/Mono/ProjectBrowserColumnOne.cs#L408-L420
5252
InternalEditorUtility.expandedProjectWindowItems = (int[])treeViewDataSource.GetType().GetMethod("GetExpandedIDs", MxEditorUtil.INSTANCE_FLAGS).Invoke(treeViewDataSource, null);
5353

54-
TreeViewItem rootItem = (TreeViewItem)treeViewDataSource.GetType().GetField("m_RootItem", MxEditorUtil.INSTANCE_FLAGS).GetValue(treeViewDataSource);
54+
TreeViewItem<int> rootItem = (TreeViewItem<int>)treeViewDataSource.GetType().GetField("m_RootItem", MxEditorUtil.INSTANCE_FLAGS).GetValue(treeViewDataSource);
5555
if (rootItem.hasChildren)
5656
{
57-
foreach (TreeViewItem item in rootItem.children)
57+
foreach (TreeViewItem<int> item in rootItem.children)
5858
EditorPrefs.SetBool("ProjectBrowser" + item.displayName, (bool)treeViewDataSource.GetType().GetMethod("IsExpanded", MxEditorUtil.INSTANCE_FLAGS, null, new System.Type[] { typeof(int) }, null).Invoke(treeViewDataSource, new object[] { item.id }));
5959
}
6060
}

‎Assets/Mx/Editor/MxEditorUtil.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ public static void HighlightAsset(string path)
234234
/// <summary>
235235
/// Collapse TreeView controller.
236236
/// </summary>
237-
public static void CollapseTreeViewController(EditorWindow editorWindow, object treeViewController, TreeViewState treeViewState, IList<int> additionalInstanceIDsToExpand = null)
237+
public static void CollapseTreeViewController(EditorWindow editorWindow, object treeViewController, TreeViewState<int> treeViewState, IList<int> additionalInstanceIDsToExpand = null)
238238
{
239239
object treeViewDataSource = treeViewController.GetType().GetProperty("data", INSTANCE_FLAGS).GetValue(treeViewController, null);
240240
List<int> treeViewSelectedIDs = new List<int>(treeViewState.selectedIDs);

‎Assets/_Project/URP/UniversalRenderPipelineGlobalSettings.asset

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ MonoBehaviour:
6161
- rid: 5612789844420853764
6262
- rid: 5612789844420853765
6363
- rid: 5612789844420853766
64+
- rid: 5850493921026113536
6465
m_RuntimeSettings:
6566
m_List: []
6667
m_AssetVersion: 8
@@ -167,9 +168,6 @@ MonoBehaviour:
167168
m_AutodeskInteractive: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f, type: 3}
168169
m_AutodeskInteractiveTransparent: {fileID: 4800000, guid: 5c81372d981403744adbdda4433c9c11, type: 3}
169170
m_AutodeskInteractiveMasked: {fileID: 4800000, guid: 80aa867ac363ac043847b06ad71604cd, type: 3}
170-
m_TerrainDetailLit: {fileID: 4800000, guid: f6783ab646d374f94b199774402a5144, type: 3}
171-
m_TerrainDetailGrassBillboard: {fileID: 4800000, guid: 29868e73b638e48ca99a19ea58c48d90, type: 3}
172-
m_TerrainDetailGrass: {fileID: 4800000, guid: e507fdfead5ca47e8b9a768b51c291a1, type: 3}
173171
m_DefaultSpeedTree7Shader: {fileID: 4800000, guid: 0f4122b9a743b744abe2fb6a0a88868b, type: 3}
174172
m_DefaultSpeedTree8Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec, type: 3}
175173
m_DefaultSpeedTree9Shader: {fileID: -6465566751694194690, guid: cbd3e1cc4ae141c42a30e33b4d666a61, type: 3}
@@ -382,3 +380,7 @@ MonoBehaviour:
382380
data:
383381
m_Version: 1
384382
m_UseBicubicLightmapSampling: 0
383+
- rid: 5850493921026113536
384+
type: {class: RenderingDebuggerRuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
385+
data:
386+
m_version: 0

‎Packages/manifest.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
{
22
"dependencies": {
3-
"com.unity.2d.animation": "10.2.0",
4-
"com.unity.2d.psdimporter": "10.1.0",
3+
"com.unity.2d.animation": "12.0.2",
4+
"com.unity.2d.psdimporter": "11.0.1",
55
"com.unity.2d.sprite": "1.0.0",
6-
"com.unity.2d.spriteshape": "10.1.0",
6+
"com.unity.2d.spriteshape": "12.0.1",
77
"com.unity.2d.tilemap": "1.0.0",
8-
"com.unity.cinemachine": "2.10.3",
9-
"com.unity.collab-proxy": "2.7.1",
8+
"com.unity.cinemachine": "2.10.4",
9+
"com.unity.collab-proxy": "2.8.2",
1010
"com.unity.feature.development": "1.0.2",
1111
"com.unity.ide.visualstudio": "2.0.23",
12-
"com.unity.inputsystem": "1.14.0",
12+
"com.unity.inputsystem": "1.14.1",
1313
"com.unity.multiplayer.center": "1.0.0",
14-
"com.unity.render-pipelines.universal": "17.1.0",
14+
"com.unity.render-pipelines.universal": "17.2.0",
1515
"com.unity.timeline": "1.8.7",
1616
"com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.10",
1717
"com.unity.ugui": "2.0.0",
18-
"com.unity.visualscripting": "1.9.6",
18+
"com.unity.visualscripting": "1.9.7",
1919
"com.unity.modules.accessibility": "1.0.0",
2020
"com.unity.modules.ai": "1.0.0",
2121
"com.unity.modules.androidjni": "1.0.0",

‎Packages/packages-lock.json

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"dependencies": {
33
"com.unity.2d.animation": {
4-
"version": "10.2.0",
4+
"version": "12.0.2",
55
"depth": 0,
66
"source": "registry",
77
"dependencies": {
8-
"com.unity.2d.common": "9.1.0",
8+
"com.unity.2d.common": "11.0.1",
99
"com.unity.2d.sprite": "1.0.0",
1010
"com.unity.collections": "1.2.4",
1111
"com.unity.modules.animation": "1.0.0",
@@ -14,7 +14,7 @@
1414
"url": "https://packages.unity.com"
1515
},
1616
"com.unity.2d.common": {
17-
"version": "9.1.0",
17+
"version": "11.0.1",
1818
"depth": 1,
1919
"source": "registry",
2020
"dependencies": {
@@ -27,11 +27,11 @@
2727
"url": "https://packages.unity.com"
2828
},
2929
"com.unity.2d.psdimporter": {
30-
"version": "10.1.0",
30+
"version": "11.0.1",
3131
"depth": 0,
3232
"source": "registry",
3333
"dependencies": {
34-
"com.unity.2d.common": "9.1.0",
34+
"com.unity.2d.common": "11.0.1",
3535
"com.unity.2d.sprite": "1.0.0",
3636
"com.unity.2d.tilemap": "1.0.0"
3737
},
@@ -44,11 +44,11 @@
4444
"dependencies": {}
4545
},
4646
"com.unity.2d.spriteshape": {
47-
"version": "10.1.0",
47+
"version": "12.0.1",
4848
"depth": 0,
4949
"source": "registry",
5050
"dependencies": {
51-
"com.unity.2d.common": "9.1.0",
51+
"com.unity.2d.common": "11.0.1",
5252
"com.unity.mathematics": "1.1.0",
5353
"com.unity.modules.physics2d": "1.0.0"
5454
},
@@ -70,7 +70,7 @@
7070
"dependencies": {}
7171
},
7272
"com.unity.burst": {
73-
"version": "1.8.21",
73+
"version": "1.8.23",
7474
"depth": 2,
7575
"source": "registry",
7676
"dependencies": {
@@ -80,7 +80,7 @@
8080
"url": "https://packages.unity.com"
8181
},
8282
"com.unity.cinemachine": {
83-
"version": "2.10.3",
83+
"version": "2.10.4",
8484
"depth": 0,
8585
"source": "registry",
8686
"dependencies": {
@@ -89,20 +89,21 @@
8989
"url": "https://packages.unity.com"
9090
},
9191
"com.unity.collab-proxy": {
92-
"version": "2.7.1",
92+
"version": "2.8.2",
9393
"depth": 0,
9494
"source": "registry",
9595
"dependencies": {},
9696
"url": "https://packages.unity.com"
9797
},
9898
"com.unity.collections": {
99-
"version": "2.5.1",
99+
"version": "2.5.7",
100100
"depth": 1,
101101
"source": "registry",
102102
"dependencies": {
103-
"com.unity.burst": "1.8.17",
104-
"com.unity.test-framework": "1.4.5",
105-
"com.unity.nuget.mono-cecil": "1.11.4",
103+
"com.unity.burst": "1.8.19",
104+
"com.unity.mathematics": "1.3.2",
105+
"com.unity.test-framework": "1.4.6",
106+
"com.unity.nuget.mono-cecil": "1.11.5",
106107
"com.unity.test-framework.performance": "3.0.3"
107108
},
108109
"url": "https://packages.unity.com"
@@ -152,7 +153,7 @@
152153
"url": "https://packages.unity.com"
153154
},
154155
"com.unity.inputsystem": {
155-
"version": "1.14.0",
156+
"version": "1.14.1",
156157
"depth": 0,
157158
"source": "registry",
158159
"dependencies": {
@@ -176,7 +177,7 @@
176177
}
177178
},
178179
"com.unity.nuget.mono-cecil": {
179-
"version": "1.11.4",
180+
"version": "1.11.5",
180181
"depth": 2,
181182
"source": "registry",
182183
"dependencies": {},
@@ -190,7 +191,7 @@
190191
"url": "https://packages.unity.com"
191192
},
192193
"com.unity.render-pipelines.core": {
193-
"version": "17.1.0",
194+
"version": "17.2.0",
194195
"depth": 1,
195196
"source": "builtin",
196197
"dependencies": {
@@ -205,12 +206,12 @@
205206
}
206207
},
207208
"com.unity.render-pipelines.universal": {
208-
"version": "17.1.0",
209+
"version": "17.2.0",
209210
"depth": 0,
210211
"source": "builtin",
211212
"dependencies": {
212-
"com.unity.render-pipelines.core": "17.1.0",
213-
"com.unity.shadergraph": "17.1.0",
213+
"com.unity.render-pipelines.core": "17.2.0",
214+
"com.unity.shadergraph": "17.2.0",
214215
"com.unity.render-pipelines.universal-config": "17.0.3"
215216
}
216217
},
@@ -247,11 +248,11 @@
247248
"url": "https://packages.unity.com"
248249
},
249250
"com.unity.shadergraph": {
250-
"version": "17.1.0",
251+
"version": "17.2.0",
251252
"depth": 1,
252253
"source": "builtin",
253254
"dependencies": {
254-
"com.unity.render-pipelines.core": "17.1.0",
255+
"com.unity.render-pipelines.core": "17.2.0",
255256
"com.unity.searcher": "4.9.3"
256257
}
257258
},
@@ -333,7 +334,7 @@
333334
}
334335
},
335336
"com.unity.visualscripting": {
336-
"version": "1.9.6",
337+
"version": "1.9.7",
337338
"depth": 0,
338339
"source": "registry",
339340
"dependencies": {
@@ -490,7 +491,8 @@
490491
"com.unity.modules.ui": "1.0.0",
491492
"com.unity.modules.imgui": "1.0.0",
492493
"com.unity.modules.jsonserialize": "1.0.0",
493-
"com.unity.modules.hierarchycore": "1.0.0"
494+
"com.unity.modules.hierarchycore": "1.0.0",
495+
"com.unity.modules.physics": "1.0.0"
494496
}
495497
},
496498
"com.unity.modules.umbra": {

‎ProjectSettings/ProjectVersion.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
m_EditorVersion: 6000.1.0f1
2-
m_EditorVersionWithRevision: 6000.1.0f1 (9ea152932a88)
1+
m_EditorVersion: 6000.2.0f1
2+
m_EditorVersionWithRevision: 6000.2.0f1 (eed1c594c913)

‎ProjectSettings/ShaderGraphSettings.asset

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ MonoBehaviour:
1313
m_Name:
1414
m_EditorClassIdentifier:
1515
shaderVariantLimit: 128
16+
overrideShaderVariantLimit: 0
1617
customInterpolatorErrorThreshold: 32
1718
customInterpolatorWarningThreshold: 16
1819
customHeatmapValues: {fileID: 0}

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
<p align="center">
1212
<a href="https://opensource.org/licenses/MIT"><img src="https://img.shields.io/badge/License-MIT-green.svg" alt="License: MIT"></a>
13-
<a href="https://unity3d.com/get-unity/download/archive"><img src="https://img.shields.io/badge/unity-6000.1.0f1-black.svg?style=flat&amp;logo=unity" alt="Unity Engine"></a>
13+
<a href="https://unity3d.com/get-unity/download/archive"><img src="https://img.shields.io/badge/unity-6000.2.0f1-black.svg?style=flat&amp;logo=unity" alt="Unity Engine"></a>
1414
<a href="https://docs.unity3d.com/2018.3/Documentation/Manual/ScriptingRuntimeUpgrade.html"><img src="https://img.shields.io/badge/.NET-2.0-blueviolet.svg" alt=".NET"></a>
1515
<a href="https://github.com/jcs090218/Unity.Mx/releases/latest"><img src="https://img.shields.io/github/tag/jcs090218/Unity.Mx.svg?label=release&logo=github" alt="Release Tag"></a>
1616
</p>

0 commit comments

Comments
 (0)