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

client_Zxw

2018-08-14 53e8e14f53ad83005d5b382b82e238392b3a07cc

 System/Welfare/WelfareWin.cs

@@ -19,19 +19,13 @@
        [SerializeField] FunctionButton Btn_InSeven;

        [SerializeField] FunctionButton m_LevelGiftBtn;

        [SerializeField] FunctionButton m_ExchangeBtn;

        [SerializeField] FunctionButton m_BossReornBtn;

        [SerializeField] FunctionButton m_NpracticeBtn;

        [SerializeField] FunctionButton m_FairyJadeInvestment;

        [SerializeField] FunctionButtonGroup buttonGroup;

        [SerializeField] Button closeBtn;



        [SerializeField] Text m_MultipleRealmPointTitle;



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

        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

@@ -46,9 +40,7 @@
            Btn_InSeven.AddListener(InSeven);

            m_LevelGiftBtn.onClick.AddListener(OnLevelGift);

            m_ExchangeBtn.onClick.AddListener(OnExchange);

            m_NpracticeBtn.AddListener(OnNPractice);

            closeBtn.onClick.AddListener(CloseClick);

            m_BossReornBtn.AddListener(BossRebornBtn);

            m_FairyJadeInvestment.AddListener(FairyJade);

        }



@@ -94,21 +86,6 @@
            functionOrder = 3;

        }



        private void BossRebornBtn()

        {

            CloseChildWin();

            if (windowState == WindowState.Opened)

            {

                WindowCenter.Instance.OpenWithoutAnimation<BossRebornWin>();

            }

            else

            {

                WindowCenter.Instance.Open<BossRebornWin>();

            }



            functionOrder = 7;

        }



        private void FairyJade()

        {

            CloseChildWin();

@@ -135,22 +112,6 @@
                WindowCenter.Instance.Open<AwardExchangeWin>();

            }

            functionOrder = 6;

        }





        private void OnNPractice()

        {

            CloseChildWin();

            if (windowState == WindowState.Opened)

            {

                WindowCenter.Instance.OpenWithoutAnimation<NPracticePointWin>();

            }

            else

            {

                WindowCenter.Instance.Open<NPracticePointWin>();

            }

            multipleRealmModel.CheckShowRed(true);

            functionOrder = 8;

        }



        private void OnSignIn()

@@ -265,15 +226,10 @@
            {

                WindowCenter.Instance.CloseImmediately<AwardExchangeWin>();

            }

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

            {

                WindowCenter.Instance.CloseImmediately<NPracticePointWin>();

            }

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

            {

                WindowCenter.Instance.CloseImmediately<FairyJadeInvestmentWin>();

            }

            WindowCenter.Instance.CloseImmediately<BossRebornWin>();

        }



        private void OperationStartEvent(Operation arg1, int arg2)

@@ -283,28 +239,10 @@


        private void OperationEndEvent(Operation type, int state)

        {

            OperationBase operation;

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

            {

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

            }

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

            {

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

            }

        }



        void CheckOperationOpen()

        {

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



            OperationBase operation = null;

            bool isOpen = Open(Operation.MultipRealmPoint, out operation);

            m_NpracticeBtn.gameObject.SetActive(isOpen);

            if (isOpen)

            {

                m_MultipleRealmPointTitle.text = Language.Get("MultipleRealmPoint", Language.Get(StringUtility.Contact("Num_CHS_", (operation as OperationMultipleRealmPoint).multiplePractice)));

            }

        }



        public bool Open(Operation type,out OperationBase operation)