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
---
Utility/UIHelper.cs | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/Utility/UIHelper.cs b/Utility/UIHelper.cs
index 7c971c9..00c7a5e 100644
--- a/Utility/UIHelper.cs
+++ b/Utility/UIHelper.cs
@@ -467,7 +467,7 @@
public static string GetRealmName(int realmLv, bool bright = false)
{
- var config = ConfigManager.Instance.GetTemplate<RealmConfig>(realmLv);
+ var config = Config.Instance.Get<RealmConfig>(realmLv);
if (config == null)
{
return string.Empty;
@@ -521,7 +521,7 @@
public static int GetItemColor(int _id, Dictionary<int, List<int>> _dict = null)
{
int _itemColor = 0;
- var _itemCfg = ConfigManager.Instance.GetTemplate<ItemConfig>(_id);
+ var _itemCfg = Config.Instance.Get<ItemConfig>(_id);
if (_itemCfg != null)
{
_itemColor = _itemCfg.ItemColor;
@@ -542,7 +542,7 @@
if (paraArray == null || paraArray.Length < 2 || paraArray.Length % 2 != 0) return 0;
for (int i = 0; i < paraArray.Length; i += 2)
{
- PlayerPropertyConfig cfg = ConfigManager.Instance.GetTemplate<PlayerPropertyConfig>(paraArray[i]);
+ PlayerPropertyConfig cfg = Config.Instance.Get<PlayerPropertyConfig>(paraArray[i]);
if (cfg != null)
{
if (paraArray[i] == 7)
@@ -556,7 +556,7 @@
}
}
}
- FuncConfigConfig funcCfg = ConfigManager.Instance.GetTemplate<FuncConfigConfig>(FightPowerFormula);
+ FuncConfigConfig funcCfg = Config.Instance.Get<FuncConfigConfig>(FightPowerFormula);
return Equation.Instance.Eval<uint>(funcCfg.Numerical1);
}
public static int GetFightPower(Dictionary<int, int> _propertyDict)
@@ -569,7 +569,7 @@
foreach (var _key in _propertyDict.Keys)
{
- PlayerPropertyConfig cfg = ConfigManager.Instance.GetTemplate<PlayerPropertyConfig>(_key);
+ PlayerPropertyConfig cfg = Config.Instance.Get<PlayerPropertyConfig>(_key);
if (cfg != null)
{
if (_key == 7)
@@ -584,13 +584,13 @@
if(_key == 11)
{
int playerLv = PlayerDatas.Instance.baseData.LV;
- FightPowerParamConfig paramConfig = ConfigManager.Instance.GetTemplate<FightPowerParamConfig>(playerLv);
+ FightPowerParamConfig paramConfig = Config.Instance.Get<FightPowerParamConfig>(playerLv);
Equation.Instance.AddKeyValue("AtkSpeedParameter", paramConfig.AtkSpeedParameter);
}
else if(_key == 15)
{
int playerLv = PlayerDatas.Instance.baseData.LV;
- FightPowerParamConfig paramConfig = ConfigManager.Instance.GetTemplate<FightPowerParamConfig>(playerLv);
+ FightPowerParamConfig paramConfig = Config.Instance.Get<FightPowerParamConfig>(playerLv);
Equation.Instance.AddKeyValue("LuckyHitParameter",paramConfig.LuckyHitParameter);
}
else
@@ -605,15 +605,15 @@
}
}
- FuncConfigConfig funcCfg = ConfigManager.Instance.GetTemplate<FuncConfigConfig>(FightPowerFormula);
+ FuncConfigConfig funcCfg = Config.Instance.Get<FuncConfigConfig>(FightPowerFormula);
return Equation.Instance.Eval<int>(funcCfg.Numerical1);
}
public static int GetFightPowerParmByAttrId(int attrId)
{
int playerLv = PlayerDatas.Instance.baseData.LV;
- FightPowerParamConfig paramConfig = ConfigManager.Instance.GetTemplate<FightPowerParamConfig>(playerLv);
- PlayerPropertyConfig cfg = ConfigManager.Instance.GetTemplate<PlayerPropertyConfig>(attrId);
+ FightPowerParamConfig paramConfig = Config.Instance.Get<FightPowerParamConfig>(playerLv);
+ PlayerPropertyConfig cfg = Config.Instance.Get<PlayerPropertyConfig>(attrId);
if (paramConfig == null || cfg == null) return 0;
switch(cfg.Parameter)
--
Gitblit v1.8.0