工具栏问题修改，中文

# Conflicts:
#	Assets/Resources/UI/language.json

Assets/BannerController.cs

@@ -15,6 +15,7 @@ public class BannerController : MonoBehaviour
     private List<Vector3> standardPositions;
     private List<Recommand> list;
     private int currentIndex = 1;
+    private Dictionary<string, Texture> caches;
     void Awake()
     {
         itemList = new List<CanvasGroup>
@@ -23,6 +24,7 @@ public class BannerController : MonoBehaviour
             transform.Find("2").GetComponent<CanvasGroup>(),
             transform.Find("3").GetComponent<CanvasGroup>()
         };
+        caches = new Dictionary<string, Texture>();
         standardPositions = new List<Vector3>
         {
             transform.Find("1").localPosition,transform.Find("2").localPosition,transform.Find("3").localPosition
@@ -101,7 +103,7 @@ public class BannerController : MonoBehaviour
         };
         TouchKit.addGestureRecognizer(pan);
     }
-
+    int sIndex = 0, eIndex = 2;
     private void Start()
     {
         GetList();
@@ -113,6 +115,7 @@ public class BannerController : MonoBehaviour
         {
             if (res.data.Count >= 3)
             {
+                sIndex = 0;eIndex = 2;
                 Initial(res.data);
                 gameObject.SetActive(true);
             }
@@ -130,7 +133,7 @@ public class BannerController : MonoBehaviour
         {
             var area = list[index++];
 
-            c.GetComponent<RecommendController>().Initial(area);
+            c.GetComponent<RecommendController>().Initial(area, caches);
             c.GetComponent<Button>().onClick.RemoveAllListeners();
             if (c.alpha != 1)
             {
@@ -148,15 +151,16 @@ public class BannerController : MonoBehaviour
                 c.GetComponent<Button>().onClick.AddListener(()=>GoDetail(c));
             }
         }
-        currentIndex = 1;
         this.list = list;
     }
+    bool animateLock = false;
     private void Right()
     {
         int center = GetCenterIndex(),
            left = GetSideIndex(true),
            right = GetSideIndex(false);
-        if (center == -1 || left == -1 || right == -1) return;
+        if (center == -1 || left == -1 || right == -1 || animateLock) return;
+        animateLock = true;
         DOTween.CompleteAll();
         DORight(itemList[left], itemList[center], itemList[right]);
     }
@@ -165,15 +169,19 @@ public class BannerController : MonoBehaviour
         Sequence se = DOTween.Sequence();
         se.Join(center.DOFade(0.5f, 0.3f));
         se.Join(center.GetComponent<RectTransform>().DOScale(Vector3.one * 0.8f, 0.3f));
-        se.Join(center.GetComponent<RectTransform>().DOLocalMoveX(43, 0.3f));
+        se.Join(center.GetComponent<RectTransform>().DOLocalMoveX(offset, 0.3f));
-        se.Join(right.GetComponent<RectTransform>().DOLocalMoveX(-43, 0.3f));
+        se.Join(right.GetComponent<RectTransform>().DOLocalMoveX(-1* offset, 0.3f));
-        var area = list[((currentIndex++) + list.Count) % list.Count];
+        var area = list[((sIndex - 1) + list.Count) % list.Count];
-        right.GetComponent<RecommendController>().Initial(area);
+        sIndex--;
-        if (currentIndex >= list.Count) currentIndex = 0;
+        eIndex--;
+        if (sIndex < 0) sIndex = (sIndex + list.Count) % list.Count;
+        if (eIndex < 0) eIndex = (eIndex + list.Count) % list.Count;
+        Debug.Log($"{sIndex},{eIndex}");
+        right.GetComponent<RecommendController>().Initial(area, caches);
         se.Join(left.DOFade(1, 0.3f));
         se.Join(left.GetComponent<RectTransform>().DOScale(Vector3.one, 0.3f));
         se.Join(left.GetComponent<RectTransform>().DOLocalMoveX(0, 0.3f));
-        se.Play();
+        se.Play().onComplete = ()=> { animateLock = false; };
         left.transform.SetAsLastSibling();
         //事件改变
         left.GetComponent<Button>().onClick.RemoveAllListeners();
@@ -183,13 +191,18 @@ public class BannerController : MonoBehaviour
         right.GetComponent<Button>().onClick.RemoveAllListeners();
         right.GetComponent<Button>().onClick.AddListener(Right);
     }
-
+#if UNITY_STANDALONE_WIN
+    float offset = 110;
+#else
+    float offset = 43;
+#endif
     private void Left()
     {
         int center = GetCenterIndex(),
            left = GetSideIndex(true),
            right = GetSideIndex(false);
-        if (center == -1 || left == -1 || right == -1) return;
+        if (center == -1 || left == -1 || right == -1|| animateLock) return;
+        animateLock = true;
         DOTween.CompleteAll();
         DOLeft(itemList[left], itemList[center], itemList[right]);
     }
@@ -198,16 +211,21 @@ public class BannerController : MonoBehaviour
         Sequence se = DOTween.Sequence();
         se.Join(center.DOFade(0.5f, 0.3f));
         se.Join(center.GetComponent<RectTransform>().DOScale(Vector3.one * 0.8f, 0.3f));
-        se.Join(center.GetComponent<RectTransform>().DOLocalMoveX(-43, 0.3f));
+        se.Join(center.GetComponent<RectTransform>().DOLocalMoveX(-1* offset, 0.3f));
-        se.Join(left.GetComponent<RectTransform>().DOLocalMoveX(43, 0.3f));
+        se.Join(left.GetComponent<RectTransform>().DOLocalMoveX(offset, 0.3f));
-        var area = list[((currentIndex--) + list.Count) % list.Count];
+        var area = list[((eIndex + 1) + list.Count) % list.Count];
+        sIndex++;
+        eIndex++;
+        if (sIndex >= list.Count - 1) sIndex = sIndex % list.Count;
+        if (eIndex >= list.Count - 1) eIndex = eIndex % list.Count;
+        Debug.Log($"{sIndex},{eIndex}");
         var centerArea = list[currentIndex + 1];
-        left.GetComponent<RecommendController>().Initial(area);
+        left.GetComponent<RecommendController>().Initial(area, caches);
         if (currentIndex < 0) currentIndex = list.Count - 1;
         se.Join(right.DOFade(1, 0.3f));
         se.Join(right.GetComponent<RectTransform>().DOScale(Vector3.one, 0.3f));
         se.Join(right.GetComponent<RectTransform>().DOLocalMoveX(0, 0.3f));
-        se.Play();
+        se.Play().onComplete = () => { animateLock = false; };
         right.transform.SetAsLastSibling();
         //事件改变
         right.GetComponent<Button>().onClick.RemoveAllListeners();
@@ -254,5 +272,8 @@ public class BannerController : MonoBehaviour
     {
         Debug.Log(248+"毁灭");
         TouchKit.removeGestureRecognizer(pan);
+        caches = null;
+        Resources.UnloadUnusedAssets();
+        GC.Collect();
     }
 }

Assets/HomeMessageController.cs

@@ -24,6 +24,11 @@ public class HomeMessageController : MonoBehaviour
         isAnimated = false;
     }
     float playtime = 0;
+#if UNITY_STANDALONE_WIN
+    float maxWidth = 370;
+#else
+    float maxWidth = 180;
+#endif
     // Update is called once per frame
     void Update()
     {
@@ -31,10 +36,10 @@ public class HomeMessageController : MonoBehaviour
         if (timer <= 0) 
         {
             //do
-            if (textWidth.HasValue && textWidth > 180 && !isAnimated)
+            if (textWidth.HasValue && textWidth > maxWidth && !isAnimated)
             {
                 isAnimated = true;
-                var offset = textWidth.Value - 180;
+                var offset = textWidth.Value - maxWidth;
                 var game = transform.Find("TextContainer/Content");
                 var v = 20 / 0.3f;
                 playtime = offset / v;

Assets/Plugins/iOS/IOSWechatController.m

@@ -8,6 +8,13 @@
 #import "WXApi.h"
 #import "UnityAppController.h"
 #import <Foundation/Foundation.h>
+
+#import <FBSDKCoreKit/FBSDKCoreKit.h>
+#import <FBSDKLoginKit/FBSDKLoginKit.h>
+#import <FBSDKShareKit/FBSDKShareKit.h>
+#import <FBSDKGamingServicesKit/FBSDKGamingServicesKit.h>
+#import <Foundation/NSJSONSerialization.h>
+
 extern void UnitySendMessage(const char *,const char *,const char *);
 @interface IOSWechatController : UnityAppController<WXApiDelegate>
 @end
@@ -29,7 +36,12 @@ IMPL_APP_CONTROLLER_SUBCLASS (IOSWechatController)
 - (BOOL)application:(UIApplication*)application openURL:(NSURL*)url
 options:(NSDictionary<UIApplicationOpenURLOptionsKey,id> *)options
 {
-    return [WXApi handleOpenURL:url delegate:self];
+    if([url.absoluteString containsString:@"fb1291883451314488powerfunx"]){
+            [[FBSDKApplicationDelegate sharedInstance] application:application openURL:url options:options];
+            return YES;
+    }else{
+        return [WXApi handleOpenURL:url delegate:self];
+    }
 }
 
 - (BOOL)application:(UIApplication *)application handleOpenURL:(NSURL *)url

Assets/Resources/Images/64-10.png.meta

@@ -0,0 +1,128 @@
+fileFormatVersion: 2
+guid: 2c5f3f1e5f1564e469edfeecf2804f61
+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: 10, y: 10, z: 10, w: 10}
+  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_PC.png.meta

@@ -0,0 +1,128 @@
+fileFormatVersion: 2
+guid: 636f568c33e7a03409ae710a1e44e945
+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/Ride/img_dnf.png.meta

@@ -0,0 +1,128 @@
+fileFormatVersion: 2
+guid: d31f23ca8dc4e8c47b4380773ed30671
+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/Ride/img_newrecord.png.meta

@@ -0,0 +1,128 @@
+fileFormatVersion: 2
+guid: 09b15bbf8610a214aa9f35aeecf1bddb
+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/Ride/img_newrecord_cn.png.meta

@@ -0,0 +1,128 @@
+fileFormatVersion: 2
+guid: f605750593fc64a46886d694f3b273f1
+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/MapList/MapItem-Mobile.prefab

@@ -797,6 +797,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 2521131d8a9d2564390f6228711f4522, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  isModal: 0
 --- !u!114 &5399473526635801971
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -2785,7 +2786,7 @@ PrefabInstance:
     - target: {fileID: 3150550772916003707, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
       propertyPath: m_Text
-      value: COUNTINUE
+      value: CONTINUE
       objectReference: {fileID: 0}
     - target: {fileID: 3150550772916003707, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
@@ -2981,7 +2982,7 @@ PrefabInstance:
     - target: {fileID: 3150550772916003707, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
       propertyPath: m_Text
-      value: REDIDE
+      value: RERIDE
       objectReference: {fileID: 0}
     - target: {fileID: 3150550772916003707, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}

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

@@ -156,6 +156,80 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: '#99999'
+--- !u!1 &1159433267961605404
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6881477292672015735}
+  - component: {fileID: 9118841034935080091}
+  - component: {fileID: 3065069098088688217}
+  m_Layer: 5
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6881477292672015735
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1159433267961605404}
+  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: 3485852382565732704}
+  m_RootOrder: 2
+  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: 10, y: 0}
+  m_SizeDelta: {x: 20, y: 20}
+  m_Pivot: {x: 0, y: 0.5}
+--- !u!222 &9118841034935080091
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1159433267961605404}
+  m_CullTransparentMesh: 0
+--- !u!114 &3065069098088688217
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1159433267961605404}
+  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: f1a91dd22363c89459095ef8759ecd2d, 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!1 &1325622395784352471
 GameObject:
   m_ObjectHideFlags: 0
@@ -395,7 +469,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.13725491, g: 0.13725491, b: 0.1764706, a: 1}
+  m_Color: {r: 0.20784314, g: 0.20784314, b: 0.2627451, a: 1}
   m_RaycastTarget: 1
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -694,6 +768,8 @@ RectTransform:
   - {fileID: 6649687042165429259}
   - {fileID: 6731783213148011198}
   - {fileID: 7439532681881893281}
+  - {fileID: 4773889092131052388}
+  - {fileID: 3485852382565732704}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -723,7 +799,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.13725491, g: 0.13725491, b: 0.1764706, a: 1}
+  m_Color: {r: 0.20784314, g: 0.20784314, b: 0.2627451, a: 1}
   m_RaycastTarget: 1
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -751,6 +827,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 2521131d8a9d2564390f6228711f4522, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  isModal: 0
 --- !u!114 &5399473526635801971
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1718,7 +1795,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.2392157, g: 0.24313727, b: 0.3019608, a: 1}
+  m_Color: {r: 0.43137255, g: 0.43137255, b: 0.49019608, a: 1}
   m_RaycastTarget: 1
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -2044,7 +2121,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.2392157, g: 0.24313727, b: 0.3019608, a: 1}
+  m_Color: {r: 0.43137255, g: 0.43137255, b: 0.49019608, a: 1}
   m_RaycastTarget: 1
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -2625,6 +2702,472 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &9037866035028281532
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1308361011409284216}
+  - component: {fileID: 8208184829928167988}
+  - component: {fileID: 9060916946468864663}
+  m_Layer: 5
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1308361011409284216
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9037866035028281532}
+  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: 4773889092131052388}
+  m_RootOrder: 2
+  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: 10, y: 0}
+  m_SizeDelta: {x: 20, y: 20}
+  m_Pivot: {x: 0, y: 0.5}
+--- !u!222 &8208184829928167988
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9037866035028281532}
+  m_CullTransparentMesh: 0
+--- !u!114 &9060916946468864663
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9037866035028281532}
+  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: 43db35c93bebaae4b99ea42cb36385c5, 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!1001 &2006702702285323200
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 5262667172184159172}
+    m_Modifications:
+    - target: {fileID: 545917028276686471, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1123028309966834811, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_Material
+      value: 
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_Pivot.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_Pivot.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 16
+      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: 0
+      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: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 123
+      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: 145
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 14
+      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: BtnReride
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312289, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772916003704, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: -40
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772916003704, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 14
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772916003707, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_Text
+      value: RERIDE
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772916003707, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_FontData.m_Font
+      value: 
+      objectReference: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083,
+        type: 3}
+    - target: {fileID: 3150550772916003707, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_FontData.m_MinSize
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772916003707, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_FontData.m_FontSize
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      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: 0
+      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 &3485852382565732704 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+    type: 3}
+  m_PrefabInstance: {fileID: 2006702702285323200}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &7636209316228936132
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 5262667172184159172}
+    m_Modifications:
+    - target: {fileID: 545917028276686471, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1123028309966834811, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_Material
+      value: 
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_Pivot.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_Pivot.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 15
+      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: 0
+      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: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 123
+      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: 12
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 14
+      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: BtnContinue
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312289, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772916003704, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: -40
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772916003704, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 14
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772916003707, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_Text
+      value: CONTINUE
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772916003707, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_FontData.m_Font
+      value: 
+      objectReference: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083,
+        type: 3}
+    - target: {fileID: 3150550772916003707, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_FontData.m_MinSize
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772916003707, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_FontData.m_FontSize
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      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: 0
+      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 &4773889092131052388 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+    type: 3}
+  m_PrefabInstance: {fileID: 7636209316228936132}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &8642810236069363371
 PrefabInstance:
   m_ObjectHideFlags: 0

Assets/Resources/UI/Prefab/Match/CompetitonPanel.prefab

@@ -2388,6 +2388,98 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   key: 
+--- !u!1 &5481704648413949200
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8755589691839213968}
+  - component: {fileID: 5817553843603491900}
+  - component: {fileID: 158511944490989202}
+  - component: {fileID: 6432496535212216019}
+  m_Layer: 5
+  m_Name: Multips
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8755589691839213968
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5481704648413949200}
+  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: 6558498177448486125}
+  m_RootOrder: 45
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -156.5, y: -329.21}
+  m_SizeDelta: {x: 1162.9983, y: 69.57846}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5817553843603491900
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5481704648413949200}
+  m_CullTransparentMesh: 0
+--- !u!114 &158511944490989202
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5481704648413949200}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3}
+    m_FontSize: 14
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 7
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 
+--- !u!114 &6432496535212216019
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5481704648413949200}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 81e6186d0c08df64ba2687b894591e90, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  key: 
 --- !u!1 &5674121455785206675
 GameObject:
   m_ObjectHideFlags: 0
@@ -3378,6 +3470,7 @@ RectTransform:
   - {fileID: 6742262383745753795}
   - {fileID: 224593554342519100}
   - {fileID: 6085898456189044154}
+  - {fileID: 8755589691839213968}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -3435,6 +3528,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 3622b843b296d2e46ba722beb139f040, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  newNav: {fileID: 0}
 --- !u!114 &8647795171597459386
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -3447,6 +3541,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 3622b843b296d2e46ba722beb139f040, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  newNav: {fileID: 0}
 --- !u!1 &6558498177537283755
 GameObject:
   m_ObjectHideFlags: 0
@@ -5224,7 +5319,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &6558498178561756610
 RectTransform:
   m_ObjectHideFlags: 0
@@ -5756,7 +5851,7 @@ RectTransform:
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 5, y: 0}
   m_SizeDelta: {x: 10, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -6111,7 +6206,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &6558498179115500272
 RectTransform:
   m_ObjectHideFlags: 0

Assets/Resources/UI/Prefab/Match/CountDownPanel.prefab

@@ -156,7 +156,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: Riding Time
+  m_Text: 'Get Ready:'
 --- !u!114 &3886708269221531246
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -248,7 +248,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: Get Ready
+  m_Text: Competition Time
 --- !u!114 &5952686733100152547
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/Resources/UI/Prefab/Match/Mobile/CompetitonPanel.prefab

@@ -3849,7 +3849,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: 100.5, y: -313}
+  m_AnchoredPosition: {x: 100.5, y: -298}
   m_SizeDelta: {x: 101, y: 14}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6558498177906922494

Assets/Resources/UI/Prefab/Match/Mobile/ToolBarPanel.prefab

