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

client_Zxw

2018-09-26 cbe3d7c2cb4fbf96f3a2295351fa03ea14035499

 System/MainInterfacePanel/TipPanel.cs

@@ -51,7 +51,7 @@
        IEnumerator Co_GuideComplete()

        {

            yield return null;

            if (WindowCenter.Instance.CheckOpen<MainInterfaceWin>() && !NewBieCenter.Instance.inGuiding

            if (WindowCenter.Instance.IsOpen<MainInterfaceWin>() && !NewBieCenter.Instance.inGuiding

                && !WindowCenter.Instance.ExitAnyFullScreenOrMaskWin() && !StageManager.Instance.isLoading)

            {

                IsOPenTip();

@@ -61,7 +61,7 @@
        IEnumerator Co_Load()

        {

            yield return WaitingForSecondConst.WaitMS500;

            if (WindowCenter.Instance.CheckOpen<MainInterfaceWin>() && !NewBieCenter.Instance.inGuiding

            if (WindowCenter.Instance.IsOpen<MainInterfaceWin>() && !NewBieCenter.Instance.inGuiding

                && !WindowCenter.Instance.ExitAnyFullScreenOrMaskWin() && !StageManager.Instance.isLoading

                && StageManager.Instance.CurrentStage is DungeonStage)

            {

@@ -78,7 +78,7 @@
        public void IsOPenTip()

        {

            var inDungeon = IsDungeon();

            if (loginAdModel.CheckOpen() || WindowCenter.Instance.CheckOpen<LoginAdWin>())//广告

            if (loginAdModel.CheckOpen() || WindowCenter.Instance.IsOpen<LoginAdWin>())//广告

            {



            }

@@ -91,8 +91,8 @@
            {

                firstTimeRechargeModel.OpenFirstChargeTrialWin();

            }

            else if(!WindowCenter.Instance.CheckOpen<PetAndMountPushWin>()

                && !WindowCenter.Instance.CheckOpen<OffLineOnHookWin>()) //灵宠坐骑推送

            else if(!WindowCenter.Instance.IsOpen<PetAndMountPushWin>()

                && !WindowCenter.Instance.IsOpen<OffLineOnHookWin>()) //灵宠坐骑推送

            {

                storeModel.SetPushPetAndMountWinState();

            }