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

Assets/Mapbox/User/Modifiers.meta

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

Assets/Resources/Images/quit.png.meta

@@ -0,0 +1,104 @@
+fileFormatVersion: 2
+guid: 1e2c7b5fb99d8e447bd477903c5b129e
+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
+  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/BigMap/Item.prefab

@@ -355,7 +355,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, type: 3}
+    m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3}
     m_FontSize: 12
     m_FontStyle: 0
     m_BestFit: 0
@@ -433,7 +433,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, type: 3}
+    m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3}
     m_FontSize: 12
     m_FontStyle: 0
     m_BestFit: 0
@@ -661,7 +661,7 @@ PrefabInstance:
         type: 3}
       propertyPath: m_FontData.m_Font
       value: 
-      objectReference: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719,
+      objectReference: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083,
         type: 3}
     - target: {fileID: 2018962972499165246, guid: d1deda2310a3a7241a8e0d559585b30d,
         type: 3}
@@ -827,7 +827,7 @@ PrefabInstance:
         type: 3}
       propertyPath: m_FontData.m_Font
       value: 
-      objectReference: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719,
+      objectReference: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083,
         type: 3}
     - target: {fileID: 2018962972499165246, guid: d1deda2310a3a7241a8e0d559585b30d,
         type: 3}

Assets/Resources/UI/Prefab/BigMap/Tips.prefab

@@ -213,7 +213,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, type: 3}
+    m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3}
     m_FontSize: 14
     m_FontStyle: 0
     m_BestFit: 0
@@ -291,7 +291,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, type: 3}
+    m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3}
     m_FontSize: 14
     m_FontStyle: 0
     m_BestFit: 0
@@ -440,7 +440,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, type: 3}
+    m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3}
     m_FontSize: 14
     m_FontStyle: 0
     m_BestFit: 0
@@ -617,7 +617,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, type: 3}
+    m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3}
     m_FontSize: 14
     m_FontStyle: 0
     m_BestFit: 0
@@ -769,7 +769,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, type: 3}
+    m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3}
     m_FontSize: 12
     m_FontStyle: 0
     m_BestFit: 0
@@ -1021,7 +1021,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, type: 3}
+    m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3}
     m_FontSize: 18
     m_FontStyle: 0
     m_BestFit: 0

Assets/Resources/UI/Prefab/Device/ConnectDeviceModal.prefab

@@ -232,7 +232,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, type: 3}
+    m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3}
     m_FontSize: 14
     m_FontStyle: 0
     m_BestFit: 0
@@ -384,7 +384,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: bd658c45bc0743949ae710339d462afd, type: 3}
+    m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3}
     m_FontSize: 20
     m_FontStyle: 0
     m_BestFit: 0

Assets/Resources/UI/Prefab/Device/DeviceItem.prefab

@@ -217,7 +217,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: bb4c2b248704c75488b5f24a63a5f370, type: 3}
+    m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3}
     m_FontSize: 16
     m_FontStyle: 0
     m_BestFit: 0

Assets/Resources/UI/Prefab/Device/DeviceView.prefab

@@ -240,7 +240,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, type: 3}
+    m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3}
     m_FontSize: 14
     m_FontStyle: 0
     m_BestFit: 0
@@ -435,7 +435,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: bd658c45bc0743949ae710339d462afd, type: 3}
+    m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3}
     m_FontSize: 20
     m_FontStyle: 0
     m_BestFit: 0
@@ -513,7 +513,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: bd658c45bc0743949ae710339d462afd, type: 3}
+    m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3}
     m_FontSize: 12
     m_FontStyle: 0
     m_BestFit: 0
@@ -692,7 +692,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: bd658c45bc0743949ae710339d462afd, type: 3}
+    m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3}
     m_FontSize: 32
     m_FontStyle: 0
     m_BestFit: 0
@@ -770,7 +770,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, type: 3}
+    m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3}
     m_FontSize: 14
     m_FontStyle: 0
     m_BestFit: 0
@@ -799,7 +799,7 @@ PrefabInstance:
         type: 3}
       propertyPath: m_FontData.m_Font
       value: 
-      objectReference: {fileID: 12800000, guid: bd658c45bc0743949ae710339d462afd,
+      objectReference: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197,
         type: 3}
     - target: {fileID: 128304049968949179, guid: f9b4f89e2e3738c459fe1a4f852d6774,
         type: 3}
@@ -955,7 +955,7 @@ PrefabInstance:
         type: 3}
       propertyPath: m_FontData.m_Font
       value: 
-      objectReference: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719,
+      objectReference: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197,
         type: 3}
     - target: {fileID: 128304049968949179, guid: f9b4f89e2e3738c459fe1a4f852d6774,
         type: 3}
@@ -1096,7 +1096,7 @@ PrefabInstance:
         type: 3}
       propertyPath: m_FontData.m_Font
       value: 
-      objectReference: {fileID: 12800000, guid: bd658c45bc0743949ae710339d462afd,
+      objectReference: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197,
         type: 3}
     - target: {fileID: 128304049968949179, guid: f9b4f89e2e3738c459fe1a4f852d6774,
         type: 3}

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

@@ -153,7 +153,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: bd658c45bc0743949ae710339d462afd, type: 3}
+    m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3}
     m_FontSize: 24
     m_FontStyle: 0
     m_BestFit: 0
@@ -305,7 +305,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: 452cd41c1fcf96e4c8d8341a2f0ada65, type: 3}
+    m_Font: {fileID: 12800000, guid: 8180b991008992c45b6bf1a979c7baca, type: 3}
     m_FontSize: 10
     m_FontStyle: 0
     m_BestFit: 0
@@ -383,7 +383,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, type: 3}
+    m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3}
     m_FontSize: 14
     m_FontStyle: 0
     m_BestFit: 0
@@ -609,7 +609,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: bd658c45bc0743949ae710339d462afd, type: 3}
+    m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3}
     m_FontSize: 24
     m_FontStyle: 0
     m_BestFit: 0
@@ -687,7 +687,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: 452cd41c1fcf96e4c8d8341a2f0ada65, type: 3}
+    m_Font: {fileID: 12800000, guid: 8180b991008992c45b6bf1a979c7baca, type: 3}
     m_FontSize: 10
     m_FontStyle: 0
     m_BestFit: 0
@@ -812,7 +812,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: 452cd41c1fcf96e4c8d8341a2f0ada65, type: 3}
+    m_Font: {fileID: 12800000, guid: 8180b991008992c45b6bf1a979c7baca, type: 3}
     m_FontSize: 10
     m_FontStyle: 0
     m_BestFit: 0
@@ -862,12 +862,12 @@ RectTransform:
   - {fileID: 2589794477207137385}
   - {fileID: 2589794478217614881}
   - {fileID: 4566599627632401656}
-  - {fileID: 1517891333614586015}
   - {fileID: 4566599627557342350}
   - {fileID: 4566599628192613341}
   - {fileID: 4566599629016508004}
   - {fileID: 7275502706204060242}
   - {fileID: 3459981280928128198}
+  - {fileID: 1517891333614586015}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1045,7 +1045,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, type: 3}
+    m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3}
     m_FontSize: 14
     m_FontStyle: 0
     m_BestFit: 0
@@ -1197,7 +1197,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: bd658c45bc0743949ae710339d462afd, type: 3}
+    m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3}
     m_FontSize: 24
     m_FontStyle: 0
     m_BestFit: 0
@@ -1275,7 +1275,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: bd658c45bc0743949ae710339d462afd, type: 3}
+    m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3}
     m_FontSize: 24
     m_FontStyle: 0
     m_BestFit: 0
@@ -1400,7 +1400,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, type: 3}
+    m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3}
     m_FontSize: 14
     m_FontStyle: 0
     m_BestFit: 0
@@ -1412,7 +1412,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: 'W/KG
+  m_Text: 'FTP/KG
 
 '
 --- !u!1 &2589794479001532657
@@ -1520,7 +1520,7 @@ RectTransform:
   - {fileID: 4566599628726290540}
   - {fileID: 4566599627765202923}
   m_Father: {fileID: 2589794478191162465}
-  m_RootOrder: 10
+  m_RootOrder: 9
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
@@ -1600,7 +1600,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, type: 3}
+    m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3}
     m_FontSize: 14
     m_FontStyle: 0
     m_BestFit: 0