@@ -393,7 +393,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 7951c34819fbd124b9314983619c205c, type: 3}
+  m_Sprite: {fileID: 21300000, guid: a6cacbc220bfd0a46ac7f4d6e052107a, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1

Assets/Resources/UI/Prefab/Match/onlinePlayerNoScript.prefab

@@ -1563,7 +1563,7 @@ GameObject:
   - component: {fileID: 7021295876441894168}
   - component: {fileID: 7021295876449305338}
   m_Layer: 0
-  m_Name: onlinePlayerTest
+  m_Name: onlinePlayerNoScript
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -1960,7 +1960,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &7021295876441894184
 Transform:
   m_ObjectHideFlags: 0

Assets/Resources/UI/Prefab/NewRoute/UserInfo.prefab

@@ -0,0 +1,214 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &727010653398515220
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 855809320942944095}
+  - component: {fileID: 1906905118980539361}
+  - component: {fileID: 1816719013343740752}
+  m_Layer: 5
+  m_Name: NickName
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &855809320942944095
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 727010653398515220}
+  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: 5992468442936236375}
+  m_RootOrder: 1
+  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: -24}
+  m_SizeDelta: {x: 0, y: 22}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &1906905118980539361
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 727010653398515220}
+  m_CullTransparentMesh: 0
+--- !u!114 &1816719013343740752
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 727010653398515220}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.61960787, g: 0.61960787, b: 0.6784314, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3}
+    m_FontSize: 8
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 8
+    m_MaxSize: 40
+    m_Alignment: 1
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 
+--- !u!1 &2508160585134113376
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3399657810546528119}
+  - component: {fileID: 4851986678425313050}
+  - component: {fileID: 2696346680040285015}
+  - component: {fileID: 7974616677074391344}
+  m_Layer: 5
+  m_Name: Avatar
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3399657810546528119
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2508160585134113376}
+  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: 5992468442936236375}
+  m_RootOrder: 0
+  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: 0, y: 0}
+  m_SizeDelta: {x: 20, y: 20}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &4851986678425313050
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2508160585134113376}
+  m_CullTransparentMesh: 0
+--- !u!114 &2696346680040285015
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2508160585134113376}
+  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: 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 &7974616677074391344
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2508160585134113376}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  radius: 10
+--- !u!1 &3688802075276480131
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5992468442936236375}
+  - component: {fileID: 3571262997660941405}
+  m_Layer: 5
+  m_Name: UserInfo
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5992468442936236375
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3688802075276480131}
+  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: 3399657810546528119}
+  - {fileID: 855809320942944095}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3571262997660941405
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3688802075276480131}
+  m_CullTransparentMesh: 0

Assets/Resources/UI/Prefab/NewRoute/UserInfo.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 823689f6993b2584a9182e156fff9e40
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -489,6 +489,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 6d865b6d0ecb54044a4600bc590d8c29, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  newNav: {fileID: 0}
 --- !u!1 &1273472110172321477
 GameObject:
   m_ObjectHideFlags: 0
@@ -709,7 +710,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 1569894540830352816}
-  m_RootOrder: 1
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -1710,9 +1711,9 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 1569894539194797782}
-  - {fileID: 1569894539192063988}
-  - {fileID: 1569894539226892726}
   - {fileID: 1569894541186943689}
+  - {fileID: 1569894539226892726}
+  - {fileID: 1569894539192063988}
   m_Father: {fileID: 956475306156679521}
   m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1985,7 +1986,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 1569894540830352816}
-  m_RootOrder: 3
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -6628,18 +6629,18 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 07e45aecba1a2d542b043157aa2e9322, type: 3}
---- !u!1 &5469857785895773085 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 92744388873403988, guid: 07e45aecba1a2d542b043157aa2e9322,
-    type: 3}
-  m_PrefabInstance: {fileID: 5377764333726817737}
-  m_PrefabAsset: {fileID: 0}
 --- !u!224 &8698039831671925482 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 3608523562535466787, guid: 07e45aecba1a2d542b043157aa2e9322,
     type: 3}
   m_PrefabInstance: {fileID: 5377764333726817737}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &5469857785895773085 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 92744388873403988, guid: 07e45aecba1a2d542b043157aa2e9322,
+    type: 3}
+  m_PrefabInstance: {fileID: 5377764333726817737}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &5377764333992007874
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -6794,18 +6795,18 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 07e45aecba1a2d542b043157aa2e9322, type: 3}
---- !u!224 &8698039833564966881 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 3608523562535466787, guid: 07e45aecba1a2d542b043157aa2e9322,
-    type: 3}
-  m_PrefabInstance: {fileID: 5377764333992007874}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &5469857784028620438 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 92744388873403988, guid: 07e45aecba1a2d542b043157aa2e9322,
     type: 3}
   m_PrefabInstance: {fileID: 5377764333992007874}
   m_PrefabAsset: {fileID: 0}
+--- !u!224 &8698039833564966881 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 3608523562535466787, guid: 07e45aecba1a2d542b043157aa2e9322,
+    type: 3}
+  m_PrefabInstance: {fileID: 5377764333992007874}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &5377764333995795933
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -7332,18 +7333,18 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 07e45aecba1a2d542b043157aa2e9322, type: 3}
---- !u!1 &5469857784411156186 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 92744388873403988, guid: 07e45aecba1a2d542b043157aa2e9322,
-    type: 3}
-  m_PrefabInstance: {fileID: 5377764334339281038}
-  m_PrefabAsset: {fileID: 0}
 --- !u!224 &8698039832972322733 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 3608523562535466787, guid: 07e45aecba1a2d542b043157aa2e9322,
     type: 3}
   m_PrefabInstance: {fileID: 5377764334339281038}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &5469857784411156186 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 92744388873403988, guid: 07e45aecba1a2d542b043157aa2e9322,
+    type: 3}
+  m_PrefabInstance: {fileID: 5377764334339281038}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &5377764334390996350
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -7659,18 +7660,18 @@ RectTransform:
     type: 3}
   m_PrefabInstance: {fileID: 7247456572859612787}
   m_PrefabAsset: {fileID: 0}
---- !u!1 &9065530877846007579 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 1827088261433348456, guid: 07e45aecba1a2d542b043157aa2e9322,
-    type: 3}
-  m_PrefabInstance: {fileID: 7247456572859612787}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &7340126173464641575 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 92744388873403988, guid: 07e45aecba1a2d542b043157aa2e9322,
     type: 3}
   m_PrefabInstance: {fileID: 7247456572859612787}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &9065530877846007579 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 1827088261433348456, guid: 07e45aecba1a2d542b043157aa2e9322,
+    type: 3}
+  m_PrefabInstance: {fileID: 7247456572859612787}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &7648405948234622015
 PrefabInstance:
   m_ObjectHideFlags: 0

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

@@ -638,6 +638,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 6d865b6d0ecb54044a4600bc590d8c29, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  newNav: {fileID: 0}
 --- !u!1 &1273472110172321477
 GameObject:
   m_ObjectHideFlags: 0
@@ -858,7 +859,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 1569894540830352816}
-  m_RootOrder: 1
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -1858,9 +1859,9 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 1569894539194797782}
-  - {fileID: 1569894539192063988}
-  - {fileID: 1569894539226892726}
   - {fileID: 1569894541186943689}
+  - {fileID: 1569894539226892726}
+  - {fileID: 1569894539192063988}
   m_Father: {fileID: 956475306156679521}
   m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -2132,7 +2133,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 1569894540830352816}
-  m_RootOrder: 3
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}

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

@@ -6593,6 +6593,21 @@ PrefabInstance:
       propertyPath: m_SizeDelta.x
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 3342506723743580662, guid: 24b12ea279c4803459cf87df536f6c21,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 14
+      objectReference: {fileID: 0}
+    - target: {fileID: 3342506723743580665, guid: 24b12ea279c4803459cf87df536f6c21,
+        type: 3}
+      propertyPath: m_FontData.m_FontSize
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 3342506723743580665, guid: 24b12ea279c4803459cf87df536f6c21,
+        type: 3}
+      propertyPath: m_FontData.m_Alignment
+      value: 3
+      objectReference: {fileID: 0}
     - target: {fileID: 3342506723879539847, guid: 24b12ea279c4803459cf87df536f6c21,
         type: 3}
       propertyPath: m_Material

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

@@ -6333,10 +6333,10 @@ RectTransform:
   m_Father: {fileID: 8976674304292884952}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMin: {x: 0.5, y: 1}
-  m_AnchorMax: {x: 1, y: 0}
+  m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: -80}
-  m_SizeDelta: {x: 0, y: 19}
+  m_SizeDelta: {x: 114, y: 19}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &267367882303563041
 CanvasRenderer:
@@ -6535,10 +6535,10 @@ RectTransform:
   m_Father: {fileID: 8119043696946072022}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMin: {x: 0.5, y: 1}
-  m_AnchorMax: {x: 1, y: 0}
+  m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: -80}
-  m_SizeDelta: {x: 0, y: 19}
+  m_SizeDelta: {x: 114, y: 19}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &4537646163777136460
 CanvasRenderer:

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

@@ -1021,6 +1021,7 @@ GameObject:
   - component: {fileID: 4573235036785167472}
   - component: {fileID: 4573235036785167478}
   - component: {fileID: 4573235036785167479}
+  - component: {fileID: 2261519680650151098}
   m_Layer: 5
   m_Name: Text
   m_TagString: Untagged
@@ -1088,6 +1089,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: ALL RACE
+--- !u!114 &2261519680650151098
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4573235036785167473}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  key: 
 --- !u!1 &5258701487187373835
 GameObject:
   m_ObjectHideFlags: 0
@@ -1939,12 +1953,12 @@ PrefabInstance:
     - target: {fileID: 1592441871873768741, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 1592441871873768741, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 1592441871873768741, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
@@ -1964,12 +1978,12 @@ PrefabInstance:
     - target: {fileID: 2004396901057112773, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2004396901057112773, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2004396901057112773, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
@@ -1979,12 +1993,12 @@ PrefabInstance:
     - target: {fileID: 2054923810110871857, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2054923810110871857, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2054923810110871857, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
@@ -2149,12 +2163,12 @@ PrefabInstance:
     - target: {fileID: 3511827664771645704, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3511827664771645704, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3511827664771645704, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
@@ -2164,12 +2178,12 @@ PrefabInstance:
     - target: {fileID: 3991752987403741024, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3991752987403741024, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3991752987403741024, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
@@ -2229,12 +2243,12 @@ PrefabInstance:
     - target: {fileID: 4834968900665809806, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4834968900665809806, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4834968900665809806, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
@@ -2244,12 +2258,12 @@ PrefabInstance:
     - target: {fileID: 5249748558008090706, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 5249748558008090706, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 5249748558008090706, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
@@ -2304,12 +2318,12 @@ PrefabInstance:
     - target: {fileID: 6172683569922498945, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6172683569922498945, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6172683569922498945, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
@@ -2324,12 +2338,12 @@ PrefabInstance:
     - target: {fileID: 6347209353323850145, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6347209353323850145, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6347209353323850145, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
@@ -2344,12 +2358,12 @@ PrefabInstance:
     - target: {fileID: 8197454007437855745, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8197454007437855745, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8197454007437855745, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
@@ -2379,12 +2393,12 @@ PrefabInstance:
     - target: {fileID: 8526344065104504758, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8526344065104504758, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8526344065104504758, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
@@ -2394,7 +2408,7 @@ PrefabInstance:
     - target: {fileID: 8526344065104504758, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -2
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8719966614707449432, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}

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

@@ -873,7 +873,7 @@ RectTransform:
   m_Children:
   - {fileID: 2283881591003425796}
   m_Father: {fileID: 1673965681348374004}
-  m_RootOrder: 6
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
@@ -1074,9 +1074,9 @@ RectTransform:
   - {fileID: 3808910954941481150}
   - {fileID: 6595848013761631944}
   - {fileID: 4408462524766711656}
-  - {fileID: 7578623247347515893}
   - {fileID: 7118448401530350836}
   - {fileID: 8606172890055807794}
+  - {fileID: 7578623247347515893}
   - {fileID: 9114115754477968003}
   m_Father: {fileID: 0}
   m_RootOrder: 0
@@ -1582,7 +1582,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 1673965681348374004}
-  m_RootOrder: 4
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -2152,6 +2152,7 @@ RectTransform:
   - {fileID: 1786430169159750715}
   - {fileID: 1128690593457696285}
   - {fileID: 7052195156892582935}
+  - {fileID: 2104230815779844094}
   m_Father: {fileID: 1673965681348374004}
   m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -2962,6 +2963,80 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &6281041052674275333
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2104230815779844094}
+  - component: {fileID: 4123304717997766521}
+  - component: {fileID: 8689588975029460177}
+  m_Layer: 5
+  m_Name: Return
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2104230815779844094
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6281041052674275333}
+  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: 9114115754477968003}
+  m_RootOrder: 6
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 0}
+  m_AnchorMax: {x: 1, y: 0}
+  m_AnchoredPosition: {x: 22, y: 26.3}
+  m_SizeDelta: {x: 44, y: 44}
+  m_Pivot: {x: 1, y: 0}
+--- !u!222 &4123304717997766521
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6281041052674275333}
+  m_CullTransparentMesh: 0
+--- !u!114 &8689588975029460177
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6281041052674275333}
+  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: fdb6d865c6f1a0d45a6fa4e26e4784a8, 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!1 &6795705504714217666
 GameObject:
   m_ObjectHideFlags: 0
@@ -3803,12 +3878,12 @@ PrefabInstance:
     - target: {fileID: 1592441871873768741, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 1592441871873768741, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 1592441871873768741, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
@@ -3828,12 +3903,12 @@ PrefabInstance:
     - target: {fileID: 2004396901057112773, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2004396901057112773, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2004396901057112773, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
@@ -3843,12 +3918,12 @@ PrefabInstance:
     - target: {fileID: 2054923810110871857, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2054923810110871857, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2054923810110871857, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
@@ -4013,12 +4088,12 @@ PrefabInstance:
     - target: {fileID: 3511827664771645704, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3511827664771645704, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3511827664771645704, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
@@ -4028,12 +4103,12 @@ PrefabInstance:
     - target: {fileID: 3991752987403741024, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3991752987403741024, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3991752987403741024, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
@@ -4093,12 +4168,12 @@ PrefabInstance:
     - target: {fileID: 4834968900665809806, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4834968900665809806, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4834968900665809806, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
@@ -4108,12 +4183,12 @@ PrefabInstance:
     - target: {fileID: 5249748558008090706, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 5249748558008090706, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 5249748558008090706, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
@@ -4168,12 +4243,12 @@ PrefabInstance:
     - target: {fileID: 6172683569922498945, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6172683569922498945, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6172683569922498945, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
@@ -4188,12 +4263,12 @@ PrefabInstance:
     - target: {fileID: 6347209353323850145, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6347209353323850145, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6347209353323850145, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
@@ -4208,12 +4283,12 @@ PrefabInstance:
     - target: {fileID: 8197454007437855745, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8197454007437855745, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8197454007437855745, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
@@ -4243,12 +4318,12 @@ PrefabInstance:
     - target: {fileID: 8526344065104504758, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8526344065104504758, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8526344065104504758, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
@@ -4258,7 +4333,7 @@ PrefabInstance:
     - target: {fileID: 8526344065104504758, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -2
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8719966614707449432, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
@@ -4498,7 +4573,7 @@ PrefabInstance:
     - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}
       propertyPath: m_RootOrder
-      value: 5
+      value: 4
       objectReference: {fileID: 0}
     - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}
@@ -4838,15 +4913,15 @@ PrefabInstance:
     m_RemovedComponents:
     - {fileID: 829206726517620079, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3}
   m_SourcePrefab: {fileID: 100100000, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3}
---- !u!224 &7118448401530350836 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e,
-    type: 3}
-  m_PrefabInstance: {fileID: 5067779267173090679}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &7118448401530350837 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 2638424933752433026, guid: a1999d0576fee6248a9c5a507ae8d10e,
     type: 3}
   m_PrefabInstance: {fileID: 5067779267173090679}
   m_PrefabAsset: {fileID: 0}
+--- !u!224 &7118448401530350836 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e,
+    type: 3}
+  m_PrefabInstance: {fileID: 5067779267173090679}
+  m_PrefabAsset: {fileID: 0}

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

@@ -2300,6 +2300,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d53c11af00252ab409587459f4a0f3f6, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  newNav: {fileID: 0}
 --- !u!222 &1298315926268858870
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -3318,7 +3319,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &6411762837365507617
 RectTransform:
   m_ObjectHideFlags: 0
@@ -3333,9 +3334,9 @@ RectTransform:
   m_Father: {fileID: 6411762836704884641}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 30, y: -8}
   m_SizeDelta: {x: 16, y: 16}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6411762837365507623

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

@@ -263,6 +263,7 @@ GameObject:
   - component: {fileID: 3728196982063212412}
   - component: {fileID: 3728196982063212386}
   - component: {fileID: 3728196982063212413}
+  - component: {fileID: 7011952942006856952}
   m_Layer: 5
   m_Name: AllRoutes
   m_TagString: Untagged
@@ -328,6 +329,49 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!114 &7011952942006856952
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3728196982063212415}
+  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: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, 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: 3728196982063212413}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &3728196982087670777
 GameObject:
   m_ObjectHideFlags: 0
@@ -464,7 +508,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.61960787, g: 0.61960787, b: 0.6784314, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -675,7 +719,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.61960787, g: 0.61960787, b: 0.6784314, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -719,6 +763,7 @@ GameObject:
   - component: {fileID: 3728196982461360755}
   - component: {fileID: 3728196982461360753}
   - component: {fileID: 3728196982461360752}
+  - component: {fileID: 3155658155276841648}
   m_Layer: 5
   m_Name: MyUpload
   m_TagString: Untagged
@@ -784,6 +829,49 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!114 &3155658155276841648
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3728196982461360754}
+  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: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, 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: 3728196982461360752}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &3728196982670996111
 GameObject:
   m_ObjectHideFlags: 0
@@ -843,7 +931,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.61960787, g: 0.61960787, b: 0.6784314, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -887,6 +975,7 @@ GameObject:
   - component: {fileID: 3728196982891290182}
   - component: {fileID: 3728196982891290180}
   - component: {fileID: 3728196982891290183}
+  - component: {fileID: 8002401230216742435}
   m_Layer: 5
   m_Name: MyCollection
   m_TagString: Untagged
@@ -952,6 +1041,49 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!114 &8002401230216742435
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3728196982891290177}
+  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: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, 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: 3728196982891290183}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &3728196982913226174
 GameObject:
   m_ObjectHideFlags: 0
@@ -1062,8 +1194,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: 0, y: -35}
+  m_AnchoredPosition: {x: 0, y: -22}
-  m_SizeDelta: {x: 35, y: 35}
+  m_SizeDelta: {x: 55, y: 55}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &3728196982934195722
 CanvasRenderer:
@@ -1161,7 +1293,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.61960787, g: 0.61960787, b: 0.6784314, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -1228,8 +1360,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: 0, y: -35}
+  m_AnchoredPosition: {x: 0, y: -22}
-  m_SizeDelta: {x: 35, y: 35}
+  m_SizeDelta: {x: 55, y: 55}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &3728196983254984104
 CanvasRenderer:
@@ -1420,6 +1552,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 198d3ec3822927f44af9fb241ac00195, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  newNav: {fileID: 0}
 --- !u!225 &1735218495705024833
 CanvasGroup:
   m_ObjectHideFlags: 0
@@ -1443,6 +1576,7 @@ GameObject:
   - component: {fileID: 3728196983699769756}
   - component: {fileID: 3728196983699769730}
   - component: {fileID: 3728196983699769757}
+  - component: {fileID: 279663084834021489}
   m_Layer: 5
   m_Name: RecentRoute
   m_TagString: Untagged
@@ -1508,6 +1642,49 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!114 &279663084834021489
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3728196983699769759}
+  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: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, 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: 3728196983699769757}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &3728196983700296461
 GameObject:
   m_ObjectHideFlags: 0
