继续重构调整（UI）

- 引入 UniTask 和异步版本的 UIModule
- 调整 Runtime/UIBase 和 Presentation 下的脚本命名空间到 SepCore.UI
- 将原来的 5 层 UI 迁移到异步实现
- 规范各层的 UI 脚本命名

Assets/GameMain/Scripts/Runtime/UIBase/Base/IUIFormController.cs

@@ -1,9 +1,13 @@
-namespace UI
+using Cysharp.Threading.Tasks;
+
+namespace SepCore.UI
 {
     public interface IUIFormController
     {
-        int? OpenUI(object userData = null);
-        void CloseUI();
+        UniTask<int?> OpenUIAsync(object userData = null, float timeout = 30f);
+
+        UniTask CloseUIAsync(object userData = null, float timeout = 30f);
+
         void BindUseCase(IUIUseCase useCase);
     }
 }

Assets/GameMain/Scripts/Runtime/UIBase/Base/IUIFormController.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 08145adf06b2b2c4b9d61d3ef6d39cfc
+guid: 66fa704224e65f54584adec043702f21
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/GameMain/Scripts/Runtime/UIBase/Base/IUIUseCase.cs

@@ -1,10 +1,6 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-namespace UI
+namespace SepCore.UI
 {
     public interface IUIUseCase
     {
     }
-}
+}

Assets/GameMain/Scripts/Runtime/UIBase/Base/IUIUseCase.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 8b527e4ad6d6207418137211caa179d5
+guid: 277ebfa2eef59b448b093625c15ecaad
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/GameMain/Scripts/Runtime/UIBase/Base/UGuiForm.cs

@@ -1,11 +1,4 @@
-//------------------------------------------------------------
-// Game Framework
-// Copyright © 2013-2021 Jiang Yin. All rights reserved.
-// Homepage: https://gameframework.cn/
-// Feedback: mailto:ellan@gameframework.cn
-//------------------------------------------------------------
-
-using System.Collections;
+using System.Collections;
 using System.Collections.Generic;
 using StarForce;
 using TMPro;
@@ -13,7 +6,7 @@ using UnityEngine;
 using UnityEngine.UI;
 using UnityGameFramework.Runtime;
 
