diff --git a/Assets/Scenes/Ride.unity b/Assets/Scenes/Ride.unity index f22052f7..946e4daf 100644 --- a/Assets/Scenes/Ride.unity +++ b/Assets/Scenes/Ride.unity @@ -388,7 +388,7 @@ MonoBehaviour: latitudeLongitude: 37.784179, -122.401583 zoom: 15 extentOptions: - extentType: 0 + extentType: 2 defaultExtents: cameraBoundsOptions: camera: {fileID: 234181019} diff --git a/Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs b/Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs index 05ae3fd3..024a9505 100644 --- a/Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs +++ b/Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs @@ -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(); - //var trailRenderer = player.GetComponent(); - //trailRenderer.time = 0; - var trailRendererList = transform.GetComponentsInChildren(); 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(); player.transform.localScale = new Vector3(3f, 3f, 3f); diff --git a/Assets/Scripts/UI/Prefab/MapList/MapItem.cs b/Assets/Scripts/UI/Prefab/MapList/MapItem.cs index b226b5e1..ab9cc3a9 100644 --- a/Assets/Scripts/UI/Prefab/MapList/MapItem.cs +++ b/Assets/Scripts/UI/Prefab/MapList/MapItem.cs @@ -218,6 +218,7 @@ public class MapItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandler, map.IsFavorite = !map.IsFavorite; transform.Find("CollectImg").Find("Image").GetComponent().sprite = UIManager.Instance.collectDict[map.IsFavorite]; + this.model.IsFavorite = map.IsFavorite; //SetColor(map.IsFavorite); } else @@ -225,10 +226,11 @@ public class MapItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandler, UIManager.ShowAlert(r.errMsg); } } - + NearRouteModel model { get; set; } public void Show(Vector3 position, NearRouteModel model) { + this.model = model; //if(position.y > position.z) //{ // position.y = position.z; @@ -251,7 +253,8 @@ public class MapItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandler, AverageGrade = model.AverageGrade, CountryCode = model.CountryCode, AltitudeGraph = model.AltitudeGraph, - Distance = model.Distance + Distance = model.Distance, + IsFavorite = model.IsFavorite, }); }