Merge branch 'develop' into 火山美术合入2.11

Assets/Scripts/Framework/EventSystemKit/EventSystemEx.cs

@@ -81,6 +81,13 @@ namespace AibisDream.Framework
             }
         }
 
+        public void UnRegister(IInteraction interaction)
+        {
+            pointerOverObjList.Remove(interaction.GetGameObject());
+            draggingObjList.Remove(interaction.GetGameObject());
+            holdingObjList.Remove(interaction.GetGameObject());
+        }
+
         #endregion
 
         private void HandleDialogueComplete()

Assets/Scripts/Framework/EventSystemKit/EventTriggerEx.cs

@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using UnityEngine;
 using UnityEngine.Events;
 using UnityEngine.EventSystems;
@@ -141,6 +141,11 @@ namespace AibisDream.Framework
                 base.OnPointerClick(eventData);
             }
         }
+
+        void OnDestroy()
+        {
+            EventSystemEx.Instance.UnRegister(_interaction);
+        }
     }
 
     public interface IInteraction

Assets/Scripts/Framework/EventSystemKit/WorldScrollRect.cs

@@ -1,6 +1,5 @@
-using UnityEngine;
+using UnityEngine;
 using UnityEngine.EventSystems;
-using AibisDream.Framework;
 
 namespace AibisDream.Framework
 {