@@ -1541,14 +1718,15 @@ RectTransform:
   - {fileID: 3728196984075467606}
   - {fileID: 3728196982389681561}
   - {fileID: 3728196982387734002}
+  - {fileID: 6433053824930993065}
   m_Father: {fileID: 3728196983693990286}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMin: {x: 0.5, y: 1}
-  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: -124}
   m_SizeDelta: {x: 1480, y: 776}
-  m_Pivot: {x: 0.5, y: 0}
+  m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &3728196983700296688
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -1682,8 +1860,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: 0, y: -35}
+  m_AnchoredPosition: {x: 0, y: -22}
-  m_SizeDelta: {x: 35, y: 35}
+  m_SizeDelta: {x: 55, y: 55}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &3728196984118981631
 CanvasRenderer:
@@ -1756,8 +1934,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: 0, y: -35}
+  m_AnchoredPosition: {x: 0, y: -22}
-  m_SizeDelta: {x: 35, y: 35}
+  m_SizeDelta: {x: 55, y: 55}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &3728196984181025721
 CanvasRenderer:
@@ -2605,6 +2783,213 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &9036843270450644861
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6433053824930993065}
+  - component: {fileID: 12646086589693467}
+  - component: {fileID: 1527046995938101170}
+  - component: {fileID: 1409648904323070650}
+  - component: {fileID: 2618153256648820204}
+  m_Layer: 5
+  m_Name: BtnSearch
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6433053824930993065
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9036843270450644861}
+  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: 4782040888327516120}
+  m_Father: {fileID: 3728196983700296690}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 30, y: -590}
+  m_SizeDelta: {x: 167, y: 48}
+  m_Pivot: {x: 0, y: 1}
+--- !u!222 &12646086589693467
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9036843270450644861}
+  m_CullTransparentMesh: 0
+--- !u!114 &1527046995938101170
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9036843270450644861}
+  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: 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 &1409648904323070650
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9036843270450644861}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  radius: 24
+--- !u!114 &2618153256648820204
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9036843270450644861}
+  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: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, 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: 1527046995938101170}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!1 &9058803352475047041
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4782040888327516120}
+  - component: {fileID: 5042580599547927796}
+  - component: {fileID: 28423115369532439}
+  m_Layer: 5
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4782040888327516120
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9058803352475047041}
+  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: 6433053824930993065}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 28, y: 28}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5042580599547927796
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9058803352475047041}
+  m_CullTransparentMesh: 0
+--- !u!114 &28423115369532439
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9058803352475047041}
+  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: 2c0ab58631d13574aab2945cda4c5261, 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!1 &9183099091842026579
 GameObject:
   m_ObjectHideFlags: 0

Assets/Resources/UI/Prefab/Panel/StartRideModal.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 6815c15382618364e850a888b993223a
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -2357,6 +2357,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d53c11af00252ab409587459f4a0f3f6, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  newNav: {fileID: 0}
 --- !u!222 &1298315926268858870
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -3337,7 +3338,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &6411762837365507617
 RectTransform:
   m_ObjectHideFlags: 0
@@ -3352,9 +3353,9 @@ RectTransform:
   m_Father: {fileID: 6411762836704884641}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 46, y: -12}
   m_SizeDelta: {x: 24, y: 24}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6411762837365507623

Assets/Resources/UI/Prefab/Ride/CancelPanel.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 37e4f36b8a6fd7146ba73172fcd4857b
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/UI/Prefab/Ride/LoadingPanel.prefab

@@ -1332,9 +1332,9 @@ RectTransform:
   m_Father: {fileID: 1936946042244182541}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 10, y: -14}
   m_SizeDelta: {x: 0, y: 28}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &9218960045514105109
@@ -3109,6 +3109,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 3622b843b296d2e46ba722beb139f040, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  newNav: {fileID: 0}
 --- !u!1 &3007624749611492914
 GameObject:
   m_ObjectHideFlags: 0
@@ -3771,13 +3772,14 @@ GameObject:
   - component: {fileID: 3007624750140628948}
   - component: {fileID: 3007624750140628950}
   - component: {fileID: 3007624750140628951}
+  - component: {fileID: 6062669006652910994}
   m_Layer: 5
   m_Name: RankingTitle
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &3007624750140628948
 RectTransform:
   m_ObjectHideFlags: 0
@@ -3794,8 +3796,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -266.5, y: -93}
+  m_AnchoredPosition: {x: -205.4, y: -93}
-  m_SizeDelta: {x: 167, y: 66}
+  m_SizeDelta: {x: 290, y: 66}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3007624750140628950
 CanvasRenderer:
@@ -3831,13 +3833,26 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 4
     m_MaxSize: 48
-    m_Alignment: 0
+    m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
-    m_HorizontalOverflow: 0
+    m_HorizontalOverflow: 1
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: Top 10
+  m_Text: RANKING
+--- !u!114 &6062669006652910994
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3007624750140628949}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  key: 
 --- !u!1 &3007624750146435811
 GameObject:
   m_ObjectHideFlags: 0

Assets/Resources/UI/Prefab/Ride/Mobile/CancelPanel.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 66d819e0c0965c249947232ed0ba0a16
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/UI/Prefab/Ride/Mobile/QuitPanel.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 36a58368eea54024ca74471e348cea81
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/UI/Prefab/Ride/Multips.prefab

@@ -0,0 +1,94 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &6048373303729076889
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7377129575015114265}
+  - component: {fileID: 5719241987414678453}
+  - component: {fileID: 2148757891008602395}
+  - component: {fileID: 5090791236708161882}
+  m_Layer: 5
+  m_Name: Multips
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7377129575015114265
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6048373303729076889}
+  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: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -156.5, y: -329.21}
+  m_SizeDelta: {x: 1162.9983, y: 69.57846}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5719241987414678453
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6048373303729076889}
+  m_CullTransparentMesh: 0
+--- !u!114 &2148757891008602395
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6048373303729076889}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3}
+    m_FontSize: 14
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 7
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 
+--- !u!114 &5090791236708161882
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6048373303729076889}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 81e6186d0c08df64ba2687b894591e90, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  key: 

Assets/Resources/UI/Prefab/Ride/Multips.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 57997cb9bf8c5b24fb9c385c2cede63f
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/UI/Prefab/Ride/MySelfRankingItem.prefab

@@ -327,7 +327,7 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 1
     m_MaxSize: 40
-    m_Alignment: 0
+    m_Alignment: 1
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0

Assets/Resources/UI/Prefab/Ride/QuitPanel.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: fb7ad2121bc5b394195ba6a54428085f
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/UI/Prefab/Ride/ViewAll.prefab

@@ -0,0 +1,213 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &3035877542464038358
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 587363923431513569}
+  - component: {fileID: 407207391305654799}
+  - component: {fileID: 4657217142766218751}
+  - component: {fileID: 4580177785358431849}
+  m_Layer: 5
+  m_Name: Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &587363923431513569
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3035877542464038358}
+  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: 3773302385381427876}
+  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.5, y: 0.5}
+--- !u!222 &407207391305654799
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3035877542464038358}
+  m_CullTransparentMesh: 0
+--- !u!114 &4657217142766218751
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3035877542464038358}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.9764706, g: 0.1882353, b: 0.5254902, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3}
+    m_FontSize: 14
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: View All
+--- !u!114 &4580177785358431849
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3035877542464038358}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  key: 
+--- !u!1 &5766380139266401392
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3773302385381427876}
+  - component: {fileID: 952584370771594700}
+  - component: {fileID: 625708832601230730}
+  - component: {fileID: 727325490816276674}
+  m_Layer: 5
+  m_Name: ViewAll
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3773302385381427876
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5766380139266401392}
+  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: 587363923431513569}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 590, y: -153}
+  m_SizeDelta: {x: 110, y: 22}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &952584370771594700
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5766380139266401392}
+  m_CullTransparentMesh: 0
+--- !u!114 &625708832601230730
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5766380139266401392}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 0}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 10905, 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 &727325490816276674
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5766380139266401392}
+  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: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, 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: 625708832601230730}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []

Assets/Resources/UI/Prefab/Ride/ViewAll.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 42e6439e5ca77244a9fd5d65bdc1e5da
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/UI/language.json

@@ -230,7 +230,9 @@
     "DEVICE": "设备",
     "QUIT": "退出",
     "Continue": "继续骑行",
+    "CONTINUE": "继续骑行",
     "Ride Again": "重新骑行",
+    "RERIDE": "重新骑行",
     "Delete": "删除",
     "Ride Route": "骑行线路",
     "Continue riding?": "继续骑行？",
@@ -309,7 +311,10 @@
     "Distance King": "里程王",
     "Power King": "功率王",
     "Climbing King": "爬坡王",
-    "WAIT": "稍后"
+    "WAIT": "稍后",
+    "RIDERS": "骑行人数",
+    "Current ride distance too short to save.": "当前骑行距离过短无法保存",
+    "NO RIDERS": "暂无用户"
   },
   "en": {
     "HOT ROUTES": "HOT ROUTES",
@@ -539,7 +544,9 @@
     "DEVICE": "DEVICE",
     "QUIT": "QUIT",
     "Continue": "Continue",
+    "CONTINUE": "CONTINUE",
     "Ride Again": "Ride Again",
+    "RERIDE": "RERIDE",
     "Delete": "Delete",
     "Ride Route": "Ride Route",
     "Ride": "Ride",
@@ -609,10 +616,13 @@
     "View All": "View All",
     "ABOUT": "ABOUT",
     "No Net": "No Net",
-    "PERFECT INFORMATION": "PERFECT INFORMATION",
+    "PERFECT INFORMATION": "COMPLETE INFORMATION",
     "Distance King": "Distance King",
     "Power King": "Power King",
     "Climbing King": "Climbing King",
-    "WAIT": "WAIT"
+    "WAIT": "WAIT",
+    "RIDERS": "RIDERS",
+    "Current ride distance too short to save.": "Current ride distance too short to save.",
+    "NO RIDERS": "NO RIDERS"
   }
 }

Assets/Scenes/MainScene.unity

@@ -121,7 +121,7 @@ NavMeshSettings:
     debug:
       m_Flags: 0
   m_NavMeshData: {fileID: 0}
---- !u!21 &94439478
+--- !u!21 &120553182
 Material:
   serializedVersion: 6
   m_ObjectHideFlags: 0
@@ -206,7 +206,7 @@ Material:
     m_Colors:
     - _Color: {r: 1, g: 1, b: 1, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-    - _WidthHeightRadius: {r: 280, g: 44, b: 44, a: 0}
+    - _WidthHeightRadius: {r: 30, g: 30, b: 26, a: 0}
 --- !u!1 &154299661
 GameObject:
   m_ObjectHideFlags: 0
@@ -285,92 +285,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 154299661}
   m_CullTransparentMesh: 0
---- !u!21 &182170215
-Material:
-  serializedVersion: 6
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: RoundedCornersTextureMaterial(Clone)
-  m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3}
-  m_ShaderKeywords: 
-  m_LightmapFlags: 4
-  m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
-  stringTagMap: {}
-  disabledShaderPasses: []
-  m_SavedProperties:
-    serializedVersion: 3
-    m_TexEnvs:
-    - _BumpMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailAlbedoMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailMask:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailNormalMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _EmissionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MainTex:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MetallicGlossMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _OcclusionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _ParallaxMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    m_Floats:
-    - _BumpScale: 1
-    - _ColorMask: 15
-    - _Cutoff: 0.5
-    - _DetailNormalMapScale: 1
-    - _DstBlend: 0
-    - _GlossMapScale: 1
-    - _Glossiness: 0.5
-    - _GlossyReflections: 1
-    - _Height: 50
-    - _Metallic: 0
-    - _Mode: 0
-    - _OcclusionStrength: 1
-    - _Parallax: 0.02
-    - _Radius: 15
-    - _SmoothnessTextureChannel: 0
-    - _SpecularHighlights: 1
-    - _SrcBlend: 1
-    - _Stencil: 0
-    - _StencilComp: 8
-    - _StencilOp: 0
-    - _StencilReadMask: 255
-    - _StencilWriteMask: 255
-    - _UVSec: 0
-    - _UseUIAlphaClip: 0
-    - _Width: 50
-    - _ZWrite: 1
-    m_Colors:
-    - _Color: {r: 1, g: 1, b: 1, a: 1}
-    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-    - _WidthHeightRadius: {r: 26, g: 26, b: 26, a: 0}
 --- !u!1 &273807000
 GameObject:
   m_ObjectHideFlags: 0
@@ -574,205 +488,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 313551262}
   m_CullTransparentMesh: 0
---- !u!1001 &575234469
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 1378474436}
-    m_Modifications:
-    - target: {fileID: 3342506722007875022, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
-        type: 3}
-      propertyPath: m_Name
-      value: MessageRight
-      objectReference: {fileID: 0}
-    - target: {fileID: 3342506722007875022, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
-        type: 3}
-      propertyPath: m_IsActive
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 3342506722007875056, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
-        type: 3}
-      propertyPath: m_Material
-      value: 
-      objectReference: {fileID: 1651577591}
-    - target: {fileID: 3342506722007875057, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
-        type: 3}
-      propertyPath: m_Pivot.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3342506722007875057, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
-        type: 3}
-      propertyPath: m_Pivot.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 3342506722007875057, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
-        type: 3}
-      propertyPath: m_RootOrder
-      value: 2
-      objectReference: {fileID: 0}
-    - target: {fileID: 3342506722007875057, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
-        type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3342506722007875057, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
-        type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 3342506722007875057, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
-        type: 3}
-      propertyPath: m_AnchorMin.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3342506722007875057, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
-        type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 3342506722007875057, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
-        type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 280
-      objectReference: {fileID: 0}
-    - target: {fileID: 3342506722007875057, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
-        type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 44
-      objectReference: {fileID: 0}
-    - target: {fileID: 3342506722007875057, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
-        type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3342506722007875057, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
-        type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3342506722007875057, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
-        type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3342506722007875057, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
-        type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 3342506722007875057, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
-        type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3342506722007875057, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
-        type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3342506722007875057, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
-        type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3342506722007875057, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
-        type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 1176
-      objectReference: {fileID: 0}
-    - target: {fileID: 3342506722007875057, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
-        type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -40
-      objectReference: {fileID: 0}
-    - target: {fileID: 3342506722007875057, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3342506722007875057, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3342506722007875057, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3342506722007875061, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
-        type: 3}
-      propertyPath: m_Color2.a
-      value: 0.29803923
-      objectReference: {fileID: 0}
-    - target: {fileID: 3342506722007875061, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
-        type: 3}
-      propertyPath: m_Color2.b
-      value: 0.1764706
-      objectReference: {fileID: 0}
-    - target: {fileID: 3342506722007875061, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
-        type: 3}
-      propertyPath: m_Color2.g
-      value: 0.13725491
-      objectReference: {fileID: 0}
-    - target: {fileID: 3342506722007875061, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
-        type: 3}
-      propertyPath: m_Color2.r
-      value: 0.13725491
-      objectReference: {fileID: 0}
-    - target: {fileID: 3342506723879539847, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
-        type: 3}
-      propertyPath: m_Material
-      value: 
-      objectReference: {fileID: 1824930348}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 10e54cf0bec9cbc4b94d1d40e437f87c, type: 3}
---- !u!224 &575234470 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 3342506722007875057, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
-    type: 3}
-  m_PrefabInstance: {fileID: 575234469}
-  m_PrefabAsset: {fileID: 0}
---- !u!1 &575234471 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 3342506722007875022, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
-    type: 3}
-  m_PrefabInstance: {fileID: 575234469}
-  m_PrefabAsset: {fileID: 0}
---- !u!225 &575234472
-CanvasGroup:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 575234471}
-  m_Enabled: 1
-  m_Alpha: 0
-  m_Interactable: 1
-  m_BlocksRaycasts: 1
-  m_IgnoreParentGroups: 0
---- !u!223 &575234473
-Canvas:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 575234471}
-  m_Enabled: 1
-  serializedVersion: 3
-  m_RenderMode: 2
-  m_Camera: {fileID: 0}
-  m_PlaneDistance: 100
-  m_PixelPerfect: 0
-  m_ReceivesEvents: 1
-  m_OverrideSorting: 0
-  m_OverridePixelPerfect: 0
-  m_SortingBucketNormalizedSize: 0
-  m_AdditionalShaderChannelsFlag: 0
-  m_SortingLayerID: 0
-  m_SortingOrder: 0
-  m_TargetDisplay: 0
 --- !u!1 &684809389
 GameObject:
   m_ObjectHideFlags: 0
