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

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

Browse Source 
# Conflicts:
#	Assets/Cyp/Prefab.meta
#	Assets/Mapbox/Core/Plugins/Android.meta
#	Assets/Mapbox/Core/Plugins/Mapbox.meta
#	Assets/Mapbox/Core/Plugins/Mapbox/MapboxAccounts.meta
#	Assets/Plugins/Circle/ImageWithRoundedCorners.cs
#	Assets/Resources/Images/Devices.meta
#	Assets/Resources/UI/Prefab/Item.meta
#	Assets/Scripts/Devices/Ant/LegacyPages.meta
#	Assets/Scripts/UI/Prefab/Item.meta
#	Assets/StreamingAssets.meta
#	ProjectSettings/EditorBuildSettings.asset
This commit is contained in:
lishuo committed 2021-04-01 14:09:23 +08:00
2 parents 2e6338bcf3 ec7589096f
commit ae9cefc645
144 files changed
+32337 -8064
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Assets/Scenes/Ride/Ride.unity
+619 -1069
View File
File diff suppressed because it is too large. Load diff
Assets/Scenes/Ride/Scripts/CyclingController.cs
+5 -4
View File
@@ -148,12 +148,13 @@ public class CyclingController : MonoBehaviour
//获取路书信息
//MapApi mapApi = new MapApi();
//var result = mapApi.GetData(5942);
RouteId = 5942;
var result = GetTestData();
mapApi = new MapApi();
RouteId = App.RouteIdParam;
//var result = GetTestData();
var result = mapApi.GetData(RouteId);
//StartCoroutine(requset());
//获取UDP信息 TODO
mapApi = new MapApi();
//var param = mapApi.GetById(RouteId);
//Route mapRoute = GetNewInstace(RouteId);//获取一个路书所有的数据