处理合并冲突

This commit is contained in:
lishuo committed 2021-03-30 20:00:11 +08:00
1 parent 8638cd97de
commit b0f6c39118
49 files changed
+119 -5434

No files matched your search

@@ -104,5 +104,11 @@ namespace Assets.Scenes.Ride.Scripts.Model.CyclingModels
}
}
protected double SpeedToDistance(double speed)
{
return Math.Round(speed / 3600, 5, MidpointRounding.AwayFromZero);
//return 0.08;
}
}
}