暂存

Assets/BannerController.cs

@@ -162,16 +162,16 @@ public class BannerController : MonoBehaviour
     void DORight(CanvasGroup left, CanvasGroup center, CanvasGroup right) 
     {
         Sequence se = DOTween.Sequence();
-        se.Join(center.DOFade(0.5f, 0.5f));
+        se.Join(center.DOFade(0.5f, 0.3f));
-        se.Join(center.GetComponent<RectTransform>().DOScale(Vector3.one * 0.8f, 0.5f));
+        se.Join(center.GetComponent<RectTransform>().DOScale(Vector3.one * 0.8f, 0.3f));
-        se.Join(center.GetComponent<RectTransform>().DOLocalMoveX(43, 0.5f));
+        se.Join(center.GetComponent<RectTransform>().DOLocalMoveX(43, 0.3f));
-        se.Join(right.GetComponent<RectTransform>().DOLocalMoveX(-43, 0.5f));
+        se.Join(right.GetComponent<RectTransform>().DOLocalMoveX(-43, 0.3f));
         var area = list[((currentIndex++) + list.Count) % list.Count];
         right.GetComponent<NewRouteItemController>().Initial(area);
         if (currentIndex >= list.Count) currentIndex = 0;
-        se.Join(left.DOFade(1, 0.5f));
+        se.Join(left.DOFade(1, 0.3f));
-        se.Join(left.GetComponent<RectTransform>().DOScale(Vector3.one, 0.5f));
+        se.Join(left.GetComponent<RectTransform>().DOScale(Vector3.one, 0.3f));
-        se.Join(left.GetComponent<RectTransform>().DOLocalMoveX(0, 0.5f));
+        se.Join(left.GetComponent<RectTransform>().DOLocalMoveX(0, 0.3f));
         se.Play();
         left.transform.SetAsLastSibling();
         //事件改变
@@ -195,17 +195,17 @@ public class BannerController : MonoBehaviour
     void DOLeft(CanvasGroup left, CanvasGroup center, CanvasGroup right) 
     {
         Sequence se = DOTween.Sequence();
-        se.Join(center.DOFade(0.5f, 0.5f));
+        se.Join(center.DOFade(0.5f, 0.3f));
-        se.Join(center.GetComponent<RectTransform>().DOScale(Vector3.one * 0.8f, 0.5f));
+        se.Join(center.GetComponent<RectTransform>().DOScale(Vector3.one * 0.8f, 0.3f));
-        se.Join(center.GetComponent<RectTransform>().DOLocalMoveX(-43, 0.5f));
+        se.Join(center.GetComponent<RectTransform>().DOLocalMoveX(-43, 0.3f));
-        se.Join(left.GetComponent<RectTransform>().DOLocalMoveX(43, 0.5f));
+        se.Join(left.GetComponent<RectTransform>().DOLocalMoveX(43, 0.3f));
         var area = list[((currentIndex--) + list.Count) % list.Count];
         var centerArea = list[currentIndex + 1];
         left.GetComponent<NewRouteItemController>().Initial(area);
         if (currentIndex < 0) currentIndex = list.Count - 1;
-        se.Join(right.DOFade(1, 0.5f));
+        se.Join(right.DOFade(1, 0.3f));
-        se.Join(right.GetComponent<RectTransform>().DOScale(Vector3.one, 0.5f));
+        se.Join(right.GetComponent<RectTransform>().DOScale(Vector3.one, 0.3f));
-        se.Join(right.GetComponent<RectTransform>().DOLocalMoveX(0, 0.5f));
+        se.Join(right.GetComponent<RectTransform>().DOLocalMoveX(0, 0.3f));
         se.Play();
         right.transform.SetAsLastSibling();
         //事件改变

Assets/ExternalDependencyManager/Editor/1.2.168.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ccd268c2c2c420741bbf29cb19e4aada
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Images/NewDesign/bg_top_APP.png.meta

@@ -0,0 +1,128 @@
+fileFormatVersion: 2
+guid: 80e15f98ba047e042a1a7825f004da85
+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: iPhone
+    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/Images/NewDesign/icon_none.png.meta

@@ -0,0 +1,128 @@
+fileFormatVersion: 2
+guid: a1a24d26a55a3cd4382984833364e241
+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: iPhone
+    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/Images/zh/运动地球.png.meta

@@ -0,0 +1,128 @@
+fileFormatVersion: 2
+guid: ca65d10fe38382344b7c0d28114781e1
+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: iPhone
+    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/Common/Mobile/Loading.prefab

@@ -36,7 +36,7 @@ RectTransform:
   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: 360, y: 360}
+  m_SizeDelta: {x: 240, y: 240}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6067144360479621595
 CanvasRenderer:
@@ -87,3 +87,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 0cb3d6b847d2e034b9ba054d0220dc0d, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  newNav: {fileID: 0}

Assets/Resources/UI/Prefab/MainNav-mobile.prefab

@@ -53,9 +53,9 @@ RectTransform:
   - {fileID: 3068819108013337933}
   - {fileID: 8160864935934588695}
   - {fileID: 1409429025663639838}
+  - {fileID: 5976554196684205079}
   - {fileID: 4027836304468151454}
   - {fileID: 8382612560249065530}
-  - {fileID: 5976554196684205079}
   - {fileID: 4204578097682859198}
   - {fileID: 8763288661036287962}
   m_Father: {fileID: 0}
@@ -326,12 +326,12 @@ PrefabInstance:
     - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
@@ -561,12 +561,12 @@ PrefabInstance:
     - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
@@ -763,12 +763,12 @@ PrefabInstance:
     - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
@@ -843,7 +843,7 @@ PrefabInstance:
     - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
       propertyPath: m_RootOrder
-      value: 7
+      value: 8
       objectReference: {fileID: 0}
     - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
@@ -948,12 +948,12 @@ PrefabInstance:
     - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
@@ -1129,12 +1129,12 @@ PrefabInstance:
     - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
@@ -1335,12 +1335,12 @@ PrefabInstance:
     - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
@@ -1355,7 +1355,7 @@ PrefabInstance:
     - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -2
       objectReference: {fileID: 0}
     - target: {fileID: 8688565590564084001, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
@@ -1551,12 +1551,12 @@ PrefabInstance:
     - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
@@ -1737,12 +1737,12 @@ PrefabInstance:
     - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
@@ -2003,7 +2003,7 @@ PrefabInstance:
     - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
       propertyPath: m_RootOrder
-      value: 8
+      value: 9
       objectReference: {fileID: 0}
     - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
@@ -2108,12 +2108,12 @@ PrefabInstance:
     - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
@@ -2189,7 +2189,7 @@ PrefabInstance:
     - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
       propertyPath: m_RootOrder
-      value: 9
+      value: 7
       objectReference: {fileID: 0}
     - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
@@ -2289,12 +2289,12 @@ PrefabInstance:
     - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
@@ -2490,12 +2490,12 @@ PrefabInstance:
     - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}

Assets/Resources/UI/Prefab/MapList/MapItem-Mobile.prefab

@@ -621,7 +621,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.13725491, g: 0.13725491, b: 0.1764706, a: 0.8}
+  m_Color: {r: 0.20784314, g: 0.20784314, b: 0.2627451, a: 0.8}
   m_RaycastTarget: 1
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -953,7 +953,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 0, y: -187}
-  m_SizeDelta: {x: 216, y: 22}
+  m_SizeDelta: {x: 242, y: 22}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &5307116753344173196
 CanvasRenderer:
@@ -998,7 +998,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
   m_AnchoredPosition: {x: 28, y: 0}
-  m_SizeDelta: {x: 53, y: 20}
+  m_SizeDelta: {x: 56, y: 14}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &5307116753349857061
 CanvasRenderer:
@@ -1034,7 +1034,7 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 1
     m_MaxSize: 40
-    m_Alignment: 3
+    m_Alignment: 6
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 1
@@ -1149,7 +1149,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 82, y: 0}
+  m_AnchoredPosition: {x: 84, y: 0}
   m_SizeDelta: {x: 12, y: 12}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &5307116753709705167
@@ -1223,8 +1223,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 168, y: 0}
+  m_AnchoredPosition: {x: 172, y: 0}
-  m_SizeDelta: {x: 37, y: 20}
+  m_SizeDelta: {x: 56, y: 14}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &5307116753824956001
 CanvasRenderer:
@@ -1260,7 +1260,7 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 1
     m_MaxSize: 40
-    m_Alignment: 3
+    m_Alignment: 6
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 1
@@ -1301,7 +1301,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 152, y: 0}
+  m_AnchoredPosition: {x: 156, y: 0}
   m_SizeDelta: {x: 12, y: 12}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &5307116753827441512
@@ -1509,8 +1509,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 97, y: 0}
+  m_AnchoredPosition: {x: 100, y: 0}
-  m_SizeDelta: {x: 53, y: 20}
+  m_SizeDelta: {x: 56, y: 14}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &5307116754248337036
 CanvasRenderer:
@@ -1546,7 +1546,7 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 1
     m_MaxSize: 40
-    m_Alignment: 3
+    m_Alignment: 6
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 1
@@ -1763,7 +1763,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.20784314, g: 0.20784314, b: 0.2627451, a: 1}
+  m_Color: {r: 0.43137255, g: 0.43137255, b: 0.49019608, a: 1}
   m_RaycastTarget: 1
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -2045,7 +2045,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.20784314, g: 0.20784314, b: 0.2627451, a: 1}
+  m_Color: {r: 0.43137255, g: 0.43137255, b: 0.49019608, a: 1}
   m_RaycastTarget: 1
   m_Maskable: 1
   m_OnCullStateChanged:

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

@@ -74,6 +74,82 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &2192866306238927730
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7422125425058783314}
+  - component: {fileID: 1441639047239612962}
+  - component: {fileID: 8978434794956830459}
+  m_Layer: 5
+  m_Name: DescScroll
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7422125425058783314
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2192866306238927730}
+  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: 8784674041717051607}
+  m_Father: {fileID: 5526612272615142912}
+  m_RootOrder: 6
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: -112}
+  m_SizeDelta: {x: -20, y: -264}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1441639047239612962
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2192866306238927730}
+  m_CullTransparentMesh: 0
+--- !u!114 &8978434794956830459
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2192866306238927730}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Content: {fileID: 42032582894242611}
+  m_Horizontal: 0
+  m_Vertical: 1
+  m_MovementType: 1
+  m_Elasticity: 0.1
+  m_Inertia: 1
+  m_DecelerationRate: 0.135
+  m_ScrollSensitivity: 1
+  m_Viewport: {fileID: 8784674041717051607}
+  m_HorizontalScrollbar: {fileID: 0}
+  m_VerticalScrollbar: {fileID: 0}
+  m_HorizontalScrollbarVisibility: 2
+  m_VerticalScrollbarVisibility: 2
+  m_HorizontalScrollbarSpacing: -3
+  m_VerticalScrollbarSpacing: -3
+  m_OnValueChanged:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &2239030176411737966
 GameObject:
   m_ObjectHideFlags: 0
@@ -85,6 +161,7 @@ GameObject:
   - component: {fileID: 3894915989844421851}
   - component: {fileID: 7972066583884027716}
   - component: {fileID: 2330414139545757493}
+  - component: {fileID: 842054790776809710}
   m_Layer: 5
   m_Name: Desc
   m_TagString: Untagged
@@ -103,14 +180,14 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
-  m_Father: {fileID: 5526612272615142912}
+  m_Father: {fileID: 42032582894242611}
-  m_RootOrder: 6
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
+  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 50, y: 20}
+  m_AnchoredPosition: {x: 5, y: 0}
-  m_SizeDelta: {x: -70, y: -288}
+  m_SizeDelta: {x: 211, y: 0}
-  m_Pivot: {x: 0, y: 0}
+  m_Pivot: {x: 0, y: 1}
 --- !u!222 &7972066583884027716
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -152,6 +229,20 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: 
+--- !u!114 &842054790776809710
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2239030176411737966}
+  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!1 &3691317595522851050
 GameObject:
   m_ObjectHideFlags: 0
