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

client_Wu Xijin

2018-08-13 5927cbc6a514576e5758cd166678805bb8ecb143

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

 System/BossReborn/BossRebornModel.cs

@@ -30,7 +30,7 @@
        Dictionary<int, BossRebornTask> bossRebornTasks = new Dictionary<int, BossRebornTask>();



        const int bossRebornPointId = 20108;

        Redpoint bossRebornPoint = new Redpoint(201, bossRebornPointId);

        public Redpoint bossRebornPoint = new Redpoint(201, bossRebornPointId);



        public override void Init()

        {


 System/OpenServerActivity/ImpactRankModel.cs

@@ -355,11 +355,9 @@
        #endregion

        public event Action OnSelectRankTypeEvent;

        private int m_PresentSelectType = 0;

        public int presentSelectType

        {

        public int presentSelectType {

            get { return m_PresentSelectType; }

            set

            {

            set {

                m_PresentSelectType = value;

                if (OnSelectRankTypeEvent != null)

                {

@@ -398,11 +396,9 @@
        }



        private PlayerRankData.RankType m_PresentBillRankType = PlayerRankData.RankType.OpenServerStrengthen;

        public PlayerRankData.RankType presentBillRankType

        {

        public PlayerRankData.RankType presentBillRankType {

            get { return m_PresentBillRankType; }

            set

            {

            set {

                m_PresentBillRankType = value;

                if (CoroutineMgr.Instance.CanBegRank((int)m_PresentBillRankType))

                {

@@ -636,6 +632,7 @@
        ConsumeRebateModel consumeRebateModel { get { return ModelCenter.Instance.GetModel<ConsumeRebateModel>(); } }



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

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



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



@@ -729,6 +726,12 @@
                _functionOrder = 8;

                return true;

            }



            if (IsBossRebornOpen())

            {

                _functionOrder = 9;

                return true;

            }

            return false;

        }



@@ -784,6 +787,12 @@
        {

            SysNotifyMgr.Instance.ShowTip("ActiveOutTime");

        }



        public bool IsBossRebornOpen()

        {

            return bossRebornModel.IsOpen();

        }



    }

}




 System/OpenServerActivity/OpenServerActivityWin.cs

@@ -17,28 +17,22 @@
        Dictionary<int, bool> m_ActivitySpreadDict = new Dictionary<int, bool>();



        ImpactRankModel m_ImpactRankModel;

        ImpactRankModel impactRankModel

        {

            get

            {

        ImpactRankModel impactRankModel {

            get {

                return m_ImpactRankModel ?? (m_ImpactRankModel = ModelCenter.Instance.GetModel<ImpactRankModel>());

            }

        }



        OSRedEnvelopeModel m_OSRedEnvelopeModel;

        OSRedEnvelopeModel envelopeModel

        {

            get

            {

        OSRedEnvelopeModel envelopeModel {

            get {

                return m_OSRedEnvelopeModel ?? (m_OSRedEnvelopeModel = ModelCenter.Instance.GetModel<OSRedEnvelopeModel>());

            }

        }



        OSTimeLimitGiftModel m_OSTimeLimitGiftModel;

        OSTimeLimitGiftModel timeLimitGiftModel

        {

            get

            {

        OSTimeLimitGiftModel timeLimitGiftModel {

            get {

                return m_OSTimeLimitGiftModel ?? (m_OSTimeLimitGiftModel = ModelCenter.Instance.GetModel<OSTimeLimitGiftModel>());

            }

        }

@@ -50,6 +44,7 @@
        MultipleExpModel multipleExpModel { get { return ModelCenter.Instance.GetModel<MultipleExpModel>(); } }



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

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



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

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

@@ -183,6 +178,15 @@
                    activityReds.Add(1);

                }

            }

            if (OpenServerActivityCenter.Instance.IsBossRebornOpen())

            {

                openActivitys.Add(9);

                if (bossRebornModel.bossRebornPoint.state == RedPointState.Simple)

                {

                    activityReds.Add(9);

                }

            }



            if (OpenServerActivityCenter.Instance.IsMultipleExpOpen())

            {

                openActivitys.Add(5);

@@ -241,6 +245,11 @@
            if (OpenServerActivityCenter.Instance.IsMultipleRealmOpen())

            {

                alreadyOpenActivitys.Add(8);

            }



            if (OpenServerActivityCenter.Instance.IsBossRebornOpen())

            {

                alreadyOpenActivitys.Add(9);

            }

        }



@@ -362,6 +371,7 @@
                    case 4:

                    case 5:

                    case 8:

                    case 9:

                        m_ActivityCtrl.AddCell(ScrollerDataType.Header, sort);

                        break;

                }

@@ -463,6 +473,17 @@
                        WindowCenter.Instance.Open<NPracticePointWin>(true);

                    }

                    break;

                case 9:

                    if (windowState == WindowState.Opened)

                    {

                        WindowCenter.Instance.OpenWithoutAnimation<BossRebornWin>();

                    }

                    else

                    {

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

                    }

                    break;



            }

        }



@@ -491,6 +512,7 @@
            WindowCenter.Instance.CloseImmediately<ConsumeRebateWin>();

            WindowCenter.Instance.CloseImmediately<MultipleExpWin>();

            WindowCenter.Instance.CloseImmediately<NPracticePointWin>();

            WindowCenter.Instance.CloseImmediately<BossRebornWin>();

        }



        private int Compare(int x, int y)

@@ -534,6 +556,11 @@
                    }

                    break;

                case Operation.BossReborn:

                    if (state == 0 && !alreadyOpenActivitys.Contains(9))

                    {

                        alreadyOpenActivitys.Add(9);

                        UpdateFunctionBtns();

                    }

                    break;

                case Operation.GiftPackage:

                    break;