Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_Zxw

2018-09-26 cbe3d7c2cb4fbf96f3a2295351fa03ea14035499

 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>();