-namespace UI
+namespace SepCore.UI
 {
     public abstract class UGuiForm : UIFormLogic
     {

Assets/GameMain/Scripts/Runtime/UIBase/Base/UGuiGroupHelper.cs

@@ -9,7 +9,7 @@ using UnityEngine;
 using UnityEngine.UI;
 using UnityGameFramework.Runtime;
 
-namespace UI
+namespace SepCore.UI
 {
     /// <summary>
     /// uGUI 界面组辅助器。

Assets/GameMain/Scripts/Runtime/UIBase/Base/UIContext.cs

@@ -1,10 +1,6 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-namespace UI
+namespace SepCore.UI
 {
     public class UIContext
     {
     }
-}
+}

Assets/GameMain/Scripts/Runtime/UIBase/Base/UIContext.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 7ac4a8b30b5b7684ca58f70386314a4b
+guid: aacfc86c69a60264b82af0d0b457eb96
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/GameMain/Scripts/Runtime/UIBase/Base/UIControllerBase.cs

@@ -0,0 +1,112 @@
+using Cysharp.Threading.Tasks;
+using SepCore.Definition;
+using UnityGameFramework.Runtime;
+using UnityGameFramework.Runtime.AsyncTask;
+
+namespace SepCore.UI
+{
+    public abstract class UIControllerBase<TContext, TForm> : IUIFormController
+        where TContext : UIContext
+        where TForm : UGuiForm
+    {
+        private TContext _context;
+        private TForm _form;
+        private int? _formSerialId;
+
+        protected TContext Context => _context;
+
+        protected TForm Form => _form;
+
+        protected abstract UIFormType UIFormType { get; }
+
+        protected abstract void RefreshUI(TForm form, TContext context);
+
+        protected virtual void SubscribeCustomEvents()
+        {
+        }
+
+        protected virtual void UnsubscribeCustomEvents()
+        {
+        }
+
+        protected virtual void CloseLoadedFormDirect(TForm form)
+        {
+            form.Close();
+        }
+
+        protected async UniTask<int?> OpenFormAsync(TContext context, float timeout = 30f)
+        {
+            if (context == null)
+            {
+                Log.Warning("{0}.OpenFormAsync() context is null.", GetType().Name);
+                return null;
+            }
+
+            if (_form != null)
+            {
+                _context = context;
+                RefreshUI(_form, _context);
+                return _formSerialId;
+            }
+
+            _context = context;
+
+            UIForm uiForm = await GameEntry.UI.OpenUIFormAsync(UIFormType, _context, timeout);
+            if (uiForm == null)
+            {
+                Log.Warning("{0}.OpenFormAsync() failed to open form '{1}'.", GetType().Name, UIFormType.ToString());
+                return null;
+            }
+
+            _formSerialId = uiForm.SerialId;
+            _form = uiForm.Logic as TForm;
+            if (_form == null)
+            {
+                Log.Warning("{0} open success but form logic is invalid.", GetType().Name);
+                _context = null;
+                _formSerialId = null;
+                return null;
+            }
+
+            SubscribeCustomEvents();
+            RefreshUI(_form, _context);
+            return _formSerialId;
+        }
+
+        protected virtual async UniTask CloseFormAsync(object userData = null, float timeout = 30f)
+        {
+            UnsubscribeCustomEvents();
+
+            int? serialId = _formSerialId;
+            TForm form = _form;
+
+            _context = null;
+            _form = null;
+            _formSerialId = null;
+
+            if (serialId.HasValue)
+            {
+                if (GameEntry.UI.HasUIForm(serialId.Value))
+                {
+                    await GameEntry.UI.CloseUIFormAsync(serialId.Value, userData, timeout);
+                }
+
+                return;
+            }
+
+            if (form != null)
+            {
+                CloseLoadedFormDirect(form);
+            }
+        }
+
+        public abstract UniTask<int?> OpenUIAsync(object userData = null, float timeout = 30f);
+
+        public virtual UniTask CloseUIAsync(object userData = null, float timeout = 30f)
+        {
+            return CloseFormAsync(userData, timeout);
+        }
+
+        public abstract void BindUseCase(IUIUseCase useCase);
+    }
+}

Assets/GameMain/Scripts/Runtime/UIBase/Base/UIControllerBase.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 7e46538e3d51b6b4ca463fa6080ad335
+guid: d69abc928823685498bed2fd356128be
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/GameMain/Scripts/Runtime/UIBase/Base/UIExtension.cs

@@ -1,14 +1,8 @@
-using GameFramework.DataTable;
-using GameFramework.UI;
-using System.Collections;
-using SepCore.DataTable;
-using SepCore.Definition;
-using CustomUtility;
+using System.Collections;
 using UnityEngine;
 using UnityEngine.UI;
-using UnityGameFramework.Runtime;
 
-namespace UI
+namespace SepCore.UI
 {
     public static class UIExtension
     {
@@ -39,122 +33,5 @@ namespace UI
 
             slider.value = value;
         }
-
-        public static bool HasUIForm(this UIComponent uiComponent, UIFormType uiFormType, string uiGroupName = null)
-        {
-            return uiComponent.HasUIForm((int)uiFormType, uiGroupName);
-        }
-
-        public static bool HasUIForm(this UIComponent uiComponent, int uiFormId, string uiGroupName = null)
-        {
-            IDataTable<DRUIForm> dtUIForm = GameEntry.DataTable.GetDataTable<DRUIForm>();
-            DRUIForm drUIForm = dtUIForm.GetDataRow(uiFormId);
-            if (drUIForm == null)
-            {
-                return false;
-            }
-
-            string assetName = AssetUtility.GetUIFormAsset(drUIForm.AssetName);
-            if (string.IsNullOrEmpty(uiGroupName))
-            {
-                return uiComponent.HasUIForm(assetName);
-            }
-
-            IUIGroup uiGroup = uiComponent.GetUIGroup(uiGroupName);
-            if (uiGroup == null)
-            {
-                return false;
-            }
-
-            return uiGroup.HasUIForm(assetName);
-        }
-
-        public static UGuiForm GetUIForm(this UIComponent uiComponent, UIFormType uiFormType, string uiGroupName = null)
-        {
-            return uiComponent.GetUIForm((int)uiFormType, uiGroupName);
-        }
-
-        public static UGuiForm GetUIForm(this UIComponent uiComponent, int uiFormId, string uiGroupName = null)
-        {
-            IDataTable<DRUIForm> dtUIForm = GameEntry.DataTable.GetDataTable<DRUIForm>();
-            DRUIForm drUIForm = dtUIForm.GetDataRow(uiFormId);
-            if (drUIForm == null)
-            {
-                return null;
-            }
-
-            string assetName = AssetUtility.GetUIFormAsset(drUIForm.AssetName);
-            UIForm uiForm = null;
-            if (string.IsNullOrEmpty(uiGroupName))
-            {
-                uiForm = uiComponent.GetUIForm(assetName);
-                if (uiForm == null)
-                {
-                    return null;
-                }
-
-                return (UGuiForm)uiForm.Logic;
-            }
-
-            IUIGroup uiGroup = uiComponent.GetUIGroup(uiGroupName);
-            if (uiGroup == null)
-            {
-                return null;
-            }
-
-            uiForm = (UIForm)uiGroup.GetUIForm(assetName);
-            if (uiForm == null)
-            {
-                return null;
-            }
-
-            return (UGuiForm)uiForm.Logic;
-        }
-
-        public static void CloseUIForm(this UIComponent uiComponent, UGuiForm uiForm)
-        {
-            uiComponent.CloseUIForm(uiForm.UIForm);
-        }
-
-        public static int? OpenUIForm(this UIComponent uiComponent, UIFormType uiFormType, object userData = null)
-        {
-            return uiComponent.OpenUIForm((int)uiFormType, userData);
-        }
-
-        public static int? OpenUIForm(this UIComponent uiComponent, int uiFormId, object userData = null)
-        {
-            IDataTable<DRUIForm> dtUIForm = GameEntry.DataTable.GetDataTable<DRUIForm>();
-            DRUIForm drUIForm = dtUIForm.GetDataRow(uiFormId);
-            if (drUIForm == null)
-            {
-                Log.Warning("Can not load UI form '{0}' from data table.", uiFormId.ToString());
-                return null;
-            }
-
-            string assetName = AssetUtility.GetUIFormAsset(drUIForm.AssetName);
-            if (!drUIForm.AllowMultiInstance)
-            {
-                if (uiComponent.IsLoadingUIForm(assetName))
-                {
-                    return null;
-                }
-
-                if (uiComponent.HasUIForm(assetName))
-                {
-                    return null;
-                }
-            }
-
-            return uiComponent.OpenUIForm(assetName, drUIForm.UIGroupName, Constant.AssetPriority.UIFormAsset, drUIForm.PauseCoveredUIForm, userData);
-        }
-
-        private static void OpenNativeDialog(DialogFormRawData rawData)
-        {
-            // TODO：这里应该弹出原生对话框，先简化实现为直接按确认按钮
-            if (rawData != null && rawData.OnClickConfirm != null)
-            {
-                rawData.OnClickConfirm(rawData.UserData);
-            }
-        }
     }
 }

Assets/GameMain/Scripts/Runtime/UIBase/Base/UIFormControllerBase.cs

@@ -1,10 +0,0 @@
-namespace UI
-{
-    public abstract class UIFormControllerBase<TContext> : IUIFormController where TContext : UIContext
-    {
-        protected abstract int? OpenUIInternal(TContext context);
-        public abstract int? OpenUI(object userData = null);
-        public abstract void CloseUI();
-        public abstract void BindUseCase(IUIUseCase useCase);
-    }
-}

Assets/GameMain/Scripts/Runtime/UIBase/Base/UIFormControllerBase.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 692b282b1ecbf5a44839d5bf4a03a937
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/GameMain/Scripts/Runtime/UIBase/Base/UIFormControllerCommonBase.cs

@@ -1,183 +0,0 @@
-using SepCore.Definition;
-using GameFramework.Event;
-using UnityGameFramework.Runtime;
-
-namespace UI
-{
-    public abstract class UIFormControllerCommonBase<TContext, TForm> : UIFormControllerBase<TContext>
-        where TContext : UIContext
-        where TForm : UGuiForm
-    {
-        private TContext _context;
-        private TForm _form;
-        private int? _formSerialId;
-        private bool _pendingRefresh;
-        private bool _isBindEvent;
-
-        protected TContext Context => _context;
-
-        protected TForm Form => _form;
-
-        protected int? FormSerialId => _formSerialId;
-
-        protected abstract UIFormType UIFormTypeId { get; }
-
-        protected abstract void RefreshUI(TForm form, TContext context);
-
-        protected virtual void SubscribeCustomEvents()
-        {
-        }
-
-        protected virtual void UnsubscribeCustomEvents()
-        {
-        }
-
-        protected virtual void CloseLoadedFormDirect(TForm form)
-        {
-            form.Close();
-        }
-
-        protected void SetContext(TContext context)
-        {
-            _context = context;
-        }
-
-        protected void RefreshCurrentUI()
-        {
-            if (_context == null)
-            {
-                return;
-            }
-
-            if (_form == null)
-            {
-                _pendingRefresh = true;
-                return;
-            }
-
-            RefreshUI(_form, _context);
-            _pendingRefresh = false;
-        }
-
-        protected override int? OpenUIInternal(TContext context)
-        {
-            if (context == null)
-            {
-                Log.Warning("{0}.OpenUI() context is null.", GetType().Name);
-                return null;
-            }
-
-            _context = context;
-
-            if (_form != null && _formSerialId.HasValue && GameEntry.UI.HasUIForm(_formSerialId.Value))
-            {
-                RefreshUI(_form, _context);
-                return _formSerialId;
-            }
-
-            CloseUI();
-            _pendingRefresh = true;
-            SubscribeEvents();
-            _formSerialId = GameEntry.UI.OpenUIForm(UIFormTypeId, _context);
-            return _formSerialId;
-        }
-
-        public override void CloseUI()
-        {
-            _pendingRefresh = false;
-            UnsubscribeEvents();
-
-            if (_formSerialId.HasValue)
-            {
-                if (GameEntry.UI.HasUIForm(_formSerialId.Value))
-                {
-                    GameEntry.UI.CloseUIForm(_formSerialId.Value);
-                }
-
-                _form = null;
-                _formSerialId = null;
-                return;
-            }
-
-            if (_form != null)
-            {
-                CloseLoadedFormDirect(_form);
-                _form = null;
-            }
-        }
-
-        private void SubscribeEvents()
-        {
-            if (_isBindEvent)
-            {
-                return;
-            }
-
-            GameEntry.Event.Subscribe(OpenUIFormSuccessEventArgs.EventId, OpenUIFormSuccess);
-            GameEntry.Event.Subscribe(CloseUIFormCompleteEventArgs.EventId, CloseUIFormComplete);
-            SubscribeCustomEvents();
-
-            _isBindEvent = true;
-        }
-
-        private void UnsubscribeEvents()
-        {
-            if (!_isBindEvent)
-            {
-                return;
-            }
-
-            GameEntry.Event.Unsubscribe(OpenUIFormSuccessEventArgs.EventId, OpenUIFormSuccess);
-            GameEntry.Event.Unsubscribe(CloseUIFormCompleteEventArgs.EventId, CloseUIFormComplete);
-            UnsubscribeCustomEvents();
-
-            _isBindEvent = false;
-        }
-
-        private void OpenUIFormSuccess(object sender, GameEventArgs e)
-        {
-            if (!(e is OpenUIFormSuccessEventArgs args))
-            {
-                return;
-            }
-
-            if (!_formSerialId.HasValue)
-            {
-                return;
-            }
-
-            if (args.UIForm == null || args.UIForm.SerialId != _formSerialId.Value || args.UserData != _context)
-            {
-                return;
-            }
-
-            _form = args.UIForm.Logic as TForm;
-            if (_form == null)
-            {
-                Log.Warning("{0} open success but form logic is invalid.", GetType().Name);
-                return;
-            }
-
-            if (_pendingRefresh)
-            {
-                RefreshCurrentUI();
-            }
-        }
-
-        private void CloseUIFormComplete(object sender, GameEventArgs e)
-        {
-            if (!(e is CloseUIFormCompleteEventArgs args))
-            {
-                return;
-            }
-
-            if (args.SerialId != _formSerialId)
-            {
-                return;
-            }
-
-            _form = null;
-            _formSerialId = null;
-        }
-    }
-}

Assets/GameMain/Scripts/Runtime/UIBase/Base/UIFormControllerCommonBase.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 696c0314286f89c4082c2aa2eddaec2d
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/GameMain/Scripts/Runtime/UIBase/Base/UIFormControllerTemplate.cs

@@ -1,44 +0,0 @@
-using SepCore.Definition;
-using UnityGameFramework.Runtime;
-
-namespace UI
-{
-    public class TUIFormController : UIFormControllerCommonBase<UIContext, TUIForm>
-    {
-        private IUIUseCase _useCase;
-
-        protected override UIFormType UIFormTypeId => UIFormType.TUIForm;
-
-        protected override void RefreshUI(TUIForm form, UIContext context)
-        {
-            form.RefreshUI(context);
-        }
-
-        public override int? OpenUI(object userData = null)
-        {
-            if (userData is UIContext context)
-            {
-                return OpenUIInternal(context);
-            }
-
-            if (userData != null)
-            {
-                Log.Warning("TUIFormController.OpenUI() userData type is invalid.");
-                return null;
-            }
-
-            return OpenUIInternal(Context);
-        }
-
-        public override void BindUseCase(IUIUseCase useCase)
-        {
-            if (!(useCase is IUIUseCase uiFormUseCase))
-            {
-                Log.Error("LevelUpForm.BindUseCase() useCase is invalid.");
-                return;
-            }
-
-            _useCase = uiFormUseCase;
-        }
-    }
-}

Assets/GameMain/Scripts/Runtime/UIBase/Base/UIFormTemplate.cs

@@ -1,27 +0,0 @@
-using UnityEngine;
-using UnityGameFramework.Runtime;
-
-namespace UI
-{
-    public class TUIForm : UGuiForm
-    {
-
-        public void RefreshUI(UIContext context)
-        {
-	    
-        }
-
-        protected override void OnOpen(object userData)
-        {
-            base.OnOpen(userData);
-
-            if (!(userData is UIContext context))
-            {
-                Log.Error("UIContext is invalid.");
-                return;
-            }
-
-            RefreshUI(context);
-        }
-    }
-}

Assets/GameMain/Scripts/Runtime/UIBase/Base/UIFormTemplate.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: e8bc5e59a2be3094798c8c46d1a4999f
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/GameMain/Scripts/Runtime/UIBase/Common/CommonButton.cs

@@ -1,15 +1,8 @@
-//------------------------------------------------------------
-// Game Framework
-// Copyright © 2013-2021 Jiang Yin. All rights reserved.
-// Homepage: https://gameframework.cn/
-// Feedback: mailto:ellan@gameframework.cn
-//------------------------------------------------------------
-
-using UnityEngine;
+using UnityEngine;
 using UnityEngine.Events;
 using UnityEngine.EventSystems;
 
-namespace UI
+namespace SepCore.UI
 {
     public class CommonButton : MonoBehaviour, IPointerEnterHandler, IPointerDownHandler, IPointerExitHandler,
         IPointerUpHandler
@@ -85,4 +78,4 @@ namespace UI
             _onPointerExitAction.Invoke();
         }
     }