@@ -1752,9 +1752,9 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: bd658c45bc0743949ae710339d462afd, type: 3}
+    m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3}
     m_FontSize: 32
-    m_FontStyle: 1
+    m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 3
     m_MaxSize: 40
@@ -1904,9 +1904,9 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: bd658c45bc0743949ae710339d462afd, type: 3}
+    m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3}
     m_FontSize: 32
-    m_FontStyle: 1
+    m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 3
     m_MaxSize: 40
@@ -1948,7 +1948,7 @@ RectTransform:
   - {fileID: 4566599628729395001}
   - {fileID: 4566599628157169631}
   m_Father: {fileID: 2589794478191162465}
-  m_RootOrder: 11
+  m_RootOrder: 10
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
@@ -2102,7 +2102,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, type: 3}
+    m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3}
     m_FontSize: 14
     m_FontStyle: 0
     m_BestFit: 0
@@ -2180,7 +2180,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, type: 3}
+    m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3}
     m_FontSize: 14
     m_FontStyle: 0
     m_BestFit: 0
@@ -2258,9 +2258,9 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: bd658c45bc0743949ae710339d462afd, type: 3}
+    m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3}
     m_FontSize: 32
-    m_FontStyle: 1
+    m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 3
     m_MaxSize: 40
@@ -2302,7 +2302,7 @@ RectTransform:
   - {fileID: 4566599627569075062}
   - {fileID: 4566599628863875598}
   m_Father: {fileID: 2589794478191162465}
-  m_RootOrder: 12
+  m_RootOrder: 11
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
@@ -2347,7 +2347,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 2589794478191162465}
-  m_RootOrder: 14
+  m_RootOrder: 13
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -2411,7 +2411,7 @@ PrefabInstance:
     - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
       propertyPath: m_RootOrder
-      value: 9
+      value: 14
       objectReference: {fileID: 0}
     - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
@@ -2521,7 +2521,12 @@ PrefabInstance:
     - target: {fileID: 3150550772916003707, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
       propertyPath: m_FontData.m_FontStyle
-      value: 1
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8688565590564084001, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: mType
+      value: 2
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3}
@@ -2551,7 +2556,7 @@ PrefabInstance:
     - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
         type: 3}
       propertyPath: m_RootOrder
-      value: 13
+      value: 12
       objectReference: {fileID: 0}
     - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
         type: 3}
@@ -2672,7 +2677,7 @@ PrefabInstance:
         type: 3}
       propertyPath: m_FontData.m_Font
       value: 
-      objectReference: {fileID: 12800000, guid: bb4c2b248704c75488b5f24a63a5f370,
+      objectReference: {fileID: 12800000, guid: dc2b8edfb87f74143913c268624f8711,
         type: 3}
     - target: {fileID: 2018962972499165246, guid: d1deda2310a3a7241a8e0d559585b30d,
         type: 3}

Assets/Resources/UI/Prefab/MainNav.prefab

@@ -1,5 +1,79 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1028020832802249258
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1582560070593925475}
+  - component: {fileID: 8575928801610675534}
+  - component: {fileID: 7589916435901445193}
+  m_Layer: 5
+  m_Name: Exit
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1582560070593925475
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1028020832802249258}
+  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: 2638424933752433027}
+  m_RootOrder: 4
+  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: 44, y: 44}
+  m_Pivot: {x: 0, y: 0.5}
+--- !u!222 &8575928801610675534
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1028020832802249258}
+  m_CullTransparentMesh: 0
+--- !u!114 &7589916435901445193
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1028020832802249258}
+  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: 1e2c7b5fb99d8e447bd477903c5b129e, 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 &2638424933752433026
 GameObject:
   m_ObjectHideFlags: 0
@@ -32,16 +106,16 @@ RectTransform:
   m_Children:
   - {fileID: 2638424934229131700}
   - {fileID: 2638424934527142483}
-  - {fileID: 2638424935285544537}
   - {fileID: 2638424934187802374}
   - {fileID: 2638424935390494092}
+  - {fileID: 1582560070593925475}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 280, y: 64}
+  m_SizeDelta: {x: 226, y: 64}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &2638424933752433029
 CanvasRenderer:
@@ -122,11 +196,11 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 2638424933752433027}
-  m_RootOrder: 3
+  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: 172, y: 0}
+  m_AnchoredPosition: {x: 118, y: 0}
   m_SizeDelta: {x: 44, y: 44}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &2638424934187802376
@@ -314,80 +388,6 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
---- !u!1 &2638424935285544536
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 2638424935285544537}
-  - component: {fileID: 2638424935285544539}
-  - component: {fileID: 2638424935285544538}
-  m_Layer: 5
-  m_Name: Wifi
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &2638424935285544537
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2638424935285544536}
-  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: 2638424933752433027}
-  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: 118, y: 0}
-  m_SizeDelta: {x: 44, y: 44}
-  m_Pivot: {x: 0, y: 0.5}
---- !u!222 &2638424935285544539
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2638424935285544536}
-  m_CullTransparentMesh: 0
---- !u!114 &2638424935285544538
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2638424935285544536}
-  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: efa4a8392a2c3d0449bf07063abea38b, 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 &2638424935390494091
 GameObject:
   m_ObjectHideFlags: 0
@@ -418,11 +418,11 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 2638424933752433027}
-  m_RootOrder: 4
+  m_RootOrder: 3
   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: 226, y: 0}
+  m_AnchoredPosition: {x: 172, y: 0}
   m_SizeDelta: {x: 44, y: 44}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &2638424935390494094

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

@@ -324,7 +324,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, type: 3}
+    m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3}
     m_FontSize: 14
     m_FontStyle: 0
     m_BestFit: 0
@@ -425,6 +425,7 @@ GameObject:
   - component: {fileID: 2939070211320469820}
   - component: {fileID: 1142354303720505027}
   - component: {fileID: 3867589268337371586}
+  - component: {fileID: 8564967389594868555}
   m_Layer: 5
   m_Name: Canvas
   m_TagString: Untagged
@@ -517,6 +518,18 @@ MonoBehaviour:
   m_BlockingMask:
     serializedVersion: 2
     m_Bits: 4294967295
+--- !u!225 &8564967389594868555
+CanvasGroup:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2446724330781706966}
+  m_Enabled: 1
+  m_Alpha: 1
+  m_Interactable: 1
+  m_BlocksRaycasts: 1
+  m_IgnoreParentGroups: 0
 --- !u!1 &2518104292931613363
 GameObject:
   m_ObjectHideFlags: 0
@@ -1081,7 +1094,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: 360, y: -30}
+  m_AnchoredPosition: {x: 306, y: -30}
   m_SizeDelta: {x: 64, y: 64}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &4997743358586351338
@@ -1431,7 +1444,7 @@ PrefabInstance:
     - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}
       propertyPath: m_SizeDelta.x
-      value: 280
+      value: 226
       objectReference: {fileID: 0}
     - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}

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

@@ -402,6 +402,7 @@ GameObject:
   - component: {fileID: 4032660314221060953}
   - component: {fileID: 454099902603697846}
   - component: {fileID: 1179195837213364712}
+  - component: {fileID: 3695202901511441468}
   m_Layer: 5
   m_Name: DevicePanel
   m_TagString: Untagged
@@ -485,6 +486,18 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!225 &3695202901511441468
+CanvasGroup:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4032660314221060955}
+  m_Enabled: 1
+  m_Alpha: 1
+  m_Interactable: 1
+  m_BlocksRaycasts: 1
+  m_IgnoreParentGroups: 0
 --- !u!1 &5023905775086954472
 GameObject:
   m_ObjectHideFlags: 0
@@ -595,7 +608,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, type: 3}
+    m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3}
     m_FontSize: 14
     m_FontStyle: 0
     m_BestFit: 0
@@ -673,7 +686,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: bd658c45bc0743949ae710339d462afd, type: 3}
+    m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3}
     m_FontSize: 20
     m_FontStyle: 0
     m_BestFit: 0
@@ -943,7 +956,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, type: 3}
+    m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3}
     m_FontSize: 14
     m_FontStyle: 0
     m_BestFit: 0
@@ -972,7 +985,7 @@ PrefabInstance:
         type: 3}
       propertyPath: m_FontData.m_Font
       value: 
