修改新设计稿，保存每次划船的影子id；修改细节，增加c2适配前暂存

Assets/Resources/UI/Font/HanWangZonYi.ttf.meta

@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: f878f11ea5771c548ac255f4e39b8e4b
+TrueTypeFontImporter:
+  externalObjects: {}
+  serializedVersion: 4
+  fontSize: 16
+  forceTextureCase: -2
+  characterSpacing: 0
+  characterPadding: 1
+  includeFontData: 1
+  fontName: HanWangZonYi
+  fontNames:
+  - HanWangZonYi
+  fallbackFontReferences: []
+  customCharacters: 
+  fontRenderingMode: 0
+  ascentCalculationMode: 1
+  useLegacyBoundsCalculation: 0
+  shouldRoundAdvanceValue: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/UI/Prefab/Panel/HomePanel.prefab

@@ -349,7 +349,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3}
+    m_Font: {fileID: 12800000, guid: f878f11ea5771c548ac255f4e39b8e4b, type: 3}
     m_FontSize: 24
     m_FontStyle: 0
     m_BestFit: 0
@@ -849,7 +849,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3}
+    m_Font: {fileID: 12800000, guid: f878f11ea5771c548ac255f4e39b8e4b, type: 3}
     m_FontSize: 24
     m_FontStyle: 0
     m_BestFit: 0
@@ -2117,7 +2117,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3}
+    m_Font: {fileID: 12800000, guid: f878f11ea5771c548ac255f4e39b8e4b, type: 3}
     m_FontSize: 24
     m_FontStyle: 0
     m_BestFit: 0
@@ -4529,11 +4529,21 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 1460208238439066746, guid: a1999d0576fee6248a9c5a507ae8d10e,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 1617869899094122649, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}
       propertyPath: m_SizeDelta.x
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 1627126351653202737, guid: a1999d0576fee6248a9c5a507ae8d10e,
+        type: 3}
+      propertyPath: m_Material
+      value: 
+      objectReference: {fileID: 0}
     - target: {fileID: 2054923810110871857, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}
       propertyPath: m_AnchorMax.y
@@ -4739,6 +4749,26 @@ PrefabInstance:
       propertyPath: m_SizeDelta.x
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 4065006849412909149, guid: a1999d0576fee6248a9c5a507ae8d10e,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4065006849412909149, guid: a1999d0576fee6248a9c5a507ae8d10e,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4065006849412909149, guid: a1999d0576fee6248a9c5a507ae8d10e,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4065006849412909149, guid: a1999d0576fee6248a9c5a507ae8d10e,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 4204578097682859198, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}
       propertyPath: m_AnchorMax.y
@@ -4834,6 +4864,21 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 6495799208751703362, guid: a1999d0576fee6248a9c5a507ae8d10e,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6495799208751703362, guid: a1999d0576fee6248a9c5a507ae8d10e,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6495799208751703362, guid: a1999d0576fee6248a9c5a507ae8d10e,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 20
+      objectReference: {fileID: 0}
     - target: {fileID: 6549425620798886645, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}
       propertyPath: m_Material

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

@@ -207,7 +207,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3}
+    m_Font: {fileID: 12800000, guid: f878f11ea5771c548ac255f4e39b8e4b, type: 3}
     m_FontSize: 14
     m_FontStyle: 0
     m_BestFit: 0
@@ -489,7 +489,7 @@ RectTransform:
   - {fileID: 6123267120473738440}
   - {fileID: 616424717270607455}
   m_Father: {fileID: 1777885814862178517}
-  m_RootOrder: 8
+  m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -893,7 +893,6 @@ RectTransform:
   - {fileID: 7422200770415638701}
   - {fileID: 1128757190696039284}
   - {fileID: 3431565778213871763}
-  - {fileID: 825902449212828960}
   - {fileID: 3101539257439404383}
   m_Father: {fileID: 0}
   m_RootOrder: 0
@@ -1979,119 +1978,6 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: 0000KM
---- !u!1 &2882590459481290732
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 825902449212828960}
-  - component: {fileID: 8679445741643427231}
-  - component: {fileID: 3435410634832720573}
-  - component: {fileID: 3924220547131846799}
-  - component: {fileID: 1423584879003993720}
-  m_Layer: 5
-  m_Name: Panel (1)
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 0
---- !u!224 &825902449212828960
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2882590459481290732}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children:
-  - {fileID: 6355271646832174643}
-  m_Father: {fileID: 1777885814862178517}
-  m_RootOrder: 7
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 323.4276, y: 163.92932}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &8679445741643427231
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2882590459481290732}
-  m_CullTransparentMesh: 0
---- !u!114 &3435410634832720573
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2882590459481290732}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 0.15294118, b: 0.25882354, a: 0}
-  m_RaycastTarget: 1
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 0}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
---- !u!114 &3924220547131846799
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2882590459481290732}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 87a02f5a9d8ce2e43b46b9bbbc2a04c4, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
---- !u!114 &1423584879003993720
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2882590459481290732}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 598e18fb001004a81960f552978ecf4e, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  urlOnStart: 
-  showOnStart: 0
-  fullScreen: 0
-  useToolbar: 0
-  toolbarPosition: 0
-  frame:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 844
-    height: 390
-  referenceRectTransform: {fileID: 825902449212828960}
 --- !u!1 &2894462968154619168
 GameObject:
   m_ObjectHideFlags: 0
@@ -2253,84 +2139,6 @@ MonoBehaviour:
   m_ChildControlHeight: 0
   m_ChildScaleWidth: 0
   m_ChildScaleHeight: 0
---- !u!1 &3161307210594869611
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 6355271646832174643}
-  - component: {fileID: 8270654500462992248}
-  - component: {fileID: 271283379993894462}
-  m_Layer: 5
-  m_Name: Text
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &6355271646832174643
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3161307210594869611}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 825902449212828960}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 100.6}
-  m_SizeDelta: {x: 160, y: 30}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &8270654500462992248
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3161307210594869611}
-  m_CullTransparentMesh: 0
---- !u!114 &271283379993894462
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3161307210594869611}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 14
-    m_FontStyle: 0
-    m_BestFit: 0
-    m_MinSize: 10
-    m_MaxSize: 40
-    m_Alignment: 4
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: New Text
 --- !u!1 &3305547976192018571
 GameObject:
   m_ObjectHideFlags: 0
@@ -5632,7 +5440,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3}
+    m_Font: {fileID: 12800000, guid: f878f11ea5771c548ac255f4e39b8e4b, type: 3}
     m_FontSize: 14
     m_FontStyle: 0
     m_BestFit: 0
