Merge branch 'master' into 1871天赋功能

client_linchunjie

2018-09-26 7da5f5b780af330ecda645f5538e0917bd9eeb01

 System/MainInterfacePanel/FlyingShoesTask.cs

@@ -561,7 +561,7 @@
            if (taskmodel.BountyDic.ContainsKey(_taskID))

            {

                int bountyNumber = TaskAllocation.Instance.ForRingNumber();

                if (bountyNumber == 10 && !WindowCenter.Instance.CheckOpen<TaskWin>())

                if (bountyNumber == 10 && !WindowCenter.Instance.IsOpen<TaskWin>())

                {

                    if (coinTaskTip.IsPopup)

                    {

@@ -573,7 +573,7 @@
            if (taskmodel.FairyAuDic.ContainsKey(_taskID))

            {

                int FairyNumber = TaskAllocation.Instance.FairyAuNumber();

                if (FairyNumber == 10 && !WindowCenter.Instance.CheckOpen<FairyWearWin>())

                if (FairyNumber == 10 && !WindowCenter.Instance.IsOpen<FairyWearWin>())

                {

                    WindowCenter.Instance.CloseImmediately<MainInterfaceWin>();

                    WindowCenter.Instance.Open<FairyAuTaskWin>();