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

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

Browse Source
This commit is contained in:
CaiYanPeng 2021-04-30 17:50:37 +08:00
commit 6399c26f7e
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Assets/Scenes/Ride/Scripts/CyclingController.cs
View File

@ -179,6 +179,13 @@ public class CyclingController : DeviceServiceMonoBase
player.SetActive(true); player.SetActive(true);
UIObject.SetActive(true); UIObject.SetActive(true);
miniMap.SetActive(true); miniMap.SetActive(true);
map.OnTileFinished += Map_OnTileFinished;
}
private void Map_OnTileFinished(Mapbox.Unity.MeshGeneration.Data.UnityTile obj)
{
var playerController = player.GetComponent<PlayerController>();
player.transform.position = map.GeoToWorldPosition(playerController.Currentlatlong);
} }
//设置骑行模式 //设置骑行模式
@ -212,13 +219,16 @@ public class CyclingController : DeviceServiceMonoBase
public bool Is3dView; public bool Is3dView;
public void ChangeMapImageStyle(GameObject arrowGameObj) public void ChangeMapImageStyle(GameObject arrowGameObj)
{ {
if (!Is3dView) if (!Is3dView)
{ {
map.Terrain.ExaggerationFactor = 1.5f; map.Terrain.ExaggerationFactor = 1.5f;
map.Terrain.SetElevationType(ElevationLayerType.TerrainWithElevation); map.Terrain.SetElevationType(ElevationLayerType.TerrainWithElevation);
map.ImageLayer.SetLayerSource(ImagerySourceType.Custom); map.ImageLayer.SetLayerSource(ImagerySourceType.Custom);
//map.SetTileMaterial(new Material()); //map.SetTileMaterial(new Material());
var playerController = player.GetComponent<PlayerController>();
player.transform.localScale = new Vector3(3f, 3f, 3f); player.transform.localScale = new Vector3(3f, 3f, 3f);
player.transform.position = map.GeoToWorldPosition(playerController.Currentlatlong);
Is3dView = true; Is3dView = true;
arrowGameObj.SetActive(false); arrowGameObj.SetActive(false);
} }
@ -228,6 +238,10 @@ public class CyclingController : DeviceServiceMonoBase
map.Terrain.SetElevationType(ElevationLayerType.FlatTerrain); map.Terrain.SetElevationType(ElevationLayerType.FlatTerrain);
map.ImageLayer.SetLayerSource(ImagerySourceType.MapboxDark); map.ImageLayer.SetLayerSource(ImagerySourceType.MapboxDark);
player.transform.localScale = new Vector3(0.1f, 0.1f, 0.1f); player.transform.localScale = new Vector3(0.1f, 0.1f, 0.1f);
var playerController = player.GetComponent<PlayerController>();
player.transform.position = map.GeoToWorldPosition(playerController.Currentlatlong);
var trailRenderer = player.GetComponent<TrailRenderer>(); var trailRenderer = player.GetComponent<TrailRenderer>();
trailRenderer.time = 0; trailRenderer.time = 0;
StartCoroutine(EnableTrailRenderer(trailRenderer)); StartCoroutine(EnableTrailRenderer(trailRenderer));

4
Assets/Scenes/Ride/Scripts/SingleUIManager.cs
View File

@ -271,6 +271,10 @@ namespace Assets.Scenes.Ride.Scripts
viewButton.enabled = false; viewButton.enabled = false;
viewButton.interactable = false; viewButton.interactable = false;
} }
else
{
ChangeView(null);
}
} }
//继续骑行如果有伴侣就自动进入伴侣骑行 //继续骑行如果有伴侣就自动进入伴侣骑行
public void ContinueRide() public void ContinueRide()