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/UI/Prefab/Device/ConnectDeviceModal.cs
+2 -1
View File
@@ -184,7 +184,8 @@ public class ConnectDeviceModal : PFUIPanel
devices = App.MainDeviceAdapter.GetDevices().Where(d => d.Sensor == SensorType || (d is ISpeedDevice && d.State == DeviceState.Connected)).OrderBy(d => d.Priority).ToList();
break;
case SensorType.Trainer:
devices = App.MainDeviceAdapter.GetDevices().Where(d => d.Sensor == SensorType && d is ITrainerDevice).ToList();
case SensorType.FtmsTrainer:
devices = App.MainDeviceAdapter.GetDevices().Where(d => (d.Sensor == SensorType || d.Sensor == SensorType.FtmsTrainer) && d is ITrainerDevice).ToList();
break;
case SensorType.VirtualPower:
break;
Assets/Scripts/UI/Prefab/Device/DeviceView.cs
+5 -2
View File
@@ -230,7 +230,7 @@ public class DeviceView : MonoBehaviour
powerUnit.text = "BPM";
}
else if (SensorType == SensorType.Trainer)
else if (SensorType == SensorType.Trainer || SensorType == SensorType.FtmsTrainer)
{
sprite0 = Resources.Load<Sprite>("Images/Devices/Trainer_1");
sprite1 = Resources.Load<Sprite>("Images/Devices/Trainer_1");
@@ -387,6 +387,7 @@ public class DeviceView : MonoBehaviour
case SensorType.Speed:
return App.GetLocalString("Speed Meter");
case SensorType.Trainer:
case SensorType.FtmsTrainer:
return App.GetLocalString("Smart Trainer");
case SensorType.VirtualPower:
break;
@@ -414,6 +415,7 @@ public class DeviceView : MonoBehaviour
case SensorType.Speed:
return (connectedDevice as ISpeedDevice).Speed.ToString("f1");
case SensorType.Trainer:
case SensorType.FtmsTrainer:
//powerValue.text = (connectedDevice as IPowerDevice).Power.ToString();
//cadenceValue.GetComponent<Text>().text = (connectedDevice as ICadenceDevice).Cadence.ToString();
//speedValue.GetComponent<Text>().text = (connectedDevice as ISpeedDevice).Speed.ToString();
@@ -462,7 +464,8 @@ public class DeviceView : MonoBehaviour
case SensorType.Speed:
return devices.FirstOrDefault(d => d is ISpeedDevice);
case SensorType.Trainer:
var item3 = devices.FirstOrDefault(d => d.Sensor == SensorType.Trainer);
case SensorType.FtmsTrainer:
var item3 = devices.FirstOrDefault(d => d.Sensor == SensorType.Trainer || d.Sensor == SensorType.FtmsTrainer);
return item3;
case SensorType.VirtualPower:
break;