From fdf33ba8df75a955c56c0680157b17c7944da605 Mon Sep 17 00:00:00 2001 From: lishuo Date: Thu, 20 May 2021 19:56:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=B7=E6=8B=94=E5=9B=BE=E5=A4=B4=E5=83=8F?= =?UTF-8?q?=E4=BD=8D=E7=A7=BBbug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Ride/Scripts/Model/CyclingModels/BaseCycling.cs | 3 ++- .../Scenes/Ride/Scripts/OnlinePlayerController.cs | 13 +++++++++++-- Assets/Scenes/Ride/Scripts/PlayerController.cs | 5 +++-- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/Assets/Scenes/Ride/Scripts/Model/CyclingModels/BaseCycling.cs b/Assets/Scenes/Ride/Scripts/Model/CyclingModels/BaseCycling.cs index bc6a6b5a..4e6b14f9 100644 --- a/Assets/Scenes/Ride/Scripts/Model/CyclingModels/BaseCycling.cs +++ b/Assets/Scenes/Ride/Scripts/Model/CyclingModels/BaseCycling.cs @@ -92,7 +92,8 @@ namespace Assets.Scenes.Ride.Scripts.Model.CyclingModels else if (recorderData.EndDistance > 0)//没有骑，但是有初始位置的情况 { var point = _turfHelper.Along(recorderData.EndDistance); - MapUDPService.Send(route.RouteInstance.Id, recorderData.BelongUserId, new double[] { point.Latitude, point.Longitude }, competitionId: recorderData.Competitionid); + //MapUDPService.Send(route.RouteInstance.Id, recorderData.BelongUserId, new double[] { point.Latitude, point.Longitude }, competitionId: recorderData.Competitionid); + MapUDPService.Send(route.RouteInstance.Id, recorderData.BelongUserId, new double[] { point.Latitude, point.Longitude }, endDistance:recorderData.EndDistance,preDistance: recorderData.EndDistance, competitionId: recorderData.Competitionid); } else { diff --git a/Assets/Scenes/Ride/Scripts/OnlinePlayerController.cs b/Assets/Scenes/Ride/Scripts/OnlinePlayerController.cs index 72a184b1..f092b1d0 100644 --- a/Assets/Scenes/Ride/Scripts/OnlinePlayerController.cs +++ b/Assets/Scenes/Ride/Scripts/OnlinePlayerController.cs @@ -77,6 +77,10 @@ namespace Assets.Scenes.Ride.Scripts break; } } + if (endistance > mapDataModel.TotalDistance) + { + onIndex = pointList.Count-2; + } return onIndex; } @@ -87,8 +91,9 @@ namespace Assets.Scenes.Ride.Scripts } public void MoveHead(Transform parent) { - var itemIndex = chartDataSourceScript.GetViewIndex(GetCurrentIndex(TotalDistance, mainController.GetMapData())) + 1; + var itemIndex = chartDataSourceScript.GetViewIndex(GetCurrentIndex(TotalDistance, mainController.GetMapData()))+1; var m = graph.DataSource.GetPoint("Player 2", itemIndex); + Debug.Log(itemIndex.ToString() + "=" + TotalDistance.ToString()); graph.PointToWorldSpace(out Vector3 itemPosition, m.x, m.y, "Player 2"); itemPosition.x -= 12f; itemPosition.y += 5f; @@ -100,6 +105,10 @@ namespace Assets.Scenes.Ride.Scripts headPanel.transform.localScale = new Vector3(0.8f, 0.8f, 0.8f); headPanel.transform.position = itemPosition; } + else + { + headPanel.transform.DOMove(new Vector3(itemPosition.x, itemPosition.y, 0), 1); + } if (head == null) { head = headPanel.GetComponentInChildren(); @@ -113,7 +122,7 @@ namespace Assets.Scenes.Ride.Scripts } } - headPanel.transform.DOMove(new Vector3(itemPosition.x, itemPosition.y, 0), 1); + } public void ShowInfoPanel(Vector3 playerScreenPos) diff --git a/Assets/Scenes/Ride/Scripts/PlayerController.cs b/Assets/Scenes/Ride/Scripts/PlayerController.cs index b779cd94..6ddefdb9 100644 --- a/Assets/Scenes/Ride/Scripts/PlayerController.cs +++ b/Assets/Scenes/Ride/Scripts/PlayerController.cs @@ -106,8 +106,9 @@ namespace Assets.Scenes.Ride.Scripts _Lon = currentlatlong.y, _TotalClimb = totalClimb, }; - recorderData.PreDistance = TotalDistance - Distance; - recorderData.EndDistance = TotalDistance; + + recorderData.PreDistance = targetData._Distance - Distance; + recorderData.EndDistance = targetData._Distance; recorderData.RiderDatas.Add(targetData); }