修改细节

Assets/CountDownAnimation.cs

@@ -20,10 +20,11 @@ public class CountDownAnimation : PFUIPanel
 
     void HandleAnimation(string s, UnityAction action)
     {
-        GetComponent<Text>().text = s;
+        var text = transform.Find("Text");
-        transform.GetComponent<RectTransform>().DOScale(Vector3.one * 2, 0.5f).onComplete = () =>
+        text.GetComponent<Text>().text = s;
+        text.transform.GetComponent<RectTransform>().DOScale(Vector3.one * 2, 0.5f).onComplete = () =>
            {
-               transform.GetComponent<RectTransform>().DOScale(Vector3.one * 0.5f, 0.5f).onComplete = ()=> 
+               text.GetComponent<RectTransform>().DOScale(Vector3.one * 0.5f, 0.5f).onComplete = ()=> 
                {
                    if (s == "Go") 
                    {

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

@@ -1,6 +1,6 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
---- !u!1 &7988615406063986404
+--- !u!1 &9117638846523165519
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -8,28 +8,29 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 7988615406063986403}
+  - component: {fileID: 9117638846523165518}
-  - component: {fileID: 7988615406063986401}
+  - component: {fileID: 9117638846523165516}
-  - component: {fileID: 7988615406063986402}
+  - component: {fileID: 9117638846523165517}
-  - component: {fileID: 7988615406063986400}
+  - component: {fileID: 9117638846523165555}
   m_Layer: 5
-  m_Name: CountDown
+  m_Name: CountDown 1
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!224 &7988615406063986403
+--- !u!224 &9117638846523165518
 RectTransform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7988615406063986404}
+  m_GameObject: {fileID: 9117638846523165519}
   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_Children:
+  - {fileID: 9117638846995180039}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -38,21 +39,107 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &7988615406063986401
+--- !u!222 &9117638846523165516
 CanvasRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7988615406063986404}
+  m_GameObject: {fileID: 9117638846523165519}
   m_CullTransparentMesh: 0
---- !u!114 &7988615406063986402
+--- !u!114 &9117638846523165517
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7988615406063986404}
+  m_GameObject: {fileID: 9117638846523165519}
+  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: 1, b: 1, a: 0}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 1
+  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 &9117638846523165555
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9117638846523165519}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 85535621a7b20f24b91b9a8e80b84ffa, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!1 &9117638846995180032
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 9117638846995180039}
+  - component: {fileID: 9117638846995180037}
+  - component: {fileID: 9117638846995180038}
+  m_Layer: 5
+  m_Name: Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &9117638846995180039
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9117638846995180032}
+  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: 9117638846523165518}
+  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: 0}
+  m_SizeDelta: {x: 160, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &9117638846995180037
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9117638846995180032}
+  m_CullTransparentMesh: 0
+--- !u!114 &9117638846995180038
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9117638846995180032}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
@@ -79,15 +166,3 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: 5
---- !u!114 &7988615406063986400
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7988615406063986404}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 85535621a7b20f24b91b9a8e80b84ffa, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 

Assets/Resources/UI/Prefab/Panel/Mobile/CountDown.prefab.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 562fb3955c04633419fe1ebb55a0c9eb
+guid: f850039b33d2c7143b5bf186fd762e3a
 PrefabImporter:
   externalObjects: {}
   userData: 

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

@@ -2651,10 +2651,10 @@ RectTransform:
   m_Father: {fileID: 5897250536890319869}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 454}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &3830074174816578586
 MonoBehaviour:

Assets/Resources/UI/Prefab/Rower/FillColor40A4FC.mat

@@ -0,0 +1,88 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: FillColor40A4FC
+  m_Shader: {fileID: 4800000, guid: 818b0e872599e3948b6cceff71a30540, type: 3}
+  m_ShaderKeywords: _EMISSION
+  m_LightmapFlags: 1
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _Angle: 9.93
+    - _BumpScale: 1
+    - _ChartTiling: 1
+    - _ColorMask: 15
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _Stencil: 0
+    - _StencilComp: 8
+    - _StencilOp: 0
+    - _StencilReadMask: 255
+    - _StencilWriteMask: 255
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 0}
+    - _ColorFrom: {r: 0.2509804, g: 0.6431373, b: 0.9882353, a: 0.29803923}
+    - _ColorTo: {r: 0.2509804, g: 0.6431373, b: 0.9882353, a: 0.459}
+    - _Combine: {r: 1, g: 1, b: 1, a: 0}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

