From 49da1493d5303986d35dfae79d454a73bee6669c Mon Sep 17 00:00:00 2001
From: lishuo <lishuo@juze.pro>
Date: Tue, 17 Aug 2021 18:43:41 +0800
Subject: [PATCH] =?UTF-8?q?nearby=E9=87=8D=E5=90=88=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=EF=BC=86=E7=BA=BF=E8=B7=AF=E6=8E=92=E5=BA=8F=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=EF=BC=86=E6=98=BE=E7=A4=BA=E8=B5=9B=E4=BA=8B=E7=BC=96=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Assets/Resources/Images/Ride/编组 15.png      | Bin 0 -> 1335 bytes
 Assets/Resources/Images/Ride/编组 15.png.meta | 104 +++++++++
 .../UI/Prefab/Match/CompetitonPanel.prefab    | 200 ++++++++++++++--
 .../UI/Prefab/Match/LoadingPanel.prefab       | 220 +++++++++++++++---
 Assets/Scripts/Apis/MapApi.cs                 |   7 +-
 .../CompetitionLoadingController.cs           |   4 +
 .../Scenes/Ride/Scripts/LoadingController.cs  |   3 +
 .../Scenes/Ride/Scripts/NearByFactory.cs      |   1 +
 .../UI/Prefab/MapList/MapFilterOptions.cs     |   2 +-
 9 files changed, 483 insertions(+), 58 deletions(-)
 create mode 100644 Assets/Resources/Images/Ride/编组 15.png
 create mode 100644 Assets/Resources/Images/Ride/编组 15.png.meta

