Merge branch 'master' into 1871天赋功能

client_linchunjie

2018-09-26 7da5f5b780af330ecda645f5538e0917bd9eeb01

 System/MainInterfacePanel/TaskAllocation.cs

@@ -133,7 +133,7 @@
                        if (Gold >= NeedMoney)

                        {

                            taskmodel.CompletionOfTask(TaskID);

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

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

                            {

                                return;

                            }