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

# Conflicts:
#	Assets/Scripts/Apis/Models/MapCompetition.cs

Assets/Resources/Images/Race/RACE-BG.jpg.meta

@@ -0,0 +1,116 @@
+fileFormatVersion: 2
+guid: 1975e68229ca53d438fc22834b56cb97
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: -1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -482,8 +482,8 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
-  - {fileID: 7830190604736488075}
   - {fileID: 5683174797082813662}
+  - {fileID: 3386380942191760360}
   - {fileID: 6797571756054001242}
   - {fileID: 5365663280637269737}
   - {fileID: 519173366022166441}
@@ -546,6 +546,124 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   radius: 30
+--- !u!1 &3137725676192941378
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3386380942191760360}
+  - component: {fileID: 2090341852664038496}
+  - component: {fileID: 6608646955269228713}
+  - component: {fileID: 5246920602886654979}
+  m_Layer: 5
+  m_Name: Exit
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3386380942191760360
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3137725676192941378}
+  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: 3706567255822698944}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -30, y: -30}
+  m_SizeDelta: {x: 30, y: 30}
+  m_Pivot: {x: 1, y: 1}
+--- !u!222 &2090341852664038496
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3137725676192941378}
+  m_CullTransparentMesh: 0
+--- !u!114 &6608646955269228713
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3137725676192941378}
+  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: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 5cbb2a1813e35d143a8939fc60814d38, type: 3}
+  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 &5246920602886654979
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3137725676192941378}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 0.13725491, g: 0.13725491, b: 0.1764706, a: 1}
+    m_HighlightedColor: {r: 1, g: 1, b: 1, a: 1}
+    m_PressedColor: {r: 0.078431375, g: 0.078431375, b: 0.09019608, a: 1}
+    m_SelectedColor: {r: 1, g: 1, b: 1, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 6608646955269228713}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &3359015043811906020
 GameObject:
   m_ObjectHideFlags: 0
@@ -576,7 +694,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 3706567255822698944}
-  m_RootOrder: 1
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
@@ -624,124 +742,6 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: POWERFUN WORKOUTS
---- !u!1 &3673582959097328910
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 7830190604736488075}
-  - component: {fileID: 430874119189972174}
-  - component: {fileID: 4488123636330514131}
-  - component: {fileID: 6379072948636497638}
-  m_Layer: 5
-  m_Name: Exit
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 0
---- !u!224 &7830190604736488075
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3673582959097328910}
-  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: 3706567255822698944}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 1, y: 1}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -30, y: -30}
-  m_SizeDelta: {x: 28, y: 28}
-  m_Pivot: {x: 1, y: 1}
---- !u!222 &430874119189972174
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3673582959097328910}
-  m_CullTransparentMesh: 0
---- !u!114 &4488123636330514131
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3673582959097328910}
-  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: 1}
-  m_RaycastTarget: 1
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 5cbb2a1813e35d143a8939fc60814d38, type: 3}
-  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 &6379072948636497638
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3673582959097328910}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Navigation:
-    m_Mode: 3
-    m_SelectOnUp: {fileID: 0}
-    m_SelectOnDown: {fileID: 0}
-    m_SelectOnLeft: {fileID: 0}
-    m_SelectOnRight: {fileID: 0}
-  m_Transition: 1
-  m_Colors:
-    m_NormalColor: {r: 0.13725491, g: 0.13725491, b: 0.1764706, a: 1}
-    m_HighlightedColor: {r: 1, g: 1, b: 1, a: 1}
-    m_PressedColor: {r: 0.078431375, g: 0.078431375, b: 0.09019608, a: 1}
-    m_SelectedColor: {r: 1, g: 1, b: 1, a: 1}
-    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
-    m_ColorMultiplier: 1
-    m_FadeDuration: 0.1
-  m_SpriteState:
-    m_HighlightedSprite: {fileID: 0}
-    m_PressedSprite: {fileID: 0}
-    m_SelectedSprite: {fileID: 0}
-    m_DisabledSprite: {fileID: 0}
-  m_AnimationTriggers:
-    m_NormalTrigger: Normal
-    m_HighlightedTrigger: Highlighted
-    m_PressedTrigger: Pressed
-    m_SelectedTrigger: Selected
-    m_DisabledTrigger: Disabled
-  m_Interactable: 1
-  m_TargetGraphic: {fileID: 4488123636330514131}
-  m_OnClick:
-    m_PersistentCalls:
-      m_Calls: []
 --- !u!1 &4528967089729351594
 GameObject:
   m_ObjectHideFlags: 0
@@ -1100,7 +1100,7 @@ PrefabInstance:
     - target: {fileID: 3150550772916003707, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
       propertyPath: m_Text
-      value: Update Now
+      value: Install Now
       objectReference: {fileID: 0}
     - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
@@ -1285,7 +1285,7 @@ PrefabInstance:
     - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 20
       objectReference: {fileID: 0}
     - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}

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

@@ -1,5 +1,76 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1703012134833883404
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2547147171398365227}
+  - component: {fileID: 6950270674676521777}
+  - component: {fileID: 2962819245497661191}
+  m_Layer: 5
+  m_Name: gq
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2547147171398365227
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1703012134833883404}
+  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: 3445340291243714514}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -56, y: -26}
+  m_SizeDelta: {x: 72, y: 72}
+  m_Pivot: {x: 1, y: 1}
+--- !u!222 &6950270674676521777
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1703012134833883404}
+  m_CullTransparentMesh: 0
+--- !u!114 &2962819245497661191
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1703012134833883404}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, 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_Texture: {fileID: 2800000, guid: 39c7432c0e6b9864d9adbcd21d6ead4b, type: 3}
+  m_UVRect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1
+    height: 1
 --- !u!1 &2322805962556808324
 GameObject:
   m_ObjectHideFlags: 0
@@ -31,7 +102,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 3445340291243714514}
-  m_RootOrder: 3
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
@@ -354,6 +425,7 @@ RectTransform:
   - {fileID: 9215991904159477866}
   - {fileID: 9215991903109907487}
   - {fileID: 8089048072454713059}
+  - {fileID: 2547147171398365227}
   - {fileID: 888596503449396189}
   m_Father: {fileID: 0}
   m_RootOrder: 0
