Merge remote-tracking branch 'origin/master' into Skill_Polymorph_BeatBackP...

client_Hale

2018-08-22 2b47fde8e7902ddddd898309f281b9c310fc877f

 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)