lishuo/powerfun-unity
1
1 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

赛事微调&mapbox sqlite dll 更新

Browse Source
This commit is contained in:
lishuo committed 2021-08-10 16:36:13 +08:00
1 parent 9f19e951cc
commit 5642d3f1c9
21 files changed
+3194 -2964
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Assets/Scripts/Scenes/Ride/Model/CyclingModels/CompetitionModel.cs
+12 -5
View File
@@ -109,7 +109,7 @@ namespace Assets.Scenes.Ride.Scripts.Model.CyclingModels
//}
//#endregion
var userList = MapUDPService.GetCompetitionOnlineUsers(recorderData.Competitionid).OrderByDescending(u => u.IsCompleted).ThenByDescending(d => d.EndDistance);
var userList = MapUDPService.GetCompetitionOnlineUsers(recorderData.Competitionid).OrderByDescending(u => u.IsCompleted).ThenBy(d => d.CreateTime).ThenByDescending(d => d.EndDistance);
riders.RemoveAll(r => r.IsSelf == false);
int index = 0;
List<CompetitionRankingSortModel> sort = new List<CompetitionRankingSortModel>();
@@ -157,9 +157,11 @@ namespace Assets.Scenes.Ride.Scripts.Model.CyclingModels
CountryImg = item.Country,//ConfigHelper.Host + $"User/GetCountryImg?userid={ item.Id }",
UserId = item.Id,
IsSelf = item.IsSelf,
Headimage =item.HeadImage
Headimage = item.HeadImage,
CreateTime = DateTime.MaxValue,
EndDistance = item.EndDistance,
IsCompleted = item.IsCompleted
});
}
}
@@ -180,11 +182,16 @@ namespace Assets.Scenes.Ride.Scripts.Model.CyclingModels
foreach (var ranking in mapWorkoutRecordRankings)
{
//var ranking = mapWorkoutRecordRankings.SingleOrDefault(r => r.UserId == item.Id);
var needUpdate = sort.Where(c => c.UserId == ranking.UserId).FirstOrDefault();
if (needUpdate != null)
{
needUpdate.CreateTime = ranking.CreateTime.ToLocalTime();
}
var createTime = "";
if (ranking != null)
{
createTime = ranking.CreateTime; //.ToString("yyyy-MM-dd HH:mm:ss");
createTime = ranking.CreateTime.ToLocalTime().ToString(); //.ToString("yyyy-MM-dd HH:mm:ss");
}
results.Add(new CompetitionResultModel
{
@@ -196,7 +203,7 @@ namespace Assets.Scenes.Ride.Scripts.Model.CyclingModels
//Time = ranking?.TotalTime ?? "",
Power = ranking?.AveragePower ?? 0,
BicycleWeight = ranking?.BicycleWeight ?? 0,
HeartRate = ranking?.AverageHeartRate ?? 0,
HeartRate = ranking?.AverageHeartRate,
DeviceType = ranking?.DeviceType ?? "",
CreateTime = createTime,
TripTime = ranking?.TripTime ?? "",