Merge remote-tracking branch 'origin/dev' into dev

Assets/Mapbox/Unity/SourceLayers/MapboxDefaultImagery.cs

@@ -66,7 +66,13 @@
 					};
 					break;
 				case ImagerySourceType.None:
-					throw new Exception("Invalid type : None");
+					//throw new Exception("Invalid type : None");
+					defaultStyle = new Style
+					{
+						Id = "mapbox://styles/juzetest/ckmkdjwsa1nvt17nr1ps4fqgs",
+						Name = "juzetest"
+					};
+					break;
 				default:
 					break;
 			}

Assets/Resources/UI/Prefab/Panel/BigMapPanel.prefab

@@ -980,12 +980,12 @@ MonoBehaviour:
   _initializeOnStart: 1
   _imagery:
     _layerProperty:
-      sourceType: 2
+      sourceType: 6
       sourceOptions:
         isActive: 1
         layerSource:
           Name: Dark
-          Id: mapbox://styles/mapbox/dark-v9
+          Id: mapbox://styles/juzetest/ckmkdjwsa1nvt17nr1ps4fqgs
           Modified: 
           UserName: 
       rasterOptions:
@@ -1610,12 +1610,12 @@ PrefabInstance:
     - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
@@ -1625,7 +1625,7 @@ PrefabInstance:
     - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -9
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8688565590564084001, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
@@ -1720,12 +1720,12 @@ PrefabInstance:
     - target: {fileID: 2054923810110871857, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2054923810110871857, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2054923810110871857, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}
@@ -1735,7 +1735,7 @@ PrefabInstance:
     - target: {fileID: 2054923810110871857, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -9
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2194771378174845541, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}
@@ -1905,12 +1905,12 @@ PrefabInstance:
     - target: {fileID: 6347209353323850145, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6347209353323850145, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6347209353323850145, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}
@@ -1920,7 +1920,7 @@ PrefabInstance:
     - target: {fileID: 6347209353323850145, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -9
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6549425620798886645, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}
@@ -1935,12 +1935,12 @@ PrefabInstance:
     - target: {fileID: 8197454007437855745, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8197454007437855745, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8197454007437855745, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}
@@ -1950,17 +1950,17 @@ PrefabInstance:
     - target: {fileID: 8197454007437855745, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -9
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8526344065104504758, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8526344065104504758, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8526344065104504758, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}
@@ -1970,7 +1970,7 @@ PrefabInstance:
     - target: {fileID: 8526344065104504758, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -2
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 9135822971364406318, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}

Assets/Resources/UI/Prefab/Ride/ReviewItem.prefab

@@ -108,7 +108,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: -40, y: 0}
+  m_AnchoredPosition: {x: -39.638, y: -10.652}
   m_SizeDelta: {x: 80, y: 34}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6375313706153414257
@@ -140,7 +140,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3}
-    m_FontSize: 24
+    m_FontSize: 20
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 2
@@ -186,7 +186,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 95.5, y: 0}
+  m_AnchoredPosition: {x: 95.5, y: 4.5}
   m_SizeDelta: {x: 99, y: 17}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6375313706613039493

Assets/Scenes/MainScene.unity

@@ -653,7 +653,7 @@ Light:
   serializedVersion: 10
   m_Type: 1
   m_Shape: 0
-  m_Color: {r: 0.93333334, g: 0.9019608, b: 0.90588236, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_Intensity: 1
   m_Range: 10
   m_SpotAngle: 30
@@ -710,13 +710,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 873388893}
-  m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261}
+  m_LocalRotation: {x: 0.6830127, y: -0.18301266, z: 0.18301266, w: 0.6830127}
   m_LocalPosition: {x: 0, y: 3, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
+  m_LocalEulerAnglesHint: {x: 90, y: -30, z: 0}
 --- !u!1 &1378474435
 GameObject:
   m_ObjectHideFlags: 0

Assets/Scenes/Ride/Scripts/CyclingController.cs

@@ -182,11 +182,11 @@ public class CyclingController : DeviceServiceMonoBase
         map.OnTileFinished += Map_OnTileFinished;
     }
 
