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

# Conflicts:
#	Assets/Resources/UI/language.json

Assets/Resources/UI/Prefab/Ride/MySelfRankingItem.prefab

@@ -327,7 +327,7 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 1
     m_MaxSize: 40
-    m_Alignment: 0
+    m_Alignment: 1
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0

Assets/Resources/UI/language.json

@@ -312,7 +312,8 @@
     "Power King": "功率王",
     "Climbing King": "爬坡王",
     "WAIT": "稍后",
-    "RIDERS": "骑行人数"
+    "RIDERS": "骑行人数",
+    "Current ride distance too short to save.": "当前骑行距离过短无法保存"
   },
   "en": {
     "HOT ROUTES": "HOT ROUTES",
@@ -619,6 +620,7 @@
     "Power King": "Power King",
     "Climbing King": "Climbing King",
     "WAIT": "WAIT",
-    "RIDERS": "RIDERS"
+    "RIDERS": "RIDERS",
+    "Current ride distance too short to save.": "Current ride distance too short to save."
   }
 }