From 12032f03912564129e7fb3b9e6d07ba04d33d7f9 Mon Sep 17 00:00:00 2001
From: Client_PangDeRong <593317293@qq.com>
Date: 星期三, 26 十二月 2018 15:05:37 +0800
Subject: [PATCH] 5398 子 【开发】【1.4】跨服竞技场 / 【前端】【1.4】跨服竞技场开发
---
System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs b/System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs
index 336082f..8e89973 100644
--- a/System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs
+++ b/System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs
@@ -141,12 +141,10 @@
}
}
- public List<AwardType> sortDayAwardslist = new List<AwardType>();
- public void SortDayAwardsList()
+ public List<AwardType> GetDayAwardsList()
{
- sortDayAwardslist.Clear();
- sortDayAwardslist.AddRange(dayAwardTypelist);
- sortDayAwardslist.Sort(CompareByCompleteProgress);
+ dayAwardTypelist.Sort(CompareByCompleteProgress);
+ return dayAwardTypelist;
}
public int CompareByCompleteProgress(AwardType start,AwardType end)
@@ -155,8 +153,12 @@
int y = (int)end.progress;
if (x.CompareTo(y) != 0) return x.CompareTo(y);
- x = dayAwardTypelist.IndexOf(start);
- y = dayAwardTypelist.IndexOf(end);
+ x = start.type;
+ y = end.type;
+ if (x.CompareTo(y) != 0) return x.CompareTo(y);
+
+ x = start.num;
+ y = end.num;
if (x.CompareTo(y) != 0) return x.CompareTo(y);
return 0;
--
Gitblit v1.8.0