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

# Conflicts:
#	Assets/Scripts/UI/Prefab/MapList/MapItem.cs

Assets/Resources/UI/language.json

@@ -284,7 +284,9 @@
     "My Upload": "我的上传",
     "My Collection": "我的收藏",
     "Recent Routes": "最近骑行",
-    "All Route": "全部线路"
+    "All Route": "全部线路",
+    "Reconnect": "重新连接",
+    "Did you want to reconnect the trip that was interrupted abnormally?": "你有异常中断的骑行,是否重新连接开始骑行?"
   },
   "en": {
     "HOT ROUTES": "HOT ROUTES",
@@ -562,6 +564,8 @@
     "My Upload": "My Upload",
     "My Collection": "My Collection",
     "Recent Routes": "Recent Routes",
-    "All Route": "All Route"
+    "All Route": "All Route",
+    "Reconnect": "Reconnect",
+    "Did you want to reconnect the trip that was interrupted abnormally?": "Did you want to reconnect the trip that was interrupted abnormally?"
   }
 }

Assets/Resources/audio/高科技UI点击触控警告提示反馈APP菜单UI-App 界面按_爱给网_aigei_com.mp3.meta

@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 84d23fd0e2b8aa54a93c299537dec8b4
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/audio/高科技UI点击触控警告提示反馈APP菜单UI-很酷的应用程序_爱给网_aigei_com.mp3.meta

@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: b6d8302f7867b0f4da50ee0fa4921dbb
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: