Merge branch 'master' into ItemReconstruction

client_Wu Xijin

2019-02-26 dbceb10cd120b2121cb93b63d50d804bc6f02f16

 System/MainInterfacePanel/TaskAllocation.cs

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

                        {

                            taskmodel.CompletionOfTask(TaskID);

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

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

                            {

                                return;

                            }