@@ -391,7 +463,7 @@ CanvasGroup:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3445340291243714513}
   m_Enabled: 1
-  m_Alpha: 1
+  m_Alpha: 0
   m_Interactable: 1
   m_BlocksRaycasts: 1
   m_IgnoreParentGroups: 0

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

@@ -37,7 +37,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 84.5, y: 40}
+  m_SizeDelta: {x: 58, y: 40}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &9190192381015952294
 CanvasRenderer:
@@ -349,7 +349,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: Finished
+  m_Text: Done
 --- !u!114 &2456986090325409475
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -539,7 +539,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: Appling
+  m_Text: Not started
 --- !u!114 &1659025924272861702
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -834,6 +834,7 @@ RectTransform:
   - {fileID: 4408462524766711656}
   - {fileID: 7118448401530350836}
   - {fileID: 7825229638776794366}
+  - {fileID: 7081805938635351733}
   - {fileID: 3808910954941481150}
   m_Father: {fileID: 0}
   m_RootOrder: 0
@@ -912,7 +913,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 58, y: 40}
+  m_SizeDelta: {x: 84.5, y: 40}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &7635687608030458564
 CanvasRenderer:
@@ -1858,7 +1859,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 1673965681348374004}
-  m_RootOrder: 3
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
@@ -1912,6 +1913,77 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   radius: 32
+--- !u!1 &5043445467111231433
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7081805938635351733}
+  - component: {fileID: 5052066067678859807}
+  - component: {fileID: 1032072723589897949}
+  m_Layer: 5
+  m_Name: gq
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7081805938635351733
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5043445467111231433}
+  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: 1673965681348374004}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -56, y: -26}
+  m_SizeDelta: {x: 72, y: 72}
+  m_Pivot: {x: 1, y: 1}
+--- !u!222 &5052066067678859807
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5043445467111231433}
+  m_CullTransparentMesh: 0
+--- !u!114 &1032072723589897949
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5043445467111231433}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, 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_Texture: {fileID: 2800000, guid: 39c7432c0e6b9864d9adbcd21d6ead4b, type: 3}
+  m_UVRect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1
+    height: 1
 --- !u!1 &5299950768805647023
 GameObject:
   m_ObjectHideFlags: 0
@@ -2625,7 +2697,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: Not started
+  m_Text: All
 --- !u!114 &7303997741883880008
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/Resources/UI/Prefab/Race/ItemSmall.prefab

@@ -113,7 +113,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 35, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 14}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4283453029241301366
@@ -364,7 +364,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.25490198, g: 0.25882354, b: 0.31764707, a: 0.9019608}
+  m_Color: {r: 0.1882353, g: 0.1882353, b: 0.24705882, a: 0.9019608}
   m_RaycastTarget: 1
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -838,6 +838,7 @@ RectTransform:
   - {fileID: 713603679570600540}
   - {fileID: 5916474674030172020}
   - {fileID: 3712440285028526962}
+  - {fileID: 6892072823467183823}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1844,7 +1845,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 33.5, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6307907517525328669
@@ -2180,6 +2181,121 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_HorizontalFit: 2
   m_VerticalFit: 0
+--- !u!1 &7468074698396101124
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6892072823467183823}
+  - component: {fileID: 4793539180843520710}
+  - component: {fileID: 7750667542575162879}
+  - component: {fileID: 1838683294276709670}
+  - component: {fileID: 3251530586542142427}
+  - component: {fileID: 6137842007705424139}
+  m_Layer: 5
+  m_Name: BtnContainer
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6892072823467183823
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7468074698396101124}
+  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: 3594112308248678713}
+  - {fileID: 185398699983025798}
+  - {fileID: 4345523542323456787}
+  - {fileID: 2216539168568584177}
+  m_Father: {fileID: 5521075338391914460}
+  m_RootOrder: 8
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 0}
+  m_AnchoredPosition: {x: 0, y: 20}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0}
+--- !u!222 &4793539180843520710
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7468074698396101124}
+  m_CullTransparentMesh: 0
+--- !u!225 &7750667542575162879
+CanvasGroup:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7468074698396101124}
+  m_Enabled: 1
+  m_Alpha: 0
+  m_Interactable: 1
+  m_BlocksRaycasts: 1
+  m_IgnoreParentGroups: 0
+--- !u!114 &1838683294276709670
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7468074698396101124}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5357b651626f6a1488bd3b1b756d271b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!114 &3251530586542142427
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7468074698396101124}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 0
+  m_VerticalFit: 2
+--- !u!114 &6137842007705424139
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7468074698396101124}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 4
+  m_Spacing: 10
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
 --- !u!1 &7903871935449730197
 GameObject:
   m_ObjectHideFlags: 0
@@ -2317,3 +2433,663 @@ CanvasGroup:
   m_Interactable: 1
   m_BlocksRaycasts: 1
   m_IgnoreParentGroups: 0
