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

伴侣骑行继续骑

Browse Source
This commit is contained in:
lishuo 2021-11-11 15:55:58 +08:00
parent 8e88b4adba
commit 50b46c5b76
9 changed files with 46 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Scripts/Apis/Models/MapRecordRanking.cs
View File

@ -25,5 +25,7 @@ namespace Assets.Scripts.Apis.Models
public string NickName { get; set; } public string NickName { get; set; }
public double WeightKg { get; set; } public double WeightKg { get; set; }
public double Weight { get; set; }
public double BikeWeight { get; set; }
} }
} }

9
Assets/Scripts/Scenes/Ride/Model/CyclingModels/ReviewModel.cs
View File

@ -55,6 +55,15 @@ namespace Assets.Scenes.Ride.Scripts.Model.CyclingModels
//AntModelId = antModelId //AntModelId = antModelId
}; };
if (param != null)
{
recorderData.ContinueIndex = param.ContinueIndex??0;
recorderData.ContinueMark = param.ContinueMark;
recorderData.EndDistance = param.EndDistance;
recorderData.PreDistance = param.EndDistance;
recorderData.CurrentRouteStartDistance = param.EndDistance;
}
//recorderData = recorderData1; //recorderData = recorderData1;
this.IsRecord = true; this.IsRecord = true;
//riders = riders1; //riders = riders1;

2
Assets/Scripts/Scenes/Ride/Scripts/AbstractPlayer.cs
View File

@ -365,7 +365,7 @@ namespace Assets.Scenes.Ride.Scripts
#region UI行为 #region UI行为
protected virtual void MoveGraphHead() protected virtual void MoveGraphHead(bool init = false)
{ {
} }

31
Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs
View File