@@ -1171,92 +886,6 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 90, y: -30, z: 0}
---- !u!21 &1180006863
-Material:
-  serializedVersion: 6
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: RoundedCornersTextureMaterial(Clone)
-  m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3}
-  m_ShaderKeywords: 
-  m_LightmapFlags: 4
-  m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
-  stringTagMap: {}
-  disabledShaderPasses: []
-  m_SavedProperties:
-    serializedVersion: 3
-    m_TexEnvs:
-    - _BumpMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailAlbedoMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailMask:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailNormalMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _EmissionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MainTex:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MetallicGlossMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _OcclusionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _ParallaxMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    m_Floats:
-    - _BumpScale: 1
-    - _ColorMask: 15
-    - _Cutoff: 0.5
-    - _DetailNormalMapScale: 1
-    - _DstBlend: 0
-    - _GlossMapScale: 1
-    - _Glossiness: 0.5
-    - _GlossyReflections: 1
-    - _Height: 50
-    - _Metallic: 0
-    - _Mode: 0
-    - _OcclusionStrength: 1
-    - _Parallax: 0.02
-    - _Radius: 15
-    - _SmoothnessTextureChannel: 0
-    - _SpecularHighlights: 1
-    - _SrcBlend: 1
-    - _Stencil: 0
-    - _StencilComp: 8
-    - _StencilOp: 0
-    - _StencilReadMask: 255
-    - _StencilWriteMask: 255
-    - _UVSec: 0
-    - _UseUIAlphaClip: 0
-    - _Width: 50
-    - _ZWrite: 1
-    m_Colors:
-    - _Color: {r: 1, g: 1, b: 1, a: 1}
-    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-    - _WidthHeightRadius: {r: 280, g: 44, b: 44, a: 0}
 --- !u!1 &1378474435
 GameObject:
   m_ObjectHideFlags: 0
@@ -1286,7 +915,6 @@ RectTransform:
   m_Children:
   - {fileID: 154299662}
   - {fileID: 1426339559}
-  - {fileID: 575234470}
   m_Father: {fileID: 273807004}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1316,7 +944,7 @@ PrefabInstance:
         type: 3}
       propertyPath: m_Material
       value: 
-      objectReference: {fileID: 1180006863}
+      objectReference: {fileID: 1566610279}
     - target: {fileID: 3342506722007875057, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
         type: 3}
       propertyPath: m_Pivot.x
@@ -1355,12 +983,12 @@ PrefabInstance:
     - target: {fileID: 3342506722007875057, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
         type: 3}
       propertyPath: m_SizeDelta.x
-      value: 280
+      value: 446
       objectReference: {fileID: 0}
     - target: {fileID: 3342506722007875057, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
         type: 3}
       propertyPath: m_SizeDelta.y
-      value: 44
+      value: 70
       objectReference: {fileID: 0}
     - target: {fileID: 3342506722007875057, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
         type: 3}
@@ -1400,12 +1028,12 @@ PrefabInstance:
     - target: {fileID: 3342506722007875057, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 390
+      value: 1014
       objectReference: {fileID: 0}
     - target: {fileID: 3342506722007875057, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -40
+      value: -451
       objectReference: {fileID: 0}
     - target: {fileID: 3342506722007875057, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
         type: 3}
@@ -1422,6 +1050,11 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 3342506722007875058, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
+        type: 3}
+      propertyPath: radius
+      value: 35
+      objectReference: {fileID: 0}
     - target: {fileID: 3342506722007875061, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
         type: 3}
       propertyPath: m_Color2.a
@@ -1442,11 +1075,111 @@ PrefabInstance:
       propertyPath: m_Color2.r
       value: 0.13725491
       objectReference: {fileID: 0}
+    - target: {fileID: 3342506723743580662, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: -76
+      objectReference: {fileID: 0}
+    - target: {fileID: 3342506723743580662, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 20
+      objectReference: {fileID: 0}
+    - target: {fileID: 3342506723743580662, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 28
+      objectReference: {fileID: 0}
+    - target: {fileID: 3342506723743580662, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -13
+      objectReference: {fileID: 0}
+    - target: {fileID: 3342506723743580665, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
+        type: 3}
+      propertyPath: m_FontData.m_FontSize
+      value: 17
+      objectReference: {fileID: 0}
+    - target: {fileID: 3342506723743580665, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
+        type: 3}
+      propertyPath: m_FontData.m_Alignment
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 3342506723879539844, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 50
+      objectReference: {fileID: 0}
+    - target: {fileID: 3342506723879539844, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 50
+      objectReference: {fileID: 0}
+    - target: {fileID: 3342506723879539844, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 10
+      objectReference: {fileID: 0}
     - target: {fileID: 3342506723879539847, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
         type: 3}
       propertyPath: m_Material
       value: 
-      objectReference: {fileID: 182170215}
+      objectReference: {fileID: 120553182}
+    - target: {fileID: 3342506723879539849, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
+        type: 3}
+      propertyPath: radius
+      value: 25
+      objectReference: {fileID: 0}
+    - target: {fileID: 4467515848031294650, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: -76
+      objectReference: {fileID: 0}
+    - target: {fileID: 4467515848031294650, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 20
+      objectReference: {fileID: 0}
+    - target: {fileID: 4467515848031294650, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 28
+      objectReference: {fileID: 0}
+    - target: {fileID: 4467515848031294650, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -37
+      objectReference: {fileID: 0}
+    - target: {fileID: 4864779298271313415, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
+        type: 3}
+      propertyPath: m_FontData.m_FontSize
+      value: 17
+      objectReference: {fileID: 0}
+    - target: {fileID: 7479474444580396582, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
+        type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 7479474444580396582, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7479474444580396582, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 20
+      objectReference: {fileID: 0}
+    - target: {fileID: 7479474444580396582, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7479474444580396582, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 10e54cf0bec9cbc4b94d1d40e437f87c, type: 3}
 --- !u!224 &1426339559 stripped
@@ -1455,33 +1188,98 @@ RectTransform:
     type: 3}
   m_PrefabInstance: {fileID: 1426339558}
   m_PrefabAsset: {fileID: 0}
+--- !u!21 &1469391097
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: RoundedCornersTextureMaterial(Clone)
+  m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3}
+  m_ShaderKeywords: 
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _BumpScale: 1
+    - _ColorMask: 15
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Height: 50
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _Radius: 15
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _Stencil: 0
+    - _StencilComp: 8
+    - _StencilOp: 0
+    - _StencilReadMask: 255
+    - _StencilWriteMask: 255
+    - _UVSec: 0
+    - _UseUIAlphaClip: 0
+    - _Width: 50
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _WidthHeightRadius: {r: 50, g: 50, b: 50, a: 0}
 --- !u!1 &1565405865 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 3342506722007875022, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
     type: 3}
   m_PrefabInstance: {fileID: 1426339558}
   m_PrefabAsset: {fileID: 0}
---- !u!223 &1565405866
-Canvas:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1565405865}
-  m_Enabled: 1
-  serializedVersion: 3
-  m_RenderMode: 2
-  m_Camera: {fileID: 0}
-  m_PlaneDistance: 100
-  m_PixelPerfect: 0
-  m_ReceivesEvents: 1
-  m_OverrideSorting: 0
-  m_OverridePixelPerfect: 0
-  m_SortingBucketNormalizedSize: 0
-  m_AdditionalShaderChannelsFlag: 0
-  m_SortingLayerID: 0
-  m_SortingOrder: 0
-  m_TargetDisplay: 0
 --- !u!225 &1565405867
 CanvasGroup:
   m_ObjectHideFlags: 0
@@ -1490,11 +1288,11 @@ CanvasGroup:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1565405865}
   m_Enabled: 1
-  m_Alpha: 0
+  m_Alpha: 1
   m_Interactable: 1
   m_BlocksRaycasts: 1
   m_IgnoreParentGroups: 0
---- !u!21 &1611774150
+--- !u!21 &1566610279
 Material:
   serializedVersion: 6
   m_ObjectHideFlags: 0
@@ -1579,179 +1377,7 @@ Material:
     m_Colors:
     - _Color: {r: 1, g: 1, b: 1, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-    - _WidthHeightRadius: {r: 26, g: 26, b: 26, a: 0}
+    - _WidthHeightRadius: {r: 273, g: 44, b: 44, a: 0}
---- !u!21 &1651577591
-Material:
-  serializedVersion: 6
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: RoundedCornersTextureMaterial(Clone)
-  m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3}
-  m_ShaderKeywords: 
-  m_LightmapFlags: 4
-  m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
-  stringTagMap: {}
-  disabledShaderPasses: []
-  m_SavedProperties:
-    serializedVersion: 3
-    m_TexEnvs:
-    - _BumpMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailAlbedoMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailMask:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailNormalMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _EmissionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MainTex:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MetallicGlossMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _OcclusionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _ParallaxMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    m_Floats:
-    - _BumpScale: 1
-    - _ColorMask: 15
-    - _Cutoff: 0.5
-    - _DetailNormalMapScale: 1
-    - _DstBlend: 0
-    - _GlossMapScale: 1
-    - _Glossiness: 0.5
-    - _GlossyReflections: 1
-    - _Height: 50
-    - _Metallic: 0
-    - _Mode: 0
-    - _OcclusionStrength: 1
-    - _Parallax: 0.02
-    - _Radius: 15
-    - _SmoothnessTextureChannel: 0
-    - _SpecularHighlights: 1
-    - _SrcBlend: 1
-    - _Stencil: 0
-    - _StencilComp: 8
-    - _StencilOp: 0
-    - _StencilReadMask: 255
-    - _StencilWriteMask: 255
-    - _UVSec: 0
-    - _UseUIAlphaClip: 0
-    - _Width: 50
-    - _ZWrite: 1
-    m_Colors:
-    - _Color: {r: 1, g: 1, b: 1, a: 1}
-    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-    - _WidthHeightRadius: {r: 280, g: 44, b: 44, a: 0}
---- !u!21 &1656986731
-Material:
-  serializedVersion: 6
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: RoundedCornersTextureMaterial(Clone)
-  m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3}
-  m_ShaderKeywords: 
-  m_LightmapFlags: 4
-  m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
-  stringTagMap: {}
-  disabledShaderPasses: []
-  m_SavedProperties:
-    serializedVersion: 3
-    m_TexEnvs:
-    - _BumpMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailAlbedoMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailMask:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailNormalMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _EmissionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MainTex:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MetallicGlossMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _OcclusionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _ParallaxMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    m_Floats:
-    - _BumpScale: 1
-    - _ColorMask: 15
-    - _Cutoff: 0.5
-    - _DetailNormalMapScale: 1
-    - _DstBlend: 0
-    - _GlossMapScale: 1
-    - _Glossiness: 0.5
-    - _GlossyReflections: 1
-    - _Height: 50
-    - _Metallic: 0
-    - _Mode: 0
-    - _OcclusionStrength: 1
-    - _Parallax: 0.02
-    - _Radius: 15
-    - _SmoothnessTextureChannel: 0
-    - _SpecularHighlights: 1
-    - _SrcBlend: 1
-    - _Stencil: 0
-    - _StencilComp: 8
-    - _StencilOp: 0
-    - _StencilReadMask: 255
-    - _StencilWriteMask: 255
-    - _UVSec: 0
-    - _UseUIAlphaClip: 0
-    - _Width: 50
-    - _ZWrite: 1
-    m_Colors:
-    - _Color: {r: 1, g: 1, b: 1, a: 1}
-    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-    - _WidthHeightRadius: {r: 26, g: 26, b: 26, a: 0}
 --- !u!1 &1726804851
 GameObject:
   m_ObjectHideFlags: 0
@@ -1830,7 +1456,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1726804851}
   m_CullTransparentMesh: 0
---- !u!21 &1769269435
+--- !u!21 &1729208821
 Material:
   serializedVersion: 6
   m_ObjectHideFlags: 0
@@ -1915,93 +1541,7 @@ Material:
     m_Colors:
     - _Color: {r: 1, g: 1, b: 1, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-    - _WidthHeightRadius: {r: 280, g: 44, b: 44, a: 0}
+    - _WidthHeightRadius: {r: 446, g: 70, b: 70, a: 0}
---- !u!21 &1824930348
-Material:
-  serializedVersion: 6
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: RoundedCornersTextureMaterial(Clone)
-  m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3}
-  m_ShaderKeywords: 
-  m_LightmapFlags: 4
-  m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
-  stringTagMap: {}
-  disabledShaderPasses: []
-  m_SavedProperties:
-    serializedVersion: 3
-    m_TexEnvs:
-    - _BumpMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailAlbedoMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailMask:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailNormalMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _EmissionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MainTex:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MetallicGlossMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _OcclusionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _ParallaxMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    m_Floats:
-    - _BumpScale: 1
-    - _ColorMask: 15
-    - _Cutoff: 0.5
-    - _DetailNormalMapScale: 1
-    - _DstBlend: 0
-    - _GlossMapScale: 1
-    - _Glossiness: 0.5
-    - _GlossyReflections: 1
-    - _Height: 50
-    - _Metallic: 0
-    - _Mode: 0
-    - _OcclusionStrength: 1
-    - _Parallax: 0.02
-    - _Radius: 15
-    - _SmoothnessTextureChannel: 0
-    - _SpecularHighlights: 1
-    - _SrcBlend: 1
-    - _Stencil: 0
-    - _StencilComp: 8
-    - _StencilOp: 0
-    - _StencilReadMask: 255
-    - _StencilWriteMask: 255
-    - _UVSec: 0
-    - _UseUIAlphaClip: 0
-    - _Width: 50
-    - _ZWrite: 1
-    m_Colors:
-    - _Color: {r: 1, g: 1, b: 1, a: 1}
-    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-    - _WidthHeightRadius: {r: 26, g: 26, b: 26, a: 0}
 --- !u!1 &1962586925
 GameObject:
   m_ObjectHideFlags: 0

Assets/Scenes/Ride.unity

@@ -1972,7 +1972,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!1 &286379890
 GameObject:
   m_ObjectHideFlags: 0
@@ -4630,6 +4630,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 3622b843b296d2e46ba722beb139f040, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  newNav: {fileID: 0}
 --- !u!222 &878222276
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -4894,12 +4895,14 @@ MonoBehaviour:
   map: {fileID: 159634025}
   player: {fileID: 286379776}
   UIObject: {fileID: 1554806540}
-  preticks: 0
+  minicamera: {fileID: 0}
   isQuit: 0
   isPause: 0
+  RotateLock: 1
   singleUIManager: {fileID: 0}
   map3d: {fileID: 0}
   Is3dView: 0
+  RankingId: 0
 --- !u!1 &1525557491
 GameObject:
   m_ObjectHideFlags: 0
@@ -5220,6 +5223,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 3622b843b296d2e46ba722beb139f040, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  newNav: {fileID: 0}
 --- !u!222 &1900532202
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -5246,7 +5250,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &2145970966
 Transform:
   m_ObjectHideFlags: 0

Assets/Scripts/Apis/Models/MapRouteArea.cs

@@ -96,7 +96,7 @@ namespace Assets.Scripts.Apis.Models
         public bool IsFav { get; set; }
     }
 
-    public class MapRouteAreaDetail 
+    public class MapRouteAreaDetail
     {
         /// <summary>
         /// 
@@ -141,6 +141,14 @@ namespace Assets.Scripts.Apis.Models
         public bool IsFav { get; set; }
         public string CreateUserHead { get; set; }
         public string CreateUserName { get; set; }
+        public List<MapRouteAreaDetailUser> UserList { get; set; }
+    }
+    public class MapRouteAreaDetailUser
+    {
+        public int Id { get; set; }
+        public string NickName { get; set; }
+        public string WxHeadImg { get; set; }
+        public string Phone { get; set; }
     }
 
     public class MapRouteAreaRouteList

Assets/Scripts/Apis/PfHttpClientHandler.cs

@@ -16,6 +16,7 @@ namespace Assets.Scripts.Apis
         protected async override Task<HttpResponseMessage> SendAsync(
         HttpRequestMessage request, CancellationToken cancellationToken)
         {
+            var badreqText = App.GetLocalLanguage() == "zh" ? "请检查网络连接是否正常" : "Please check if the network connection is normal.";
             try
             {
                 var response = await base.SendAsync(request, cancellationToken).ConfigureAwait(false);
@@ -36,7 +37,7 @@ namespace Assets.Scripts.Apis
                 }
                 if (response.StatusCode != System.Net.HttpStatusCode.OK)
                 {
-                    response.Content = new StringContent(new JsonResult<object> { result = false, errMsg = "Please check if the network connection is normal.", data = null }.ToString());
+                    response.Content = new StringContent(new JsonResult<object> { result = false, errMsg = badreqText, data = null }.ToString());
                 }
                 return response;
             }
@@ -46,7 +47,7 @@ namespace Assets.Scripts.Apis
                 HttpResponseMessage httpResponse = new HttpResponseMessage
                 {
                     StatusCode = System.Net.HttpStatusCode.BadRequest,
-                    Content = new StringContent(new JsonResult<object> { result = false, errMsg = "Please check if the network connection is normal.", data = null }.ToString())
+                    Content = new StringContent(new JsonResult<object> { result = false, errMsg = badreqText, data = null }.ToString())
                 };
                 return httpResponse;
             }

Assets/Scripts/App.cs

@@ -19,7 +19,7 @@ public delegate void ChangeLanguageDelegate();
 
 public static class App
 {
-    public static string Host = "http://192.168.0.101:5083/";
+    public static string Host = "http://192.168.0.101:5084/";
 
     public static string AppVersion = Application.version;
 
@@ -152,6 +152,9 @@ public static class App
         {
             language = "en";
         }
+#if UNITY_EDITOR
+        //language = "en";
+#endif
         var a = Resources.Load<TextAsset>("UI/language");
         dic = JsonConvert.DeserializeObject<Dictionary<string, Dictionary<string, string>>>(a.text);
         if (dic.ContainsKey(language))
@@ -177,12 +180,17 @@ public static class App
             }
         }
     }
+    public static Dictionary<string, string> websiteDict = new Dictionary<string, string>()
+    {
+        {"https://wx.powerfun.com.cn/","http://www.powerfun.com/" },
+        {"http://pf.juze.pro/","http://pfweb.juze.pro/" }
+    };
     static App()
     {
         InitLanguage();
 #if !UNITY_EDITOR
+      //测试服务器
       //Host = "http://pf.juze.pro/";
-      //Host = "http://192.168.0.101:5087/";
       //UdpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 21000);
       //TcpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 21001);
       //线上
@@ -193,12 +201,12 @@ public static class App
         //Host = "http://192.168.0.101:5085/";
         //UdpAddress = new IPEndPoint(IPAddress.Parse("192.168.0.97"), 11000);
         //TcpAddress = new IPEndPoint(IPAddress.Parse("192.168.0.102"), 21001);
-        //Debug.unityLogger.logEnabled = false;
+        Debug.unityLogger.logEnabled = false;
 #else 
         //Host = "http://pf.juze.pro/";
         //Host = "http://192.168.0.101:5087/";
-        UdpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 21000);
+        UdpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 11000);
-        TcpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 21001);
+        TcpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 11001);
         //UdpAddress = new IPEndPoint(IPAddress.Parse("192.168.0.102"), 21001);
         //TcpAddress = new IPEndPoint(IPAddress.Parse("192.168.0.102"), 21001);
 #endif