+--- !u!1001 &1726962916840079795
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 6892072823467183823}
+    m_Modifications:
+    - target: {fileID: 545917028276686471, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 40
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_Pivot.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 160
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 38
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 100
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -48
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312289, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_Name
+      value: BtnEnter
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312289, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772916003707, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_Text
+      value: Enter
+      objectReference: {fileID: 0}
+    - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 20
+      objectReference: {fileID: 0}
+    - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -9
+      objectReference: {fileID: 0}
+    - target: {fileID: 8688565590564084001, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: mType
+      value: 2
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3}
+--- !u!224 &4345523542323456787 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+    type: 3}
+  m_PrefabInstance: {fileID: 1726962916840079795}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &1898789675138186137
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 6892072823467183823}
+    m_Modifications:
+    - target: {fileID: 545917028276686471, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 40
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_Pivot.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 160
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 38
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 100
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312289, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_Name
+      value: BtnCancel
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312289, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772916003707, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_Text
+      value: Cancel  Reserve
+      objectReference: {fileID: 0}
+    - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 20
+      objectReference: {fileID: 0}
+    - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -9
+      objectReference: {fileID: 0}
+    - target: {fileID: 8688565590564084001, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: mType
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3}
+--- !u!224 &3594112308248678713 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+    type: 3}
+  m_PrefabInstance: {fileID: 1898789675138186137}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &2966651827652746278
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 6892072823467183823}
+    m_Modifications:
+    - target: {fileID: 545917028276686471, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 40
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_Pivot.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 160
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 38
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 100
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312289, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_Name
+      value: BtnJoin
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312289, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772916003707, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_Text
+      value: Join
+      objectReference: {fileID: 0}
+    - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 20
+      objectReference: {fileID: 0}
+    - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -9
+      objectReference: {fileID: 0}
+    - target: {fileID: 8688565590564084001, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: mType
+      value: 2
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3}
+--- !u!224 &185398699983025798 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+    type: 3}
+  m_PrefabInstance: {fileID: 2966651827652746278}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &3853880190950886737
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 6892072823467183823}
+    m_Modifications:
+    - target: {fileID: 545917028276686471, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 40
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_Pivot.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 160
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 38
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 100
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -96
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312289, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_Name
+      value: BtnWatch
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312289, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772916003707, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_Text
+      value: Detail
+      objectReference: {fileID: 0}
+    - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 20
+      objectReference: {fileID: 0}
+    - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -9
+      objectReference: {fileID: 0}
+    - target: {fileID: 8688565590564084001, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: mType
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3}
+--- !u!224 &2216539168568584177 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+    type: 3}
+  m_PrefabInstance: {fileID: 3853880190950886737}
+  m_PrefabAsset: {fileID: 0}

Assets/Scripts/Apis/Models/AppDownloadModel.cs

