Merge branch 'master' into 1871天赋功能

client_linchunjie

2018-09-26 7da5f5b780af330ecda645f5538e0917bd9eeb01

 System/Skill/SkillPanel.cs

@@ -129,10 +129,10 @@


        void CloseChild()

        {

            if (WindowCenter.Instance.CheckOpen<SkillAccordWin>()) {

            if (WindowCenter.Instance.IsOpen<SkillAccordWin>()) {

                WindowCenter.Instance.CloseImmediately<SkillAccordWin>();

            }

            if (WindowCenter.Instance.CheckOpen<SkillPassWin>()) {

            if (WindowCenter.Instance.IsOpen<SkillPassWin>()) {

                WindowCenter.Instance.CloseImmediately<SkillPassWin>();

            }

            if (WindowCenter.Instance.CheckOpen<TalentWin>())