重构:修复 Shop 与 ItemTooltip 跨模块事件边界问题

- 将 _tooltipLocked 状态从 ItemTooltipController 移到 ShopController 维护
- DisplayItem 只发 Shop 模块 UI 事件(Hover/Lock/Hide)
- ItemTooltipForm 取消按钮发 ItemTooltip 模块事件自关闭
- ShopController 通过 UIRouter 跨模块控制 ItemTooltipForm
- 移除 DisplayItemHideEventArgs 的 Force 字段,分离两种关闭场景
This commit is contained in:
2026-06-17 09:37:44 +08:00
parent 2590f31250
commit c30b256d7a
24 changed files with 340 additions and 213 deletions
@@ -3,7 +3,6 @@ using Cysharp.Threading.Tasks;
using SepCore.Event;
using SepCore.Definition;
using GameFramework.Event;
using UnityEngine;
using UnityGameFramework.Runtime;
namespace SepCore.UI
@@ -12,21 +11,24 @@ namespace SepCore.UI
{
protected override UIFormType UIFormType => UIFormType.ItemTooltipForm;
private bool _locked = false;
private Action<int, int> _onRecycle;
private bool _subscribed = false;
protected override void SubscribeCustomEvents()
{
GameEntry.Event.Subscribe(DisplayItemLockEventArgs.EventId, OnDisplayItemLock);
GameEntry.Event.Subscribe(DisplayItemHideEventArgs.EventId, OnDisplayItemHide);
if (_subscribed) return;
GameEntry.Event.Subscribe(ItemTooltipRecycleEventArgs.EventId, ItemTooltipRecycle);
GameEntry.Event.Subscribe(ItemTooltipHideEventArgs.EventId, ItemTooltipHide);
_subscribed = true;
}
protected override void UnsubscribeCustomEvents()
{
GameEntry.Event.Unsubscribe(DisplayItemLockEventArgs.EventId, OnDisplayItemLock);
GameEntry.Event.Unsubscribe(DisplayItemHideEventArgs.EventId, OnDisplayItemHide);
if (!_subscribed) return;
GameEntry.Event.Unsubscribe(ItemTooltipRecycleEventArgs.EventId, ItemTooltipRecycle);
GameEntry.Event.Unsubscribe(ItemTooltipHideEventArgs.EventId, ItemTooltipHide);
_subscribed = false;
}
protected override void RefreshUI(ItemTooltipForm form, ItemTooltipContext context)
@@ -79,7 +81,6 @@ namespace SepCore.UI
public override async UniTask CloseUIAsync(object userData = null, float timeout = 30f)
{
_locked = false;
_onRecycle = null;
await base.CloseUIAsync(userData, timeout);
}
@@ -92,45 +93,8 @@ namespace SepCore.UI
}
}
private bool IsCurrentFormSender(object sender)
{
if (sender is ItemTooltipForm ItemTooltipForm)
{
return ItemTooltipForm == Form;
}
if (sender is Component component && Form != null)
{
return component.transform.IsChildOf(Form.transform);
}
return false;
}
#region Event Handlers
private void OnDisplayItemLock(object sender, GameEventArgs e)
{
if (e is not DisplayItemLockEventArgs)
{
return;
}
_locked = true;
}
private void OnDisplayItemHide(object sender, GameEventArgs e)
{
if (e is not DisplayItemHideEventArgs args)
{
return;
}
if (_locked && !args.Force) return;
GameEntry.UIRouter.CloseUIAsync(UIFormType.ItemTooltipForm).Forget();
}
private void ItemTooltipRecycle(object sender, GameEventArgs e)
{
if (e is not ItemTooltipRecycleEventArgs args)
@@ -138,14 +102,16 @@ namespace SepCore.UI
return;
}
if (!IsCurrentFormSender(sender))
{
return;
}
_onRecycle?.Invoke(args.Index, args.Price);
}
private void ItemTooltipHide(object sender, GameEventArgs e)
{
if (e is not ItemTooltipHideEventArgs args) return;
CloseUIAsync().Forget();
}
#endregion
}
}