lishuo/powerfun-unity
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev_lishuo' into dev

Browse Source
This commit is contained in:
suntao 2021-05-20 20:00:59 +08:00
commit 7eb76291ec
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Assets/Scenes/Ride/Scripts/Model/CyclingModels/BaseCycling.cs
View File

@ -92,7 +92,8 @@ namespace Assets.Scenes.Ride.Scripts.Model.CyclingModels
else if (recorderData.EndDistance > 0)//没有骑，但是有初始位置的情况 else if (recorderData.EndDistance > 0)//没有骑，但是有初始位置的情况
{ {
var point = _turfHelper.Along(recorderData.EndDistance); 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 else
{ {

13
Assets/Scenes/Ride/Scripts/OnlinePlayerController.cs
View File

@ -77,6 +77,10 @@ namespace Assets.Scenes.Ride.Scripts
break; break;
} }
} }
if (endistance > mapDataModel.TotalDistance)
{
onIndex = pointList.Count-2;
}
return onIndex; return onIndex;
} }
@ -87,8 +91,9 @@ namespace Assets.Scenes.Ride.Scripts
} }
public void MoveHead(Transform parent) 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); 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"); graph.PointToWorldSpace(out Vector3 itemPosition, m.x, m.y, "Player 2");
itemPosition.x -= 12f; itemPosition.x -= 12f;
itemPosition.y += 5f; 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.localScale = new Vector3(0.8f, 0.8f, 0.8f);
headPanel.transform.position = itemPosition; headPanel.transform.position = itemPosition;
} }
else
{
headPanel.transform.DOMove(new Vector3(itemPosition.x, itemPosition.y, 0), 1);
}
if (head == null) if (head == null)
{ {
head = headPanel.GetComponentInChildren<RawImage>(); head = headPanel.GetComponentInChildren<RawImage>();
@ -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) public void ShowInfoPanel(Vector3 playerScreenPos)

5
Assets/Scenes/Ride/Scripts/PlayerController.cs
View File

@ -106,8 +106,9 @@ namespace Assets.Scenes.Ride.Scripts
_Lon = currentlatlong.y, _Lon = currentlatlong.y,
_TotalClimb = totalClimb, _TotalClimb = totalClimb,
}; };
recorderData.PreDistance = TotalDistance - Distance;
recorderData.EndDistance = TotalDistance; recorderData.PreDistance = targetData._Distance - Distance;
recorderData.EndDistance = targetData._Distance;
recorderData.RiderDatas.Add(targetData); recorderData.RiderDatas.Add(targetData);
} }