Merge remote-tracking branch 'origin/dev_cyp' into dev_lishuo

Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs

@@ -822,9 +822,9 @@ public BaseUIManager singleUIManager;
         Camera.main.transform.DOLocalMove(neareast, 1f);
         //StartCoroutine(MoveCamera(far, near));//初始摄像头
         var check = CheckAnt();
-#if UNITY_EDITOR
+//#if UNITY_EDITOR
         check = true;
-#endif
+//#endif
         if (check || isWatch)
         {
             singleUIManager.StartRide();

Assets/Scripts/Scenes/Ride/Scripts/PlayerController.cs

@@ -60,9 +60,9 @@ namespace Assets.Scenes.Ride.Scripts
 				cadance = mainController.UpdateCadence();
 				weight = App.CurrentUser.Weight;
 				bicycleWeight = App.CurrentUser.BicycleWeight;
-#if UNITY_EDITOR
-                power = 330;
-#endif
+//#if UNITY_EDITOR
+                power = 300;
+//#endif
                 mainController.TrackResistance(currentSlope * App.RideSetting.Sensitivity / 100);
 			}
 			catch (Exception ex)