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

client_linchunjie

2018-08-13 63d124b1e44386a9fcd016c3687b1dc78cf52bf6

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

 System/OpenServerActivity/ImpactRankModel.cs

@@ -633,6 +633,8 @@
        OSTimeLimitGiftModel timeLimitGiftModel { get { return ModelCenter.Instance.GetModel<OSTimeLimitGiftModel>(); } }

        FlashSaleModel flashSaleModel { get { return ModelCenter.Instance.GetModel<FlashSaleModel>(); } }



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



        public event Action openServerActivityStateChange;



        public OpenServerActivityCenter()

@@ -693,6 +695,11 @@
                _functionOrder = 0;

                return true;

            }

            if (IsConsumeRebateOpen())

            {

                _functionOrder = 1;

                return true;

            }

            if (IsRedEnvelopeOpen())

            {

                _functionOrder = 2;

@@ -744,6 +751,11 @@
            return false;

        }



        public bool IsConsumeRebateOpen()

        {

            return consumeRebateModel.IsOpen;

        }



        public void ProcessErrorTip()

        {

            SysNotifyMgr.Instance.ShowTip("ActiveOutTime");


 System/OpenServerActivity/OpenServerActivityWin.cs

@@ -12,8 +12,7 @@
        [SerializeField] ScrollerController m_ActivityCtrl;

        [SerializeField] Button m_BtnClose;

        [SerializeField] Image m_TitleIcon;



        readonly int[] sortArray = new int[] { 3, 4, 0, 1, 2 };

        [SerializeField, Header("排序")] List<int> m_SortArray;



        Dictionary<int, bool> m_ActivitySpreadDict = new Dictionary<int, bool>();



@@ -46,6 +45,11 @@


        FlashSaleModel flashSaleModel { get { return ModelCenter.Instance.GetModel<FlashSaleModel>(); } }



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



        List<int> openActivitys = new List<int>();

        List<int> activityReds = new List<int>();



        protected override void BindController()

        {



@@ -60,15 +64,14 @@
        protected override void OnPreOpen()

        {

            TimeUtility.OnServerOpenDayRefresh += OnStepServerDayEvent;

            for (int i = 0; i < sortArray.Length; i++)

            for (int i = 0; i < m_SortArray.Count; i++)

            {

                m_ActivitySpreadDict[sortArray[i]] = false;

                m_ActivitySpreadDict[m_SortArray[i]] = false;

            }

            impactRankModel.presentSelectType = impactRankModel.GetDefaultSelectType();

            impactRankModel.gotoImpactRankType = 0;

            envelopeModel.selectType = 1;

            UpdateFunctionBtns();

            m_TitleIcon.SetSprite(OpenServerActivityCenter.Instance.IsFlashSaleTitle() ? "XT_KF_32" : "XT_KF_9");

        }



        protected override void OnActived()

@@ -79,98 +82,18 @@
            }

            if (functionOrder == 0 && !WindowJumpMgr.Instance.IsJumpState)

            {

                bool _step = false;



                functionOrder = 3;

                if (OpenServerActivityCenter.Instance.IsTimeLimitGiftOpen())

                functionOrder = GetDefaultSelect();

                for (int i = 0; i < m_SortArray.Count; i++)

                {

                    if (timeLimitGiftModel.redpoint.state == RedPointState.Simple)

                    {

                        functionOrder = 3;

                        _step = true;

                    }

                }

                else if (!OpenServerActivityCenter.Instance.IsTimeLimitGiftOpen())

                {

                    functionOrder = 4;

                }



                if (!_step && OpenServerActivityCenter.Instance.IsFlashSaleOpen())

                {

                    if (flashSaleModel.flashSaleRedpoint.state == RedPointState.Simple)

                    {

                        functionOrder = 4;

                    }

                }

                else if (!OpenServerActivityCenter.Instance.IsFlashSaleOpen() && functionOrder == 4)

                {

                    functionOrder = 0;

                }





                if (!_step && OpenServerActivityCenter.Instance.IsImpactRankOpen() && impactRankModel.HasRedpoint())

                {

                    functionOrder = 0;

                    _step = true;

                }

                else if (!OpenServerActivityCenter.Instance.IsImpactRankOpen() && functionOrder == 0)

                {

                    functionOrder = 2;

                }



                if (!_step && OpenServerActivityCenter.Instance.IsRedEnvelopeOpen())

                {

                    if (envelopeModel.m_RedAchieveRedpoint.state == RedPointState.Simple)

                    {

                        functionOrder = 2;

                        envelopeModel.selectType = 1;

                        _step = true;

                    }

                    else if (envelopeModel.m_OpenServerGetRedpin.state == RedPointState.Simple)

                    {

                        functionOrder = 2;

                        envelopeModel.selectType = 2;

                        _step = true;

                    }

                }

                else if (!OpenServerActivityCenter.Instance.IsRedEnvelopeOpen() && functionOrder == 2)

                {

                    DesignDebug.Log("是不是逻辑有错误");

                }



                //if (!_step && OpenServerActivityCenter.Instance.IsTimeLimitGiftOpen())

                //{

                //    if (timeLimitGiftModel.redpoint.state == RedPointState.Simple)

                //    {

                //        functionOrder = 3;

                //        _step = true;

                //    }

                //}

                //else if (!OpenServerActivityCenter.Instance.IsTimeLimitGiftOpen() && functionOrder == 3)

                //{

                //    functionOrder = 4;

                //}

                //

                //if (!_step && OpenServerActivityCenter.Instance.IsFlashSaleOpen())

                //{

                //

                //}

                //else if (!OpenServerActivityCenter.Instance.IsFlashSaleOpen() && functionOrder == 4)

                //{

                //    DesignDebug.Log("是不是逻辑有错误");

                //}



                for (int i = 0; i < sortArray.Length; i++)

                {

                    m_ActivitySpreadDict[sortArray[i]] = sortArray[i] == functionOrder;

                    m_ActivitySpreadDict[m_SortArray[i]] = m_SortArray[i] == functionOrder;

                }

                UpdateFunctionBtns();

            }

            else

            {

                for (int i = 0; i < sortArray.Length; i++)

                for (int i = 0; i < m_SortArray.Count; i++)

                {

                    m_ActivitySpreadDict[sortArray[i]] = sortArray[i] == functionOrder;

                    m_ActivitySpreadDict[m_SortArray[i]] = m_SortArray[i] == functionOrder;

                }

                if (functionOrder == 2)

                {

@@ -199,6 +122,74 @@
        {



        }



        int GetDefaultSelect()

        {

            openActivitys.Clear();

            activityReds.Clear();

            if (OpenServerActivityCenter.Instance.IsTimeLimitGiftOpen())

            {

                openActivitys.Add(3);

                if (timeLimitGiftModel.redpoint.state == RedPointState.Simple)

                {

                    activityReds.Add(3);

                }

            }



            if (OpenServerActivityCenter.Instance.IsFlashSaleOpen())

            {

                openActivitys.Add(4);

                if (flashSaleModel.flashSaleRedpoint.state == RedPointState.Simple)

                {

                    activityReds.Add(4);

                }

            }



            if (OpenServerActivityCenter.Instance.IsImpactRankOpen())

            {

                openActivitys.Add(0);

                if (impactRankModel.HasRedpoint())

                {

                    activityReds.Add(0);

                }

            }



            if (OpenServerActivityCenter.Instance.IsRedEnvelopeOpen())

            {

                openActivitys.Add(2);

                if (envelopeModel.m_RedAchieveRedpoint.state == RedPointState.Simple)

                {

                    activityReds.Add(2);

                    envelopeModel.selectType = 1;

                }

                else if (envelopeModel.m_OpenServerGetRedpin.state == RedPointState.Simple)

                {

                    activityReds.Add(2);

                    envelopeModel.selectType = 2;

                }

            }



            if (OpenServerActivityCenter.Instance.IsConsumeRebateOpen())

            {

                openActivitys.Add(1);

                if (consumeRebateModel.consumeRebateRedpoint.state == RedPointState.Simple)

                {

                    activityReds.Add(1);

                }

            }



            if (activityReds.Count > 0)

            {

                activityReds.Sort(Compare);

                return activityReds[0];

            }

            else

            {

                openActivitys.Sort(Compare);

                return openActivitys[0];

            }

        }



        private void OnOpenServerActivityRefresh(ScrollerDataType type, CellView cell)

        {

            switch (type)

@@ -259,9 +250,9 @@
        private void UpdateFunctionBtns()

        {

            m_ActivityCtrl.Refresh();

            for (int i = 0; i < sortArray.Length; i++)

            for (int i = 0; i < m_SortArray.Count; i++)

            {

                var sort = sortArray[i];

                var sort = m_SortArray[i];

                switch (sort)

                {

                    case 0:

@@ -284,6 +275,11 @@
                        }

                        break;

                    case 1:

                        if (!OpenServerActivityCenter.Instance.IsConsumeRebateOpen())

                        {

                            continue;

                        }

                        m_ActivityCtrl.AddCell(ScrollerDataType.Header, sort);

                        continue;

                    case 2:

                        if (!OpenServerActivityCenter.Instance.IsRedEnvelopeOpen())

@@ -352,6 +348,14 @@
                    }

                    break;

                case 1:

                    if (windowState == WindowState.Opened)

                    {

                        WindowCenter.Instance.OpenWithoutAnimation<ConsumeRebateWin>();

                    }

                    else

                    {

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

                    }

                    break;

                case 2:

                    if (windowState == WindowState.Opened)

@@ -404,22 +408,18 @@


        private void CloseOtherWin()

        {

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

            {

                WindowCenter.Instance.CloseImmediately<ImpactRankWin>();

            }

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

            {

                WindowCenter.Instance.CloseImmediately<OpenServerRedEnvelopeWin>();

            }

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

            {

                WindowCenter.Instance.CloseImmediately<OSTimeLimitGiftWin>();

            }

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

            {

                WindowCenter.Instance.CloseImmediately<FlashSaleWin>();

            }

            WindowCenter.Instance.CloseImmediately<ImpactRankWin>();

            WindowCenter.Instance.CloseImmediately<OpenServerRedEnvelopeWin>();

            WindowCenter.Instance.CloseImmediately<OSTimeLimitGiftWin>();

            WindowCenter.Instance.CloseImmediately<FlashSaleWin>();

            WindowCenter.Instance.CloseImmediately<ConsumeRebateWin>();

        }



        private int Compare(int x, int y)

        {

            var index_x = m_SortArray.IndexOf(x);

            var index_y = m_SortArray.IndexOf(y);

            return index_x.CompareTo(index_y);

        }

    }

}


 System/Welfare/ConsumeRebateModel.cs

@@ -162,7 +162,7 @@
            return costTotal;

        }



        public Redpoint consumeRebateRedpoint = new Redpoint(201, 20105);

        public Redpoint consumeRebateRedpoint = new Redpoint(MainRedDot.REDPOINT_OPENSERVER, 20901);

        private void UpdateRedpoint()

        {

            consumeRebateRedpoint.state = RedPointState.None;


 System/Welfare/WelfareCenter.cs

@@ -13,8 +13,6 @@


        InSevenDayModel sevenDayModel { get { return ModelCenter.Instance.GetModel<InSevenDayModel>(); } }



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



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



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

@@ -64,13 +62,6 @@
            {

                WindowCenter.Instance.Close<MainInterfaceWin>();

                WindowCenter.Instance.Open<WelfareWin>(false, 3);

                return;

            }



            if (rebateModel.IsOpen && rebateModel.consumeRebateRedpoint.state == RedPointState.Simple)

            {

                WindowCenter.Instance.Close<MainInterfaceWin>();

                WindowCenter.Instance.Open<WelfareWin>(false, 4);

                return;

            }



@@ -127,11 +118,6 @@
            if (levelGiftModel.redpoint.state == RedPointState.Simple)

            {

                return 3;

            }



            if (rebateModel.IsOpen && rebateModel.consumeRebateRedpoint.state == RedPointState.Simple)

            {

                return 4;

            }



            if (multipleExpModel.Open() && multipleExpModel.multipleExpRedpoint.state == RedPointState.Simple)


 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())