Assets/Resources/UI/Prefab/Rower/FillColor40A4FC.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f4f6c85f87fcf2d47837a4ff45dfb3f3
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/UI/Prefab/Rower/FillColorA374FE.mat

@@ -0,0 +1,88 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: FillColorA374FE
+  m_Shader: {fileID: 4800000, guid: 818b0e872599e3948b6cceff71a30540, type: 3}
+  m_ShaderKeywords: _EMISSION
+  m_LightmapFlags: 1
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _Angle: 9.93
+    - _BumpScale: 1
+    - _ChartTiling: 1
+    - _ColorMask: 15
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _Stencil: 0
+    - _StencilComp: 8
+    - _StencilOp: 0
+    - _StencilReadMask: 255
+    - _StencilWriteMask: 255
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 0}
+    - _ColorFrom: {r: 0.6392157, g: 0.45490196, b: 0.99607843, a: 0.29803923}
+    - _ColorTo: {r: 0.6392157, g: 0.45490196, b: 0.99607843, a: 0.459}
+    - _Combine: {r: 1, g: 1, b: 1, a: 0}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

Assets/Resources/UI/Prefab/Rower/FillColorA374FE.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 321c302bd2a6fe340a8e904014362464
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/UI/Prefab/Rower/FillColorF93086.mat

@@ -0,0 +1,88 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: FillColorF93086
+  m_Shader: {fileID: 4800000, guid: 818b0e872599e3948b6cceff71a30540, type: 3}
+  m_ShaderKeywords: _EMISSION
+  m_LightmapFlags: 1
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _Angle: 9.93
+    - _BumpScale: 1
+    - _ChartTiling: 1
+    - _ColorMask: 15
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _Stencil: 0
+    - _StencilComp: 8
+    - _StencilOp: 0
+    - _StencilReadMask: 255
+    - _StencilWriteMask: 255
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 0}
+    - _ColorFrom: {r: 0.9764706, g: 0.1882353, b: 0.5254902, a: 0.29803923}
+    - _ColorTo: {r: 0.9764706, g: 0.1882353, b: 0.5254902, a: 0.459}
+    - _Combine: {r: 1, g: 1, b: 1, a: 0}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

Assets/Resources/UI/Prefab/Rower/FillColorF93086.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: bd4a7fb7ee25c8249bee0d72b764cfe0
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/UI/Prefab/Rower/Line40A4FC.mat

@@ -0,0 +1,88 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Line40A4FC
+  m_Shader: {fileID: 4800000, guid: 818b0e872599e3948b6cceff71a30540, type: 3}
+  m_ShaderKeywords: _EMISSION
+  m_LightmapFlags: 1
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: 9959c8d64e68c9b49a96dd9de08c4315, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _Angle: 90
+    - _BumpScale: 1
+    - _ChartTiling: 1
+    - _ColorMask: 15
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _Stencil: 0
+    - _StencilComp: 8
+    - _StencilOp: 0
+    - _StencilReadMask: 255
+    - _StencilWriteMask: 255
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 0}
+    - _ColorFrom: {r: 0.2509804, g: 0.6431373, b: 0.9882353, a: 1}
+    - _ColorTo: {r: 0.2509804, g: 0.6431373, b: 0.9882353, a: 1}
+    - _Combine: {r: 0.2509804, g: 0.6431373, b: 0.9882353, a: 0}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

Assets/Resources/UI/Prefab/Rower/Line40A4FC.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 27a057b820735c44f8a6e430b0aa3d2e
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/UI/Prefab/Rower/LineA374FE.mat