diff --git a/Assets/Resources/Images/Ride/编组 15.png b/Assets/Resources/Images/Ride/编组 15.png
new file mode 100644
index 0000000000000000000000000000000000000000..1985dbc630097d64860fb1fe76d9cead43cfe3e6
GIT binary patch
literal 1335
zcmV-71<3k|P)<h;3K|Lk000e1NJLTq001}u001}$1^@s6sD?Wp00004XF*Lt006O%
z3;baP0000uWmrjOO-%qQ0000800D<-00aO40096102%-Q00002paK8{000010000u
zpaTE|000010000u00000E}u$i000E4Nkl<ZXa((=TZmO<6vxj|(XuAR3N(wsQS(9#
zl%S=NiGl<AAo!pUB53p|5@a`=5hB461*0$!lOE>5mx3;c;%$0S(3c1YydW}DnrY;i
zP0ftsOuu#7`^-A)?A!5tb8H{af;D^n*IM6N-}-L*+h;PF8l`&#vaY&6G&D4WSd&z|
zo@_STp>V87jPW?VU>q+H=eE&R9@4o!*wW-udP3tC8vy)iDKV_?D61#~j}2%$E<hKh
z3i1!qMa3wvxh$|C@c#u=eSu@_NVDeGqHBU5Q8pO};Q^&fB7R1^o+OT*Ph)`ZQeqqo
z(1)q6V%WpM^s_h=oT3EUi0%t9q?|hG{~U_^$1c%TDKE_Lem%lV0&Icu9;z0~)nW^*
zmg4et6df{o%dqej;@M#sD(wicw4%Eepbt|m$FRg0&w#%+It#a;c+x71Fo(=B*wULt
zjsXhW$iuQ15)*B<2gKPI7l1aG0@^K;c2&PbYX!zF4`sihWD$GeJ4P1=Z4B`b(#6He
z+mjqJdFL2m3ii>;XOI`|J%wXM{6AqY?bVLx?rL1B?5sdKGDvdavZ&mGZ1UP3v?G!>
zT${nP&6w?PNrwz4+&lt&V1gXrU^rxS8GN5c_qoz<!>{N^DEubkBVREM@HF^YxEuZr
zJ_UbIyFYlAPb7=Hs$pLVTas&1(LkZAH;#*S53xN4e+b_)eiq(E@e!<FK{}KS=7?U^
zW{~Zzf{e*P8*bZSnZYQM!E1(3P)N~0Ml}?ht3#%l<m2O#`F4EQAj`7!NnYk#;f1h#
z6}$q!2lv4~y^gTi2lw?Paj8pmfHpoA>`j#QzQKFumMC%^d_&nJ#?qh;qkjYLSH6ED
zKW=@|jo1?1uadn>BK^y@G8Kp~g5&`5=?I6&aUbX>`gX8B!0Nzrv`?H|?h@Taf@@w9
z*-P)oCB#0{_<Uoqh4y2&q6PNQ8#w@c+Qcl%F&{;?z+a=BvHfD~vki`f<<6i4{}TR5
z1W0~M-IkNW|4cWg-wn3#rcqRM1~cpv`GR;ybz%dvI7?wG_8UdqYhr@&4}BjRzZ`Ti
zgHq&Cq8;`UNC)Ko7Dm^NVXDCvK4TPe!%0j|3iPsV;pu<iu1208(hGZCTM**st6%j6
z?|ISSNa(CUX7L=E4ybG&D_M)*0`yn<I+nD4ZRCB?KLOa7SNtb@XK*BRR-l)qh38+M
z{JhDW`#%T+(T%=M+2ml7YuH?+ll!GyyidYXq)$K4{=5&8Je?Lua@k)y6C{2cpHAf`
z|F-U+s4iHFy$lw9S^3DotXDXZ=(IpD<8Gc;qp~v)@;~=QaJ%t)4!i_zfO9kM*=66Y
zpk0@T6F;06NGJX#yIh<j2|pPGxq}MJmG27N3k%8fM_87!T(BGQmv6)Jh@}yE*)A`7
zvexurB3#nD4*$^0_LyX8E9b>b$zF3t&X=gOo;eCsE6~wEKCm#g8GK+v?<jGSQ*<WB
z@N16pjZ~ON!vZHMP=4JKP9;5bdvG9?(-hq4TrGA6PY3&^PAi{mx!;NG9&E+%6x;-l
tgVRWIiErl0=jI<aX&ixCpVKq~{{p#*m-mQDUXuU-002ovPDHLkV1fu|W10W}

literal 0
HcmV?d00001

diff --git a/Assets/Resources/Images/Ride/编组 15.png.meta b/Assets/Resources/Images/Ride/编组 15.png.meta
new file mode 100644
index 00000000..ac9697ab
--- /dev/null
+++ b/Assets/Resources/Images/Ride/编组 15.png.meta	
@@ -0,0 +1,104 @@
+fileFormatVersion: 2
+guid: 762994a6a0b398c49b038120301bf5de
+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: 
diff --git a/Assets/Resources/UI/Prefab/Match/CompetitonPanel.prefab b/Assets/Resources/UI/Prefab/Match/CompetitonPanel.prefab
index 4bae737a..722bf7fe 100644
--- a/Assets/Resources/UI/Prefab/Match/CompetitonPanel.prefab
+++ b/Assets/Resources/UI/Prefab/Match/CompetitonPanel.prefab
@@ -124,6 +124,84 @@ MonoBehaviour:
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &486928665351942900
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6098493334929419579}
+  - component: {fileID: 8367125415035570718}
+  - component: {fileID: 3434730319805254204}
+  m_Layer: 5
+  m_Name: MapId
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6098493334929419579
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 486928665351942900}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 6558498177448486125}
+  m_RootOrder: 18
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 606.7, y: -179}
+  m_SizeDelta: {x: 83.693054, y: 28}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8367125415035570718
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 486928665351942900}
+  m_CullTransparentMesh: 0
+--- !u!114 &3434730319805254204
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 486928665351942900}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3}
+    m_FontSize: 20
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 40
+    m_Alignment: 6
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 1
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 0
 --- !u!1 &568794585315016799
 GameObject:
   m_ObjectHideFlags: 0
@@ -515,7 +593,7 @@ RectTransform:
   m_Children:
   - {fileID: 7308942387469008178}
   m_Father: {fileID: 6558498177448486125}
-  m_RootOrder: 27
+  m_RootOrder: 29
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -851,7 +929,7 @@ RectTransform:
   - {fileID: 5698108039784919937}
   - {fileID: 7832561499842500791}
   m_Father: {fileID: 6558498177448486125}
-  m_RootOrder: 33
+  m_RootOrder: 35
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {x: 1, y: 0}
@@ -1223,7 +1301,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 6558498177448486125}
-  m_RootOrder: 32
+  m_RootOrder: 34
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {x: 1, y: 0}
@@ -1301,7 +1379,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 6558498177448486125}
-  m_RootOrder: 17
+  m_RootOrder: 19
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -1673,7 +1751,7 @@ RectTransform:
   - {fileID: 7508488585840996723}
   - {fileID: 804126381881165943}
   m_Father: {fileID: 6558498177448486125}
