nearby重合问题＆线路排序修改＆显示赛事编号

Assets/Scripts/Apis/MapApi.cs

@@ -59,7 +59,12 @@ namespace Assets.Scripts.Apis
         /// <returns></returns>
         public Task<JsonResult<List<MapRoute>>> GetList(int pageIndex, int pageSize, string name, string distance="", string hands="", bool is3D=false, string sort="", string sortDire = "", bool isFav = false)
         {
-            var url = $"Map/GetRoute?pageIndex={ pageIndex }&pageSize={ pageSize }&name={ name }&distance={ distance }&hands={ hands }&is3D={ is3D }&sort={ sort }&sortDire={ sortDire }&isFav={isFav}";
+            string lngLat = "";
+            if (string.IsNullOrEmpty(name) && string.IsNullOrEmpty(distance) && string.IsNullOrEmpty(hands) && !is3D && sort.Equals("Hot") && sortDire.Equals("desc") && !isFav)
+            {
+                lngLat = $"{App.longitude},{App.latitude}";
+            }
+            var url = $"Map/GetRoute?pageIndex={ pageIndex }&pageSize={ pageSize }&name={ name }&distance={ distance }&hands={ hands }&is3D={ is3D }&sort={ sort }&sortDire={ sortDire }&isFav={isFav}&lngLat={lngLat}";
 
             return GetAsync<JsonResult<List<MapRoute>>>(url);
         }

Assets/Scripts/Scenes/Ride/Competiton/CompetitionLoadingController.cs

@@ -115,6 +115,7 @@ namespace Assets.Scenes.Ride.Scripts
         GameObject MoreHead { get; set; }
         Text CompetitionTitle { get; set; }
         Text EndTime { get; set; }
+        Text MapId { get; set; }
         //构建赛事界面
         protected override void InitGameObject()
         {
@@ -135,6 +136,7 @@ namespace Assets.Scenes.Ride.Scripts
             ReadMore = panel.transform.Find("ReadMore").gameObject;
             GetReady = panel.transform.Find("GetReady").GetComponent<Text>();
             GetReadyTitle = panel.transform.Find("GetReadyTitle").GetComponent<Text>();
+            MapId = panel.transform.Find("MapId").GetComponent<Text>();
             Watcher = Resources.Load<GameObject>("UI/Prefab/Match/Watcher");
             MoreHead = Resources.Load<GameObject>("UI/Prefab/Match/MoreHead");
             Watch.GetComponent<Button>().enabled = false;
@@ -183,6 +185,8 @@ namespace Assets.Scenes.Ride.Scripts
             ShowPlayers(competition.UserList);
             //路书描述
             mapDescText.text = competition.Dec;
+            //线路编号
+            MapId.text = route.Id.ToString();
 
             ReadMore.SetActive(!string.IsNullOrEmpty(competition.CompetitionPreviewUrl));
             //主办方logo

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

@@ -20,6 +20,7 @@ namespace Assets.Scenes.Ride.Scripts
 		protected RawImage mapCountry;
 		protected RawImage altitudeGraph;
 		protected Transform mapRanking;
+		protected Text mapId;
 		#endregion
 
 		public override void InjectController(CyclingController controller)
@@ -54,6 +55,7 @@ namespace Assets.Scenes.Ride.Scripts
 			head = panel.transform.Find("UploadByHead").GetComponent<RawImage>();
 			altitudeGraph = panel.transform.Find("AltitudeGraph").GetComponent<RawImage>();
 			mapRanking = panel.transform.Find("MapRanking");
+			mapId = panel.transform.Find("MapId").GetComponent<Text>();
 		}
 		protected override void InitGameObjectData()
 		{
@@ -67,6 +69,7 @@ namespace Assets.Scenes.Ride.Scripts
 			rideNum.text = route.TheHeat.ToString();
 			distance.text = route.Distance.ToString("f1") + "KM";
 			mapDescText.text = route.Dec;
+			mapId.text = route.Id.ToString();
 			var userList = ConfigHelper.mapApi.GetOnlineUserInfo(new int[] { route.UserId }).data;
 			if (userList.Count > 0)
 			{

Assets/Scripts/Scenes/Ride/Scripts/NearByFactory.cs

@@ -29,6 +29,7 @@ namespace Assets.Scenes.Ride.Scripts
         protected override void CreateList()
         {
             OnlineUserNum.text =  MapUDPService.GetNearRiderCount().ToString();
+            LayoutRebuilder.ForceRebuildLayoutImmediate(OnlineUserNum.rectTransform);
             var nearList = MapUDPService.GetNearRiderData(pageIndex, pageSize, new double[] { playerController.Currentlatlong.x, playerController.Currentlatlong.y });
             totalPages = MapUDPService.GetNearRiderCount();
             for (int i = 0; i < nearList.Count(); i++)

Assets/Scripts/UI/Prefab/MapList/MapFilterOptions.cs

@@ -40,7 +40,7 @@ namespace Assets.Scripts.UI.Prefab.MapList
             {"HC","750-99999" },
         };
         public static List<Dropdown.OptionData> sorts = new string[] {
-            "Trend","Name","Distance","Difficulty"//,"Times"
+            "Trend","Name","Distance","Difficulty","Time"
         }.Select(x => new Dropdown.OptionData(x)).ToList();
         public static Dictionary<string, string> diffDisplayDict = new Dictionary<string, string>()
         {