Merge branch 'master' into 1871天赋功能

client_linchunjie

2018-09-26 7da5f5b780af330ecda645f5538e0917bd9eeb01

 System/SystemSetting/SetFreeTimeWin.cs

@@ -76,7 +76,7 @@
          

            curHour = hour;

            curMinute = minute;

            if(!WindowCenter.Instance.CheckOpen<SetFreeTimeWin>())

            if(!WindowCenter.Instance.IsOpen<SetFreeTimeWin>())

            {

                WindowCenter.Instance.Open<SetFreeTimeWin>();

            }