From b35cca26e2ee0e3a6b8a8c8d11c7253be4864609 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期五, 18 七月 2025 14:55:30 +0800
Subject: [PATCH] 冲突解决
---
Main/System/Battle/BattleHUDWin.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Main/System/Battle/BattleHUDWin.cs b/Main/System/Battle/BattleHUDWin.cs
index 61bc946..2570383 100644
--- a/Main/System/Battle/BattleHUDWin.cs
+++ b/Main/System/Battle/BattleHUDWin.cs
@@ -40,7 +40,7 @@
protected override void OnPreOpen()
{
base.OnPreOpen();
- EventBroadcast.Instance.AddListener<BattleObject, List<int>>(EventName.BATTLE_DAMAGE_TAKEN, OnDamageTaken);
+ EventBroadcast.Instance.AddListener<string, BattleObject, List<long>>(EventName.BATTLE_DAMAGE_TAKEN, OnDamageTaken);
EventBroadcast.Instance.AddListener<BattleObject, SkillConfig>(EventName.BATTLE_BUFF_MOUNTED, OnBuffMounted);
EventBroadcast.Instance.AddListener<BattleObject, SkillConfig>(EventName.BATTLE_BUFF_DISAPEAR, OnBuffDisapear);
damagePrefabPool = GameObjectPoolManager.Instance.RequestPool(ResManager.Instance.LoadAsset<GameObject>("UIComp", "DamageContent"));
@@ -51,7 +51,7 @@
protected override void OnPreClose()
{
base.OnPreClose();
- EventBroadcast.Instance.RemoveListener<BattleObject, List<int>>(EventName.BATTLE_DAMAGE_TAKEN, OnDamageTaken);
+ EventBroadcast.Instance.RemoveListener<string, BattleObject, List<long>>(EventName.BATTLE_DAMAGE_TAKEN, OnDamageTaken);
EventBroadcast.Instance.RemoveListener<BattleObject, SkillConfig>(EventName.BATTLE_BUFF_MOUNTED, OnBuffMounted);
EventBroadcast.Instance.RemoveListener<BattleObject, SkillConfig>(EventName.BATTLE_BUFF_DISAPEAR, OnBuffDisapear);
}
@@ -84,7 +84,7 @@
damagePrefabPool.Release(content.gameObject);
}
- private void OnDamageTaken(BattleObject bo, List<int> damageList)
+ private void OnDamageTaken(string guid, BattleObject bo, List<long> damageList)
{
GameObject damageContent = damagePrefabPool.Request();
DamageContent content = damageContent.GetComponent<DamageContent>();
@@ -122,7 +122,7 @@
private void OnBuffMounted(BattleObject bo, SkillConfig buffConfig)
{
-
+
}
private void OnBuffDisapear(BattleObject bo, SkillConfig buffConfig)
--
Gitblit v1.8.0