From d930e85ecc496307fd2e1bd21add1808e44849b8 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期三, 26 十二月 2018 15:41:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/Cross_Server' into 【1.4】王者法宝

---
 System/CrossServerOneVsOne/CrossServerOneVsOneCyclicScroll.cs |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/System/CrossServerOneVsOne/CrossServerOneVsOneCyclicScroll.cs b/System/CrossServerOneVsOne/CrossServerOneVsOneCyclicScroll.cs
index 9d9074a..14410d6 100644
--- a/System/CrossServerOneVsOne/CrossServerOneVsOneCyclicScroll.cs
+++ b/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));

--
Gitblit v1.8.0