@@ -370,8 +461,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 15, y: -236}
+  m_AnchoredPosition: {x: 0, y: -212}
-  m_SizeDelta: {x: 211, y: 22}
+  m_SizeDelta: {x: 230, y: 22}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &1713212118604465205
 CanvasRenderer:
@@ -496,7 +587,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &4575540577362706356
 RectTransform:
   m_ObjectHideFlags: 0
@@ -1105,7 +1196,7 @@ MonoBehaviour:
   m_Padding:
     m_Left: 0
     m_Right: 0
-    m_Top: 0
+    m_Top: 6
     m_Bottom: 0
   m_ChildAlignment: 0
   m_StartCorner: 0
@@ -1210,8 +1301,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 10, y: -10}
+  m_AnchoredPosition: {x: 10, y: -4}
-  m_SizeDelta: {x: -20, y: -20}
+  m_SizeDelta: {x: -20, y: -14}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &5526612272606031881
 CanvasRenderer:
@@ -1273,7 +1364,6 @@ GameObject:
   m_Component:
   - component: {fileID: 5526612272615142912}
   - component: {fileID: 5526612272615142942}
-  - component: {fileID: 2968433541682090128}
   - component: {fileID: 6368635270485513067}
   m_Layer: 5
   m_Name: Left
@@ -1299,7 +1389,7 @@ RectTransform:
   - {fileID: 5526612272636430230}
   - {fileID: 5526612272941488697}
   - {fileID: 5526612272165583874}
-  - {fileID: 3894915989844421851}
+  - {fileID: 7422125425058783314}
   - {fileID: 5778423490206480944}
   - {fileID: 3790473409329199100}
   - {fileID: 330365734832415941}
@@ -1309,7 +1399,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 281, y: 0}
+  m_SizeDelta: {x: 250, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &5526612272615142942
 CanvasRenderer:
@@ -1319,35 +1409,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5526612272615142915}
   m_CullTransparentMesh: 0
---- !u!114 &2968433541682090128
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5526612272615142915}
-  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: 0.13725491, g: 0.13725491, b: 0.1764706, a: 0.8}
-  m_RaycastTarget: 1
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 0}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
 --- !u!114 &6368635270485513067
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1466,8 +1527,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 50, y: -178}
+  m_AnchoredPosition: {x: 10, y: -154}
-  m_SizeDelta: {x: 211, y: 48}
+  m_SizeDelta: {x: 230, y: 48}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &5526612272636430228
 CanvasRenderer:
@@ -1520,6 +1581,8 @@ GameObject:
   m_Component:
   - component: {fileID: 5526612272745412623}
   - component: {fileID: 5526612272745412621}
+  - component: {fileID: 1369733520845916388}
+  - component: {fileID: 4454756389916793965}
   m_Layer: 5
   m_Name: Container
   m_TagString: Untagged
@@ -1540,13 +1603,14 @@ RectTransform:
   m_Children:
   - {fileID: 5526612272615142912}
   - {fileID: 5526612273599596600}
+  - {fileID: 4145096425839109525}
   m_Father: {fileID: 9155624476384996310}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMin: {x: 0.5, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_SizeDelta: {x: 764, y: -10}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &5526612272745412621
 CanvasRenderer:
@@ -1556,6 +1620,49 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5526612272745412622}
   m_CullTransparentMesh: 0
+--- !u!114 &1369733520845916388
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5526612272745412622}
+  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: 0.13725491, g: 0.13725491, b: 0.1764706, a: 0.8}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &4454756389916793965
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5526612272745412622}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 109c41f08973846429af681aea0a30c4, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  r: {x: 20, y: 20, z: 0, w: 0}
+  rect2props: {x: 0.000061035156, y: -10, z: 259.5082, w: 259.5082}
 --- !u!1 &5526612272941488696
 GameObject:
   m_ObjectHideFlags: 0
@@ -1593,7 +1700,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -10, y: -74}
+  m_AnchoredPosition: {x: -10, y: -10}
   m_SizeDelta: {x: 0, y: 14}
   m_Pivot: {x: 1, y: 1}
 --- !u!222 &5526612272941488695
@@ -1770,8 +1877,6 @@ GameObject:
   m_Component:
   - component: {fileID: 5526612273599596600}
   - component: {fileID: 5526612273599596601}
-  - component: {fileID: 793280911815898427}
-  - component: {fileID: 953103594924131267}
   m_Layer: 5
   m_Name: Right
   m_TagString: Untagged
@@ -1796,8 +1901,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 291, y: -10}
+  m_AnchoredPosition: {x: 251, y: 0}
-  m_SizeDelta: {x: 513, y: -10}
+  m_SizeDelta: {x: 513, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &5526612273599596601
 CanvasRenderer:
@@ -1807,49 +1912,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5526612273599596603}
   m_CullTransparentMesh: 0
---- !u!114 &793280911815898427
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5526612273599596603}
-  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: 0.13725491, g: 0.13725491, b: 0.1764706, a: 0.8}
-  m_RaycastTarget: 1
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 0}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
---- !u!114 &953103594924131267
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5526612273599596603}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 109c41f08973846429af681aea0a30c4, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  r: {x: 20, y: 20, z: 0, w: 0}
-  rect2props: {x: 0.000015258789, y: -10.000015, z: 170.7663, w: 170.7663}
 --- !u!1 &5526612273750354113
 GameObject:
   m_ObjectHideFlags: 0
@@ -1956,8 +2018,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 50, y: -54}
+  m_AnchoredPosition: {x: 10, y: -10}
-  m_SizeDelta: {x: 130, y: 86}
+  m_SizeDelta: {x: 160, y: 106}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &5526612273772399088
 CanvasRenderer:
@@ -2248,7 +2310,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 242.5, y: -116.5}
+  m_AnchoredPosition: {x: 212, y: -54}
   m_SizeDelta: {x: 19, y: 17}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &2453552088492445910