@ -80,17 +80,6 @@ public class CyclingController : DeviceServiceMonoBase
//获取路书信息 //获取路书信息
mapApi = ConfigHelper.mapApi; mapApi = ConfigHelper.mapApi;
routeId = App.RouteIdParam > 0? App.RouteIdParam : 2633; routeId = App.RouteIdParam > 0? App.RouteIdParam : 2633;
//mapRoute = mapApi.GetById(routeId).data;
//miniMap = transform.Find("MiniMap").gameObject;//小地图
//var panel = Instantiate(Resources.Load<GameObject>("UI/Prefab/Ride/Panel"), UIObject.transform);
//resultPanel = transform.Find("UI/Panel/ResultPanel").gameObject;
////获取海拔图UI对象
//var graphObject = transform.Find("UI/Panel/GraphChart");
//chartDataSourceScript = graphObject.GetComponent<ChartDataSourceScript>();
//graph = graphObject.GetComponent<GraphChartBase>();
competitionId = App.CompetionId; competitionId = App.CompetionId;
App.CompetionId = 0;//清空比赛参数 App.CompetionId = 0;//清空比赛参数
Resources.UnloadUnusedAssets(); Resources.UnloadUnusedAssets();
@ -98,7 +87,6 @@ public class CyclingController : DeviceServiceMonoBase
void OnDestroy() void OnDestroy()
{ {
//App.TextureCache.Clear();
Resources.UnloadUnusedAssets(); Resources.UnloadUnusedAssets();
} }
Transform target; Transform target;
@ -328,19 +316,8 @@ public class CyclingController : DeviceServiceMonoBase
App.routeResult = null; App.routeResult = null;
#endregion #endregion
////异步请求mapbox画出当前路书路线图
//loadingController.DrawMapRouteAsync(mapRoute.Id);
//loadingController.AddProcess(10);
//计算上次骑行距离调整地图中心点
double endDistance = selectParamModel.EndDistance; double endDistance = selectParamModel.EndDistance;
coordiantes = Along(endDistance); coordiantes = Along(endDistance);
////查询排行榜
//var list = mapApi.GetRouteRanking(App.RouteIdParam, "1", 0, 10, "");
//if (list.result)
//{
// loadingController.CreateRankingList(list.data.list);
// loadingController.AddProcess(10);
//}
var shaowList = mapApi.GetShadowList(App.RouteIdParam, "", 0, 10); var shaowList = mapApi.GetShadowList(App.RouteIdParam, "", 0, 10);
if (shaowList.result) if (shaowList.result)
{ {
@ -488,7 +465,7 @@ public class CyclingController : DeviceServiceMonoBase
//初始化海拔图头像位置 //初始化海拔图头像位置
var index = GetCurrentIndex(recorderData.EndDistance); var index = GetCurrentIndex(recorderData.EndDistance);
InitGraph(index); InitGraph(index);
//playerController.InitGraph(index); playerController.CurrentIndex = index;
} }
public void InitGraph(int index) public void InitGraph(int index)
{ {
@ -499,9 +476,9 @@ public class CyclingController : DeviceServiceMonoBase
public void GameStart() public void GameStart()
{ {
var check = CheckAnt(); var check = CheckAnt();
//#if UNITY_EDITOR #if UNITY_EDITOR
// check = true; check = true;
//#endif #endif
if (check) if (check)
{ {
singleUIManager.StartRide(); singleUIManager.StartRide();

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

@ -236,7 +236,7 @@ namespace Assets.Scenes.Ride.Scripts
lineRender.numCornerVertices = 10; lineRender.numCornerVertices = 10;
} }
protected override void MoveGraphHead() protected override void MoveGraphHead(bool init=false)
{ {
if (mainController.cyclingModel == CyclingModel.Competition) if (mainController.cyclingModel == CyclingModel.Competition)
{ {

12
Assets/Scripts/Scenes/Ride/Scripts/OtherPlayerController.cs
View File

@ -36,6 +36,13 @@ namespace Assets.Scenes.Ride.Scripts
//创建UI //创建UI
uiObject = uipanel.transform.Find("ArrowList"); uiObject = uipanel.transform.Find("ArrowList");
arrowImage = Instantiate(Resources.Load<Image>("UI/Prefab/Ride/ReviewArrow"), uiObject); arrowImage = Instantiate(Resources.Load<Image>("UI/Prefab/Ride/ReviewArrow"), uiObject);
//初始化位置
Compute();
var initPos = map.GeoToWorldPosition(currentlatlong);
initPos.y += 1.35f;//提高y轴让人物站在地图上面
transform.localPosition = initPos;
CurrentIndex = mainController.GetCurrentIndex(totalDistance);
MoveGraphHead(true);
} }
double diff = 0; double diff = 0;
@ -157,7 +164,7 @@ namespace Assets.Scenes.Ride.Scripts
} }
} }
protected override void MoveGraphHead() protected override void MoveGraphHead(bool init = false)
{ {
var itemIndex = chartDataSourceScript.GetViewIndex(CurrentIndex); var itemIndex = chartDataSourceScript.GetViewIndex(CurrentIndex);
var m = graph.DataSource.GetPoint("Player 2", itemIndex); var m = graph.DataSource.GetPoint("Player 2", itemIndex);
@ -176,7 +183,8 @@ namespace Assets.Scenes.Ride.Scripts
head = headPanel.GetComponentInChildren<RawImage>(); head = headPanel.GetComponentInChildren<RawImage>();
head.texture = _reviewItemScript.GetHead(); head.texture = _reviewItemScript.GetHead();
} }
headPanel.transform.DOMove(new Vector3(itemPosition.x, itemPosition.y, 0), 1); var duration = init ? 0 : 1;
headPanel.transform.DOMove(new Vector3(itemPosition.x, itemPosition.y, 0), duration);
} }
} }
} }

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

