Merge branch 'master' into 1871天赋功能

client_linchunjie

2018-09-26 7da5f5b780af330ecda645f5538e0917bd9eeb01

 System/Debug/DebugController.cs

@@ -57,7 +57,7 @@


        public void OpenGM()

        {

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

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

            {

                WindowCenter.Instance.Open<GMInputWin>();

            }