-      objectReference: {fileID: 12800000, guid: bd658c45bc0743949ae710339d462afd,
+      objectReference: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197,
         type: 3}
     - target: {fileID: 128304049968949179, guid: f9b4f89e2e3738c459fe1a4f852d6774,
         type: 3}
@@ -1128,7 +1141,7 @@ PrefabInstance:
         type: 3}
       propertyPath: m_FontData.m_Font
       value: 
-      objectReference: {fileID: 12800000, guid: bd658c45bc0743949ae710339d462afd,
+      objectReference: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197,
         type: 3}
     - target: {fileID: 128304049968949179, guid: f9b4f89e2e3738c459fe1a4f852d6774,
         type: 3}
@@ -1669,7 +1682,7 @@ PrefabInstance:
         type: 3}
       propertyPath: m_FontData.m_Font
       value: 
-      objectReference: {fileID: 12800000, guid: bd658c45bc0743949ae710339d462afd,
+      objectReference: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197,
         type: 3}
     - target: {fileID: 128304049968949179, guid: f9b4f89e2e3738c459fe1a4f852d6774,
         type: 3}

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

@@ -11,6 +11,7 @@ GameObject:
   - component: {fileID: 1777885814862178517}
   - component: {fileID: 787256587561520313}
   - component: {fileID: 958233340109605464}
+  - component: {fileID: 248175241253817336}
   m_Layer: 5
   m_Name: HomePanel
   m_TagString: Untagged
@@ -62,49 +63,18 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1777885814862178516}
   m_CullTransparentMesh: 0
---- !u!114 &4666630721626389153
+--- !u!225 &248175241253817336
-MonoBehaviour:
+CanvasGroup:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4110286610393964380}
+  m_GameObject: {fileID: 1777885814862178516}
   m_Enabled: 1
-  m_EditorHideFlags: 0
+  m_Alpha: 1
-  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: 4110286610393964382}
+  m_BlocksRaycasts: 1
-  m_OnClick:
+  m_IgnoreParentGroups: 0
-    m_PersistentCalls:
-      m_Calls: []
 --- !u!1001 &1777885815653005510
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -241,19 +211,19 @@ PrefabInstance:
         type: 3}
       propertyPath: m_FontData.m_Font
       value: 
-      objectReference: {fileID: 12800000, guid: bd658c45bc0743949ae710339d462afd,
+      objectReference: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197,
         type: 3}
     - target: {fileID: 3324359234025609929, guid: 0cf36a704cf17794aab167386641cf2a,
         type: 3}
       propertyPath: m_FontData.m_Font
       value: 
-      objectReference: {fileID: 12800000, guid: bd658c45bc0743949ae710339d462afd,
+      objectReference: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197,
         type: 3}
     - target: {fileID: 3324359234272836253, guid: 0cf36a704cf17794aab167386641cf2a,
         type: 3}
       propertyPath: m_FontData.m_Font
       value: 
-      objectReference: {fileID: 12800000, guid: bd658c45bc0743949ae710339d462afd,
+      objectReference: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197,
         type: 3}
     - target: {fileID: 3324359234648502169, guid: 0cf36a704cf17794aab167386641cf2a,
         type: 3}
@@ -348,7 +318,7 @@ PrefabInstance:
     - target: {fileID: 3324359234648502174, guid: 0cf36a704cf17794aab167386641cf2a,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -261
+      value: -230
       objectReference: {fileID: 0}
     - target: {fileID: 3324359234648502174, guid: 0cf36a704cf17794aab167386641cf2a,
         type: 3}
@@ -435,7 +405,7 @@ PrefabInstance:
     - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}
       propertyPath: m_SizeDelta.x
-      value: 280
+      value: 226
       objectReference: {fileID: 0}
     - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}
@@ -510,21 +480,3 @@ RectTransform:
     type: 3}
   m_PrefabInstance: {fileID: 2132237384658419801}
   m_PrefabAsset: {fileID: 0}
---- !u!1 &4110286610393964380 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 2638424934187802373, guid: a1999d0576fee6248a9c5a507ae8d10e,
-    type: 3}
-  m_PrefabInstance: {fileID: 2132237384658419801}
-  m_PrefabAsset: {fileID: 0}
---- !u!114 &4110286610393964382 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 2638424934187802375, guid: a1999d0576fee6248a9c5a507ae8d10e,
-    type: 3}
-  m_PrefabInstance: {fileID: 2132237384658419801}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4110286610393964380}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 

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

@@ -2322,7 +2322,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: 360, y: -30}
+  m_AnchoredPosition: {x: 306, y: -30}
   m_SizeDelta: {x: 64, y: 64}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &8343395811988274841
@@ -3198,6 +3198,7 @@ GameObject:
   - component: {fileID: 3875008516619180971}
   - component: {fileID: 6799029054918475999}
   - component: {fileID: 6799029054918475996}
+  - component: {fileID: 4631699736552807878}
   m_Layer: 5
   m_Name: MapListPanel
   m_TagString: Untagged
@@ -3217,7 +3218,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 8931608246266398584}
-  - {fileID: 2905060696191417379}
+  - {fileID: 243684882420699873}
   - {fileID: 726549195090357672}
   - {fileID: 5499711730237207362}
   - {fileID: 5284463610994455041}
@@ -3297,6 +3298,18 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!225 &4631699736552807878
+CanvasGroup:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5779676824674420566}
+  m_Enabled: 1
+  m_Alpha: 1
+  m_Interactable: 1
+  m_BlocksRaycasts: 1
+  m_IgnoreParentGroups: 0
 --- !u!114 &5014623458251111798
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -4631,131 +4644,6 @@ RectTransform:
     type: 3}
   m_PrefabInstance: {fileID: 726549194336560541}
   m_PrefabAsset: {fileID: 0}
---- !u!1001 &922472870509598112
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 5779676824674420565}
-    m_Modifications:
-    - target: {fileID: 2638424933752433026, guid: a1999d0576fee6248a9c5a507ae8d10e,
-        type: 3}
-      propertyPath: m_Name
-      value: MainNav
-      objectReference: {fileID: 0}
-    - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e,
-        type: 3}
-      propertyPath: m_Pivot.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e,
-        type: 3}
-      propertyPath: m_Pivot.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e,
-        type: 3}
-      propertyPath: m_RootOrder
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e,
-        type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e,
-        type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e,
-        type: 3}
-      propertyPath: m_AnchorMin.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e,
-        type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e,
-        type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 280
-      objectReference: {fileID: 0}
-    - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e,
-        type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 64
-      objectReference: {fileID: 0}
-    - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e,
-        type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e,
-        type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e,
-        type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e,
-        type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e,
-        type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e,
-        type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e,
-        type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e,
-        type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 60
-      objectReference: {fileID: 0}
-    - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e,
-        type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -30
-      objectReference: {fileID: 0}
-    - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3}
---- !u!224 &2905060696191417379 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e,
-    type: 3}
-  m_PrefabInstance: {fileID: 922472870509598112}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &2277129673863769977
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -4913,6 +4801,12 @@ GameObject:
     type: 3}
   m_PrefabInstance: {fileID: 2277129673863769977}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &1048332570473065360 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 1231050277644289257, guid: 5ee52e0b78bd38244a2b473e2236800c,
+    type: 3}
+  m_PrefabInstance: {fileID: 2277129673863769977}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &2835369396092332516 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 4089475371085219485, guid: 5ee52e0b78bd38244a2b473e2236800c,
@@ -4949,9 +4843,128 @@ GameObject:
     type: 3}
   m_PrefabInstance: {fileID: 2277129673863769977}
   m_PrefabAsset: {fileID: 0}
---- !u!1 &1048332570473065360 stripped
+--- !u!1001 &2881229966191197026
-GameObject:
+PrefabInstance:
-  m_CorrespondingSourceObject: {fileID: 1231050277644289257, guid: 5ee52e0b78bd38244a2b473e2236800c,
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 5779676824674420565}
+    m_Modifications:
+    - target: {fileID: 2638424933752433026, guid: a1999d0576fee6248a9c5a507ae8d10e,
+        type: 3}
+      propertyPath: m_Name
+      value: MainNav
+      objectReference: {fileID: 0}
+    - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e,
+        type: 3}
+      propertyPath: m_Pivot.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e,
+        type: 3}
+      propertyPath: m_Pivot.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e,
+        type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e,
+        type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 226
+      objectReference: {fileID: 0}
+    - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 64
+      objectReference: {fileID: 0}
+    - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 60
+      objectReference: {fileID: 0}
+    - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -30
+      objectReference: {fileID: 0}
+    - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3}
+--- !u!224 &243684882420699873 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e,
     type: 3}
