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

# Conflicts:
#	Assets/NuGet.meta
#	Assets/Resources/Images/Ride.meta
#	Assets/Resources/Sound.meta
#	Assets/Scripts/App.cs
#	Assets/Scripts/UI/Prefab/BigMap/Tips.cs
#	Assets/StreamingAssets.meta

Assets/Scripts/Apis/Models/MapRoute.cs

@@ -102,5 +102,7 @@ namespace Assets.Scripts.Apis.Models
         public bool Enable3D { get; set; }
         public int TheHeat { get; set; }
         public string Hard { get; set; }
+        public string CountryCode { get; set; }
+        public bool IsFire { get; set; }
     }
 }

Assets/Scripts/Apis/Models/NearRouteModel.cs

@@ -25,5 +25,13 @@ namespace Assets.Scripts.Apis.Models
         /// 骑行热度
         /// </summary>
         public int TheHeat { get; set; }
+
+        public string Hard { get; set; }
+        public bool IsFire { get; set; }
+        public string CountryCode { get; set; }
+
+        public bool IsFavorite { get; set; }
+
+        public bool Enable3D { get; set; }
     }
 }

Assets/Scripts/Apis/UserApi.cs

@@ -134,13 +134,22 @@ namespace Assets.Scripts.Apis
 
         public async Task<JsonResult<object>> OnWebWxLoginCheckUnionId(string unionId, string openId)
         {
-            return await PostAsync<JsonResult<object>>("NoAuth/OnWebWxLoginCheckUnionId", new {unionId,openId});
+            var r = await PostAsync<JsonResult<object>>("NoAuth/OnWebWxLoginCheckUnionId", new { unionId, openId });
+            if (r.result)
+            {
+                var data = JObject.FromObject(r.data).ToObject<UserResultModel>();
+                data.cookie = cookies[0].Value;
+                r.data = data;
+            }
+            return r;
         }
         public async Task<JsonResult<UserResultModel>> OnWebWxLogin(string Phone, string Captcha
             , string UnionId, string WxWebOpenId, string WxHeadImg, string NickName, int? Sex, string Password)
         {
-            return await PostAsync<JsonResult<UserResultModel>>("NoAuth/OnWebWxLogin", 
+            var r = await PostAsync<JsonResult<UserResultModel>>("NoAuth/OnWebWxLogin",
                 new { Phone, Captcha, UnionId, WxWebOpenId, WxHeadImg, NickName, Sex, Password });
+            r.data.cookie = cookies[0].Value;
+            return r;
         }