@@ -6963,7 +6771,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3}
+    m_Font: {fileID: 12800000, guid: f878f11ea5771c548ac255f4e39b8e4b, type: 3}
     m_FontSize: 14
     m_FontStyle: 0
     m_BestFit: 0
@@ -7471,12 +7279,12 @@ PrefabInstance:
     - target: {fileID: 1592441871873768741, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 1592441871873768741, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 1592441871873768741, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
@@ -7496,12 +7304,12 @@ PrefabInstance:
     - target: {fileID: 2004396901057112773, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2004396901057112773, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2004396901057112773, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
@@ -7511,12 +7319,12 @@ PrefabInstance:
     - target: {fileID: 2054923810110871857, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2054923810110871857, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2054923810110871857, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
@@ -7653,6 +7461,11 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 2857858179394088567, guid: 240a4465e4dc90848a0efc1a9520c658,
+        type: 3}
+      propertyPath: m_Material
+      value: 
+      objectReference: {fileID: 0}
     - target: {fileID: 3068819108013337933, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMax.y
@@ -7673,6 +7486,21 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 3092721066492637211, guid: 240a4465e4dc90848a0efc1a9520c658,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3092721066492637211, guid: 240a4465e4dc90848a0efc1a9520c658,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3092721066492637211, guid: 240a4465e4dc90848a0efc1a9520c658,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 20
+      objectReference: {fileID: 0}
     - target: {fileID: 3319170174453971756, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_Material
@@ -7681,12 +7509,12 @@ PrefabInstance:
     - target: {fileID: 3511827664771645704, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3511827664771645704, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3511827664771645704, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
@@ -7696,12 +7524,12 @@ PrefabInstance:
     - target: {fileID: 3991752987403741024, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3991752987403741024, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3991752987403741024, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
@@ -7753,6 +7581,21 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 4449183833974762062, guid: 240a4465e4dc90848a0efc1a9520c658,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4449183833974762062, guid: 240a4465e4dc90848a0efc1a9520c658,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4449183833974762062, guid: 240a4465e4dc90848a0efc1a9520c658,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 20
+      objectReference: {fileID: 0}
     - target: {fileID: 4586126367539938617, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_SizeDelta.x
@@ -7761,27 +7604,47 @@ PrefabInstance:
     - target: {fileID: 4834968900665809806, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4834968900665809806, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4834968900665809806, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchoredPosition.x
       value: 20
       objectReference: {fileID: 0}
+    - target: {fileID: 5235423208383503620, guid: 240a4465e4dc90848a0efc1a9520c658,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5235423208383503620, guid: 240a4465e4dc90848a0efc1a9520c658,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5235423208383503620, guid: 240a4465e4dc90848a0efc1a9520c658,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5235423208383503620, guid: 240a4465e4dc90848a0efc1a9520c658,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 5249748558008090706, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 5249748558008090706, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 5249748558008090706, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
@@ -7836,12 +7699,12 @@ PrefabInstance:
     - target: {fileID: 6172683569922498945, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6172683569922498945, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6172683569922498945, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
@@ -7856,12 +7719,12 @@ PrefabInstance:
     - target: {fileID: 6347209353323850145, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6347209353323850145, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6347209353323850145, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
@@ -7873,6 +7736,31 @@ PrefabInstance:
       propertyPath: m_SizeDelta.x
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 6913823502350419793, guid: 240a4465e4dc90848a0efc1a9520c658,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6913823502350419793, guid: 240a4465e4dc90848a0efc1a9520c658,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6913823502350419793, guid: 240a4465e4dc90848a0efc1a9520c658,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6913823502350419793, guid: 240a4465e4dc90848a0efc1a9520c658,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7245597125348948259, guid: 240a4465e4dc90848a0efc1a9520c658,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 7793409217181307314, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_VerticalFit
@@ -7881,18 +7769,23 @@ PrefabInstance:
     - target: {fileID: 8197454007437855745, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8197454007437855745, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8197454007437855745, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchoredPosition.x
       value: 20
       objectReference: {fileID: 0}
+    - target: {fileID: 8347606906924376950, guid: 240a4465e4dc90848a0efc1a9520c658,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 8382612560249065530, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMax.y
@@ -7916,12 +7809,12 @@ PrefabInstance:
     - target: {fileID: 8526344065104504758, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8526344065104504758, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8526344065104504758, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
@@ -7931,7 +7824,7 @@ PrefabInstance:
     - target: {fileID: 8526344065104504758, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -2
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8719966614707449432, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}

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

@@ -3023,7 +3023,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: Carlories
+  m_Text: S/M
 --- !u!1 &7381048951715059745
 GameObject:
   m_ObjectHideFlags: 0

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

@@ -908,7 +908,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3}
+    m_Font: {fileID: 12800000, guid: f878f11ea5771c548ac255f4e39b8e4b, type: 3}
     m_FontSize: 20
     m_FontStyle: 0
     m_BestFit: 0
@@ -1625,7 +1625,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3}
+    m_Font: {fileID: 12800000, guid: f878f11ea5771c548ac255f4e39b8e4b, type: 3}
     m_FontSize: 20
     m_FontStyle: 0
     m_BestFit: 0
@@ -1810,7 +1810,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3}
+    m_Font: {fileID: 12800000, guid: f878f11ea5771c548ac255f4e39b8e4b, type: 3}
     m_FontSize: 20
     m_FontStyle: 0
     m_BestFit: 0
@@ -3905,7 +3905,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3}
+    m_Font: {fileID: 12800000, guid: f878f11ea5771c548ac255f4e39b8e4b, type: 3}
     m_FontSize: 20
     m_FontStyle: 0
     m_BestFit: 0
@@ -4153,7 +4153,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3}
+    m_Font: {fileID: 12800000, guid: f878f11ea5771c548ac255f4e39b8e4b, type: 3}
     m_FontSize: 20
     m_FontStyle: 0
     m_BestFit: 0
@@ -4231,7 +4231,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3}
+    m_Font: {fileID: 12800000, guid: f878f11ea5771c548ac255f4e39b8e4b, type: 3}
     m_FontSize: 20
     m_FontStyle: 0
     m_BestFit: 0
@@ -4401,7 +4401,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3}
+    m_Font: {fileID: 12800000, guid: f878f11ea5771c548ac255f4e39b8e4b, type: 3}
     m_FontSize: 20
     m_FontStyle: 0
     m_BestFit: 0
@@ -4723,7 +4723,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3}
+    m_Font: {fileID: 12800000, guid: f878f11ea5771c548ac255f4e39b8e4b, type: 3}
     m_FontSize: 20
     m_FontStyle: 0
     m_BestFit: 0
@@ -5575,7 +5575,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3}
+    m_Font: {fileID: 12800000, guid: f878f11ea5771c548ac255f4e39b8e4b, type: 3}
     m_FontSize: 20
     m_FontStyle: 0
     m_BestFit: 0
@@ -6100,7 +6100,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3}
+    m_Font: {fileID: 12800000, guid: f878f11ea5771c548ac255f4e39b8e4b, type: 3}
     m_FontSize: 20
     m_FontStyle: 0
     m_BestFit: 0

Assets/Resources/UI/Prefab/Panel/UserInfoPanel.prefab

@@ -938,7 +938,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3}
+    m_Font: {fileID: 12800000, guid: f878f11ea5771c548ac255f4e39b8e4b, type: 3}
     m_FontSize: 32
     m_FontStyle: 0
     m_BestFit: 0
@@ -1669,7 +1669,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3}
+    m_Font: {fileID: 12800000, guid: f878f11ea5771c548ac255f4e39b8e4b, type: 3}
     m_FontSize: 32
     m_FontStyle: 0
     m_BestFit: 0
@@ -1867,7 +1867,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3}
+    m_Font: {fileID: 12800000, guid: f878f11ea5771c548ac255f4e39b8e4b, type: 3}
     m_FontSize: 32
     m_FontStyle: 0
     m_BestFit: 0
@@ -3923,7 +3923,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3}
+    m_Font: {fileID: 12800000, guid: f878f11ea5771c548ac255f4e39b8e4b, type: 3}
     m_FontSize: 24
     m_FontStyle: 0
     m_BestFit: 0
