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

client_Zxw

2018-08-14 53e8e14f53ad83005d5b382b82e238392b3a07cc

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

            }

        }

@@ -48,6 +42,9 @@
        ConsumeRebateModel consumeRebateModel { get { return ModelCenter.Instance.GetModel<ConsumeRebateModel>(); } }



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

@@ -181,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);

@@ -189,7 +195,14 @@
                    activityReds.Add(5);

                }

            }



            if (OpenServerActivityCenter.Instance.IsMultipleRealmOpen())

            {

                openActivitys.Add(8);

                if (multipleRealmPointModel.multipleRed.state == RedPointState.Simple)

                {

                    activityReds.Add(8);

                }

            }

            if (activityReds.Count > 0)

            {

                activityReds.Sort(Compare);

@@ -229,6 +242,15 @@
            {

                alreadyOpenActivitys.Add(5);

            }

            if (OpenServerActivityCenter.Instance.IsMultipleRealmOpen())

            {

                alreadyOpenActivitys.Add(8);

            }



            if (OpenServerActivityCenter.Instance.IsBossRebornOpen())

            {

                alreadyOpenActivitys.Add(9);

            }

        }



        private void OnOpenServerActivityRefresh(ScrollerDataType type, CellView cell)

@@ -246,13 +268,19 @@


        private void RefreshOpenActivityCell(OpenServerActivityCell _cell)

        {

            OperationBase operationBase;

            switch (_cell.index)

            {

                case 5:

                    OperationBase operationBase;

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

                    {

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

                    }

                    break;

                case 8:

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

                    {

                        _cell.title.text = Language.Get("MultipleRealmPoint", Language.Get(StringUtility.Contact("Num_CHS_", (operationBase as OperationMultipleRealmPoint).multiplePractice)));

                    }

                    break;

                default:

@@ -262,8 +290,13 @@
            _cell.order = _cell.index;

            _cell.redpoint.redpointId = MainRedDot.REDPOINT_OPENSERVER * 100 + _cell.index;

            _cell.ChangeState(_cell.order == functionOrder ? TitleBtnState.Click : TitleBtnState.Normal);

            _cell.arrow.rectTransform.localEulerAngles = m_ActivitySpreadDict[_cell.order] ? new Vector3(0, 0, -90) : Vector3.zero;

            _cell.arrow.gameObject.SetActive(_cell.order == 0 || _cell.order == 2);

            _cell.downArrow.gameObject.SetActive(false);

            _cell.upArrow.gameObject.SetActive(false);

            if(_cell.order == 0 || _cell.order == 2)

            {

                _cell.downArrow.gameObject.SetActive(m_ActivitySpreadDict[_cell.order]);

                _cell.upArrow.gameObject.SetActive(!m_ActivitySpreadDict[_cell.order]);

            }

            _cell.funcBtn.onClick.RemoveAllListeners();

            _cell.funcBtn.onClick.AddListener(() =>

            {

@@ -340,12 +373,10 @@
                        m_ActivityCtrl.AddCell(ScrollerDataType.Normal, sort * 100 + 2);

                        break;

                    case 3:

                        m_ActivityCtrl.AddCell(ScrollerDataType.Header, sort);

                        break;

                    case 4:

                        m_ActivityCtrl.AddCell(ScrollerDataType.Header, sort);

                        break;

                    case 5:

                    case 8:

                    case 9:

                        m_ActivityCtrl.AddCell(ScrollerDataType.Header, sort);

                        break;

                }

@@ -437,6 +468,27 @@
                        WindowCenter.Instance.Open<MultipleExpWin>(true);

                    }

                    break;

                case 8:

                    if (windowState == WindowState.Opened)

                    {

                        WindowCenter.Instance.OpenWithoutAnimation<NPracticePointWin>();

                    }

                    else

                    {

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

                    }

                    break;

                case 9:

                    if (windowState == WindowState.Opened)

                    {

                        WindowCenter.Instance.OpenWithoutAnimation<BossRebornWin>();

                    }

                    else

                    {

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

                    }

                    break;



            }

        }



@@ -464,6 +516,8 @@
            WindowCenter.Instance.CloseImmediately<FlashSaleWin>();

            WindowCenter.Instance.CloseImmediately<ConsumeRebateWin>();

            WindowCenter.Instance.CloseImmediately<MultipleExpWin>();

            WindowCenter.Instance.CloseImmediately<NPracticePointWin>();

            WindowCenter.Instance.CloseImmediately<BossRebornWin>();

        }



        private int Compare(int x, int y)

@@ -507,14 +561,20 @@
                    }

                    break;

                case Operation.BossReborn:

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

                    {

                        alreadyOpenActivitys.Add(9);

                        UpdateFunctionBtns();

                    }

                    break;

                case Operation.GiftPackage:

                    break;

                case Operation.FairyCeremony:

                    break;

                case Operation.MultipRealmPoint:

                    break;

                case Operation.max:

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

                    {

                        alreadyOpenActivitys.Add(8);

                        UpdateFunctionBtns();

                    }

                    break;

            }

        }