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/SkillPassWin.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/System/Skill/SkillPassWin.cs b/System/Skill/SkillPassWin.cs
index 189c92a..c112378 100644
--- a/System/Skill/SkillPassWin.cs
+++ b/System/Skill/SkillPassWin.cs
@@ -155,7 +155,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);
@@ -270,7 +270,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)
--
Gitblit v1.8.0