Assets/Scripts/Mobile/LoginControllerMobile.cs

@@ -19,8 +19,6 @@ public class LoginControllerMobile : MonoBehaviour, INativeOnMobileWxLoginResp
 
     void Awake()
     {
-        transform.Find("Panel/LoginContainer/LoginScrollView/Viewport/Content/FormContainer-Login/Mask/FormContainer/otherContainer/Wechat")
-                .gameObject.SetActive(App.weChatController.IsWeChatAppInstalled());
         loginScrollView = transform.Find("Panel/LoginContainer/LoginScrollView").GetComponent<ScrollRect>();
         thirdLoginPage = loginScrollView.content.Find("FormContainer-Login/Mask/FormContainer-third");
         //UIManager.AddEvent(loginScrollView.content.Find("FormContainer-Login/Mask/FormContainer/BtnThirdLogin").gameObject,
@@ -44,6 +42,12 @@ public class LoginControllerMobile : MonoBehaviour, INativeOnMobileWxLoginResp
             DateTime.Now.ToString("HH:mm");
         weChat = App.weChatController;
         weChat.Init(App.WxAppId);
+#if UNITY_IOS
+        transform.Find("Panel/LoginContainer/LoginScrollView/Viewport/Content/FormContainer-Login/Mask/FormContainer/otherContainer/Wechat")
+                .gameObject.SetActive(App.weChatController.IsWeChatAppInstalled());
+        transform.Find("Panel/LoginContainer/LoginScrollView/Viewport/Content/FormContainer-Login/Mask/FormContainer/otherContainer/Google")
+                .gameObject.SetActive(false);
+#endif
 #if UNITY_IOS
         UIManager.AddEvent(transform.Find("Panel/LoginContainer/LoginScrollView/Viewport/Content/FormContainer-Login/Mask/FormContainer/otherContainer/Apple").gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, b =>
          {
@@ -64,7 +68,7 @@ public class LoginControllerMobile : MonoBehaviour, INativeOnMobileWxLoginResp
         });
         UIManager.AddEvent(transform.Find("Panel/LoginContainer/LoginScrollView/Viewport/Content/FormContainer-Login/Mask/FormContainer/otherContainer/Google").gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, b =>
         {
-            //Utils.CallAndroidMethod("signInWithGoogle");
+            Utils.CallAndroidMethod("signInWithGoogle");
         });
         //App.weChatController.Init(App.WxAppId);
         //var s = App.weChatController.isApplicationAvilible("com.gugoumainapp","powerfun").ToString();
@@ -200,6 +204,7 @@ public class LoginControllerMobile : MonoBehaviour, INativeOnMobileWxLoginResp
     public void OnMobileGoogleLoginResp(string res)
     {
         Utils.showToast(null, res);
+        Debug.Log(res);
         //if (res.Contains("true;"))
         //{
         //    GetComponent<LoginController>().goWxLoginWithCode(res.Replace("true;", ""), "mobile");

Assets/Scripts/Mobile/WeChatController.cs

@@ -128,7 +128,7 @@ public class WeChatController
     {
 #if UNITY_ANDROID
         mainActivityClass.CallStatic("ShareWebpageToWX", scene, url, title, description, image);
-#else
+#elif UNITY_IOS
         ShareUrlToWX(scene, url, title, description);
 #endif
     }

Assets/Scripts/Scenes/LoginController.cs

@@ -1156,11 +1156,13 @@ public class LoginController : BaseScene
         imagexf.localPosition = new Vector3(0, -669, 0);
         LoginBg.localPosition = Vector3.zero;
         LoginBg.GetComponent<RectTransform>().sizeDelta = new Vector2(360, 573);
-#endif
+#else
         imagedf.GetComponent<Image>().color = new Color(255, 255, 255, 0);
         imagexf.GetComponent<Image>().color = new Color(255, 255, 255, 0);
         LoginBg.GetComponent<RectTransform>().sizeDelta = new Vector2(354, 370);
         LoginBg.GetComponent<RectTransform>().localPosition = new Vector2(LoginBg.GetComponent<RectTransform>().localPosition.x, 0);
+#endif
+
 
         var scrollValue = 1f / (pageNums - 1);
         var value = 1 * scrollValue;

Assets/Scripts/Scenes/MainController.cs

@@ -73,18 +73,23 @@ public class MainController : BaseScene
     {
 #if UNITY_STANDALONE_WIN
         msgLocation = 1 * msg.transform.localPosition;
-        var msg2 = Instantiate<CanvasGroup>(msg);
+        var go = transform.Find("GameObject");
-        var msg3 = Instantiate<CanvasGroup>(msg);
+        rightMessage = Instantiate<CanvasGroup>(msg);
-        msg2.transform.SetParent(msg.transform.parent);
+        DestroyImmediate(transform.Find("GameObject/Message").gameObject);
-        msg3.transform.SetParent(msg.transform.parent);
+        rightMessage.transform.SetParent(go);
-        msg2.transform.localPosition = 1 * msgLocation;
+        rightMessage.transform.localScale = Vector3.one;
-        msg2.transform.localScale = Vector3.one;
+        rightMessage.transform.localPosition = 1 * msgLocation;
-        msg2.alpha = 0;
+        rightMessage.alpha = 0;
-        msg3.transform.localPosition = 1 * msgLocation;
+        msgs = new List<CanvasGroup> { rightMessage };
-        msg3.transform.localScale = Vector3.one;
+        for (int i = 0; i < 4; i++)
-        msg3.alpha = 0;
+        {
-        msgs = new List<CanvasGroup> { msg, msg2, msg3 };
+            var tmpm = Instantiate<CanvasGroup>(rightMessage);
-        rightMessage = transform.Find("GameObject/MessageRight").GetComponent<CanvasGroup>();
+            tmpm.transform.SetParent(rightMessage.transform.parent);
+            tmpm.transform.localPosition = 1 * msgLocation;
+            tmpm.transform.localScale = Vector3.one;
+            tmpm.alpha = 0;
+            msgs.Add(tmpm);
+        }
 #else
         msgLocation = new Vector3(168, 37-46, 0);
         var go = transform.Find("GameObject");
@@ -93,7 +98,6 @@ public class MainController : BaseScene
         go.GetComponent<RectTransform>().offsetMax = Vector2.zero;
         go.GetComponent<RectTransform>().offsetMin = Vector2.zero;
         DestroyImmediate(transform.Find("GameObject/Message").gameObject);
-        DestroyImmediate(transform.Find("GameObject/MessageRight").gameObject);
         var m = Resources.Load<GameObject>("UI/Prefab/NewRoute/Mobile/Message");
         rightMessage = Instantiate<GameObject>(m).GetComponent<CanvasGroup>();
         
@@ -121,22 +125,26 @@ public class MainController : BaseScene
     {
         //msg.transform.Find("Content")
         emptyt = 0;
-#if UNITY_STANDALONE_WIN
+        //#if UNITY_STANDALONE_WIN
-        Debug.Log(e.content);
+        //        Debug.Log(e.content);
-        if (App.currentPageIsHome)
+        //        if (App.currentPageIsHome)
-        {
+        //        {
-            DoMessage(e);
+        //            DoMessage(e);
-        }
+        //        }
-        else 
+        //        else 
-        {
+        //        {
-            DoMessageRight(e);
+        //            DoMessageRight(e);
-        }
+        //        }
-#else
+        //#else
+        //        if (App.currentPageIsHome)
+        //        {
+        //            DoMessage6(e);
+        //        }
+        //#endif
         if (App.currentPageIsHome)
         {
             DoMessage6(e);
         }
-#endif
     }
     private void DoMessageRight(LinkedMessageEvent e) 
     {
@@ -170,8 +178,15 @@ public class MainController : BaseScene
         }
         msgIndex++;
     }
+#if UNITY_STANDALONE_WIN
+    float moveOffset = 74;
+#else
+    float moveOffset = 38;
+#endif
     private void DoMessage6(LinkedMessageEvent e)
     {
+        //Resources.UnloadUnusedAssets();
+        //GC.Collect();
         var selectIndex = msgIndex % 5;
         var m = msgs[selectIndex];
         if (msgIndex >= 5) //
@@ -181,7 +196,7 @@ public class MainController : BaseScene
             //m.transform.DOLocalMoveY(m.transform.localPosition.y - 38, 0.5f);
             foreach (var item in msgs)
             {
-                se.Join(item.transform.DOLocalMoveY(item.transform.localPosition.y - 38, 0.5f));
+                se.Join(item.transform.DOLocalMoveY(item.transform.localPosition.y - moveOffset, 0.5f));
             }
             se.Join(m.DOFade(0, 0.5f));
             se.Play().onComplete = () =>
@@ -199,7 +214,7 @@ public class MainController : BaseScene
             for (int i = 0; i < msgIndex; i++) 
             {
                 var rect = msgs[i].GetComponent<RectTransform>();
-                se.Join(rect.DOLocalMoveY(rect.localPosition.y - 38, 0.5f));
+                se.Join(rect.DOLocalMoveY(rect.localPosition.y - moveOffset, 0.5f));
             }
             se.Join(m.DOFade(1, 0.5f));
             se.Play();
@@ -210,17 +225,6 @@ public class MainController : BaseScene
 
     void FinishMessage(object sender) 
     {
-#if UNITY_STANDALONE_WIN
-        if ((bool)sender)
-        {
-            FinishMessageRight();
-        }
-        else 
-        {
-            FinishMessageLeft();
-        }
-#else
-        
         if (!(bool)sender)
         {
             //FinishMessage6();
@@ -228,24 +232,36 @@ public class MainController : BaseScene
             DOTween.CompleteAll(true);
             transform.Find("GameObject").gameObject.SetActive(false);
         }
-        else 
+        else
         {
             transform.Find("GameObject").gameObject.SetActive(true);
         }
-#endif
+        //#if UNITY_STANDALONE_WIN
+        //        if ((bool)sender)
+        //        {
+        //            FinishMessageRight();
+        //        }
+        //        else 
+        //        {
+        //            FinishMessageLeft();
+        //        }
+        //#else
+
+
+        //#endif
     }
     void FinishMessageLeft() 
     {
-#if UNITY_STANDALONE_WIN
+//#if UNITY_STANDALONE_WIN
-        msgIndex = 0;
+//        msgIndex = 0;
-        if (msgs != null) 
+//        if (msgs != null) 
-        {
+//        {
-            foreach (var item in msgs)
+//            foreach (var item in msgs)
-            {
+//            {
-                item.DOFade(0, 0.3f);
+//                item.DOFade(0, 0.3f);
-            }
+//            }
-        }
+//        }
-#endif
+//#endif
     }
 
     void FinishMessageRight() 
@@ -347,9 +363,9 @@ public class MainController : BaseScene
             if (App.MainSceneParam["Name"] == "UserInfoPanel")
             {
                 UIManager.ShowUserInfoPanel();
-                #if UNITY_ANDROID || UNITY_IOS
+#if UNITY_ANDROID || UNITY_IOS
                     UIManager.ShowResultListPanel();
-                #endif
+#endif
             }
 
             if (App.MainSceneParam["Name"] == "RaceHomePanel")
@@ -375,11 +391,20 @@ public class MainController : BaseScene
     float emptyt = 0;//用于无消息计时
     float t = 1f;
     float scanTicks = 0;
+    float clearcachet = 30;
     // Update is called once per frame
     protected override void Update()
     {
         base.Update();
-        
+
+        clearcachet -= Time.deltaTime;
+        if (clearcachet <= 0) 
+        {
+            Debug.Log("清一次");
+            Resources.UnloadUnusedAssets();
+            GC.Collect();
+            clearcachet = 30;
+        }
         if (App.canvasWidth != transform.GetComponent<RectTransform>().sizeDelta.x) 
         {
             App.canvasWidth = transform.GetComponent<RectTransform>().sizeDelta.x;
@@ -424,7 +449,8 @@ public class MainController : BaseScene
                     var message = "";
                     if (item.TotalTicks == 0 && item.PreDistance == 0)
                     {
-                        message = lang=="zh"?$"发起了对<color=#f93086>{item.RouteName}</color>的挑战！" : $"started riding <color=#f93086>{item.RouteName}</color>!";
+                        var routeName = string.IsNullOrEmpty(item.RouteName) ? $"#{item.RouteId}" : item.RouteName;
+                        message = lang=="zh"?$"发起了对<color=#f93086>{routeName}</color>的挑战！" : $"started riding <color=#f93086>{item.RouteName}</color>!";
                     }
                     if (item.IsCompleted)
                     {
@@ -436,15 +462,15 @@ public class MainController : BaseScene
                     }
                 }
                 //距离50
-                if (item.EndDistance >= 50)
+                if (item.EndDistance >= 50 && item.EndDistance < 100)
                 {
-                    var message = lang == "zh" ? $"在<color=#f93086>{item.RouteName}</color>中骑行里程达到<color=#e3d427>{"50KM"}</color>！" : $"riding distance reaches <color=#e3d427>{"50KM"}</color> in <color=#f93086>${item.RouteName}</color>!";
+                    var message = lang == "zh" ? $"在<color=#f93086>{item.RouteName}</color>中骑行里程达到<color=#e3d427>{"50KM"}</color>！" : $"riding distance reaches <color=#e3d427>{"50KM"}</color> in <color=#f93086>{item.RouteName}</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=#f93086>{item.RouteName}</color>中骑行里程达到<color=#e3d427>{"100KM"}</color>！" : $"riding distance reaches <color=#e3d427>{"100KM"}</color> in <color=#f93086>${item.RouteName}</color>!";
+                    var message = lang == "zh" ? $"在<color=#f93086>{item.RouteName}</color>中骑行里程达到<color=#e3d427>{"100KM"}</color>！" : $"riding distance reaches <color=#e3d427>{"100KM"}</color> in <color=#f93086>{item.RouteName}</color>!";
                     EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name, item.RouteName), $"{item.RouteId}{item.Name}100KM");
                 }
                 ////速度35
@@ -456,13 +482,13 @@ public class MainController : BaseScene
                 //速度50
                 if (item.Speed >= 50)
                 {
-                    var message = lang == "zh" ? $"在<color=#f93086>{item.RouteName}</color>中骑行速度达到<color=#e3d427>{Math.Round(item.Speed,2)}KM/H</color>！" : $"riding speed reaches <color=#e3d427>{Math.Round(item.Speed, 2)}KM/H</color> in <color=#f93086>${item.RouteName}</color>!";
+                    var message = lang == "zh" ? $"在<color=#f93086>{item.RouteName}</color>中骑行速度达到<color=#e3d427>{Math.Round(item.Speed,2)}KM/H</color>！" : $"riding speed reaches <color=#e3d427>{Math.Round(item.Speed, 2)}KM/H</color> in <color=#f93086>{item.RouteName}</color>!";
                     EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name, item.RouteName), $"{item.RouteId}{item.Name}50KM/H");
                 }
                 //功体比
                 if (item.WeightKg >= 4)
                 {
-                    var message = lang == "zh" ? $"在<color=#f93086>{item.RouteName}</color>中功体比达到<color=#e3d427>{Math.Round(item.WeightKg, 2)}w/kg</color>！" : $" riding PWR reaches <color=#e3d427>{Math.Round(item.WeightKg, 2)}w/kg</color> in <color=#f93086>${item.RouteName}</color>!";
+                    var message = lang == "zh" ? $"在<color=#f93086>{item.RouteName}</color>中功体比达到<color=#e3d427>{Math.Round(item.WeightKg, 2)}w/kg</color>！" : $" riding PWR reaches <color=#e3d427>{Math.Round(item.WeightKg, 2)}w/kg</color> in <color=#f93086>{item.RouteName}</color>!";
                     EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name, item.RouteName), $"{item.RouteId}{item.Name}3WeightKg");
                 }
             }

Assets/Scripts/Scenes/Ride/Competiton/CompetitionLoadingController.cs

@@ -215,13 +215,16 @@ namespace Assets.Scenes.Ride.Scripts
             elevaction.text = Math.Round(route.TotalClimb.GetValueOrDefault(0), 2).ToString() + "M";
             //平均破度
             slope.text = Math.Round(route.AverageGrade, 2).ToString() + "%";
-#if UNITY_IOS || UNITY_ANDROID
+
             //比赛开始时间
