From f16883465f57e2322b2543b774353b794479ddfe Mon Sep 17 00:00:00 2001
From: lishuo <lishuo@juze.pro>
Date: Tue, 25 Jan 2022 18:25:40 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=82=E5=AF=9F=E8=80=85=E5=88=87=E6=8D=A2?=
 =?UTF-8?q?=E4=BA=BA=E7=89=A9=E5=A4=A7=E5=B0=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Scenes/Ride/Scripts/BaseUIManager.cs      |  3 +-
 .../Scenes/Ride/Scripts/CyclingController.cs  | 36 +++++++++++--------
 2 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/Assets/Scripts/Scenes/Ride/Scripts/BaseUIManager.cs b/Assets/Scripts/Scenes/Ride/Scripts/BaseUIManager.cs
index 0d669826..58f4ae4f 100644
--- a/Assets/Scripts/Scenes/Ride/Scripts/BaseUIManager.cs
+++ b/Assets/Scripts/Scenes/Ride/Scripts/BaseUIManager.cs
@@ -372,8 +372,9 @@ namespace Assets.Scenes.Ride.Scripts
                 //{
                 //    return;
                 //}
+                mainController.Is3dView = true;
                 ChangeView(null);
-                //mainController.Is3dView = true;
+                
             }
         }
         
diff --git a/Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs b/Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs
index c136adfb..a283f7f6 100644
--- a/Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs
+++ b/Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs
@@ -720,6 +720,17 @@ public class CyclingController : DeviceServiceMonoBase
     public void ChangeCurrentPlayer(int userId)
     {
         var coll = FindObjectsOfType<AbstractPlayer>();
+        
+        var unselectedPlayers = coll.Where(c => c.UserId != userId).ToList();
+        foreach (var item in unselectedPlayers)
+        {
+            item.transform.localScale = MIN_SIZE;
+            if (item.transform.childCount > 0)
+            {
+                Utils.DestroyChildren(item.transform);
+            }
+        }
+
         var selectedPlayer = coll.Where(c => c.UserId == userId).FirstOrDefault();
         if (selectedPlayer != null)
         {
@@ -732,8 +743,10 @@ public class CyclingController : DeviceServiceMonoBase
             {
                 Utils.DestroyChildren(selectedPlayer.transform);
                 var ss = Instantiate(onlineUserPrefab3d, selectedPlayer.transform);
-                ss.transform.localScale = Is3dView ? MAX_SIZE : MIN_SIZE;
+                ss.transform.localScale = new Vector3(1f, 1f, 1f); 
+                selectedPlayer.transform.localScale = Is3dView ? MAX_SIZE : MIN_SIZE;
                 selectedPlayer.UpdateAnimator();
+                selectedPlayer.UserId = userId;
             }
             Vector2d nextLatLon = Along(selectedPlayer.TotalDistance + 0.1);
             //设定人物方向
@@ -743,16 +756,7 @@ public class CyclingController : DeviceServiceMonoBase
             selectedPlayer.transform.rotation = Quaternion.Euler(0, neededRotation.eulerAngles.y, 0);
             selectedPlayer.currentRotation = neededRotation;
         }
-
-        var unselectedPlayers = coll.Where(c => c.UserId != userId).ToList();
-        foreach (var item in unselectedPlayers)
-        {
-            item.transform.localScale = MIN_SIZE;
-            if (item.transform.childCount > 0)
-            {
-                Utils.DestroyChildren(item.transform);
-            }
-        }
+   
         //重置海拔图进度
         var currentIndex = currentPlayer.CurrentIndex;
         graph.HorizontalScrolling = chartDataSourceScript.GetCurrentStart(currentIndex);
@@ -1066,11 +1070,15 @@ public BaseUIManager singleUIManager;
     IEnumerator EnableTrailRenderer(List<TrailRenderer> trailRendererList)
     {
         yield return new WaitForSeconds(2f);
-        foreach (var item in trailRendererList)
+        try
         {
-            item.Clear();
-            item.time = 30;
+            foreach (var item in trailRendererList)
+            {
+                item.Clear();
+                item.time = 30;
+            }
         }
+        catch (Exception e) { }
     }
 
     #endregion