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/SystemSetting/SettingEffectMgr.cs | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/System/SystemSetting/SettingEffectMgr.cs b/System/SystemSetting/SettingEffectMgr.cs
index 49cbc3f..2b25a12 100644
--- a/System/SystemSetting/SettingEffectMgr.cs
+++ b/System/SystemSetting/SettingEffectMgr.cs
@@ -201,14 +201,14 @@
if (singlePack == null)
return;
- _tagFuncModel = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("AutoBuyDrug");
+ _tagFuncModel = Config.Instance.Get<FuncConfigConfig>("AutoBuyDrug");
shopIdlist = ConfigParse.GetMultipleStr<int>(_tagFuncModel.Numerical1);
int i = 0;
int length = shopIdlist.Length;
for (i = length - 1; i > -1; i--)
{
- _tagShopModel = ConfigManager.Instance.GetTemplate<StoreConfig>(shopIdlist[i]);
- _tagItemModel = ConfigManager.Instance.GetTemplate<ItemConfig>(_tagShopModel.ItemID);
+ _tagShopModel = Config.Instance.Get<StoreConfig>(shopIdlist[i]);
+ _tagItemModel = Config.Instance.Get<ItemConfig>(_tagShopModel.ItemID);
if (PlayerDatas.Instance.baseData.LV >= _tagItemModel.LV)
{
List<ItemModel> list = null;
@@ -248,7 +248,7 @@
|| !DeadModel.IsCanReborn || IsDungeon())
return;
- _tagFuncModel = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("RebornArguments");
+ _tagFuncModel = Config.Instance.Get<FuncConfigConfig>("RebornArguments");
RebornConditions = ConfigParse.GetMultipleStr<int>(_tagFuncModel.Numerical1);
rebornPrice = RebornConditions[2];
StartCoroutine(PlayerReborn(5));
@@ -257,7 +257,7 @@
private bool IsDungeon()
{
var mapId = PlayerDatas.Instance.baseData.MapID;
- var mapConfig = ConfigManager.Instance.GetTemplate<MapConfig>(mapId);
+ var mapConfig = Config.Instance.Get<MapConfig>(mapId);
return mapConfig != null && mapConfig.MapFBType != 0;
}
@@ -294,9 +294,9 @@
private int CompareDrugLv(ItemModel start, ItemModel next)
{
- _tagItemModel = ConfigManager.Instance.GetTemplate<ItemConfig>((int)start.itemInfo.ItemID);
+ _tagItemModel = Config.Instance.Get<ItemConfig>((int)start.itemInfo.ItemID);
int lv1 = _tagItemModel.LV;
- _tagItemModel = ConfigManager.Instance.GetTemplate<ItemConfig>((int)next.itemInfo.ItemID);
+ _tagItemModel = Config.Instance.Get<ItemConfig>((int)next.itemInfo.ItemID);
int lv2 = _tagItemModel.LV;
return -lv1.CompareTo(lv2);
}
--
Gitblit v1.8.0