-            StartTime.text = competition.StartTime.ToLocalTime().ToString("yyyy/MM/dd HH:mm:ss");//+" TO "+ competition.EndTime.ToLocalTime().ToString();
+            if (App.GetLocalLanguage().Equals("zh"))
-#else
+            {
-            //比赛开始时间
+                StartTime.text = competition.StartTime.ToLocalTime().ToString("yyyy-MM-dd HH:mm:ss");//+" TO "+ competition.EndTime.ToLocalTime().ToString();
-            StartTime.text = competition.StartTime.ToLocalTime().ToString();//+" TO "+ competition.EndTime.ToLocalTime().ToString();
+            }
-#endif
+            else
+            {
+                StartTime.text = competition.StartTime.ToLocalTime().ToString();//+" TO "+ competition.EndTime.ToLocalTime().ToString();
+            }
             //比赛结束时间
             // EndTime.text = competition.EndTime.ToLocalTime().ToString();
             //比赛状态

Assets/Scripts/Scenes/Ride/Competiton/CompetitionResultFactory.cs

@@ -7,6 +7,8 @@ using UnityEngine.EventSystems;
 using UnityEngine.SceneManagement;
 using UnityEngine.UI;
 using DG.Tweening;
+using System;
+using Facebook.Unity;
 
 namespace Assets.Scenes.Ride.Scripts
 {
@@ -64,6 +66,8 @@ namespace Assets.Scenes.Ride.Scripts
             WeChatGpButton = transform.Find("ToolBarPanel/GoogleButton").gameObject;
             UIManager.AddEvent(WeChatButton, UnityEngine.EventSystems.EventTriggerType.PointerClick, ShareWechat);
             UIManager.AddEvent(WeChatGpButton, UnityEngine.EventSystems.EventTriggerType.PointerClick, ShareWechatGp);
+            var fbButton = transform.Find("ToolBarPanel/FaceBookButton").gameObject;
+            UIManager.AddEvent(fbButton, EventTriggerType.PointerClick, shareFb);
 #endif
             SpriteTop = Resources.Load<Sprite>("Images/Ride/Match/top-1");
             SpriteSecond = Resources.Load<Sprite>("Images/Ride/Match/top-2");
@@ -72,6 +76,7 @@ namespace Assets.Scenes.Ride.Scripts
             UIManager.AddEvent(closeBtn, UnityEngine.EventSystems.EventTriggerType.PointerClick, Close);
         }
 
+        
         float time = 1;
         private void Update()
         {
@@ -244,6 +249,14 @@ namespace Assets.Scenes.Ride.Scripts
                 Utils.showToast(null, "未安装微信");
             }
         }
+        private void shareFb(BaseEventData arg0)
+        {
+            //cyclingController.competition.Title, "By " + App.CurrentUser.Nickname, null)
+            FB.ShareLink(contentURL: new Uri($"{App.CurrentUser.WebHost}Mine/MatchPreview?id={cyclingController.competitionId}&Token={App.CurrentUser.cookie}"),
+                contentTitle: cyclingController.competition.Title,
+                contentDescription: "By " + App.CurrentUser.Nickname,
+                photoURL: new Uri(cyclingController.competition.CoverImage));
+        }
 
         private void ShareWechatGp(BaseEventData baseEventData)
         {

Assets/Scripts/Scenes/Ride/Competiton/CompetitionUIManager.cs

@@ -149,6 +149,7 @@ namespace Assets.Scenes.Ride.Scripts
                 mainController.SetQuit();
                 playerController.Upload();
                 quitPanel.SetActive(false);
+                transform.Find("modalPanel").gameObject.SetActive(false);
             }
             ShowResultList();//保存显示当前排名
         }

Assets/Scripts/Scenes/Ride/Scripts/BaseUIManager.cs

@@ -27,6 +27,7 @@ namespace Assets.Scenes.Ride.Scripts
         protected GameObject reviewPanel;
         protected GameObject titlePanel;
         protected GameObject quitPanel;//退出界面
+        protected GameObject cancelPanel;//退出(骑行里程较短不给保存)
 
         protected Text nextSlopeText;//下一个坡度
         protected Text nextSlopeDistanceText;//下一个坡度距离
@@ -120,6 +121,11 @@ namespace Assets.Scenes.Ride.Scripts
         Text totalDistanceCompetition { get; set; }
         GameObject distanceIconCompetition { get; set; }
         GameObject totalDistanceIcon { get; set; }
+
+        GameObject QuitButton;
+        GameObject CancelButton;
+        GameObject modalPanel;
+        GameObject CancelCloseQuitButton;
         private void InitGameObject()
         {
             #region 控件获取与事件绑定
@@ -172,7 +178,23 @@ namespace Assets.Scenes.Ride.Scripts
             selectPanel = uipanel.transform.Find("SelectPanel").gameObject;
             selectPlayer = uipanel.transform.Find("SelectPlayer").gameObject;
             reviewPanel = uipanel.transform.Find("ReviewPanel").gameObject;
-            quitPanel = uipanel.transform.Find("QuitPanel").gameObject;
+            modalPanel = transform.Find("ModalPanel").gameObject;
+#if UNITY_IOS || UNITY_ANDROID
+            var cancelPanelPrefab = Resources.Load<GameObject>("UI/Prefab/Ride/Mobile/CancelPanel");
+            var quitPanelPrefab = Resources.Load<GameObject>("UI/Prefab/Ride/Mobile/QuitPanel");
+            quitPanel = Instantiate<GameObject>(quitPanelPrefab, modalPanel.transform);
+            cancelPanel = Instantiate<GameObject>(cancelPanelPrefab, modalPanel.transform);
+#else
+            var cancelPanelPrefab = Resources.Load<GameObject>("UI/Prefab/Ride/CancelPanel");
+            var quitPanelPrefab = Resources.Load<GameObject>("UI/Prefab/Ride/QuitPanel");
+            quitPanel = Instantiate<GameObject>(quitPanelPrefab, modalPanel.transform);
+            cancelPanel = Instantiate<GameObject>(cancelPanelPrefab, modalPanel.transform);
+#endif
+            quitPanel.SetActive(false);
+            cancelPanel.SetActive(false);
+            QuitButton = cancelPanel.transform.Find("QuitButton").gameObject;
+            CancelButton = cancelPanel.transform.Find("CancelButton").gameObject;
+            CancelCloseQuitButton = cancelPanel.transform.Find("CloseButton").gameObject;
 
             pauseButton = uipanel.transform.Find("ToolBarPanel/StartOrPauseButton").GetComponent<Button>();
             settingButton = uipanel.transform.Find("ToolBarPanel/SettingButton").GetComponent<Button>();
@@ -185,10 +207,11 @@ namespace Assets.Scenes.Ride.Scripts
             singleArea = uipanel.transform.Find("ReviewPanel/SingleArea").gameObject;
             addButton = uipanel.transform.Find("ReviewPanel/SingleArea/AddButton").GetComponent<Button>();
 
-            saveButton = uipanel.transform.Find("QuitPanel/SaveButton").GetComponent<Button>();
+            saveButton = quitPanel.transform.Find("SaveButton").GetComponent<Button>();
-            cancelQuitButton = uipanel.transform.Find("QuitPanel/CancelButton").GetComponent<Button>();
+            cancelQuitButton = quitPanel.transform.Find("CancelButton").GetComponent<Button>();
-            closeQuitButton = uipanel.transform.Find("QuitPanel/CloseButton").GetComponent<Button>();
+            closeQuitButton = quitPanel.transform.Find("CloseButton").GetComponent<Button>();
-            abandonButton = uipanel.transform.Find("QuitPanel/AbandonButton").GetComponent<Button>();
+           
+            abandonButton = quitPanel.transform.Find("AbandonButton").GetComponent<Button>();
 
             viewButton = uipanel.transform.Find("ViewButton").GetComponent<Button>();
 #if UNITY_IOS || UNITY_ANDROID
@@ -239,6 +262,10 @@ namespace Assets.Scenes.Ride.Scripts
             UIManager.AddEvent(singleButton.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerExit, OnPointExit);
             UIManager.AddEvent(shadowButton.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerExit, OnPointExit);
 
+            UIManager.AddEvent(QuitButton, UnityEngine.EventSystems.EventTriggerType.PointerClick, StopShortRide);
+            UIManager.AddEvent(CancelButton, UnityEngine.EventSystems.EventTriggerType.PointerClick, CancelStopShortRide);
+            UIManager.AddEvent(CancelCloseQuitButton, UnityEngine.EventSystems.EventTriggerType.PointerClick, CancelStopShortRide);
+            
 #endregion
         }
         protected virtual void Update()
@@ -487,6 +514,7 @@ namespace Assets.Scenes.Ride.Scripts
                 mainController.SetQuit();
                 playerController?.Upload();
                 quitPanel.SetActive(false);
+                modalPanel.SetActive(false);
             }
             else
             {
@@ -496,6 +524,7 @@ namespace Assets.Scenes.Ride.Scripts
         //不保存退出
         public virtual void CancelQuit(BaseEventData baseEventData)
         {
+            modalPanel.SetActive(false);
             quitPanel.SetActive(false);
             mainController.ClearTempFile();
             SceneManager.LoadScene("MainScene");
@@ -504,6 +533,7 @@ namespace Assets.Scenes.Ride.Scripts
         public void CloseQuit(BaseEventData baseEventData)
         {
             quitPanel.SetActive(false);
+            modalPanel.SetActive(false);
         }
         //切换视角
         public void ChangeView(BaseEventData baseEventData)
@@ -513,17 +543,29 @@ namespace Assets.Scenes.Ride.Scripts
                 mainController.ChangeMapImageStyle(arrow.gameObject);
             }
         }
+        protected virtual void StopShortRide(BaseEventData baseEventData)
+        {
+            SceneManager.LoadScene("MainScene");
+        }
+        protected virtual void CancelStopShortRide(BaseEventData baseEventData)
+        {
+            cancelPanel.SetActive(false);
+            modalPanel.SetActive(false);
+        }
         //结束游戏
         protected virtual void StopRide(BaseEventData baseEventData)
         {
-            if (playerController?.TotalTicks > 0)
+            if (playerController?.TotalTicks > 0 && playerController ?.TotalDistance > 0.1f)
             {
+                modalPanel.SetActive(true);
                 quitPanel.SetActive(true);
                 quitPanel.transform.SetAsLastSibling();
             }
             else
             {
-                SceneManager.LoadScene("MainScene");
+                modalPanel.SetActive(true);
+                cancelPanel.SetActive(true);
+                cancelPanel.transform.SetAsLastSibling();
             }
         }
         //显示设备连接

Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs

@@ -325,8 +325,10 @@ public class CyclingController : DeviceServiceMonoBase
                 if (cameraList == null)
                 {
                     cameraList = new List<Vector3>();
+                    cameraList.Add(neareast);
                     cameraList.Add(near);
                     cameraList.Add(plane);
+                    cameraList.Add(medium);
                     cameraList.Add(far);
                 }
                 var prePos = Camera.main.transform.localPosition;
@@ -413,9 +415,11 @@ public class CyclingController : DeviceServiceMonoBase
     public bool isWatch { get; set; }
     private Vector3 currentCameraPos { get; set; }
 
-    Vector3 far = new Vector3(-18, 50, -48);
+    Vector3 far = new Vector3(-17, 52, -48);
-    Vector3 plane = new Vector3(-15.1f, 42, -40);
+    Vector3 medium = new Vector3(-14.5f, 45, -40);
-    Vector3 near = new Vector3(-11.4f, 31, -30);
+    Vector3 plane = new Vector3(-10.5f, 35, -30); //new Vector3(-11.4f, 31, -30);
+    Vector3 near = new Vector3(-7.3f, 24, -20);
+    Vector3 neareast = new Vector3(-5.4f, 18, -15);
     List<Vector3> cameraList { get; set; }
 
     /// <summary>
@@ -430,8 +434,10 @@ public class CyclingController : DeviceServiceMonoBase
         if (cameraList == null)
         {
             cameraList = new List<Vector3>();
+            cameraList.Add(neareast);
             cameraList.Add(near);
             cameraList.Add(plane);
+            cameraList.Add(medium);
             cameraList.Add(far);
         }
         var prePos = Camera.main.transform.localPosition;
@@ -757,7 +763,10 @@ public class CyclingController : DeviceServiceMonoBase
         player.transform.position = currentPos;
         playerController.currentPos = currentPos;
         var trail = FindObjectOfType<TrailRenderer>();
-        trail.enabled = true;
+        if (trail != null)
+        {
+            trail.enabled = true;
+        }
 
         Vector2d nextLatLon = Along(recorderData.EndDistance + 0.1);
         //设定人物方向
@@ -785,7 +794,7 @@ public class CyclingController : DeviceServiceMonoBase
 public BaseUIManager singleUIManager;
     public void GameStart()
     {
-        Camera.main.transform.DOLocalMove(near, 1.5f);
+        Camera.main.transform.DOLocalMove(neareast, 1f);
         //StartCoroutine(MoveCamera(far, near));//初始摄像头
         var check = CheckAnt();
 #if UNITY_EDITOR
@@ -1260,6 +1269,13 @@ public BaseUIManager singleUIManager;
         index = endDistance >= mapData.TotalDistance ? pointList.Count - 1 : index;
         return index;
     }
+
+    public double Distance(Vector2d from, Vector2d to)
+    { 
+        var pt1 = Turf.Point(new double[] { from.x, from.y });
+        var pt2 = Turf.Point(new double[] { to.x, to.y });
+        return Turf.Distance(pt1, pt2);
+    }
     public Vector2d Along(double endDistance)
     {
         if (mapData != null)

Assets/Scripts/Scenes/Ride/Scripts/LoadingController.cs

@@ -166,6 +166,7 @@ namespace Assets.Scenes.Ride.Scripts
 #else
 			var prefab = Resources.Load<GameObject>("UI/Prefab/Ride/RankingItem");
 			var myprefab = Resources.Load<GameObject>("UI/Prefab/Ride/MySelfRankingItem");
+			var viewAllbtn = Resources.Load<GameObject>("UI/Prefab/Ride/ViewAll");
 #endif
 			var parent = panel.transform.Find("MapRanking");
 			var title = panel.transform.Find("RankingTitle").gameObject;

Assets/Scripts/Scenes/Ride/Scripts/OnlinePlayerController.cs

@@ -163,7 +163,11 @@ namespace Assets.Scenes.Ride.Scripts
             }
             //如果观察的是当前用户 隐藏UI 添加trailrender
             var iscurrentUser = mainController.currentPlayer.UserId == UserId;
-            arrowImage.gameObject.SetActive(!iscurrentUser);
+            var s = mainController.currentPlayer.Currentlatlong;
+            var e = currentlatlong;
+            var distancesss = mainController.Distance(s, e);
+            arrowImage.gameObject.SetActive(!iscurrentUser && distancesss <= 2);
+       
             if (iscurrentUser && trailRenderer  == null)
             {
                 trailRenderer = gameObject.AddComponent<TrailRenderer>();
@@ -172,8 +176,8 @@ namespace Assets.Scenes.Ride.Scripts
                 var Graph2 = mainController.Get3dGraph2(); //Resources.Load<Material>("UI/Material/3dGraph2");
                 trailRenderer.material = Graph2;//new Material[] { Graph2 };
                 trailRenderer.time = 30;
-                trailRenderer.startWidth = 1f;
+                trailRenderer.startWidth = 0.5f;
-                trailRenderer.endWidth = 1f;
+                trailRenderer.endWidth = 0.5f;
                 trailRenderer.startColor = new Color(0.9764706f, 0.1882353f, 0.5254902f, 1f);
                 trailRenderer.endColor = new Color(0.9764706f, 0.1882353f, 0.5254902f, 1f);
                 trailRenderer.shadowCastingMode = UnityEngine.Rendering.ShadowCastingMode.Off;
@@ -282,7 +286,7 @@ namespace Assets.Scenes.Ride.Scripts
             //超出边界隐藏
             var start = graph.HorizontalScrolling;
             var end = graph.HorizontalScrolling + graph.DataSource.HorizontalViewSize;
-            headPanel.SetActive( viewIndex >= start && viewIndex <= end);
+            headPanel.SetActive(nextIndex >= start && nextIndex <= end);
             //显示头像
             if (head == null)
             {

Assets/Scripts/Scenes/Ride/Scripts/ResultPanelScript.cs

@@ -8,6 +8,7 @@ using System;
 using DG.Tweening;
 using UnityEngine.EventSystems;
 using UnityEngine.SceneManagement;
+using Facebook.Unity;
 
 namespace Assets.Scenes.Ride.Scripts
 {
@@ -43,6 +44,8 @@ namespace Assets.Scenes.Ride.Scripts
         GameObject shareWxBtn;
         GameObject shareWxGpButton;
         Transform toolbar;
+        Image DNF;
+        Image newRecord;
         #endregion
 
         CyclingController cyclingController;
@@ -76,6 +79,8 @@ namespace Assets.Scenes.Ride.Scripts
             shareWxBtn = transform.Find("ToolBarPanel/WeChatButton").gameObject;
             shareWxGpButton = transform.Find("ToolBarPanel/GoogleButton").gameObject;
 #endif
+            DNF = transform.Find("DNF").GetComponent<Image>();
+            newRecord = transform.Find("TimePanel/NewRecord").GetComponent<Image>();
         }
 
         public void InjectController(CyclingController controller)
@@ -86,9 +91,19 @@ namespace Assets.Scenes.Ride.Scripts
 #if UNITY_ANDROID || UNITY_IOS
             cyclingController.AddEvent(shareWxBtn, EventTriggerType.PointerClick, shareToWx);
             cyclingController.AddEvent(shareWxGpButton, EventTriggerType.PointerClick, shareToWxGp);
+            var fbButton = transform.Find("ToolBarPanel/FaceBookButton").gameObject;
+            cyclingController.AddEvent(fbButton, EventTriggerType.PointerClick, shareToFb);
 #endif
         }
 
+        private void shareToFb(BaseEventData arg0)
+        {
+            FB.ShareLink(contentURL: new Uri($"{App.CurrentUser.WebHost}RoutesRecords/{cyclingController.RankingId}?Token={App.CurrentUser.cookie}"),
+                contentTitle: cyclingController.mapRoute.Name,
+                contentDescription: "By " + App.CurrentUser.Nickname,
+                photoURL: new Uri(cyclingController.mapRoute.CoverImage));
+        }
+
         private void shareToWx(BaseEventData b)
         {
             if (App.weChatController.IsWeChatAppInstalled())
@@ -123,6 +138,8 @@ namespace Assets.Scenes.Ride.Scripts
             {
                 App.MainSceneParam.Add("Name", "UserInfoPanel");
             }
+         
+            Application.OpenURL($"{App.CurrentUser.WebHost}Mine/Detail/{cyclingController.RankingId}?Token={App.CurrentUser.cookie}");
             SceneManager.LoadScene("MainScene");
         }
 
@@ -133,12 +150,8 @@ namespace Assets.Scenes.Ride.Scripts
         public void SetDataSource(RecorderDataModel record)
         {
             var route = record.CurrentRoute.RouteInstance;
-#if UNITY_ANDROID || UNITY_IOS
+            var dataformt = App.GetLocalLanguage().Equals("zh") ? "yyyy-MM-dd" : "dd-MM-yyyy";
-            //绑定路书信息
+            date.text = record.StartTime.ToString(dataformt);
-            date.text = record.StartTime.ToString("yyyy-MM-dd");
-#else
-            date.text = record.StartTime.ToShortDateString("yyyy-MM-dd");
-#endif
             time.text = record.StartTime.ToShortTimeString();
             level.text = route.Hard;
             mapName.text = route.Name;
@@ -157,6 +170,11 @@ namespace Assets.Scenes.Ride.Scripts
             maxSpeed.text = record.RiderDatas.Max(c => c._Speed).ToString("f1");
             wkgText.text = Math.Round(power / record.CurrentUser.Weight,2).ToString();
             avCadence.text = record.RiderDatas.Average(c => c._Cadence).GetValueOrDefault(0).ToString("f0");
+            
+            DNF.gameObject.SetActive(!record.IsCompleted);
+            var recordImagePath = App.GetLocalLanguage().Equals("zh") ? "Images/Ride/img_newrecord_cn" : "img_newrecord";
+            newRecord.sprite =  Resources.Load<Sprite>(recordImagePath);
+            newRecord.gameObject.SetActive(record.IsCompleted);
         }
     }
 }

