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

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

Assets/Resources/UI/language.json

@@ -297,7 +297,9 @@
     "CARLORIES": "卡路里",
     "DAY": "天",
     "DAYS": "天",
-    "VIEW1": "查看"
+    "VIEW1": "查看",
+    "Get The First Place. Time Limit": "第一名已产生，倒计时:",
+    "Competition Time": "比赛时间"
   },
   "en": {
     "HOT ROUTES": "HOT ROUTES",
@@ -588,6 +590,8 @@
     "CARLORIES": "CARLORIES",
     "DAY": "DAY",
     "DAYS": "DAYS",
-    "VIEW1": "VIEW"
+    "VIEW1": "VIEW",
+    "Get The First Place. Time Limit": "Get The First Place. Time Limit",
+    "Competition Time": "Competition Time"
   }
-}
+}