-  m_PrefabInstance: {fileID: 2277129673863769977}
+  m_PrefabInstance: {fileID: 2881229966191197026}
   m_PrefabAsset: {fileID: 0}

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

@@ -259,6 +259,7 @@ GameObject:
   - component: {fileID: 1018732089903226588}
   - component: {fileID: 1018732089903226589}
   - component: {fileID: 1018732089903226591}
+  - component: {fileID: 8084789863929639026}
   m_Layer: 5
   m_Name: SettingModal
   m_TagString: Untagged
@@ -335,6 +336,18 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 1304d873aa16cd641a83b889e9a1f3af, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!225 &8084789863929639026
+CanvasGroup:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1018732089903226587}
+  m_Enabled: 1
+  m_Alpha: 1
+  m_Interactable: 1
+  m_BlocksRaycasts: 1
+  m_IgnoreParentGroups: 0
 --- !u!1 &1018732090860767023
 GameObject:
   m_ObjectHideFlags: 0

Assets/Resources/UI/Prefab/ResultList/RouteItem.prefab

@@ -487,6 +487,130 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_HorizontalFit: 2
   m_VerticalFit: 0
+--- !u!1 &394191259421430988
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7596543225826370523}
+  - component: {fileID: 1616657703676474664}
+  m_Layer: 5
+  m_Name: RightMatch
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &7596543225826370523
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 394191259421430988}
+  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: 7333143462917461189}
+  - {fileID: 4620552528893032614}
+  m_Father: {fileID: 4085630360285719620}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 482, y: 0}
+  m_SizeDelta: {x: -964, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1616657703676474664
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 394191259421430988}
+  m_CullTransparentMesh: 0
+--- !u!1 &3545011464969782806
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7333143462917461189}
+  - component: {fileID: 6410137277827500634}
+  - component: {fileID: 1124194809507677811}
+  m_Layer: 5
+  m_Name: Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7333143462917461189
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3545011464969782806}
+  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: 7596543225826370523}
+  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: -32}
+  m_SizeDelta: {x: 31, y: 17}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &6410137277827500634
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3545011464969782806}
+  m_CullTransparentMesh: 0
+--- !u!114 &1124194809507677811
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3545011464969782806}
+  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.25490198, g: 0.25882354, b: 0.31764707, 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: 12
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 0
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: Rank
 --- !u!1 &3956325779266006875
 GameObject:
   m_ObjectHideFlags: 0
@@ -677,6 +801,7 @@ RectTransform:
   - {fileID: 8504920722886678745}
   - {fileID: 4085630360693585359}
   - {fileID: 5607096041038795515}
+  - {fileID: 7596543225826370523}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1228,6 +1353,84 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: <color=#5c5c6e>Riding time:</color>00:18:52
+--- !u!1 &5077901321725402009
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4620552528893032614}
+  - component: {fileID: 5939672542218804338}
+  - component: {fileID: 2716823427977179675}
+  m_Layer: 5
+  m_Name: Value
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4620552528893032614
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5077901321725402009}
+  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: 7596543225826370523}
+  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: -48}
+  m_SizeDelta: {x: 0, y: 60}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &5939672542218804338
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5077901321725402009}
+  m_CullTransparentMesh: 0
+--- !u!114 &2716823427977179675
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5077901321725402009}
+  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.36078432, g: 0.36078432, b: 0.43137255, 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: 52
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 5
+    m_MaxSize: 52
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 08
 --- !u!1 &5607096041038795514
 GameObject:
   m_ObjectHideFlags: 0

Assets/Scenes/MainScene.unity

@@ -146,12 +146,12 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 154299661}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  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: 273807004}
+  m_Father: {fileID: 1378474436}
-  m_RootOrder: 2
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {x: 1, y: 0}
@@ -178,7 +178,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, type: 3}
+    m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3}
     m_FontSize: 14
     m_FontStyle: 0
     m_BestFit: 0
@@ -293,7 +293,7 @@ RectTransform:
   m_Children:
   - {fileID: 730655536}
   - {fileID: 1985738406}
-  - {fileID: 154299662}
+  - {fileID: 1378474436}
   m_Father: {fileID: 0}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -710,6 +710,42 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
+--- !u!1 &1378474435
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1378474436}
+  m_Layer: 5
+  m_Name: GameObject
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1378474436
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1378474435}
+  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: 154299662}
+  m_Father: {fileID: 273807004}
+  m_RootOrder: 2
+  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: 1600, y: 900}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &1962586925
 GameObject:
   m_ObjectHideFlags: 0

Assets/Scripts/Apis/ApiBase.cs

@@ -40,7 +40,7 @@ namespace Assets.Scripts.Apis
             httpClientHandler.Proxy = WebRequest.DefaultWebProxy;
             httpClientHandler.CookieContainer = _cookieCollection;
             httpClientHandler.UseCookies = true;
-            httpClientHandler.CookieContainer.Add(new Uri(ConfigHelper.Host), new Cookie("PowerFun.AUTH", "E1F130A03C0C2F01DF465A17AAA4740E9C44FC5F7C5077AF5A09B5ED29F0CF4FABE44329111C0BDBC6D97A28E7C7C188250265B37D2E6A849D7F0CAC606490648F17DC7FB9C8778BE7217991EBB6304BD543CFEE55084E54CCD634B49F26A751","/"));
+            //httpClientHandler.CookieContainer.Add(new Uri(ConfigHelper.Host), new Cookie("PowerFun.AUTH", "E1F130A03C0C2F01DF465A17AAA4740E9C44FC5F7C5077AF5A09B5ED29F0CF4FABE44329111C0BDBC6D97A28E7C7C188250265B37D2E6A849D7F0CAC606490648F17DC7FB9C8778BE7217991EBB6304BD543CFEE55084E54CCD634B49F26A751","/"));
             
             httpClient = new System.Net.Http.HttpClient(httpClientHandler);
             httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
@@ -446,7 +446,7 @@ namespace Assets.Scripts.Apis
             //}
             request.UserAgent = httpClient.DefaultRequestHeaders.UserAgent.ToString();
             request.Accept = "application/json";
-            request.Headers.Add("Language", "Zh-cn");
+            request.Headers.Add("Language", "en");
             request.AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate;
             request.CookieContainer = new CookieContainer();
             foreach (Cookie item in cookies)

Assets/Scripts/Apis/MapInterruptRecordApi.cs

@@ -24,27 +24,9 @@ namespace Assets.Scripts.Apis
             return jsonResult;
         }
 
-        public JsonResult<List<RouteResult>> GetMapInterruptRecord(string keyword, int pageIndex, int pageSize)
+        public async Task<JsonResult<List<RouteResult>>> GetMapInterruptRecord(string keyword, int pageIndex, int pageSize, string type)
         {
-            var result = new JsonResult<List<RouteResult>>()
+            return await GetAsync<JsonResult<List<RouteResult>>>($"MapRecord/v1/GetList?keyword={keyword}&pageIndex={pageIndex}&pageSize={pageSize}&type={type}");
-            {
-                result = false,
-                data = null,
-                errMsg = ""
-            };
-            try
-            {
-                var r = Get<List<RouteResult>>($"MapRecord/GetMapInterruptRecord?keyword={keyword}&pageIndex={pageIndex}&pageSize={pageSize}");
-                result.result = true;
-                result.data = r;
-                return result;
-            }
-            catch (Exception e)
-            {
-                Debug.LogError(e.ToString());
-                return result;
-            }
-            
         }
         /// <summary>
         /// 通过ID获取设备商

Assets/Scripts/Apis/UserApi.cs

@@ -108,6 +108,7 @@ namespace Assets.Scripts.Apis
             try
             {
                 ret = await PostAsync<JsonResult<UserResultModel>>("NoAuth/v1/Register", param);
+                ret.data.cookie = cookies[0].Value;
             }
             catch (Exception ex)
             {
@@ -139,9 +140,17 @@ namespace Assets.Scripts.Apis
             var r = await PostAsync<JsonResult<object>>("NoAuth/OnWebWxLoginCheckUnionId", new { unionId, openId });
             if (r.result)
             {
-                var data = JObject.FromObject(r.data).ToObject<UserResultModel>();
+                var data = JObject.FromObject(r.data);
-                data.cookie = cookies[0].Value;
+                if (data.Value<string>("success") != null && data.Value<string>("success") == "False")
-                r.data = data;
+                {
+                    return r;
+                }
+                else 
+                {
+                    var user = data.ToObject<UserResultModel>();
+                    user.cookie = cookies[0].Value;
+                    r.data = user;
+                }
             }
             return r;
         }

