From 4075588c3412e596dc0c35d7e3b67a0e175c9634 Mon Sep 17 00:00:00 2001
From: feng <admin@6ag.cn>
Date: Mon, 16 Dec 2024 22:36:26 +0800
Subject: [PATCH] =?UTF-8?q?UIWindow=E6=96=B0=E5=A2=9EHide=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=EF=BC=8C=E5=B0=86UIWindow=E4=B8=AD=E7=9A=84UserData?=
 =?UTF-8?q?=E5=92=8CUserDatas=E5=B1=9E=E6=80=A7=E7=A7=BB=E5=8A=A8=E5=88=B0?=
 =?UTF-8?q?UIBase?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Runtime/Modules/UIModule/UIBase.cs        | 23 +++++++++++++++
 .../Runtime/Modules/UIModule/UIWindow.cs      | 28 ++++---------------
 2 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/UnityProject/Assets/TEngine/Runtime/Modules/UIModule/UIBase.cs b/UnityProject/Assets/TEngine/Runtime/Modules/UIModule/UIBase.cs
index 3459a460..3fb3822d 100644
--- a/UnityProject/Assets/TEngine/Runtime/Modules/UIModule/UIBase.cs
+++ b/UnityProject/Assets/TEngine/Runtime/Modules/UIModule/UIBase.cs
@@ -45,6 +45,29 @@ namespace TEngine
         /// 自定义数据集。
         /// </summary>
         protected System.Object[] userDatas;
+        
+        /// <summary>
+        /// 自定义数据。
+        /// </summary>
+        public System.Object UserData
+        {
+            get
+            {
+                if (userDatas != null && userDatas.Length >= 1)
+                {
+                    return userDatas[0];
+                }
+                else
+                {
+                    return null;
+                }
+            }
+        }
+
+        /// <summary>
+        /// 自定义数据集。
+        /// </summary>
+        public System.Object[] UserDatas => userDatas;
 
         /// <summary>
         /// 窗口的实例资源对象。
diff --git a/UnityProject/Assets/TEngine/Runtime/Modules/UIModule/UIWindow.cs b/UnityProject/Assets/TEngine/Runtime/Modules/UIModule/UIWindow.cs
index fac24e8c..71ab89d0 100644
--- a/UnityProject/Assets/TEngine/Runtime/Modules/UIModule/UIWindow.cs
+++ b/UnityProject/Assets/TEngine/Runtime/Modules/UIModule/UIWindow.cs
@@ -74,29 +74,6 @@ namespace TEngine
         
         public int HideTimerId { get; set; }
 
-        /// <summary>
-        /// 自定义数据。
-        /// </summary>
-        public System.Object UserData
-        {
-            get
-            {
-                if (userDatas != null && userDatas.Length >= 1)
-                {
-                    return userDatas[0];
-                }
-                else
-                {
-                    return null;
-                }
-            }
-        }
-
-        /// <summary>
-        /// 自定义数据集。
-        /// </summary>
-        public System.Object[] UserDatas => userDatas;
-
         /// <summary>
         /// 窗口深度值。
         /// </summary>
@@ -447,6 +424,11 @@ namespace TEngine
             IsPrepare = true;
             _prepareCallback?.Invoke(this);
         }
+        
+        protected virtual void Hide()
+        {
+            GameModule.UI.HideUI(this.GetType());
+        }
 
         protected virtual void Close()
         {