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?"
   }
 }