@@ -0,0 +1,44 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Assets.Scripts.Apis.Models
+{
+    public class AppDownloadInfo
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        public string Version { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string Url { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string GooglePlayUrl { get; set; }
+    }
+
+    public class AppDownloadModel
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        public AppDownloadInfo Apk { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public AppDownloadInfo Ios { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public AppDownloadInfo Unity { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public AppDownloadInfo WPF { get; set; }
+    }
+}

Assets/Scripts/Apis/Models/AppDownloadModel.cs.meta

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

Assets/Scripts/Apis/UserApi.cs

@@ -240,7 +240,10 @@ namespace Assets.Scripts.Apis
             var res = Upload("feedback/add", new { content } , files);
             return Newtonsoft.Json.JsonConvert.DeserializeObject<JsonResult<object>>(res);
         }
-
+        public async Task<JsonResult<AppDownloadModel>> GetAppVersion()
+        {
+            return await GetAsync<JsonResult<AppDownloadModel>>("home/getversions");
+        }
         public JsonResult<object> Update(UserResultModel currUser, string filePath = "")
         {
             //return await PostAsync<JsonResult<dynamic>>("User/UpdateUserSetting", new {

Assets/Scripts/UI/Control/PfUIButton.cs

@@ -82,7 +82,7 @@ namespace Assets.Scripts.UI.Control
             {
                 case Type.Normal:
                     {                        
-                        image.color = ConvertColor("#303030");
+                        image.color = ConvertColor("#414251");
                     }
                     break;
                 case Type.Border:
@@ -152,7 +152,7 @@ namespace Assets.Scripts.UI.Control
                 {
                     case Type.Normal:
                         {
-                            image.color = ConvertColor("#303030");
+                            image.color = ConvertColor("#414251");
                         }
                         break;
                     case Type.Border:

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

@@ -58,7 +58,8 @@ public class HomeController : PFUIPanel
             if (!System.IO.File.Exists(path))
             {
                 //TODO: auto update
-                Application.OpenURL("https://powerfun.oss-cn-shanghai.aliyuncs.com/Releases/PowerFunWorkouts.exe");
+                UIManager.ShowDownloadWorkoutsPanel();
+                //Application.OpenURL("https://powerfun.oss-cn-shanghai.aliyuncs.com/Releases/PowerFunWorkouts.exe");
                 return;
             }
             Utils.ExecFile(path);

Assets/Scripts/UI/Prefab/Race/RaceFilterOptions.cs

@@ -10,10 +10,10 @@ namespace Assets.Scripts.UI.Prefab.Race
     {
         public static Dictionary<string, string> statusDict = new Dictionary<string, string>()
         {
-            {"Not started","1" },
+            {"All","" },
-            {"Appling","2" },
+            {"Not started","1,2" },
             {"Racing","3" },
-            {"Finished","4" },
+            {"Done","4" },
         };
     }
 }

Assets/Scripts/UI/Prefab/Race/RaceHomeScript.cs

@@ -22,6 +22,7 @@ public class RaceHomeScript : RaceScript
     {
         base.Show();
         handleAvatar();
+        GetData();
     }
     void Start()
     {
@@ -58,8 +59,7 @@ public class RaceHomeScript : RaceScript
                  UIManager.ShowRaceListPanel();
              };
         });
-        handleAvatar();
+        
-        GetData();
     }
     
     async void GetData() 
@@ -87,6 +87,15 @@ public class RaceHomeScript : RaceScript
         //    game.transform.SetParent(rightContainer.Find("Container-1"));
         //    game.transform.localScale = Vector3.one;
         //}
+        foreach (Transform t in rightContainer.Find("Container-2")) 
+        {
+            if (t.name != "BtnGoList") 
+            {
+                t.gameObject.Destroy();
+            }
+        }
+        scroll.transform.Find("DotList").DestroyChildren();
+        scroll.content.DestroyChildren();
         for (; i < list.Count; i++) 
         {
             var game = Instantiate<GameObject>(smallGame);

Assets/Scripts/UI/Prefab/Race/RaceItemScript.cs

@@ -30,7 +30,7 @@ public class RaceItemScript : MonoBehaviour, IPointerExitHandler, IPointerEnterH
         Utils.DisplayImage(transform.GetComponent<RawImage>(), mapCompetition.RouteCover, true);
         Utils.DisplayImage(transform.Find("AltitudeCurve").GetComponent<RawImage>(), mapCompetition.AltitudeGraph, true);
         transform.Find("InfoContainer/Text").GetComponent<Text>().SetTextWithEllipsis(mapCompetition.Title);
-        transform.Find("GetReadyContainer").gameObject.SetActive(mapCompetition.Status != 4);
+        transform.Find("GetReadyContainer").gameObject.SetActive(mapCompetition.Status != 3);
         transform.Find("GetReadyContainer-2").gameObject.SetActive(mapCompetition.Status == 1);
         //transform.Find("Text").GetComponent<Text>().text = mapCompetition.Title;
         //props.Find("DistanceText").GetComponent<Text>().text = $"{myMap.Distance.ToString(myMap.Distance > 1000 ? "#0" : "#0.00")}KM";
@@ -55,71 +55,89 @@ public class RaceItemScript : MonoBehaviour, IPointerExitHandler, IPointerEnterH
 
     private void SetButtonGroup(MapCompetition mapCompetition)
     {
-        if (mapCompetition.Status == 1)
+        var container = transform.Find("BtnContainer");
-        {
+        container.GetComponent<RaceButtonGroupScript>().map = mapCompetition;
-            var game = Resources.Load<GameObject>("UI/Prefab/Race/ButtonGroup/BtnContainer-Enter");
+        container.GetComponent<RaceButtonGroupScript>().parent = transform;
-            var igame = Instantiate(game);
+        container.Find("BtnCancel").gameObject.SetActive(mapCompetition.CanCancelJoin);
-            igame.name = "BtnContainer";
+        container.Find("BtnJoin").gameObject.SetActive(mapCompetition.CanJoin);
-            igame.GetComponent<RaceButtonGroupScript>().map = mapCompetition;
+        container.Find("BtnEnter").gameObject.SetActive(mapCompetition.Status != 4);
-            igame.GetComponent<RaceButtonGroupScript>().parent = transform;
+        container.Find("BtnWatch").gameObject.SetActive(mapCompetition.Status == 4);
-            igame.transform.SetParent(transform);
+        //if (transform.Find("BtnContainer") != null)
-            igame.transform.localScale = Vector3.one;
+        //{
-            var loc = Vector3.zero;
+        //    transform.Find("BtnContainer").gameObject.Destroy();
-            loc.y = myType == ItemType.big ? -252 : -257;
+        //}
-            igame.transform.localPosition = loc;
+        //if (mapCompetition.Status == 1)
-        }
+        //{
-        else if (mapCompetition.Status == 4)
+        //    var game = Resources.Load<GameObject>("UI/Prefab/Race/ButtonGroup/BtnContainer-Enter");
-        {
+        //    var igame = Instantiate(game);
-            var game = Resources.Load<GameObject>("UI/Prefab/Race/ButtonGroup/BtnContainer-Watch");
+        //    igame.name = "BtnContainer";
-            var igame = Instantiate(game);
+        //    igame.GetComponent<RaceButtonGroupScript>().map = mapCompetition;
-            igame.name = "BtnContainer";
+        //    igame.GetComponent<RaceButtonGroupScript>().parent = transform;
-            igame.GetComponent<RaceButtonGroupScript>().map = mapCompetition;
+        //    igame.transform.SetParent(transform);
-            igame.GetComponent<RaceButtonGroupScript>().parent = transform;
+        //    igame.transform.localScale = Vector3.one;
-            igame.transform.SetParent(transform);
+        //    var loc = Vector3.zero;
-            igame.transform.localScale = Vector3.one;
+        //    loc.y = myType == ItemType.big ? -252 : -257;
-            var loc = Vector3.zero;
+        //    igame.transform.localPosition = loc;
-            loc.y = myType == ItemType.big ? -252 : -257;
+        //}
-            igame.transform.localPosition = loc;
+        //else
-        }
+        //if (mapCompetition.Status == 4)
-        else 
+        //{
-        {
+        //    var game = Resources.Load<GameObject>("UI/Prefab/Race/ButtonGroup/BtnContainer-Watch");
-            if (myType == ItemType.big)
+        //    var igame = Instantiate(game);
-            {
+        //    igame.name = "BtnContainer";
-                var game = Resources.Load<GameObject>("UI/Prefab/Race/ButtonGroup/BtnContainer-Double-H");
+        //    igame.GetComponent<RaceButtonGroupScript>().map = mapCompetition;
-                var igame = Instantiate(game);
+        //    igame.GetComponent<RaceButtonGroupScript>().parent = transform;
-                igame.name = "BtnContainer";
+        //    igame.transform.SetParent(transform);
-                igame.GetComponent<RaceButtonGroupScript>().map = mapCompetition;
+        //    igame.transform.localScale = Vector3.one;
-                igame.GetComponent<RaceButtonGroupScript>().parent = transform;
+        //    var loc = Vector3.zero;
-                igame.transform.Find("BtnJoin").gameObject.SetActive(mapCompetition.CanJoin);
+        //    loc.y = myType == ItemType.big ? -252 : -257;
-                igame.transform.Find("BtnCancel").gameObject.SetActive(mapCompetition.HasJoin);
+        //    igame.transform.localPosition = loc;
-                igame.transform.SetParent(transform);
+        //}
-                igame.transform.localScale = Vector3.one;
+        //else 
-                igame.transform.GetComponent<RectTransform>().anchorMax = new Vector2(0, 0);
+        //{
-                igame.transform.GetComponent<RectTransform>().anchorMin = new Vector2(1, 0);
+        //    if (myType == ItemType.big)
-                igame.transform.GetComponent<RectTransform>().pivot = new Vector2(0.5f, 0);
+        //    {
-                var loc = Vector3.zero;
+        //        var game = Resources.Load<GameObject>("UI/Prefab/Race/ButtonGroup/BtnContainer-Double-H");
-                loc.y = 20;
+        //        var igame = Instantiate(game);
-                igame.transform.GetComponent<RectTransform>().anchoredPosition = loc;
+        //        igame.name = "BtnContainer";
-            }
+        //        igame.GetComponent<RaceButtonGroupScript>().map = mapCompetition;
-            else 
+        //        igame.GetComponent<RaceButtonGroupScript>().parent = transform;
-            {
+        //        igame.transform.Find("BtnJoin").gameObject.SetActive(mapCompetition.CanJoin);
-                var game = Resources.Load<GameObject>("UI/Prefab/Race/ButtonGroup/BtnContainer-Double-V");
+        //        igame.transform.Find("BtnCancel").gameObject.SetActive(mapCompetition.CanCancelJoin);
-                var igame = Instantiate(game);
+        //        igame.transform.SetParent(transform);
-                igame.name = "BtnContainer";
+        //        igame.transform.localScale = Vector3.one;
-                igame.GetComponent<RaceButtonGroupScript>().map = mapCompetition;
+        //        igame.transform.GetComponent<RectTransform>().anchorMax = new Vector2(0, 0);
-                igame.GetComponent<RaceButtonGroupScript>().parent = transform;
+        //        igame.transform.GetComponent<RectTransform>().anchorMin = new Vector2(1, 0);
-                igame.transform.Find("BtnJoin").gameObject.SetActive(mapCompetition.CanJoin);
+        //        igame.transform.GetComponent<RectTransform>().pivot = new Vector2(0.5f, 0);
-                igame.transform.Find("BtnCancel").gameObject.SetActive(mapCompetition.HasJoin);
+        //        var loc = Vector3.zero;
-                igame.transform.SetParent(transform);
+        //        loc.y = 20;
-                igame.transform.localScale = Vector3.one;
+        //        loc.y = 20;
-                igame.transform.GetComponent<RectTransform>().anchorMax = new Vector2(0, 0);
+        //        igame.transform.GetComponent<RectTransform>().anchoredPosition = loc;
-                igame.transform.GetComponent<RectTransform>().anchorMin = new Vector2(1, 0);
+        //    }
-                igame.transform.GetComponent<RectTransform>().pivot = new Vector2(0.5f, 0);
+        //    else 
-                var loc = Vector3.zero;
+        //    {
-                loc.y = 20;
+        //        var game = Resources.Load<GameObject>("UI/Prefab/Race/ButtonGroup/BtnContainer-Double-V");
-                igame.transform.GetComponent<RectTransform>().anchoredPosition = loc;
+        //        var igame = Instantiate(game);
-            }
+        //        igame.name = "BtnContainer";
-        }
+        //        igame.GetComponent<RaceButtonGroupScript>().map = mapCompetition;
+        //        igame.GetComponent<RaceButtonGroupScript>().parent = transform;
+        //        igame.transform.Find("BtnJoin").gameObject.SetActive(mapCompetition.CanJoin);
+        //        igame.transform.Find("BtnCancel").gameObject.SetActive(mapCompetition.CanCancelJoin);
+
+        //        igame.transform.SetParent(transform);
+        //        igame.transform.localScale = Vector3.one;
+        //        igame.transform.GetComponent<RectTransform>().anchorMax = new Vector2(0, 0);
+        //        igame.transform.GetComponent<RectTransform>().anchorMin = new Vector2(1, 0);
+        //        igame.transform.GetComponent<RectTransform>().pivot = new Vector2(0.5f, 0);
+        //        var loc = Vector3.zero;
+        //        loc.y = 20;
+        //        igame.transform.GetComponent<RectTransform>().anchoredPosition = loc;
+        //    }
+        //}
+        //if (transform.Find("Masking").GetComponent<CanvasGroup>().alpha == 1) 
+        //{
+        //    transform.Find("BtnContainer").GetComponent<CanvasGroup>().alpha = 1;
+        //}
     }
 
     private Dictionary<int, string> statusColorDict = new Dictionary<int, string>
@@ -136,9 +154,9 @@ public class RaceItemScript : MonoBehaviour, IPointerExitHandler, IPointerEnterH
         else
         {
             status.GetComponent<RawImage>().color = Utils.HexToColorHtml(statusColorDict[mapCompetition.Status]);
-            if (mapCompetition.Status == 2 && mapCompetition.HasJoin)
+            if (mapCompetition.Status == 2 && !mapCompetition.HasJoin)
             {
-                status.Find("Text").GetComponent<Text>().text = "Applied";
+                status.gameObject.SetActive(false);
             }
             else 
             {
@@ -149,7 +167,6 @@ public class RaceItemScript : MonoBehaviour, IPointerExitHandler, IPointerEnterH
 
     public void OnPointerExit(PointerEventData eventData)
     {
-        Cursor.SetCursor(null, Vector2.zero, CursorMode.Auto);
         transform.Find("Masking").GetComponent<CanvasGroup>().DOFade(0, 0.5f);
         transform.Find("AltitudeCurve").GetComponent<RawImage>().DOFade(0, 0.5f);
         transform.Find("InfoContainer/Text").GetComponent<CanvasGroup>().DOFade(1, 0.5f);
@@ -176,7 +193,6 @@ public class RaceItemScript : MonoBehaviour, IPointerExitHandler, IPointerEnterH
 
     public void OnPointerEnter(PointerEventData eventData)
     {
-        Cursor.SetCursor(Resources.Load<Texture2D>("Images/PointerButtonHover"), Vector2.zero, CursorMode.Auto);
         transform.Find("Masking").GetComponent<CanvasGroup>().DOFade(1, 0.5f);
         transform.Find("AltitudeCurve").GetComponent<RawImage>().DOFade(1, 0.5f);
         transform.Find("InfoContainer/Text").GetComponent<CanvasGroup>().DOFade(0, 0.5f);
@@ -211,12 +227,18 @@ public class RaceItemScript : MonoBehaviour, IPointerExitHandler, IPointerEnterH
         var res = ConfigHelper.mapCompetitionApi.ApplyMapCompetition(mapCompetition.Id);
         if (res.result)
         {
-            mapCompetition.HasJoin = true;
+
-            mapCompetition.CanJoin = false;
+            //mapCompetition.HasJoin = true;
-            transform.Find("CountContainer/Text").GetComponent<Text>().text = (++mapCompetition.ApplyCount).ToString();
+            //mapCompetition.CanJoin = false;
-            SetStatus(mapCompetition);
+            //transform.Find("CountContainer/Text").GetComponent<Text>().text = (++mapCompetition.ApplyCount).ToString();
-            transform.Find("BtnContainer").gameObject.Destroy();
+            //SetStatus(mapCompetition);
-            SetButtonGroup(mapCompetition);
+            //transform.Find("BtnContainer").gameObject.Destroy();
+            //SetButtonGroup(mapCompetition);
+            var res1 = ConfigHelper.mapCompetitionApi.GetById(mapCompetition.Id);
+            if (res1.result)
+            {
+                Initial(res1.data, null);
+            }
             Utils.showToast(null, "Successful application!", type: 1);
         }
         else 
@@ -229,12 +251,17 @@ public class RaceItemScript : MonoBehaviour, IPointerExitHandler, IPointerEnterH
         var res = ConfigHelper.mapCompetitionApi.CancelMapCompetition(mapCompetition.Id);
         if (res.result)
         {
-            mapCompetition.HasJoin = false;
+            //mapCompetition.HasJoin = false;
-            mapCompetition.CanJoin = true;
+            //mapCompetition.CanJoin = true;
-            transform.Find("CountContainer/Text").GetComponent<Text>().text = (--mapCompetition.ApplyCount).ToString();
+            //transform.Find("CountContainer/Text").GetComponent<Text>().text = (--mapCompetition.ApplyCount).ToString();
-            SetStatus(mapCompetition);
+            //SetStatus(mapCompetition);
-            transform.Find("BtnContainer").gameObject.Destroy();
+            //transform.Find("BtnContainer").gameObject.Destroy();
-            SetButtonGroup(mapCompetition);
+            //SetButtonGroup(mapCompetition);
+            var res1 = ConfigHelper.mapCompetitionApi.GetById(mapCompetition.Id);
+            if (res1.result)
+            {
+                Initial(res1.data, null);
+            }
             Utils.showToast(null, "Successful cancellation application!", type: 1);
         }
         else 

Assets/Scripts/UI/Prefab/Race/RaceListScript.cs

@@ -26,6 +26,7 @@ public class RaceListScript : RaceScript
     {
         base.Show();
         handleAvatar();
+        //Refresh();
     }
     //筛选条件
     void Start()
@@ -44,24 +45,66 @@ public class RaceListScript : RaceScript
                 var button = t.GetComponent<Button>();
                 var image = t.GetComponent<Image>();
                 var text = t.Find("Text").GetComponent<Text>();
-                UIManager.AddEvent(button.gameObject, EventTriggerType.PointerClick, (b) =>
+                if (t.name == "Btn1")
                 {
-                    Color c1 = Utils.HexToColorHtml("#23232D");
+                    image.color = Utils.HexToColorHtml("#F93086");
-                    if (image.color.r == c1.r && image.color.g == c1.g && image.color.b == c1.b)
+                    text.color = new Color(1, 1, 1, 1);
+                    UIManager.AddEvent(button.gameObject, EventTriggerType.PointerClick, (b) => 
                     {
-                        image.color = Utils.HexToColorHtml("#F93086");
+                        foreach (Transform t1 in statusOptionContainer) 
-                        text.color = new Color(1, 1, 1, 1);
+                        {
-                        statusOptions.Add(RaceFilterOptions.statusDict[text.text]);
+                            var image1 = t1.GetComponent<Image>();
-                    }
+                            var text1 = t1.Find("Text").GetComponent<Text>();
-                    else
+                            if (t1.name == t.name)
+                            {
+                                image1.color = Utils.HexToColorHtml("#F93086");
+                                text1.color = new Color(1, 1, 1, 1);
+                            }
+                            else 
+                            {
+                                image1.color = Utils.HexToColorHtml("#23232D");
+                                text1.color = new Color(1, 1, 1, 1);
+                            }
+                        }
+                        statusOptions.Clear();
+                        scroll.GetComponent<ScrollRect>().verticalNormalizedPosition = 1;
+                        Refresh();
+                    });
+                }
+                else 
+                {
+                    UIManager.AddEvent(button.gameObject, EventTriggerType.PointerClick, (b) =>
                     {
-                        image.color = c1;
+                        Color c1 = Utils.HexToColorHtml("#23232D");
-                        text.color = new Color(1, 1, 1, 1);
+                        if (image.color.r == c1.r && image.color.g == c1.g && image.color.b == c1.b)
-                        statusOptions.Remove(RaceFilterOptions.statusDict[text.text]);
+                        {
-                    }
+                            image.color = Utils.HexToColorHtml("#F93086");
-                    scroll.GetComponent<ScrollRect>().verticalNormalizedPosition = 1;
+                            text.color = new Color(1, 1, 1, 1);
-                    Refresh();
+                            statusOptions.Add(RaceFilterOptions.statusDict[text.text]);
-                });
+                        }
+                        else
+                        {
+                            image.color = c1;
+                            text.color = new Color(1, 1, 1, 1);
+                            statusOptions.Remove(RaceFilterOptions.statusDict[text.text]);
+                        }
+                        Transform t1 = statusOptionContainer.GetChild(0);
+                        var image1 = t1.GetComponent<Image>();
+                        var text1 = t1.Find("Text").GetComponent<Text>();
+                        if (statusOptions.Count == 0)
+                        {
+                            image1.color = Utils.HexToColorHtml("#F93086");
+                            text1.color = new Color(1, 1, 1, 1);
+                        }
+                        else 
+                        {
+                            image1.color = Utils.HexToColorHtml("#23232D");
+                            text1.color = new Color(1, 1, 1, 1);
+                        }
+                        scroll.GetComponent<ScrollRect>().verticalNormalizedPosition = 1;
+                        Refresh();
+                    });
+                }
             }
         }
         reserveContainer = transform.Find("ListContainer/Conditions/ReserveContainer");
@@ -98,7 +141,11 @@ public class RaceListScript : RaceScript
         searchInput = transform.Find("ListContainer/Conditions/SearchInput");
         if (searchInput != null) 
         {
-            UIManager.AddEvent(searchInput.Find("Button").gameObject, EventTriggerType.PointerClick, (b) =>
+            //UIManager.AddEvent(searchInput.Find("Button").gameObject, EventTriggerType.PointerClick, (b) =>
+            //{
+            //    //onEndEdit();
+            //});
+            searchInput.GetComponent<InputField>().onEndEdit.AddListener((string s) => 
             {
                 onEndEdit();
             });
@@ -114,7 +161,6 @@ public class RaceListScript : RaceScript
                 };
             });
         }
