Merge branch 'dev_rower' into dev_cyp

# Conflicts:
#	ProjectSettings/ProjectSettings.asset

Assets/Scripts/Scenes/MainController.cs

@@ -296,18 +296,18 @@ public class MainController : BaseScene
         //{
         //    UIManager.ShowHomePanel();
         //});
-        //#if UNITY_ANDROID || UNITY_IOS
-        //        if (!App.IsRowerMode.HasValue)
-        //        {
-        //            UIManager.ShowRowerSelector();
-        //            return;
-        //        }
-        //        if (App.IsRowerMode == true)
-        //        {
-        //            UIManager.ShowRowerPanel();
-        //            return;
-        //        }
-        //#endif
+#if UNITY_ANDROID || UNITY_IOS
+        if (!App.IsRowerMode.HasValue)
+        {
+            UIManager.ShowRowerSelector();
+            return;
+        }
+        if (App.IsRowerMode == true)
+        {
+            UIManager.ShowRowerPanel();
+            return;
+        }
+#endif
         LastRide();//检查本地异常中断的骑行并弹窗提示继续
         if (App.MainSceneParam.ContainsKey("Name") && !string.IsNullOrEmpty(App.MainSceneParam["Name"]))
         {