Assets/Scripts/App.cs

@@ -7,7 +7,7 @@ using UnityEngine;
 
 public static class App
 {
-    public static string Host = "http://192.168.0.97:5082/";
+    public static string Host = "http://192.168.0.101:5082/";
 
     public static string AppVersion = "1.0.0";
 

Assets/Scripts/Scenes/LoginController.cs

@@ -325,8 +325,8 @@ public class LoginController : MonoBehaviour
         {
             wxLogin2.Find("return").GetComponent<Button>().onClick.AddListener(() => {
                 wxLogin2.gameObject.SetActive(false);
-                wxLogin3.gameObject.SetActive(false);
+                //wxLogin3.gameObject.SetActive(false);
-                pageNums = 3;
+                pageNums = 4;
                 Canvas.ForceUpdateCanvases();
                 StartScrollPanel(1); 
             });
@@ -347,7 +347,8 @@ public class LoginController : MonoBehaviour
                 else 
                 {
                     signContainer.gameObject.SetActive(true);
-                    wxLogin3.gameObject.SetActive(false);
+                    pageNums = 4;
+                    //wxLogin3.gameObject.SetActive(false);
                     StartScrollPanel(1);
                 }
             });
@@ -588,14 +589,7 @@ public class LoginController : MonoBehaviour
         }
         if (r!=null && r.result)
         {
-            if (signType == 1)
+            RefreshWx3(r.data);
-            {
-                RefreshWx3(r.data);
-            }
-            else 
-            {
-                userResult = r.data;
-            }
             LoadInfo();
             StartScrollSign(1);
         }
@@ -643,8 +637,7 @@ public class LoginController : MonoBehaviour
         }
         else
         {
-            App.CurrentUser = userResult;
+            this.StartScrollPanel(3);
-            SceneManager.LoadScene("MainScene");
         }
         //throw new NotImplementedException();
     }
@@ -691,7 +684,10 @@ public class LoginController : MonoBehaviour
         userResult.Unit = _units.SelectedIndex;
         userResult.Weight = int.Parse(_weight.Text);
         userResult.Height = int.Parse(_height.Text);
-        userResult.Nickname = userResult.Phone;
+        if (string.IsNullOrEmpty(userResult.Nickname)) 
+        {
+            userResult.Nickname = userResult.Phone;
+        }
         var r = await ConfigHelper.userApi.Update(userResult);
         return r.result;
         //userResult.Birthday.v
@@ -699,8 +695,8 @@ public class LoginController : MonoBehaviour
     private void goLoginReturn2()
     {
         if (wxLogin2.gameObject.activeSelf) wxLogin2.gameObject.SetActive(false);
-        if (wxLogin3.gameObject.activeSelf) wxLogin3.gameObject.SetActive(false);
+        //if (wxLogin3.gameObject.activeSelf) wxLogin3.gameObject.SetActive(false);
-        pageNums = 3;
+        pageNums = 4;
         Canvas.ForceUpdateCanvases();
         this.StartScrollPanel(1);
     }
@@ -744,7 +740,7 @@ public class LoginController : MonoBehaviour
         }
         else 
         {
-            pageNums = 3;
+            pageNums = 4;
             wxLogin2.gameObject.SetActive(false);
             
             signPage1.Find("next").gameObject.SetActive(true);
@@ -877,7 +873,7 @@ public class LoginController : MonoBehaviour
         scrollPanelIndex = index;
         startScrollPanel = true;
     }
-    private int pageNums = 3;
+    private int pageNums = 4;
     private void goScrollPanel()
     {
         var index = scrollPanelIndex;

Assets/Scripts/Scenes/MainController.cs

@@ -10,8 +10,9 @@ public class MainController : MonoBehaviour
     private Text Version;
     private void Awake()
     {
-        Version = this.transform.Find("Version").GetComponent<Text>();
+        Version = this.transform.Find("GameObject").Find("Version").GetComponent<Text>();
         Version.text = "Version:"+App.AppVersion;
+
     }
 
     // Start is called before the first frame update

Assets/Scripts/UI/Prefab/Login/QuickLoginScroll.cs

@@ -19,11 +19,19 @@ public class QuickLoginScroll : MonoBehaviour
         //Initial();
         if (L != null)
         {
-            L.onClick.AddListener(goLeft);
+            UIManager.AddEvent(L.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick,(b)=> 
+            {
+                goLeft();
+            });
+            //L.onClick.AddListener(goLeft);
         }
         if (R != null)
         {
-            R.onClick.AddListener(goRight);
+            UIManager.AddEvent(R.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, (b) =>
+            {
+                goRight();
+            });
+            //R.onClick.AddListener(goRight);
         }
     }
     public void Initial() 

Assets/Scripts/UI/Prefab/Login/QuickLoginUser.cs