-        handleAvatar();
         Refresh();
     }
 
@@ -143,10 +189,10 @@ public class RaceListScript : RaceScript
                 OnEndDrag(null);
             }
         }
-        if (Input.GetKeyDown(KeyCode.KeypadEnter) || Input.GetKeyDown(KeyCode.Return))
+        //if (Input.GetKeyDown(KeyCode.KeypadEnter) || Input.GetKeyDown(KeyCode.Return))
-        {
+        //{
-            onEndEdit();
+        //    onEndEdit();
-        }
+        //}
     }
 
     private void OnEndDrag(BaseEventData arg0)

Assets/Scripts/UI/Prefab/Race/RaceScript.cs

@@ -77,13 +77,30 @@ public class RaceScript : PFUIPanel
             if (map.Status == 1)
             {
                 currentItem.Find("GetReadyContainer/Title").GetComponent<Text>().text = "Application Start Time";
-                currentItem.Find("GetReadyContainer/Value").GetComponent<Text>().text = 
+                currentItem.Find("GetReadyContainer/Value").GetComponent<Text>().text =
                     map.StartApplyTime.ToString("yyyy-MM-dd HH:mm");
                 currentItem.Find("GetReadyContainer-2/Title").GetComponent<Text>().text = "Race Start Time";
                 currentItem.Find("GetReadyContainer-2/Value").GetComponent<Text>().text =
                     map.StartTime.ToString("yyyy-MM-dd HH:mm");
+
+                if ((map.StartApplyTime - UIManager.Now.GetDateTime()).TotalSeconds < 0 ||
+                    (map.StartTime - UIManager.Now.GetDateTime()).TotalSeconds < 0) 
+                {
+                    var res = ConfigHelper.mapCompetitionApi.GetById(map.Id);
+                    if (res.result)
+                    {
+                        currentItem.GetComponent<RaceItemScript>().Initial(res.data, null);
+                    }
+                }
             }
