Merge branch 'master' into 1871天赋功能

client_linchunjie

2018-09-26 7da5f5b780af330ecda645f5538e0917bd9eeb01

 System/MainInterfacePanel/TaskWin.cs

@@ -86,7 +86,7 @@
        private void OnPlayerDie()

        {

            CloseImmediately();

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

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

            {

                WindowCenter.Instance.Open<MainInterfaceWin>();

            }