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

hch

11 小时以前 e95a97e663ba46ed474c89425dd92516a0d9b7dd

 Main/System/Battle/BattleManager.cs

@@ -84,7 +84,11 @@

            redTeamList.Add(storyTeam);

            CreateBattleField(string.Empty, MapID, FuncLineID, extendData, redTeamList, blueTeamList);
            HB424_tagSCTurnFightInit vNetData = new HB424_tagSCTurnFightInit();
            vNetData.MapID = (uint)MapID;
            vNetData.FuncLineID = (uint)FuncLineID;

            CreateBattleField(string.Empty, vNetData, extendData, redTeamList, blueTeamList);
        }
        else
        {
@@ -455,9 +459,12 @@
    }
    #endregion

    public BattleField CreateBattleField(string guid, int MapID, int FuncLineID, JsonData extendData, List<TeamBase> redTeamList, List<TeamBase> blueTeamList)
    public BattleField CreateBattleField(string guid, HB424_tagSCTurnFightInit vNetData, JsonData extendData, List<TeamBase> redTeamList, List<TeamBase> blueTeamList)
    {
        BattleField battleField = null;

        int MapID = (int)vNetData.MapID;
        int FuncLineID = (int)vNetData.FuncLineID;

        bool isCreate = true;
        if (battleFields.TryGetValue(guid, out battleField))
@@ -475,7 +482,7 @@
        }

        if (isCreate)
        { 
        {
            battleField = BattleFieldFactory.CreateBattleField(guid, MapID, FuncLineID, extendData, redTeamList, blueTeamList);

            if (string.IsNullOrEmpty(guid))
@@ -488,7 +495,7 @@



        battleField.Init(MapID, FuncLineID, extendData, redTeamList, blueTeamList);
        battleField.Init(MapID, FuncLineID, extendData, redTeamList, blueTeamList, vNetData.TurnMax);

        return battleField;
    }