@@ -23,46 +23,40 @@ public class QuickLoginUser : MonoBehaviour
     {
         if (user == null) return;
         this.top = top;
-        transform.GetComponent<Button>().onClick.AddListener(async () => 
+        UIManager.AddEvent(gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, (b) =>
         {
-            ApiBase.SetCookie(user.Cookie);
+            goMain();
-            var r = await ConfigHelper.userApi.QuickLogin();
-            if (r.result)
-            {
-                //
-                top.GetComponent<LoginController>().SaveInfo(r.data);
-                App.CurrentUser = r.data;
-                //ConfigHelper.CurrentUser = r.data.Value<UserResultModel>("user");
-                //ConfigHelper.CurrentUser = re;
-                //var usermodel = r.data.Value<JObject>("user");
-                //App.CurrentUser = new UserModel
-                //{
-                //    NickName = usermodel.Value<string>("NickName"),
-                //    Ftp = usermodel.Value<int>("FTP"),
-                //    Weight = usermodel.Value<double>("Weight"),
-                //    BicycleWeight = usermodel.Value<double>("BicycleWeight"),
-                //    Carlories = "",
-                //    Avatar = usermodel.Value<string>("WxHeadImg"),
-                //    Distance = 0,
-                //    Climb = "",
-                //};
-
-                SceneManager.LoadScene("MainScene");
-            }
-            else 
-            {
-                Utils.showToast(gameObject, r.errMsg);
-            }
         });
+        //transform.GetComponent<Button>().onClick.AddListener();
         this.user = user;
         Utils.DisplayImage(StartCoroutine, transform.Find("Avatar").GetComponent<RawImage>(),user.Avatar);
         transform.Find("NickNameText").GetComponent<Text>().text = user.NickName;
-        transform.Find("BtnDelete").GetComponent<Button>().onClick.AddListener(DestroySelf);
+        UIManager.AddEvent(transform.Find("BtnDelete").gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, (e) =>
+         {
+             DestroySelf();
+         });
+        //transform.Find("BtnDelete").GetComponent<Button>().onClick.AddListener(DestroySelf);
     }
     // Update is called once per frame
     void Update()
     {
         
+    }
+    async void goMain() 
+    {
+        ApiBase.SetCookie(user.Cookie);
+        var r = await ConfigHelper.userApi.QuickLogin();
+        if (r.result)
+        {
+            top.GetComponent<LoginController>().SaveInfo(r.data);
+            App.CurrentUser = r.data;
+
+            SceneManager.LoadScene("MainScene");
+        }
+        else
+        {
+            Utils.showToast(gameObject, r.errMsg);
+        }
     }
     private void OnDestroy()
     {

Assets/Scripts/UI/Prefab/MainNav.cs

@@ -6,6 +6,8 @@ using UnityEngine.UI;
 
 public class MainNav : MonoBehaviour
 {
+    private GameObject exit;
+    private GameObject home;
     private void Awake()
     {
         var material = Instantiate(Resources.Load<Material>("UI/Material/RoundedCornersTextureMaterial"));
@@ -14,18 +16,32 @@ public class MainNav : MonoBehaviour
         material.SetVector(Shader.PropertyToID("_WidthHeightRadius"), new Vector4(rect.width, rect.height, rect.height, 0));
         this.GetComponent<Image>().material = material;
 
-        var wifi = this.transform.Find("Wifi");
+        var device = this.transform.Find("Device");
-        UIManager.AddEvent(wifi.gameObject, EventTriggerType.PointerClick, x =>
+        UIManager.AddEvent(device.gameObject, EventTriggerType.PointerClick, x =>
         {
-            Debug.Log("click wifi");
+            Debug.Log("click device");
             UIManager.ShowDevicePanel();
         });
 
-        var home = this.transform.Find("Home");
+        home = this.transform.Find("Home").gameObject;
-        UIManager.AddEvent(home.gameObject, EventTriggerType.PointerClick, x =>
+        UIManager.AddEvent(home, EventTriggerType.PointerClick, x =>
         {
             UIManager.ShowHomePanel();
         });
+
+        exit = this.transform.Find("Exit").gameObject;
+        exit.SetActive(false);
+
+
+        UIManager.AddEvent(exit, EventTriggerType.PointerClick, (e) =>
+        {
+            Application.Quit();
+        });
+
+        UIManager.AddEvent(transform.Find("Setting").gameObject, EventTriggerType.PointerClick, x =>
+        {
+            UIManager.ShowSettingModal();
+        });
     }
 
     // Start is called before the first frame update
@@ -39,4 +55,10 @@ public class MainNav : MonoBehaviour
     {
         
     }
+
+    public void ShowExit()
+    {
+        exit.SetActive(true);
+        home.SetActive(false);
+    }
 }

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

@@ -15,6 +15,7 @@ using UnityEngine.Events;
 using UnityEngine.EventSystems;
 using UnityEngine.SceneManagement;
 using Mapbox.Examples;
+using DG.Tweening;
 
 public class BigMapController : PFUIPanel
 {
@@ -33,6 +34,10 @@ public class BigMapController : PFUIPanel
     int timer = 0;
     protected override void Awake()
     {
+        var cg = this.transform.Find("Canvas").GetComponent<CanvasGroup>();
+        cg.alpha = 0;
+
+
         mapApi = new MapApi();
         mapboxApi = new MapBoxApi();
 
@@ -384,6 +389,14 @@ public class BigMapController : PFUIPanel
         //timer += Time.deltaTime;
     }
 
+    public override void Show()
+    {
+        var cg = this.transform.Find("Canvas").GetComponent<CanvasGroup>();
+        cg.alpha = 0;
+        base.Show();
+
+        cg.DOFade(1f, 0.3f);
+    }
 
     public override void Close()
     {

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

@@ -7,6 +7,7 @@ using System.Threading.Tasks;
 using UnityEngine;
 using UnityEngine.UI;
 using UnityEngine.EventSystems;
+using DG.Tweening;
 
 public class DeviceController : PFUIPanel
 {
@@ -89,6 +90,15 @@ public class DeviceController : PFUIPanel
         }
     }
 
+    public override void Show()
+    {
+        var cg = this.GetComponent<CanvasGroup>();
+        cg.alpha = 0;
+        base.Show();
+
+        cg.DOFade(1f, 0.3f);
+    }
+
     private void OnApplicationQuit()
     {
         AntConnector.Instance().Dispose();

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

@@ -156,11 +156,10 @@ public class EditUserController : PFUIPanel
     }
     async Task LoadDataSync()
     {
-        if (!App.FromLogin) 
+        //if (!App.FromLogin) 
-        {
+        //{
-            await Login();
+        //    await Login();
-        }
+        //}       
-        
 
         var currentUser = App.CurrentUser;
         if (currentUser == null) return;

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

@@ -25,10 +25,15 @@ public class HomeController : PFUIPanel
     //[SerializeField] Button More;
     [SerializeField] Button BtnRide;
     [SerializeField] Transform userInfo;
+
+    private MainNav mainNav;
     // Start is called before the first frame update
     protected override void Start()
     {
         base.Start();
+
+        mainNav = this.transform.Find("MainNav").GetComponent<MainNav>();
+        mainNav.ShowExit();
         //var parent = Utils.FindUpParent(gameObject.transform);
         //if (parent.Find("ToastContainer") == null) 
         //{
@@ -45,10 +50,8 @@ public class HomeController : PFUIPanel
         BtnRide.onClick.AddListener(GoRide);
 
         var avatar = userInfo.Find("Avatar").GetComponent<RawImage>();        
-        var material = Instantiate(Resources.Load<Material>("UI/Material/RoundedCornersTextureMaterial"));
         var rect = ((RectTransform)avatar.transform).rect;       
-        material.SetVector(Shader.PropertyToID("_WidthHeightRadius"), new Vector4(rect.width, rect.height, rect.height, 0));
+        SetRounded(avatar.transform, rect.height);
-        avatar.material = material;
 
         UIManager.AddEvent(avatar.gameObject, EventTriggerType.PointerClick, x =>
         {
@@ -59,10 +62,6 @@ public class HomeController : PFUIPanel
         {
             UIManager.ShowAlert("test");
         });
-        UIManager.AddEvent(transform.Find("MainNav").Find("Setting").gameObject, EventTriggerType.PointerClick, x =>
-        {
-            UIManager.ShowSettingModal();
-        });
         GetSummary();
     }
 
@@ -99,16 +98,17 @@ public class HomeController : PFUIPanel
         userInfo.Find("NickName").GetComponent<Text>().text = App.CurrentUser.Nickname;
         userInfo.Find("GroupTop").Find("FtpContainer").Find("FtpValue").GetComponent<Text>().text = App.CurrentUser.FTP.ToString();
         userInfo.Find("GroupTop").Find("WeightContainer").Find("WeightValue").GetComponent<Text>().text = App.CurrentUser.Weight.ToString();
-        userInfo.Find("GroupTop").Find("WKGContainer").Find("WKGValue").GetComponent<Text>().text = $"{App.CurrentUser.Weight}kg/{App.CurrentUser.BicycleWeight}kg";
+        userInfo.Find("GroupTop").Find("WKGContainer").Find("WKGValue").GetComponent<Text>().text = $"{ (App.CurrentUser.FTP/ App.CurrentUser.Weight).ToString("0.0") }";
         userInfo.Find("CaloriesContainer").Find("CaloriesValue").GetComponent<Text>().text = summary.Kcal +" KCAL";
         userInfo.Find("KMContainer").Find("KMValue").GetComponent<Text>().text = summary.TotalDistance.ToString("0") +" KM";
         userInfo.Find("ClimbContainer").Find("ClimbValue").GetComponent<Text>().text = summary.TotalClimb +" M";
-        userInfo.Find("IDText").GetComponent<Text>().text = "ID:"+App.CurrentUser.Id;
+        userInfo.Find("IDText").GetComponent<Text>().text = "ID:"+App.CurrentUser.Id.ToString("000000");
         //var user = ConfigHelper.CurrentUser;
         //Ftp.text = summary.Ftp.ToString();
         //Weight.text = user.Weight.ToString();
         //WKG.text = $"{user.Weight}KG/{user.BicycleWeight}KG";
         //NickName.text = user.Nickname;
+
         Utils.DisplayImage(StartCoroutine, userInfo.Find("Avatar").GetComponent<RawImage>(), App.CurrentUser.WxHeadImg);
     }
     async void GetSummary()
@@ -152,6 +152,11 @@ public class HomeController : PFUIPanel
 
     public override void Show()
     {
+        var cg = this.GetComponent<CanvasGroup>();
+        cg.alpha = 0;
         base.Show();
+
+        cg.DOFade(1f, 0.3f);
+       
     }
 }

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

@@ -2,6 +2,7 @@
 using Assets.Scripts.Apis;
 using Assets.Scripts.Apis.Models;
 using Assets.Scripts.UI.Prefab.MapList;
+using DG.Tweening;
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -197,10 +198,10 @@ public class MapListController : PFUIPanel
         var rect = ((RectTransform)headImage.transform).rect;
         material.SetVector(Shader.PropertyToID("_WidthHeightRadius"), new Vector4(rect.width, rect.height, rect.height, 0));
         headImage.material = material;
-        if (App.FromLogin) 
+        //if (App.FromLogin) 
-        {
+        //{
             Utils.DisplayImage(StartCoroutine, headImage, App.CurrentUser.WxHeadImg);
-        }
+        //}
         
 
         UIManager.AddEvent(headImage.gameObject, EventTriggerType.PointerClick, (e) =>
@@ -294,4 +295,13 @@ public class MapListController : PFUIPanel
     {
         
     }
+
+    public override void Show()
+    {
+        var cg = this.GetComponent<CanvasGroup>();
+        cg.alpha = 0;
+        base.Show();
+
+        cg.DOFade(1f, .3f);
+    }
 }

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

@@ -18,10 +18,14 @@ public class UserInfoController : PFUIPanel
 
         Button exitBtn = this.transform.Find("InfoPanel").Find("Button").GetComponent<Button>();
 
-        exitBtn.onClick.AddListener(() =>
+        UIManager.AddEvent(exitBtn.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, (b) =>
         {
             UIManager.ShowHomePanel();
         });
+        //exitBtn.onClick.AddListener(() =>
+        //{
+        //    UIManager.ShowHomePanel();
+        //});
         UIManager.AddEvent(transform.Find("InfoPanel").Find("SwitchAccountButton").gameObject,
              UnityEngine.EventSystems.EventTriggerType.PointerClick, (b) => 
              {
@@ -29,20 +33,24 @@ public class UserInfoController : PFUIPanel
              });
         infoPanel = transform.Find("InfoPanel").Find("P");
         Button editBtn = infoPanel.Find("EditButton").GetComponent<Button>();
-        editBtn.onClick.AddListener(() =>
+        UIManager.AddEvent(editBtn.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, (b) =>
-        {
+         {
-            UIManager.ShowEditUserPanel();
+             UIManager.ShowEditUserPanel();
-        });
+         });
+        //editBtn.onClick.AddListener(() =>
+        //{
+        //    UIManager.ShowEditUserPanel();
+        //});
         summaryPanel = transform.Find("SummaryPanel");
         Load();
     }
     async void Load() 
     {
-        if (!App.FromLogin)
+        //if (!App.FromLogin)
-        {
+        //{
-            var result = await userApi.Login("15651831367", "123456", "");
+        //    var result = await userApi.Login("15651831367", "123456", "");
-            App.CurrentUser = result.data;
+        //    App.CurrentUser = result.data;
-        }
+        //}
         var r = userApi.GetSummary();
         if (r.result) 
         {

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

@@ -17,9 +17,13 @@ public class ResultListController : MonoBehaviour
     Transform btnRoute, btnMatch,searchInput;
     Color c1, c2;
     // Start is called before the first frame update
-    int pageIndex = 0, pageSize = 20;
+    int pageSize = 20;
     string name = "";
     Transform[] contents;
+    Dictionary<int, string> filterOptionDict = new Dictionary<int, string> 
+    {
+        {0,"routes" },{1,"competition" }
+    };
     void Start()
     {
         //ApiBase.SetCookie("73385F5F719B610D132C1ECF3E9143272BF15214D57ED91CD7A9DFD832407471535112AAEB8E9271F75D54FBBF2D99F18FA313C1EEA5676F5D722D7FBB07C926BEC5905591BF9AFDDC6336552DF273112C2DA1794E6FA2F465B11FECD2E82E52");
@@ -36,19 +40,32 @@ public class ResultListController : MonoBehaviour
         contents = new Transform[] { routeContent, matchContent};
         if (btnMatch != null) 
         {
-            btnMatch.GetComponent<Button>().onClick.AddListener(() => StartScroll(0));
+            UIManager.AddEvent(btnMatch.gameObject, EventTriggerType.PointerClick, (b) =>
+            {
+                StartScroll(0);
+            });
+            //btnMatch.GetComponent<Button>().onClick.AddListener(() => StartScroll(0));
         }
         if (btnRoute != null) 
         {
-            btnRoute.GetComponent<Button>().onClick.AddListener(() => StartScroll(1));
+            UIManager.AddEvent(btnRoute.gameObject, EventTriggerType.PointerClick, (b) =>
+            {
+                StartScroll(1);
+            });
+            //btnRoute.GetComponent<Button>().onClick.AddListener(() => StartScroll(1));
         }
         if (searchInput != null) 
         {
-            searchInput.Find("Button").GetComponent<Button>().onClick.AddListener(() =>
+            UIManager.AddEvent(searchInput.Find("Button").gameObject, EventTriggerType.PointerClick, (b) =>
             {
-                name = searchInput.GetComponent<InputField>().text;
+                 name = searchInput.GetComponent<InputField>().text;
-                Refresh(contents[scrollIndex]);
+                 Refresh(contents[scrollIndex]);
             });
+            //searchInput.Find("Button").GetComponent<Button>().onClick.AddListener(() =>
+            //{
+            //    name = searchInput.GetComponent<InputField>().text;
+            //    Refresh(contents[scrollIndex]);
+            //});
         }
         if (routeScroll != null)
         {
@@ -58,7 +75,8 @@ public class ResultListController : MonoBehaviour
         {
             UIManager.AddEvent(matchScroll.gameObject, UnityEngine.EventSystems.EventTriggerType.EndDrag, OnEndDrag);
         }
-        GetList();
+        GetList(0);
+        GetList(1);
     }
 
     private void OnEndDrag(BaseEventData e)
@@ -68,7 +86,7 @@ public class ResultListController : MonoBehaviour
         if (scrollrect.verticalNormalizedPosition <= 0)
         {
             Debug.Log(scrollrect.verticalNormalizedPosition);
-            pageIndex++;
+            pageIndex[scrollIndex]++;
             GetList();
         }
         if (scrollrect.verticalNormalizedPosition >= 1)
@@ -80,23 +98,33 @@ public class ResultListController : MonoBehaviour
     private void Refresh(Transform content)
     {
         content.transform.DestroyChildren();
-        pageIndex = 0;
+        isEnd[scrollIndex] = false;
+        pageIndex[scrollIndex] = 0;
         GetList();
     }
-    bool isEnd = false;
+    Dictionary<int, bool> isEnd = new Dictionary<int, bool> 
-    void GetList()
     {
-        var r =ConfigHelper.mapInterruptRecordApi.GetMapInterruptRecord(name, pageIndex, 20);
+        {0,false },{1,false }
+    };
+    Dictionary<int, int> pageIndex = new Dictionary<int, int>
+    {
+        {0,0 },{1,0 }
+    };
+    async void GetList(int? sindex = null)
+    {
+        var index = sindex ?? scrollIndex;
+        if (isEnd[index]) return;
+        var r = await ConfigHelper.mapInterruptRecordApi.GetMapInterruptRecord(name, pageIndex[index], 20,filterOptionDict[index]);
         if (r.result)
         {
-            if (r.data.Count == 0 && pageIndex != 0)
+            if (r.data.Count == 0 && pageIndex[index] != 0)
             {
-                isEnd = true;
+                isEnd[index] = true;
             }
             else
             {
-                isEnd = false;
+                isEnd[index] = false;
-                DisplayRouteResult(r.data,contents[scrollIndex]);
+                DisplayRouteResult(r.data, contents[index],index);
                 //DisplayRouteResult(r.data, matchContent);
             }
         }
@@ -105,14 +133,14 @@ public class ResultListController : MonoBehaviour
             Utils.showToast(gameObject, r.errMsg);
         }
     }
-    void DisplayRouteResult(List<RouteResult> list,Transform content)
+    void DisplayRouteResult(List<RouteResult> list,Transform content,int index)
     {
         if (routeResult != null)
         {
             foreach (var item in list)
             {
                 var obj = Instantiate(routeResult);
-                obj.GetComponent<RouteItem>().Initial(item);
+                obj.GetComponent<RouteItem>().Initial(item, index);
                 //obj.SendMessage("Initial", );
                 obj.transform.parent = content;
                 obj.transform.localScale = new Vector3(1, 1, 1);

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

@@ -26,7 +26,9 @@ public class RouteItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandle
     }
     string titleColor = "#5c5c6e";
     RouteResult data;
-    public void Initial(RouteResult result)
+    //滑动索引 0route 1match
+    int index;
+    public void Initial(RouteResult result,int index)
     {
         routeResult = result;
         left = transform.Find("Left");
@@ -38,29 +40,49 @@ public class RouteItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandle
         row1.Find("Time").GetComponent<Text>().text = $"<color={titleColor}>Riding time:</color>{result.TrainingTime}";
         row1.Find("Distance").GetComponent<Text>().text = $"<color={titleColor}>Mileage:</color>{result.EndDistance.ToString("#0.00")}KM";
         row1.Find("Times").GetComponent<Text>().text = $"<color={titleColor}>Times:</color>{result.Count}";
-        row1.Find("Rank").GetComponent<Text>().text = $"<color={titleColor}>Rank:</color>{result.Ranking}";
+        if (index == 0)
+        {
+            row1.Find("Rank").GetComponent<Text>().text = $"<color={titleColor}>Rank:</color>{result.Ranking}";
+        }
+        else 
+        {
+            row1.Find("Rank").GetComponent<Text>().text = $"";
+        }
         left.Find("Progress").Find("Image").GetComponent<Image>().fillAmount = (float)result.Progress;
         left.Find("Progress").Find("Value").GetComponent<Text>().text = (result.Progress * 100).ToString("#0");
         row2.Find("Device").GetComponent<Text>().text = $"<color={titleColor}>Cycling equipment:</color>{result.ManufacturerName}";
-        right = transform.Find("Right");
+        if (index == 0)
-        btnContinue = right.Find("BtnContinue");
-        if (btnContinue) 
         {
-            btnContinue.gameObject.SetActive(false);
+            right = transform.Find("Right");
-            btnContinue.GetComponent<Button>().onClick.AddListener(GoContinue);
+            btnContinue = right.Find("BtnContinue");
+            if (btnContinue)
+            {
+                //btnContinue.gameObject.SetActive(false);
+                btnContinue.GetComponent<Button>().onClick.AddListener(GoContinue);
+            }
+            btnReRide = right.Find("BtnReRide");
+            if (btnReRide)
+            {
+                //btnReRide.gameObject.SetActive(false);
+                btnReRide.GetComponent<Button>().onClick.AddListener(GoReRide);
+            }
+            btnDelete = right.Find("BtnDelete");
+            if (btnDelete)
+            {
+                //btnDelete.gameObject.SetActive(false);
+                btnDelete.GetComponent<Button>().onClick.AddListener(Delete);
+            }
+            SetButtonColor(false);
+            transform.Find("RightMatch").gameObject.SetActive(false);
         }
-        btnReRide = right.Find("BtnReRide");
+        else 
-        if (btnReRide)
         {
-            btnReRide.gameObject.SetActive(false);
+            right = transform.Find("RightMatch");
-            btnReRide.GetComponent<Button>().onClick.AddListener(GoReRide);
+            transform.Find("Right").gameObject.SetActive(false);
-        }
+            right.Find("Value").GetComponent<Text>().text = result.Ranking.ToString();
-        btnDelete = right.Find("BtnDelete");
-        if (btnDelete)
-        {
-            btnDelete.gameObject.SetActive(false);
-            btnDelete.GetComponent<Button>().onClick.AddListener(Delete);
         }
+        right.gameObject.SetActive(true);
+        this.index = index;
     }
 
     private void Delete()
@@ -86,10 +108,35 @@ public class RouteItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandle
             SceneManager.LoadScene("Ride");
         }
     }
-
+    void SetButtonColor(bool f) 
+    {
+        if (f)
+        {
+            btnContinue.GetComponent<Image>().color = Utils.HexToColorHtml("#F93086");
+            btnReRide.GetComponent<Image>().color = Utils.HexToColorHtml("#F93086");
+            btnDelete.GetComponent<Image>().color = Utils.HexToColorHtml("#353543");
+            btnContinue.Find("Text").GetComponent<Text>().color = Utils.HexToColorHtml("#ffffff");
+            btnReRide.Find("Text").GetComponent<Text>().color = Utils.HexToColorHtml("#ffffff");
+            btnDelete.Find("Text").GetComponent<Text>().color = Utils.HexToColorHtml("#474759");
+        }
+        else 
+        {
+            btnContinue.GetComponent<Image>().color = Utils.HexToColorHtml("#414251");
+            btnReRide.GetComponent<Image>().color = Utils.HexToColorHtml("#414251");
+            btnDelete.GetComponent<Image>().color = Utils.HexToColorHtml("#23232D");
+            btnContinue.Find("Text").GetComponent<Text>().color = Utils.HexToColorHtml("#353543");
+            btnReRide.Find("Text").GetComponent<Text>().color = Utils.HexToColorHtml("#353543");
+            btnDelete.Find("Text").GetComponent<Text>().color = Utils.HexToColorHtml("#353543");
+        }
+    }
     public void OnPointerExit(PointerEventData eventData)
     {
         transform.GetComponent<Image>().color = Utils.HexToColorHtml("#23232d");
+        if (index == 1)
+        {
+            right.Find("Text").GetComponent<Text>().color = Utils.HexToColorHtml("#414251");
+            right.Find("Value").GetComponent<Text>().color = Utils.HexToColorHtml("#5c5c6e");
+        }
         if (left != null) 
         {
             left.Find("Main").Find("Time").GetComponent<Text>().color = Utils.HexToColorHtml("#414251");
@@ -105,14 +152,17 @@ public class RouteItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandle
             row1.Find("Rank").GetComponent<Text>().color = Utils.HexToColorHtml("#9E9EAD");
         }
         titleColor = "#414251";
-        btnContinue.gameObject.SetActive(false);
+        SetButtonColor(false);
-        btnReRide.gameObject.SetActive(false);
-        btnDelete.gameObject.SetActive(false);
     }
 
     public void OnPointerEnter(PointerEventData eventData)
     {
         transform.GetComponent<Image>().color = Utils.HexToColorHtml("#353543");
+        if (index == 1) 
+        {
+            right.Find("Text").GetComponent<Text>().color = Utils.HexToColorHtml("#5c5c6e");
+            right.Find("Value").GetComponent<Text>().color = Utils.HexToColorHtml("#ffffff");
+        }
         if (left != null)
         {
             left.Find("Main").Find("Time").GetComponent<Text>().color = Utils.HexToColorHtml("#5c5c6e");
@@ -128,8 +178,6 @@ public class RouteItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandle
             row1.Find("Rank").GetComponent<Text>().color = Utils.HexToColorHtml("#ffffff");
         }
         titleColor = "#5c5c6e";
-        btnContinue.gameObject.SetActive(true);
+        SetButtonColor(true);
-        btnReRide.gameObject.SetActive(true);
-        btnDelete.gameObject.SetActive(true);
     }
 }

Assets/Scripts/UI/Prefab/SettingContoller.cs

@@ -1,7 +1,9 @@
-using System.Collections;
+using DG.Tweening;
+using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.UI;
+using UnityEngine.EventSystems;
 
 public class SettingContoller : PFUIPanel
 {
@@ -12,13 +14,17 @@ public class SettingContoller : PFUIPanel
         exit = transform.Find("Main").Find("Exit");
         if (exit != null) 
         {
-            exit.GetComponent<Button>().onClick.AddListener(()=> 
+            //exit.GetComponent<Button>().onClick.AddListener(()=> 
+            //{
+            //    Close();
+            //});
+            UIManager.AddEvent(exit.gameObject, EventTriggerType.PointerClick, (e) =>
             {
                 Close();
             });
         }
     }
-    void Start()
+    protected override void Start()
     {
 
     }
@@ -28,4 +34,13 @@ public class SettingContoller : PFUIPanel
     {
         
     }
+
+    public override void Show()
+    {
+        var cg = this.GetComponent<CanvasGroup>();
+        cg.alpha = 0;
+        base.Show();
+
+        cg.DOFade(1f, 0.3f);
+    }
 }

Assets/Scripts/UIManager.cs

@@ -339,7 +339,7 @@ public class UIManager : MonoBehaviour
         var obj = Resources.Load("UI/Prefab/Panel/BigMapPanel");
         //var root = UIManager.Instance.MainPanel.transform.parent.parent;
         var bigMap = (GameObject)Instantiate(obj, UIManager.Instance.Root.transform);
-
+        bigMap.GetComponent<BigMapController>().Show();
         //prePanel = bigMap.GetComponent<PFUIPanel>();
     }
 
@@ -373,6 +373,7 @@ public class UIManager : MonoBehaviour
             });
             UIManager.AddEvent(gameObject, EventTriggerType.PointerExit, (e) => {
                 if (!gameObject.activeInHierarchy) return;
+                
                 Cursor.SetCursor(null, Vector2.zero, CursorMode.Auto);
             });
         }