@@ -2362,6 +2424,95 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &7422954580519245607
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8784674041717051607}
+  - component: {fileID: 1645100082002518108}
+  - component: {fileID: 4977025431586088799}
+  - component: {fileID: 409416936031330657}
+  m_Layer: 5
+  m_Name: Viewport
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8784674041717051607
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7422954580519245607}
+  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: 42032582894242611}
+  m_Father: {fileID: 7422125425058783314}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0, y: 1}
+--- !u!222 &1645100082002518108
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7422954580519245607}
+  m_CullTransparentMesh: 0
+--- !u!114 &4977025431586088799
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7422954580519245607}
+  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: 10917, guid: 0000000000000000f000000000000000, type: 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 &409416936031330657
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7422954580519245607}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_ShowMaskGraphic: 0
 --- !u!1 &8192472598482676617
 GameObject:
   m_ObjectHideFlags: 0
@@ -2506,6 +2657,157 @@ MonoBehaviour:
   m_ChildControlHeight: 0
   m_ChildScaleWidth: 0
   m_ChildScaleHeight: 0
+--- !u!1 &8639126074118007320
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 42032582894242611}
+  - component: {fileID: 6988587361511480002}
+  - component: {fileID: 2645726034277478883}
+  m_Layer: 5
+  m_Name: Content
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &42032582894242611
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8639126074118007320}
+  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: 3894915989844421851}
+  m_Father: {fileID: 8784674041717051607}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0, y: 1}
+--- !u!114 &6988587361511480002
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8639126074118007320}
+  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 &2645726034277478883
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8639126074118007320}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 5
+    m_Right: 5
+    m_Top: 5
+    m_Bottom: 5
+  m_ChildAlignment: 0
+  m_Spacing: 0
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+--- !u!1 &8764234698560013687
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4145096425839109525}
+  - component: {fileID: 3077769259701813193}
+  - component: {fileID: 5336817673869588156}
+  m_Layer: 5
+  m_Name: Line
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4145096425839109525
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8764234698560013687}
+  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: 5526612272745412623}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 250, y: 0}
+  m_SizeDelta: {x: 1, y: -20}
+  m_Pivot: {x: 0, y: 0.5}
+--- !u!222 &3077769259701813193
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8764234698560013687}
+  m_CullTransparentMesh: 0
+--- !u!114 &5336817673869588156
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8764234698560013687}
+  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: 0.23921569, g: 0.24313726, b: 0.3019608, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &9155624476384996305
 GameObject:
   m_ObjectHideFlags: 0
@@ -3676,15 +3978,15 @@ PrefabInstance:
     - {fileID: 7793409217181307314, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3}
     - {fileID: 829206726517620079, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3}
   m_SourcePrefab: {fileID: 100100000, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3}
---- !u!1 &8210619403058349571 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 2638424933752433026, guid: a1999d0576fee6248a9c5a507ae8d10e,
-    type: 3}
-  m_PrefabInstance: {fileID: 6155413159602679681}
-  m_PrefabAsset: {fileID: 0}
 --- !u!224 &8210619403058349570 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e,
     type: 3}
   m_PrefabInstance: {fileID: 6155413159602679681}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &8210619403058349571 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 2638424933752433026, guid: a1999d0576fee6248a9c5a507ae8d10e,
+    type: 3}
+  m_PrefabInstance: {fileID: 6155413159602679681}
+  m_PrefabAsset: {fileID: 0}

Assets/Resources/UI/language.json

@@ -40,7 +40,7 @@
     "Please Connect  Device！": "请连接设备",
     "OK": "好的",
     "Total Climbed": "累计爬升",
-    "Other Account": "切换账号",
+    "Other Account": "添加账号",
     "Ranking": "排名",
     "Close Gate:": "倒计时：",
     "RANK": "排名",
@@ -117,20 +117,20 @@
     "Year": "年",
     "Gender": "性别",
     "Units": "单位",
-    "FTP": "FTP",
+    "FTP": "FTP(W)",
     "Please enter your FTP": "请输入您的FTP",
-    "Weight": "体重",
+    "Weight": "体重(KG)",
     "Please enter your weight": "请输入您的体重",
-    "Height": "身高",
+    "Height": "身高(CM)",
     "Please enter your height": "请输入您的身高",
-    "Max heart rate": "最大心率",
+    "Max heart rate": "最大心率(BPM)",
-    "Max Heart Rate": "最大心率",
+    "Max Heart Rate": "最大心率(BPM)",
     "Please enter your MHR": "请输入您的最大心率",
-    "Bike weight": "车重",
+    "Bike weight": "车重(KG)",
-    "Bike Weight": "车重",
+    "Bike Weight": "车重(KG)",
     "Please enter your BW": "请输入您的车重",
-    "Wheel diameter": "轮径",
+    "Wheel diameter": "轮径(MM)",
-    "Wheel Diameter": "轮径",
+    "Wheel Diameter": "轮径(MM)",
     "Please enter your WD": "请输入您的轮径",
     "DELIVERY INFO": "收货信息",
     "Please enter your name": "请输入您的姓名",
@@ -148,7 +148,7 @@
     "We sincerely look forward to receiving your suggestions......": "我们真诚的希望收到您的建议......",
     "Submit": "提交",
     "RACE": "比赛",
-    "WEIGHT": "体重",
+    "WEIGHT": "体重(KG)",
     "FTP/KG": "功体比",
     "Total Calories Burned": "累计消耗",
     "Phone/E-mail": "手机号/邮箱",
@@ -157,7 +157,7 @@
     "Logout": "注销",
     "Do you want to log out and change accounts?": "您要注销并更改帐户吗？",
     "Forget password?": "忘记密码?",
-    "or you can join with": "或者使用如下账号登录",
+    "or you can join with": "其他登录方式",
     "Difficulty": "难度",
     "FLAT": "平路",
     "Favorite": "收藏",
@@ -178,10 +178,10 @@
     "Total Rides": "骑行次数",
     "Total Riding Time": "骑行时间",
     "times": "次",
-    "hours": "H",
+    "hours": "小时",
-    "KCAL": "KCAL",
+    "KCAL": "千卡",
-    "M": "M",
+    "M": "米",
-    "KM": "KM",
+    "KM": "千米",
     "TRAINING DIARY": "骑行记录",
     "Downloaded": "下载进度",
     "Update Now": "立即更新",
