From 2b47fde8e7902ddddd898309f281b9c310fc877f Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期三, 22 八月 2018 12:00:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into Skill_Polymorph_BeatBackPlayer
---
System/OpenServerActivity/ImpactRankModel.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/System/OpenServerActivity/ImpactRankModel.cs b/System/OpenServerActivity/ImpactRankModel.cs
index 36a8208..1ba13f1 100644
--- a/System/OpenServerActivity/ImpactRankModel.cs
+++ b/System/OpenServerActivity/ImpactRankModel.cs
@@ -103,7 +103,7 @@
billTagCfgDict = new Dictionary<int, List<OSCBillTagAwardConfig>>();
billTagSortCfgDict = new Dictionary<int, List<OSCBillTagAwardConfig>>();
billTagAwardDict = new Dictionary<int, List<RankAwardItem>>();
- var _cfgs = ConfigManager.Instance.GetAllValues<OSCBillRankAwardConfig>();
+ var _cfgs = Config.Instance.GetAllValues<OSCBillRankAwardConfig>();
for (int i = 0; i < _cfgs.Count; i++)
{
List<OSCBillRankAwardConfig> _list = null;
@@ -138,7 +138,7 @@
}
_awardList.Add(_award);
}
- var _billTagCfgs = ConfigManager.Instance.GetAllValues<OSCBillTagAwardConfig>();
+ var _billTagCfgs = Config.Instance.GetAllValues<OSCBillTagAwardConfig>();
for (int i = 0; i < _billTagCfgs.Count; i++)
{
List<OSCBillTagAwardConfig> _list = null;
@@ -189,7 +189,7 @@
}
billRankPromotePathDict = new Dictionary<int, int[]>();
- var _funcCfg = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("OSCBillRankTypePromote");
+ var _funcCfg = Config.Instance.Get<FuncConfigConfig>("OSCBillRankTypePromote");
var _json = LitJson.JsonMapper.ToObject(_funcCfg.Numerical1);
foreach (var _key in _json.Keys)
{
@@ -197,7 +197,7 @@
var _wayArray = LitJson.JsonMapper.ToObject<int[]>(_json[_key].ToJson());
billRankPromotePathDict.Add(_type, _wayArray);
}
- _funcCfg = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("OSCBillboardOpen");
+ _funcCfg = Config.Instance.Get<FuncConfigConfig>("OSCBillboardOpen");
_json = LitJson.JsonMapper.ToObject(_funcCfg.Numerical1);
openServerActivityDays = int.Parse(_funcCfg.Numerical2);
impactRankTypeOpenDict = new Dictionary<int, OSCbillBoardCondition>();
--
Gitblit v1.8.0