Merge remote-tracking branch 'origin/dev_mobile_ble' into dev_mobile

# Conflicts:
#	Assets/Scripts/Scenes/MainController.cs
This commit is contained in:
Caiyanpeng committed 2021-09-28 11:30:08 +08:00
commit 5bd1c3b1ca
278 files changed
+19740 -112

No files matched your search

@@ -88,7 +88,8 @@ namespace Assets.Scripts.Devices.Ble.Characteristic
{
int num = this.CadenceEventDifference() * 61440 / this.CadenceTimeDifference();
if (num > (int)byte.MaxValue)
return (int)byte.MaxValue;
return 0;
//return (int)byte.MaxValue;
if (num < 0)
return 0;
return num;