@@ -219,7 +219,7 @@
     "You're almost done.": "马上完成",
     "Just a little more info to set up your account.": "设置一些额外的账号信息",
     "Already a member?": "老用户?",
-    "Or you can continue with": "或者使用如下账号登录",
+    "Or you can continue with": "其他登录方式",
     "Not a member?": "还未注册？",
     "RESET PASSWORD": "重置密码",
     "Create Race": "创建赛事",
@@ -292,9 +292,9 @@
     "User refusal of authorisation": "用户拒绝授权",
     "User deauthorisation": "用户取消授权",
     "COLLECTIONS": "集合",
-    "CONTINUOUS": "累计骑行",
+    "CONTINUOUS": "连续骑行",
-    "DISTANCE": "距离",
+    "DISTANCE": "阶段里程(KM)",
-    "CARLORIES": "卡路里",
+    "CARLORIES": "卡路里(KCAL)",
     "DAY": "天",
     "DAYS": "天",
     "VIEW1": "查看",
@@ -302,7 +302,11 @@
     "Competition Time": "比赛时间",
     "View All": "查看全部",
     "ABOUT": "简介",
-    "No Net": "无网络"
+    "No Net": "无网络",
+    "PERFECT INFORMATION": "完善信息",
+    "Distance King": "里程王",
+    "Power King": "功率王",
+    "Climbing King": "爬坡王"
   },
   "en": {
     "HOT ROUTES": "HOT ROUTES",
@@ -421,17 +425,18 @@
     "Year": "Year",
     "Gender": "Gender",
     "Units": "Units",
-    "FTP": "Units",
+    "FTP": "FTP(W)",
     "Please enter your FTP": "Please enter your FTP",
-    "Weight": "Weight",
+    "Weight": "Weight(KG)",
     "Please enter your weight": "Please enter your weight",
-    "Height": "Height",
+    "Height": "Height(CM)",
     "Please enter your height": "Please enter your height",
-    "Max heart rate": "Max heart rate",
+    "Max heart rate": "Max heart rate(BPM)",
+    "Max Heart Rate": "Max Heart Rate(BPM)",
     "Please enter your MHR": "Please enter your MHR",
-    "Bike weight": "Bike weight",
+    "Bike weight": "Bike weight(KG)",
     "Please enter your BW": "Please enter your BW",
-    "Wheel diameter": "Wheel diameter",
+    "Wheel diameter": "Wheel diameter(MM)",
     "Please enter your WD": "Please enter your WD",
     "DELIVERY INFO": "DELIVERY INFO",
     "Please enter your name": "Please enter your name",
@@ -449,7 +454,7 @@
     "We sincerely look forward to receiving your suggestions......": "We sincerely look forward to receiving your suggestions......",
     "Submit": "Submit",
     "RACE": "RACE",
-    "WEIGHT": "WEIGHT",
+    "WEIGHT": "WEIGHT(KG)",
     "FTP/KG": "FTP/KG",
     "Total Calories Burned": "Total Calories Burned",
     "Phone/E-mail": "Phone/E-mail",
@@ -598,6 +603,10 @@
     "Competition Time": "Competition Time",
     "View All": "View All",
     "ABOUT": "ABOUT",
-    "No Net": "No Net"
+    "No Net": "No Net",
+    "PERFECT INFORMATION": "PERFECT INFORMATION",
+    "Distance King": "Distance King",
+    "Power King": "Power King",
+    "Climbing King": "Climbing King"
   }
 }

Assets/Scripts/Apis/Models/UserResultModel.cs

@@ -74,5 +74,8 @@ namespace Assets.Scripts.Apis.Models
         public DateTime UpdateTime { get; set; }
         public string WebHost { get; set; }//创建比赛url
         public bool CanCreateRace { get; set; }//是否可以创建比赛
+        //第三方userid
+        public string AppleUserId { get; set; }
+        public string FacebookUserId { get; set; }
     }
 }

Assets/Scripts/Scenes/LoginController.cs

@@ -762,6 +762,7 @@ public class LoginController : BaseScene
                 wxLogin3.Find("NickName").GetComponent<Text>().text = wxInfoJson.Value<string>("nickname");
                 pageNums = 5;
                 //this.goSign();
+                PerfectInfo();
                 StartScrollPanel(2);
             }
             else
@@ -1120,6 +1121,7 @@ public class LoginController : BaseScene
         if (wxLogin2.gameObject.activeSelf) wxLogin2.gameObject.SetActive(false);
         //if (wxLogin3.gameObject.activeSelf) wxLogin3.gameObject.SetActive(false);
         pageNums = 4;
+        signType = 0;
 #if !(UNITY_ANDROID || UNITY_IOS)
         if (wxLogin1.transform.localPosition.y == 0) 
         {
@@ -1254,6 +1256,18 @@ public class LoginController : BaseScene
     {
         return signType > 0;
     }
+    void PerfectInfo() 
+    {
+        var txt = transform.Find("Panel/LoginContainer/LoginScrollView/Viewport/Content/FormContainer-Sign/signText").GetComponent<Text>();
+        if (isThird())
+        {
+            txt.text = App.GetLocalString("PERFECT INFORMATION");
+        }
+        else 
+        {
+            txt.text = App.GetLocalString("SIGN UP");
+        }
+    }
     /// <summary>
     /// 
     /// </summary>
@@ -1272,6 +1286,7 @@ public class LoginController : BaseScene
 #endif
             signPage1.Find("signThird").gameObject.SetActive(true);
             ShowPassword();
+            PerfectInfo();
             this.StartScrollPanel(3);
             this.StartScrollSign(0);
         }
@@ -1280,10 +1295,6 @@ public class LoginController : BaseScene
             if (type == 0)
             {
                 pageNums = 4;
-                if (signType < 2) 
-                {
-                    signType = 0;
-                }
                 signContainer.Find("signText").GetComponent<Text>().text = App.GetLocalString("SIGN UP");
                 wxLogin2.gameObject.SetActive(false);
                 signPage1.Find("next").gameObject.SetActive(true);
@@ -1291,6 +1302,7 @@ public class LoginController : BaseScene
                 signPage1.Find("previousThird").gameObject.SetActive(false);
                 signPage1.Find("signThird").gameObject.SetActive(false);
                 ShowPassword();
+                PerfectInfo();
                 this.StartScrollPanel(2);
                 this.StartScrollSign(0);
             }

