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

client_Zxw

2018-08-13 498ec5c5d03765bbd87c3f75cbe68dd0d413baf9

 System/Welfare/WelfareWin.cs

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

        [SerializeField] FunctionButton m_LevelGiftBtn;

        [SerializeField] FunctionButton m_ExchangeBtn;

        [SerializeField] FunctionButton m_MultipleExpBtn;

        [SerializeField] FunctionButton m_BossReornBtn;

        [SerializeField] FunctionButton m_NpracticeBtn;

        [SerializeField] FunctionButtonGroup buttonGroup;

        [SerializeField] Button closeBtn;



        [SerializeField] Text m_MultipleExtTitle;

        [SerializeField] Text m_MultipleRealmPointTitle;



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

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

        InSevenDayModel m_InSevenDayModel;

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

@@ -49,7 +46,6 @@
            m_ExchangeBtn.onClick.AddListener(OnExchange);

            m_NpracticeBtn.AddListener(OnNPractice);

            closeBtn.onClick.AddListener(CloseClick);

            m_MultipleExpBtn.onClick.AddListener(OnMultipleExp);

            m_BossReornBtn.AddListener(BossRebornBtn);

        }



@@ -140,19 +136,6 @@
            functionOrder = 8;

        }



        private void OnMultipleExp()

        {

            CloseChildWin();

            if (windowState == WindowState.Opened)

            {

                WindowCenter.Instance.OpenWithoutAnimation<MultipleExpWin>();

            }

            else

            {

                WindowCenter.Instance.Open<MultipleExpWin>();

            }

            functionOrder = 5;

        }

        private void OnSignIn()

        {

            CloseChildWin();

@@ -187,10 +170,6 @@
        protected override void OnActived()

        {

            base.OnActived();

            //if (!Btn_InSeven.gameObject.activeInHierarchy)

            //{

            //    functionOrder = 2;

            //}

            buttonGroup.TriggerByOrder(functionOrder);

        }



@@ -241,10 +220,6 @@
            {

                WindowCenter.Instance.CloseImmediately<AwardExchangeWin>();

            }

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

            {

                WindowCenter.Instance.CloseImmediately<MultipleExpWin>();

            }

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

            {

                WindowCenter.Instance.CloseImmediately<NPracticePointWin>();

@@ -260,11 +235,7 @@
        private void OperationEndEvent(Operation type, int state)

        {

            OperationBase operation;

            if (type == Operation.MultipleExp && !multipleExpModel.Open() && WindowCenter.Instance.CheckOpen<MultipleExpWin>())

            {

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

            }

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

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

            {

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

            }

@@ -276,17 +247,7 @@


        void CheckOperationOpen()

        {

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

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



            if (multipleExpModel.Open())

            {

                OperationBase operationBase;

                if (OperationTimeHepler.Instance.TryGetOperationTime(Operation.MultipleExp, out operationBase))

                {

                    m_MultipleExtTitle.text = Language.Get("ExpActivity_Text5", (operationBase as OperationMultiExp).GetMultipleCHS());

                }

            }



            OperationBase operation = null;

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