From 39001a600fcae2bcf27c225df8752d75fb92fef4 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期五, 31 十月 2025 11:18:26 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts
---
Main/System/Battle/BattleHUDWin.cs | 126 +++++++++++++++++++++++++----------------
1 files changed, 76 insertions(+), 50 deletions(-)
diff --git a/Main/System/Battle/BattleHUDWin.cs b/Main/System/Battle/BattleHUDWin.cs
index 2570383..7a893e6 100644
--- a/Main/System/Battle/BattleHUDWin.cs
+++ b/Main/System/Battle/BattleHUDWin.cs
@@ -4,56 +4,60 @@
using UnityEngine.UI;
using DG.Tweening;
using Cysharp.Threading.Tasks;
-
+using System;
+using LitJson;
// 杩欎釜鐣岄潰鏄� persistent鐨勭晫闈�
public class BattleHUDWin : UIBase
{
- // 缁勪欢寮曠敤
- // private List<HUDContent> damageList = new List<HUDContent>();
-
- // private List<BuffContent> buffList = new List<BuffContent>();
-
private GameObjectPoolManager.GameObjectPool damagePrefabPool;
-
private GameObjectPoolManager.GameObjectPool buffIconPrefabPool;
-
private GameObjectPoolManager.GameObjectPool buffLabelPrefabPool;
public Transform damageNode;
-
public Transform buffIconNode;
-
public Transform buffLabelNode;
private BattleField battleField;
-
private List<DamageContent> damageContentList = new List<DamageContent>();
- // 鐢熷懡鍛ㄦ湡
protected override void InitComponent()
{
base.InitComponent();
- // 鍒濆鍖栫粍浠跺紩鐢� 缁戝畾鎸夐挳绛塙I缁勪欢浜嬩欢
}
protected override void OnPreOpen()
{
base.OnPreOpen();
- 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"));
- // buffIconPrefabPool = GameObjectPoolManager.Instance.RequestPool();
- // buffLabelPrefabPool = GameObjectPoolManager.Instance.RequestPool(ResManager.Instance.LoadAsset<GameObject>("UIComp", "BuffContent"));
+ EventBroadcast.Instance.AddListener<BattleDmgInfo>(EventName.BATTLE_DAMAGE_TAKEN, OnDamageTaken);
+ EventBroadcast.Instance.AddListener<string, JsonData>(EventName.BATTLE_END, OnBattleEnd);
+ damagePrefabPool = GameObjectPoolManager.Instance.RequestPool(UILoader.LoadPrefab("DamageContent"));
+ }
+
+ private void OnBattleEnd(string guid, JsonData data)
+ {
+ ClearContent(guid);
+ }
+
+ private void ClearContent(string guid, bool force = false)
+ {
+ if ((battleField != null && battleField.guid == guid) || force)
+ {
+ for (int i = damageContentList.Count - 1; i >= 0; i--)
+ {
+ var content = damageContentList[i];
+ content.Stop();
+ RemoveDamageContent(content);
+ }
+ damageContentList.Clear();
+ }
}
protected override void OnPreClose()
{
base.OnPreClose();
- 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);
+ EventBroadcast.Instance.RemoveListener<BattleDmgInfo>(EventName.BATTLE_DAMAGE_TAKEN, OnDamageTaken);
+ EventBroadcast.Instance.RemoveListener<string, JsonData>(EventName.BATTLE_END, OnBattleEnd);
}
protected override void OnOpen()
@@ -64,8 +68,13 @@
protected override void OnClose()
{
base.OnClose();
- battleField.OnBattlePause -= OnBattlePause;
- battleField = null;
+ if (battleField != null)
+ {
+ battleField.OnBattlePause -= OnBattlePause;
+ battleField.OnBattleRun -= OnBattleRun;
+ battleField.OnSpeedRatioChange -= OnSpeedRatioChange;
+ battleField = null;
+ }
}
protected override void NextFrameAfterOpen()
@@ -84,30 +93,24 @@
damagePrefabPool.Release(content.gameObject);
}
- private void OnDamageTaken(string guid, BattleObject bo, List<long> damageList)
+ private void OnDamageTaken(BattleDmgInfo damageInfo)
{
GameObject damageContent = damagePrefabPool.Request();
DamageContent content = damageContent.GetComponent<DamageContent>();
damageContent.transform.SetParent(damageNode, false);
- damageContent.transform.localPosition = new Vector3(damageContent.transform.localPosition.x, damageContent.transform.localPosition.y, 0);
- content.SetDamage(damageList, () => RemoveDamageContent(content));
- damageContentList.Add(content);
-
- // heroGo 鐨� parent 浣滀负鍙傝�冭妭鐐�
- var heroGo = bo.heroGo;
- if (heroGo == null)
- return;
-
- var heroRect = heroGo.GetComponent<RectTransform>();
+
+ var heroRect = damageInfo.hurtObj.heroRectTrans;
if (heroRect == null)
+ {
+ damagePrefabPool.Release(damageContent);
return;
+ }
- // 璁＄畻 heroGo 鍦� content 鐖惰妭鐐逛笅鐨� anchoredPosition
var contentRect = content.GetComponent<RectTransform>();
var contentParentRect = contentRect.parent as RectTransform;
- // 鑾峰彇 heroGo 鐨勪笘鐣屽潗鏍�
- Vector3 worldTargetPos = heroRect.TransformPoint(heroRect.anchoredPosition);
+ // 鑾峰彇 heroRect 鐨勪笘鐣屽潗鏍囷紙閿氱偣涓轰腑蹇冿級
+ Vector3 worldTargetPos = heroRect.transform.TransformPoint(heroRect.rect.center);
// 杞崲鍒� content 鐖惰妭鐐逛笅鐨� anchoredPosition
Vector2 anchoredPos;
@@ -117,17 +120,19 @@
null,
out anchoredPos);
- contentRect.anchoredPosition = anchoredPos;
- }
-
- private void OnBuffMounted(BattleObject bo, SkillConfig buffConfig)
- {
+ // 璁剧疆鍒濆浣嶇疆鍜岀粨鏉熶綅缃�
+ content.beginPos = anchoredPos;
+ content.endPos = anchoredPos + new Vector2(0, 150);
- }
+ // 璁剧疆閫熷害姣斾緥
+ if (battleField != null)
+ {
+ content.SetRatio(battleField.speedRatio, 1f);
+ }
- private void OnBuffDisapear(BattleObject bo, SkillConfig buffConfig)
- {
-
+ // 璁剧疆浼ゅ鏁版嵁骞跺紑濮嬫挱鏀�
+ content.SetDamage(damageInfo, () => RemoveDamageContent(content));
+ damageContentList.Add(content);
}
public void SetBattleField(BattleField _battleField)
@@ -135,15 +140,26 @@
if (battleField != null)
{
battleField.OnBattlePause -= OnBattlePause;
+ battleField.OnBattleRun -= OnBattleRun;
+ battleField.OnSpeedRatioChange -= OnSpeedRatioChange;
}
-
+ ClearContent(string.Empty, true);
battleField = _battleField;
battleField.OnBattlePause += OnBattlePause;
+ battleField.OnBattleRun += OnBattleRun;
+ battleField.OnSpeedRatioChange += OnSpeedRatioChange;
+ }
+
+ private void OnSpeedRatioChange(float newSpeedRatio)
+ {
+ foreach (var content in damageContentList)
+ {
+ content.SetRatio(newSpeedRatio, 1f);
+ }
}
private void OnBattlePause(bool isPause)
{
- // 娓告垙鏆傚仠
if (isPause)
{
foreach (var content in damageContentList)
@@ -151,7 +167,6 @@
content.Stop();
}
}
- // 娓告垙鎭㈠
else
{
foreach (var content in damageContentList)
@@ -160,4 +175,15 @@
}
}
}
+
+ private void OnBattleRun()
+ {
+ for (int i = damageContentList.Count - 1; i >= 0; i--)
+ {
+ if (i < damageContentList.Count)
+ {
+ damageContentList[i].Run();
+ }
+ }
+ }
}
--
Gitblit v1.8.0