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

# Conflicts:
#	Assets/Scripts/Scenes/MainController.cs

Assets/Scripts/Apis/Models/UserResultModel.cs

@@ -74,5 +74,8 @@ namespace Assets.Scripts.Apis.Models
         public DateTime UpdateTime { get; set; }
         public string WebHost { get; set; }//创建比赛url
         public bool CanCreateRace { get; set; }//是否可以创建比赛
+        //第三方userid
+        public string AppleUserId { get; set; }
+        public string FacebookUserId { get; set; }
     }
 }