Merge branch 'Cross_Server' of http://192.168.0.87:10010/r/snxxz_scripts in...

client_Zxw

2018-12-24 336c229f0b32edc4d1dfd3579eb70c5bae142286

 System/CrossServerOneVsOne/CrossServerOneVsOneCyclicScroll.cs

File was renamed from System/CrossServerOneVsOne/CrossServerCyclicScroll.cs
@@ -12,12 +12,12 @@
namespace Snxxz.UI

{



    public class CrossServerCyclicScroll : CyclicScroll

    public class CrossServerOneVsOneCyclicScroll : CyclicScroll

    {

        const float fadeOutTime = 0.3f;

        const float relocationTime = 0.4f;



        CrossSeverDayAwardCell showAchievementBehaviour;

        CrossSeverOneVsOneDayAwardCell showAchievementBehaviour;



        bool m_Showing = false;

        public bool showing

@@ -26,9 +26,9 @@
            private set { m_Showing = value; }

        }



        List<CrossServerModel.AwardType> dayAwards;

        List<CrossServerOneVsOneModel.AwardType> dayAwards;



        CrossServerModel crossServerModel { get { return ModelCenter.Instance.GetModel<CrossServerModel>(); } }

        CrossServerOneVsOneModel crossServerModel { get { return ModelCenter.Instance.GetModel<CrossServerOneVsOneModel>(); } }



        public void ShowTreasures(bool _stepByStep)

        {

@@ -41,7 +41,7 @@
        {

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

            {

                var item = infiniteItems[i] as CrossSeverDayAwardCell;

                var item = infiniteItems[i] as CrossSeverOneVsOneDayAwardCell;

                item.alphaTween.SetStartState();

                item.linerMove.Stop();

            }

@@ -60,7 +60,7 @@
            this.enabled = true;

        }



        public void ShowBegin(CrossSeverDayAwardCell _showItem)

        public void ShowBegin(CrossSeverOneVsOneDayAwardCell _showItem)

        {

            this.enabled = false;

            showing = true;

@@ -96,7 +96,7 @@
            var index = infiniteItems.IndexOf(_scrollItem);

            if (index != -1)

            {

                var showBehaviour = _scrollItem as CrossSeverDayAwardCell;

                var showBehaviour = _scrollItem as CrossSeverOneVsOneDayAwardCell;

                var lastItem = infiniteItems[infiniteItems.Count - 1];



                showBehaviour.rectTransform.anchoredPosition = lastItem.rectTransform.anchoredPosition.SetY(lastItem.rectTransform.anchoredPosition.y - cellSize.y - spacing.y);

@@ -106,7 +106,7 @@


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

                {

                    var item = infiniteItems[i] as CrossSeverDayAwardCell;

                    var item = infiniteItems[i] as CrossSeverOneVsOneDayAwardCell;

                    if (item != null && preIndex + i < datas.Count)

                    {

                        item.Display(datas[preIndex + i]);

@@ -116,7 +116,7 @@
                for (int i = index; i < infiniteItems.Count; i++)

                {

                    var item = infiniteItems[i];

                    var achievementBehaviour = item as CrossSeverDayAwardCell;

                    var achievementBehaviour = item as CrossSeverOneVsOneDayAwardCell;



                    achievementBehaviour.linerMove.from = achievementBehaviour.rectTransform.anchoredPosition;

                    var toY = achievementBehaviour.rectTransform.anchoredPosition.y + cellSize.y + spacing.y;