Merge branch 'dev_lishuo' into dev_cyp

# Conflicts:
#	Assets/Resources/UI/Prefab/Panel/Mobile/DevicePanel.prefab
#	Assets/Scenes/Login-Mobile.unity
#	Assets/Scenes/Login.unity
#	Assets/Scripts/App.cs
#	Assets/Scripts/Editor.meta
#	Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs

Assets/Resources/UI/Prefab/Panel/Mobile/BigMapPanel.prefab

@@ -1342,6 +1342,7 @@ GameObject:
   - component: {fileID: 1012470515126369931}
   - component: {fileID: 9122360330302052981}
   - component: {fileID: 4470795080666355868}
+  - component: {fileID: 4793984599962948466}
   m_Layer: 5
   m_Name: Text
   m_TagString: Untagged
@@ -1409,6 +1410,18 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: HOT ROUTES
+--- !u!114 &4793984599962948466
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5467443816373535817}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &5584058651668514870
 GameObject:
   m_ObjectHideFlags: 0