@@ -4171,7 +4171,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3}
+    m_Font: {fileID: 12800000, guid: f878f11ea5771c548ac255f4e39b8e4b, type: 3}
     m_FontSize: 24
     m_FontStyle: 0
     m_BestFit: 0
@@ -4249,7 +4249,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3}
+    m_Font: {fileID: 12800000, guid: f878f11ea5771c548ac255f4e39b8e4b, type: 3}
     m_FontSize: 24
     m_FontStyle: 0
     m_BestFit: 0
@@ -4419,7 +4419,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3}
+    m_Font: {fileID: 12800000, guid: f878f11ea5771c548ac255f4e39b8e4b, type: 3}
     m_FontSize: 24
     m_FontStyle: 0
     m_BestFit: 0
@@ -4741,7 +4741,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3}
+    m_Font: {fileID: 12800000, guid: f878f11ea5771c548ac255f4e39b8e4b, type: 3}
     m_FontSize: 24
     m_FontStyle: 0
     m_BestFit: 0
@@ -5607,7 +5607,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3}
+    m_Font: {fileID: 12800000, guid: f878f11ea5771c548ac255f4e39b8e4b, type: 3}
     m_FontSize: 32
     m_FontStyle: 0
     m_BestFit: 0
@@ -6132,7 +6132,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3}
+    m_Font: {fileID: 12800000, guid: f878f11ea5771c548ac255f4e39b8e4b, type: 3}
     m_FontSize: 32
     m_FontStyle: 0
     m_BestFit: 0

Assets/Resources/UI/language.json

@@ -207,7 +207,7 @@
     "Heart Rate Monitor": "心率带",
     "NO DEVICE": "无可用设备",
     "Edit": "编辑",
-    "Record": "骑行记录",
+    "Record": "记录",
     "More": "更多",
     "Remaining": "比赛结束倒计时：",
     "Close Gate": "关门时间：",

Assets/Scripts/Apis/Models/RowerRecordModel.cs

@@ -31,6 +31,7 @@ namespace Assets.Scripts.Apis.Models
         public int TotalTime { get;  set; }
         public int? Type { get; set; }
         public double? TypeValue { get; set; }
+        public string ShadowIds { get; set; }
     }
     public class RowerChartModel 
     {
@@ -64,6 +65,8 @@ namespace Assets.Scripts.Apis.Models
         public int TotalTime { get;  set; }
         public List<RowerChartModel> ChartList { get; set; }
         public string Cover { get; set; }
+        public int? Type { get; set; }
+        public double? TypeValue { get; set; }
     }
 
 
@@ -76,6 +79,7 @@ namespace Assets.Scripts.Apis.Models
         public int HeartRate { get; set; }
         public int StrokeCount { get; set; }
         public int Energy { get; set; }
+        public int Rate { get; set; }
     }
 
     public class RowerRank
@@ -90,13 +94,15 @@ namespace Assets.Scripts.Apis.Models
         public bool isFinished { get; set; }
         public List<RowerChartModel> list { get; set; }
         public string Country { get; set; }
-}
+        public int Nid { get; set; }
+    }
 
     public class Info
     {
         public string CreateTime { get; set; }
         public string MyRank { get; set; }
         public int? Type { get; set; }
+        public string TypeStr { get; set; }
     }
 
     public class RowerSegmentData

Assets/Scripts/App.cs

@@ -214,7 +214,8 @@ public static class App
     {
         {"https://wx.powerfun.com.cn/","http://www.powerfun.com/" },
         {"http://pf.juze.pro/","http://pfweb.juze.pro/" },
-        {"http://192.168.0.101:5087/","http://192.168.0.101:3081/" }
+        {"http://192.168.0.101:5087/","http://192.168.0.101:3081/" },
+        {"http://192.168.0.101:5083/","http://pfweb.juze.pro/" }
     };
 
     static App()
@@ -222,7 +223,7 @@ public static class App
         InitLanguage();
 #if !UNITY_EDITOR
       //测试服务器
-      Host = "http://pf.juze.pro/";
+      Host = "http://192.168.0.101:5083/";
       UdpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 21000);
       TcpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 21001);
       //线上

Assets/Scripts/Devices/Ble/Devices/FtmsRower.cs

@@ -70,6 +70,12 @@ namespace Assets.Scripts.Devices.Ble.Devices
                             //C2RowerData.IsEnabled = true;
                             this.hwInterface.SubscribeCharacteristic(character, null);
                         }
