Merge remote-tracking branch 'origin/dev_lishuo' into dev_cyp

This commit is contained in:
Caiyanpeng committed 2022-01-13 15:36:20 +08:00
commit 697818bae4
6 files changed
+217 -18

No files matched your search

@@ -215,13 +215,16 @@ namespace Assets.Scenes.Ride.Scripts
elevaction.text = Math.Round(route.TotalClimb.GetValueOrDefault(0), 2).ToString() + "M";
//平均破度
slope.text = Math.Round(route.AverageGrade, 2).ToString() + "%";
#if UNITY_IOS || UNITY_ANDROID
//比赛开始时间
StartTime.text = competition.StartTime.ToLocalTime().ToString("yyyy/MM/dd HH:mm:ss");//+" TO "+ competition.EndTime.ToLocalTime().ToString();
#else
//比赛开始时间
StartTime.text = competition.StartTime.ToLocalTime().ToString();//+" TO "+ competition.EndTime.ToLocalTime().ToString();
#endif
if (App.GetLocalLanguage().Equals("zh"))
{
StartTime.text = competition.StartTime.ToLocalTime().ToString("yyyy-MM-dd HH:mm:ss");//+" TO "+ competition.EndTime.ToLocalTime().ToString();
}
else
{
StartTime.text = competition.StartTime.ToLocalTime().ToString();//+" TO "+ competition.EndTime.ToLocalTime().ToString();
}
//比赛结束时间
// EndTime.text = competition.EndTime.ToLocalTime().ToString();
//比赛状态