-  m_RootOrder: 35
+  m_RootOrder: 37
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {x: 1, y: 0}
@@ -1808,7 +1886,7 @@ RectTransform:
   - {fileID: 9050330319599987492}
   - {fileID: 4958187996342670554}
   m_Father: {fileID: 6558498177448486125}
-  m_RootOrder: 37
+  m_RootOrder: 39
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {x: 1, y: 0}
@@ -2336,7 +2414,7 @@ RectTransform:
   - {fileID: 6558498177838812408}
   - {fileID: 6558498178609268828}
   m_Father: {fileID: 6558498177448486125}
-  m_RootOrder: 38
+  m_RootOrder: 40
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {x: 1, y: 0}
@@ -2468,7 +2546,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 6558498177448486125}
-  m_RootOrder: 26
+  m_RootOrder: 28
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -2930,6 +3008,8 @@ RectTransform:
   - {fileID: 6558498178970650012}
   - {fileID: 6558498179157108068}
   - {fileID: 6558498179321791264}
+  - {fileID: 169318638442674245}
+  - {fileID: 6098493334929419579}
   - {fileID: 7411107261559440790}
   - {fileID: 6558498177678574344}
   - {fileID: 6558498178512125495}
@@ -3150,7 +3230,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 6558498177448486125}
-  m_RootOrder: 18
+  m_RootOrder: 20
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -3228,7 +3308,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 6558498177448486125}
-  m_RootOrder: 25
+  m_RootOrder: 27
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -3513,7 +3593,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 6558498177448486125}
-  m_RootOrder: 30
+  m_RootOrder: 32
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {x: 1, y: 0}
@@ -3593,7 +3673,7 @@ RectTransform:
   - {fileID: 5276663987612575157}
   - {fileID: 6558498178766627004}
   m_Father: {fileID: 6558498177448486125}
-  m_RootOrder: 28
+  m_RootOrder: 30
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -3672,7 +3752,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 6558498177448486125}
-  m_RootOrder: 29
+  m_RootOrder: 31
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {x: 1, y: 0}
@@ -3988,7 +4068,7 @@ RectTransform:
   - {fileID: 6558498178642912254}
   - {fileID: 6558498177739491041}
   m_Father: {fileID: 6558498177448486125}
-  m_RootOrder: 34
+  m_RootOrder: 36
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {x: 1, y: 0}
@@ -4203,7 +4283,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 6558498177448486125}
-  m_RootOrder: 22
+  m_RootOrder: 24
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -4562,7 +4642,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 6558498177448486125}
-  m_RootOrder: 19
+  m_RootOrder: 21
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -4714,7 +4794,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 6558498177448486125}
-  m_RootOrder: 39
+  m_RootOrder: 41
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -4999,7 +5079,7 @@ RectTransform:
   - {fileID: 6558498178369272025}
   - {fileID: 6558498178957397887}
   m_Father: {fileID: 6558498177448486125}
