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

hch

3 天以前 364bb6a6623e49eec17075074a33121b6706fb31

 Main/System/Settlement/BattleSettlementManager.cs

@@ -42,16 +42,16 @@
        switch (battleName)
        {
            case BattleConst.ArenaBattleField:
                PopupWindowsProcessor.Instance.Add(isWin ? "ArenaBattleVictoryWin" : "ArenaBattleFailWin", false);
                PopupWindowsProcessor.Instance.Add(isWin ? "ArenaBattleVictoryWin" : "ArenaBattleFailWin", false, BattleConst.ArenaBattleField);
                break;
            case BattleConst.BoneBattleField:
                PopupWindowsProcessor.Instance.Add(isWin ? "BoneBattleVictoryWin" : "BoneBattleFailWin", false);
                PopupWindowsProcessor.Instance.Add(isWin ? "BoneBattleVictoryWin" : "BoneBattleFailWin", false, BattleConst.BoneBattleField);
                break;
            case BattleConst.TianziBillboradBattleField:
                PopupWindowsProcessor.Instance.Add("TianziBillboradVictoryWin", false);
                PopupWindowsProcessor.Instance.Add("TianziBillboradVictoryWin", false, BattleConst.TianziBillboradBattleField);
                break;
            default:
                PopupWindowsProcessor.Instance.Add(isWin ? "BattleVictoryWin" : "BattleFailWin", false);
                PopupWindowsProcessor.Instance.Add(isWin ? "BattleVictoryWin" : "BattleFailWin", false, BattleConst.StoryBossBattleField);
                break;
        }
    }
@@ -108,20 +108,29 @@
    {
        if (string.Empty == _guid)
            return;
        Debug.Log($"OnBattleEnd 结算 guid {_guid}");
        var battle = BattleManager.Instance.GetBattleField(_guid);
        if (battle == null)
            return;
        var battleName = battle.ToString();
        battleSettlementDic[battleName] = _data;
        if (battleAwardDic.ContainsKey(battleName))
        try
        {
            //合并战报和结算数据
            JsonData extendData = battleAwardDic[battleName];
            foreach (var key in extendData.Keys)
            battleSettlementDic[battleName] = _data;
            if (battleAwardDic.ContainsKey(battleName))
            {
                _data[key] = extendData[key];
                //合并战报和结算数据
                JsonData extendData = battleAwardDic[battleName];
                foreach (var key in extendData.Keys)
                {
                    _data[key] = extendData[key];
                }
            }
        }
        catch (Exception e)
        {
            Debug.LogError(e.ToString());
        }


        string activeBattleName = BattleManager.Instance.GetActiveBattleName();