-    private void Map_OnTileFinished(Mapbox.Unity.MeshGeneration.Data.UnityTile obj)
+    //private void Map_OnTileFinished(Mapbox.Unity.MeshGeneration.Data.UnityTile obj)
-    {
+    //{
-        var playerController = player.GetComponent<PlayerController>();
+    //    var playerController = player.GetComponent<PlayerController>();
-        player.transform.position = map.GeoToWorldPosition(playerController.Currentlatlong);
+    //    player.transform.position = map.GeoToWorldPosition(playerController.Currentlatlong);
-    }
+    //}
 
     //设置骑行模式
     public void SetCyclingModel(CyclingModel mode)
@@ -203,6 +203,18 @@ public class CyclingController : DeviceServiceMonoBase
                 break;
         }
         AutoStart();
+
+        lockView = true;
+        if (recorderData != null)
+        {
+            var lastLatLon = Along(recorderData.EndDistance);
+            player.transform.position = map.GeoToWorldPosition(lastLatLon);
+        }
+        else
+        {
+            var lastLatLon = Along(0);
+            player.transform.position = map.GeoToWorldPosition(lastLatLon);
+        }
     }
     SingleUIManager singleUIManager;
     public void AutoStart()
@@ -226,27 +238,40 @@ public class CyclingController : DeviceServiceMonoBase
             map.Terrain.SetElevationType(ElevationLayerType.TerrainWithElevation);
             map.ImageLayer.SetLayerSource(ImagerySourceType.Custom);
             //map.SetTileMaterial(new Material());
-            var playerController = player.GetComponent<PlayerController>();
+             Is3dView = true;
-            player.transform.localScale = new Vector3(3f, 3f, 3f);
-            player.transform.position = map.GeoToWorldPosition(playerController.Currentlatlong);
-            Is3dView = true;
             arrowGameObj.SetActive(false);
         }
-        else
+        //else
-        {
+        //{
-            map.Terrain.ExaggerationFactor = 0f;
+        //    map.Terrain.ExaggerationFactor = 0f;
-            map.Terrain.SetElevationType(ElevationLayerType.FlatTerrain);
+        //    map.Terrain.SetElevationType(ElevationLayerType.FlatTerrain);
-            map.ImageLayer.SetLayerSource(ImagerySourceType.MapboxDark);
+        //    map.ImageLayer.SetLayerSource(ImagerySourceType.None);
-            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>();
+        //    trailRenderer.time = 0;
+        //    StartCoroutine(EnableTrailRenderer(trailRenderer));
+        //    Is3dView = false;
+        //    arrowGameObj.SetActive(true);
+        //}
+    }
+    private bool lockView = false;
+    private void Map_OnTileFinished(Mapbox.Unity.MeshGeneration.Data.UnityTile obj)
+    {
+        if (!lockView) {
+            
             var playerController = player.GetComponent<PlayerController>();
-            player.transform.position = map.GeoToWorldPosition(playerController.Currentlatlong);
+            player.transform.localScale = new Vector3(3f, 3f, 3f);
-
+            var locations = playerController.Currentlatlong == null ? playerController.Currentlatlong : new Vector2d(mapData.List[0].Point[0], mapData.List[0].Point[1]);
-            var trailRenderer = player.GetComponent<TrailRenderer>();
+            player.transform.position = map.GeoToWorldPosition(locations);
-            trailRenderer.time = 0;
+            if (recorderData != null)
-            StartCoroutine(EnableTrailRenderer(trailRenderer));
+            {
-            Is3dView = false;
+                var lastLatLon = Along(recorderData.EndDistance);
-            arrowGameObj.SetActive(true);
+                player.transform.position = map.GeoToWorldPosition(lastLatLon);
+            }
         }
     }
 

Assets/Scenes/Ride/Scripts/PlayerController.cs

@@ -33,7 +33,7 @@ namespace Assets.Scenes.Ride.Scripts
 			weight = App.CurrentUser.Weight;
 			bicycleWeight = App.CurrentUser.BicycleWeight;
 #if UNITY_EDITOR
-            //power = 2000;//测试功率
+            power = 2000;//测试功率
 #endif
             Debug.Log(currentSlope.ToString() + "==" + App.rideSetting.sensitivity.ToString());
 			//mainController.CheckAnt();

Assets/Scenes/Ride/Scripts/SelectPlayerFactory.cs

@@ -32,7 +32,7 @@ namespace Assets.Scenes.Ride.Scripts
         InputField startValue;
         InputField endValue;
         private int pageIndex = 0;
