From 7da5f5b780af330ecda645f5538e0917bd9eeb01 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期三, 26 九月 2018 19:37:20 +0800
Subject: [PATCH] Merge branch 'master' into 1871天赋功能

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

diff --git a/System/GeneralConfig/GeneralConfig.cs b/System/GeneralConfig/GeneralConfig.cs
index c09a95b..8b4a74f 100644
--- a/System/GeneralConfig/GeneralConfig.cs
+++ b/System/GeneralConfig/GeneralConfig.cs
@@ -77,6 +77,7 @@
     public int[] autoBuyItemPrices;
 
     public List<int> neutralMaps = new List<int>();
+    public List<int> neutralBossMaps = new List<int>();
 
     public int demonJarRedPoint { get; private set; }
     public string LoadLV { get; private set; }
@@ -362,7 +363,8 @@
             lowHpRemind = GetInt("LowHpRemind");
             autoBuyItemIds = GetIntArray("BuyItemPrice", 1);
             autoBuyItemPrices = GetIntArray("BuyItemPrice", 2);
-            neutralMaps.AddRange(GetIntArray("BossListMapID"));
+            neutralMaps.AddRange(GetIntArray("MapLine", 4));
+            neutralBossMaps.AddRange(GetIntArray("BossListMapID"));
 
             var _propertyIconCfg = Config.Instance.Get<FuncConfigConfig>("PropertyIcon");
             var _propertyIconJson = LitJson.JsonMapper.ToObject(_propertyIconCfg.Numerical1);

--
Gitblit v1.8.0