Merge branch 'GameFrameX:main' into main

Author: BrokenMyth

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [2.1.0](https://github.com/GameFrameX/com.gameframex.unity.ui.fairygui/tree/2.1.0) (2025-09-17)
+
+[Full Changelog](https://github.com/GameFrameX/com.gameframex.unity.ui.fairygui/compare/2.0.0...2.1.0)
+
+**Merged pull requests:**
+
+- \[修改\] RemovePackage 时如果只有描述文件,没有资源文件，报 can not be null [\#1](https://github.com/GameFrameX/com.gameframex.unity.ui.fairygui/pull/1) ([DreamChaseAndVera](https://github.com/DreamChaseAndVera))
+
 ## [2.0.0](https://github.com/GameFrameX/com.gameframex.unity.ui.fairygui/tree/2.0.0) (2025-06-12)
 
 [Full Changelog](https://github.com/GameFrameX/com.gameframex.unity.ui.fairygui/compare/1.2.6...2.0.0)

Runtime/FairyGUIFormHelper.cs

@@ -6,6 +6,7 @@
 //------------------------------------------------------------
 
 using System;
+using System.Reflection;
 using FairyGUI;
 using GameFrameX.Asset.Runtime;
 using GameFrameX.Runtime;
@@ -21,6 +22,7 @@ namespace GameFrameX.UI.FairyGUI.Runtime
     public class FairyGUIFormHelper : UIFormHelperBase
     {
         private AssetComponent m_AssetComponent = null;
+        private UIComponent m_UIComponent = null;
 
         /// <summary>
         /// 实例化界面。
@@ -39,7 +41,6 @@ public override object InstantiateUIForm(object uiFormAsset)
         /// 创建界面。
         /// </summary>
         /// <param name="uiFormInstance">界面实例。</param>
-        /// <param name="uiGroup">界面所属的界面组。</param>
         /// <param name="uiFormType">界面逻辑类型</param>
         /// <param name="userData">用户自定义数据。</param>
         /// <returns>界面。</returns>
@@ -67,6 +68,15 @@ public override IUIForm CreateUIForm(object uiFormInstance, Type uiFormType, obj
 
             var uiGroup = uiForm.UIGroup;
 
+            if (uiGroup == null)
+            {
+                var attribute = uiFormType.GetCustomAttribute(typeof(OptionUIGroup));
+                if (attribute is OptionUIGroup optionUIGroup)
+                {
+                    uiGroup = m_UIComponent.GetUIGroup(optionUIGroup.GroupName);
+                }
+            }
+
             if (uiGroup == null)
             {
                 Log.Error("UI group is invalid.");
@@ -110,14 +120,21 @@ public override void ReleaseUIForm(object uiFormAsset, object uiFormInstance)
             }
         }
 
-        private void Start()
+        private void Awake()
         {
             m_AssetComponent = GameEntry.GetComponent<AssetComponent>();
             if (m_AssetComponent == null)
             {
                 Log.Fatal("Asset component is invalid.");
                 return;
             }
+
+            m_UIComponent = GameEntry.GetComponent<UIComponent>();
+            if (m_UIComponent == null)
+            {
+                Log.Fatal("UI component is invalid.");
+                return;
+            }
         }
     }
 }

Runtime/FairyGUILoadAsyncResourceHelper.cs

@@ -23,7 +23,11 @@ public void ReleasePackage(string uiPackageName)
             if (m_UIPackages.TryGetValue(uiPackageName, out var uiPackageData))
             {
                 AssetComponent.UnloadAsset(uiPackageData.DefiledAssetPath);
-                AssetComponent.UnloadAsset(uiPackageData.ResourceAssetPath);
+                if (uiPackageData.ResourceAssetPath != null)
+                {
+                    AssetComponent.UnloadAsset(uiPackageData.ResourceAssetPath);
+                }
+
                 uiPackageData.Dispose();
                 m_UIPackages.Remove(uiPackageName);
             }

Runtime/UIManager.Open.cs

@@ -107,6 +107,14 @@ private IUIForm InternalOpenUIForm(int serialId, string uiFormAssetName, Type ui
                 }
 
                 var uiGroup = uiForm.UIGroup;
+                if (serialId < 0)
+                {
+                    if (m_UIFormsToReleaseOnLoad.Contains(uiForm.SerialId))
+                    {
+                        m_UIFormsToReleaseOnLoad.Remove(uiForm.SerialId);
+                    }
+                }
+
                 uiForm.Init(serialId, uiFormAssetName, uiGroup, OnInitAction, pauseCoveredUIForm, isNewInstance, userData, isFullScreen);
 
                 void OnInitAction(IUIForm obj)

package.json

@@ -3,7 +3,7 @@
   "displayName": "Game Frame X UI FairyGUI",
   "category": "Game Framework X",
   "description": "独立游戏前后端一体化解决方案,独立游戏开发者的圆梦大使。\n文档地址: https://gameframex.doc.alianblank.com \n Game Frame X UI FairyGUI组件 - Unity UI功能包，提供FairyGUI组件的封装，使FairyGUI组件的使用更加简单高效。",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "unity": "2019.4",
   "keywords": [
     "Game Framework X"