From 89343a7a0909e5244a3b69c4db1294de4536243b Mon Sep 17 00:00:00 2001
From: lcy <1459594991@qq.com>
Date: 星期一, 15 十二月 2025 18:15:22 +0800
Subject: [PATCH] 262 幻境阁系统-客户端 新增仅适用武将解锁的头像和形象的红点移除规则

---
 Main/System/Battle/BattleUtility.cs |   47 +++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/Main/System/Battle/BattleUtility.cs b/Main/System/Battle/BattleUtility.cs
index 75513bb..2b0d59d 100644
--- a/Main/System/Battle/BattleUtility.cs
+++ b/Main/System/Battle/BattleUtility.cs
@@ -324,7 +324,7 @@
     }
 
     public static BattleHurtParam CalcBattleHurtParam(SkillBase skillBase, int hitIndex, BattleObject target, 
-        HB427_tagSCUseSkill.tagSCUseSkillHurt hurt, BattleDrops battleDrops, HB422_tagMCTurnFightObjDead deadPack)
+        HB427_tagSCUseSkill.tagSCUseSkillHurt hurt, BattleDrops battleDrops, BattleDeadPack deadPack)
     {
         long suckHp = GetSuckHp(skillBase.tagUseSkillAttack);
         SkillConfig skillConfig = skillBase.skillConfig;
@@ -646,20 +646,55 @@
         return null;
     }
 
-    public static List<HB422_tagMCTurnFightObjDead> FindDeadPack(List<GameNetPackBasic> packList)
+    public static List<BattleDeadPack> FindDeadPack(List<GameNetPackBasic> packList)
     {
-        List<HB422_tagMCTurnFightObjDead> deadPacks = new List<HB422_tagMCTurnFightObjDead>();
+        List<BattleDeadPack> deadPacks = new List<BattleDeadPack>();
         for (int i = 0; i < packList.Count; i++)
         {
             var pack = packList[i];
             //	瀵绘壘姝讳骸鍖� 鎵惧埌姝讳骸鍖呬箣鍚庤鎵炬帀钀藉寘 涓嶈兘瓒呰繃鎶�鑳藉寘
             if (pack is HB422_tagMCTurnFightObjDead deadPack)
             {
-                deadPacks.Add(deadPack);
+                deadPacks.Add(new BattleDeadPack { deadPack = deadPack });
             }
-            else if (pack is CustomHB426CombinePack)
+            else if (pack is CustomHB426CombinePack combinePack)
             {
-                break;
+                if (deadPacks.Count > 0)
+                {
+                    HB427_tagSCUseSkill hB427_TagSCUseSkill = combinePack.GetMainHB427SkillPack();
+
+                    if (null == hB427_TagSCUseSkill)
+                    {
+                        break;
+                    }
+                    else
+                    {
+                        var skillID = hB427_TagSCUseSkill.SkillID;
+                        var skillConfig = SkillConfig.Get((int)skillID);
+
+                        if ((SkillTriggerTiming)skillConfig.ClientTriggerTiming == SkillTriggerTiming.Death)
+                        {
+                            for (int j = 0 ; j < deadPacks.Count; j ++)
+                            {
+                                var parentPack = deadPacks[j];
+
+                                if (parentPack.IsOwnSkill(hB427_TagSCUseSkill))
+                                {
+                                    parentPack.SetDeathSkill(combinePack);
+                                    break;
+                                }
+                            }
+                        }
+                        else
+                        {
+                            break;
+                        }
+                    }
+                }
+                else
+                {
+                    break;
+                }
             }
         }
         // Debug.LogError("find dead pack " + deadPacks.Count);

--
Gitblit v1.8.0