2453【前端】消费返利迁移至精彩活动界面

client_linchunjie

2018-08-13 63d124b1e44386a9fcd016c3687b1dc78cf52bf6

 System/Welfare/WelfareWin.cs

@@ -20,7 +20,6 @@
        [SerializeField] FunctionButton m_LevelGiftBtn;

        [SerializeField] FunctionButton m_ExchangeBtn;

        [SerializeField] FunctionButton m_MultipleExpBtn;

        [SerializeField] FunctionButton m_ConsumeRebateBtn;

        [SerializeField] FunctionButton m_BossReornBtn;

        [SerializeField] FunctionButton m_NpracticeBtn;

        [SerializeField] FunctionButtonGroup buttonGroup;

@@ -31,7 +30,6 @@


        MultipleExpModel multipleExpModel { get { return ModelCenter.Instance.GetModel<MultipleExpModel>(); } }

        MultipleRealmPointModel multipleRealmModel { get { return ModelCenter.Instance.GetModel<MultipleRealmPointModel>(); } }

        ConsumeRebateModel consumeRebateModel { get { return ModelCenter.Instance.GetModel<ConsumeRebateModel>(); } }

        InSevenDayModel m_InSevenDayModel;

        InSevenDayModel inSevenDay { get { return m_InSevenDayModel ?? (m_InSevenDayModel = ModelCenter.Instance.GetModel<InSevenDayModel>()); } }

    

@@ -52,7 +50,6 @@
            m_NpracticeBtn.AddListener(OnNPractice);

            closeBtn.onClick.AddListener(CloseClick);

            m_MultipleExpBtn.onClick.AddListener(OnMultipleExp);

            m_ConsumeRebateBtn.onClick.AddListener(ConsumeRebateBtn);

            m_BossReornBtn.AddListener(BossRebornBtn);

        }



@@ -96,20 +93,6 @@
                WindowCenter.Instance.Open<LevelGiftWin>();

            }

            functionOrder = 3;

        }



        private void ConsumeRebateBtn()

        {

            CloseChildWin();

            if (windowState == WindowState.Opened)

            {

                WindowCenter.Instance.OpenWithoutAnimation<ConsumeRebateWin>();

            }

            else

            {

                WindowCenter.Instance.Open<ConsumeRebateWin>();

            }

            functionOrder = 4;

        }



        private void BossRebornBtn()

@@ -262,10 +245,6 @@
            {

                WindowCenter.Instance.CloseImmediately<MultipleExpWin>();

            }

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

            {

                WindowCenter.Instance.CloseImmediately<ConsumeRebateWin>();

            }

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

            {

                WindowCenter.Instance.CloseImmediately<NPracticePointWin>();

@@ -289,10 +268,6 @@
            {

                buttonGroup.TriggerByOrder(WelfareCenter.Instance.GetWelfareFuncOrder());

            }

            else if (type == Operation.ConsumeRebate && !consumeRebateModel.IsOpen && WindowCenter.Instance.CheckOpen<ConsumeRebateWin>())

            {

                buttonGroup.TriggerByOrder(WelfareCenter.Instance.GetWelfareFuncOrder());

            }

            else if (type == Operation.MultipRealmPoint && !Open(Operation.MultipRealmPoint, out operation) && WindowCenter.Instance.CheckOpen<NPracticePointWin>())

            {

                buttonGroup.TriggerByOrder(WelfareCenter.Instance.GetWelfareFuncOrder());

@@ -302,7 +277,6 @@
        void CheckOperationOpen()

        {

            m_MultipleExpBtn.gameObject.SetActive(multipleExpModel.Open());

            m_ConsumeRebateBtn.gameObject.SetActive(consumeRebateModel.IsOpen);

            m_BossReornBtn.gameObject.SetActive(bossRebornModel.IsOpen());



            if (multipleExpModel.Open())