+                        else if (character.MatchGuid(ServiceUuids.Characteristics.C2RowerStatus))
+                        {
+                            Debug.Log("c2划船机响应数据" + service.Id);
+                            //C2RowerData.IsEnabled = true;
+                            this.hwInterface.SubscribeCharacteristic(character, null);
+                        }
                         else if (character.MatchGuid(ServiceUuids.Characteristics.C2RowerControl)) 
                         {
                             Debug.Log("c2划船机控制台");
@@ -121,12 +127,12 @@ namespace Assets.Scripts.Devices.Ble.Devices
             if (C2RowerData.IsEnabled == true)
             {
                 //等对csafe协议研究透彻后写
-                //if (this.c2Control != null)
+                if (this.c2Control != null)
-                //{
+                {
-                //    Debug.Log("发送重置命令" + this.c2Control.ToString());
+                    Debug.Log("发送重置命令" + this.c2Control.ToString());
-                //    hwInterface.WriteCharacteristic(this.c2Control, new byte[] { 0xF1, 0x86, 0x87, 0x01, 0xF2 });
+                    hwInterface.WriteCharacteristic(this.c2Control, new byte[] { 0xF1, 0x80, 0x80, 0xF2 });
-                //    //hwInterface.WriteCharacteristic(this.c2Control, new byte[] { 0xF1, 0x81, 0x81, 0xF2 });
+                    //hwInterface.WriteCharacteristic(this.c2Control, new byte[] { 0xF1, 0x81, 0x81, 0xF2 });
-                //}
+                }
             }
             else 
             {

Assets/Scripts/Devices/Ble/Win/ServiceUuids.cs

@@ -374,6 +374,8 @@ namespace Assets.Scripts.Ble
             public static Guid C2RowerData = new Guid("ce060035-43e5-11e4-916c-0800200c9a66");
             //拉力曲线
             public static Guid C2RowerData1 = new Guid("ce06003D-43e5-11e4-916c-0800200c9a66");
+            //c2划船机状态
+            public static Guid C2RowerStatus = new Guid("ce06003D-43e5-11e4-916c-0800200c9a66");
             public static Guid C2Service = new Guid("CE060030-43E5-11E4-916C-0800200C9A66");
             //ce060030-43e5-11e4-916c-0800200c9a66
         }

Assets/Scripts/UI/Prefab/NewMainNav.cs

@@ -48,11 +48,15 @@ public class NewMainNav : MonoBehaviour
     /// <param name="indexs">仅展开显示的按钮：1:"Exit",3:"Device",4:"Delay",5:"Setting",6:"Support",7:"Avatar"</param>
     /// <param name="shrinkIndex">合上后仍显示的按钮：0:"Back",2:"Home",null:仅PF</param>
     /// <param name="custom">自定义按钮 8:c1 9:c2 11:c3</param>
-    public void SetButtonActive(List<int> indexs,int? shrinkIndex = null, CustomButton custom = null, CustomButton custom2 = null,CustomButton custom3 = null) 
+    public void SetButtonActive(List<int> indexs,int? shrinkIndex = null, CustomButton custom = null, CustomButton custom2 = null,CustomButton custom3 = null,bool ShowMail = true) 
     {
         this.indexs = indexs;
-        //邮箱常驻
+        
-        this.indexs.Add(10);
+        if (ShowMail) 
+        {
+            //邮箱常驻(除划船机)
+            this.indexs.Add(10);
+        }
         this.shrinkIndex = shrinkIndex;
         this.custom = custom;
         this.custom2 = custom2;

Assets/Scripts/UI/Prefab/Panel/RowerHomeScript.cs

@@ -201,7 +201,7 @@ public class RowerHomeScript : PFUIPanel
         {
             ReturnHome();
         }, false);
-        nav.SetButtonActive(new List<int> { 3, 7 }, null, c1, null, c3);
+        nav.SetButtonActive(new List<int> { 3, 7 }, null, c1, null, c3, false);
         newNav = nav;
 #endif
         UIManager.AddEvent(transform.Find("Stopped/Confirm/BtnSave").gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, b =>
@@ -224,8 +224,10 @@ public class RowerHomeScript : PFUIPanel
             Rower.Reset();
         }
         //RowerPanel/Rower/Bottom/Expected/Title
-        var dw = rowerType.type == 1 ? $"{rowerType.value}M" : $"{(rowerType.value / 60).ToString("#0.00")}Min";
+        //var dw = rowerType.type == 1 ? $"{rowerType.value}M" : $"{(rowerType.value / 60).ToString("#0.00")}Min";
-        bottom.Find("Expected/Title").GetComponent<Text>().text = $"EST\n/ {dw}";
+        //bottom.Find("Expected/Title").GetComponent<Text>().text = $"EST\n/ {dw}";
+        var dw = rowerType.type == 1 ? $"" : $"\nM";
+        bottom.Find("Expected/Title").GetComponent<Text>().text = $"EST{dw}";
         Init();
         //Utils.showToast(null, "请滑动划船机并开始", isLowest: true, type: 1);
     }
@@ -268,6 +270,7 @@ public class RowerHomeScript : PFUIPanel
         isPause = true;
         btnStart.GetComponent<Image>().sprite = spriteDict["Start"];
         btnStart.tag = "Start";
+        transform.Find("Stopped").gameObject.SetActive(false);
         Save();
         Init();
     }
@@ -389,6 +392,7 @@ public class RowerHomeScript : PFUIPanel
         model.TotalDistance = RowerData.TotalDistance;
         model.Type = rowerType.type == 0 ? (int?)null : rowerType.type;
         model.TypeValue = rowerType.value == 0 ? (float?)null : rowerType.value;
+        model.ShadowIds = string.Join(",",GetComponent<RowerMultiModeScript>().shadowList.Select(x=>x.Nid));
         var path = PFConstants.RowerRecordFolder + "/" + model.Id;
         Helper.CreateDirectoryIfNotExsit(path);
         var files = new List<string>();
@@ -416,7 +420,14 @@ public class RowerHomeScript : PFUIPanel
             Debug.Log(ex.Message);
         }
         var res = ConfigHelper.rowerApi.Add(model, files);
-        UIManager.ShowRowerWelldone(model.Id);
+        if (res.result)
+        {
+            UIManager.ShowRowerWelldone(model.Id);
+        }
+        else 
+        {
+            Utils.showToast(null, res.errMsg);
+        }
         //Disconnect();
     }
 
@@ -441,9 +452,25 @@ public class RowerHomeScript : PFUIPanel
         pullList = new List<DoubleVector2>();
         mid.Find("GraphChart").GetComponent<RowerGraphChartFeed>().SetData(pullList);
         openTimer = false;
