Merge branch 'dev_lishuo' into dev

# Conflicts:
#	.gitignore
#	Assets/Scenes/Ride/Scripts/SelectPlayerFactory.cs
This commit is contained in:
suntao committed 2021-05-12 10:30:08 +08:00
commit a7ea02f70a
52 files changed
+6329 -2723

No files matched your search

+8 -1
View File
@@ -127,7 +127,14 @@ namespace Assets.Scripts.Apis
public JsonResult<MapRouteRankingList> GetRouteRanking(int id,string type, int pageIndex,int pageSize,string name)
{
var url = $"Map/v1/GetRouteRanking?pageIndex={ 0 }&pageSize={ pageSize }&name={ name }&id={ id }&type={ type }&filterSelf={ false }";
var url = $"Map/v1/GetRouteRanking?pageIndex={ pageIndex }&pageSize={ pageSize }&name={ name }&id={ id }&type={ type }&filterSelf={ false }";
return Get<JsonResult<MapRouteRankingList>>(url);
}
public JsonResult<MapRouteRankingList> GetShadowList(int id, string name, int pageIndex, int pageSize)
{
var url = $"Map/GetShadowList?pageIndex={ pageIndex }&pageSize={ pageSize }&name={ name }&id={ id }";
return Get<JsonResult<MapRouteRankingList>>(url);
}