Skip to content

Commit cce5666

Browse files
authored
fix GenericMenuPopup on Mac M1 (#175)
* fix GenericMenuPopup on Mac M1 * update version of package.
1 parent 148fff8 commit cce5666

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

Packages/essential/Dependencies/Nuwa/Core/Editor/GenericMenuPopup.cs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -477,8 +477,9 @@ public static MenuItemNode GenerateMenuItemNodeTree(GenericMenu p_menu)
477477
if (p_menu == null)
478478
return rootNode;
479479

480-
var menuItemsField = p_menu.GetType().GetField("menuItems", BindingFlags.Instance | BindingFlags.NonPublic);
481-
var menuItems = menuItemsField.GetValue(p_menu) as ArrayList;
480+
var menuItemsField = TryGetField("menuItems");
481+
if (menuItemsField == null) menuItemsField = TryGetField("m_MenuItems");
482+
var menuItems = menuItemsField.GetValue(p_menu) as IEnumerable;
482483

483484
foreach (var menuItem in menuItems)
484485
{
@@ -511,6 +512,11 @@ public static MenuItemNode GenerateMenuItemNodeTree(GenericMenu p_menu)
511512
}
512513

513514
return rootNode;
515+
516+
FieldInfo TryGetField(string fieldName)
517+
{
518+
return p_menu.GetType().GetField(fieldName, BindingFlags.Instance | BindingFlags.NonPublic);
519+
}
514520
}
515521

516522
public override void OnOpen()

Packages/essential/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "com.quabug.entities-bt.essential",
33
"description": "Behavior Tree for Unity Entities - Essential",
4-
"version": "1.3.0",
4+
"version": "1.3.1",
55
"unity": "2020.2",
66
"displayName": "EntitiesBT - Essential",
77
"dependencies": {

0 commit comments

Comments
 (0)