3335 全民冲榜修改

client_linchunjie

2019-07-17 5c13aa5685076fa9d622355386973bcd9741b276

3335 全民冲榜修改

 System/OpenServerActivity/OpenServerActivityWin.cs

@@ -263,7 +263,7 @@


        private void SecondEvent()

        {

            var cell = m_ActivityCtrl.GetActiveCellView(12);

            var cell = m_ActivityCtrl.GetActiveCellView(12, ScrollerDataType.Header);

            if (cell != null)

            {

                var activityCell = cell as OpenServerActivityCell;

@@ -444,10 +444,10 @@
                        }

                        foreach (var _type in impactRankModel.impactRankSorts)

                        {

                            if (impactRankModel.IsLock(_type))

                            {

                                continue;

                            }

                            //if (impactRankModel.IsLock(_type))

                            //{

                            //    continue;

                            //}

                            m_ActivityCtrl.AddCell(ScrollerDataType.Normal, activityId * 100 + _type);

                        }

                        break;


 System/Skill/ScrollerController.cs

@@ -236,6 +236,24 @@
        return null;

    }



    public CellView GetActiveCellView(int _index, ScrollerDataType type)

    {

        if (m_Scorller == null)

        {

            return null;

        }

        var views = m_Scorller.GetActiveCellViews();

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

        {

            var _cellView = views[i] as CellView;

            if (views[i].index == _index && _cellView.type == type)

            {

                return _cellView;

            }

        }

        return null;

    }



    public void AddCell(ScrollerDataType type, int index, Action<CellView> action = null, CellInfo? info = null)

    {

        ScrollerData data = null;


 System/WindowJump/WindowJumpMgr.cs

@@ -931,11 +931,6 @@
                break;

            case JumpUIType.OpenServerMountRank:

                var type = int.Parse(_tagWinSearchModel.SelectActive);

                if (rankModel.IsLock(type))

                {

                    SysNotifyMgr.Instance.ShowTip("InOperationTimeError");

                    return false;

                }

                if (TimeUtility.OpenDay >= rankModel.openServerActivityDays)

                {

                    SysNotifyMgr.Instance.ShowTip("ActiveOutTime");


 UI/EnhancedScroller/EnhancedScroller.cs

@@ -2,6 +2,7 @@
using UnityEngine.UI;

using System.Collections;

using System;

using System.Collections.Generic;



namespace EnhancedUI.EnhancedScroller

{

@@ -584,6 +585,11 @@
            return null;

        }



        public SmallList<EnhancedScrollerCellView> GetActiveCellViews()

        {

            return _activeCellViews;

        }



        internal float GetCellSize(int _dataIndex)

        {

            if (_dataIndex >= 0 && _dataIndex < _cellViewSizeArray.Count)