-}
+}

Assets/GameMain/Scripts/Runtime/UIBase/Common/DialogForm/DialogFormRawData.cs

@@ -1,109 +0,0 @@
-using GameFramework;
-
-namespace UI
-{
-    /// <summary>
-    /// 对话框显示数据。
-    /// </summary>
-    public class DialogFormRawData
-    {
-        /// <summary>
-        /// 模式，即按钮数量。取值 1、2、3。
-        /// </summary>
-        public int Mode
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// 标题。
-        /// </summary>
-        public string Title
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// 消息内容。
-        /// </summary>
-        public string Message
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// 弹出窗口时是否暂停游戏。
-        /// </summary>
-        public bool PauseGame
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// 确认按钮文本。
-        /// </summary>
-        public string ConfirmText
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// 确定按钮回调。
-        /// </summary>
-        public GameFrameworkAction<object> OnClickConfirm
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// 取消按钮文本。
-        /// </summary>
-        public string CancelText
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// 取消按钮回调。
-        /// </summary>
-        public GameFrameworkAction<object> OnClickCancel
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// 中立按钮文本。
-        /// </summary>
-        public string OtherText
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// 其它按钮回调。
-        /// </summary>
-        public GameFrameworkAction<object> OnClickOther
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// 用户自定义数据。
-        /// </summary>
-        public object UserData
-        {
-            get;
-            set;
-        }
-    }
-}

