From c591cb6e215ea5e762560afdae059f1d4fd7f4ec Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期五, 28 九月 2018 16:32:37 +0800
Subject: [PATCH] Merge branch 'master' into 3687天赋功能

---
 System/RolePromote/RolePromoteModel.cs |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/System/RolePromote/RolePromoteModel.cs b/System/RolePromote/RolePromoteModel.cs
index d968c67..9151ee1 100644
--- a/System/RolePromote/RolePromoteModel.cs
+++ b/System/RolePromote/RolePromoteModel.cs
@@ -138,6 +138,7 @@
         public Dictionary<int, int> wingLv2GenerDict = new Dictionary<int, int>();
         public Dictionary<int, List<RoleStrongerConfig>> roleStrongerDic = new Dictionary<int, List<RoleStrongerConfig>>();
         List<int> promotePercents = new List<int>();
+        public List<int> fightPowerPercents = new List<int>();
         void ParseConfig()
         {
             var dict = Config.Instance.GetAllValues<RoleStrongerConfig>();
@@ -160,6 +161,7 @@
             }
             funcConfig = Config.Instance.Get<FuncConfigConfig>("FightpowerUp");
             promotePercents.AddRange(ConfigParse.GetMultipleStr<int>(funcConfig.Numerical1));
+            fightPowerPercents.AddRange(ConfigParse.GetMultipleStr<int>(funcConfig.Numerical2));
         }
 
         public List<RoleStrongerConfig> GetStrongerConfigs(int funcType)

--
Gitblit v1.8.0