-            else 
+            else if (map.Status == 4) 
+            {
+                currentItem.Find("GetReadyContainer/Title").GetComponent<Text>().text = "Race End Time";
+                currentItem.Find("GetReadyContainer/Value").GetComponent<Text>().text =
+                    map.FirstEndTime.HasValue? 
+                    map.FirstEndTime.Value.ToString("yyyy-MM-dd HH:mm"):map.EndTime.ToString("yyyy-MM-dd HH:mm");
+            }
+            else
             {
                 //Dictionary<int,>
                 var time = (map.Status == 2 ? map.StartTime.ToLocalTime() : map.EndTime.ToLocalTime()) - UIManager.Now.GetDateTime();
@@ -91,7 +108,7 @@ public class RaceScript : PFUIPanel
                 {
                     currentItem.Find("GetReadyContainer").GetComponent<CanvasGroup>().alpha = 0;
                     var res = ConfigHelper.mapCompetitionApi.GetById(map.Id);
-                    if (res.result) 
+                    if (res.result)
                     {
                         currentItem.GetComponent<RaceItemScript>().Initial(res.data, null);
                     }

Assets/Scripts/UI/Prefab/Update/DownloadWorkoutsController.cs

@@ -1,4 +1,6 @@
 using Assets.Scripts;
+using Assets.Scripts.Apis.Models;
+using Newtonsoft.Json.Linq;
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -15,6 +17,19 @@ public class DownloadWorkoutsController : PFUIPanel
     ScrollRect scroll;
     string path;
     [SerializeField] Transform log;
+    AppDownloadInfo wpf;
+    public override void Show()
+    {
+        base.Show();
+        Btn = transform.Find("Panel/BtnConfirm");
+        BtnStart = transform.Find("Panel/BtnStart");
+        Loading = transform.Find("Panel/LoadingContainer");
+        scroll = transform.Find("Panel/Scroll View").GetComponent<ScrollRect>();
+        Exit = transform.Find("Panel/Exit");
+        BtnStart.GetComponent<Button>().enabled = true;
+        BtnStart.GetComponent<Button>().interactable = true;
+        SetType(1);
+    }
     void Start()
     {
         Btn = transform.Find("Panel/BtnConfirm");
@@ -22,63 +37,102 @@ public class DownloadWorkoutsController : PFUIPanel
         Loading = transform.Find("Panel/LoadingContainer");
         scroll = transform.Find("Panel/Scroll View").GetComponent<ScrollRect>();
         Exit = transform.Find("Panel/Exit");
+        SetType(1);
         UIManager.AddEvent(Exit.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, (b) =>
         {
-            Utils.showToast(gameObject, "Please update to the latest version.");
+            //UIManager.CloseConfirm();
+            if (request != null) 
+            {
+                request.Abort();
+            }
+            if (_fs != null) 
+            {
+                _fs.Close();
+            }
+            if (_netStream != null) 
+            {
+                _netStream.Close();
+            }
+            gameObject.SetActive(false);
         });
-        SetType(1);
+        
         //Button.GetComponent<Button>().enabled = false;
         //Button.GetComponent<Button>().interactable = false;
-        path = Application.persistentDataPath + "/PowerFun.exe";
+        path = Application.persistentDataPath + "/PowerFunWorkouts.exe";
         UIManager.AddEvent(Btn.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, (b) =>
          {
-             Application.Quit();
+             //Application.Quit();
              Utils.ExecFile(path);
          });
-        UIManager.AddEvent(BtnStart.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, (_base) =>
+        UIManager.AddEvent(BtnStart.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick,async (_base) =>
         {
-            if (App.UpdateObject != null) 
+            var res = await ConfigHelper.userApi.GetAppVersion();
+            if (res.result) 
             {
-                BtnStart.GetComponent<Button>().enabled = false;
+                wpf = res.data.WPF;
-                BtnStart.GetComponent<Button>().interactable = false;
+                if (wpf != null) 
-                StartCoroutine(DownLoadExe(App.UpdateObject.Url, path, (a, b, isComplete) =>
                 {
-                    transform.Find("Panel/LoadingContainer/Text").GetComponent<Text>().text = $"Downloaded {a.ToString("#0")}M / {b.ToString("#0")}M";// string.Format(, a, b);
+                    BtnStart.GetComponent<Button>().enabled = false;
-                    transform.Find("Panel/LoadingContainer/Loading").GetComponent<Image>().fillAmount = (float)(a / b);
+                    BtnStart.GetComponent<Button>().interactable = false;
-                    if (isComplete)
+                    Debug.Log(path);
+                    StartCoroutine(DownLoadExe(wpf.Url, path, (a, b, isComplete) =>
                     {
-                        SetType(3);
+                        Debug.Log($"{a} {b} {isComplete}");
-
+                        transform.Find("Panel/LoadingContainer/Text").GetComponent<Text>().text = $"Downloaded {a.ToString("#0")}M / {b.ToString("#0")}M";// string.Format(, a, b);
-                        PlayerPrefs.SetString("exeVersion", App.UpdateObject.Code);
+                            transform.Find("Panel/LoadingContainer/Loading").GetComponent<Image>().fillAmount = (float)(a / b);
-                        new FileInfo(path + ".pfdownload").MoveTo(path);
+                        if (isComplete)
-                    }
+                        {
-                }));
+                            SetType(3);
+                            PlayerPrefs.SetString("exeVersion_w", wpf.Version);
+                            new FileInfo(path + ".pfdownload").MoveTo(path);
+                        }
+                    }));
+                }
             }
+            //if (App.UpdateObject != null) 
+            //{
+            //    BtnStart.GetComponent<Button>().enabled = false;
+            //    BtnStart.GetComponent<Button>().interactable = false;
+            //    StartCoroutine(DownLoadExe(App.UpdateObject.Url, path, (a, b, isComplete) =>
+            //    {
+            //        transform.Find("Panel/LoadingContainer/Text").GetComponent<Text>().text = $"Downloaded {a.ToString("#0")}M / {b.ToString("#0")}M";// string.Format(, a, b);
+            //        transform.Find("Panel/LoadingContainer/Loading").GetComponent<Image>().fillAmount = (float)(a / b);
+            //        if (isComplete)
+            //        {
+            //            SetType(3);
+
+            //            PlayerPrefs.SetString("exeVersion", App.UpdateObject.Code);
+            //            new FileInfo(path + ".pfdownload").MoveTo(path);
+            //        }
+            //    }));
+            //}
         });
         //transform
-        if (App.UpdateObject != null) 
+        //if (App.UpdateObject != null) 
-        {
+        //{
-            
+        //    for (var i = 0; i < App.UpdateObject.UpdateLog.Count; i++) 
-            for (var i = 0; i < App.UpdateObject.UpdateLog.Count; i++) 
+        //    {
-            {
+        //        var newLog = Instantiate<Transform>(log);
-                var newLog = Instantiate<Transform>(log);
+        //        newLog.GetComponent<DownloadLog>().Initial(App.UpdateObject.UpdateLog[i]);
-                newLog.GetComponent<DownloadLog>().Initial(App.UpdateObject.UpdateLog[i]);
+        //        if (i == App.UpdateObject.UpdateLog.Count - 1) 
-                if (i == App.UpdateObject.UpdateLog.Count - 1) 
+        //        {
-                {
+        //            newLog.GetComponent<DownloadLog>().HideLine();
-                    newLog.GetComponent<DownloadLog>().HideLine();
+        //        }
-                }
+        //        newLog.SetParent(scroll.content);
-                newLog.SetParent(scroll.content);
+        //        newLog.localScale = Vector3.one;
-                newLog.localScale = Vector3.one;
+        //    }
-            }
+        //}
-        }
     }
+    bool stop = false;
+    HttpWebRequest request;
+    Stream _fs, _netStream;
     /*下载文件*/
     IEnumerator DownLoadExe(string url, string desFileName, Action<double, double, bool> OnDownloadProgressEvent)
     {
         string version = null;
-        if (App.UpdateObject != null)
+        if (wpf != null)
         {
-            version = App.UpdateObject.Code;
+            version = wpf.Version;
         }
         if (File.Exists(desFileName))
         {
@@ -89,9 +143,9 @@ public class DownloadWorkoutsController : PFUIPanel
             }
             else
             {
-                if (version == PlayerPrefs.GetString("exeVersion"))
+                if (version == PlayerPrefs.GetString("exeVersion_w"))
                 {
-                    Application.Quit();
+                    //Application.Quit();
                     Utils.ExecFile(desFileName);
                     yield break;
                 }
@@ -108,8 +162,9 @@ public class DownloadWorkoutsController : PFUIPanel
             File.Delete(desFileName + ".pfdownload");
         }
         SetType(2);
-        HttpWebRequest request = (HttpWebRequest)HttpWebRequest.Create(url);
+        request = (HttpWebRequest)HttpWebRequest.Create(url);
         request.Timeout = 5000;
+
         WebResponse response = request.GetResponse();
         //UnityWebRequest request = UnityWebRequest.Get(url);
         //yield return request.SendWebRequest();
@@ -121,6 +176,8 @@ public class DownloadWorkoutsController : PFUIPanel
         using (FileStream fs = new FileStream(desFileName + ".pfdownload", FileMode.Create))
         using (Stream netStream = response.GetResponseStream())
         {
+            _fs = fs;
+            _netStream = netStream;
             nReadSize = netStream.Read(nbytes, 0, packLength);
             while (nReadSize > 0)
             {

Assets/Scripts/UIManager.cs

@@ -152,6 +152,8 @@ public class UIManager : MonoBehaviour
         {
             UIManager.PopStack();
         }
+        UIManager.Instance.MainPanel.GetComponent<Image>().sprite =
+            Resources.Load<Sprite>("Images/Race/RACE-BG");
         UIManager.Show(UIManager.Instance.RaceHomePanel, UIManager.Instance.MainPanel);
     }
     /*比赛首页*/
@@ -462,6 +464,8 @@ public class UIManager : MonoBehaviour
     public static void ShowHomePanel()
     {
         stack.Clear();
+        UIManager.Instance.MainPanel.GetComponent<Image>().sprite =
+            Resources.Load<Sprite>("Images/main-bg");
         UIManager.Show(UIManager.Instance.HomePanel, UIManager.Instance.MainPanel);
     }