Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts

yyl

9 天以前 871594462e82d6bc1341918d39e11ab036d59563

 Main/System/Battle/BattleField/BattleField.cs

@@ -3,7 +3,7 @@
using System;
using LitJson;
using DG.Tweening;
using Codice.Client.BaseCommands;


public class BattleField
{
@@ -452,18 +452,25 @@
        }
    }

    //各个战场没有场景概念，且可以共存，同时存在战场和结算的情况
    //内部结算需要处理的逻辑，不含UI
    protected virtual void OnSettlement(JsonData turnFightStateData)
    {

    }

    //UI结算后回调需要处理的逻辑
    public virtual void WhaleFall()
    {
        Destroy();
    }

    public virtual void OnBattleEnd(JsonData turnFightStateData)
    {
        BattleEndAction battleEndAction = new BattleEndAction(this, turnFightStateData, () =>
        {
            BattleDebug.LogError(turnFightStateData.ToJson());
            // 这里可以添加战斗结束的具体逻辑
            // 战场自身的结束逻辑，不含结算等外部逻辑
            OnSettlement(turnFightStateData);

            int winFaction = (int)turnFightStateData["winFaction"];
@@ -482,63 +489,14 @@

            IsBattleFinish = true;

            
            //提供外部 胜利等奖励显示
            EventBroadcast.Instance.Broadcast<string, JsonData>(EventName.BATTLE_END, guid, turnFightStateData);

            
            //提供外部 胜利等奖励显示
            if (guid != "")
                EventBroadcast.Instance.Broadcast<string, JsonData>(EventName.BATTLE_END, guid, turnFightStateData);


        });
        recordPlayer.PlayRecord(battleEndAction);
        // 处理战斗结束逻辑
        // IsBattleFinish = true;
        // 结算逻辑

            // {
            // "itemInfo": [],
            // "winFaction": 1,//获胜阵营:   一般为1或者2，当玩家发起的战斗时，如果获胜阵营不等于1代表玩家失败了
            // "statInfo": {
            //     "1": {
            //     "1": {
            //         "5": {
            //         "NPCID": 0,
            //         "DefHurt": 633,
            //         "CureHP": 0,
            //         "AtkHurt": 169247,
            //         "ObjID": 1,
            //         "HeroID": 510006
            //         }
            //     }
            //     },
            //     "2": {
            //     "1": {
            //         "2": {
            //         "NPCID": 10101001,
            //         "DefHurt": 169246,
            //         "CureHP": 143096,
            //         "AtkHurt": 999952,
            //         "ObjID": 2,
            //         "HeroID": 0
            //         },
            //         "4": {
            //         "NPCID": 10101001,
            //         "DefHurt": 0,
            //         "CureHP": 0,
            //         "AtkHurt": 0,
            //         "ObjID": 3,
            //         "HeroID": 0
            //         },
            //         "6": {
            //         "NPCID": 10101001,
            //         "DefHurt": 1,
            //         "CureHP": 0,
            //         "AtkHurt": 0,
            //         "ObjID": 4,
            //         "HeroID": 0
            //         }
            //     }
            //     }
            // }
            // }
    }

    public virtual void HaveRest()