6086 【前端】【1.5.200】春节红包雨活动

client_linchunjie

2019-01-28 316392fc7db70f82c5da0badee782a03e73c5d50

 System/OpenServerActivity/OpenServerActivityWin.cs

@@ -37,6 +37,7 @@
        FairyLeagueModel fairyLeagueModel { get { return ModelCenter.Instance.GetModel<FairyLeagueModel>(); } }

        FairyGrabBossModel fairyGrabBossModel { get { return ModelCenter.Instance.GetModel<FairyGrabBossModel>(); } }

        OSGiftModel giftModel { get { return ModelCenter.Instance.GetModel<OSGiftModel>(); } }

        FestivalRedpackModel festivalRedpackModel { get { return ModelCenter.Instance.GetModel<FestivalRedpackModel>(); } }



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

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

@@ -122,6 +123,11 @@
                {

                    giftModel.selectIndex = giftModel.GetDefaultSelect();

                }

                if (functionOrder == 19)

                {

                    festivalRedpackModel.selectType = festivalRedpackModel.jumpType != 0 ? festivalRedpackModel.jumpType : 1;

                    festivalRedpackModel.jumpType = 0;

                }

                UpdateFunctionBtns();

            }

            OnOpenActivity(functionOrder);

@@ -203,6 +209,24 @@
                            case OpenServerActivityCenter.OSActivityType.OSGift:

                                giftModel.selectIndex = giftModel.GetDefaultSelect();

                                break;

                            case OpenServerActivityCenter.OSActivityType.FestivalRedpack:

                                if (festivalRedpackModel.systemRedpoint.state == RedPointState.Simple)

                                {

                                    festivalRedpackModel.selectType = 1;

                                    break;

                                }

                                else if (festivalRedpackModel.taskRedpoint.state == RedPointState.Simple)

                                {

                                    festivalRedpackModel.selectType = 2;

                                    break;

                                }

                                else if (festivalRedpackModel.receiveRedpoint.state == RedPointState.Simple)

                                {

                                    festivalRedpackModel.selectType = 3;

                                    break;

                                }

                                festivalRedpackModel.selectType = 1;

                                break;

                        }

                    }

                }

@@ -280,7 +304,7 @@
            if (type == ScrollerDataType.Header)

            {

                if (!m_ActivitySpreadDict.ContainsKey(sort) || !m_ActivitySpreadDict[sort]

                    || (sort != 2 && sort != 0))

                    || (sort != 2 && sort != 0 && sort != 19))

                {

                    height = 80;

                    return true;

@@ -397,7 +421,7 @@
            _cell.downArrow.gameObject.SetActive(false);

            _cell.upArrow.gameObject.SetActive(false);



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

            if (_cell.activityType == 0 || _cell.activityType == 2 || _cell.activityType == 19)

            {

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

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

@@ -431,6 +455,11 @@
                    _cell.redpoint.redpointId = 20902 * 100 + _type;

                    _cell.titleTxt.text = Language.Get(StringUtility.Contact("OSRedEnvelopeType_", _type));

                    _cell.ChangeState(_type == envelopeModel.selectType ? TitleBtnState.Click : TitleBtnState.Normal);

                    break;

                case 19:

                    _cell.redpoint.redpointId = 20919 * 100 + _type;

                    _cell.titleTxt.text = Language.Get(StringUtility.Contact("FestivalRedpackType_", _type));

                    _cell.ChangeState(_type == festivalRedpackModel.selectType ? TitleBtnState.Click : TitleBtnState.Normal);

                    break;

            }

            _cell.functionBtn.onClick.RemoveAllListeners();

@@ -487,6 +516,17 @@
                        {

                            m_ActivityCtrl.AddCell(ScrollerDataType.Header, sort * 1000 + giftModel.alreadyOpens[k]);

                        }

                        break;

                    case 19:

                        m_ActivityCtrl.AddCell(ScrollerDataType.Header, sort);

                        if (!m_ActivitySpreadDict[sort])

                        {

                            m_ActivitySpreadDict[sort] = false;

                            break;

                        }

                        m_ActivityCtrl.AddCell(ScrollerDataType.Normal, sort * 100 + 1);

                        m_ActivityCtrl.AddCell(ScrollerDataType.Normal, sort * 100 + 2);

                        m_ActivityCtrl.AddCell(ScrollerDataType.Normal, sort * 100 + 3);

                        break;

                    default:

                        m_ActivityCtrl.AddCell(ScrollerDataType.Header, sort);

@@ -589,6 +629,9 @@
                case 18:

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

                    break;

                case 19:

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

                    break;

            }

        }



@@ -604,6 +647,9 @@
                case 2:

                    envelopeModel.selectType = _type;

                    break;

                case 19:

                    festivalRedpackModel.selectType = _type;

                    break;

            }

            m_ActivityCtrl.m_Scorller.RefreshActiveCellViews();

        }