tinbird/aibis-dream
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

美术合入

Browse Source
This commit is contained in:
bottlefish
2026-04-08 18:28:27 +08:00
parent 79997281c0
commit 7f2d12b5a5
30 changed files with 4240 additions and 1314 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Scripts/Framework/EventSystemKit/EventTriggerEx.cs
+6 -11
View File
@@ -1,4 +1,4 @@
using System.Linq;
using System.Linq;
using UnityEngine;
using UnityEngine.Events;
using UnityEngine.EventSystems;
@@ -87,23 +87,18 @@ namespace AibisDream.Framework
public override void OnPointerDown(PointerEventData eventData)
{
// 对话等场景 isLocked 时仍要让 EventTrigger 上注册的回调执行（如塔罗 PointerDown），
// 否则会出现能 Hover、但 Down/Up/Click 全不进组件的问题。
if (_interaction != null && _interaction.IsAvailable && !EventSystemEx.Instance.isLocked)
{
EventSystemEx.Instance.OnPointerDown(_interaction);
base.OnPointerDown(eventData);
}
base.OnPointerDown(eventData);
}
public override void OnPointerUp(PointerEventData eventData)
{
if (_interaction != null && _interaction.IsAvailable && !EventSystemEx.Instance.isLocked)
{
EventSystemEx.Instance.OnPointerUp(_interaction);
if (eventData != null)
{
base.OnPointerUp(eventData);
}
}
base.OnPointerUp(eventData);
}
public override void OnDrag(PointerEventData eventData)
@@ -138,8 +133,8 @@ namespace AibisDream.Framework
if (_interaction != null && _interaction.IsAvailable && !EventSystemEx.Instance.isLocked)
{
// EventSystemEx.Instance.OnPointerClick(_interaction);
base.OnPointerClick(eventData);
}
base.OnPointerClick(eventData);
}
void OnDestroy()