lishuo/powerfun-unity
1
1 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev_lishuo' into dev

Browse Source 
# Conflicts:
#	.gitignore
#	Assets/Scenes/Ride/Scripts/SelectPlayerFactory.cs
This commit is contained in:
suntao committed 2021-05-12 10:30:08 +08:00
2 parents 2c5501a096 8f0598580d
commit a7ea02f70a
52 files changed
+6329 -2723
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Assets/Scripts/Apis/MapApi.cs
+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);
}
Assets/Scripts/App.cs
+4 -4
View File
@@ -8,7 +8,7 @@ using System.Net;
public static class App
{
public static string Host = "http://192.168.0.101:5082/";
public static string Host = "http://192.168.0.97:5082/";
public static string AppVersion = Application.version;
@@ -51,9 +51,9 @@ public static class App
static App()
{
#if !UNITY_EDITOR
Host = "http://pf.juze.pro/";
UdpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 21000);
TcpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 21001);
//Host = "http://pf.juze.pro/";
//UdpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 21000);
//TcpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 21001);
#endif
}
}