@ -43,6 +43,7 @@ namespace Assets.Scenes.Ride.Scripts
trail.enabled = false; trail.enabled = false;
headPanel = uipanel.transform.Find("GraphChart/HeadPanel").gameObject; headPanel = uipanel.transform.Find("GraphChart/HeadPanel").gameObject;
MoveGraphHead(true);
} }
TargetData targetData; TargetData targetData;
/// <summary> /// <summary>
@ -134,7 +135,7 @@ namespace Assets.Scenes.Ride.Scripts
// chartDataSourceScript.InitHorizontalScrolling(index); // chartDataSourceScript.InitHorizontalScrolling(index);
//} //}
//移动海拔图头像 //移动海拔图头像
protected override void MoveGraphHead() protected override void MoveGraphHead(bool init = false)
{ {
Vector3 oldPos = headPanel.transform.position; Vector3 oldPos = headPanel.transform.position;
int nextIndex = CurrentIndex; int nextIndex = CurrentIndex;
@ -154,7 +155,8 @@ namespace Assets.Scenes.Ride.Scripts
{ {
graph.HorizontalScrolling += offset; graph.HorizontalScrolling += offset;
} }
headPanel.transform.DOMove(new Vector3(oldPos.x, nextPosition.y, 0), 1); var duration = init ? 0 : 1;
headPanel.transform.DOMove(new Vector3(oldPos.x, nextPosition.y, 0), duration);
} }
else else
{ {

9
Assets/Scripts/Scenes/Ride/Scripts/ReviewFactory.cs
View File

@ -58,7 +58,6 @@ namespace Assets.Scenes.Ride.Scripts
break; break;
case Model.CyclingModel.Review: case Model.CyclingModel.Review:
singleArea.SetActive(false); singleArea.SetActive(false);
//InitReview();
break; break;
} }
} }
@ -101,12 +100,12 @@ namespace Assets.Scenes.Ride.Scripts
otherPlayerObj.transform.position = cyclingController.map.GeoToWorldPosition(cyclingController.Along(0)); otherPlayerObj.transform.position = cyclingController.map.GeoToWorldPosition(cyclingController.Along(0));
var otherPlayerController = otherPlayerObj.GetComponent<OtherPlayerController>(); var otherPlayerController = otherPlayerObj.GetComponent<OtherPlayerController>();
otherList.Add(otherPlayerController); otherList.Add(otherPlayerController);
otherPlayerController.record = item.record;
otherPlayerController.Weight = cyclingController.selectPlayerDic[item.UserId].Weight;
otherPlayerController.BikeWeight = cyclingController.selectPlayerDic[item.UserId].BikeWeight;
otherPlayerController.record = item.record;
otherPlayerController.Weight = item.Weight;
otherPlayerController.BikeWeight = item.BikeWeight;
otherPlayerController.SetController(reviewItemScript); otherPlayerController.SetController(reviewItemScript);
GameObject miniPlayer = (GameObject)Instantiate(miniMapPlayer, transform.parent.parent.parent); GameObject miniPlayer = (GameObject)Instantiate(miniMapPlayer, transform.parent.parent.parent);
var miniController = miniPlayer.GetComponent<MiniMapPlayerController>(); var miniController = miniPlayer.GetComponent<MiniMapPlayerController>();
miniController.SetController(otherPlayerController); miniController.SetController(otherPlayerController);

18
Assets/Scripts/Scenes/Ride/Scripts/SingleUIManager.cs
View File

@ -2,6 +2,7 @@
using DG.Tweening; using DG.Tweening;
using Assets.Scenes.Ride.Scripts.Model; using Assets.Scenes.Ride.Scripts.Model;
using UnityEngine.EventSystems; using UnityEngine.EventSystems;
using Assets.Scripts;
namespace Assets.Scenes.Ride.Scripts namespace Assets.Scenes.Ride.Scripts
{ {
@ -29,13 +30,16 @@ namespace Assets.Scenes.Ride.Scripts
if (mainController.routeResult != null) if (mainController.routeResult != null)
{ {
#region 注释伴侣骑行的重骑和继续骑行的逻辑 #region 注释伴侣骑行的重骑和继续骑行的逻辑
//if (mainController.routeResult.Mode == CyclingModel.Review.ToString()) if (mainController.routeResult.Mode == CyclingModel.Review.ToString())
//{ {
// mainController.SetCyclingModel(CyclingModel.Review); mainController.SetCyclingModel(CyclingModel.Review);
// selectPanel.SetActive(false); selectPanel.SetActive(false);
// var reviewFactory = reviewPanel.transform.GetComponent<ReviewFactory>(); //查询选中人员的骑行记录
// reviewFactory.Refresh(); var rankingList = ConfigHelper.mapApi.GetRecordFileFromServer(mainController.routeResult.ContinueCyclingParam.RankingsId);
//} var reviewFactory = reviewPanel.transform.GetComponent<ReviewFactory>();
reviewFactory.Refresh();
reviewFactory.SetReview(rankingList);
}
#endregion #endregion
if (mainController.routeResult.Mode == CyclingModel.Single.ToString()) if (mainController.routeResult.Mode == CyclingModel.Single.ToString())
{ {