-        private int pageSize = 8;
+        private int pageSize = 25;
         private int totalPages = 0;
         private string seachName = string.Empty;
 
@@ -86,11 +86,11 @@ namespace Assets.Scenes.Ride.Scripts
             gameObjects.Add(transform.Find("Panel/Player4").gameObject);
             gameObjects.Add(transform.Find("Panel/Player5").gameObject);
             //功体比默认条件
-            var currentUserWkg = Math.Round((App.CurrentUser.FTP / App.CurrentUser.Weight),2);
+            //var currentUserWkg = Math.Round((App.CurrentUser.FTP / App.CurrentUser.Weight),2);
-            _startValue = currentUserWkg - 0.5<0?0 : currentUserWkg - 0.5;
+            //_startValue = currentUserWkg - 0.5<0?0 : currentUserWkg - 0.5;
-            _endValue = currentUserWkg + 0.5;
+            //_endValue = currentUserWkg + 0.5;
-            startValue.text = _startValue.ToString();
+            //startValue.text = _startValue.ToString();
-            endValue.text = _endValue.ToString();
+            //endValue.text = _endValue.ToString();
         }
         private void StartvalueChanged(string input)
         {

Assets/Scenes/Ride/Scripts/SingleUIManager.cs

@@ -134,7 +134,7 @@ namespace Assets.Scenes.Ride.Scripts
             miniMap = transform.Find("Panel/MiniMap").GetComponent<RawImage>();
 
             alertPanel = transform.Find("Panel/Alert").gameObject;
-         
+
             selectPanel = transform.Find("Panel/SelectPanel").gameObject;
             selectPlayer = transform.Find("Panel/SelectPlayer").gameObject;
             reviewPanel = transform.Find("Panel/ReviewPanel").gameObject;
@@ -156,7 +156,7 @@ namespace Assets.Scenes.Ride.Scripts
             closeQuitButton = transform.Find("Panel/QuitPanel/QuitPanel/CloseButton").GetComponent<Button>();
             abandonButton = transform.Find("Panel/QuitPanel/QuitPanel/AbandonButton").GetComponent<Button>();
 
-            viewButton =transform.Find("Panel/ViewButton").GetComponent<Button>();
+            viewButton = transform.Find("Panel/ViewButton").GetComponent<Button>();
             altitudeGraph = transform.Find("Panel/TitlePanel/AltitudeGraph").GetComponent<RawImage>();
             leftImage = transform.Find("Panel/TitlePanel/Left").GetComponent<Image>();
             rightImage = transform.Find("Panel/TitlePanel/Right").GetComponent<Image>();
@@ -195,8 +195,7 @@ namespace Assets.Scenes.Ride.Scripts
             UIManager.AddEvent(shadowButton.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerEnter, OnPointEnter);
             UIManager.AddEvent(singleButton.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerExit, OnPointExit);
             UIManager.AddEvent(shadowButton.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerExit, OnPointExit);
-
+           
-     
             #endregion
         }
 