Assets/Scripts/Scenes/MainController.cs

@@ -86,7 +86,7 @@ public class MainController : BaseScene
         msgs = List<CanvasGroup> { msg, msg2, msg3 };
         rightMessage = transform.Find("GameObject/MessageRight").GetComponent<CanvasGroup>();
 #else
-        msgLocation = new Vector3(168, 37, 0);
+        msgLocation = new Vector3(168, 37-80, 0);
         var go = transform.Find("GameObject");
         go.GetComponent<RectTransform>().anchorMin = Vector2.zero;
         go.GetComponent<RectTransform>().anchorMax = Vector2.one;
@@ -102,7 +102,7 @@ public class MainController : BaseScene
         rightMessage.transform.localPosition = 1 * msgLocation;
         rightMessage.alpha = 0;
         msgs = new List<CanvasGroup> { rightMessage };
-        for (int i = 0; i < 5; i++) 
+        for (int i = 0; i < 3; i++) 
         {
             var tmpm = Instantiate<CanvasGroup>(rightMessage);
             tmpm.transform.SetParent(rightMessage.transform.parent);
@@ -172,9 +172,9 @@ public class MainController : BaseScene
     }
     private void DoMessage6(LinkedMessageEvent e)
     {
-        var selectIndex = msgIndex % 6;
+        var selectIndex = msgIndex % 4;
         var m = msgs[selectIndex];
-        if (msgIndex >= 6) //
+        if (msgIndex >= 4) //
         {
             //msgIndex = 0;
             Sequence se = DOTween.Sequence();
@@ -363,7 +363,7 @@ public class MainController : BaseScene
         UIManager.UpdateJoinCompetition();//查询当前我参加的赛事
     }
 
-    float maxt = 0f; //用于获取全服最值内容
+
     float emptyt = 0;//用于无消息计时
     float t = 1f;
     float scanTicks = 0;
@@ -430,54 +430,36 @@ public class MainController : BaseScene
                 //距离50
                 if (item.EndDistance >= 50)
                 {
-                    var message = lang == "zh" ? $"骑行里程突破<color=#e3d427>{"50KM"}</color>！" : $"riding distance reaches <color=#e3d427>{"50KM"}</color>!";
+                    var message = lang == "zh" ? $"骑行里程达到<color=#e3d427>{"50KM"}</color>！" : $"riding distance reaches <color=#e3d427>{"50KM"}</color>!";
                     EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name, item.RouteName), $"{item.RouteId}{item.Name}50KM");
                 }
                 //距离100
                 if (item.EndDistance >= 100)
                 {
-                    var message = lang == "zh" ? $"骑行里程突破<color=#e3d427>{"100KM"}</color>！" : $"riding distance reaches <color=#e3d427>{"100KM"}</color>!";
+                    var message = lang == "zh" ? $"骑行里程达到<color=#e3d427>{"100KM"}</color>！" : $"riding distance reaches <color=#e3d427>{"100KM"}</color>!";
                     EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name, item.RouteName), $"{item.RouteId}{item.Name}100KM");
                 }
                 //速度35
                 if (item.Speed >= 35)
                 {
-                    var message = lang == "zh" ? $"骑行速度突破<color=#e3d427>{Math.Round(item.Speed, 2)}KM/H</color>！" : $"riding speed reaches <color=#e3d427>{Math.Round(item.Speed, 2)}KM/H</color>!";
+                    var message = lang == "zh" ? $"骑行速度达到<color=#e3d427>{Math.Round(item.Speed, 2)}KM/H</color>！" : $"riding speed reaches <color=#e3d427>{Math.Round(item.Speed, 2)}KM/H</color>!";
                     EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name, item.RouteName), $"{item.RouteId}{item.Name}35KM/H");
                 }
                 //速度50
                 if (item.Speed >= 50)
                 {
-                    var message = lang == "zh" ? $"骑行速度突破<color=#e3d427>{Math.Round(item.Speed,2)}KM/H</color>！" : $"riding speed reaches <color=#e3d427>{Math.Round(item.Speed, 2)}KM/H</color>!";
+                    var message = lang == "zh" ? $"骑行速度达到<color=#e3d427>{Math.Round(item.Speed,2)}KM/H</color>！" : $"riding speed reaches <color=#e3d427>{Math.Round(item.Speed, 2)}KM/H</color>!";
                     EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name, item.RouteName), $"{item.RouteId}{item.Name}50KM/H");
                 }
                 //功体比
                 if (item.WeightKg >= 3)
                 {
-                    var message = lang == "zh" ? $"骑行功体比突破<color=#e3d427>{Math.Round(item.WeightKg, 2)}w/kg</color>！" : $" riding PWR reaches <color=#e3d427>{Math.Round(item.WeightKg, 2)}w/kg</color>!";
+                    var message = lang == "zh" ? $"骑行功体比达到<color=#e3d427>{Math.Round(item.WeightKg, 2)}w/kg</color>！" : $" riding PWR reaches <color=#e3d427>{Math.Round(item.WeightKg, 2)}w/kg</color>!";
                     EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name, item.RouteName), $"{item.RouteId}{item.Name}3WeightKg");
                 }
             }
         }
-        maxt -= Time.deltaTime;
+        
-        if (maxt <= 0) 
-        {
-            GetMaxRanking();
-            
-            maxt += 60f;
-        }
-    }
-
-    private async void GetMaxRanking()
-    {
-        var res = await ConfigHelper.mapApi.GetMaxRanking();
-        if (res.result) 
-        {
-            foreach (var item in res.data) 
-            {
-                EventQueueSystem.QueueEvent(new LinkedMessageEvent(-1, item.Message, item.WxHeadImg, item.NickName,null));
-            }
-        }
     }
 
     

Assets/Scripts/UI/Prefab/NewMainNav.cs

@@ -91,14 +91,6 @@ public class NewMainNav : MonoBehaviour
                 {
                     item.gameObject.SetActive(false);
                 }
