From 80ee8ad03ff2329aa8b28d38381a5ac368fd0cb9 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期一, 11 三月 2019 09:36:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into AllianceBoss

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

diff --git a/System/GeneralConfig/GeneralDefine.cs b/System/GeneralConfig/GeneralDefine.cs
index 2e459e2..ee67957 100644
--- a/System/GeneralConfig/GeneralDefine.cs
+++ b/System/GeneralConfig/GeneralDefine.cs
@@ -186,6 +186,7 @@
     public static int mysteryShopRefreshItemValue { get; private set; }
     public static int mysteryShopRefreshInterval { get; private set; }
     public static Dictionary<int, Dictionary<int, int>> equipStarLimit { get; private set; }
+    public static int equipTrainMustItemId { get; private set; }
 
     public static void Init()
     {
@@ -750,6 +751,8 @@
                 }
                 equipStarLimit.Add(itemColor, dict);
             }
+
+            equipTrainMustItemId = GetInt("EquipWashMustID");
         }
         catch (Exception ex)
         {

--
Gitblit v1.8.0