2453 【前端】充值、福利、活动界面整合2

client_Wu Xijin

2018-08-13 f01c97f6a8b70c693c64150587775f863e36fbfb

2453 【前端】充值、福利、活动界面整合2

 System/Welfare/WelfareWin.cs

@@ -19,7 +19,6 @@
        [SerializeField] FunctionButton Btn_InSeven;

        [SerializeField] FunctionButton m_LevelGiftBtn;

        [SerializeField] FunctionButton m_ExchangeBtn;

        [SerializeField] FunctionButton m_BossReornBtn;

        [SerializeField] FunctionButton m_FairyJadeInvestment;

        [SerializeField] FunctionButtonGroup buttonGroup;

        [SerializeField] Button closeBtn;

@@ -27,7 +26,6 @@
        InSevenDayModel m_InSevenDayModel;

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

    

        BossRebornModel bossRebornModel { get { return ModelCenter.Instance.GetModel<BossRebornModel>(); } }

        FairyJadeInvestmentModel m_FairyJadeInvestmentModel;

        FairyJadeInvestmentModel fairyJadeInvestmentModel { get { return m_FairyJadeInvestmentModel ?? (m_FairyJadeInvestmentModel = ModelCenter.Instance.GetModel<FairyJadeInvestmentModel>()); } }

        #region Built-in

@@ -43,7 +41,6 @@
            m_LevelGiftBtn.onClick.AddListener(OnLevelGift);

            m_ExchangeBtn.onClick.AddListener(OnExchange);

            closeBtn.onClick.AddListener(CloseClick);

            m_BossReornBtn.AddListener(BossRebornBtn);

            m_FairyJadeInvestment.AddListener(FairyJade);

        }



@@ -87,21 +84,6 @@
                WindowCenter.Instance.Open<LevelGiftWin>();

            }

            functionOrder = 3;

        }



        private void BossRebornBtn()

        {

            CloseChildWin();

            if (windowState == WindowState.Opened)

            {

                WindowCenter.Instance.OpenWithoutAnimation<BossRebornWin>();

            }

            else

            {

                WindowCenter.Instance.Open<BossRebornWin>();

            }



            functionOrder = 7;

        }



        private void FairyJade()

@@ -248,7 +230,6 @@
            {

                WindowCenter.Instance.CloseImmediately<FairyJadeInvestmentWin>();

            }

            WindowCenter.Instance.CloseImmediately<BossRebornWin>();

        }



        private void OperationStartEvent(Operation arg1, int arg2)

@@ -258,15 +239,10 @@


        private void OperationEndEvent(Operation type, int state)

        {

            if (type == Operation.BossReborn && !bossRebornModel.IsOpen() && WindowCenter.Instance.CheckOpen<BossRebornWin>())

            {

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

            }

        }



        void CheckOperationOpen()

        {

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

        }



        public bool Open(Operation type,out OperationBase operation)