-                else if (item.name == "Custom") 
-                {
-                    item.gameObject.SetActive(custom != null && types.Contains(item.name));
-                }
-                else if (item.name == "Custom2")
-                {
-                    item.gameObject.SetActive(custom2 != null && types.Contains(item.name));
-                }
                 else
                 {
                     item.gameObject.SetActive(types.Contains(item.name));
@@ -108,7 +100,15 @@ public class NewMainNav : MonoBehaviour
             {
                 item.gameObject.SetActive(item.name == "PF"|| item.name == shrinkName);
             }
-            
+            //自定义按钮出来
+            if (item.name == "Custom")
+            {
+                item.gameObject.SetActive(custom != null && types.Contains(item.name));
+            }
+            else if (item.name == "Custom2")
+            {
+                item.gameObject.SetActive(custom2 != null && types.Contains(item.name));
+            }
         }
     }
 

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

@@ -246,10 +246,10 @@ public class HomeController : PFUIPanel
         {
             Utils.DisplayHead(todayData.Find("Avatar").GetComponent<RawImage>(), App.CurrentUser.WxHeadImg);
             todayData.Find("Datas/Distance/Value").GetComponent<Text>().text = $"{summary.ContinuesDay}"+ (summary.ContinuesDay > 1 ? App.GetLocalString("DAYS") : App.GetLocalString("DAY"));
-            todayData.Find("Datas/Climb/Value").GetComponent<Text>().text = $"{summary.ContinuesKm.ToString("#0")}KM";//$"{double.Parse(summary.TotalClimb, CultureInfo.InvariantCulture).ToString("0")}M";
+            todayData.Find("Datas/Climb/Value").GetComponent<Text>().text = $"{summary.ContinuesKm.ToString("#0.0")}";//$"{double.Parse(summary.TotalClimb, CultureInfo.InvariantCulture).ToString("0")}M";
-            todayData.Find("Datas/Carlories/Value").GetComponent<Text>().text = $"{summary.ContinuesKcal.ToString("#0")}KCAL";
+            todayData.Find("Datas/Carlories/Value").GetComponent<Text>().text = $"{summary.ContinuesKcal.ToString("#0")}";
             //todayData.Find("Datas/Distance/Rank").GetComponent<Text>().text = summary.CurrentTotalDistance == 0 ? "——" : $"+{summary.CurrentTotalDistance.ToString("#0")}";
-            todayData.Find("Datas/Climb/Rank").GetComponent<Text>().text = summary.CurrentTotalDistance == 0 ? "——" : $"+{summary.CurrentTotalDistance.ToString("#0")}";
+            todayData.Find("Datas/Climb/Rank").GetComponent<Text>().text = summary.CurrentTotalDistance == 0 ? "——" : $"+{summary.CurrentTotalDistance.ToString("#0.0")}";
             todayData.Find("Datas/Carlories/Rank").GetComponent<Text>().text = summary.CurrentTotalKcal == 0 ? "——" : $"+{summary.CurrentTotalKcal.ToString("#0")}";
         }
         
@@ -282,12 +282,38 @@ public class HomeController : PFUIPanel
         //    Utils.showToast(gameObject, res.errMsg);
         //}
     }
+    float maxt = 0f; //用于获取全服最值内容
     // Update is called once per frame
     void Update()
     {
-        
+        maxt -= Time.deltaTime;
+        if (maxt <= 0)
+        {
+            GetMaxRanking();
+            maxt += 60f;
+        }
+    }
+    private async void GetMaxRanking()
+    {
+        var res = await ConfigHelper.mapApi.GetMaxRanking();
+        if (res.result)
+        {
+            var list = res.data;
+            if (list.Count >= 3) 
+            {
+                Transform p = transform.Find("MaxRankingData/Power"),
+                d = transform.Find("MaxRankingData/Distance"),
+                c = transform.Find("MaxRankingData/Climb");
+                Utils.DisplayHead(p.Find("Avatar").GetComponent<RawImage>(), list[1].WxHeadImg);
+                Utils.DisplayHead(d.Find("Avatar").GetComponent<RawImage>(), list[0].WxHeadImg);
+                Utils.DisplayHead(c.Find("Avatar").GetComponent<RawImage>(), list[2].WxHeadImg);
+                p.Find("NickName").GetComponent<Text>().text = list[1].NickName;
+                d.Find("NickName").GetComponent<Text>().text = list[0].NickName;
+                c.Find("NickName").GetComponent<Text>().text = list[2].NickName;
+            }
+            
+        }
     }
