Merge remote-tracking branch 'origin/dev_mobile_ble' into dev_release

This commit is contained in:
Caiyanpeng committed 2021-11-03 09:52:51 +08:00
commit e8a12452ca
3 files changed
+15 -11

No files matched your search

@@ -492,7 +492,9 @@ public class CyclingController : DeviceServiceMonoBase
public void GameStart()
{
var check = CheckAnt();
#if UNITY_EDITOR
check = true;
#endif
if (check)
{
singleUIManager.StartRide();
@@ -669,10 +671,6 @@ public class CyclingController : DeviceServiceMonoBase
public bool Is3dView;
public void ChangeMapImageStyle(GameObject arrowGameObj)
{
//var playerController = player.GetComponent<PlayerController>();
//var trailRenderer = player.GetComponent<TrailRenderer>();
//trailRenderer.time = 0;
var trailRendererList = transform.GetComponentsInChildren<TrailRenderer>();
foreach (var item in trailRendererList)
{
@@ -719,13 +717,16 @@ public class CyclingController : DeviceServiceMonoBase
arrowGameObj.SetActive(true);
Is3dView = false;
}
ChangeCurrentPlayer(currentPlayer.UserId);
if (competitionId > 0)
{
ChangeCurrentPlayer(currentPlayer.UserId);
}
}
private bool lockView = false;
private void Map_OnTileFinished(Mapbox.Unity.MeshGeneration.Data.UnityTile obj)
{
if (!lockView) {
if (!lockView)
{
var playerController = player.GetComponent<PlayerController>();
player.transform.localScale = new Vector3(3f, 3f, 3f);