From e5530e1ca1f28ab70c783d2b3ec685bb6569504b Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期五, 21 十二月 2018 14:44:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into Cross_Server
---
System/GeneralConfig/GeneralDefine.cs | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/System/GeneralConfig/GeneralDefine.cs b/System/GeneralConfig/GeneralDefine.cs
index 36443ea..f9df787 100644
--- a/System/GeneralConfig/GeneralDefine.cs
+++ b/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>();
--
Gitblit v1.8.0