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

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

Assets/Scripts/UI/Prefab/Panel/HomeController.cs

@@ -114,7 +114,8 @@ public class HomeController : PFUIPanel
     private void GoMatch(BaseEventData e)
     {
         //TODO:进入比赛列表
-
+        UIManager.ShowRaceHomePanel();
+        return;
         #region 测试比赛
         App.CompetionId = 1048;
         App.RouteIdParam = 1215;