Merge remote-tracking branch 'origin/master' into Cross_Server

client_Wu Xijin

2018-12-21 e5530e1ca1f28ab70c783d2b3ec685bb6569504b

 System/GeneralConfig/GeneralDefine.cs

@@ -162,6 +162,8 @@
    public static int medQualityHorseEffectCount { get; private set; }
    public static int highQualityHorseEffectCount { get; private set; }

    public static int GatherSoulDZ { get; private set; }

    public static int fairyLandBuffCondition { get; private set; }
    public static int fairyLandBuffId { get; private set; }
    public static int achievementEarlierStageLevel { get; private set; }
@@ -552,12 +554,12 @@
            lowQualityGuardCount = int.Parse(func.Numerical1);
            medQualityGuardCount = int.Parse(func.Numerical2);
            highQualityGuardCount = int.Parse(func.Numerical3);
            

            func = Config.Instance.Get<FuncConfigConfig>("QualityPetEffectCount");
            lowQualityPetEffectCount = int.Parse(func.Numerical1);
            medQualityPetEffectCount = int.Parse(func.Numerical2);
            highQualityPetEffectCount = int.Parse(func.Numerical3);
            

            func = Config.Instance.Get<FuncConfigConfig>("QualityHorseEffectCount");
            lowQualityHorseEffectCount = int.Parse(func.Numerical1);
            medQualityHorseEffectCount = int.Parse(func.Numerical2);
@@ -638,6 +640,8 @@
                }
            }

            GatherSoulDZ = GetInt("GatherSoulDZ");

            if (SgzcRealm == null)
            {
                SgzcRealm = new Dictionary<int, int>();