From 144cea1efa4a85d699aaaf3d8a69f241ac010d60 Mon Sep 17 00:00:00 2001
From: bottlefish <781230111@qq.com>
Date: Thu, 26 Feb 2026 17:18:27 +0800
Subject: [PATCH] =?UTF-8?q?feat(framework):=20=E5=A2=9E=E5=BC=BA=E4=BA=8B?=
 =?UTF-8?q?=E4=BB=B6=E8=A7=A6=E5=8F=91=E5=99=A8=E6=94=AF=E6=8C=81=E4=BA=A4?=
 =?UTF-8?q?=E4=BA=92=E9=94=81=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EventSystemKit/EventTriggerEx.cs          | 37 ++++++++++++-------
 1 file changed, 24 insertions(+), 13 deletions(-)

diff --git a/Assets/Scripts/Framework/EventSystemKit/EventTriggerEx.cs b/Assets/Scripts/Framework/EventSystemKit/EventTriggerEx.cs
index 3e97f3ec8..876cae637 100644
--- a/Assets/Scripts/Framework/EventSystemKit/EventTriggerEx.cs
+++ b/Assets/Scripts/Framework/EventSystemKit/EventTriggerEx.cs
@@ -75,19 +75,19 @@ namespace AibisDream.Framework
 
         public override void OnPointerEnter(PointerEventData data)
         {
-            EventSystemEx.Instance.OnPointerEnter(_interaction);
+            if (_interaction != null) EventSystemEx.Instance.OnPointerEnter(_interaction);
             base.OnPointerEnter(data);
         }
 
         public override void OnPointerExit(PointerEventData data)
         {
-            EventSystemEx.Instance.OnPointerExit(_interaction);
+            if (_interaction != null) EventSystemEx.Instance.OnPointerExit(_interaction);
             base.OnPointerExit(data);
         }
 
         public override void OnPointerDown(PointerEventData eventData)
         {
-            if (_interaction.IsAvailable && !EventSystemEx.Instance.isLocked)
+            if (_interaction != null && _interaction.IsAvailable && !EventSystemEx.Instance.isLocked)
             {
                 EventSystemEx.Instance.OnPointerDown(_interaction);
                 base.OnPointerDown(eventData);
@@ -96,8 +96,7 @@ namespace AibisDream.Framework
 
         public override void OnPointerUp(PointerEventData eventData)
         {
-            
-            if (_interaction.IsAvailable && !EventSystemEx.Instance.isLocked)
+            if (_interaction != null && _interaction.IsAvailable && !EventSystemEx.Instance.isLocked)
             {
                 EventSystemEx.Instance.OnPointerUp(_interaction);
                 if (eventData != null)
@@ -109,26 +108,38 @@ namespace AibisDream.Framework
 
         public override void OnDrag(PointerEventData eventData)
         {
-            EventSystemEx.Instance.OnDrag(_interaction);
-            base.OnDrag(eventData);
+            if (_interaction != null && _interaction.IsAvailable && !EventSystemEx.Instance.isLocked)
+            {
+                EventSystemEx.Instance.OnDrag(_interaction);
+                base.OnDrag(eventData);
+            }
         }
 
         public override void OnEndDrag(PointerEventData eventData)
         {
-            EventSystemEx.Instance.OnEndDrag(_interaction);
-            base.OnEndDrag(eventData);
+            if (_interaction != null && _interaction.IsAvailable && !EventSystemEx.Instance.isLocked)
+            {
+                EventSystemEx.Instance.OnEndDrag(_interaction);
+                base.OnEndDrag(eventData);
+            }
         }
 
         public override void OnBeginDrag(PointerEventData eventData)
         {
-            EventSystemEx.Instance.OnEndDrag(_interaction);
-            base.OnBeginDrag(eventData);
+            if (_interaction != null && _interaction.IsAvailable && !EventSystemEx.Instance.isLocked)
+            {
+                EventSystemEx.Instance.OnBeginDrag(_interaction);
+                base.OnBeginDrag(eventData);
+            }
         }
 
         public override void OnPointerClick(PointerEventData eventData)
         {
-            // EventSystemEx.Instance.OnPointerClick(_interaction);
-            base.OnPointerClick(eventData);
+            if (_interaction != null && _interaction.IsAvailable && !EventSystemEx.Instance.isLocked)
+            {
+                // EventSystemEx.Instance.OnPointerClick(_interaction);
+                base.OnPointerClick(eventData);
+            }
         }
     }