From dc7922d80c1d133b6261b8af1d521567d2c0a35d Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期四, 30 十月 2025 16:51:39 +0800
Subject: [PATCH] Merge branch 'master' of http://mobile.secondworld.net.cn:10010/r/Project_SG_scripts

---
 Main/System/Battle/BattleHUDWin.cs |   71 +++++++++++++++++++++++------------
 1 files changed, 47 insertions(+), 24 deletions(-)

diff --git a/Main/System/Battle/BattleHUDWin.cs b/Main/System/Battle/BattleHUDWin.cs
index ef233a2..7a893e6 100644
--- a/Main/System/Battle/BattleHUDWin.cs
+++ b/Main/System/Battle/BattleHUDWin.cs
@@ -7,36 +7,23 @@
 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()
@@ -45,8 +32,6 @@
         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"));
-        // buffIconPrefabPool = GameObjectPoolManager.Instance.RequestPool();
-        // buffLabelPrefabPool = GameObjectPoolManager.Instance.RequestPool(ResManager.Instance.LoadAsset<GameObject>("UIComp", "BuffContent"));
     }
 
     private void OnBattleEnd(string guid, JsonData data)
@@ -83,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()
@@ -108,13 +98,13 @@
         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(damageInfo, () => RemoveDamageContent(content));
-        damageContentList.Add(content);
-
+        
         var heroRect = damageInfo.hurtObj.heroRectTrans;
         if (heroRect == null)
+        {
+            damagePrefabPool.Release(damageContent);
             return;
+        }
 
         var contentRect = content.GetComponent<RectTransform>();
         var contentParentRect = contentRect.parent as RectTransform;
@@ -130,7 +120,19 @@
             null,
             out anchoredPos);
 
-        contentRect.anchoredPosition = anchoredPos;
+        // 璁剧疆鍒濆浣嶇疆鍜岀粨鏉熶綅缃�
+        content.beginPos = anchoredPos;
+        content.endPos = anchoredPos + new Vector2(0, 150);
+        
+        // 璁剧疆閫熷害姣斾緥
+        if (battleField != null)
+        {
+            content.SetRatio(battleField.speedRatio, 1f);
+        }
+
+        // 璁剧疆浼ゅ鏁版嵁骞跺紑濮嬫挱鏀�
+        content.SetDamage(damageInfo, () => RemoveDamageContent(content));
+        damageContentList.Add(content);
     }
 
     public void SetBattleField(BattleField _battleField)
@@ -138,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)
@@ -154,7 +167,6 @@
                 content.Stop();
             }
         }
-        //  娓告垙鎭㈠
         else
         {
             foreach (var content in damageContentList)
@@ -163,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