-        bottom.Find("Time/Value").GetComponent<Text>().text = "---";
+        if (rowerType.type == 0)
-        //bottom.Find("TrueTime/Value").GetComponent<Text>().text = "---";
+        {
-        bottom.Find("KM/Value").GetComponent<Text>().text = "---";
+            bottom.Find("Time/Value").GetComponent<Text>().text = "---";
+            bottom.Find("KM/Value").GetComponent<Text>().text = "---";
+        }
+        else 
+        {
+            if (rowerType.type == 1)
+            {
+                bottom.Find("Time/Value").GetComponent<Text>().text = "---";
+                bottom.Find("KM/Value").GetComponent<Text>().text = $"{rowerType.value}M";
+            }
+            else 
+            {
+                bottom.Find("Time/Value").GetComponent<Text>().text = TimeSpan.FromSeconds(rowerType.value).ToPFString();
+                bottom.Find("KM/Value").GetComponent<Text>().text = "---";
+            }
+        }
+        
         mid.Find("W/Value").GetComponent<Text>().text = "---";
         //bottom.Find("W/AvgValue").GetComponent<Text>().text = "---";
         bottom.Find("500/Value").GetComponent<Text>().text = "---";
@@ -533,6 +560,8 @@ public class RowerHomeScript : PFUIPanel
         var distance = (int)RowerData.TotalDistance;
         var energy = RowerData.TotalEnergy;
         var strokeCount = RowerData.StrokeCount;
+        var power = RowerData.InstantaneousPower;
+        var rate = RowerData.StrokeRate;
         TempRowerCalc tmpdata = null;
         if (totalDistance == RowerData.TotalDistance)
         {
@@ -567,14 +596,19 @@ public class RowerHomeScript : PFUIPanel
                 var remainTime = rowerType.value - (seconds++);
                 if (remainTime == 0) 
                 {
+                    records.Add($"{strokeCount},{RowerData.ElapsedTime},{distance},0,0,0,{RowerData.ResistanceLevel},{heartRate},{energy}");
+                    tmpdata = new TempRowerCalc() { strokeCount = strokeCount, pace = 0, power = 0, rate = 0, heartRate = heartRate, distance = distance, energy = energy };
+                    values.Add(tmpdata);
+                    SendDataToRace(tmpdata);
                     HandleSaveDirect();
                     return;
                 }
-                bottom.Find("Time/Value").GetComponent<Text>().text = TimeSpan.FromSeconds(remainTime).ToString();
+                TimeSpan.FromSeconds(remainTime).ToPFString();
+                bottom.Find("Time/Value").GetComponent<Text>().text = TimeSpan.FromSeconds(remainTime).ToPFString();
             }
             else 
             {
-                bottom.Find("Time/Value").GetComponent<Text>().text = TimeSpan.FromSeconds(seconds++).ToString();
+                bottom.Find("Time/Value").GetComponent<Text>().text = TimeSpan.FromSeconds(seconds++).ToPFString();
             }
             mid.Find("W/Value").GetComponent<Text>().text = "---";
             //bottom.Find("W/AvgValue").GetComponent<Text>().text = "---";
@@ -598,21 +632,28 @@ public class RowerHomeScript : PFUIPanel
             var remainTime = rowerType.value - (seconds++);
             if (remainTime == 0)
             {
+                records.Add($"{strokeCount},{RowerData.ElapsedTime},{distance},{RowerData.InstantaneousPower},{RowerData.InstantaneousPace},{RowerData.StrokeRate},{RowerData.ResistanceLevel},{heartRate},{energy}");
+                tmpdata = new TempRowerCalc() { strokeCount = strokeCount, pace = pace, power = power, rate = rate, heartRate = heartRate, distance = distance, energy = energy };
+                values.Add(tmpdata);
+                SendDataToRace(tmpdata);
                 HandleSaveDirect();
                 return;
             }
-            bottom.Find("Time/Value").GetComponent<Text>().text = TimeSpan.FromSeconds(remainTime).ToString();
+            bottom.Find("Time/Value").GetComponent<Text>().text = TimeSpan.FromSeconds(remainTime).ToPFString();
         }
         else
         {
-            bottom.Find("Time/Value").GetComponent<Text>().text = TimeSpan.FromSeconds(seconds++).ToString();
+            bottom.Find("Time/Value").GetComponent<Text>().text = TimeSpan.FromSeconds(seconds++).ToPFString();
         }
-        //bottom.Find("TrueTime/Value").GetComponent<Text>().text = TimeSpan.FromSeconds(RowerData.ElapsedTime).ToString();
         if (rowerType.type == 1)
         {
             var remainDistance = rowerType.value - totalDistance;
             if (remainDistance < 0)
             {
+                records.Add($"{strokeCount},{RowerData.ElapsedTime},{distance},{RowerData.InstantaneousPower},{RowerData.InstantaneousPace},{RowerData.StrokeRate},{RowerData.ResistanceLevel},{heartRate},{energy}");
+                tmpdata = new TempRowerCalc() { strokeCount = strokeCount, pace = pace, power = power, rate = rate, heartRate = heartRate, distance = distance, energy = energy };
+                values.Add(tmpdata);
+                SendDataToRace(tmpdata);
                 HandleSaveDirect();
                 return;
             }
@@ -629,33 +670,39 @@ public class RowerHomeScript : PFUIPanel
                 //设置里程时 显示预估时间 当前时间+剩余里程/配速（转换）
                 var remainDistance = rowerType.value - totalDistance;
                 var time = values.Count + (remainDistance / (500f / pace));
-                bottom.Find("Expected/Value").GetComponent<Text>().text = TimeSpan.FromSeconds(time).ToString(@"hh\:mm\:ss");
+                bottom.Find("Expected/Value").GetComponent<Text>().text = TimeSpan.FromSeconds(time).ToPFString();
             }
             else if (rowerType.type == 2)
             {
                 var remainTime = rowerType.value - values.Count;
                 var dis = totalDistance + (remainTime * (500f / pace));
                 //设置时间时 显示预估里程 当前里程+剩余时间*配速
-                bottom.Find("Expected/Value").GetComponent<Text>().text = $"{dis.ToString("#0")}M";
+                bottom.Find("Expected/Value").GetComponent<Text>().text = $"{dis.ToString("#0")}";
             }
             else
             {
                 //自由滑 显示30min里程 当前里程+剩余时间*配速
-                var remainTime = 30 * 60 - values.Count;
+                var count30 = ((int)Math.Ceiling(values.Count / 1800f));
-                var dis = totalDistance + (remainTime * (500f / pace));
+                var remainTime = count30 * 1800 - values.Count;
+                var dif = 0;
+                if (count30 > 1 && (count30 - 1) * 1800 - 1 < values.Count)
+                {
+                    dif = values[(count30 - 1) * 1800 - 1].distance;
+                }
+                var dis = totalDistance - dif + (remainTime * (500f / pace));
                 //设置时间时 显示预估里程 当前里程+剩余时间*配速
-                bottom.Find("Expected/Value").GetComponent<Text>().text = $"{dis.ToString("#0")}M";
+                bottom.Find("Expected/Value").GetComponent<Text>().text = $"{dis.ToString("#0")}";
             }
         }
         
         //RowerPanel/Rower/Bottom/Expected/Value
