From b0afa639a3d3074aca41912fa749b94d2e3a3be5 Mon Sep 17 00:00:00 2001 From: quabug Date: Thu, 7 Oct 2021 16:58:07 +0800 Subject: [PATCH 1/2] fix GenericMenuPopup on Mac M1 --- .../Dependencies/Nuwa/Core/Editor/GenericMenuPopup.cs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Packages/essential/Dependencies/Nuwa/Core/Editor/GenericMenuPopup.cs b/Packages/essential/Dependencies/Nuwa/Core/Editor/GenericMenuPopup.cs index 7688f368..d6dd3fc5 100644 --- a/Packages/essential/Dependencies/Nuwa/Core/Editor/GenericMenuPopup.cs +++ b/Packages/essential/Dependencies/Nuwa/Core/Editor/GenericMenuPopup.cs @@ -477,8 +477,9 @@ public static MenuItemNode GenerateMenuItemNodeTree(GenericMenu p_menu) if (p_menu == null) return rootNode; - var menuItemsField = p_menu.GetType().GetField("menuItems", BindingFlags.Instance | BindingFlags.NonPublic); - var menuItems = menuItemsField.GetValue(p_menu) as ArrayList; + var menuItemsField = TryGetField("menuItems"); + if (menuItemsField == null) menuItemsField = TryGetField("m_MenuItems"); + var menuItems = menuItemsField.GetValue(p_menu) as IEnumerable; foreach (var menuItem in menuItems) { @@ -511,6 +512,11 @@ public static MenuItemNode GenerateMenuItemNodeTree(GenericMenu p_menu) } return rootNode; + + FieldInfo TryGetField(string fieldName) + { + return p_menu.GetType().GetField(fieldName, BindingFlags.Instance | BindingFlags.NonPublic); + } } public override void OnOpen() From dc2dcba4d1c466aed5cb0a7cf3cc8c10bd8b6db2 Mon Sep 17 00:00:00 2001 From: quabug Date: Tue, 7 Dec 2021 12:20:52 +0800 Subject: [PATCH 2/2] update version of package. --- Packages/essential/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Packages/essential/package.json b/Packages/essential/package.json index a10db0cb..9d266e14 100644 --- a/Packages/essential/package.json +++ b/Packages/essential/package.json @@ -1,7 +1,7 @@ { "name": "com.quabug.entities-bt.essential", "description": "Behavior Tree for Unity Entities - Essential", - "version": "1.3.0", + "version": "1.3.1", "unity": "2020.2", "displayName": "EntitiesBT - Essential", "dependencies": {