@@ -0,0 +1,88 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: LineA374FE
+  m_Shader: {fileID: 4800000, guid: 818b0e872599e3948b6cceff71a30540, type: 3}
+  m_ShaderKeywords: _EMISSION
+  m_LightmapFlags: 1
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: 9959c8d64e68c9b49a96dd9de08c4315, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _Angle: 90
+    - _BumpScale: 1
+    - _ChartTiling: 1
+    - _ColorMask: 15
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _Stencil: 0
+    - _StencilComp: 8
+    - _StencilOp: 0
+    - _StencilReadMask: 255
+    - _StencilWriteMask: 255
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 0}
+    - _ColorFrom: {r: 0.6392157, g: 0.45490196, b: 0.99607843, a: 1}
+    - _ColorTo: {r: 0.6392157, g: 0.45490196, b: 0.99607843, a: 1}
+    - _Combine: {r: 0.6392157, g: 0.45490196, b: 0.99607843, a: 0}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

Assets/Resources/UI/Prefab/Rower/LineA374FE.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f3e7e13267ee7f146a257fa0d03ae05f
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scenes/Test.unity

@@ -294,6 +294,12 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!224 &1060448221 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 9117638846523165518, guid: f850039b33d2c7143b5bf186fd762e3a,
+    type: 3}
+  m_PrefabInstance: {fileID: 9117638845534694547}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1079865532
 GameObject:
   m_ObjectHideFlags: 0
@@ -382,12 +388,6 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!224 &1528219284 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 7988615406063986403, guid: 562fb3955c04633419fe1ebb55a0c9eb,
-    type: 3}
-  m_PrefabInstance: {fileID: 7988615405411164279}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1678571397
 GameObject:
   m_ObjectHideFlags: 0
@@ -479,7 +479,7 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 0, y: 0, z: 0}
   m_Children:
-  - {fileID: 1528219284}
+  - {fileID: 1060448221}
   m_Father: {fileID: 0}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -579,122 +579,122 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 48.593002, y: -4.8190002, z: -6.4140005}
---- !u!1001 &7988615405411164279
+--- !u!1001 &9117638845534694547
 PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
     m_TransformParent: {fileID: 1678571401}
     m_Modifications:
-    - target: {fileID: 7988615406063986403, guid: 562fb3955c04633419fe1ebb55a0c9eb,
+    - target: {fileID: 9117638846523165518, guid: f850039b33d2c7143b5bf186fd762e3a,
         type: 3}
       propertyPath: m_Pivot.x
       value: 0.5
       objectReference: {fileID: 0}
-    - target: {fileID: 7988615406063986403, guid: 562fb3955c04633419fe1ebb55a0c9eb,
+    - target: {fileID: 9117638846523165518, guid: f850039b33d2c7143b5bf186fd762e3a,
         type: 3}
       propertyPath: m_Pivot.y
       value: 0.5
       objectReference: {fileID: 0}
-    - target: {fileID: 7988615406063986403, guid: 562fb3955c04633419fe1ebb55a0c9eb,
+    - target: {fileID: 9117638846523165518, guid: f850039b33d2c7143b5bf186fd762e3a,
         type: 3}
       propertyPath: m_RootOrder
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 7988615406063986403, guid: 562fb3955c04633419fe1ebb55a0c9eb,
+    - target: {fileID: 9117638846523165518, guid: f850039b33d2c7143b5bf186fd762e3a,
         type: 3}
       propertyPath: m_AnchorMax.x
-      value: 0.5
+      value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 7988615406063986403, guid: 562fb3955c04633419fe1ebb55a0c9eb,
+    - target: {fileID: 9117638846523165518, guid: f850039b33d2c7143b5bf186fd762e3a,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0.5
+      value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 7988615406063986403, guid: 562fb3955c04633419fe1ebb55a0c9eb,
+    - target: {fileID: 9117638846523165518, guid: f850039b33d2c7143b5bf186fd762e3a,
         type: 3}
       propertyPath: m_AnchorMin.x
-      value: 0.5
+      value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 7988615406063986403, guid: 562fb3955c04633419fe1ebb55a0c9eb,
+    - target: {fileID: 9117638846523165518, guid: f850039b33d2c7143b5bf186fd762e3a,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0.5
+      value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 7988615406063986403, guid: 562fb3955c04633419fe1ebb55a0c9eb,
+    - target: {fileID: 9117638846523165518, guid: f850039b33d2c7143b5bf186fd762e3a,
         type: 3}
       propertyPath: m_SizeDelta.x
-      value: 160
+      value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 7988615406063986403, guid: 562fb3955c04633419fe1ebb55a0c9eb,
+    - target: {fileID: 9117638846523165518, guid: f850039b33d2c7143b5bf186fd762e3a,
         type: 3}
       propertyPath: m_SizeDelta.y
-      value: 100
+      value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 7988615406063986403, guid: 562fb3955c04633419fe1ebb55a0c9eb,
+    - target: {fileID: 9117638846523165518, guid: f850039b33d2c7143b5bf186fd762e3a,
         type: 3}
       propertyPath: m_LocalPosition.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 7988615406063986403, guid: 562fb3955c04633419fe1ebb55a0c9eb,
+    - target: {fileID: 9117638846523165518, guid: f850039b33d2c7143b5bf186fd762e3a,
         type: 3}
       propertyPath: m_LocalPosition.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 7988615406063986403, guid: 562fb3955c04633419fe1ebb55a0c9eb,
+    - target: {fileID: 9117638846523165518, guid: f850039b33d2c7143b5bf186fd762e3a,
         type: 3}
       propertyPath: m_LocalPosition.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 7988615406063986403, guid: 562fb3955c04633419fe1ebb55a0c9eb,
+    - target: {fileID: 9117638846523165518, guid: f850039b33d2c7143b5bf186fd762e3a,
         type: 3}
       propertyPath: m_LocalRotation.w
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 7988615406063986403, guid: 562fb3955c04633419fe1ebb55a0c9eb,
+    - target: {fileID: 9117638846523165518, guid: f850039b33d2c7143b5bf186fd762e3a,
         type: 3}
       propertyPath: m_LocalRotation.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 7988615406063986403, guid: 562fb3955c04633419fe1ebb55a0c9eb,
+    - target: {fileID: 9117638846523165518, guid: f850039b33d2c7143b5bf186fd762e3a,
         type: 3}
       propertyPath: m_LocalRotation.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 7988615406063986403, guid: 562fb3955c04633419fe1ebb55a0c9eb,
+    - target: {fileID: 9117638846523165518, guid: f850039b33d2c7143b5bf186fd762e3a,
         type: 3}
       propertyPath: m_LocalRotation.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 7988615406063986403, guid: 562fb3955c04633419fe1ebb55a0c9eb,
+    - target: {fileID: 9117638846523165518, guid: f850039b33d2c7143b5bf186fd762e3a,
         type: 3}
       propertyPath: m_AnchoredPosition.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 7988615406063986403, guid: 562fb3955c04633419fe1ebb55a0c9eb,
+    - target: {fileID: 9117638846523165518, guid: f850039b33d2c7143b5bf186fd762e3a,
         type: 3}
       propertyPath: m_AnchoredPosition.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 7988615406063986403, guid: 562fb3955c04633419fe1ebb55a0c9eb,
+    - target: {fileID: 9117638846523165518, guid: f850039b33d2c7143b5bf186fd762e3a,
         type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 7988615406063986403, guid: 562fb3955c04633419fe1ebb55a0c9eb,
+    - target: {fileID: 9117638846523165518, guid: f850039b33d2c7143b5bf186fd762e3a,
         type: 3}
       propertyPath: m_LocalEulerAnglesHint.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 7988615406063986403, guid: 562fb3955c04633419fe1ebb55a0c9eb,
+    - target: {fileID: 9117638846523165518, guid: f850039b33d2c7143b5bf186fd762e3a,
         type: 3}
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 7988615406063986404, guid: 562fb3955c04633419fe1ebb55a0c9eb,
+    - target: {fileID: 9117638846523165519, guid: f850039b33d2c7143b5bf186fd762e3a,
         type: 3}
       propertyPath: m_Name
       value: CountDown
       objectReference: {fileID: 0}
     m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 562fb3955c04633419fe1ebb55a0c9eb, type: 3}
+  m_SourcePrefab: {fileID: 100100000, guid: f850039b33d2c7143b5bf186fd762e3a, type: 3}

Assets/Scripts/Scenes/MainController.cs

@@ -62,6 +62,7 @@ public class MainController : BaseScene
         //{
         //    UIManager.ShowHomePanel();
         //});
+#if UNITY_ANDROID || UNITY_IOS
         if (!App.IsRowerMode.HasValue) 
         {
             UIManager.ShowRowerSelector();
@@ -72,6 +73,7 @@ public class MainController : BaseScene
             UIManager.ShowRowerPanel();
             return;
         }
+#endif
         if (App.MainSceneParam.ContainsKey("Name") && !string.IsNullOrEmpty(App.MainSceneParam["Name"]))
         {
             UIManager.ShowHomePanel();

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

@@ -145,10 +145,18 @@ public class RowerHomeScript : PFUIPanel
         }
         else 
         {
+            openTimer = false;
+            isPause = true;
+            if (RowerData != null)
+            {
+                RowerData.PullChanged -= PaintPullCurveDelegate;
+            }
+            btnStart.GetComponent<Image>().sprite = spriteDict["Start"];
+            btnStart.tag = "Start";
             UIManager.ShowConfirm3("Quit", "Do you want to keep the record?", 
              () =>
              {
-                 UIManager.CloseConfirm();
+                 UIManager.CloseConfirm3();
                  Save();
                  Init();
              },
@@ -158,11 +166,7 @@ public class RowerHomeScript : PFUIPanel
              },
              ()=> 
              {
-                 openTimer = false;
+                 
-                 isPause = true;
-                 RowerData.PullChanged -= PaintPullCurveDelegate;
-                 btnStart.GetComponent<Image>().sprite = spriteDict["Start"];
-                 btnStart.tag = "Start";
              });
         }
         Debug.Log(RowerData);
@@ -189,11 +193,14 @@ public class RowerHomeScript : PFUIPanel
         if (values.Count > 0) 
         {
             model.MaxPower = values.Max(x => x.power);
-            model.MaxPace = values.Where(x => x.pace > 0).Min(x => x.pace);
+            if (values.Count(x => x.pace > 0) > 0)
+            {
+                model.MaxPace = values.Where(x => x.pace > 0).Min(x => x.pace);
+                model.AvgPace = values.Where(x => x.pace > 0).Average(x => x.pace);
+            }
             model.MaxRate = values.Max(x => x.rate);
             model.MaxHeartRate = values.Max(x => x.heartRate);
             model.AvgPower = values.Average(x => x.power);
-            model.AvgPace = values.Where(x => x.pace > 0).Average(x => x.pace);
             model.AvgRate = values.Average(x => x.rate);
             model.AvgHeartRate = (int)values.Average(x => x.heartRate);
         }
@@ -296,7 +303,15 @@ public class RowerHomeScript : PFUIPanel
         bottom.Find("MS/AvgValue").GetComponent<Text>().text = RowerData.AverageStrokeRate.ToString();
         var heartRate = HeartRate ?? 0;
         bottom.Find("BPM/Value").GetComponent<Text>().text = heartRate.ToString();
-        left.Find("Times/Value").GetComponent<Text>().text = RowerData.StrokeCount.ToString();
+        var strokeCount = RowerData.StrokeCount;
+        if (ushort.TryParse(left.Find("Times/Value").GetComponent<Text>().text, out ushort originStroke)) 
+        {
+            if (strokeCount != originStroke) 
+            {
+                left.Find("Rower").GetComponent<RowerAnimation>().StartAnimation();
+            }
+        }
+        left.Find("Times/Value").GetComponent<Text>().text = strokeCount.ToString();
         left.Find("Calories/Value").GetComponent<Text>().text = RowerData.TotalEnergy.ToString();
         records.Add($"{RowerData.StrokeCount},{RowerData.ElapsedTime},{RowerData.TotalDistance},{RowerData.InstantaneousPower},{RowerData.InstantaneousPace},{RowerData.StrokeRate},{RowerData.ResistanceLevel},{heartRate}");
         values.Add(new TempRowerCalc() { pace = pace, power = power, rate = rate,heartRate = heartRate });
@@ -319,7 +334,7 @@ public class RowerHomeScript : PFUIPanel
         left.Find("LeftImage/Value").GetComponent<Image>().fillAmount = rate;
         left.Find("RightImage/Value").GetComponent<Image>().fillAmount = rate;
         //动画
-        left.Find("Rower").GetComponent<Image>().sprite = spriteDict[y / 67];
+        //left.Find("Rower").GetComponent<Image>().sprite = spriteDict[y / 67];
         //曲线
         if (y == 0)
         {

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

@@ -8,12 +8,12 @@ public class RowerAnimation : PFUIPanel
 {
     List<Sprite> sprites;
     Image image;
-
+    public bool isFinish = false;
     protected override void Awake()
     {
         base.Awake();
         sprites = new List<Sprite>();
-        for (int i = 1; i < 26; i++)
+        for (int i = 1; i <= 30; i++)
         {
             sprites.Add(Resources.Load<Sprite>($"Images/Rower/序列帧/划船机{i.ToString("0000")}"));
         }
@@ -40,19 +40,16 @@ public class RowerAnimation : PFUIPanel
     public void StartAnimation() 
     {
         index = 0;
+        isFinish = false;
         StartCoroutine(Animation());
     }
 
     IEnumerator Animation()
     {
-        for (; ; )
+        yield return new WaitForEndOfFrame();
+        for (int i = 0; i < 30; i++)
         {
-            if (index % 25 == 0)
+            image.sprite = sprites[i];
-            {
-                index = 0;
-            }
-            image.sprite = sprites[index];
-            index++;
             yield return new WaitForSeconds(0.08f);
         }
     }

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

@@ -190,8 +190,8 @@ public class RowerDeviceView : MonoBehaviour
             sprite0 = Resources.Load<Sprite>("Images/Devices/Heart Rate_1");
             sprite1 = Resources.Load<Sprite>("Images/Devices/Heart Rate_1");
             sprite3 = Resources.Load<Sprite>("Images/Devices/Heart Rate_4");
-
+            powerValue.text = "";
-            powerUnit.text = "BPM";
+            powerUnit.text = "";
         }
         else if (SensorType == SensorType.Trainer)
         {

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

@@ -0,0 +1,143 @@
+#define Graph_And_Chart_PRO
+using ChartAndGraph;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public partial class RowerHoverText : MonoBehaviour
+{
+    public Text TextPrefab;
+    public int FontSize = 5;
+    public Vector3 TextOffset = new Vector3();
+    int fractionDigits = 0;
+    AnyChart mChart;
+
+    List<Text> mItems = new List<Text>();
+    List<CharItemEffectController> mRemoved = new List<CharItemEffectController>();
+
+    partial void HoverStart();
+	void Start ()
+    {
+        var graph = GetComponent<GraphChart>();
+
+        var labels = GetComponent<ItemLabels>();
+        if (labels != null)
+            fractionDigits = labels.FractionDigits;
+        else
+            fractionDigits = 2;
+
+        if (graph != null)
+        {
+            mChart = graph;
+            graph.PointHovered.AddListener(GraphHover);
+            graph.NonHovered.AddListener(NonHover);
+            return;
+        }
+
+        var bar = GetComponent<CanvasBarChart>();
+        if (bar != null)
+        {
+            mChart = bar;
+            bar.BarHovered.AddListener(BarHover);
+            bar.NonHovered.AddListener(NonHover);
+            return;
+        }
+
+        HoverStart();
+    }
+
+    void NonHover()
+    {
+        for (int i = 0; i < mItems.Count; i++)
+        {
+            RemoveText(mItems[i]);
+        }
+        mItems.Clear();
+    }
+
+    void Update()
+    {
+        mRemoved.RemoveAll(x =>
+        {
+            if(!x.enabled)
+            {
+                ChartCommon.SafeDestroy(x.gameObject);
+                return true;
+            }
+            return false;
+        });
+    }
+
+    IEnumerator SelectText(Text text)
+    {
+        yield return new WaitForEndOfFrame();
+        if (text != null)
+        {
+            ChartItemEvents e = text.GetComponent<ChartItemEvents>();
+            if (e != null)
+            {
+                e.OnMouseHover.Invoke(e.gameObject);
+            }
+        }
+    }
+
+    void RemoveText(Text text)
+    {
+        if (text != null)
+        {
+            ChartItemEvents e = text.GetComponent<ChartItemEvents>();
+            CharItemEffectController control = text.GetComponent<CharItemEffectController>();
+            if (e != null && control != null)
+            {
+                e.OnMouseLeave.Invoke(e.gameObject);
+                mRemoved.Add(control);
+            }
+            else
+            {
+                ChartCommon.SafeDestroy(text);
+            }
+        }
+    }
+
+    void PopText(string data,Vector3 position,bool worldPositionStays)
+    {
+        var canvas = GetComponentInParent<Canvas>();
+        if (canvas == null || TextPrefab == null)
+            return;
+        NonHover();
+        GameObject obj =(GameObject) GameObject.Instantiate(TextPrefab.gameObject, position + TextOffset, Quaternion.identity);
+        var text = obj.GetComponent<Text>();
+        text.maskable = false;
+        text.text = data;
+        text.fontSize = FontSize;
+        obj.transform.SetParent(transform, false);
+        if (worldPositionStays)
+            obj.transform.position = position + TextOffset;
+        else
+            obj.transform.localPosition = position + TextOffset;
+        Vector3 local = obj.transform.localPosition;
+        local.z = 0f;
+        obj.transform.localPosition = local;
+        mItems.Add(text);
+        StartCoroutine(SelectText(text));
+    }
+
+    void BarHover(BarChart.BarEventArgs args)
+    {
+        String data = ChartAdancedSettings.Instance.FormatFractionDigits(fractionDigits, args.Value);
+        PopText(data, args.TopPosition,true);
+    }
+    void GraphHover(GraphChartBase.GraphEventArgs args)
+    {
+        var graph = mChart as GraphChart;
+        var point = graph.DataSource.GetPoint(args.Category, args.Index);
+        Vector3 position;
+        if(graph.PointToWorldSpace(out position, point.x, point.y, args.Category))
+            PopText($"({args.XString},{args.YString})", position, true);
+        else
+            PopText($"({args.XString},{args.YString})", args.Position,false);
+    }
+
+}

Assets/Scripts/UI/Prefab/Rower/RowerHoverText.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: edce4d82bd7a8544982946c6318de49b
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -9,7 +9,7 @@ public partial class RowerLargeDataFeed : MonoBehaviour, IComparer<DoubleVector2
 {
     public string Category = "Player 1";
     public int DownSampleToPoints = 100;
-    List<DoubleVector2> mData = new List<DoubleVector2>();  // the data held by the chart
+    public List<DoubleVector2> mData = new List<DoubleVector2>();  // the data held by the chart
     double pageSize = 2f;
     double currentPagePosition = 0.0;
     double currentZoom = 0f;
@@ -228,7 +228,9 @@ public partial class RowerLargeDataFeed : MonoBehaviour, IComparer<DoubleVector2
             graph.DataSource.HorizontalViewOrigin = 0;
             int start, end;
             findPointsForPage(pagePosition, out start, out end); // get the page edges
-            graph.DataSource.ClearAndMakeBezierCurve(Category); // clear the cateogry
+            graph.DataSource.ClearCategory(Category); // clear the cateogry
+
+            graph.DataSource.HorizontalViewSize = 500 > mData.Count ? mData.Count : 500;
 
             if (DownSampleToPoints <= 0)
                 LoadWithoutDownSampling(start, end);

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

@@ -55,16 +55,16 @@ public class RowerResult : PFUIPanel
             dataContent.Find("TitleContent/Device").GetComponent<Text>().text
                 = $"<color=#5c5c6e>Rowing equipment :</color> {_model.ManufacturerName}";
             dataContent.Find("Table/AvgPower/Text").GetComponent<Text>().text
-                = $"{_model.AvgPower.ToString("#0")} W";
+                = $"{TimeSpan.FromSeconds(_model.AvgPace).ToString(@"mm\:ss")} /500M";
             dataContent.Find("Table/AvgHR/Text").GetComponent<Text>().text
                 = $"{_model.AvgHeartRate} BPM";
             dataContent.Find("Table/AvgRate/Text").GetComponent<Text>().text
                 = $"{_model.AvgRate.ToString("#0")} W";
             dataContent.Find("Table/MaxPower/Text").GetComponent<Text>().text
-                = $"{_model.MaxPower.ToString("#0")} W";
+                = $"{TimeSpan.FromSeconds(_model.MaxPace).ToString(@"mm\:ss")} /500M";
-            dataContent.Find("Table/AvgHR/Text").GetComponent<Text>().text
+            dataContent.Find("Table/MaxHR/Text").GetComponent<Text>().text
                 = $"{_model.MaxHeartRate} BPM";
-            dataContent.Find("Table/AvgRate/Text").GetComponent<Text>().text
+            dataContent.Find("Table/MaxRate/Text").GetComponent<Text>().text
                 = $"{_model.MaxRate.ToString("#0")} SPM";
             dataContent.Find("ChartPace/Avg/Value").GetComponent<Text>().text
                 = $"{TimeSpan.FromSeconds(_model.AvgPace).ToString(@"mm\:ss")} /500M";
@@ -84,18 +84,23 @@ public class RowerResult : PFUIPanel
                 = _model.StrokeCount.ToString();
             //var b = _model.ChartList.Select((x, i) => new DoubleVector2(i, ChartDateUtility.TimeSpanToValue(TimeSpan.FromMinutes(x.Pace + UnityEngine.Random.value * 300)))).ToList();
             //Debug.Log(_model.ChartList.Select((x, i) => new DoubleVector2(i, ChartDateUtility.TimeSpanToValue(TimeSpan.FromMinutes(x.Pace + UnityEngine.Random.value * 300)))).ToList());
+            //var a = new List<DoubleVector2>();
+            //for (int i = 0; i < 20000; i++) 
+            //{
+            //    a.Add(new DoubleVector2(i, UnityEngine.Random.value * 200));
+            //}
             chartPace.GetComponent<RowerLargeDataFeed>()
-                .SetData(_model.ChartList.Select((x, i) => 
+                .SetData(_model.ChartList.Select((x, i) =>
                 {
                     if (x.Pace == 0)
                     {
-                        return new DoubleVector2(i, ChartDateUtility.TimeSpanToValue(TimeSpan.FromHours(15))-2000);
+                        return new DoubleVector2(i, ChartDateUtility.TimeSpanToValue(TimeSpan.FromHours(15)) - 2000);
                     }
-                    else 
+                    else
                     {
                         return new DoubleVector2(i, ChartDateUtility.TimeSpanToValue(TimeSpan.FromMinutes(x.Pace)));
                     }
-                    
+
                 }).ToList());
             chartRate.GetComponent<RowerLargeDataFeed>()
                 .SetData(_model.ChartList.Select((x, i) => new DoubleVector2(i, x.Rate)).ToList());

Assets/Scripts/UIManager.cs

@@ -201,6 +201,15 @@ public class UIManager : MonoBehaviour
         UIManager.Show(UIManager.Instance.DownloadWorkoutsModal, null, true);
         //UIManager.Show(UIManager.Instance.RaceListPanel, UIManager.Instance.MainPanel);
     }
+
+    public static void CloseConfirm3()
+    {
+        if (UIManager.Instance.confirm3 != null)
+        {
+            UIManager.Instance.confirm3.Close();
+        }
+    }
+
     /*比赛列表*/
     /*划船机页面*/
     //自由滑