同步最新REF改动

ET-Packages · Oct 17, 2024 · 2b9ad10 · 2b9ad10
1 parent 3402e5e
commit 2b9ad10
Show file tree

Hide file tree

Showing 21 changed files with 61 additions and 25 deletions.
diff --git a/Runtime/Core/YIUIBind/Code/Event/Code/Genericity/EventHandle/UIEventHandleP0.cs b/Runtime/Core/YIUIBind/Code/Event/Code/Genericity/EventHandle/UIEventHandleP0.cs
@@ -85,7 +85,7 @@ public void Dispose()
         {
             OnEventInvokeType    = null;
             UIEventParamDelegate = null;
-            m_Trigger            = null;
+            m_Trigger            = default;
             if (m_UIEventList == null || m_UIEventNode == null) return;
             m_UIEventList.Remove(m_UIEventNode);
             m_UIEventNode = null;

diff --git a/Runtime/Core/YIUIBind/Code/Event/Code/Genericity/EventHandle/UIEventHandleP1.cs b/Runtime/Core/YIUIBind/Code/Event/Code/Genericity/EventHandle/UIEventHandleP1.cs
@@ -85,7 +85,7 @@ public void Dispose()
         {
             OnEventInvokeType    = null;
             UIEventParamDelegate = null;
-            m_Trigger            = null;
+            m_Trigger            = default;
             if (m_UIEventList == null || m_UIEventNode == null) return;
             m_UIEventList.Remove(m_UIEventNode);
             m_UIEventNode = null;

diff --git a/Runtime/Core/YIUIBind/Code/Event/Code/Genericity/EventHandle/UIEventHandleP2.cs b/Runtime/Core/YIUIBind/Code/Event/Code/Genericity/EventHandle/UIEventHandleP2.cs
@@ -85,7 +85,7 @@ public void Dispose()
         {
             OnEventInvokeType    = null;
             UIEventParamDelegate = null;
-            m_Trigger            = null;
+            m_Trigger            = default;
             if (m_UIEventList == null || m_UIEventNode == null) return;
             m_UIEventList.Remove(m_UIEventNode);
             m_UIEventNode = null;

diff --git a/Runtime/Core/YIUIBind/Code/Event/Code/Genericity/EventHandle/UIEventHandleP3.cs b/Runtime/Core/YIUIBind/Code/Event/Code/Genericity/EventHandle/UIEventHandleP3.cs
@@ -85,7 +85,7 @@ public void Dispose()
         {
             OnEventInvokeType    = null;
             UIEventParamDelegate = null;
-            m_Trigger            = null;
+            m_Trigger            = default;
             if (m_UIEventList == null || m_UIEventNode == null) return;
             m_UIEventList.Remove(m_UIEventNode);
             m_UIEventNode = null;

diff --git a/Runtime/Core/YIUIBind/Code/Event/Code/Genericity/EventHandle/UIEventHandleP4.cs b/Runtime/Core/YIUIBind/Code/Event/Code/Genericity/EventHandle/UIEventHandleP4.cs
@@ -85,7 +85,7 @@ public void Dispose()
         {
             OnEventInvokeType    = null;
             UIEventParamDelegate = null;
-            m_Trigger            = null;
+            m_Trigger            = default;
             if (m_UIEventList == null || m_UIEventNode == null) return;
             m_UIEventList.Remove(m_UIEventNode);
             m_UIEventNode = null;

diff --git a/Runtime/Core/YIUIBind/Code/Event/Code/Genericity/EventHandle/UIEventHandleP5.cs b/Runtime/Core/YIUIBind/Code/Event/Code/Genericity/EventHandle/UIEventHandleP5.cs
@@ -85,7 +85,7 @@ public void Dispose()
         {
             OnEventInvokeType    = null;
             UIEventParamDelegate = null;
-            m_Trigger            = null;
+            m_Trigger            = default;
             if (m_UIEventList == null || m_UIEventNode == null) return;
             m_UIEventList.Remove(m_UIEventNode);
             m_UIEventNode = null;

diff --git a/Runtime/Core/YIUIBind/Code/TaskEvent/Code/Genericity/EventHandle/UITaskEventHandleP0.cs b/Runtime/Core/YIUIBind/Code/TaskEvent/Code/Genericity/EventHandle/UITaskEventHandleP0.cs
@@ -82,7 +82,7 @@ public void Dispose()
         {
             OnEventInvokeType        = null;
             UITaskEventParamDelegate = null;
-            m_Trigger                = null;
+            m_Trigger                = default;
             if (m_UITaskEventList == null || m_UITaskEventNode == null) return;
             m_UITaskEventList.Remove(m_UITaskEventNode);
             m_UITaskEventNode = null;

diff --git a/Runtime/Core/YIUIBind/Code/TaskEvent/Code/Genericity/EventHandle/UITaskEventHandleP1.cs b/Runtime/Core/YIUIBind/Code/TaskEvent/Code/Genericity/EventHandle/UITaskEventHandleP1.cs
@@ -82,7 +82,7 @@ public void Dispose()
         {
             OnEventInvokeType        = null;
             UITaskEventParamDelegate = null;
-            m_Trigger                = null;
+            m_Trigger                = default;
             if (m_UITaskEventList == null || m_UITaskEventNode == null) return;
             m_UITaskEventList.Remove(m_UITaskEventNode);
             m_UITaskEventNode = null;

diff --git a/Runtime/Core/YIUIBind/Code/TaskEvent/Code/Genericity/EventHandle/UITaskEventHandleP2.cs b/Runtime/Core/YIUIBind/Code/TaskEvent/Code/Genericity/EventHandle/UITaskEventHandleP2.cs
@@ -82,7 +82,7 @@ public void Dispose()
         {
             OnEventInvokeType        = null;
             UITaskEventParamDelegate = null;
-            m_Trigger                = null;
+            m_Trigger                = default;
             if (m_UITaskEventList == null || m_UITaskEventNode == null) return;
             m_UITaskEventList.Remove(m_UITaskEventNode);
             m_UITaskEventNode = null;

diff --git a/Runtime/Core/YIUIBind/Code/TaskEvent/Code/Genericity/EventHandle/UITaskEventHandleP3.cs b/Runtime/Core/YIUIBind/Code/TaskEvent/Code/Genericity/EventHandle/UITaskEventHandleP3.cs
@@ -82,7 +82,7 @@ public void Dispose()
         {
             OnEventInvokeType        = null;
             UITaskEventParamDelegate = null;
-            m_Trigger                = null;
+            m_Trigger                = default;
             if (m_UITaskEventList == null || m_UITaskEventNode == null) return;
             m_UITaskEventList.Remove(m_UITaskEventNode);
             m_UITaskEventNode = null;

diff --git a/Runtime/Core/YIUIBind/Code/TaskEvent/Code/Genericity/EventHandle/UITaskEventHandleP4.cs b/Runtime/Core/YIUIBind/Code/TaskEvent/Code/Genericity/EventHandle/UITaskEventHandleP4.cs
@@ -82,7 +82,7 @@ public void Dispose()
         {
             OnEventInvokeType        = null;
             UITaskEventParamDelegate = null;
-            m_Trigger                = null;
+            m_Trigger                = default;
             if (m_UITaskEventList == null || m_UITaskEventNode == null) return;
             m_UITaskEventList.Remove(m_UITaskEventNode);
             m_UITaskEventNode = null;

diff --git a/Runtime/Core/YIUIBind/Code/TaskEvent/Code/Genericity/EventHandle/UITaskEventHandleP5.cs b/Runtime/Core/YIUIBind/Code/TaskEvent/Code/Genericity/EventHandle/UITaskEventHandleP5.cs
@@ -82,7 +82,7 @@ public void Dispose()
         {
             OnEventInvokeType        = null;
             UITaskEventParamDelegate = null;
-            m_Trigger                = null;
+            m_Trigger                = default;
             if (m_UITaskEventList == null || m_UITaskEventNode == null) return;
             m_UITaskEventList.Remove(m_UITaskEventNode);
             m_UITaskEventNode = null;

diff --git a/Scripts/HotfixView/Client/System/Load/YIUILoadComponentSystem.cs b/Scripts/HotfixView/Client/System/Load/YIUILoadComponentSystem.cs
@@ -24,7 +24,7 @@ private static void Awake(this YIUILoadComponent self)
         [EntitySystem]
         private static void Destroy(this YIUILoadComponent self)
         {
-            YIUILoadComponent.m_InstRef = null;
+            YIUILoadComponent.m_InstRef = default;
         }
 
         public static async ETTask<bool> Initialize(this YIUILoadComponent self)

diff --git a/Scripts/HotfixView/Client/System/Panel/YIUIPanelComponentSystem.cs b/Scripts/HotfixView/Client/System/Panel/YIUIPanelComponentSystem.cs
@@ -16,6 +16,7 @@ public static partial class YIUIPanelComponentSystem
         [EntitySystem]
         private static void Awake(this YIUIPanelComponent self)
         {
+            self.UIBindVo = self.UIBase.UIBindVo;
         }
 
         [EntitySystem]
@@ -30,7 +31,7 @@ private static void Destroy(this YIUIPanelComponent self)
             self.StopCountDownDestroyPanel();
             EventSystem.Instance?.YIUIInvokeSync(new YIUIInvokeDestroyPanel
                                                  {
-                                                     PanelName = self.UIBase.UIBindVo.ComponentType.Name
+                                                     PanelName = self.UIBindVo.ComponentType.Name
                                                  });
         }
     }

diff --git a/Scripts/HotfixView/Client/System/UIMgr/YIUIMgrComponentSystem.cs b/Scripts/HotfixView/Client/System/UIMgr/YIUIMgrComponentSystem.cs
@@ -27,7 +27,7 @@ private static void Destroy(this YIUIMgrComponent self)
             YIUIBindHelper.Reset();
             YIUISingletonHelper.DisposeAll();
             self.ResetRoot();
-            YIUIMgrComponent.m_InstRef = null;
+            YIUIMgrComponent.m_InstRef = default;
         }
     }
 }
diff --git a/Scripts/HotfixView/Client/System/Window/YIUIWindowComponentSystem.cs b/Scripts/HotfixView/Client/System/Window/YIUIWindowComponentSystem.cs
@@ -20,6 +20,7 @@ public static partial class YIUIWindowComponentSystem
         [EntitySystem]
         private static void Awake(this YIUIWindowComponent self)
         {
+            self.UIBindVo = self.UIBase.UIBindVo;
         }
 
         [EntitySystem]

diff --git a/Scripts/ModelView/Client/Component/Common/YIUICommonComponent.cs b/Scripts/ModelView/Client/Component/Common/YIUICommonComponent.cs
@@ -21,7 +21,11 @@ public YIUIChild UIBase
             {
                 if (_UIBase == null)
                 {
-                    _uiBase = this.GetParent<YIUIChild>();
+                    var yiuiChild = this.GetParent<YIUIChild>();
+                    if (yiuiChild is { IsDisposed: false })
+                    {
+                        _uiBase = yiuiChild;
+                    }
                 }
 
                 return _UIBase;

diff --git a/Scripts/ModelView/Client/Component/Panel/PanelInfo.cs b/Scripts/ModelView/Client/Component/Panel/PanelInfo.cs
@@ -56,12 +56,26 @@ public PanelInfo(YIUIBindVo vo)
 
         public void ResetUI(YIUIChild uiBase)
         {
-            m_UIBase = uiBase;
+            if (uiBase is { IsDisposed: false })
+            {
+                m_UIBase = uiBase;
+            }
+            else
+            {
+                m_UIBase = default;
+            }
         }
 
         public void ResetEntity(Entity entity)
         {
-            m_OwnerUIEntity = entity;
+            if (entity is { IsDisposed: false })
+            {
+                m_OwnerUIEntity = entity;
+            }
+            else
+            {
+                m_OwnerUIEntity = default;
+            }
         }
     }
-}
+}
diff --git a/Scripts/ModelView/Client/Component/Panel/YIUIPanelComponent.cs b/Scripts/ModelView/Client/Component/Panel/YIUIPanelComponent.cs
@@ -14,6 +14,8 @@ namespace ET.Client
     [ComponentOf(typeof(YIUIChild))]
     public partial class YIUIPanelComponent : Entity, IAwake, IYIUIInitialize, IDestroy
     {
+        public YIUIBindVo UIBindVo;
+
         private EntityRef<YIUIChild> _uiBase;
         private YIUIChild            _UIBase => _uiBase;
 
@@ -23,7 +25,11 @@ public YIUIChild UIBase
             {
                 if (_UIBase == null)
                 {
-                    _uiBase = this.GetParent<YIUIChild>();
+                    var yiuiChild = this.GetParent<YIUIChild>();
+                    if (yiuiChild is { IsDisposed: false })
+                    {
+                        _uiBase = yiuiChild;
+                    }
                 }
 
                 return _UIBase;

diff --git a/Scripts/ModelView/Client/Component/View/YIUIViewComponent.cs b/Scripts/ModelView/Client/Component/View/YIUIViewComponent.cs
@@ -23,7 +23,11 @@ public YIUIChild UIBase
             {
                 if (_UIBase == null)
                 {
-                    _uiBase = this.GetParent<YIUIChild>();
+                    var yiuiChild = this.GetParent<YIUIChild>();
+                    if (yiuiChild is { IsDisposed: false })
+                    {
+                        _uiBase = yiuiChild;
+                    }
                 }
 
                 return _UIBase;

diff --git a/Scripts/ModelView/Client/Component/Window/YIUIWindowComponent.cs b/Scripts/ModelView/Client/Component/Window/YIUIWindowComponent.cs
@@ -19,6 +19,8 @@ public partial class YIUIWindowComponent : Entity, IAwake, IDestroy
         public ETTask _LastOpenETTask;
         public ETTask _LastCloseETTask;
 
+        public YIUIBindVo UIBindVo;
+
         private EntityRef<YIUIChild> _uiBase;
         private YIUIChild            _UIBase => _uiBase;
 
@@ -28,7 +30,11 @@ public YIUIChild UIBase
             {
                 if (_UIBase == null)
                 {
-                    _uiBase = this.GetParent<YIUIChild>();
+                    var yiuiChild = this.GetParent<YIUIChild>();
+                    if (yiuiChild is { IsDisposed: false })
+                    {
+                        _uiBase = yiuiChild;
+                    }
                 }
 
                 return _UIBase;
@@ -58,7 +64,7 @@ public Entity OwnerUIEntity
         /// </summary>
         public EWindowOption WindowOption = EWindowOption.None;
 
-        public bool    m_FirstOpenTween;
-        public bool    m_FirstCloseTween;
+        public bool m_FirstOpenTween;
+        public bool m_FirstCloseTween;
     }
-}
+}