Skip to content

Commit 9f2bf57

Browse files
jcs090218jcs090218
committed
chore: Upgrade to Unity 6.3
1 parent f570c6d commit 9f2bf57

File tree

11 files changed

+103
-30
lines changed

11 files changed

+103
-30
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: 5 additions & 5 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
52-
InternalEditorUtility.expandedProjectWindowItems = (int[])treeViewDataSource.GetType().GetMethod("GetExpandedIDs", MxEditorUtil.INSTANCE_FLAGS).Invoke(treeViewDataSource, null);
52+
InternalEditorUtility.expandedProjectWindowItemIds = (EntityId[])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/Mx.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public abstract class Mx
1616

1717
public const string NAME = "Mx";
1818

19-
public static readonly Version VERSION = new Version("0.1.2");
19+
public static readonly Version VERSION = new Version("0.1.5");
2020

2121
/* Setter & Getter */
2222

@@ -74,8 +74,8 @@ private static void CompletingRead(
7474
}
7575

7676
public static void CompletingRead(
77-
string prompt,
78-
List<string> candidates,
77+
string prompt,
78+
List<string> candidates,
7979
CompletingReadCallback callback,
8080
CompletingReadCallback hover = null,
8181
bool requiredMatch = true)
@@ -130,7 +130,7 @@ public static void ReadNumber(
130130

131131
public static void YesOrNo(string prompt, CompletingReadCallback callback)
132132
{
133-
CompletingRead(prompt, new List<string>() { "Yes", "No"}, callback);
133+
CompletingRead(prompt, new List<string>() { "Yes", "No" }, callback);
134134
}
135135
}
136136
}

‎Assets/Mx/Editor/MxCompletionWindow.cs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -504,7 +504,10 @@ private void CheckScrollToSelected()
504504

505505
if (mSelected >= Mathf.Min(iBase + iButtonCountFloor, mCommandsFilteredCount))
506506
{
507-
mScrollBar = mButtonHeight * (mSelected - iButtonCountFloor + 1);
507+
// The bottom line offset.
508+
const int offset = 0;
509+
510+
mScrollBar = mButtonHeight * (mSelected - iButtonCountFloor + offset);
508511
}
509512
else if (mSelected < iBase)
510513
{

‎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);

