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

Assets/Resources/UI/Prefab/Device/ConnectDeviceModal.prefab

@@ -179,7 +179,6 @@ GameObject:
   - component: {fileID: 7672791435969097068}
   - component: {fileID: 740803332586528087}
   - component: {fileID: 913971118869806231}
-  - component: {fileID: 3736854379713315744}
   m_Layer: 5
   m_Name: NoDevice
   m_TagString: Untagged
@@ -246,20 +245,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: NO DEVICE
---- !u!114 &3736854379713315744
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3184548043826394215}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  key: 
+  m_Text: 
 --- !u!1 &3878003491430181822
 GameObject:
   m_ObjectHideFlags: 0

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

@@ -3615,6 +3615,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 3a8eec0d4bf3f4841982794180df6e10, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  newNav: {fileID: 0}
 --- !u!222 &454099902603697846
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -4611,7 +4612,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: a38e5e467140caa4d9bd38fd08291bf7, type: 3}
+  m_Sprite: {fileID: 21300000, guid: c8c6fdc9e45c8c246ba0619dbba0abdf, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1

Assets/Resources/UI/language.json

@@ -205,7 +205,8 @@
     "Cadence Sensor": "踏频",
     "Speed Meter": "速度计",
     "Heart Rate Monitor": "心率带",
-    "NO DEVICE": "尚未连接设备",
+    "NO DEVICE": "无可用设备",
+    "CHOOSE DEVICE": "查看可用设备",
     "Edit": "编辑",
     "Record": "记录",
     "More": "更多",
@@ -363,7 +364,8 @@
     "Minimum time is 20s.": "最低时间是20s！",
     "Please enter an integer between 0-59.": "请输入一个0-59的整数！",
     "Please check the network status!": "请检查网络连接是否正常!",
-    "FINISH": "终点"
+    "FINISH": "终点",
+    "Continue the game?": "有中断的划船记录，是否继续?"
   },
   "en": {
     "HOT ROUTES": "HOT ROUTES",
@@ -450,6 +452,7 @@
     "Cancel  Reserve": "Cancel  Reserve",
     "Smart Trainer": "Smart Trainer",
     "NO DEVICE": "NO DEVICE",
+    "CHOOSE DEVICE": "CHOOSE DEVICE",
     "CONNECT": "CONNECT",
     "CLOSE": "CLOSE",
     "PAIR": "PAIR",
@@ -721,6 +724,7 @@
     "Minimum time is 20s.": "Minimum time is 20s.",
     "Please enter an integer between 0-59.": "Please enter an integer between 0-59.",
     "Please check the network status!": "Please check if the network connection is normal!",
-    "FINISH": "FINISH"
+    "FINISH": "FINISH",
+    "Continue the game?": "Continue the game?"
   }
 }