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

yyl

2025-12-03 bf9d063af5655f93db17578cfe52d8abbb60c596

 Main/System/Settlement/BattleSettlementManager.cs

@@ -1,13 +1,18 @@


using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using LitJson;
using UnityEngine;

public partial class BattleSettlementManager : GameSystemManager<BattleSettlementManager>
{
    //结算后需清除 <battleName,JsonData>
    Dictionary<string, JsonData> battleSettlementDic = new Dictionary<string, JsonData>();
    Dictionary<string, JsonData> battleAwardDic = new Dictionary<string, JsonData>();   //B431 另外通报奖励


    // public string notifyGuid = string.Empty;

@@ -28,6 +33,7 @@
    public void OnBeforePlayerDataInitialize()
    {
        battleSettlementDic.Clear();
        battleAwardDic.Clear();
    }

    public void AddPop(string battleName, int result)
@@ -35,13 +41,13 @@
        bool isWin = result == 1;
        switch (battleName)
        {
            case "ArenaBattleField":
            case BattleConst.ArenaBattleField:
                PopupWindowsProcessor.Instance.Add(isWin ? "ArenaBattleVictoryWin" : "ArenaBattleFailWin", false);
                break;
            case "BoneBattleField":
            case BattleConst.BoneBattleField:
                PopupWindowsProcessor.Instance.Add(isWin ? "BoneBattleVictoryWin" : "BoneBattleFailWin", false);
                break;
            case "TianziBillboradBattleField":
            case BattleConst.TianziBillboradBattleField:
                PopupWindowsProcessor.Instance.Add("TianziBillboradVictoryWin", false);
                break;
            default:
@@ -55,7 +61,7 @@
        bool isWin = result == 1;
        switch (battleName)
        {
            case "ArenaBattleField":
            case BattleConst.ArenaBattleField:
                if (isWin)
                {
                    UIManager.Instance.OpenWindow<ArenaBattleVictoryWin>();
@@ -65,7 +71,7 @@
                    UIManager.Instance.OpenWindow<ArenaBattleFailWin>();
                }
                break;
            case "BoneBattleField":
            case BattleConst.BoneBattleField:
                if (isWin)
                {
                    UIManager.Instance.OpenWindow<BoneBattleVictoryWin>();
@@ -75,7 +81,7 @@
                    UIManager.Instance.OpenWindow<BoneBattleFailWin>();
                }
                break;
            case "TianziBillboradBattleField":
            case BattleConst.TianziBillboradBattleField:
                TianziBillboradManager.Instance.isSweepVictory = false;
                UIManager.Instance.OpenWindow<TianziBillboradVictoryWin>();
                break;
@@ -107,6 +113,15 @@
            return;
        var battleName = battle.ToString();
        battleSettlementDic[battleName] = _data;
        if (battleAwardDic.ContainsKey(battleName))
        {
            //合并战报和结算数据
            JsonData extendData = battleAwardDic[battleName];
            foreach (var key in extendData.Keys)
            {
                _data[key] = extendData[key];
            }
        }

        string activeBattleName = BattleManager.Instance.GetActiveBattleName();

@@ -129,6 +144,7 @@
    public void WinShowOver(string battleName)
    {
        battleSettlementDic.Remove(battleName);
        battleAwardDic.Remove(battleName);

        var battle = BattleManager.Instance.GetActiveBattleFieldByName(battleName);
        if (battle != null)
@@ -143,5 +159,112 @@
        }
        return battleSettlementDic[battleName];
    }

    public JsonData GetBattleSettlementByMapID(int mapID)
    {
        if (BattleConst.mapIDToBattleNameDic.ContainsKey(mapID))
        {
            return GetBattleSettlement(BattleConst.mapIDToBattleNameDic[mapID]);
        }
        return null;
    }

    public void UpdateSettlementData(HB431_tagSCTurnFightRet netData)
    {
        // 先获得战斗结果，如果需要展示战斗，则请求战报 （如有些跳过战斗表现直接结算）
        bool needBattleData = true;
        var guid = UIHelper.ServerStringTrim(netData.GUID);
        var mapID = (int)netData.MapID;
        JsonData extendData2 = JsonMapper.ToObject(netData.AwardMsg);

        battleAwardDic[BattleConst.mapIDToBattleNameDic[mapID]] = extendData2;

        if (needBattleData)
        {
            Debug.Log("战斗时序 收到B431 并请求下载战报" + Time.time);
            var date = UIHelper.ServerStringTrim(netData.PathDate);
            RequestTurnFightData(guid, date, mapID);
        }
        else
        {
            JsonData extendData1 = JsonMapper.ToObject(netData.BatStatMsg);

            JsonData turnFightStateData = new JsonData();
            foreach (var key in extendData1.Keys)
            {
                turnFightStateData[key] = extendData1[key];
            }
            foreach (var key in extendData2.Keys)
            {
                turnFightStateData[key] = extendData2[key];
            }

            EventBroadcast.Instance.Broadcast<string, JsonData>(EventName.BATTLE_END, guid, turnFightStateData);
        }

    }
    public void RequestTurnFightData(string guid, string date, int mapID)
    {
        //mobile.secondworld.net.cn:53080\S9006\20251202\3042602\5b11338f-cf2c-11f0-a0a0-000c29b22418.tfr
        var serverID = UIHelper.GetServerIDByAccount(PlayerDatas.Instance.baseData.AccID);
        
        var url = ServerListCenter.Instance.GetServerUrl(serverID);
        string assetVersionUrl = string.Empty;
        
        if (string.IsNullOrEmpty(date))
        {
            //公共战报  路径： C:\TurnFightReport\S服务器编号\功能地图ID\战报GUID
            assetVersionUrl = $"{url}/S{serverID}/{mapID}/{guid}.tfr";
        }
        else
        {
            //个人战报  路径： C:\TurnFightReport\S服务器编号\日期\玩家ID\功能地图ID\战报GUID
            assetVersionUrl = $"{url}/S{serverID}/{date}/{PlayerDatas.Instance.baseData.PlayerID}/{mapID}/{guid}.tfr";
        }

        HttpRequest.Instance.UnityWebRequestTurnFightGet(assetVersionUrl, guid, 3, OnGetTurnFightData);
    }

    void OnGetTurnFightData(bool _ok, string guid, byte[] _result)
    {
        if (_ok)
        {
            ReadTurnFightInfo(_result);
        }
    }

    //战报存储的是B430封包，所以需要转发B430封包
    private void ReadTurnFightInfo(byte[] vBytes)
    {
        try
        {
            byte[] vPackBytes = vBytes;
            GameNetPackBasic vNetpack;
            byte[] vCmdBytes = new byte[2];
            ServerType socketType = ServerType.B430;

            Array.Copy(vPackBytes, 0, vCmdBytes, 0, 2);
            var cmd = (ushort)((ushort)(vCmdBytes[0] << 8) + vCmdBytes[1]);

            // 处理主工程的封包
            if (PackageRegedit.Contain(cmd))
            {
                vNetpack = PackageRegedit.TransPack(socketType, cmd, vPackBytes);
                if (vNetpack != null)
                {
                    GameNetSystem.Instance.PushPackage(vNetpack, socketType);
                }
            }

        }
        catch (Exception ex)
        {
            Debug.LogErrorFormat("ReadTurnFightInfo 分析战报异常：{0}", ex);
        }

    }



}