Merge remote-tracking branch 'origin/dev_lishuo' into dev_lishuo
This commit is contained in:
commit
f7b33bf491
@ -101,7 +101,7 @@ namespace Assets.Scenes.Ride.Scripts
|
||||
_device = devices.OrderByDescending(d => d.Sensor == SensorType.Trainer).First();
|
||||
if (_device != null && _device is IRequiresRiderWeight)
|
||||
{
|
||||
(_device as IRequiresRiderWeight).RiderWeight = 65;//TODO:App.CurrentUser.Weight;
|
||||
(_device as IRequiresRiderWeight).RiderWeight = App.CurrentUser.Weight;
|
||||
}
|
||||
ManufacturerId = _device.ManufacturerId;
|
||||
DeviceNumber = $"{ _device.DeviceNumber },{ _device.DeviceType }";
|
||||
@ -112,11 +112,11 @@ namespace Assets.Scenes.Ride.Scripts
|
||||
|
||||
return false;
|
||||
}
|
||||
//if (App.CurrentUser.FTP <= 0)
|
||||
//{
|
||||
if (App.CurrentUser.FTP <= 0)
|
||||
{
|
||||
|
||||
// return false;
|
||||
//}
|
||||
return false;
|
||||
}
|
||||
if (_device == null)
|
||||
{
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user