From 756176608359a1205ece9a71c729955d3d29b265 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期一, 29 九月 2025 18:21:52 +0800
Subject: [PATCH] 125 战斗 1.修复死亡包导致战斗卡死的问题  2.修复主线战斗偶尔不主动开始的问题

---
 Main/System/Battle/BattleField/RecordActions/DeathRecordAction.cs                               |   30 ++++++++++++++----------------
 Main/Core/NetworkPackage/DTCFile/ServerPack/HB4_FightDefine/DTCB425_tagSCTurnFightReportSign.cs |    6 ++++++
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/Main/Core/NetworkPackage/DTCFile/ServerPack/HB4_FightDefine/DTCB425_tagSCTurnFightReportSign.cs b/Main/Core/NetworkPackage/DTCFile/ServerPack/HB4_FightDefine/DTCB425_tagSCTurnFightReportSign.cs
index 9291e7b..a27ad54 100644
--- a/Main/Core/NetworkPackage/DTCFile/ServerPack/HB4_FightDefine/DTCB425_tagSCTurnFightReportSign.cs
+++ b/Main/Core/NetworkPackage/DTCFile/ServerPack/HB4_FightDefine/DTCB425_tagSCTurnFightReportSign.cs
@@ -34,6 +34,12 @@
         //	鎴柇 PackageRegedit Distribute 閲岀殑灏佸寘
 
         //	鐩村埌sign = 1;
+        BattleField battleField = BattleManager.Instance.GetBattleField(vNetData.packUID);
+
+        if (null != battleField)
+        {
+            battleField.DistributeNextPackage();
+        }
     }
 
     public static bool IsCorrectType(GameNetPackBasic vNetPack)
diff --git a/Main/System/Battle/BattleField/RecordActions/DeathRecordAction.cs b/Main/System/Battle/BattleField/RecordActions/DeathRecordAction.cs
index 9eade48..fc04597 100644
--- a/Main/System/Battle/BattleField/RecordActions/DeathRecordAction.cs
+++ b/Main/System/Battle/BattleField/RecordActions/DeathRecordAction.cs
@@ -9,13 +9,7 @@
     public DeathRecordAction(BattleField _battleField, List<HB422_tagMCTurnFightObjDead> _deadPackList)
         : base(RecordActionType.Death, _battleField, null)
     {
-        isFinish = false;
         deadPackList = _deadPackList;
-    }
-
-    public override bool IsFinished()
-    {
-        return isFinish;
     }
 
 
@@ -29,6 +23,9 @@
             bool isLastOne = false;
             int index = 0;
             int total = deadPackList.Count;
+
+            bool canFind = true;
+
             foreach (var deadPack in deadPackList)
             {
                 BattleObject deadObj = battleField.battleObjMgr.GetBattleObject((int)deadPack.ObjID);
@@ -46,16 +43,24 @@
                         {
                             // UniTaskExtension.DelayTime((GameObject)null, 0.3f / battleField.speedRatio, () =>
                             // {
-                                isFinish = true;
+                            isFinish = true;
                             // });
                         }
                     });
                 }
-
+                else
+                {
+                    canFind = false;
+                }
             }
+
+            if (!canFind)
+            {
+                isFinish = true;
+            }
+
             return;
         }
-
     }
 
     private void OnDeathAnimationEnd(BattleObject deadObj)
@@ -65,12 +70,5 @@
         {
             deadObj.PerformDrop();
         }
-    }
-    
-    public override void ForceFinish()
-    {
-        //  璁剧疆缁撴潫flag 璁板緱娓呯┖motionBase閲岀殑浜嬩欢
-        base.ForceFinish();
-        
     }
 }
\ No newline at end of file

--
Gitblit v1.8.0