Merge branch 'master' into 1871天赋功能

client_linchunjie

2018-09-26 7da5f5b780af330ecda645f5538e0917bd9eeb01

 System/Vip/VipModel.cs

@@ -60,7 +60,7 @@
        {

            TimeMgr.Instance.UnRegister(TimeMgr.SyntonyType.VipExperirnceOverdue);

            m_VipExperienceTime = 0;

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

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

            {

                WindowCenter.Instance.CloseImmediately<GotoChargeWin>();

            }

@@ -117,10 +117,10 @@
        {

            yield return WaitingForSecondConst.WaitMS1000;

            waitingJump = false;

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

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

                && StageManager.Instance.CurrentStage is DungeonStage && !deadModel.playerIsDie)

            {

                if (!WindowCenter.Instance.CheckOpen<VipRechargeWin>())

                if (!WindowCenter.Instance.IsOpen<VipRechargeWin>())

                {

                    WindowJumpMgr.Instance.ClearJumpData();

                    WindowCenter.Instance.CloseAll(WindowCenter.CloseAllIgnoreType.BaseAndCustom);

@@ -133,15 +133,15 @@
        private void OnChargeComplete()

        {

            m_ChargeReset = true;

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

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

            {

                WindowCenter.Instance.CloseImmediately<RechargeBoxWin>();

            }

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

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

            {

                WindowCenter.Instance.CloseImmediately<SupremeRechargeWin>();

            }

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

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

            {

                WindowCenter.Instance.CloseImmediately<FirstRechargeWin>();

                WindowCenter.Instance.Open<MainInterfaceWin>();

@@ -540,7 +540,7 @@
        {

            vipWinType = type;

            var _order = (int)vipWinType;

            if (!WindowCenter.Instance.CheckOpen<VipRechargeWin>())

            if (!WindowCenter.Instance.IsOpen<VipRechargeWin>())

            {

                WindowCenter.Instance.Open<VipRechargeWin>(false, _order);

            }

@@ -708,7 +708,7 @@
            }

            m_ChargeReset = false;

            beforeCTGTime = DateTime.Now;

            if (!WindowCenter.Instance.CheckOpen<GotoChargeWin>())

            if (!WindowCenter.Instance.IsOpen<GotoChargeWin>())

            {

                WindowCenter.Instance.Open<GotoChargeWin>(true);

            }

@@ -731,7 +731,7 @@
            {

                SetViewedRechargeGift();

            }

            if (!WindowCenter.Instance.CheckOpen<RechargeBoxWin>())

            if (!WindowCenter.Instance.IsOpen<RechargeBoxWin>())

            {

                WindowCenter.Instance.Open<RechargeBoxWin>();

            }

@@ -820,11 +820,11 @@


        private void CheckOpenFirstRechargeWin()

        {

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

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

            {

                return;

            }

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

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

            {

                if (PlayerDatas.Instance.baseData.coinPointTotal > 0 && !firstChargeRewardGet

                                && firstRechargeOpen && !WindowCenter.Instance.ExitAnyFullScreenOrMaskWin())