Merge branch 'master' into HazyRegion_1

client_linchunjie

2019-05-21 2c74005b027588fb2f352012015e038d2eb82dba

 System/MainWin/SkillButton.cs

@@ -70,8 +70,10 @@
                m_Icon.SetSprite(skillConfig.IconName);
            }

            DisplaySkillDynamicInfo(true);
            m_CoolDown.gameObject.SetActive(false);
            m_CoolDownMask.gameObject.SetActive(false);
            m_Selected.gameObject.SetActive(false);
            DisplaySkillDynamicInfo(true);
            HideSkillTip();

            this.enabled = true;