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

最新打包配置；适配wahoo

Browse Source
This commit is contained in:
Caiyanpeng committed 2022-08-29 11:12:53 +08:00
1 parent 74bdd26924
commit b830b5961a
20 files changed
+280 -189
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Assets/Scripts/Scenes/Ride/Scripts/DeviceServiceMonoBase.cs
+5 -6
View File
@@ -28,11 +28,11 @@ namespace Assets.Scenes.Ride.Scripts
public AbstractDevice CurrentTrainer
{
get {
var devices = App.MainDeviceAdapter.GetDevices().Where(d => d.State == DeviceState.Connected && (d.Sensor == SensorType.Trainer));
var devices = App.MainDeviceAdapter.GetDevices().Where(d => d.State == DeviceState.Connected && (d.Sensor == SensorType.Trainer || d.Sensor == SensorType.FtmsTrainer));
_device = null;//重置设备状态
if (devices.Count() > 0)
{
_device = devices.OrderByDescending(d => d.Sensor == SensorType.Trainer).First();
_device = devices.OrderByDescending(d => d.Sensor == SensorType.Trainer || d.Sensor == SensorType.FtmsTrainer).First();
var RiderWeight = (_device as IRequiresRiderWeight).RiderWeight;
if (RiderWeight == 0)
{
@@ -141,10 +141,10 @@ namespace Assets.Scenes.Ride.Scripts
public bool CheckAnt()
{
//_antConnector = AntConnector.Instance();
var devices = App.MainDeviceAdapter.GetDevices().Where(d => d.State == DeviceState.Connected && (d.Sensor == SensorType.Trainer || d.Sensor == SensorType.Power));
var devices = App.MainDeviceAdapter.GetDevices().Where(d => d.State == DeviceState.Connected && (d.Sensor == SensorType.Trainer || d.Sensor == SensorType.FtmsTrainer || d.Sensor == SensorType.Power));
if (devices.Count() > 0)
{
_device = devices.OrderByDescending(d => d.Sensor == SensorType.Trainer).First();
_device = devices.OrderByDescending(d => d.Sensor == SensorType.Trainer || d.Sensor == SensorType.FtmsTrainer).First();
if (_device != null && _device is IRequiresRiderWeight)
{
(_device as IRequiresRiderWeight).RiderWeight = App.CurrentUser.Weight;
@@ -216,10 +216,9 @@ namespace Assets.Scenes.Ride.Scripts
{
return (IPowerDevice)power;
}
if (powerDevices.Any())
{
return (IPowerDevice)powerDevices.FirstOrDefault();
return (IPowerDevice)powerDevices.FirstOrDefault(d=>d.Sensor == SensorType.Trainer || d.Sensor == SensorType.FtmsTrainer);
}
return null;
Assets/Scripts/Scenes/Ride/Scripts/PlayerController.cs
+4 -4
View File
@@ -47,8 +47,8 @@ namespace Assets.Scenes.Ride.Scripts
/// </summary>
protected override void Compute()
{
//计算数据
//speed = mainController.UpDateSpeed();
//计算数据
speed = mainController.UpDateSpeed();
try
{
heartRate = mainController.UpDateHeart();
@@ -57,10 +57,10 @@ namespace Assets.Scenes.Ride.Scripts
weight = App.CurrentUser.Weight;
bicycleWeight = App.CurrentUser.BicycleWeight;
#if UNITY_EDITOR
power = 300;
power = 300;
#endif
mainController.TrackResistance(currentSlope * App.RideSetting.Sensitivity / 100);
}
}
catch (Exception ex)
{
Debug.Log(ex.Message);