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

# Conflicts:
#	Assets/Scripts/Apis/Models/MapCompetition.cs

Assets/Scripts/Apis/Models/AppDownloadModel.cs

@@ -0,0 +1,44 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Assets.Scripts.Apis.Models
+{
+    public class AppDownloadInfo
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        public string Version { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string Url { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string GooglePlayUrl { get; set; }
+    }
+
+    public class AppDownloadModel
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        public AppDownloadInfo Apk { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public AppDownloadInfo Ios { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public AppDownloadInfo Unity { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public AppDownloadInfo WPF { get; set; }
+    }
+}

Assets/Scripts/Apis/Models/AppDownloadModel.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: c3dcd96af3a32fc45a73484d1ff60bfd
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Apis/UserApi.cs

@@ -240,7 +240,10 @@ namespace Assets.Scripts.Apis
             var res = Upload("feedback/add", new { content } , files);
             return Newtonsoft.Json.JsonConvert.DeserializeObject<JsonResult<object>>(res);
         }
-
+        public async Task<JsonResult<AppDownloadModel>> GetAppVersion()
+        {
+            return await GetAsync<JsonResult<AppDownloadModel>>("home/getversions");
+        }
         public JsonResult<object> Update(UserResultModel currUser, string filePath = "")
         {
             //return await PostAsync<JsonResult<dynamic>>("User/UpdateUserSetting", new {