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

hch

16 小时以前 ee7f8b5362d27b228274c197dba97b17cb6bda57

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

@@ -124,22 +124,30 @@

    public override void ForceFinish()
    {
        if (isFinish)
            return;

        isFinish = true;

        // 强制结束所有死亡触发技能
        foreach (var kv in deathActionDict)
        {
            kv.Value.ForceFinish();
        }
        deathActionDict.Clear();

        //  直接结束
        // 清理状态字典，防止回调继续等待
        deadActionStatesDict.Clear();

        //  直接结束所有死亡对象
        foreach (var deadPack in deadPackList)
        {
            BattleObject deadObj = battleField.battleObjMgr.GetBattleObject((int)deadPack.deadPack.ObjID);
            if (null != deadObj)
            {
                PerformDrop(deadObj);
                deadObj.SetDeath();
            }
            deadObj.SetDeath();
        }

        base.ForceFinish();