Merge branch 'master' into 1871天赋功能

client_linchunjie

2018-09-26 7da5f5b780af330ecda645f5538e0917bd9eeb01

 System/MainInterfacePanel/FunctionForecastWin.cs

@@ -33,7 +33,7 @@


        protected override void OnPreOpen()

        {

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

            if (WindowCenter.Instance.IsOpen<CombatModeWin>())

            {

                WindowCenter.Instance.Close<CombatModeWin>();

            }