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

# Conflicts:
#	Assets/Scripts/Apis/Models/MapCompetition.cs
#	Assets/Scripts/UI/Prefab/Race/RaceButtonGroupScript.cs

Assets/Scripts/Apis/MapCompetitionApi.cs

@@ -60,9 +60,9 @@ namespace Assets.Scripts.Apis
                 data = Newtonsoft.Json.JsonConvert.DeserializeObject<List<MapCompetitionModel>>(JsonConvert.SerializeObject(list.data))
             };
         }
-        public async Task<JsonResult<List<MapCompetition>>> GetCompetitionListV2(string name, int pageIndex, int pageSize, string status = "", int order = 1, bool self = false)
+        public async Task<JsonResult<List<MapCompetition>>> GetCompetitionListV2(string name, int pageIndex, int pageSize, string status = "", int order = 1, bool self = false, int activity = 0)
         {
-            var list = await GetAsync<JsonResult<dynamic>>($"/MapCompetition/v2/GetList?pageIndex={ pageIndex }&pageSize={ pageSize }&name={ name }&status={ status }&order={order}&self={self}");
+            var list = await GetAsync<JsonResult<dynamic>>($"/MapCompetition/v2/GetList?pageIndex={ pageIndex }&pageSize={ pageSize }&name={ name }&status={ status }&order={order}&self={self}&activity={activity}");
             return new JsonResult<List<MapCompetition>>
             {
                 result = list.result,
@@ -100,5 +100,14 @@ namespace Assets.Scripts.Apis
             };
             return Post<JsonResult>($"/MapCompetition/CancelMapCompetition", param);
         }
+        //取消报名比赛
+        public async Task<JsonResult> CancelMapCompetition(int id)
+        {
+            var param = new
+            {
+                id = id,
+            };
+            return await PostAsync<JsonResult>($"/MapCompetition/CancelMapCompetition", param);
+        }
     }
 }

Assets/Scripts/Apis/Models/MapCompetition.cs

@@ -69,6 +69,8 @@ namespace Assets.Scripts.Apis.Models
         public string ShortPreview { get; set; }
         //活动banner
         public string BannerPreview { get; set; }
+        public bool HasJoin { get; set; }
+        public int ApplyCount { get; set; }
 
     }
     public class CompetitionPlayer