‎Packages/manifest.json‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
{
22
"dependencies": {
33
"com.unity.ai.navigation": "2.0.9",
4-
"com.unity.collab-proxy": "2.9.3",
4+
"com.unity.collab-proxy": "2.10.2",
55
"com.unity.ide.rider": "3.0.38",
6-
"com.unity.ide.visualstudio": "2.0.23",
7-
"com.unity.multiplayer.center": "1.0.0",
8-
"com.unity.nuget.newtonsoft-json": "3.2.1",
6+
"com.unity.ide.visualstudio": "2.0.25",
7+
"com.unity.multiplayer.center": "1.0.1",
8+
"com.unity.nuget.newtonsoft-json": "3.2.2",
99
"com.unity.test-framework": "1.6.0",
1010
"com.unity.timeline": "1.8.9",
11-
"com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.10",
11+
"com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.11",
1212
"com.unity.ugui": "2.0.0",
13-
"com.unity.visualscripting": "1.9.7",
13+
"com.unity.visualscripting": "1.9.9",
1414
"com.unity.modules.accessibility": "1.0.0",
15+
"com.unity.modules.adaptiveperformance": "1.0.0",
1516
"com.unity.modules.ai": "1.0.0",
1617
"com.unity.modules.androidjni": "1.0.0",
1718
"com.unity.modules.animation": "1.0.0",
@@ -38,6 +39,7 @@
3839
"com.unity.modules.unitywebrequestaudio": "1.0.0",
3940
"com.unity.modules.unitywebrequesttexture": "1.0.0",
4041
"com.unity.modules.unitywebrequestwww": "1.0.0",
42+
"com.unity.modules.vectorgraphics": "1.0.0",
4143
"com.unity.modules.vehicles": "1.0.0",
4244
"com.unity.modules.video": "1.0.0",
4345
"com.unity.modules.vr": "1.0.0",

‎Packages/packages-lock.json‎

Lines changed: 27 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"url": "https://packages.unity.com"
1111
},
1212
"com.unity.collab-proxy": {
13-
"version": "2.9.3",
13+
"version": "2.10.2",
1414
"depth": 0,
1515
"source": "registry",
1616
"dependencies": {},
@@ -32,38 +32,38 @@
3232
"url": "https://packages.unity.com"
3333
},
3434
"com.unity.ide.visualstudio": {
35-
"version": "2.0.23",
35+
"version": "2.0.25",
3636
"depth": 0,
3737
"source": "registry",
3838
"dependencies": {
39-
"com.unity.test-framework": "1.1.9"
39+
"com.unity.test-framework": "1.1.31"
4040
},
4141
"url": "https://packages.unity.com"
4242
},
4343
"com.unity.multiplayer.center": {
44-
"version": "1.0.0",
44+
"version": "1.0.1",
4545
"depth": 0,
4646
"source": "builtin",
4747
"dependencies": {
4848
"com.unity.modules.uielements": "1.0.0"
4949
}
5050
},
5151
"com.unity.nuget.newtonsoft-json": {
52-
"version": "3.2.1",
52+
"version": "3.2.2",
5353
"depth": 0,
5454
"source": "registry",
5555
"dependencies": {},
5656
"url": "https://packages.unity.com"
5757
},
5858
"com.unity.sysroot": {
59-
"version": "2.0.10",
59+
"version": "2.0.11",
6060
"depth": 1,
6161
"source": "registry",
6262
"dependencies": {},
6363
"url": "https://packages.unity.com"
6464
},
6565
"com.unity.sysroot.linux-x86_64": {
66-
"version": "2.0.9",
66+
"version": "2.0.10",
6767
"depth": 1,
6868
"source": "registry",
6969
"dependencies": {
@@ -94,7 +94,7 @@
9494
"url": "https://packages.unity.com"
9595
},
9696
"com.unity.toolchain.win-x86_64-linux-x86_64": {
97-
"version": "2.0.10",
97+
"version": "2.0.11",
9898
"depth": 0,
9999
"source": "registry",
100100
"dependencies": {
@@ -113,7 +113,7 @@
113113
}
114114
},
115115
"com.unity.visualscripting": {
116-
"version": "1.9.7",
116+
"version": "1.9.9",
117117
"depth": 0,
118118
"source": "registry",
119119
"dependencies": {
@@ -128,6 +128,14 @@
128128
"source": "builtin",
129129
"dependencies": {}
130130
},
131+
"com.unity.modules.adaptiveperformance": {
132+
"version": "1.0.0",
133+
"depth": 0,
134+
"source": "builtin",
135+
"dependencies": {
136+
"com.unity.modules.subsystems": "1.0.0"
137+
}
138+
},
131139
"com.unity.modules.ai": {
132140
"version": "1.0.0",
133141
"depth": 0,
@@ -335,6 +343,16 @@
335343
"com.unity.modules.imageconversion": "1.0.0"
336344
}
337345
},
346+
"com.unity.modules.vectorgraphics": {
347+
"version": "1.0.0",
348+
"depth": 0,
349+
"source": "builtin",
350+
"dependencies": {
351+
"com.unity.modules.uielements": "1.0.0",
352+
"com.unity.modules.imageconversion": "1.0.0",
353+
"com.unity.modules.imgui": "1.0.0"
354+
}
355+
},
338356
"com.unity.modules.vehicles": {
339357
"version": "1.0.0",
340358
"depth": 0,

‎ProjectSettings/Packages/com.unity.dedicated-server/MultiplayerRolesSettings.asset‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &1
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 53
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: 15023, guid: 0000000000000000e000000000000000, type: 0}
13+
m_Name:
14+
m_EditorClassIdentifier: UnityEditor.MultiplayerModule.dll::UnityEditor.Multiplayer.Internal.MultiplayerRolesSettings
15+
m_MultiplayerRoleForClassicProfile:
16+
m_Keys: []
17+
m_Values:

‎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.2.6f2
2-
m_EditorVersionWithRevision: 6000.2.6f2 (4a4dcaec6541)
1+
m_EditorVersion: 6000.3.0f1
2+
m_EditorVersionWithRevision: 6000.3.0f1 (d1870ce95baf)

‎UserSettings/PlayModeUserSettings.asset‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &1
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 53
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: 15050, guid: 0000000000000000e000000000000000, type: 0}
13+
m_Name:
14+
m_EditorClassIdentifier: UnityEditor.PlayModeModule.dll::Unity.PlayMode.Editor.PlayModeUserSettings
15+
m_LastActiveConfiguration: {fileID: 0}

0 commit comments

Comments
 (0)