Merge branch 'master' into 1871天赋功能

client_linchunjie

2018-09-26 7da5f5b780af330ecda645f5538e0917bd9eeb01

 System/MainInterfacePanel/TaskListTip.cs

@@ -217,7 +217,7 @@
        {

            TaskScheduling();

            var inDungeon = IsDungeon();

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

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

            {

                TaskAddAndDelete();

            }

@@ -304,7 +304,7 @@
        {

            var inDungeon = IsDungeon();

            TaskScheduling();

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

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

            {

                DeleteSort(_IdTask);

            }