-  m_RootOrder: 36
+  m_RootOrder: 38
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {x: 1, y: 0}
@@ -5821,7 +5901,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 6558498177448486125}
-  m_RootOrder: 23
+  m_RootOrder: 25
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -5977,7 +6057,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 6558498177448486125}
-  m_RootOrder: 21
+  m_RootOrder: 23
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -6025,6 +6105,80 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: 0000 - 00-00 00:00:00
+--- !u!1 &6967565870765060030
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 169318638442674245}
+  - component: {fileID: 8954508495726212577}
+  - component: {fileID: 7439621176865291513}
+  m_Layer: 5
+  m_Name: MapIcon
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &169318638442674245
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6967565870765060030}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 6558498177448486125}
+  m_RootOrder: 17
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 544.8535, y: -181}
+  m_SizeDelta: {x: 16, y: 16}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8954508495726212577
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6967565870765060030}
+  m_CullTransparentMesh: 0
+--- !u!114 &7439621176865291513
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6967565870765060030}
+  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: 762994a6a0b398c49b038120301bf5de, 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 &6980510087908380503
 GameObject:
   m_ObjectHideFlags: 0
@@ -6131,7 +6285,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 6558498177448486125}
-  m_RootOrder: 31
+  m_RootOrder: 33
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {x: 1, y: 0}
@@ -6583,7 +6737,7 @@ RectTransform:
   - {fileID: 4513700211969794283}
   - {fileID: 4980171126590156168}
   m_Father: {fileID: 6558498177448486125}
-  m_RootOrder: 24
+  m_RootOrder: 26
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -6811,7 +6965,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 6558498177448486125}
-  m_RootOrder: 20
+  m_RootOrder: 22
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
diff --git a/Assets/Resources/UI/Prefab/Match/LoadingPanel.prefab b/Assets/Resources/UI/Prefab/Match/LoadingPanel.prefab
index a8fff719..e535d57c 100644
--- a/Assets/Resources/UI/Prefab/Match/LoadingPanel.prefab
+++ b/Assets/Resources/UI/Prefab/Match/LoadingPanel.prefab
@@ -34,7 +34,7 @@ RectTransform:
   - {fileID: 145307034357954014}
   - {fileID: 3327674566083090465}
   m_Father: {fileID: 3007624749581944593}
-  m_RootOrder: 27
+  m_RootOrder: 29
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {x: 1, y: 0}
@@ -169,7 +169,7 @@ RectTransform:
   - {fileID: 145307034124314502}
   - {fileID: 3327674565846436473}
   m_Father: {fileID: 3007624749581944593}
-  m_RootOrder: 28
+  m_RootOrder: 30
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {x: 1, y: 0}
@@ -984,6 +984,84 @@ MonoBehaviour:
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &2769541347924689023
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 756218096192378214}
+  - component: {fileID: 5327673503896133289}
+  - component: {fileID: 7601601580800100336}
+  m_Layer: 5
+  m_Name: MapId
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &756218096192378214
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2769541347924689023}
+  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: 3007624749581944593}
+  m_RootOrder: 6
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 153.85, y: -344.3}
+  m_SizeDelta: {x: 83.693054, y: 28}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5327673503896133289
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2769541347924689023}
+  m_CullTransparentMesh: 0
+--- !u!114 &7601601580800100336
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2769541347924689023}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3}
+    m_FontSize: 20
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 40
+    m_Alignment: 6
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 1
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 0
 --- !u!1 &3007624748289717559
 GameObject:
   m_ObjectHideFlags: 0
@@ -1014,11 +1092,11 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 3007624749581944593}
-  m_RootOrder: 12
+  m_RootOrder: 14
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 92, y: -429}
+  m_AnchoredPosition: {x: 92, y: -457.69998}
   m_SizeDelta: {x: 16, y: 16}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3007624748289717560
@@ -1088,7 +1166,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 3007624749581944593}
-  m_RootOrder: 6
+  m_RootOrder: 8
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -1159,11 +1237,11 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 3007624749581944593}
-  m_RootOrder: 13
+  m_RootOrder: 15
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 153.8465, y: -427}
+  m_AnchoredPosition: {x: 153.8465, y: -455.69998}
   m_SizeDelta: {x: 83.693054, y: 28}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3007624748526063404
