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/Mapbox/Unity/Map/InitializeMapWithLocationProvider.cs
+9 -9
View File
@@ -30,15 +30,15 @@
void LocationProvider_OnLocationUpdated(Unity.Location.Location location)
{
_locationProvider.OnLocationUpdated -= LocationProvider_OnLocationUpdated;
//_map.Initialize(location.LatitudeLongitude, _map.AbsoluteZoom);
//_map.Initialize(location.LatitudeLongitude, _map.AbsoluteZoom);
var mainController = transform.parent.GetComponent<CyclingController>();
if (mainController != null)
{
//初始化map
var point = mainController.GetCenterCoordinate();
_map.Initialize(new Utils.Vector2d(point[0], point[1]), _map.AbsoluteZoom);
}
}
var mainController = transform.parent.GetComponent<CyclingController>();
if (mainController != null)
{
//初始化map
var point = mainController.GetCenterCoordinate();
_map.Initialize(new Utils.Vector2d(point[0], point[1]), _map.AbsoluteZoom);
}
}
}
}