Assets/GameMain/Scripts/Runtime/UIBase/Common/DialogForm/DialogRawData.cs

@@ -0,0 +1,65 @@
+using GameFramework;
+
+namespace SepCore.UI
+{
+    /// <summary>
+    /// 对话框显示数据。
+    /// </summary>
+    public class DialogRawData
+    {
+        /// <summary>
+        /// 模式，即按钮数量。取值 1、2、3。
+        /// </summary>
+        public int Mode { get; set; }
+
+        /// <summary>
+        /// 标题。
+        /// </summary>
+        public string Title { get; set; }
+
+        /// <summary>
+        /// 消息内容。
+        /// </summary>
+        public string Message { get; set; }
+
+        /// <summary>
+        /// 弹出窗口时是否暂停游戏。
+        /// </summary>
+        public bool PauseGame { get; set; }
+
+        /// <summary>
+        /// 确认按钮文本。
+        /// </summary>
+        public string ConfirmText { get; set; }
+
+        /// <summary>
+        /// 确定按钮回调。
+        /// </summary>
+        public GameFrameworkAction<object> OnClickConfirm { get; set; }
+
+        /// <summary>
+        /// 取消按钮文本。
+        /// </summary>
+        public string CancelText { get; set; }
+
+        /// <summary>
+        /// 取消按钮回调。
+        /// </summary>
+        public GameFrameworkAction<object> OnClickCancel { get; set; }
+
+        /// <summary>
+        /// 中立按钮文本。
+        /// </summary>
+        public string OtherText { get; set; }
+
+        /// <summary>
+        /// 其它按钮回调。
+        /// </summary>
+        public GameFrameworkAction<object> OnClickOther { get; set; }
+
+        /// <summary>
+        /// 用户自定义数据。
+        /// </summary>
+        public object UserData { get; set; }
+    }
+}