@@ -1237,11 +1315,11 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 3007624749581944593}
-  m_RootOrder: 15
+  m_RootOrder: 17
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 153.84656, y: -389}
+  m_AnchoredPosition: {x: 153.84656, y: -417.69998}
   m_SizeDelta: {x: 83.693054, y: 28}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3007624748546083608
@@ -1413,11 +1491,11 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 3007624749581944593}
-  m_RootOrder: 10
+  m_RootOrder: 12
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 92, y: -353}
+  m_AnchoredPosition: {x: 92, y: -381.69998}
   m_SizeDelta: {x: 16, y: 16}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3007624748693613234
@@ -1487,7 +1565,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 3007624749581944593}
-  m_RootOrder: 29
+  m_RootOrder: 31
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1640,7 +1718,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 3007624749581944593}
-  m_RootOrder: 5
+  m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -1947,7 +2025,7 @@ RectTransform:
   m_Children:
   - {fileID: 3007624749716399586}
   m_Father: {fileID: 3007624749581944593}
-  m_RootOrder: 9
+  m_RootOrder: 11
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -2034,11 +2112,11 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 3007624749581944593}
-  m_RootOrder: 14
+  m_RootOrder: 16
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 92, y: -391}
+  m_AnchoredPosition: {x: 92, y: -419.69998}
   m_SizeDelta: {x: 16, y: 16}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3007624749186584481
@@ -2108,7 +2186,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 3007624749581944593}
-  m_RootOrder: 25
+  m_RootOrder: 27
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
@@ -2184,7 +2262,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 3007624749581944593}
-  m_RootOrder: 8
+  m_RootOrder: 10
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -2255,11 +2333,11 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 3007624749581944593}
-  m_RootOrder: 17
+  m_RootOrder: 19
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 153.8465, y: -465}
+  m_AnchoredPosition: {x: 153.8465, y: -493.69998}
   m_SizeDelta: {x: 83.693054, y: 28}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3007624749335273309
@@ -2411,7 +2489,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 3007624749581944593}
-  m_RootOrder: 21
+  m_RootOrder: 23
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -2494,6 +2572,8 @@ RectTransform:
   - {fileID: 3007624748601755783}
   - {fileID: 2322716380738134732}
   - {fileID: 3007624748799085429}
+  - {fileID: 5324006962730904505}
+  - {fileID: 756218096192378214}
   - {fileID: 3007624748807431534}
   - {fileID: 3007624748412546457}
   - {fileID: 3007624750289242273}
@@ -2610,7 +2690,7 @@ RectTransform:
   - {fileID: 3007624749338625854}
   - {fileID: 3007624749010474861}
   m_Father: {fileID: 3007624749581944593}
-  m_RootOrder: 26
+  m_RootOrder: 28
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {x: 1, y: 0}
@@ -2742,7 +2822,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 3007624749581944593}
-  m_RootOrder: 18
+  m_RootOrder: 20
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -2904,7 +2984,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 3007624749581944593}
-  m_RootOrder: 23
+  m_RootOrder: 25
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {x: 1, y: 0}
@@ -2983,7 +3063,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 3007624749581944593}
-  m_RootOrder: 19
+  m_RootOrder: 21
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -3067,7 +3147,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 3007624749581944593}
-  m_RootOrder: 20
+  m_RootOrder: 22
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -3243,7 +3323,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 3007624749581944593}
-  m_RootOrder: 24
+  m_RootOrder: 26
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
@@ -3321,11 +3401,11 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 3007624749581944593}
-  m_RootOrder: 16
+  m_RootOrder: 18
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 92, y: -466}
+  m_AnchoredPosition: {x: 92, y: -494.69998}
   m_SizeDelta: {x: 16, y: 16}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3007624750146435812
@@ -3396,7 +3476,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 3007624749581944593}
-  m_RootOrder: 22
+  m_RootOrder: 24
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {x: 1, y: 0}
@@ -3486,11 +3566,11 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 3007624749581944593}
-  m_RootOrder: 11
+  m_RootOrder: 13
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 153.84656, y: -351}
+  m_AnchoredPosition: {x: 153.84656, y: -379.69998}
   m_SizeDelta: {x: 83.693054, y: 28}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3007624750243088003
