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/Skill/SkillAccordWin.cs | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/System/Skill/SkillAccordWin.cs b/System/Skill/SkillAccordWin.cs
index 6755b2a..18d3503 100644
--- a/System/Skill/SkillAccordWin.cs
+++ b/System/Skill/SkillAccordWin.cs
@@ -209,7 +209,7 @@
void OnUpdateSltSkillInfo()
{
- SkillConfig cfg = ConfigManager.Instance.GetTemplate<SkillConfig>(model.presentSltSkillID);
+ SkillConfig cfg = Config.Instance.Get<SkillConfig>(model.presentSltSkillID);
m_ContainerSkillDetails.gameObject.SetActive(cfg != null);
m_ContainerUnselect.gameObject.SetActive(cfg == null);
if (cfg != null)
@@ -265,7 +265,7 @@
for (int i = 0; i < m_QuickSkills.Count; i++)
{
PlayerSkillData data = PlayerDatas.Instance.skill.GetQuickSkillByPos(i);
- SkillConfig skillCfg = ConfigManager.Instance.GetTemplate<SkillConfig>(intarray[i]);
+ SkillConfig skillCfg = Config.Instance.Get<SkillConfig>(intarray[i]);
if (data != null)
{
m_QuickSkills[i].skillData.SetSkillData(data.id);
@@ -291,7 +291,7 @@
if (skill == null)
{
int skillid = model.GetQuickBaseSkillArray(PlayerDatas.Instance.baseData.Job)[_index];
- SkillConfig skillCfg = ConfigManager.Instance.GetTemplate<SkillConfig>(skillid);
+ SkillConfig skillCfg = Config.Instance.Get<SkillConfig>(skillid);
if (skillCfg != null)
{
MessageWin.Inst.ShowFixedTip(Language.Get("L1115", skillCfg.Skillsource));
@@ -382,7 +382,7 @@
if (!m_DragImg.gameObject.activeSelf)
{
m_DragImg.gameObject.SetActive(true);
- SkillConfig cfg = ConfigManager.Instance.GetTemplate<SkillConfig>(model.skillDragId);
+ SkillConfig cfg = Config.Instance.Get<SkillConfig>(model.skillDragId);
if (cfg != null)
{
m_DragSkillImg.SetSprite(cfg.IconName);
@@ -477,7 +477,7 @@
m_AchieveSkillId = 0;
if (AchievementGoto.achievementType == AchievementGoto.ExcuteSkill)
{
- var _cfg = ConfigManager.Instance.GetTemplate<SuccessConfig>(AchievementGoto.guideAchievementId);
+ var _cfg = Config.Instance.Get<SuccessConfig>(AchievementGoto.guideAchievementId);
var _skillId = ModelCenter.Instance.GetModel<AchievementModel>().FindSkillByJob(_cfg.Condition, PlayerDatas.Instance.baseData.Job);
if (_skillId != 0)
{
--
Gitblit v1.8.0