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/Mount/MountPanelAssignment.cs | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/System/Mount/MountPanelAssignment.cs b/System/Mount/MountPanelAssignment.cs
index b6f31f3..8ed5334 100644
--- a/System/Mount/MountPanelAssignment.cs
+++ b/System/Mount/MountPanelAssignment.cs
@@ -163,14 +163,14 @@
private void OnClickDeblockingButton()
{
- FuncConfigConfig _tagfun = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("HorseUpItem");
- ItemConfig _tagchine = ConfigManager.Instance.GetTemplate<ItemConfig>(int.Parse(_tagfun.Numerical1));
+ FuncConfigConfig _tagfun = Config.Instance.Get<FuncConfigConfig>("HorseUpItem");
+ ItemConfig _tagchine = Config.Instance.Get<ItemConfig>(int.Parse(_tagfun.Numerical1));
GetItemPath.SetChinItemModel(_tagchine.ID);
}
private void OnClickNotUnlockButton()
{
- HorseConfig _Horse = ConfigManager.Instance.GetTemplate<HorseConfig>(pitchOnHorseID);
- ItemConfig _item = ConfigManager.Instance.GetTemplate<ItemConfig>(_Horse.UnlockItemID);
+ HorseConfig _Horse = Config.Instance.Get<HorseConfig>(pitchOnHorseID);
+ ItemConfig _item = Config.Instance.Get<ItemConfig>(_Horse.UnlockItemID);
GetItemPath.SetPetMatUnlockModel(_item.ID);
}
public void PanelAssignment(int mountID)
@@ -194,7 +194,7 @@
}
if (HorseID != mount_ID)
{
- HorseConfig _model = ConfigManager.Instance.GetTemplate<HorseConfig>(HorseID);
+ HorseConfig _model = Config.Instance.Get<HorseConfig>(HorseID);
UI3DModelExhibition.Instance.BeginShowHourse(_model.Model, m_MountRawImg);
mount_ID = HorseID;
if (UI3DModelExhibition.Instance.NpcModelHorse != null)
@@ -275,7 +275,7 @@
int initialForce = 0;
foreach (var key in mountModel._DicHorse.Keys)
{
- HorseConfig horseConfig = ConfigManager.Instance.GetTemplate<HorseConfig>(key);
+ HorseConfig horseConfig = Config.Instance.Get<HorseConfig>(key);
initialForce += horseConfig.InitFightPower;
}
Dictionary<int, int> AddPowerDic = new Dictionary<int, int>();
@@ -297,7 +297,7 @@
{
if (mountModel._DicMountItem[key] != 0)
{
- ItemConfig itemModel = ConfigManager.Instance.GetTemplate<ItemConfig>(key);
+ ItemConfig itemModel = Config.Instance.Get<ItemConfig>(key);
if (dic.ContainsKey(itemModel.Effect1))
{
dic[itemModel.Effect1] += itemModel.EffectValueA1 * mountModel._DicMountItem[key];
@@ -332,7 +332,7 @@
}
if (mountModel._DicHorse.ContainsKey(mountID))
{
- var configHorse = ConfigManager.Instance.GetTemplate<HorseConfig>(mountID);
+ var configHorse = Config.Instance.Get<HorseConfig>(mountID);
if (mountModel._DicHorse[mountID].Lv >= configHorse.MaxLV)
{
m_ManJie.SetActive(true);
@@ -362,13 +362,13 @@
m_YiJieSuo.SetActive(false);
m_Deblocking.SetActive(true);
m_TrainButtonGroup.SetActive(false);
- HorseConfig _Horse = ConfigManager.Instance.GetTemplate<HorseConfig>(mountID);
- ItemConfig _item = ConfigManager.Instance.GetTemplate<ItemConfig>(_Horse.UnlockItemID);
+ HorseConfig _Horse = Config.Instance.Get<HorseConfig>(mountID);
+ ItemConfig _item = Config.Instance.Get<ItemConfig>(_Horse.UnlockItemID);
m_NotUnlockImageBG.SetSprite(_item.IconKey);
m_ImmageBG.SetItemBackGround(_item.ItemColor);
- int UnlockItemID = ConfigManager.Instance.GetTemplate<HorseConfig>(mountID).UnlockItemID;
+ int UnlockItemID = Config.Instance.Get<HorseConfig>(mountID).UnlockItemID;
int MaterialNumber = playerPack.GetItemCountByID(PackType.rptItem, UnlockItemID);//鑾峰彇鑳屽寘瑙ｉ攣鏉愭枡鐨勬暟閲�
- int UnlockItemCnt = ConfigManager.Instance.GetTemplate<HorseConfig>(mountID).UnlockItemCnt;
+ int UnlockItemCnt = Config.Instance.Get<HorseConfig>(mountID).UnlockItemCnt;
if (MaterialNumber >= UnlockItemCnt)
{
m_NotUnlockTxt.text = "<color=#fffaf0>" + MaterialNumber + "/" + UnlockItemCnt + "</color>";
@@ -384,7 +384,7 @@
if (mountModel._DicHorse.ContainsKey(mountID))
{
m_BottomOperate.SetActive(true);
- int horseMaxLv = ConfigManager.Instance.GetTemplate<HorseConfig>(mountID).MaxLV;
+ int horseMaxLv = Config.Instance.Get<HorseConfig>(mountID).MaxLV;
if (mountModel._DicHorse[mountID].Lv >= horseMaxLv)
{
m_ExpNum.text = Language.Get("Z1029");
@@ -578,8 +578,8 @@
private void TheMountButton()
{
- FuncConfigConfig _tagfun = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("HorseUpItem");
- ItemConfig _tagchine = ConfigManager.Instance.GetTemplate<ItemConfig>(int.Parse(_tagfun.Numerical1));
+ FuncConfigConfig _tagfun = Config.Instance.Get<FuncConfigConfig>("HorseUpItem");
+ ItemConfig _tagchine = Config.Instance.Get<ItemConfig>(int.Parse(_tagfun.Numerical1));
IconImage1.SetSprite(_tagchine.IconKey);
int mountDanNum = playerPack.GetItemCountByID(PackType.rptItem, int.Parse(_tagfun.Numerical1));
m_Text1.text = string.Format(Language.Get("Remaining_Z1"), mountDanNum);
@@ -590,7 +590,7 @@
int fightNum = 0;
if (IsDeblocking(SkillID))
{
- SkillConfig skillconfig = ConfigManager.Instance.GetTemplate<SkillConfig>(SkillID);
+ SkillConfig skillconfig = Config.Instance.Get<SkillConfig>(SkillID);
fightNum = skillconfig.FightPower;
}
return fightNum;
--
Gitblit v1.8.0