Merge remote-tracking branch 'origin/dev_combine' into dev_release

# Conflicts:
#	Assets/Scripts/App.cs

Assets/Scripts/Scenes/MainController.cs

@@ -305,29 +305,7 @@ public class MainController : BaseScene
             await Login();
         }
 #endif
-        //MainMenu.transform.Find("Home").GetComponent<Button>().onClick.AddListener(() =>
-        //{
-        //    UIManager.ShowHomePanel();
-        //});
-//#if UNITY_ANDROID || UNITY_IOS
 
-//        #region 划船机功能：隐藏骑行
-//        UIManager.ShowRowerPanel();
-//        return;
-//        #endregion
-//        if (!App.IsRowerMode.HasValue)
-//        {
-//            UIManager.ShowHomePanel();
-//            UIManager.ShowRowerSelector();
-//            return;
-//        }
-//        if (App.IsRowerMode == true)
-//        {
-//            UIManager.ShowHomePanel();
-//            UIManager.ShowRowerPanel();
-//            return;
-//        }
-//#endif
         LastRide();//检查本地异常中断的骑行并弹窗提示继续
         if (App.MainSceneParam.ContainsKey("Name") && !string.IsNullOrEmpty(App.MainSceneParam["Name"]))
         {