Merge remote-tracking branch 'origin/Cross_Server' into 【1.4】王者法宝

client_linchunjie

2018-12-26 d930e85ecc496307fd2e1bd21add1808e44849b8

 System/CrossServerOneVsOne/CrossServerOneVsOneCyclicScroll.cs

@@ -32,8 +32,7 @@


        public void ShowTreasures(bool _stepByStep)

        {

            crossServerModel.SortDayAwardsList();

            dayAwards = crossServerModel.sortDayAwardslist;

            dayAwards = crossServerModel.GetDayAwardsList();

            Init(dayAwards, _stepByStep);

        }



@@ -77,8 +76,7 @@
        void ReLocateItems()

        {

            showAchievementBehaviour.alphaTween.SetStartState();

            crossServerModel.SortDayAwardsList();

            dayAwards = crossServerModel.sortDayAwardslist;

            dayAwards = crossServerModel.GetDayAwardsList();

            ReLocateAllItems(showAchievementBehaviour);



            var endTime = DateTime.Now + new TimeSpan((long)(relocationTime * TimeSpan.TicksPerSecond));