Merge branch 'master' of http://mobile.secondworld.net.cn:10010/r/Project_S...

hch

2026-01-09 59a2580b135c497a2689bd9ed86a9a7751d418a0

Merge branch 'master' of http://mobile.secondworld.net.cn:10010/r/Project_SG_scripts

 Main/Core/NetworkPackage/CustomServerPack/CustomHB426CombinePack.cs

@@ -408,7 +408,7 @@
            }
            else if (pack is CustomHB426CombinePack)
            {
                Debug.LogError("无法找到Skill包，先发现了嵌套包");
                Debug.LogError("无法找到Skill包，先发现了嵌套包 " + startTag.Tag);
                return null;
            }
            else

 Main/Core/NetworkPackage/DTCFile/ServerPack/HB4_FightDefine/DTCB430_tagSCTurnFightReport.cs

@@ -141,6 +141,25 @@
            DebugingBuffStatus(vPackList);
#endif

#region Start Print Before Pack List Detail
            if (Launch.Instance.isOpenSkillLogFile)
            {
                try
                {
                    string detailAnalysis = PrintPackageDetailAnalysis(vPackList, guid);
                    string filePath = Application.dataPath + "/../BattleReport/PackageBeforeDetailAnalysis_" + DateTime.Now.ToString("yyyyMMdd_HHmmss") + ".txt";
                    System.IO.Directory.CreateDirectory(System.IO.Path.GetDirectoryName(filePath));
                    System.IO.File.WriteAllText(filePath, detailAnalysis);
                    Debug.Log("包详细分析已保存到: " + filePath);
                }
                catch (Exception e)
                {
                    Debug.LogError("保存包详细分析失败: " + e.Message);
                }
            }
#endregion 


            vPackList = AnalysisPackQueueAndDistribute(guid, vPackList);


@@ -150,7 +169,7 @@
                try
                {
                    string detailAnalysis = PrintPackageDetailAnalysis(vPackList, guid);
                    string filePath = Application.dataPath + "/../BattleReport/PackageDetailAnalysis_" + DateTime.Now.ToString("yyyyMMdd_HHmmss") + ".txt";
                    string filePath = Application.dataPath + "/../BattleReport/PackageAfterDetailAnalysis_" + DateTime.Now.ToString("yyyyMMdd_HHmmss") + ".txt";
                    System.IO.Directory.CreateDirectory(System.IO.Path.GetDirectoryName(filePath));
                    System.IO.File.WriteAllText(filePath, detailAnalysis);
                    Debug.Log("包详细分析已保存到: " + filePath);

 Main/System/Battle/BattleField/RecordActions/DeathRecordAction.cs

@@ -237,4 +237,9 @@
        
        return true;
    }

    public override bool NeedWaitSibling()
    {
        return HasDeathTriggerSkill();
    }
}

 Main/System/Battle/Define/BattleDmgInfo.cs

@@ -14,6 +14,15 @@

public class BattleDmgInfo
{
    //  排除展示的伤害类型
    protected static List<DamageType> ExcludeDamageTypes = new List<DamageType>
    {
        DamageType.SuckHpReverse,
        DamageType.Parry,
        DamageType.BreakArmor,
        DamageType.Protected,
    };

    public string battleFieldGuid { get; private set; }
    public BattleHurtParam battleHurtParam { get; private set; }
    
@@ -419,13 +428,7 @@
        targetDamageList.Add(new BattleDmg { damage = damage, attackType = attackType });
    }

    protected static List<DamageType> ExcludeDamageTypes = new List<DamageType>
    {
        DamageType.SuckHpReverse,
        DamageType.Parry,
        DamageType.BreakArmor,
        DamageType.Protected,
    };


    /// <summary>
    /// 验证并修复攻击类型

 Main/System/Battle/Define/DamageType.cs

@@ -73,9 +73,11 @@

    CritRealdamage = Crit + Realdamage, //暴击真伤

    SuckHpReverse = 8192, //吸血反转为伤害
    SuckHpReverse = 8192,//吸血毒药 (2^13 序号13)

    Protected = 16384,//本次伤害有受保护标记 (2^13 序号13)
    Protected = 16384,//本次伤害有受保护标记 (2^14 序号14)



    BreakArmor = 32768,//破甲伤害 (2^15 序号15)


 Main/System/Battle/Motion/MotionBase.cs

@@ -458,7 +458,8 @@
                    RemoveAction(frameHandler);
                    onComplete?.Invoke();
                    skillBase.OnFinalFrameEnd();
                    skillTrack = null;
                    if (hasAnim)
                        skillTrack = null;
                }
            }
        };

 Main/System/Battle/RecordPlayer/RecordAction.cs

@@ -165,4 +165,9 @@
        }
        return battleField.guid;
    }

    public virtual bool NeedWaitSibling()
    {
        return true;
    }
}

 Main/System/Battle/RecordPlayer/RecordPlayer.cs

@@ -154,7 +154,7 @@
                        if (prevAction != null && prevAction.parentAction == action.parentAction)
                        {
                            //  找到同级前置节点，如果它还在执行中，则当前节点需要等待
                            if (!prevAction.IsFinished())
                            if (!prevAction.IsFinished() && action.NeedWaitSibling())
                            {
                                shouldWaitForSibling = true;
                                // BattleDebug.LogError($"RecordPlayer: {action.GetType().Name} 等待同级前置节点 {prevAction.GetType().Name} 完成");

 Main/System/Battle/Skill/SkillBase.cs

@@ -1187,7 +1187,7 @@
        }

        //  传递parentRecordAction，让死亡技能等待当前技能完成
        battleField.OnObjsDead(new List<BattleDeadPack>(tempDeadPackList.Values), parentRecordAction);
        battleField.OnObjsDead(new List<BattleDeadPack>(tempDeadPackList.Values));

        // 1. 强制结束技能效果
        skillEffect?.ForceFinished();