Merge branch 'dev_cyp' into dev

# Conflicts:
#	Assets/Resources/Loading.meta
#	Assets/Scripts/Apis/MapApi.cs
#	Assets/Scripts/UI/Prefab/Panel/MapListController.cs

Assets/Scripts/Apis/Models/MapRoute.cs

@@ -104,5 +104,6 @@ namespace Assets.Scripts.Apis.Models
         public string Hard { get; set; }
         public string CountryCode { get; set; }
         public bool IsFire { get; set; }
+        public string AltitudeGraph { get; set; }
     }
 }

Assets/Scripts/Apis/Models/UserResultModel.cs

@@ -61,7 +61,7 @@ namespace Assets.Scripts.Apis.Models
         //cookie
         public string cookie { get; set; }
 
-
-
+        public string Unionid { get; set; }
+        public int Height { get; set; }
     }
 }