@@ -3564,7 +3644,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 3007624749581944593}
-  m_RootOrder: 7
+  m_RootOrder: 9
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -3887,3 +3967,77 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_HorizontalFit: 2
   m_VerticalFit: 0
+--- !u!1 &8110328268474125505
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5324006962730904505}
+  - component: {fileID: 7943435336564939480}
+  - component: {fileID: 6981647137641869650}
+  m_Layer: 5
+  m_Name: MapIcon
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5324006962730904505
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8110328268474125505}
+  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: 3007624749581944593}
+  m_RootOrder: 5
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 92, y: -346.3}
+  m_SizeDelta: {x: 16, y: 16}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7943435336564939480
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8110328268474125505}
+  m_CullTransparentMesh: 0
+--- !u!114 &6981647137641869650
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8110328268474125505}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.40392157, g: 0.40392157, b: 0.4745098, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 762994a6a0b398c49b038120301bf5de, 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
diff --git a/Assets/Scripts/Apis/MapApi.cs b/Assets/Scripts/Apis/MapApi.cs
index 46322c3f..e2a363fc 100644
--- a/Assets/Scripts/Apis/MapApi.cs
+++ b/Assets/Scripts/Apis/MapApi.cs
@@ -59,7 +59,12 @@ namespace Assets.Scripts.Apis
         /// <returns></returns>
         public Task<JsonResult<List<MapRoute>>> GetList(int pageIndex, int pageSize, string name, string distance="", string hands="", bool is3D=false, string sort="", string sortDire = "", bool isFav = false)
         {
-            var url = $"Map/GetRoute?pageIndex={ pageIndex }&pageSize={ pageSize }&name={ name }&distance={ distance }&hands={ hands }&is3D={ is3D }&sort={ sort }&sortDire={ sortDire }&isFav={isFav}";
+            string lngLat = "";
+            if (string.IsNullOrEmpty(name) && string.IsNullOrEmpty(distance) && string.IsNullOrEmpty(hands) && !is3D && sort.Equals("Hot") && sortDire.Equals("desc") && !isFav)
+            {
+                lngLat = $"{App.longitude},{App.latitude}";
+            }
+            var url = $"Map/GetRoute?pageIndex={ pageIndex }&pageSize={ pageSize }&name={ name }&distance={ distance }&hands={ hands }&is3D={ is3D }&sort={ sort }&sortDire={ sortDire }&isFav={isFav}&lngLat={lngLat}";
 
             return GetAsync<JsonResult<List<MapRoute>>>(url);
         }
diff --git a/Assets/Scripts/Scenes/Ride/Competiton/CompetitionLoadingController.cs b/Assets/Scripts/Scenes/Ride/Competiton/CompetitionLoadingController.cs
index 2d2e1b3a..b16460b0 100644
--- a/Assets/Scripts/Scenes/Ride/Competiton/CompetitionLoadingController.cs
+++ b/Assets/Scripts/Scenes/Ride/Competiton/CompetitionLoadingController.cs
@@ -115,6 +115,7 @@ namespace Assets.Scenes.Ride.Scripts
         GameObject MoreHead { get; set; }
         Text CompetitionTitle { get; set; }
         Text EndTime { get; set; }
