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

# Conflicts:
#	Assets/Resources/UI/language.json

Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs

@@ -92,8 +92,8 @@ public class CyclingController : DeviceServiceMonoBase
         if (App.tempRecordData != null)
         {
             selectParamModel = App.tempRecordData.selectParam;
-            competitionId = selectParamModel.CompetitionId ?? 0;
-            routeId = selectParamModel.RouteId ?? 0;
+            competitionId = App.tempRecordData.CompetitionId;
+            routeId = App.tempRecordData.RouteId;
         }
         Resources.UnloadUnusedAssets();
     }
@@ -560,8 +560,10 @@ public class CyclingController : DeviceServiceMonoBase
     //初始比赛
     private IEnumerator InitRace()
     {
-        yield return new WaitForSeconds(1);
+        yield return null;//new WaitForSeconds(1);
+        UnityEngine.Debug.Log($"TEST:{routeId}");
         mapRoute = mapApi.GetById(routeId).data;
+
         var mapCompetitionApi = new MapCompetitionApi();
         competition = mapCompetitionApi.GetById(competitionId).data;
         loadingController.Init();//初始化loading页面 
@@ -602,7 +604,7 @@ public class CyclingController : DeviceServiceMonoBase
                 EndDistance = 0,
                 RankingsId = new List<string>(),
                 OnlineUserId = 0,
-                RouteId = App.RouteIdParam
+                RouteId = routeId
             };
         }
 
@@ -1146,7 +1148,8 @@ public BaseUIManager singleUIManager;
         RecorderDataModel recorderData = cyclingController.recorderData;
         tempRecordData.RiderDatas = recorderData.RiderDatas;
         tempRecordData.selectParam = recorderData.selectParam;
-        tempRecordData.RouteId = mapRoute.Id;
+        tempRecordData.RouteId = recorderData.Competitionid;
+        tempRecordData.CompetitionId = mapRoute.Id;
         tempRecordData.StartTime = startTime;
         tempRecordData.ManufacturerId = recorderData.ManufacturerId;
         tempRecordData.ManufacturerName = recorderData.ManufacturerName;

Assets/Scripts/Scenes/Ride/Scripts/LoadingController.cs

@@ -137,7 +137,7 @@ namespace Assets.Scenes.Ride.Scripts
 			DrawMapRouteAsync(route.Id);
 			AddProcess(10);
 			//查询排行榜 
-			var list = mapApi.GetRouteRanking(App.RouteIdParam, "1", 0, 99999, "");
+			var list = mapApi.GetRouteRanking(route.Id, "1", 0, 10, "");
 			if (list.result)
 			{
 				if (list.data.list.Count > 10)