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

client_Zxw

2018-09-26 cbe3d7c2cb4fbf96f3a2295351fa03ea14035499

 System/MainInterfacePanel/CoinTaskTipModel.cs

@@ -113,11 +113,11 @@
    private IEnumerator PopupPanel()

    {

        yield return WaitingForSecondConst.WaitMS1500;

        if (NewBieCenter.Instance.inGuiding || ModelCenter.Instance.GetModel<TreasureModel>().newGotShowing || WindowCenter.Instance.CheckOpen<TreasureLevelUpWin>())

        if (NewBieCenter.Instance.inGuiding || ModelCenter.Instance.GetModel<TreasureModel>().newGotShowing || WindowCenter.Instance.IsOpen<TreasureLevelUpWin>())

        {

            yield break;

        }

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

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

        {

            yield break;

        }

@@ -126,7 +126,7 @@
        {

            IsPopup = true;

        }  

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

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

        {

            WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.BountyInterface);

        }      

@@ -135,11 +135,11 @@
    private IEnumerator FairyAuTaskPanel()

    {

        yield return WaitingForSecondConst.WaitMS1500;

        if (NewBieCenter.Instance.inGuiding || ModelCenter.Instance.GetModel<TreasureModel>().newGotShowing || WindowCenter.Instance.CheckOpen<TreasureLevelUpWin>())

        if (NewBieCenter.Instance.inGuiding || ModelCenter.Instance.GetModel<TreasureModel>().newGotShowing || WindowCenter.Instance.IsOpen<TreasureLevelUpWin>())

        {

            yield break;

        }

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

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

        {

            yield break;

        }

@@ -148,7 +148,7 @@
        {

            IsFairy = true;

        }       

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

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

        {

            WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.UnionTask);

        }