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/SkillButtonPet.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/System/Pet/SkillButtonPet.cs b/System/Pet/SkillButtonPet.cs
index df43403..2673e3c 100644
--- a/System/Pet/SkillButtonPet.cs
+++ b/System/Pet/SkillButtonPet.cs
@@ -21,7 +21,7 @@
public void SetModel(int skillId, int skillUnlock, bool isUnlock, int petId, SkillType skillType, bool isAll = false)
{
- SkillConfig skillConfig = ConfigManager.Instance.GetTemplate<SkillConfig>(skillId);
+ SkillConfig skillConfig = Config.Instance.Get<SkillConfig>(skillId);
if (skillConfig == null) return;
skillIcon.SetSprite(skillConfig.IconName);
@@ -56,14 +56,14 @@
switch (skillType)
{
case SkillType.PetSkill:
- PetInfoConfig petInfo = ConfigManager.Instance.GetTemplate<PetInfoConfig>(petId);
+ PetInfoConfig petInfo = Config.Instance.Get<PetInfoConfig>(petId);
if (petInfo != null)
{
str[2] = Language.Get("pet_SkillTipLv", petInfo.Name, skillUnlock);
}
break;
case SkillType.MountSkill:
- HorseConfig horseInfo = ConfigManager.Instance.GetTemplate<HorseConfig>(petId);
+ HorseConfig horseInfo = Config.Instance.Get<HorseConfig>(petId);
if (horseInfo != null)
{
str[2] = Language.Get("pet_SkillTipLv", horseInfo.Name, skillUnlock);
--
Gitblit v1.8.0