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/Pet/PetAttributeMethods.cs | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/System/Pet/PetAttributeMethods.cs b/System/Pet/PetAttributeMethods.cs
index 8515d0e..6908bf4 100644
--- a/System/Pet/PetAttributeMethods.cs
+++ b/System/Pet/PetAttributeMethods.cs
@@ -221,7 +221,7 @@
petSkillUnlockLvlist.Clear();
petSkillIdlist.Clear();
petSkillIsUnlocklist.Clear();
- List<PetInfoConfig> list = ConfigManager.Instance.GetAllValues<PetInfoConfig>();
+ List<PetInfoConfig> list = Config.Instance.GetAllValues<PetInfoConfig>();
for (int i = 0; i < list.Count; i++)
{
if (petmodel._DicPetBack.ContainsKey(list[i].ID))
@@ -300,7 +300,7 @@
SkillButtonPet skillButton = cell.transform.GetChild(i).GetComponent<SkillButtonPet>();
FunctionUnlockFlyObjectTarget functionUnlockFlyObjectTarget = cell.transform.GetChild(i).GetComponent<FunctionUnlockFlyObjectTarget>();
int petId = 0;
- List<PetInfoConfig> list = ConfigManager.Instance.GetAllValues<PetInfoConfig>();
+ List<PetInfoConfig> list = Config.Instance.GetAllValues<PetInfoConfig>();
for (int j = 0; j < list.Count; j++)
{
int[] ids = ConfigParse.GetMultipleStr<int>(list[j].SkillID);
@@ -364,7 +364,7 @@
{
int _scoreNum = 0;
int _scoreNumAll = 0;
- PetInfoConfig config = ConfigManager.Instance.GetTemplate<PetInfoConfig>(petId);
+ PetInfoConfig config = Config.Instance.Get<PetInfoConfig>(petId);
InitFightPower += int.Parse(config.InitFightPower);
string[] strNumberSkill = config.SkillID.Split('|');
string[] strSkillUnLock = config.SkillUnLock.Split('|');
@@ -373,7 +373,7 @@
{
if (petmodel._DicPetBack[petId].PetClass >= int.Parse(strSkillUnLock[i]))
{
- SkillConfig skillconfig = ConfigManager.Instance.GetTemplate<SkillConfig>(int.Parse(strNumberSkill[i]));
+ SkillConfig skillconfig = Config.Instance.Get<SkillConfig>(int.Parse(strNumberSkill[i]));
if (skillconfig != null)
{
_scoreNum += skillconfig.FightPower;
@@ -394,7 +394,7 @@
if (petInfoConfig == null) return;
upgradeCostTip.SetActive(true);
- ItemConfig itemConfig = ConfigManager.Instance.GetTemplate<ItemConfig>(petmodel.petUpgradeToolId);
+ ItemConfig itemConfig = Config.Instance.Get<ItemConfig>(petmodel.petUpgradeToolId);
if (itemConfig != null)
{
m_PetDanIcon1.SetSprite(itemConfig.IconKey);
@@ -586,7 +586,7 @@
{
petmodel.curPetId = PetID;
isAutoTrain = false;
- petInfoConfig = ConfigManager.Instance.GetTemplate<PetInfoConfig>(PetID);
+ petInfoConfig = Config.Instance.Get<PetInfoConfig>(PetID);
LoadingShowNPC(PetID);
petAutoTrainText.text = Language.Get("PetWin_EvolveTrainBtn_6");
PetPanelAssignment(PetID);
@@ -611,7 +611,7 @@
}
typePetID = PetID;
timePlay = 0;
- var npcConfig = ConfigManager.Instance.GetTemplate<NPCConfig>(PetID);
+ var npcConfig = Config.Instance.Get<NPCConfig>(PetID);
UI3DModelExhibition.Instance.BeginShowNPC(PetID, npcConfig.UIModeLOffset, npcConfig.UIModelRotation, _rawImage);
if (UI3DModelExhibition.Instance.NpcModelPet != null)
{
@@ -633,7 +633,7 @@
public void PetPanelAssignment(int PetID, bool isRefresh = false)//鍏充簬闈㈡澘璧嬪�奸�夋嫨
{
- PetInfoConfig PetModel = ConfigManager.Instance.GetTemplate<PetInfoConfig>(PetID);
+ PetInfoConfig PetModel = Config.Instance.Get<PetInfoConfig>(PetID);
petAttrBtn.RemoveAllListeners();
if (petmodel._DicPetBack.ContainsKey(PetID))
{
@@ -675,8 +675,8 @@
{
FragmentUnlockTip.SetActive(true);
FullAttTip.SetActive(false);
- PetInfoConfig PetModel = ConfigManager.Instance.GetTemplate<PetInfoConfig>(PetID);
- ItemConfig _item = ConfigManager.Instance.GetTemplate<ItemConfig>(PetModel.UnLockNeedItemID);
+ PetInfoConfig PetModel = Config.Instance.Get<PetInfoConfig>(PetID);
+ ItemConfig _item = Config.Instance.Get<ItemConfig>(PetModel.UnLockNeedItemID);
ImageIcon.SetSprite(_item.IconKey);
m_BGM_Image.SetItemBackGround(_item.ItemColor);
if (playerPack.GetItemCountByID(PackType.rptItem, PetModel.UnLockNeedItemID) < PetModel.UnLockNeedItemCnt)
@@ -692,7 +692,7 @@
void FullOrderPanel(int PetID)
{
- PetInfoConfig PetModel = ConfigManager.Instance.GetTemplate<PetInfoConfig>(PetID);
+ PetInfoConfig PetModel = Config.Instance.Get<PetInfoConfig>(PetID);
PetClassCostConfig _tagPetClass = PetClassCostConfig.GetPetIdAndRank(PetID, PetModel.MaxRank);
FragmentUnlockTip.SetActive(false);
FullAttTip.SetActive(true);
--
Gitblit v1.8.0