移动动效和界面调整

Assets/Scenes/Ride/Scripts/SingleUIManager.cs

@@ -81,6 +81,10 @@ namespace Assets.Scenes.Ride.Scripts
         Image arrow;
         AbstractMap map;
         Transform t;
+        GameObject alertPanel;
+        Button alertBtn;
+        Button alertCloseBtn;
+        Text preSlopeText;
         void Awake()
         {
             #region 控件获取与事件绑定
@@ -114,7 +118,14 @@ namespace Assets.Scenes.Ride.Scripts
             img = transform.Find("Panel/GraphChart/Head").GetComponent<RawImage>();
             t = transform.Find("Panel/GraphChart/Button");
             miniMap = transform.Find("Panel/MiniMap").GetComponent<RawImage>();
-            
+
+            alertPanel = transform.Find("Panel/Alert").gameObject;
+            alertBtn = transform.Find("Panel/Alert/SaveButton").GetComponent<Button>();
+            alertCloseBtn = transform.Find("Panel/Alert/CloseButton").GetComponent<Button>();
+            UIManager.AddEvent(alertBtn.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, AlertOk);
+            UIManager.AddEvent(alertCloseBtn.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, AlertClose);
+
+
             selectPanel = transform.Find("Panel/SelectPanel").gameObject;
             selectPlayer = transform.Find("Panel/SelectPlayer").gameObject;
             reviewPanel = transform.Find("Panel/ReviewPanel").gameObject;
@@ -133,6 +144,8 @@ namespace Assets.Scenes.Ride.Scripts
             viewButton =transform.Find("Panel/ViewButton").GetComponent<Button>();
             altitudeGraph = transform.Find("Panel/TitlePanel/AltitudeGraph").GetComponent<RawImage>();
 
+            preSlopeText = transform.Find("Panel/PreSlopePanel/PreSlopeText").GetComponent<Text>();
+
             target = transform.parent.Find("Target").gameObject;
 
             UIManager.AddEvent(startBtn.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, StartRide);
@@ -153,19 +166,6 @@ namespace Assets.Scenes.Ride.Scripts
             UIManager.AddEvent(singleButton.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerExit, OnPointExit);
             UIManager.AddEvent(shadowButton.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerExit, OnPointExit);
 
-
-            //startBtn.onClick.AddListener(StartRide);
-            //simpleBtn.onClick.AddListener(ClearPanel);
-            //pauseButton.onClick.AddListener(PauseRide);
-            //settingButton.onClick.AddListener(ShowSettingPanel);
-            //deviceButton.onClick.AddListener(ShowDevicePanel);
-            //exitButton.onClick.AddListener(StopRide);
-            //singleButton.onClick.AddListener(SingleRide);
-            //shadowButton.onClick.AddListener(ShadowRide);
-            //addButton.onClick.AddListener(ShowSelectPlayer);
-            //saveButton.onClick.AddListener(SaveRide);
-            //cancelQuitButton.onClick.AddListener(CancelQuit);
-            //closeQuitButton.onClick.AddListener(CloseQuit);
             #endregion
         }
 
@@ -241,6 +241,7 @@ namespace Assets.Scenes.Ride.Scripts
                 ditance.text = Math.Round(playerController.TotalDistance, 1).ToString("f1");
                 heartRate.text = $"{Math.Round(playerController.HeartRate, 0)}";
                 candance.text = $"{Math.Round(playerController.Cadance, 0)}";
+                preSlopeText.text = $"{Math.Round(playerController.PreSlope, 1)}%";
                 //倒计时
                 if (count > 0)
                 {
@@ -282,6 +283,14 @@ namespace Assets.Scenes.Ride.Scripts
                 }
                 //控制照片移动
                 ((RectTransform)arrow.transform).position = Camera.main.WorldToScreenPoint(target.transform.position);
+                if (playerController.Distance > 0 && mainController.isStart)
+                {
+                    arrow.transform.Find("bg").gameObject.SetActive(true);
+                }
+                else
+                {
+                    arrow.transform.Find("bg").gameObject.SetActive(false);
+                }
             }
         }
   
@@ -307,13 +316,24 @@ namespace Assets.Scenes.Ride.Scripts
         {
             selectPlayer.SetActive(true);
         }
-        private void StartRide(BaseEventData baseEventData)
+        public void AlertOk(BaseEventData baseEventData)
+        {
+            alertPanel.SetActive(false);
+            UIManager.Show(UIManager.Instance.DevicePanel, transform.Find("Panel").GetComponent<PFUIPanel>());
+        }
+        public void AlertClose(BaseEventData baseEventData)
+        {
+            alertPanel.SetActive(false);
+        }
+        public void StartRide(BaseEventData baseEventData)
         {
             var antConnected = mainController.CheckAnt();//初始化ant+设备
-            //if (!antConnected)
-            //{
-            //    throw new Exception("请先连接设备");
-            //}
+#if !UNITY_EDITOR
+            if (!antConnected)
+            {
+                alertPanel.SetActive(true);
+            }
+#endif
             //加个5秒钟倒计时
             count = 5;
             startBtn.gameObject.SetActive(false);
@@ -514,7 +534,7 @@ namespace Assets.Scenes.Ride.Scripts
         void MoveChartMarkPoint()
         {
             Vector3 prePosition = img.transform.position;
-            int nextIndex = playerController.CurrentIndex;
+            int nextIndex = playerController.CurrentIndex+1;
             double ditance = playerController.Distance;//当前移动距离
             double currentDistance = playerController.CurrentDistance;//当前区间距离
             var t = currentDistance != 0 ? ditance*1000 / currentDistance : 0;
@@ -524,7 +544,14 @@ namespace Assets.Scenes.Ride.Scripts
 
             var currentPos =  Vector3.Lerp(prePosition, nextPosition, (float)t);
             img.transform.DOMove(currentPos, 1);
-
+            var ss = graph.GetComponentInChildren<ChartDataSourceScript>();
+            var q = ss.pageStartThreshold;
+            var p = ss.pageEndThreshold;
+            var diff = currentPos.x - prePosition.x;
+            var s = graph.ScrollableData;
+            var sss = s.GetMaxValue(0, true);
+            Debug.Log(sss);
+            //graph.HorizontalScrolling += diff / graph.TotalWidth; 
             //人物移动到中间的时候，线开始向左边平滑移动 
             //int del = (int)Math.Round(graph.DataSource.HorizontalViewSize / 2, 0);
             //if (playerController.CurrentIndex % del == 0)
@@ -532,7 +559,7 @@ namespace Assets.Scenes.Ride.Scripts
             //    graph.HorizontalScrolling += 1;
             //}
 
-            #region 注释
+#region 注释
             //var dataPoints = elevationChart.series.list[0].dataPoints.OrderBy(c => c.x).ToList();
             //if (dataPoints.Count > 0)
             //{
@@ -555,7 +582,7 @@ namespace Assets.Scenes.Ride.Scripts
             //    //testButton.transform.DOLocalMove(new Vector3(pointMap[playerController.CurrentIndex - 1].x-Screen.width/2, pointMap[playerController.CurrentIndex - 1].y, 0),0.5f);
             //    //pointMap.Remove(playerController.CurrentIndex - 1);
             //}
-            #endregion
+#endregion
         }
     }
 }