Assets/GameMain/Scripts/Runtime/UIBase/Common/DialogForm/DialogRawData.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: ad9ca3c36c52b0a4e8b25c8b451966da
+guid: 1f7f875b57135c5438301146eb0f3713
 timeCreated: 1528026160
 licenseType: Pro
 MonoImporter:

Assets/GameMain/Scripts/Runtime/UIBase/Common/RawData/RoleItemRawData.cs

@@ -1,4 +1,4 @@
-namespace UI
+namespace SepCore.UI
 {
     public class RoleItemRawData
     {

Assets/GameMain/Scripts/Runtime/UIBase/Common/RawData/RolePropertyAreaRawData.cs

@@ -1,4 +1,4 @@
-namespace UI
+namespace SepCore.UI
 {
     public class RolePropertyAreaRawData
     {

Assets/GameMain/Scripts/Runtime/UIBase/Main/DisplayItemInfo/DisplayItemInfoRawData.cs

@@ -1,11 +1,9 @@
-using System.Collections;
-using System.Collections.Generic;
 using SepCore.Definition;
 using UnityEngine;
 
-namespace UI
+namespace SepCore.UI
 {
-    public class DisplayItemInfoFormRawData
+    public class DisplayItemInfoRawData
     {
         public int Index;
         public string IconAssetName;
@@ -17,4 +15,4 @@ namespace UI
         public bool IsWeapon;
         public Vector3 TargetPos;
     }
-}
+}

Assets/GameMain/Scripts/Runtime/UIBase/Main/DisplayItemInfo/DisplayItemInfoUseCase.cs

@@ -3,20 +3,20 @@ using Entity;
 using CustomUtility;
 using Entity.Weapon;
 
-namespace UI
+namespace SepCore.UI
 {
-    public class DisplayItemInfoFormUseCase : IUIUseCase
+    public class DisplayItemInfoUseCase : IUIUseCase
     {
         private readonly Player _player;
 
         private Player Player => _player;
 
-        public DisplayItemInfoFormUseCase(Player player)
+        public DisplayItemInfoUseCase(Player player)
         {
             _player = player;
         }
 
-        public DisplayItemInfoFormRawData CreateModel(int index, bool isWeapon)
+        public DisplayItemInfoRawData CreateModel(int index, bool isWeapon)
         {
             if (index < 0 || Player == null)
             {
@@ -37,7 +37,7 @@ namespace UI
                     return null;
                 }
 
-                return new DisplayItemInfoFormRawData
+                return new DisplayItemInfoRawData
                 {
                     IconAssetName = weapon.WeaponData.IconAssetName,
                     Title = weapon.WeaponData.Title,
@@ -60,7 +60,7 @@ namespace UI
                 return null;
             }
 
-            return new DisplayItemInfoFormRawData
+            return new DisplayItemInfoRawData
             {
                 IconAssetName = prop.IconAssetName,
                 Title = prop.Title,

Assets/GameMain/Scripts/Runtime/UIBase/Main/LevelUp/LevelUpRawData.cs

@@ -1,11 +1,11 @@
 using System.Collections.Generic;
 using SepCore.DataTable;
 
-namespace UI
+namespace SepCore.UI
 {
-    public class LevelUpFormRawData
+    public class LevelUpRawData
     {
         public List<DRLevelUpReward> Rewards;
         public int RefreshPrice;
     }
-}
+}

Assets/GameMain/Scripts/Runtime/UIBase/Main/LevelUp/LevelUpUseCase.cs

@@ -9,9 +9,9 @@ using UnityGameFramework.Runtime;
 using CustomUtility;
 using GameFramework.DataTable;
 
-namespace UI
+namespace SepCore.UI
 {
-    public class LevelUpFormUseCase : IUIUseCase
+    public class LevelUpUseCase : IUIUseCase
     {
         private const int BaseRefreshPrice = 2;
         private readonly Action _onCompleted;
@@ -21,11 +21,11 @@ namespace UI
         private readonly List<DRLevelUpReward> _validRewards = new();
 
         private int _refreshCount;
-        private LevelUpFormRawData _currentModel;
+        private LevelUpRawData _currentModel;
 
         private readonly Player _player;
 
-        public LevelUpFormUseCase(Player player, Action onCompleted)
+        public LevelUpUseCase(Player player, Action onCompleted)
         {
             _player = player;
             _onCompleted = onCompleted;
@@ -35,7 +35,7 @@ namespace UI
             BuildRewardRarityPools();
         }
 
-        public LevelUpFormRawData CreateInitialModel(int count = 4)
+        public LevelUpRawData CreateInitialModel(int count = 4)
         {
             _refreshCount = 0;
 
@@ -49,7 +49,7 @@ namespace UI
             return _currentModel;
         }
 
-        public LevelUpFormRawData TryRefresh(int refreshCost, int count = 4)
+        public LevelUpRawData TryRefresh(int refreshCost, int count = 4)
         {
             if (_currentModel == null)
             {
@@ -68,7 +68,7 @@ namespace UI
             return _currentModel;
         }
 
-        public LevelUpFormRawData SelectReward(int selectedIndex, int count = 4)
+        public LevelUpRawData SelectReward(int selectedIndex, int count = 4)
         {
             if (_currentModel?.Rewards == null)
             {
@@ -95,7 +95,7 @@ namespace UI
             return null;
         }
 
-        private LevelUpFormRawData BuildModel(int refreshPrice, int count)
+        private LevelUpRawData BuildModel(int refreshPrice, int count)
         {
             if (_allRewards == null || _allRewards.Length == 0)
             {
@@ -120,7 +120,7 @@ namespace UI
                 selections.Add(reward);
             }
 
-            return new LevelUpFormRawData
+            return new LevelUpRawData
             {
                 Rewards = selections,
                 RefreshPrice = refreshPrice

Assets/GameMain/Scripts/Runtime/UIBase/Main/RawData/DisplayItemRawData.cs

@@ -1,6 +1,6 @@
 using SepCore.Definition;
 
-namespace UI
+namespace SepCore.UI
 {
     public class DisplayItemRawData
     {

Assets/GameMain/Scripts/Runtime/UIBase/Main/RawData/DisplayListAreaRawData.cs

@@ -2,7 +2,7 @@ using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 
-namespace UI
+namespace SepCore.UI
 {
     public class DisplayListAreaRawData
     {

Assets/GameMain/Scripts/Runtime/UIBase/Main/RawData/GoodsItemRawData.cs

@@ -1,7 +1,7 @@
 using SepCore.Definition;
 using UnityEngine;
 
-namespace UI
+namespace SepCore.UI
 {
     public class GoodsItemRawData
     {

Assets/GameMain/Scripts/Runtime/UIBase/Main/RawData/LevelUpRewardItemRawData.cs

@@ -1,7 +1,7 @@
 using SepCore.Definition;
 using UnityEngine;
 
-namespace UI
+namespace SepCore.UI
 {
     public class LevelUpRewardItemRawData
     {

Assets/GameMain/Scripts/Runtime/UIBase/Main/Shop/ShopRawData.cs

@@ -2,9 +2,9 @@ using System.Collections.Generic;
 using SepCore.Definition;
 using Entity.Weapon;
 
-namespace UI
+namespace SepCore.UI
 {
-    public class ShopFormRawData
+    public class ShopRawData
     {
         public int CurrentLevel;
         public int RefreshPrice;

Assets/GameMain/Scripts/Runtime/UIBase/Main/Shop/ShopUseCase.cs

@@ -11,7 +11,7 @@ using UnityEngine;
 using UnityGameFramework.Runtime;
 using Random = UnityEngine.Random;
 
-namespace UI
+namespace SepCore.UI
 {
     public sealed class ShopRefreshResult
     {
@@ -25,7 +25,7 @@ namespace UI
         public DisplayItemRawData DisplayItem;
     }
 
-    public class ShopFormUseCase : IUIUseCase
+    public class ShopUseCase : IUIUseCase
     {
         private readonly Player _player;
         private readonly int _currentLevel;
@@ -51,7 +51,7 @@ namespace UI
             public int Price;
         }
 
-        public ShopFormUseCase(Player player, int currentLevel, Action onShopFinish)
+        public ShopUseCase(Player player, int currentLevel, Action onShopFinish)
         {
             _player = player;
             _currentLevel = currentLevel;
@@ -64,7 +64,7 @@ namespace UI
             BuildGoodsRarityPools();
         }
 
-        public ShopFormRawData CreateInitialModel()
+        public ShopRawData CreateInitialModel()
         {
             _refreshTime = 0;
 
@@ -75,7 +75,7 @@ namespace UI
             }
 
             int currentLevel = _currentLevel;
-            return new ShopFormRawData
+            return new ShopRawData
             {
                 CurrentLevel = currentLevel,
                 RefreshPrice = currentLevel,

Assets/GameMain/Scripts/Runtime/UIBase/Menu/SelectRoleForm/SelectRoleRawData.cs

@@ -1,6 +1,6 @@
-namespace UI
+namespace SepCore.UI
 {
-    public class SelectRoleFormRawData
+    public class SelectRoleRawData
     {
         public int[] RoleIds;
         public string[] RoleIconNames;

Assets/GameMain/Scripts/Runtime/UIBase/Menu/SelectRoleForm/SelectRoleUseCase.cs

@@ -4,9 +4,9 @@ using SepCore.DataTable;
 using GameFramework.DataTable;
 using Random = UnityEngine.Random;
 
-namespace UI
+namespace SepCore.UI
 {
-    public class SelectRoleFormUseCase : IUIUseCase
+    public class SelectRoleUseCase : IUIUseCase
     {
         private readonly IDataTable<DRRole> _roleDataTable;
 
@@ -14,18 +14,18 @@ namespace UI
 
         public int SelectedRoleId { get; private set; }
 
-        public SelectRoleFormUseCase(Action<int> onStartGame)
+        public SelectRoleUseCase(Action<int> onStartGame)
         {
             _onStartGame = onStartGame;
             _roleDataTable = GameEntry.DataTable.GetDataTable<DRRole>();
         }
 
-        public SelectRoleFormRawData CreateModel()
+        public SelectRoleRawData CreateModel()
         {
             return BuildModel(0);
         }
 
-        public SelectRoleFormRawData SelectRole(int roleId)
+        public SelectRoleRawData SelectRole(int roleId)
         {
             SelectedRoleId = roleId;
             return BuildModel(roleId);
@@ -54,7 +54,7 @@ namespace UI
             return result;
         }
 
-        private SelectRoleFormRawData BuildModel(int selectedRoleId)
+        private SelectRoleRawData BuildModel(int selectedRoleId)
         {
             DRRole[] roles = _roleDataTable.GetAllDataRows();
             int count = _roleDataTable.Count;
@@ -67,7 +67,7 @@ namespace UI
             }
 
             DRRole selectedRole = selectedRoleId > 0 ? _roleDataTable.GetDataRow(selectedRoleId) : null;
-            return new SelectRoleFormRawData
+            return new SelectRoleRawData
             {
                 RoleIds = roleIds,
                 RoleIconNames = iconNames,

Assets/GameMain/Scripts/Runtime/UIBase/Menu/StartMenuForm/MenuRawData.cs

@@ -0,0 +1,7 @@
+namespace SepCore.UI
+{
+    public class MenuRawData
+    {
+        
+    }
+}

Assets/GameMain/Scripts/Runtime/UIBase/Menu/StartMenuForm/StartMenuFormRawData.cs

@@ -1,7 +0,0 @@
-namespace UI
-{
-    public class StartMenuFormRawData
-    {
-        
-    }
-}