Assets/Scripts/Scenes/Ride/Scripts/RouteController.cs

@@ -208,8 +208,8 @@ namespace Assets.Scenes.Ride.Scripts
 			lineRender.positionCount = dat.Count;
 			lineRender.SetPositions(feat.Points[0].ToArray());
 			lineRender.loop = false;
-			lineRender.numCapVertices = 10;
+			//lineRender.numCapVertices = 10;
-			lineRender.numCornerVertices = 30;
+			//lineRender.numCornerVertices = 30;
 
 
 		}
@@ -236,8 +236,8 @@ namespace Assets.Scenes.Ride.Scripts
 			lineRender.positionCount = feat.Count;
 			lineRender.SetPositions(feat.ToArray());
 			lineRender.loop = false;
-			lineRender.numCapVertices = 10;
+			//lineRender.numCapVertices = 10;
-			lineRender.numCornerVertices = 10;
+			//lineRender.numCornerVertices = 10;
 			//
 			lineRender.shadowCastingMode = UnityEngine.Rendering.ShadowCastingMode.Off;
 			lineRender.allowOcclusionWhenDynamic = false;

Assets/Scripts/UI/Control/PfUIButton.cs

@@ -9,6 +9,9 @@ using UnityEngine.EventSystems;
 using UnityEngine.Events;
 using DG.Tweening;
 using System.Timers;
+using System.Collections;
+using DG.Tweening.Core;
+using DG.Tweening.Plugins.Options;
 
 namespace Assets.Scripts.UI.Control
 {
@@ -31,7 +34,11 @@ namespace Assets.Scripts.UI.Control
         //private Texture2D cursor;
         private Outline outline;
         private Button mButton;
-        
+        private Sequence se = null;
+        private Sequence a;
+        private TweenerCore<float, float, FloatOptions> b;
+        private TweenerCore<float, float, FloatOptions> c;
+
         protected void Awake()
         {
 
@@ -120,7 +127,6 @@ namespace Assets.Scripts.UI.Control
             }
         }
         public bool showTooltip { get; set; }
-  
         private void BindEvent()
         {
             Timer timer = new Timer();  
@@ -128,8 +134,9 @@ namespace Assets.Scripts.UI.Control
             var group =  tooltips.GetComponent<CanvasGroup>();
             timer.Elapsed += (r, s) =>
             {
+                Debug.Log(131);
                 timer.Stop();
-                group.DOFade(1, 0.5f);
+                
             };
            
             //鼠标进入
@@ -144,9 +151,26 @@ namespace Assets.Scripts.UI.Control
                 if (!string.IsNullOrWhiteSpace(Tooltips) && showTooltip)
                 {
 #endif
-                    tooltips.GetComponent<CanvasGroup>().alpha = 0f;
+                    
-                    tooltips.SetActive(true);
+                    //tooltips.SetActive(true);
-                    timer.Start();
+                    //tooltips.GetComponent<CanvasGroup>().DOFade(1, 0.5f);
+
+
+                    //tooltips.GetComponent<CanvasGroup>().DOFade(1, 0.5f);
+                    //DOTween.CompleteAll(true);
+                    se = DOTween.Sequence();
+                    se.SetDelay(1);
+                    se.AppendCallback(() =>
+                    {
+                        if(a!=null) a.Complete(true);
+                        if (b != null) b.Complete(true);
+                        tooltips.SetActive(true);
+                        tooltips.GetComponent<CanvasGroup>().alpha = 0f;
+                        c = tooltips.GetComponent<CanvasGroup>().DOFade(1, 0.5f);
+                    });
+                    a = se.Play();
+                    //StartCoroutine(DelayShowTooltip());
+                    //timer.Start();
                 }
                 switch (mType)
                 {
@@ -182,8 +206,11 @@ namespace Assets.Scripts.UI.Control
 #else
                 if (!string.IsNullOrWhiteSpace(Tooltips) && showTooltip)
                 {
-#endif          
+#endif
-                    group.DOFade(0, 1f).onComplete += () => {
+                    if (a != null) a.Complete(true);
+                    if (c != null) c.Complete(true);
+                    b = group.DOFade(0, 1f);
+                    b.onComplete += () => {
                         tooltips.SetActive(false);
                     };
                 }
@@ -215,6 +242,18 @@ namespace Assets.Scripts.UI.Control
             UIManager.AddEvent(this.gameObject, EventTriggerType.PointerDown, new UnityEngine.Events.UnityAction<BaseEventData>(e =>
             {
                 if (!this.isActiveAndEnabled) return;
+                if (a != null) a.Complete(true);
+                if (b != null) b.Complete(true);
+                if (c != null) c.Complete(true);
+                tooltips.SetActive(false);
+
+                //else
+                //{
+                //    DOTween.CompleteAll(true);
+                //    tooltips.SetActive(true);
+                //    tooltips.GetComponent<CanvasGroup>().alpha = 0f;
+                //    tooltips.GetComponent<CanvasGroup>().DOFade(1, 0.5f);
+                //}
                 switch (mType)
                 {
                     case Type.Normal:
@@ -244,7 +283,7 @@ namespace Assets.Scripts.UI.Control
             {
                 if (!this.isActiveAndEnabled) return;
                 //Cursor.SetCursor(null, Vector2.zero, CursorMode.Auto);
-
+                
                 switch (mType)
                 {
                     case Type.Normal:
@@ -275,7 +314,6 @@ namespace Assets.Scripts.UI.Control
             }));
         }
 
-
         public void SetEnabled(bool value)
         {
             base.enabled = value;

Assets/Scripts/UI/Prefab/MainNav.cs

@@ -41,7 +41,7 @@ public class MainNav : MonoBehaviour
 #if UNITY_ANDROID || UNITY_IOS
         UIManager.AddEvent(transform.Find("Delay").gameObject, EventTriggerType.PointerClick, b =>
          {
-             delayTime = 3;
+            delayTime = 3;
              transform.Find("Delay/Tooltips").gameObject.SetActive(true);
              transform.Find("Delay/Tooltips").GetComponent<CanvasGroup>().DOFade(1, 0.5f);
          });
@@ -57,7 +57,22 @@ public class MainNav : MonoBehaviour
         {
             UIManager.ShowPrePanel();
         });
-
+        UIManager.AddEvent(transform.Find("Delay").gameObject, EventTriggerType.PointerClick, x =>
+         {
+             var tooltips = transform.Find("Delay/Tooltips").gameObject;
+             if (tooltips.activeInHierarchy)
+             {
+                 DOTween.CompleteAll(true);
+                 tooltips.SetActive(false);
+             }
+             else 
+             {
+                 DOTween.CompleteAll(true);
+                 tooltips.SetActive(true);
+                 tooltips.GetComponent<CanvasGroup>().alpha = 0f;
+                 tooltips.GetComponent<CanvasGroup>().DOFade(1, 0.5f);
+             }
+         });
         UIManager.AddEvent(transform.Find("Setting").gameObject, EventTriggerType.PointerClick, x =>
         {
             UIManager.ShowSettingModal();
@@ -94,6 +109,7 @@ public class MainNav : MonoBehaviour
     // Update is called once per frame
     void Update()
     {
+#if UNITY_ANDROID || UNITY_IOS
         if (delayTime < 0)
         {
             Debug.Log("小时");
@@ -108,6 +124,7 @@ public class MainNav : MonoBehaviour
             Debug.Log(delayTime);
             delayTime -= Time.deltaTime;
         }
+#endif
     }
 
     public void ShowExit()

Assets/Scripts/UI/Prefab/MapList/MapItem.cs

@@ -128,12 +128,12 @@ public class MapItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandler,
         Utils.DisplayImageTempDict(transform.Find("MapHBImg").GetComponent<RawImage>(), myMap.AltitudeGraph, this.caches);
 
         SetActive4Button(false);
-#if UNITY_ANDROID || UNITY_IOS
+
         var isRecent = App.CurrentRouteType == "Recent Routes" && myMap.RecentRecord != null && myMap.RecentRecord.ContinueCyclingParam != null && !isModal;
         transform.Find("BtnContinue").gameObject.SetActive(isRecent);
         transform.Find("BtnReride").gameObject.SetActive(isRecent);
         transform.Find("MapHBImg").gameObject.SetActive(!isRecent);
-        if (isRecent) 
+        if (isRecent)
         {
             transform.Find("BtnContinue").GetComponent<Button>().onClick.RemoveAllListeners();
             transform.Find("BtnReride").GetComponent<Button>().onClick.RemoveAllListeners();
@@ -143,12 +143,26 @@ public class MapItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandler,
                 {
                     App.RouteIdParam = myMap.RecentRecord.RouteId;
                     App.routeResult = myMap.RecentRecord;
+                    if (area != null)
+                    {
+                        App.MainSceneParam["Name"] = "NewRouteDetail";
+                    }
+                    else
+                    {
+                        if (!App.MainSceneParam.ContainsKey("Name"))
+                        {
+                            App.MainSceneParam.Add("Name", "MapListPanel");
+                        }
+                        else
+                        {
+                            App.MainSceneParam["Name"] = "MapListPanel";
+                        }
+                    }
                     SceneManager.LoadScene("Ride");
                 }
             });
             transform.Find("BtnReride").GetComponent<Button>().onClick.AddListener(Ride);
         }
-#endif
     }
 
     private void Ride()
@@ -185,6 +199,10 @@ public class MapItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandler,
 
     public void OnPointerExit(PointerEventData eventData)
     {
+        if (isModal)
+        {
+            return;
+        }
 #if !(UNITY_ANDROID || UNITY_IOS)
         if (localY != null)
         {
@@ -196,14 +214,15 @@ public class MapItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandler,
         //SetActive4Button(false);
         SetColor(false);
 #else
-        if (!isModal)
+        transform.Find("Shadow").GetComponent<Image>().DOFade(0, 0.3f);
-        {
-            transform.Find("Shadow").GetComponent<Image>().DOFade(0, 0.3f);
-        }
 #endif
     }
     public void OnPointerEnter(PointerEventData eventData)
     {
+        if (isModal)
+        {
+            return;
+        }
 #if !(UNITY_ANDROID || UNITY_IOS)
         if (localY == null)
         {
@@ -216,10 +235,7 @@ public class MapItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandler,
         //SetActive4Button(true);
         SetColor(true);
 #else
-        if (!isModal) 
+        transform.Find("Shadow").GetComponent<Image>().DOFade(1, 0.3f);
-        {
-            transform.Find("Shadow").GetComponent<Image>().DOFade(1, 0.3f);
-        }
 #endif
     }
     void SetActive4Button(bool b)

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

@@ -284,6 +284,14 @@ public class EditUserController : PFUIPanel, INativeOnMobileImageSelect
             string.IsNullOrEmpty(currentUser.Unionid)
             ? Resources.Load<Sprite>("Images/Wechat_person_0")
             : Resources.Load<Sprite>("Images/Wechat_person_1");
+        linkContainer.Find("Fb").GetComponent<Image>().sprite =
+            string.IsNullOrEmpty(currentUser.FacebookUserId)
+            ? Resources.Load<Sprite>("Images/link-facebook")
+            : Resources.Load<Sprite>("Images/Login_Facebook");
+        linkContainer.Find("Ap").GetComponent<Image>().sprite =
+            string.IsNullOrEmpty(currentUser.AppleUserId)
+            ? Resources.Load<Sprite>("Images/link-apple")
+            : Resources.Load<Sprite>("Images/Login_Apple");
     }
     // Start is called before the first frame update
     protected override void Start()

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

@@ -35,19 +35,24 @@ public class HomeController : PFUIPanel
     protected override void Start()
     {
         base.Start();
+        UIManager.AddEvent(transform.Find("TodayData/Avatar").gameObject, EventTriggerType.PointerClick, b =>
+        {
+            UIManager.ShowUserInfoPanel();
+        });
+
 #if UNITY_ANDROID || UNITY_IOS
         var nav = transform.Find("MainNav-mobile").GetComponent<NewMainNav>();
         nav.SetButtonActive(new List<int> { 1, 3, 4, 6 });
         newNav = nav;
-        UIManager.AddEvent(transform.Find("TodayData/Avatar").gameObject, EventTriggerType.PointerClick, b =>
-         {
-             UIManager.ShowUserInfoPanel();
-         });
         UIManager.AddEvent(transform.Find("TodayData/Datas/Distance").gameObject, EventTriggerType.PointerClick, b =>
         {
             UIManager.ShowResultListPanel();
         });
 #else
+        UIManager.AddEvent(transform.Find("TodayData/Datas/Distance").gameObject, EventTriggerType.PointerClick, b =>
+        {
+            UIManager.ShowUserInfoPanel();
+        });
         mainNav = this.transform.Find("MainNav").GetComponent<MainNav>();
         mainNav.ShowExit();
 #endif
@@ -251,6 +256,10 @@ public class HomeController : PFUIPanel
             //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.0")}";
             todayData.Find("Datas/Carlories/Rank").GetComponent<Text>().text = summary.CurrentTotalKcal == 0 ? "——" : $"+{summary.CurrentTotalKcal.ToString("#0")}";
+#if UNITY_STANDALONE_WIN
+            //todayData.Find("NickName").GetComponent<Text>().text = App.CurrentUser.Nickname;
+            //todayData.Find("ID").GetComponent<Text>().text = $"ID:{App.CurrentUser.Id.ToString("000000")}";
+#endif
         }
         
     }
@@ -308,7 +317,7 @@ public class HomeController : PFUIPanel
         if (res.result)
         {
             maxList = res.data;
-            if (maxList.Count >= 3)
+            if (maxList.Count > 0)
             {
                 maxdataTime = 3;
                 maxdataIndex = 0;

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

@@ -110,14 +110,21 @@ public class MapListController : PFUIPanel
             }));
         newNav = nav;
 #else
-        topContainer = transform.Find("Panel").Find("Top");
+        topContainer = transform.Find("Panel/Top/Container");
 #endif
 #if UNITY_STANDALONE_WIN
         btnMapMode = this.transform.Find("SwitchMode").gameObject;
         SetRounded(btnMapMode.transform, 64);
         UIManager.AddEvent(btnMapMode.transform.Find("GoList").gameObject, EventTriggerType.PointerClick, (e) =>
         {
-            Application.OpenURL("http://192.168.0.101:3081/Mine/Upload?token="+ App.CurrentUser.cookie);
+            if (App.websiteDict.ContainsKey(App.Host))
+            {
+                Application.OpenURL($"{App.websiteDict[App.Host]}Mine/Upload?token={App.CurrentUser.cookie}");
+            }
+            else 
+            {
+                Application.OpenURL("http://www.powerfun.com/Mine/Upload?token=" + App.CurrentUser.cookie);
+            }
         });
         transform.Find("MainNav").GetComponent<MainNav>().ShowBack();
 #endif
@@ -318,8 +325,10 @@ public class MapListController : PFUIPanel
         mc.gameObject.SetActive(true);
         mc.GetComponent<CanvasGroup>().alpha = 0;
         mc.GetComponent<CanvasGroup>().DOFade(1, 0.3f);
+#else
+        var topRect = topContainer;
 #endif
-        if (isFocusSearch) 
+        if (isFocusSearch)
         {
             topRect.Find("SearchInput").GetComponent<InputField>().OnPointerClick(new PointerEventData(EventSystem.current));
         }
@@ -356,7 +365,7 @@ public class MapListController : PFUIPanel
     {
         var scrollrect = scroll.GetComponent<ScrollRect>();
         Debug.Log(scrollrect.verticalNormalizedPosition);
-        if (scrollrect.verticalNormalizedPosition <= 0) 
+        if (scrollrect.verticalNormalizedPosition < 0) 
         {
             pageIndex++;
             GetList();
@@ -508,6 +517,8 @@ public class MapListController : PFUIPanel
         }
 #if UNITY_STANDALONE_WIN
         btnMapMode.SetActive(App.CurrentRouteType == "My Upload");
+        topContainer.Find("line2").gameObject.SetActive(App.CurrentRouteType == "All Route");
+        topContainer.Find("SearchInput").gameObject.SetActive(App.CurrentRouteType == "All Route");
 #else
         transform.Find("Upload").gameObject.SetActive(App.CurrentRouteType == "My Upload");
 #endif

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

@@ -43,25 +43,27 @@ public class MapListExtraController : PFUIPanel
         {
             typeSelector.Find("Container/Route").GetComponent<Text>().color = Utils.HexToColorHtml("#ffffff");
             typeSelector.Find("Container1/Collection").GetComponent<Text>().color = Utils.HexToColorHtml("#5c5c6e");
-            typeSelector.Find("Container/Line").gameObject.SetActive(true);
+            SetImageStyle(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");
+            HandleMobileNavCustom(true);
         });
         UIManager.AddEvent(typeSelector.Find("Container1/Collection").gameObject, EventTriggerType.PointerClick, b =>
         {
             typeSelector.Find("Container/Route").GetComponent<Text>().color = Utils.HexToColorHtml("#5c5c6e");
             typeSelector.Find("Container1/Collection").GetComponent<Text>().color = Utils.HexToColorHtml("#ffffff");
-            typeSelector.Find("Container/Line").gameObject.SetActive(false);
+            SetImageStyle(false);
-            typeSelector.Find("Container1/Line").gameObject.SetActive(true);
+            p1.DOLocalMoveX(p1originx - listWidth, 0.5f);
-            p1.DOLocalMoveX(p1originx - 764f, 0.5f);
+            p2.DOLocalMoveX(p2originx - listWidth, 0.5f);
-            p2.DOLocalMoveX(p2originx - 764f, 0.5f);
+            HandleMobileNavCustom(false);
-            transform.Find("Tmp/MainNav-mobile").GetComponent<NewMainNav>().HideButton("Custom");
         });
 
     }
-
+#if UNITY_STANDALONE_WIN
+    float listWidth = 1480f;
+#else
+    float listWidth = 764f;
+#endif
     protected override void Start()
     {
 
@@ -78,6 +80,40 @@ public class MapListExtraController : PFUIPanel
 
     }
     private int pageIndex = 0;
+    void HandleMobileNavCustom(bool b) 
+    {
+#if !UNITY_STANDALONE_WIN
+        if (b)
+        {
+            transform.Find("Tmp/MainNav-mobile").GetComponent<NewMainNav>().ShowButton("Custom");
+        }
+        else 
+        {
+            transform.Find("Tmp/MainNav-mobile").GetComponent<NewMainNav>().HideButton("Custom");
+        }
+#else
+        transform.Find("Panel/Top/Container").gameObject.SetActive(b);
+#endif
+    }
+    void SetImageStyle(bool b) 
+    {
+#if !UNITY_STANDALONE_WIN
+        typeSelector.Find("Container/Line").gameObject.SetActive(b);
+        typeSelector.Find("Container1/Line").gameObject.SetActive(!b);
+#else
+        if (b)
+        {
+            typeSelector.Find("Container").GetComponent<Image>().color = Utils.HexToColorHtml("#f93086ff");
+            typeSelector.Find("Container1").GetComponent<Image>().color = Utils.HexToColorHtml("#f9308600");
+        }
+        else 
+        {
+            typeSelector.Find("Container").GetComponent<Image>().color = Utils.HexToColorHtml("#f9308600");
+            typeSelector.Find("Container1").GetComponent<Image>().color = Utils.HexToColorHtml("#f93086ff");
+        }
+        
+#endif
+    }
     public void HandleCollection()
     {
         if (App.CurrentRouteType == "My Collection")
@@ -93,15 +129,15 @@ public class MapListExtraController : PFUIPanel
         p2.localPosition = new Vector3(p2originx, p2.localPosition.y, p2.localPosition.z);
         typeSelector.Find("Container/Route").GetComponent<Text>().color = Utils.HexToColorHtml("#ffffff");
         typeSelector.Find("Container1/Collection").GetComponent<Text>().color = Utils.HexToColorHtml("#5c5c6e");
-        typeSelector.Find("Container/Line").gameObject.SetActive(true);
+        SetImageStyle(true);
-        typeSelector.Find("Container1/Line").gameObject.SetActive(false);
+        HandleMobileNavCustom(true);
-        transform.Find("Tmp/MainNav-mobile").GetComponent<NewMainNav>().ShowButton("Custom");
     }
     private async void GetList() 
     {
         var res = await ConfigHelper.mapApi.GetMemberMapRouteAreaList(pageIndex, 10);
         if (res.result)
         {
+            p2.Find("Scroll View/Error").gameObject.SetActive(res.data.Count == 0);
             foreach (var area in res.data)
             {
                 var item = Instantiate<Transform>(tmpCollectItem);

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

@@ -60,34 +60,35 @@ public class NewRouteDetailController : PFUIPanel
     }
     void Start()
     {
+        UIManager.AddEvent(transform.Find("Container/Left/Fav").gameObject, EventTriggerType.PointerClick, async b =>
+        {
+            Assets.Scripts.Apis.JsonResult<object> res = null;
+            var p = ((PointerEventData)b).pointerEnter;
+            var act = ((PointerEventData)b).pointerEnter.GetComponent<Image>().sprite.name == "icon_heji_like";
+            if (act)
+            {
+                res = await ConfigHelper.mapApi.CancelAreaFav(area.Id);
+            }
+            else
+            {
+                res = await ConfigHelper.mapApi.AddAreaFav(area.Id);
+            }
+
+            if (res.result)
+            {
+                p.GetComponent<Image>().sprite = FavDict[!act];
+                //Utils.showToast(null, App.GetLocalString("Success"), type: 1);
+            }
+            else
+            {
+                Utils.showToast(null, res.errMsg);
+            }
+        });
 #if UNITY_ANDROID || UNITY_IOS
         var nav = transform.Find("Tmp/MainNav-mobile").GetComponent<NewMainNav>();
         nav.SetButtonActive(new List<int> { 0, 3, 4, 6, 7 }, 0);
         newNav = nav;
-        UIManager.AddEvent(transform.Find("Container/Left/Fav").gameObject, EventTriggerType.PointerClick, async b =>
+        
-         {
-             Assets.Scripts.Apis.JsonResult<object> res = null;
-             var p = ((PointerEventData)b).pointerEnter;
-             var act = ((PointerEventData)b).pointerEnter.GetComponent<Image>().sprite.name == "icon_heji_like";
-             if (act)
-             {
-                 res = await ConfigHelper.mapApi.CancelAreaFav(area.Id);
-             }
-             else 
-             {
-                 res = await ConfigHelper.mapApi.AddAreaFav(area.Id);
-             }
-             
-             if (res.result)
-             {
-                 p.GetComponent<Image>().sprite = FavDict[!act];
-                 //Utils.showToast(null, App.GetLocalString("Success"), type: 1);
-             }
-             else 
-             {
-                 Utils.showToast(null, res.errMsg);
-             }
-         });
 #else
         transform.Find("MainNav").GetComponent<MainNav>().ShowBack();
 #endif
@@ -115,18 +116,19 @@ public class NewRouteDetailController : PFUIPanel
                 OnEndDrag(null);
             }
         }
-        timer -= Time.deltaTime;
+        //timer -= Time.deltaTime;
-        while (timer < 0)
+        //while (timer < 0)
-        {
+        //{
-            var list = MapUDPService.GetAllOnlineUserList();
+        //    var list = MapUDPService.GetAllOnlineUserList();
-            if (list.Count > 0 && routeIds != null)
+        //    if (list.Count > 0 && routeIds != null)
-            {
+        //    {
-                //当前集合骑行人数
+        //        var onlineUserList = list.Where(c => routeIds.Contains(c.RouteId)).ToList();
-                var currentUserCount = list.Where(c => routeIds.Contains(c.RouteId)).Count();
+        //        //当前集合骑行人数
-                Debug.Log($"当前集合骑行人数{currentUserCount}");
+        //        var currentUserCount = onlineUserList.Count();
-            }
+        //        Debug.Log($"当前集合骑行人数{currentUserCount}");
-            timer += 1f;
+        //    }
-        }
+        //    timer += 1f;
+        //}
     }
     MapRouteAreaItem area;
     int pageIndex = 0, pageSize = 10;
@@ -154,33 +156,33 @@ public class NewRouteDetailController : PFUIPanel
             Utils.DisplayImageTempDict(left.Find("Icon").GetComponent<RawImage>(), area.CoverImage, caches
                 , b =>
                  {
-                     if (b != null)
+//                     if (b != null)
-                     {
+//                     {
-                         cacheByte.Add(area.CoverImage, b);
+//                         cacheByte.Add(area.CoverImage, b);
-                     }
+//                     }
-                     else if(cacheByte.ContainsKey(area.CoverImage))
+//                     else if(cacheByte.ContainsKey(area.CoverImage))
-                     {
+//                     {
-                         b = cacheByte[area.CoverImage];
+//                         b = cacheByte[area.CoverImage];
-                     }
+//                     }
                      
-#if UNITY_EDITOR
+//#if UNITY_EDITOR
-                     var _t = new Texture2D(4, 4, TextureFormat.DXT5, false);
+//                     var _t = new Texture2D(4, 4, TextureFormat.DXT5, false);
-#else
+//#else
-#if UNITY_IOS
+//#if UNITY_IOS
-                var _t = new Texture2D(4, 4, TextureFormat.ASTC_RGB_4x4,false);
+//                var _t = new Texture2D(4, 4, TextureFormat.ASTC_RGB_4x4,false);
-                Debug.Log("使用了壓縮");
+//                Debug.Log("使用了壓縮");
-#elif UNITY_ANDROID
+//#elif UNITY_ANDROID
-                var _t = new Texture2D(4, 4, TextureFormat.ASTC_RGB_4x4,false);
+//                var _t = new Texture2D(4, 4, TextureFormat.ASTC_RGB_4x4,false);
-                Debug.Log("使用了壓縮");
+//                Debug.Log("使用了壓縮");
-#else //pc
+//#else //pc
-                var _t = new Texture2D(4, 4, TextureFormat.DXT5,false);
+//                var _t = new Texture2D(4, 4, TextureFormat.DXT5,false);
-#endif
+//#endif
-#endif
+//#endif
-                     _t.LoadImage(b);
+//                     _t.LoadImage(b);
-                     //Graphics.CopyTexture(t, _t);
+//                     //Graphics.CopyTexture(t, _t);
-                     //Debug.Log($"{t.width},{t.height}");
+//                     //Debug.Log($"{t.width},{t.height}");
-                     left.Find("Thumbnail").GetComponent<RawImage>().texture =
+//                     left.Find("Thumbnail").GetComponent<RawImage>().texture =
-                        ScaleTextureCutOut(_t, 0, _t.height / 2, _t.width / 3, _t.height / 3);
+//                        ScaleTextureCutOut(_t, 0, _t.height / 2, _t.width / 3, _t.height / 3);
                  });
             //Utils.DisplayImageTempDict(left.Find("Thumbnail").GetComponent<RawImage>(), area.CoverImage, caches);
         }
@@ -261,6 +263,19 @@ public class NewRouteDetailController : PFUIPanel
             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>());
+            var userinfo = Resources.Load<GameObject>("UI/Prefab/NewRoute/UserInfo");
+#if !(UNITY_ANDROID || UNITY_IOS)
+            transform.Find("Container/Left/NOData").gameObject.SetActive(res.data.UserList.Count == 0);
+            transform.Find("Container/Left/Users").DestroyChildren();
+            foreach (var item in res.data.UserList) 
+            {
+                var info = Instantiate<GameObject>(userinfo);
+                Utils.DisplayImageTempDict(info.transform.Find("Avatar").GetComponent<Image>(), item.WxHeadImg, caches);
+                info.transform.Find("NickName").GetComponent<Text>().text = item.NickName;
+                info.transform.SetParent(transform.Find("Container/Left/Users"));
+                info.transform.localScale = Vector3.one;
+            }
+#endif
         }
     }
 

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

