本地合并备份

Assets/Scenes/Ride/Scripts/PlayerController.cs

@@ -32,9 +32,8 @@ namespace Assets.Scenes.Ride.Scripts
 			cadance = mainController.UpdateCadence();
 			weight = App.CurrentUser.Weight;
 			bicycleWeight = App.CurrentUser.BicycleWeight;
-	
-//#if UNITY_EDITOR
-            power = 20000;//测试功率
+					//#if UNITY_EDITOR
+					power = 1000;//测试功率
 //#endif
             mainController.TrackResistance(currentSlope);//TODO
 			speed = Helper.CalculateSpeed(elevation, currentSlope, power, weight, bicycleWeight);