From a9fc25defba01e0dc829d2a88e921f9431043b11 Mon Sep 17 00:00:00 2001
From: lishuo <lishuo@juze.pro>
Date: Tue, 2 Nov 2021 14:38:05 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=A4=A7=E5=9C=B0=E7=90=83?=
 =?UTF-8?q?=E6=94=B6=E8=97=8F=E9=97=AE=E9=A2=98&=E5=8D=95=E4=BA=BA?=
 =?UTF-8?q?=E9=AA=91=E8=A1=8C=E5=88=87=E6=8D=A2=E5=9C=B0=E5=9B=BE=E6=B5=B7?=
 =?UTF-8?q?=E6=8B=94=E5=9B=BE=E4=BD=8D=E7=BD=AE=E9=97=AE=E9=A2=98=E5=92=8C?=
 =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E4=B8=8D=E5=85=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Assets/Scenes/Ride.unity                        |  2 +-
 .../Scenes/Ride/Scripts/CyclingController.cs    | 17 +++++++++--------
 Assets/Scripts/UI/Prefab/MapList/MapItem.cs     |  7 +++++--
 3 files changed, 15 insertions(+), 11 deletions(-)

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 ea3d3a29..ba1896e4 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();
@@ -666,10 +668,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)
         {
@@ -716,13 +714,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);
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<Image>().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,
         });
     }