@@ -216,7 +215,7 @@ namespace Assets.Scenes.Ride.Scripts
         }
         void OnPointExit(BaseEventData pointerEventData)
         {
-            var button =((PointerEventData)pointerEventData).pointerEnter.GetComponent<Button>();
+            var button = ((PointerEventData)pointerEventData).pointerEnter.GetComponent<Button>();
             if (button != null)
             {
                 var enterTransform = button.transform;
@@ -243,6 +242,10 @@ namespace Assets.Scenes.Ride.Scripts
             CountDown();
             MoveCamera();
         }
+        private float cameraX = 0;
+        private float cameraY = 0;
+        private float cameraZ = 0;
+
         private void Init()
         {
             playerController = FindObjectOfType<PlayerController>();
@@ -250,6 +253,14 @@ namespace Assets.Scenes.Ride.Scripts
 
             var route = mainController.GetRoute();
             mapName.text = route.RouteInstance.Name;
+            var camera = route.RouteInstance.Camera;
+            if (!string.IsNullOrEmpty(camera))
+            {
+                var cameraArr = camera.Split(',');
+                cameraX = float.Parse(cameraArr[0]);
+                cameraY = float.Parse(cameraArr[1]);
+                cameraZ = float.Parse(cameraArr[2]);
+            }
             totalDistance.text = Math.Round(mainController.GetMapData().TotalDistance, 1).ToString() + "KM";//总里程
             Utils.DisplayImage(StartCoroutine, altitudeGraph, route.RouteInstance.AltitudeGraph);//渲染海拔图
 
@@ -270,9 +281,12 @@ namespace Assets.Scenes.Ride.Scripts
             {
                 viewButton.enabled = false;
                 viewButton.interactable = false;
+                mainController.Is3dView = false;
+                mainController.player.transform.localScale = new Vector3(0, 0, 0);
             }
             else
             {
+                mainController.Is3dView = false;
                 ChangeView(null);
             }
         }
@@ -306,10 +320,11 @@ namespace Assets.Scenes.Ride.Scripts
                 if (!mainController.Is3dView)
                 {                                                               //target.transform.rotation = playerController.transform.rotation;//new Quaternion(playerController.transform.rotation.x, playerController.transform.rotation.y +1f, playerController.transform.rotation.z, playerController.transform.rotation.w);
                     target.transform.eulerAngles = new Vector3(0, playerController.transform.eulerAngles.y + 160f, 0);
+                    mainController.player.transform.localScale = new Vector3(0.1f, 0.1f, 0.1f);
                 }
                 else
                 {
-                    target.transform.eulerAngles = new Vector3(0, -65f, 0);
+                    target.transform.eulerAngles = new Vector3(cameraX, cameraY, cameraZ);
                 }
                 //控制照片移动
                 ((RectTransform)arrow.transform).position = Camera.main.WorldToScreenPoint(target.transform.position);
@@ -341,7 +356,7 @@ namespace Assets.Scenes.Ride.Scripts
                     {
                         reviewPanel.GetComponent<CanvasGroup>().DOFade(0, 1);
                         //附近的人
-                       // nearByPanel.GetComponent<CanvasGroup>().DOFade(0, 1);
+                        // nearByPanel.GetComponent<CanvasGroup>().DOFade(0, 1);
                     }
                     timeRemaining = 1.0f;
                 }
@@ -364,16 +379,16 @@ namespace Assets.Scenes.Ride.Scripts
                 //坡度相关数据
                 nextSlopeText.text = Math.Round(playerController.NextSlope, 1).ToString() + "%";
                 //nextSlopeDistanceText.GetComponent<NumberDotween>().AnimateNum((float)playerController.NextSlopeDistance, 0, "-{0}M");
-                nextSlopeDistanceText.text = $"{Math.Round(playerController.NextSlopeTotalDistance, 0)}M";  
+                nextSlopeDistanceText.text = $"{Math.Round(playerController.NextSlopeTotalDistance, 0)}M";
                 currentSlopeText.text = Math.Round(playerController.CurrentSlope, 1).ToString() + "%";
-                currentSlopeDistanceText.GetComponent<NumberDotween>().AnimateNum((float)playerController.CurrentSlopeDistance, Math.Round(playerController.CurrentDistance, 0),  playerController.CurrentIndex, 0, "{0}M");
+                currentSlopeDistanceText.GetComponent<NumberDotween>().AnimateNum((float)playerController.CurrentSlopeDistance, Math.Round(playerController.CurrentDistance, 0), playerController.CurrentIndex, 0, "{0}M");
                 totalClimb.text = Math.Round(playerController.TotalClimb, 0).ToString();
                 //动态改变坡度图片
-                if (playerController.CurrentSlope >= 1 )
+                if (playerController.CurrentSlope >= 1)
                 {
                     currentSlopeImage.sprite = uphill1;
                 }
-                else if(playerController.CurrentSlope > -1|| playerController.CurrentSlope<1)
+                else if (playerController.CurrentSlope > -1 || playerController.CurrentSlope < 1)
                 {
                     currentSlopeImage.sprite = straight;
                 }
@@ -429,7 +444,7 @@ namespace Assets.Scenes.Ride.Scripts
             Reset();
             selectPlayer.SetActive(true);
         }
