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
---
Core/GameEngine/Model/Player/Market/MarketModel.cs | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Core/GameEngine/Model/Player/Market/MarketModel.cs b/Core/GameEngine/Model/Player/Market/MarketModel.cs
index 2606b0a..99ada43 100644
--- a/Core/GameEngine/Model/Player/Market/MarketModel.cs
+++ b/Core/GameEngine/Model/Player/Market/MarketModel.cs
@@ -112,14 +112,14 @@
public List<KeyValuePair<int, int>> fitters { get; private set; }
private void ParseConfig()
{
- var _funcCfg = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("BourseSaleLimit");
+ var _funcCfg = Config.Instance.Get<FuncConfigConfig>("BourseSaleLimit");
totalPutawayCnt = int.Parse(_funcCfg.Numerical1);
- _funcCfg = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("BoursePriceLimit");
+ _funcCfg = Config.Instance.Get<FuncConfigConfig>("BoursePriceLimit");
maxprice = int.Parse(_funcCfg.Numerical2);
minprice = int.Parse(_funcCfg.Numerical1);
- _funcCfg = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("BourseMaxRecord");
+ _funcCfg = Config.Instance.Get<FuncConfigConfig>("BourseMaxRecord");
dealRecordCnt = int.Parse(_funcCfg.Numerical1);
- _funcCfg = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("BourseQuality");
+ _funcCfg = Config.Instance.Get<FuncConfigConfig>("BourseQuality");
string[] _array1 = ConfigParse.GetMultipleStr(_funcCfg.Numerical1);
fitters = new List<KeyValuePair<int, int>>();
for (int i = 0; i < _array1.Length; i++)
@@ -128,7 +128,7 @@
var _keyValuePair = new KeyValuePair<int, int>(int.Parse(_array2[0]), int.Parse(_array2[1]));
fitters.Add(_keyValuePair);
}
- var _list = ConfigManager.Instance.GetAllValues<MarketConfig>();
+ var _list = Config.Instance.GetAllValues<MarketConfig>();
for (int i = 0; i < _list.Count; i++)
{
marketCfgDict.Add(_list[i].type, _list[i]);
@@ -190,7 +190,7 @@
}
return false;
}
- ItemConfig cfg = ConfigManager.Instance.GetTemplate<ItemConfig>(_itemModel.itemInfo.ItemID);
+ ItemConfig cfg = Config.Instance.Get<ItemConfig>(_itemModel.itemInfo.ItemID);
if (cfg.CanTrade != 1)
{
if (_showTip)
--
Gitblit v1.8.0