@@ -21,6 +21,7 @@ public class NewRouteOverviewController: PFUIPanel
     {
         caches = new Dictionary<string, Texture>();
         scroll = transform.Find("Container/Right/Scroll View").GetComponent<ScrollRect>();
+#if !UNITY_STANDALONE_WIN
         scroll.onValueChanged.RemoveAllListeners();
         scroll.onValueChanged.AddListener(p=> 
         {
@@ -35,6 +36,7 @@ public class NewRouteOverviewController: PFUIPanel
                 DOTween.To(() => rect.offsetMax, x => rect.offsetMax = x, new Vector2(rect.offsetMax.x, -68), 0.5f);
             }
         });
+#endif
         UIManager.AddEvent(scroll.gameObject, UnityEngine.EventSystems.EventTriggerType.EndDrag, OnEndDrag);
     }
 

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

@@ -76,12 +76,7 @@ public class RaceHomeScript : RaceScript
 #else
         btnGoList = rightContainer.Find("BtnGoList");
         var nav = transform.Find("Tmp/MainNav-mobile").GetComponent<NewMainNav>();
-        nav.SetButtonActive(new List<int> { 2, 3, 4, 6, 7 }, 2,
+        nav.SetButtonActive(new List<int> { 2, 3, 4, 6, 7 }, 2);
-            custom: new NewMainNav.CustomButton(Resources.Load<Sprite>("Images/Race/back down"), () =>
-            {
-                //OpenFilter();
-                UIManager.ShowRaceListPanel();
-            }));
         newNav = nav;
 #endif
         if (btnGoList != null) 

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

@@ -232,37 +232,54 @@ public class RaceListScript : RaceScript
         var mc = transform.Find("MC");
         UIManager.AddEvent(transform.Find("SwitchMode/BtnFilter").gameObject, EventTriggerType.PointerClick, b =>
         {
+            
             conditions.DOLocalMoveX(App.topRectStartX.Value + topRect.rect.width, 0.3f);
             mc.gameObject.SetActive(true);
             mc.GetComponent<CanvasGroup>().alpha = 0;
             mc.GetComponent<CanvasGroup>().DOFade(1, 0.3f);
         });
+        transform.Find("Conditions/Return").gameObject.SetActive(false);
         UIManager.AddEvent(mc.gameObject, EventTriggerType.PointerClick, b =>
         {
-            conditions.DOLocalMoveX(App.topRectStartX.Value, 0.3f);
+            CloseFilter();
-            mc.GetComponent<CanvasGroup>().DOFade(0, 0.3f).onComplete = () =>
+        });
-            {
+        UIManager.AddEvent(transform.Find("Conditions/Return").gameObject, EventTriggerType.PointerClick, b =>
-                mc.gameObject.SetActive(false);
+        {
-            };
+            CloseFilter();
         });
-
         var nav = transform.Find("Tmp/MainNav-mobile").GetComponent<NewMainNav>();
         nav.SetButtonActive(new List<int> { 0, 3, 4, 6, 7 }, 0,
             custom: new NewMainNav.CustomButton(Resources.Load<Sprite>("Images/Mobile/map_筛选"), () =>
             {
-                //OpenFilter();
+                OpenFilter();
-                conditions.DOLocalMoveX(App.topRectStartX.Value + topRect.rect.width, 0.3f);
-                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
 #endif
     }
+
+    private void OpenFilter()
+    {
+        var topRect = conditions.GetComponent<RectTransform>();
+        var mc = transform.Find("MC");
+        transform.Find("Conditions/Return").gameObject.SetActive(true);
+        conditions.DOLocalMoveX(App.topRectStartX.Value + topRect.rect.width, 0.3f);
+        mc.gameObject.SetActive(true);
+        mc.GetComponent<CanvasGroup>().alpha = 0;
+        mc.GetComponent<CanvasGroup>().DOFade(1, 0.3f);
+    }
+
+    private void CloseFilter()
+    {
+        var mc = transform.Find("MC");
+        transform.Find("Conditions/Return").gameObject.SetActive(false);
+        conditions.DOLocalMoveX(App.topRectStartX.Value, 0.3f);
+        mc.GetComponent<CanvasGroup>().DOFade(0, 0.3f).onComplete = () =>
+        {
+            mc.gameObject.SetActive(false);
+        };
+    }
+
     private async Task Login()
     {
         var result = await ConfigHelper.userApi.Login("13115011550", "laozhong", "");

Assets/Scripts/UIManager.cs

@@ -334,9 +334,8 @@ public class UIManager : MonoBehaviour
     }
     public static void ShowNewRouteDetailPanel(MapRouteAreaItem area)
     {
-        UIManager.Instance.NewRouteDetailPanel
-            .GetComponent<NewRouteDetailController>().Initial(area);
         UIManager.Show(UIManager.Instance.NewRouteDetailPanel, UIManager.Instance.MainPanel);
+        UIManager.Instance.NewRouteDetailPanel.GetComponent<NewRouteDetailController>().Initial(area);
     }
     #endregion
     private CountDownAnimation mCountDownAnimation;
@@ -605,7 +604,7 @@ public class UIManager : MonoBehaviour
         {
             return;
         }
-        if (parent == UIManager.Instance.MainPanel) 
+        if (UIManager.Instance.MainPanel != null && parent == UIManager.Instance.MainPanel) 
         {
             App.currentPageIsHome = panelToShow.Equals(UIManager.Instance.HomePanel);
         }

ProjectSettings/EditorBuildSettings.asset

@@ -6,8 +6,8 @@ EditorBuildSettings:
   serializedVersion: 2
   m_Scenes:
   - enabled: 1
-    path: Assets/Scenes/Login-Mobile.unity
+    path: Assets/Scenes/Login.unity
-    guid: 4be878da00cf764499988cf403faf94d
+    guid: 6dce3e17997730b4492f91dd8fede429
   - enabled: 1
     path: Assets/Scenes/MainScene.unity
     guid: ab586a3c1bacd4a48a55178eb06fe0cc

ProjectSettings/ProjectSettings.asset

@@ -133,7 +133,7 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 2.1.0
+  bundleVersion: 2.1.1
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0
@@ -179,8 +179,8 @@ PlayerSettings:
   applicationIdentifier:
     Android: com.ZhiXingPai.PowerFunUnity
   buildNumber:
-    iPhone: 2.1.0.5
+    iPhone: 2.1.1.2
-  AndroidBundleVersionCode: 13
+  AndroidBundleVersionCode: 15
   AndroidMinSdkVersion: 24
   AndroidTargetSdkVersion: 30
   AndroidPreferredInstallLocation: 1