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

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

@@ -59,6 +59,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 2a0878e6d65232b4eb49c2aa886ab9da, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  newNav: {fileID: 0}
 --- !u!1 &2752224541465288006
 GameObject:
   m_ObjectHideFlags: 0
@@ -411,7 +412,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: Smart Trainer
+  m_Text: 
 --- !u!114 &2376164354960099470
 MonoBehaviour:
   m_ObjectHideFlags: 0

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

@@ -1,18 +1,5 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
---- !u!114 &6820942701388656379
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 600129134975741725}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 954bbf32f326f684c90a328ec1db5ff9, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  mType: 2
 --- !u!114 &2374286134688455127
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -56,19 +43,19 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
---- !u!114 &6820942701245574145
+--- !u!114 &6820942701388656379
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 600129135100964347}
+  m_GameObject: {fileID: 600129134975741725}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 954bbf32f326f684c90a328ec1db5ff9, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  mType: 8
+  mType: 2
 --- !u!114 &619076547355285759
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -112,6 +99,19 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &6820942701245574145
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 600129135100964347}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 954bbf32f326f684c90a328ec1db5ff9, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  mType: 8
 --- !u!1 &6820942700051256070
 GameObject:
   m_ObjectHideFlags: 0
@@ -1682,7 +1682,7 @@ PrefabInstance:
     - target: {fileID: 7414013380646078914, guid: 95d5b69c6ebb5f34bb864b2c0756d442,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -51
+      value: -57
       objectReference: {fileID: 0}
     - target: {fileID: 7509276603553944008, guid: 95d5b69c6ebb5f34bb864b2c0756d442,
         type: 3}

Assets/Resources/UI/language.json

@@ -205,7 +205,7 @@
     "Cadence Sensor": "踏频",
     "Speed Meter": "速度计",
     "Heart Rate Monitor": "心率带",
-    "NO DEVICE": "无可用设备",
+    "NO DEVICE": "尚未连接设备",
     "Edit": "编辑",
     "Record": "记录",
     "More": "更多",