-        var power = RowerData.InstantaneousPower;
+        
         mid.Find("W/Value").GetComponent<Text>().text = power.ToString();
         //bottom.Find("W/AvgValue").GetComponent<Text>().text = RowerData.AveragePower.ToString();
         
-        bottom.Find("500/Value").GetComponent<Text>().text = TimeSpan.FromSeconds(pace).ToString(@"mm\:ss");
+        bottom.Find("500/Value").GetComponent<Text>().text = TimeSpan.FromSeconds(pace).ToPFString();
         //bottom.Find("500/AvgValue").GetComponent<Text>().text = TimeSpan.FromSeconds(RowerData.AveragePace).ToString(@"mm\:ss");
-        var rate = RowerData.StrokeRate;
+        
         bottom.Find("MS/Value").GetComponent<Text>().text = rate.ToString();
         //bottom.Find("MS/AvgValue").GetComponent<Text>().text = RowerData.AverageStrokeRate.ToString();
         //if (ushort.TryParse(left.Find("Times/Value").GetComponent<Text>().text, out ushort originStroke))
@@ -670,7 +717,6 @@ public class RowerHomeScript : PFUIPanel
         mid.Find("AvgForce/Value").GetComponent<Text>().text = RowerCommonDataInstance.AverageDriveForce.ToString("#0");
         mid.Find("PeakForce/Value").GetComponent<Text>().text = RowerCommonDataInstance.PeakDriveForce.ToString("#0");
         records.Add($"{strokeCount},{RowerData.ElapsedTime},{distance},{RowerData.InstantaneousPower},{RowerData.InstantaneousPace},{RowerData.StrokeRate},{RowerData.ResistanceLevel},{heartRate},{energy}");
-        print(records.Count);
         tmpdata = new TempRowerCalc() { strokeCount = strokeCount, pace = pace, power = power, rate = rate, heartRate = heartRate, distance = distance, energy = energy };
         values.Add(tmpdata);
         SendDataToRace(tmpdata);
@@ -802,8 +848,8 @@ public class RowerHomeScript : PFUIPanel
         {
             var flag = Rower != null && RowerData != null;
             transform.Find("Ready/DeviceStatus").gameObject.SetActive(!flag);
-            transform.Find("Ready/Img").gameObject.SetActive(!flag);
+            transform.Find("Ready/Img").gameObject.SetActive(flag);
-            transform.Find("Ready/Text").gameObject.SetActive(!flag);
+            transform.Find("Ready/Text").gameObject.SetActive(flag);
             transform.Find("Ready/DeviceStatusConnect").gameObject.SetActive(flag);
         }
     }

Assets/Scripts/UI/Prefab/ResultList/RouteItem.cs

@@ -95,7 +95,28 @@ public class RouteItem : MonoBehaviour
         row1.Find("Distance").GetComponent<Text>().text = $"<color=#5c5c6e>{App.GetLocalString("Distance")}:</color>{result.TotalDistance}M";
         row2.Find("Device").GetComponent<Text>().text = $"<color=#5c5c6e>{App.GetLocalString("Rowing equipment")}:</color>{result.ManufacturerName}";
         left.Find("Progress").gameObject.SetActive(false);
-        left.Find("Main/Name").GetComponent<Text>().text = $"{result.CreateTime.ToLocalTime().ToString("yyyy-MM-dd HH:mm:ss")} Free Rowing";
+        string typeStr = "Free";
+        if (result.Type == 1)
+        {
+            typeStr = $"{result.TypeValue}M";
+        }
+        else if (result.Type == 2 && result.TypeValue.HasValue) 
+        {
+            var ts = TimeSpan.FromSeconds(result.TypeValue.Value);
+            if (ts.TotalHours >= 1)
+            {
+                typeStr = ts.TotalHours.ToString("#0.0") + "h";
+            }
+            else if (ts.TotalMinutes >= 1)
+            {
+                typeStr = ts.TotalMinutes.ToString("#0.0") + "min";
+            }
+            else
+            {
+                typeStr = result.TypeValue.Value + "s";
+            }
+        }
+        left.Find("Main/Name").GetComponent<Text>().text = $"{result.CreateTime.ToLocalTime().ToString("yyyy-MM-dd HH:mm:ss")} {typeStr} Rowing";
         left.Find("Main/Time").GetComponent<Text>().text = $"{result.StartTime.ToLocalTime().ToString("yyyy-MM-dd HH:mm:ss")} ~ {result.CreateTime.ToLocalTime().ToString("yyyy-MM-dd HH:mm:ss")}";
         var rect = left.Find("Main").GetComponent<RectTransform>();
         rect.sizeDelta = new Vector2(399,rect.sizeDelta.y);

Assets/Scripts/UI/Prefab/Rower/RowerMultiModeScript.cs

@@ -38,6 +38,7 @@ public class RowerMultiModeScript : MonoBehaviour
         public bool isMine { get; set; }
         public int currentDistance { get; set; }
         public string Country { get; set; }
+        public int currentRank { get; set; }
     }
     List<Trace> traceList;
     List<float> initialPosYList;
@@ -48,6 +49,18 @@ public class RowerMultiModeScript : MonoBehaviour
         if (PlayerPrefs.GetFloat("RowerMultiModeLocationX") != 0f) 
         {
             scroll.localPosition = new Vector3(PlayerPrefs.GetFloat("RowerMultiModeLocationX"), startPosition.y, startPosition.z);
+            foreach (Transform t in transform.Find("Rower/Dots"))
+            {
+                t.GetComponent<Image>().color = Utils.HexToColorHtml("#ffffff");
+            }
+            if (scroll.localPosition.x >= startPosition.x - (730 / 2))
+            {
+                transform.Find("Rower/Dots/d1").GetComponent<Image>().color = Utils.HexToColorHtml("#f93086");
+            }
+            else
+            {
+                transform.Find("Rower/Dots/d2").GetComponent<Image>().color = Utils.HexToColorHtml("#f93086");
+            }
         }
         AddTouchEvent();
         m2 = transform.Find("Rower/Modes/Scroll/M2");