-       
+
         public void StartRide(BaseEventData baseEventData)
         {
             var antConnected = mainController.CheckAnt();//初始化ant+设备
@@ -460,7 +475,7 @@ namespace Assets.Scenes.Ride.Scripts
         }
         private void SaveRide(BaseEventData baseEventData)
         {
-            if (playerController.TotalTicks > 0 && !mainController.isQuit )
+            if (playerController.TotalTicks > 0 && !mainController.isQuit)
             {
                 mainController.SetQuit();
                 playerController.Upload();
@@ -517,7 +532,7 @@ namespace Assets.Scenes.Ride.Scripts
                 clearLock = false;
                 leftPanel.transform.DOLocalMove(new Vector3(leftPanel.transform.localPosition.x + isSimple * 430f, leftPanel.transform.localPosition.y, leftPanel.transform.localPosition.z), 1);
                 titlePanel.transform.DOLocalMove(new Vector3(titlePanel.transform.localPosition.x, titlePanel.transform.localPosition.y + isSimple * 200f, titlePanel.transform.localPosition.z), 1);
-                miniMap.transform.DOLocalMove(new Vector3(miniMap.transform.localPosition.x , miniMap.transform.localPosition.y + isSimple * 260f, miniMap.transform.localPosition.z), 1);
+                miniMap.transform.DOLocalMove(new Vector3(miniMap.transform.localPosition.x, miniMap.transform.localPosition.y + isSimple * 260f, miniMap.transform.localPosition.z), 1);
                 nextSlopePanel.transform.DOLocalMove(new Vector3(nextSlopePanel.transform.localPosition.x, nextSlopePanel.transform.localPosition.y + isSimple * 260f, nextSlopePanel.transform.localPosition.z), 1);
                 currentSlopePanel.transform.DOLocalMove(new Vector3(currentSlopePanel.transform.localPosition.x, currentSlopePanel.transform.localPosition.y + isSimple * 80f, currentSlopePanel.transform.localPosition.z), 1);
 
@@ -553,13 +568,13 @@ namespace Assets.Scenes.Ride.Scripts
             chartDataSourceScript = transform.Find("Panel/GraphChart").GetComponent<ChartDataSourceScript>();
             graph = transform.Find("Panel/GraphChart").GetComponent<GraphChartBase>();
             chartDataSourceScript.SetDataSource(dd.ToArray());
-           
+
             if (App.CurrentUser != null)
             {
                 Utils.DisplayImage(StartCoroutine, head, App.CurrentUser.WxHeadImg);
             }
         }
-    
+
         //挪到人物脚本中处理
         void MoveChartMarkPoint()
         {
@@ -574,9 +589,9 @@ namespace Assets.Scenes.Ride.Scripts
         private void MoverCurrentUserHead()
         {
             Vector3 prePos = headPanel.transform.position;
-            int nextIndex = playerController.CurrentIndex +1;
+            int nextIndex = playerController.CurrentIndex + 1;
             var viewIndex = chartDataSourceScript.GetViewIndex(nextIndex);
-            if (!mainController.isStart && !mainController.isPause && !mainController.isQuit)//未开始未暂停未结束
+            if (!mainController.isStart && !mainController.isPause && !mainController.isQuit ||(mainController.isStart && playerController.Distance == 0))//未开始未暂停未结束
             {
                 viewIndex = 0;
             }
@@ -607,7 +622,7 @@ namespace Assets.Scenes.Ride.Scripts
             foreach (var item in others)
             {
                 var itemIndex = chartDataSourceScript.GetViewIndex(item.CurrentIndex) + 1;
-                if (!mainController.isStart && !mainController.isPause && !mainController.isQuit)//未开始未暂停未结束
+                if (!mainController.isStart && !mainController.isPause && !mainController.isQuit || (mainController.isStart && item.Distance == 0))//未开始未暂停未结束
                 {
                     itemIndex = 0;
                 }

Assets/Scripts/Apis/Models/MapRoute.cs

@@ -105,5 +105,7 @@ namespace Assets.Scripts.Apis.Models
         public string CountryCode { get; set; }
         public bool IsFire { get; set; }
         public string AltitudeGraph { get; set; }
+        //0,0,0
+        public string Camera { get; set; }
     }
 }

Assets/Scripts/UI/Prefab/Panel/BigMapController.cs

@@ -70,15 +70,17 @@ public class BigMapController : PFUIPanel
     IEnumerator Main()
     {
         mapManager = this.transform.Find("Map").GetComponent<AbstractMap>();
-        mapManager.MaxZoom = 4;
+        //mapManager.MaxZoom = 4;
         mapManager.OnInitialized += MapManager_OnInitialized;
         mapManager.OnUpdated += MapManager_OnUpdated;
 
         //// mapManager.OnTileFinished += MapManager_OnTileFinished;
-        mapManager.SetZoom(5.8f);
+        //mapManager.SetZoom(5.8f);
+        
         //mapManager.SetCenterLatitudeLongitude(new Mapbox.Utils.Vector2d(32.051203, 118.771572));
 
         this.transform.Find("Map").GetComponent<QuadTreeCameraMovement>()._referenceCamera = Camera.main;
+        
 
         canvas = this.transform.Find("Canvas").gameObject;
         canvas.GetComponent<Canvas>().worldCamera = Camera.main;
@@ -167,14 +169,17 @@ public class BigMapController : PFUIPanel
         //Debug.Log(infoStr);
         var info = Newtonsoft.Json.Linq.JObject.Parse(infoStr);
 
-        var center = (info["features"] as JArray).First()["center"];
+        var features = (info["features"] as JArray);
-        mapManager.UpdateMap(new Vector2d(Convert.ToDouble(center[1]), Convert.ToDouble(center[0])));
+        if (features.Count > 0) {
-
+            var center = features.First()["center"];
+            mapManager.UpdateMap(new Vector2d(Convert.ToDouble(center[1]), Convert.ToDouble(center[0])));
+        }
         UIManager.HideLoadingDialogBox();
     }
 
     private void MapManager_OnInitialized()
     {
+        mapManager.UpdateMap(5.8f);
         Load();
     }
     private void MapManager_OnUpdated()

Assets/Scripts/UI/Prefab/Panel/EarthController.cs

@@ -7,6 +7,7 @@ using UnityEngine.UI;
 using Assets.Scripts.Apis;
 using Newtonsoft.Json.Linq;
 using Assets.Scripts;
+using UnityEngine.EventSystems;
 
 public class EarthController : PFUIPanel
 {
@@ -61,7 +62,17 @@ public class EarthController : PFUIPanel
         panel = rootPanel.Find("Panel").gameObject;
         SetRounded(panel.transform, 60);
         panel.gameObject.SetActive(false);
-        
+
+
+        var goList = rootPanel.transform.Find("SwitchMode");
+        SetRounded(goList, 64);
+        UIManager.AddEvent(goList.Find("GoList").gameObject, EventTriggerType.PointerClick, (e) =>
+        {            
+            //UIManager.PopStack();
+            UIManager.ShowMapListPanel();
+            //this.gameObject.SetActive(false);
+            //DestroyImmediate(this.gameObject);
+        });
 
         maskImage = rootPanel.Find("MaskImage").GetComponent<RawImage>();
 
@@ -85,7 +96,7 @@ public class EarthController : PFUIPanel
         Camera.main.transform.rotation = Quaternion.Euler(0, 0, 0);
 
 
-        map.SetZoomLevel(1.43f);
+        map.SetZoomLevel(2.6f);
         //var zoom = map.GetZoomLevel();
         //Debug.Log(zoom);
         map.OnZoomStart += Map_OnZoomStart;
@@ -139,8 +150,12 @@ public class EarthController : PFUIPanel
             var latLon = province.latlonCenter;
             EnterBigMap(latLon);
         };
-    }
 
+        skybox  = Camera.main.GetComponent<Skybox>();
+        Debug.Log(skybox != null);
+    }
+    private float rot = 0;
+    Skybox skybox;
     /// <summary>
     /// 显示概要信息
     /// </summary>
@@ -246,6 +261,10 @@ public class EarthController : PFUIPanel
             }
         }
         //Debug.Log(showSummary + "," + time);
+
+        //rot += 0.1f * Time.deltaTime;
+        //rot %= 360;
+        //skybox.material.SetFloat("_Rotation", rot);
     }
 
     public void Show(double lat, double lon)

Assets/Scripts/UIManager.cs

@@ -483,7 +483,7 @@ public class UIManager : MonoBehaviour
         EventTrigger.Entry pointerEvent = new EventTrigger.Entry();
         pointerEvent.eventID = eventTriggerType;
         pointerEvent.callback.AddListener((e)=> {
-            if (gameObject.activeInHierarchy == false) return;
+            if (gameObject == null || gameObject.activeInHierarchy == false) return;
             var btn = gameObject.GetComponent<Button>();
             if(btn != null && btn.enabled == false)
             {