Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_linchunjie

2018-08-31 4ca03303c442a2931a95914828b8ea4baec312f3

Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

 Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0419_tagPlayerReborn.cs

@@ -57,8 +57,14 @@
                    switch (vNetData.Type)

                    {

                        case 0:

                            _hero.Behaviour.StopHandupAI();

                            _hero.Behaviour.StopKillUntilDieAI();

                            if (DungeonStage.CurrentMapType != MapType.OpenCountry)

                            {

                                if (!GeneralConfig.Instance.RebornAutoFightMapID.Contains(PlayerDatas.Instance.baseData.MapID))

                                {

                                    _hero.Behaviour.StopHandupAI();

                                    _hero.Behaviour.StopKillUntilDieAI();

                                }

                            }

                            break;

                        case 2:

                        case 3:


 System/GeneralConfig/GeneralConfig.cs

@@ -133,6 +133,8 @@


    public Dictionary<int, List<int>> DropItemEffectMapID { get; private set; }



    public List<int> RebornAutoFightMapID { get; private set; }



    public void Init()

    {

        try

@@ -475,6 +477,9 @@
                    }

                }

            }



            func = Config.Instance.Get<FuncConfigConfig>("RebornAutoFightDungeon");

            RebornAutoFightMapID = new List<int>(GetIntArray(func.Numerical1));

        }

        catch (Exception ex)

        {