From 458f4c831623966402f78d1ec00b24aebf674e66 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期三, 12 十二月 2018 09:46:22 +0800
Subject: [PATCH] Merge branch 'master' into Cross_Server

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

diff --git a/System/GeneralConfig/GeneralDefine.cs b/System/GeneralConfig/GeneralDefine.cs
index b364584..36443ea 100644
--- a/System/GeneralConfig/GeneralDefine.cs
+++ b/System/GeneralConfig/GeneralDefine.cs
@@ -155,6 +155,12 @@
     public static int lowQualityGuardCount { get; private set; }
     public static int medQualityGuardCount { get; private set; }
     public static int highQualityGuardCount { get; private set; }
+    public static int lowQualityPetEffectCount { get; private set; }
+    public static int medQualityPetEffectCount { get; private set; }
+    public static int highQualityPetEffectCount { get; private set; }
+    public static int lowQualityHorseEffectCount { get; private set; }
+    public static int medQualityHorseEffectCount { get; private set; }
+    public static int highQualityHorseEffectCount { get; private set; }
 
     public static int fairyLandBuffCondition { get; private set; }
     public static int fairyLandBuffId { get; private set; }
@@ -546,6 +552,16 @@
             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);
+            highQualityHorseEffectCount = int.Parse(func.Numerical3);
 
             fairyLandBuffCondition = GetInt("XjmjAddHarm", 1);
             fairyLandBuffId = GetInt("XjmjAddHarm", 2);

--
Gitblit v1.8.0