@@ -75,6 +88,7 @@ public class RowerMultiModeScript : MonoBehaviour
 
     public void HandleTimeTick(RowerChartModel data)
     {
+        //rowerType = GetComponent<RowerHomeScript>().rowerType;
         currentSecond++;
         myData.list.Add(data);
         SortByCurrentDistance();
@@ -105,6 +119,10 @@ public class RowerMultiModeScript : MonoBehaviour
             });
         }
         userList = userList.OrderByDescending(x => x.currentDistance).ToList();
+        for (int i = 0; i < userList.Count; i++) 
+        {
+            userList[i].currentRank = i + 1;
+        }
     }
     private List<TraceData> HandleData()
     {
@@ -126,21 +144,15 @@ public class RowerMultiModeScript : MonoBehaviour
 
     List<TraceData> userList;
     TraceData myData;
-    List<RowerRank> shadowList;
+    public List<RowerRank> shadowList { get; private set; }
-    private async void Start()
-    {
-        rowerType = GetComponent<RowerHomeScript>().rowerType;
-//#if UNITY_EDITOR
-//        rowerType = new RowerTaskPanel.RowerType { type = 1, value = 250 };
-//#endif
-        GetShadowList(rowerType);
-    }
 
     public async void GetShadowList(RowerTaskPanel.RowerType rowerType) 
     {
+        this.rowerType = rowerType;
         currentSecond = -1;
         var res = await ConfigHelper.rowerApi.GetShadowList(rowerType);
         shadowList = res.data;
+        
         var _tmpList = shadowList.Select(x => new TraceData
         {
             list = x.list,
@@ -161,6 +173,10 @@ public class RowerMultiModeScript : MonoBehaviour
         myData.Country = App.CurrentUser.Country;
         _tmpList.Add(myData);
         userList = _tmpList.OrderByDescending(x => x.currentDistance).ToList();
+        for (int i = 0; i < userList.Count; i++)
+        {
+            userList[i].currentRank = i + 1;
+        }
         DisplayUserRanks(true);
         DisplayTraces();
     }
@@ -263,16 +279,20 @@ public class RowerMultiModeScript : MonoBehaviour
             }
             var width = t.Find("Main").GetComponent<RectTransform>().sizeDelta.x - t.Find("Main/Boat").GetComponent<RectTransform>().sizeDelta.x;
             var diffWidth = data.currentDistance - mineData.currentDistance + 50;
+            if (data.currentDistance <= 50)
+            {
+                diffWidth = data.currentDistance;
+            }
+            else if (rowerType.type == 1 && rowerType.value - data.currentDistance <= 50)
+            {
+                diffWidth = 100 - ((int)rowerType.value - data.currentDistance);
+            }
+            if (data.isMine) 
+            {
+                print("diff:" + diffWidth + ";"+ rowerType.type);
+            }
             if (diffWidth >= 0 && diffWidth <= 100)
             {   
-                if (data.currentDistance <= 50)
-                {
-                    diffWidth = data.currentDistance;
-                }
-                else if (rowerType.type == 1 && rowerType.value - data.currentDistance <= 50) 
-                {
-                    diffWidth = 100 - ((int)rowerType.value - data.currentDistance);
-                }
                 var tWidth = (diffWidth / 100f) * width;
                 t.Find("Main/Boat").gameObject.SetActive(true);
                 //t.Find("Main/Boat").localPosition = new Vector3(25 + tWidth, t.Find("Main/Boat").localPosition.y, t.Find("Main/Boat").localPosition.z);
@@ -331,7 +351,7 @@ public class RowerMultiModeScript : MonoBehaviour
 
     private void SetRank(GameObject game, TraceData item,int i) 
     {
-        game.transform.Find("Content/Rank").GetComponent<Text>().text = (i + 1).ToString("00");
+        game.transform.Find("Content/Rank").GetComponent<Text>().text = item.currentRank.ToString("00");
         game.transform.Find("Content/NickName").GetComponent<Text>().text = item.NickName;
         Utils.DisplayImageTempDict(game.transform.Find("Content/Avatar").GetComponent<RawImage>(), item.Avatar, caches);
         var _c = countryList.FirstOrDefault(x => item.Country == x.country);
@@ -339,7 +359,7 @@ public class RowerMultiModeScript : MonoBehaviour
         {
             game.transform.Find("Content/Country").GetComponent<Image>().sprite = Resources.Load<Sprite>(_c.source);
         }
-        if (currentSecond < 0)
+        if (currentSecond < 0 || item.list.Count == 0)
         {
             game.transform.Find("Content/Time").GetComponent<Text>().text = "0M";
             game.transform.Find("Content/Power").GetComponent<Text>().text = "0W";
@@ -369,17 +389,42 @@ public class RowerMultiModeScript : MonoBehaviour
             game.transform.Find("Content/Rank").GetComponent<Text>().color = Utils.HexToColorHtml("#ffffff");
         }
     }
+    private List<TraceData> Get8UserList() 
+    {
+        var resRanks = userList;
+        var ind = resRanks.FindIndex(x => x.UserId == App.CurrentUser.Id);
+        if (ind >= 8)
+        {
+            var tops = resRanks.Take(3).ToList();
+            List<TraceData> mys = null;
+            if (resRanks.Count - 1 - ind < 2)
+            {
+                mys = resRanks.GetRange(resRanks.Count - 5, 5);
+            }
+            else
+            {
+                mys = resRanks.GetRange(ind - 2, 5);
+            }
+            resRanks = tops.Concat(mys).ToList();
+        }
+        else
+        {
+            resRanks = resRanks.Take(8).ToList();
+        }
+        return resRanks;
+    }
     private void DisplayUserRanks(bool isRefresh = false) 
     {
         if (isRefresh) 
         {
             scrollRank.content.DestroyChildren();
         }
+        var list = Get8UserList();
         if (scrollRank.content.childCount == 0)
         {
-            for (int i = 0; i < userList.Count; i++)
+            for (int i = 0; i < list.Count; i++)
             {
-                var item = userList[i];
+                var item = list[i];
                 var game = Instantiate<GameObject>(rank);
                 SetRank(game, item, i);
                 game.transform.SetParent(scrollRank.content);
@@ -392,7 +437,7 @@ public class RowerMultiModeScript : MonoBehaviour
             int i = 0;
             foreach (Transform t in scrollRank.content) 
             {
-                var item = userList[i];
+                var item = list[i];
                 SetRank(t.gameObject, item, i);
                 i++;
             }
@@ -419,13 +464,19 @@ public class RowerMultiModeScript : MonoBehaviour
         pan.gestureCompleteEvent += (r) =>
         {
             float x = 0;
+            foreach (Transform t in transform.Find("Rower/Dots")) 
+            {
+                t.GetComponent<Image>().color = Utils.HexToColorHtml("#ffffff");
+            }
             if (scroll.localPosition.x >= startPosition.x - (730 / 2))
             {
                 x = startPosition.x;
+                transform.Find("Rower/Dots/d1").GetComponent<Image>().color = Utils.HexToColorHtml("#f93086");
             }
             else
             {
                 x = startPosition.x - 730;
+                transform.Find("Rower/Dots/d2").GetComponent<Image>().color = Utils.HexToColorHtml("#f93086");
             }
             scroll.DOLocalMoveX(x, 0.5f);
             PlayerPrefs.SetFloat("RowerMultiModeLocationX", x);
@@ -518,7 +569,7 @@ public class RowerMultiModeScript : MonoBehaviour
     int currentSecond = -1;
     private List<CountryModel> countryList;
 
-    public RowerTaskPanel.RowerType rowerType { get; private set; }
+    public RowerTaskPanel.RowerType rowerType { get; set; }
 
     // Update is called once per frame
     void Update()
@@ -533,9 +584,8 @@ public class RowerMultiModeScript : MonoBehaviour
             //ChangeTrace(a, a+1);
             HandleTimeTick(new RowerChartModel()
             {
-                Distance = 0,
+                Distance = 15,
             });
-            currentSecond++;
             timer += 1f;
         }
 #endif

Assets/Scripts/UI/Prefab/Rower/RowerTaskPanel.cs

@@ -41,6 +41,16 @@ public class RowerTaskPanel : PFUIPanel
         {
             Close();
         });
+        UIManager.AddEvent(transform.Find("Main/BtnFreeMode").gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, b =>
+        {
+            rowerType.type = 0;
+            rowerType.value = 0;
+            if (callBack != null)
+            {
+                callBack.Invoke(rowerType);
+            }
+            Close();
+        });
         //var bg = transform.Find("Main/Time/Inputbg").gameObject;
         //UIManager.AddEvent(bg, UnityEngine.EventSystems.EventTriggerType.PointerEnter, b =>
         // {
@@ -59,6 +69,7 @@ public class RowerTaskPanel : PFUIPanel
         formList = new List<object>
         {
             distance.Find("Btn500").GetComponent<Button>(),
+            distance.Find("Btn1000").GetComponent<Button>(),
             distance.Find("Btn2000").GetComponent<Button>(),
             distance.Find("Btn5000").GetComponent<Button>(),
             distance.Find("Btn10000").GetComponent<Button>(),

Assets/Scripts/UI/Prefab/Rower/RowerWelldone.cs

@@ -1,5 +1,6 @@
 using Assets.Scripts;
 using Assets.Scripts.Apis.Models;
+using Facebook.Unity;
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -41,6 +42,26 @@ public class RowerWelldone : PFUIPanel
             Close();
             Application.OpenURL($"{App.websiteDict[App.Host]}rower/record/{id}?Token={App.CurrentUser.cookie}");
         });
+        UIManager.AddEvent(transform.Find("Container/Share/Wx").gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, b => 
+        {
+            if (data == null) return;
+            App.weChatController.ShareWebpageToWX(0, $"{App.websiteDict[App.Host]}rower/record/{id}?UserId={App.CurrentUser.Id}", $"PowerFun {data.info.TypeStr} Rowing", $"By {App.CurrentUser.Nickname}",null);
+        });
+
+        UIManager.AddEvent(transform.Find("Container/Share/WxMoment").gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, b =>
+        {
+            if (data == null) return;
+            App.weChatController.ShareWebpageToWX(1, $"{App.websiteDict[App.Host]}rower/record/{id}?UserId={App.CurrentUser.Id}", $"PowerFun {data.info.TypeStr} Rowing", $"By {App.CurrentUser.Nickname}", null);
+        });
+
+        UIManager.AddEvent(transform.Find("Container/Share/Fb").gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, b =>
+        {
+            if (data == null) return;
+            FB.ShareLink(contentURL: new Uri($"{App.websiteDict[App.Host]}rower/record/{id}?UserId={App.CurrentUser.Id}"),
+                contentTitle: $"PowerFun {data.info.TypeStr} Rowing",
+                contentDescription: $"By {App.CurrentUser.Nickname}");
+            //App.weChatController.ShareWebpageToWX(1, , , , null);
+        });
     }
 
     // Update is called once per frame
@@ -66,6 +87,7 @@ public class RowerWelldone : PFUIPanel
 
     float timer = 1f, remainTime = 10f;
     bool startTime = false;
+    RowerSegmentData data;
     public async void Initial(string id)
     {
         Debug.Log("Initial");
@@ -74,6 +96,7 @@ public class RowerWelldone : PFUIPanel
         var res = await ConfigHelper.rowerApi.GetSegmentDataAndRanking(id);
         if (res.result) 
         {
+            this.data = res.data;
             DisplayData(res.data, caches);
             startTime = true;
             remainTime = 10f;
@@ -123,7 +146,7 @@ public class RowerWelldone : PFUIPanel
             content.Find("Power").GetComponent<Text>().text = item.Power.ToString("#0");
             content.Find("HR").GetComponent<Text>().text = item.HeartRate.ToString("#0");
             content.Find("Count").GetComponent<Text>().text = item.StrokeCount.ToString("#0");
-            content.Find("Carlories").GetComponent<Text>().text = item.Energy.ToString("#0");
+            content.Find("Carlories").GetComponent<Text>().text = item.Rate.ToString("#0");
             //game.transform.Find("Content/Rank").GetComponent<Text>().text = (i + 1).ToString("00");
             //game.transform.Find("Content/NickName").GetComponent<Text>().text = item.NickName;
             //Utils.DisplayImageTempDict(game.transform.Find("Content/Avatar").GetComponent<RawImage>(), item.WxHeadImg, caches);

Assets/Scripts/Utils/Utils.cs

@@ -19,6 +19,17 @@ namespace Assets.Scripts
 
     public static class Utils
     {
+        public static string ToPFString(this TimeSpan t) 
+        {
+            var s = "00:00:00";
+            var r = t.ToString(@"hh\:mm\:ss");
+            int i = 0;
+            for (; i < r.Length; i++)
+            {
+                if (s[i] != r[i]) break;
+            }
+            return r.Substring(i, r.Length - i);
+        }
         /*获取ip*/
         public enum ADDRESSFAM
         {