From c080c44a275c54783f6e0d3ee6cb86e1e16f562e Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期五, 02 十一月 2018 10:17:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into DownLoad

---
 System/GeneralConfig/GeneralDefine.cs |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/System/GeneralConfig/GeneralDefine.cs b/System/GeneralConfig/GeneralDefine.cs
index aa35401..4b1e0dc 100644
--- a/System/GeneralConfig/GeneralDefine.cs
+++ b/System/GeneralConfig/GeneralDefine.cs
@@ -149,6 +149,9 @@
     public static int medQualityCount { get; private set; }
     public static int highQualityCount { get; private set; }
 
+    public static int fairyLandBuffCondition { get; private set; }
+    public static int fairyLandBuffId { get; private set; }
+
     public static void Init()
     {
         try
@@ -521,6 +524,9 @@
             lowQualityCount = int.Parse(func.Numerical1);
             medQualityCount = int.Parse(func.Numerical2);
             highQualityCount = int.Parse(func.Numerical3);
+
+            fairyLandBuffCondition = GetInt("XjmjAddHarm", 1);
+            fairyLandBuffId = GetInt("XjmjAddHarm", 2);
         }
         catch (Exception ex)
         {

--
Gitblit v1.8.0