-
     public override void Show()
     {
         base.Show();

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

@@ -34,18 +34,22 @@ public class MapListExtraController : PFUIPanel
 #else
         tmpCollectItem = Resources.Load<Transform>("UI/Prefab/NewRoute/RouteItem");
 #endif
-        UIManager.AddEvent(typeSelector.Find("Route").gameObject, EventTriggerType.PointerClick, b =>
+        UIManager.AddEvent(typeSelector.Find("Container/Route").gameObject, EventTriggerType.PointerClick, b =>
         {
-            typeSelector.Find("Route").GetComponent<Text>().color = Utils.HexToColorHtml("#ffffff");
+            typeSelector.Find("Container/Route").GetComponent<Text>().color = Utils.HexToColorHtml("#ffffff");
-            typeSelector.Find("Collection").GetComponent<Text>().color = Utils.HexToColorHtml("#5c5c6e");
+            typeSelector.Find("Container1/Collection").GetComponent<Text>().color = Utils.HexToColorHtml("#5c5c6e");
+            typeSelector.Find("Container/Line").gameObject.SetActive(true);
+            typeSelector.Find("Container1/Line").gameObject.SetActive(false);
             p1.DOLocalMoveX(p1originx, 0.5f);
             p2.DOLocalMoveX(p2originx, 0.5f);
             transform.Find("Tmp/MainNav-mobile").GetComponent<NewMainNav>().ShowButton("Custom");
         });
-        UIManager.AddEvent(typeSelector.Find("Collection").gameObject, EventTriggerType.PointerClick, b =>
+        UIManager.AddEvent(typeSelector.Find("Container1/Collection").gameObject, EventTriggerType.PointerClick, b =>
         {
-            typeSelector.Find("Route").GetComponent<Text>().color = Utils.HexToColorHtml("#5c5c6e");
+            typeSelector.Find("Container/Route").GetComponent<Text>().color = Utils.HexToColorHtml("#5c5c6e");
-            typeSelector.Find("Collection").GetComponent<Text>().color = Utils.HexToColorHtml("#ffffff");
+            typeSelector.Find("Container1/Collection").GetComponent<Text>().color = Utils.HexToColorHtml("#ffffff");
+            typeSelector.Find("Container/Line").gameObject.SetActive(false);
+            typeSelector.Find("Container1/Line").gameObject.SetActive(true);
             p1.DOLocalMoveX(p1originx - 764f, 0.5f);
             p2.DOLocalMoveX(p2originx - 764f, 0.5f);
             transform.Find("Tmp/MainNav-mobile").GetComponent<NewMainNav>().HideButton("Custom");
@@ -82,8 +86,10 @@ public class MapListExtraController : PFUIPanel
         }
         p1.localPosition = new Vector3(p1originx, p1.localPosition.y, p1.localPosition.z);
         p2.localPosition = new Vector3(p2originx, p2.localPosition.y, p2.localPosition.z);
-        typeSelector.Find("Route").GetComponent<Text>().color = Utils.HexToColorHtml("#ffffff");
+        typeSelector.Find("Container/Route").GetComponent<Text>().color = Utils.HexToColorHtml("#ffffff");
-        typeSelector.Find("Collection").GetComponent<Text>().color = Utils.HexToColorHtml("#5c5c6e");
+        typeSelector.Find("Container1/Collection").GetComponent<Text>().color = Utils.HexToColorHtml("#5c5c6e");
+        typeSelector.Find("Container/Line").gameObject.SetActive(true);
+        typeSelector.Find("Container1/Line").gameObject.SetActive(false);
         transform.Find("Tmp/MainNav-mobile").GetComponent<NewMainNav>().ShowButton("Custom");
     }
     private async void GetList() 

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

@@ -147,7 +147,7 @@ public class NewRouteDetailController : PFUIPanel
             .text = string.Empty;
         transform.Find("Container/Left/Infos/SlopeContainer/Text").GetComponent<Text>()
             .text = string.Empty;
-        transform.Find("Container/Left/Desc").GetComponent<Text>()
+        transform.Find("Container/Left/DescScroll/Viewport/Content/Desc").GetComponent<Text>()
             .text = string.Empty;
         if (area.CoverImage != null) 
         {
@@ -253,8 +253,9 @@ public class NewRouteDetailController : PFUIPanel
                 .text = $"{res.data.TotalClimb.ToString("#0")}M";
             transform.Find("Container/Left/Infos/SlopeContainer/Text").GetComponent<Text>()
                 .text = $"{res.data.AverageGrade.ToString("#0.00")}%";
-            transform.Find("Container/Left/Desc").GetComponent<Text>()
+            transform.Find("Container/Left/DescScroll/Viewport/Content/Desc").GetComponent<Text>()
                 .text = res.data.Description;
+            LayoutRebuilder.ForceRebuildLayoutImmediate(transform.Find("Container/Left/DescScroll").GetComponent<ScrollRect>().content);
             transform.Find("Container/Left/Fav").GetComponent<Image>().sprite = FavDict[res.data.IsFav];
             LayoutRebuilder.ForceRebuildLayoutImmediate(transform.Find("Container/Left/RideContainer").GetComponent<RectTransform>());
         }

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

@@ -112,9 +112,9 @@ public class UserInfoController : PFUIPanel
 #if UNITY_IOS || UNITY_ANDROID
             infoPanel.Find("Container/Ftp").Find("Value").GetComponent<Text>().text = user.FTP.ToString();
             infoPanel.Find("Container/MHR").Find("Value").GetComponent<Text>().text = user.MaxHeartRate.ToString();
-            infoPanel.Find("Container/Weight").Find("Value").GetComponent<Text>().text = $"{user.Weight}KG";
+            infoPanel.Find("Container/Weight").Find("Value").GetComponent<Text>().text = $"{user.Weight}";
-            infoPanel.Find("Container/BW").Find("Value").GetComponent<Text>().text = $"{user.BicycleWeight}KG";
+            infoPanel.Find("Container/BW").Find("Value").GetComponent<Text>().text = $"{user.BicycleWeight}";
-            infoPanel.Find("Container/WD").Find("Value").GetComponent<Text>().text = $"{user.WheelDiameter}MM";
+            infoPanel.Find("Container/WD").Find("Value").GetComponent<Text>().text = $"{user.WheelDiameter}";
             infoPanel.Find("Container/Ftp").Find("Time").GetComponent<Text>().text = user.LastUpdateFtpTime.ToLocalString("dd-MM-yyyy");
             infoPanel.Find("Container/Weight").Find("Time").GetComponent<Text>().text = user.LastUpdateWeightTime.ToLocalString("dd-MM-yyyy");
             infoPanel.Find("Container/BW").Find("Time").GetComponent<Text>().text = user.LastUpdateBicycleWeightTime.ToLocalString("dd-MM-yyyy");

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

@@ -255,6 +255,9 @@ public class RaceListScript : RaceScript
                 mc.gameObject.SetActive(true);
                 mc.GetComponent<CanvasGroup>().alpha = 0;
                 mc.GetComponent<CanvasGroup>().DOFade(1, 0.3f);
+            }),custom2:new NewMainNav.CustomButton(Resources.Load<Sprite>("Images/Race/back up"),()=> 
+            {
+                UIManager.ShowPrePanel();
             }));
         newNav = nav;
 #else

ProjectSettings/AndroidResolverDependencies.xml

@@ -22,7 +22,7 @@
     <setting name="packageDir" value="Assets/Plugins/Android" />
     <setting name="patchAndroidManifest" value="True" />
     <setting name="patchMainTemplateGradle" value="True" />
-    <setting name="projectExportEnabled" value="False" />
+    <setting name="projectExportEnabled" value="True" />
     <setting name="useJetifier" value="False" />
   </settings>
 </dependencies>