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

# Conflicts:
#	Assets/Scenes/Login-Mobile.unity
#	Assets/Scripts/UI/Prefab/Panel/NewRouteDetailController.cs

Assets/Scripts/Apis/MapApi.cs

@@ -16,7 +16,11 @@ namespace Assets.Scripts.Apis
         {
             return Get($"Map/GetMapToken?name={name}");
         }
-        
+        public string GetTipsList()
+        {
+            return Get($"Map/GetTipList");
+        }
+
         /// <summary>
         /// 获取路线数据
         /// </summary>
@@ -178,9 +182,9 @@ namespace Assets.Scripts.Apis
             return result;
         }
 
-        public async Task<JsonResult<List<MapRoute>>> GetMapRouteAreaDetailList(int id, int pageIndex, int pageSize)
+        public async Task<JsonResult<MapRouteAreaRouteList>> GetMapRouteAreaDetailList(int id, int pageIndex, int pageSize)
         {
-            var result = await GetAsync<JsonResult<List<MapRoute>>>($"MapRouteArea/GetRouteList?areaId={id}&pageSize={pageSize}&pageIndex={pageIndex}");
+            var result = await GetAsync<JsonResult<MapRouteAreaRouteList>>($"MapRouteArea/GetRouteList?areaId={id}&pageSize={pageSize}&pageIndex={pageIndex}");
             return result;
         }
 

Assets/Scripts/Apis/Models/MapCompetition.cs

@@ -18,7 +18,7 @@ namespace Assets.Scripts.Apis.Models
 
         public bool IsOfficial { get; set; }
         public int MapCompetitionType { get; set; }
-        public object NickName { get; set; }
+        public string NickName { get; set; }
         public int pageCount { get; set; }
         public int RouteId { get; set; }
         public string Sponsor { get; set; }

Assets/Scripts/Apis/Models/MapRoute.cs

@@ -109,5 +109,7 @@ namespace Assets.Scripts.Apis.Models
         public string Camera { get; set; }
         public string MineCountString { get; set; }
         public int MineCount { get; set; }
+
+        public int[] RouteIds { get; set; }
     }
 }

Assets/Scripts/Apis/Models/MapRouteArea.cs

@@ -138,6 +138,21 @@ namespace Assets.Scripts.Apis.Models
         public DateTime UpdateTime { get; set; }
     }
 
+    public class MapRouteAreaRouteList
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        public List<MapRoute> RouteList
+        {
+            get; set;
+        }
+        public List<int> RouteIds
+        {
+            get; set;
+        }
+
+    }
     public class MapMaxRanking
     {
         /// <summary>