From 2df58aeacbf1177ec01167bdeccfe89d6a8d5804 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期三, 13 二月 2019 14:20:28 +0800
Subject: [PATCH] 3335 配置表读取重构,修改配置表读取接口1
---
System/KnapSack/Logic/PackModelInterface.cs | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/System/KnapSack/Logic/PackModelInterface.cs b/System/KnapSack/Logic/PackModelInterface.cs
index 8b704ef..7f62a1f 100644
--- a/System/KnapSack/Logic/PackModelInterface.cs
+++ b/System/KnapSack/Logic/PackModelInterface.cs
@@ -47,7 +47,7 @@
public override void Init()
{
- _equipGSFormula = Config.Instance.Get<FuncConfigConfig>("EquipGSFormula");
+ _equipGSFormula = FuncConfigConfig.Get("EquipGSFormula");
equipBaseAttrlist.Clear();
JsonData baseAttr = JsonMapper.ToObject(_equipGSFormula.Numerical2);
if (baseAttr.IsArray)
@@ -58,20 +58,20 @@
}
}
- _itemPush = Config.Instance.Get<FuncConfigConfig>("ItemPush");
+ _itemPush = FuncConfigConfig.Get("ItemPush");
preciousItemType = ConfigParse.GetMultipleStr<int>(_itemPush.Numerical1);
- FuncConfigConfig noPromptUsetItem = Config.Instance.Get<FuncConfigConfig>("NoPromptUsetItem");
+ FuncConfigConfig noPromptUsetItem = FuncConfigConfig.Get("NoPromptUsetItem");
promptUseLimitDict = ConfigParse.GetDic<int, int>(noPromptUsetItem.Numerical1);
- _drugIDFunc = Config.Instance.Get<FuncConfigConfig>("LifePotionlist");
+ _drugIDFunc = FuncConfigConfig.Get("LifePotionlist");
drugIDs = ConfigParse.GetMultipleStr<int>(_drugIDFunc.Numerical1);
- _oneKeySellFunc = Config.Instance.Get<FuncConfigConfig>("OneKeySellItemType");
+ _oneKeySellFunc = FuncConfigConfig.Get("OneKeySellItemType");
onekeySellTypes = ConfigParse.GetMultipleStr<int>(_oneKeySellFunc.Numerical1);
- FuncConfigConfig funcConfig = Config.Instance.Get<FuncConfigConfig>("IntroductionItem");
+ FuncConfigConfig funcConfig = FuncConfigConfig.Get("IntroductionItem");
pushItemIds = ConfigParse.GetMultipleStr<int>(funcConfig.Numerical1);
pushBuffTypeIds = ConfigParse.GetMultipleStr<int>(funcConfig.Numerical2);
- FuncConfigConfig betterEquipExcConfig = Config.Instance.Get<FuncConfigConfig>("GoodItemDungeon");
+ FuncConfigConfig betterEquipExcConfig = FuncConfigConfig.Get("GoodItemDungeon");
betterEquipExceptDungeonDict = new Dictionary<int, List<int>>();
JsonData excEquipData = JsonMapper.ToObject(betterEquipExcConfig.Numerical1);
foreach (var dungeonId in excEquipData.Keys)
@@ -114,10 +114,10 @@
{
specAttrDic.Clear();
int id = itemId;
- ItemConfig itemConfig = Config.Instance.Get<ItemConfig>(itemId);
+ ItemConfig itemConfig = ItemConfig.Get(itemId);
if (CheckIsCustomItem(itemConfig))
{
- AppointItemConfig appointItemConfig = Config.Instance.Get<AppointItemConfig>(itemId);
+ AppointItemConfig appointItemConfig = AppointItemConfig.Get(itemId);
SetCustomAttrData(appointItemConfig);
id = itemConfig.EffectValueA1;
}
@@ -368,7 +368,7 @@
private float curProValue = 0;
private int GetEquipScore(PackType type, int itemId, Dictionary<AttrEnum, int> specAttrDict)
{
- tagChinModel = Config.Instance.Get<ItemConfig>(itemId);
+ tagChinModel = ItemConfig.Get(itemId);
if (tagChinModel == null || !GeneralDefine.CompareEquipPlaces.Contains(tagChinModel.EquipPlace)) return 0;
Equation.Instance.Clear();
@@ -462,7 +462,7 @@
{
foreach (var key in curEquipAttrDict.Keys)
{
- PlayerPropertyConfig propertyConfig = Config.Instance.Get<PlayerPropertyConfig>((int)key);
+ PlayerPropertyConfig propertyConfig = PlayerPropertyConfig.Get((int)key);
if (propertyConfig != null)
{
Equation.Instance.AddKeyValue(propertyConfig.Parameter, curEquipAttrDict[key]);
@@ -570,7 +570,7 @@
public bool CheckPreciousCondition(ItemModel itemModel)
{
bool isReach = true;
- WindowSearchConfig windowSearch = Config.Instance.Get<WindowSearchConfig>((int)itemModel.chinItemModel.Jump);
+ WindowSearchConfig windowSearch = WindowSearchConfig.Get((int)itemModel.chinItemModel.Jump);
if (windowSearch != null)
{
if (!FuncOpen.Instance.IsFuncOpen(windowSearch.Lv) && windowSearch.Lv != 0)
@@ -824,7 +824,7 @@
if (singlePack == null) return false;
int startLockIndex = singlePack.openGridCount - playerPack.InitBagGridCnt;
- FuncConfigConfig _tagFuncModel = Config.Instance.Get<FuncConfigConfig>("OpenBagItem");
+ FuncConfigConfig _tagFuncModel = FuncConfigConfig.Get("OpenBagItem");
int haveCount = playerPack.GetItemCountByID(PackType.rptItem, itemId);
Equation.Instance.Clear();
Equation.Instance.AddKeyValue("index", startLockIndex + 1);
@@ -1020,7 +1020,7 @@
{
if (playerPack.CheckIsDrugById(model.itemId))
{
- AttrFruitConfig fruitConfig = Config.Instance.Get<AttrFruitConfig>(model.itemId);
+ AttrFruitConfig fruitConfig = AttrFruitConfig.Get(model.itemId);
if (!playerPack.IsReachMaxUseDrug(fruitConfig)
&& model.chinItemModel.RealmLimit <= realmLv)
{
@@ -1069,7 +1069,7 @@
time = 0;
}
itemEffectTimelist.Add(guid);
- ItemConfig itemConfig = Config.Instance.Get<ItemConfig>(itemID);
+ ItemConfig itemConfig = ItemConfig.Get(itemID);
if (time >= itemConfig.ExpireTime)
{
KnapsackTimeCDMgr.Instance.UnRegister(guid);
@@ -1580,7 +1580,7 @@
{
wingsQualitys = null;
wingsRefineExps = null;
- ItemConfig itemConfig = Config.Instance.Get<ItemConfig>(itemId);
+ ItemConfig itemConfig = ItemConfig.Get(itemId);
wingRefineQualityDict = WingRefineAttrConfig.GetWingsQualityModel(itemConfig.LV);
if (useDataDic != null)
{
@@ -1638,7 +1638,7 @@
/// <returns></returns>
public int IsFightUp(int _itemID, int _score)//-1浣庣骇锛�0涓嶆槸鏈亴涓氾紝1鏇村ソ
{
- ItemConfig chinItemModel = Config.Instance.Get<ItemConfig>(_itemID);
+ ItemConfig chinItemModel = ItemConfig.Get(_itemID);
if (chinItemModel != null)
{
ItemModel putOnModel = null;
@@ -1737,7 +1737,7 @@
#region 鐗╁搧鏄惁杩囨湡
public bool IsOverdue(string guid, int itemId, Dictionary<int, List<int>> useDataDict = null)
{
- ItemConfig itemConfig = Config.Instance.Get<ItemConfig>(itemId);
+ ItemConfig itemConfig = ItemConfig.Get(itemId);
if (itemConfig == null) return false;
if (itemConfig.ExpireTime > 0)
--
Gitblit v1.8.0