+        Text MapId { get; set; }
         //构建赛事界面
         protected override void InitGameObject()
         {
@@ -135,6 +136,7 @@ namespace Assets.Scenes.Ride.Scripts
             ReadMore = panel.transform.Find("ReadMore").gameObject;
             GetReady = panel.transform.Find("GetReady").GetComponent<Text>();
             GetReadyTitle = panel.transform.Find("GetReadyTitle").GetComponent<Text>();
+            MapId = panel.transform.Find("MapId").GetComponent<Text>();
             Watcher = Resources.Load<GameObject>("UI/Prefab/Match/Watcher");
             MoreHead = Resources.Load<GameObject>("UI/Prefab/Match/MoreHead");
             Watch.GetComponent<Button>().enabled = false;
@@ -183,6 +185,8 @@ namespace Assets.Scenes.Ride.Scripts
             ShowPlayers(competition.UserList);
             //路书描述
             mapDescText.text = competition.Dec;
+            //线路编号
+            MapId.text = route.Id.ToString();
 
             ReadMore.SetActive(!string.IsNullOrEmpty(competition.CompetitionPreviewUrl));
             //主办方logo
diff --git a/Assets/Scripts/Scenes/Ride/Scripts/LoadingController.cs b/Assets/Scripts/Scenes/Ride/Scripts/LoadingController.cs
index 3f568b86..a85db82f 100644
--- a/Assets/Scripts/Scenes/Ride/Scripts/LoadingController.cs
+++ b/Assets/Scripts/Scenes/Ride/Scripts/LoadingController.cs
@@ -20,6 +20,7 @@ namespace Assets.Scenes.Ride.Scripts
 		protected RawImage mapCountry;
 		protected RawImage altitudeGraph;
 		protected Transform mapRanking;
+		protected Text mapId;
 		#endregion
 
 		public override void InjectController(CyclingController controller)
@@ -54,6 +55,7 @@ namespace Assets.Scenes.Ride.Scripts
 			head = panel.transform.Find("UploadByHead").GetComponent<RawImage>();
 			altitudeGraph = panel.transform.Find("AltitudeGraph").GetComponent<RawImage>();
 			mapRanking = panel.transform.Find("MapRanking");
+			mapId = panel.transform.Find("MapId").GetComponent<Text>();
 		}
 		protected override void InitGameObjectData()
 		{
@@ -67,6 +69,7 @@ namespace Assets.Scenes.Ride.Scripts
 			rideNum.text = route.TheHeat.ToString();
 			distance.text = route.Distance.ToString("f1") + "KM";
 			mapDescText.text = route.Dec;
+			mapId.text = route.Id.ToString();
 			var userList = ConfigHelper.mapApi.GetOnlineUserInfo(new int[] { route.UserId }).data;
 			if (userList.Count > 0)
 			{
diff --git a/Assets/Scripts/Scenes/Ride/Scripts/NearByFactory.cs b/Assets/Scripts/Scenes/Ride/Scripts/NearByFactory.cs
index e184421e..41487658 100644
--- a/Assets/Scripts/Scenes/Ride/Scripts/NearByFactory.cs
+++ b/Assets/Scripts/Scenes/Ride/Scripts/NearByFactory.cs
@@ -29,6 +29,7 @@ namespace Assets.Scenes.Ride.Scripts
         protected override void CreateList()
         {
             OnlineUserNum.text =  MapUDPService.GetNearRiderCount().ToString();
+            LayoutRebuilder.ForceRebuildLayoutImmediate(OnlineUserNum.rectTransform);
             var nearList = MapUDPService.GetNearRiderData(pageIndex, pageSize, new double[] { playerController.Currentlatlong.x, playerController.Currentlatlong.y });
             totalPages = MapUDPService.GetNearRiderCount();
             for (int i = 0; i < nearList.Count(); i++)
diff --git a/Assets/Scripts/UI/Prefab/MapList/MapFilterOptions.cs b/Assets/Scripts/UI/Prefab/MapList/MapFilterOptions.cs
index 5e7350d6..d8c58fb1 100644
--- a/Assets/Scripts/UI/Prefab/MapList/MapFilterOptions.cs
+++ b/Assets/Scripts/UI/Prefab/MapList/MapFilterOptions.cs
@@ -40,7 +40,7 @@ namespace Assets.Scripts.UI.Prefab.MapList
             {"HC","750-99999" },
         };
         public static List<Dropdown.OptionData> sorts = new string[] {
-            "Trend","Name","Distance","Difficulty"//,"Times"
+            "Trend","Name","Distance","Difficulty","Time"
         }.Select(x => new Dropdown.OptionData(x)).ToList();
         public static Dictionary<string, string> diffDisplayDict = new Dictionary<string, string>()
         {