From b8a5982bc5732d3c5a12d6985e28229492ba4841 Mon Sep 17 00:00:00 2001 From: lishuo Date: Fri, 30 Jul 2021 19:39:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Scripts/Scenes/Ride/Model/CyclingModels/BaseCycling.cs | 2 +- Assets/Scripts/Scenes/Ride/Model/OutModel.cs | 2 +- Assets/Scripts/Scenes/Ride/Network/MapUDPService.cs | 2 +- Assets/Scripts/Scenes/Ride/Scripts/AbstractPlayer.cs | 3 +-- Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs | 5 ++--- Assets/Scripts/Scenes/Ride/Scripts/PlayerController.cs | 2 +- 6 files changed, 7 insertions(+), 9 deletions(-) diff --git a/Assets/Scripts/Scenes/Ride/Model/CyclingModels/BaseCycling.cs b/Assets/Scripts/Scenes/Ride/Model/CyclingModels/BaseCycling.cs index 69dd8104..4fcd5313 100644 --- a/Assets/Scripts/Scenes/Ride/Model/CyclingModels/BaseCycling.cs +++ b/Assets/Scripts/Scenes/Ride/Model/CyclingModels/BaseCycling.cs @@ -103,7 +103,7 @@ namespace Assets.Scenes.Ride.Scripts.Model.CyclingModels MapUDPService.Send(route.RouteInstance.Id, recorderData.BelongUserId, new double[] { lastData._Lat, lastData._Lon }, recorderData.IsCompleted, false, recorderData.EndDistance, - true, 1, lastData._Speed, false, preDistance, weightKg, competitionId: recorderData.Competitionid, recorderData.Saved, lastData._HeartRate, lastData._Power, lastData._Cadence, lastData.Ticks); + true, 1, lastData._Speed, false, preDistance, weightKg, competitionId: recorderData.Competitionid, recorderData.Saved, 0, lastData._Power, lastData._Cadence, lastData.Ticks); } else if (recorderData.EndDistance > 0)//没有骑，但是有初始位置的情况 { diff --git a/Assets/Scripts/Scenes/Ride/Model/OutModel.cs b/Assets/Scripts/Scenes/Ride/Model/OutModel.cs index 8455b167..e6bef357 100644 --- a/Assets/Scripts/Scenes/Ride/Model/OutModel.cs +++ b/Assets/Scripts/Scenes/Ride/Model/OutModel.cs @@ -330,7 +330,7 @@ namespace Assets.Scenes.Ride.Scripts.Model public double Speed { get; set; } public double Power { get; set; } - public double? Heart { get; set; } + public double? HeartRate { get; set; } public double? Cadence { get; set; } public int TotalTicks { get; set; } diff --git a/Assets/Scripts/Scenes/Ride/Network/MapUDPService.cs b/Assets/Scripts/Scenes/Ride/Network/MapUDPService.cs index 818d947b..7febbd10 100644 --- a/Assets/Scripts/Scenes/Ride/Network/MapUDPService.cs +++ b/Assets/Scripts/Scenes/Ride/Network/MapUDPService.cs @@ -208,7 +208,7 @@ namespace Assets.Scenes.Ride.Scripts Speed = speed, Power = power, - Heart = heartRate, + HeartRate = heartRate, Cadence = cadence, TotalTicks = totalTicks, diff --git a/Assets/Scripts/Scenes/Ride/Scripts/AbstractPlayer.cs b/Assets/Scripts/Scenes/Ride/Scripts/AbstractPlayer.cs index c778a8dc..0fa55d69 100644 --- a/Assets/Scripts/Scenes/Ride/Scripts/AbstractPlayer.cs +++ b/Assets/Scripts/Scenes/Ride/Scripts/AbstractPlayer.cs @@ -196,12 +196,11 @@ namespace Assets.Scenes.Ride.Scripts } } } - if (totalDistance >= mapData.TotalDistance && !stopRecord) + if (totalDistance > mapData.TotalDistance) { distance = totalDistance - mapData.TotalDistance; totalDistance = mapData.TotalDistance; stopRecord = true; - mainController.cyclingController.recorderData.EndTime = UIManager.Now.GetDateTime(); StartCoroutine("LateUpload"); } diff --git a/Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs b/Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs index c93b547d..703fb75f 100644 --- a/Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs +++ b/Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs @@ -650,7 +650,6 @@ public class CyclingController : DeviceServiceMonoBase //} isStart = false; isQuit = true; - cyclingController.recorderData.EndTime = UIManager.Now.GetDateTime(); } #endregion @@ -677,7 +676,7 @@ public class CyclingController : DeviceServiceMonoBase public void Save(double totalDistance) { - //cyclingController.recorderData.EndTime = UIManager.Now.GetDateTime(); + cyclingController.recorderData.EndTime = UIManager.Now.GetDateTime(); isQuit = true; isStart = false; string recordId = Guid.NewGuid().ToString(); @@ -688,7 +687,7 @@ public class CyclingController : DeviceServiceMonoBase string imageFileName = path +"/"+ Guid.NewGuid().ToString() + ".png"; CaptureCamera(Camera.main, new Rect(Screen.width * 0f, Screen.height * 0f, Screen.width * 0.5f, Screen.height * 0.5f), imageFileName); cyclingController.recorderData.StartTime = startTime; - cyclingController.recorderData.IsCompleted = totalDistance == mapData.TotalDistance; + cyclingController.recorderData.IsCompleted = totalDistance >= mapData.TotalDistance; cyclingController.recorderData.EndDistance = totalDistance; cyclingController.recorderData.AntModelId = AntModelId; cyclingController.recorderData.ManufacturerId = ManufacturerId; diff --git a/Assets/Scripts/Scenes/Ride/Scripts/PlayerController.cs b/Assets/Scripts/Scenes/Ride/Scripts/PlayerController.cs index 979902e5..cd0e9a68 100644 --- a/Assets/Scripts/Scenes/Ride/Scripts/PlayerController.cs +++ b/Assets/Scripts/Scenes/Ride/Scripts/PlayerController.cs @@ -56,7 +56,7 @@ namespace Assets.Scenes.Ride.Scripts weight = App.CurrentUser.Weight; bicycleWeight = App.CurrentUser.BicycleWeight; #if UNITY_EDITOR - power = 2000; + power = 50; #endif mainController.TrackResistance(currentSlope * App.RideSetting.Sensitivity / 100); }