暂存

.gitignore

@@ -73,3 +73,4 @@ Assets/Packages
 Assets/Packages.meta
 Assets/Shader2D-master
 Assets/ZFBrowser
+Assets/Resources/UI/Font

Assets/Mapbox/User.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 95a41acefc4f5e04a9a456f8ce06938e
+guid: 102e792eaf910f74e9acb0b9a6182219
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Assets/NuGet.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 9a0a7989900f2c34abeee17c663d08dc
+guid: 217cb7caed5f7fb49b339428b1d80974
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Assets/NuGet/Apis.meta

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

Assets/Resources/Images/back.png.meta

@@ -0,0 +1,116 @@
+fileFormatVersion: 2
+guid: c30fffdfc35042c448a3aab8559ed062
+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: 0
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Images/change account.png.meta

@@ -0,0 +1,116 @@
+fileFormatVersion: 2
+guid: bb837cfa22ca26441a41246a50f74a51
+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: 0
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/UI/Font.meta

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

Assets/Resources/UI/Prefab/Login/QuickUserInfo.prefab

@@ -287,9 +287,9 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: 8180b991008992c45b6bf1a979c7baca, type: 3}
     m_FontSize: 14
-    m_FontStyle: 0
+    m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 10
     m_MaxSize: 40

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

@@ -166,7 +166,7 @@ GameObject:
   m_Component:
   - component: {fileID: 5144962272042509941}
   - component: {fileID: 5144962272042509947}
-  - component: {fileID: 5144962272042509940}
+  - component: {fileID: 5792232319875981949}
   m_Layer: 5
   m_Name: Country
   m_TagString: Untagged
@@ -201,7 +201,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5144962272042509942}
   m_CullTransparentMesh: 0
---- !u!114 &5144962272042509940
+--- !u!114 &5792232319875981949
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -210,7 +210,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 5144962272042509942}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
@@ -220,16 +220,13 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 05c69d457e1e29940a073dc1a0a562fe, type: 3}
+  m_Texture: {fileID: 0}
-  m_Type: 0
+  m_UVRect:
-  m_PreserveAspect: 0
+    serializedVersion: 2
-  m_FillCenter: 1
+    x: 0
-  m_FillMethod: 4
+    y: 0
-  m_FillAmount: 1
+    width: 1
-  m_FillClockwise: 1
+    height: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &5262667172184159175
 GameObject:
   m_ObjectHideFlags: 0

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

@@ -62,6 +62,49 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1777885814862178516}
   m_CullTransparentMesh: 0
+--- !u!114 &4666630721626389153
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4110286610393964380}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 4110286610393964382}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1001 &1777885815653005510
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -469,3 +512,21 @@ 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/SettingModal.prefab

@@ -0,0 +1,623 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1018732089158331853
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1018732089158331852}
+  - component: {fileID: 1018732089158331854}
+  - component: {fileID: 1018732089158331855}
+  m_Layer: 5
+  m_Name: Title
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1018732089158331852
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1018732089158331853}
+  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: 1018732089284998885}
+  m_RootOrder: 1
+  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: -50}
+  m_SizeDelta: {x: 159, y: 50}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &1018732089158331854
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1018732089158331853}
+  m_CullTransparentMesh: 0
+--- !u!114 &1018732089158331855
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1018732089158331853}
+  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: 36
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 3
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: SETTING
+--- !u!1 &1018732089284998882
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1018732089284998885}
+  - component: {fileID: 1018732089284998887}
+  - component: {fileID: 1018732089284998884}
+  - component: {fileID: 1018732089284998886}
+  m_Layer: 5
+  m_Name: Main
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1018732089284998885
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1018732089284998882}
+  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: 1018732090860767022}
+  - {fileID: 1018732089158331852}
+  - {fileID: 1018732090872344628}
+  m_Father: {fileID: 1018732089903226586}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 710, y: 496}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1018732089284998887
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1018732089284998882}
+  m_CullTransparentMesh: 0
+--- !u!114 &1018732089284998884
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1018732089284998882}
+  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.20784315, g: 0.20784315, b: 0.2627451, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &1018732089284998886
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1018732089284998882}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  radius: 30
+--- !u!1 &1018732089374569862
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1018732089374569865}
+  - component: {fileID: 1018732089374569867}
+  - component: {fileID: 1018732089374569864}
+  m_Layer: 5
+  m_Name: Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1018732089374569865
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1018732089374569862}
+  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: 1018732090860767022}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1018732089374569867
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1018732089374569862}
+  m_CullTransparentMesh: 0
+--- !u!114 &1018732089374569864
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1018732089374569862}
+  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.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 14
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: Button
+--- !u!1 &1018732089531101872
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1018732089531101875}
+  - component: {fileID: 1018732089531101877}
+  - component: {fileID: 1018732089531101874}
+  m_Layer: 5
+  m_Name: 1-TO
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1018732089531101875
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1018732089531101872}
+  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: 1018732090872344628}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 160, y: 30}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1018732089531101877
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1018732089531101872}
+  m_CullTransparentMesh: 0
+--- !u!114 &1018732089531101874
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1018732089531101872}
+  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.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 14
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 0
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: New Text
+--- !u!1 &1018732089903226587
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1018732089903226586}
+  - component: {fileID: 1018732089903226588}
+  - component: {fileID: 1018732089903226589}
+  - component: {fileID: 1018732089903226591}
+  m_Layer: 5
+  m_Name: SettingModal
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1018732089903226586
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1018732089903226587}
+  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: 1018732089284998885}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1018732089903226588
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1018732089903226587}
+  m_CullTransparentMesh: 0
+--- !u!114 &1018732089903226589
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1018732089903226587}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.13725491, g: 0.13725491, b: 0.1764706, a: 0.8}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &1018732089903226591
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1018732089903226587}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1304d873aa16cd641a83b889e9a1f3af, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!1 &1018732090860767023
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1018732090860767022}
+  - component: {fileID: 1018732090860767027}
+  - component: {fileID: 1018732090860767024}
+  - component: {fileID: 1018732090860767025}
+  m_Layer: 5
+  m_Name: Exit
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1018732090860767022
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1018732090860767023}
+  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: 1018732089374569865}
+  m_Father: {fileID: 1018732089284998885}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -30, y: -30}
+  m_SizeDelta: {x: 30, y: 30}
+  m_Pivot: {x: 1, y: 1}
+--- !u!222 &1018732090860767027
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1018732090860767023}
+  m_CullTransparentMesh: 0
+--- !u!114 &1018732090860767024
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1018732090860767023}
+  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: 10905, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &1018732090860767025
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1018732090860767023}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 1018732090860767024}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!1 &1018732090872344629
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1018732090872344628}
+  - component: {fileID: 1018732090872344630}
+  - component: {fileID: 1018732090872344631}
+  - component: {fileID: 1018732090872344633}
+  m_Layer: 5
+  m_Name: Inner
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1018732090872344628
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1018732090872344629}
+  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: 1018732089531101875}
+  m_Father: {fileID: 1018732089284998885}
+  m_RootOrder: 2
+  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: -130}
+  m_SizeDelta: {x: 670, y: 346}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &1018732090872344630
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1018732090872344629}
+  m_CullTransparentMesh: 0
+--- !u!114 &1018732090872344631
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1018732090872344629}
+  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.14509805, g: 0.14509805, b: 0.18431373, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &1018732090872344633
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1018732090872344629}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  radius: 20

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

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

Assets/Scripts/Apis/Models/MapRoute.cs

@@ -102,5 +102,7 @@ namespace Assets.Scripts.Apis.Models
         public bool Enable3D { get; set; }
         public int TheHeat { get; set; }
         public string Hard { get; set; }
+        public string CountryCode { get; set; }
+        public bool IsFire { get; set; }
     }
 }

Assets/Scripts/Apis/UserApi.cs

@@ -134,13 +134,22 @@ namespace Assets.Scripts.Apis
 
         public async Task<JsonResult<object>> OnWebWxLoginCheckUnionId(string unionId, string openId)
         {
-            return await PostAsync<JsonResult<object>>("NoAuth/OnWebWxLoginCheckUnionId", new {unionId,openId});
+            var r = await PostAsync<JsonResult<object>>("NoAuth/OnWebWxLoginCheckUnionId", new { unionId, openId });
+            if (r.result)
+            {
+                var data = JObject.FromObject(r.data).ToObject<UserResultModel>();
+                data.cookie = cookies[0].Value;
+                r.data = data;
+            }
+            return r;
         }
         public async Task<JsonResult<UserResultModel>> OnWebWxLogin(string Phone, string Captcha
             , string UnionId, string WxWebOpenId, string WxHeadImg, string NickName, int? Sex, string Password)
         {
-            return await PostAsync<JsonResult<UserResultModel>>("NoAuth/OnWebWxLogin", 
+            var r = await PostAsync<JsonResult<UserResultModel>>("NoAuth/OnWebWxLogin",
                 new { Phone, Captcha, UnionId, WxWebOpenId, WxHeadImg, NickName, Sex, Password });
+            r.data.cookie = cookies[0].Value;
+            return r;
         }
         
         

Assets/Scripts/App.cs

@@ -1,11 +1,12 @@
 using Assets.Scripts.Apis.Models;
+using Assets.Scripts.UI.Prefab.Login;
 using System.Collections;
 using System.Collections.Generic;
 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";
 
@@ -15,7 +16,6 @@ public static class App
     public static string WxAppSecret = "906abafb2a18bc7a66ccfa5550f859b6";
 
     public static string MapBoxAccessToken => "pk.eyJ1IjoiYW5keXNqdCIsImEiOiJja2ZhajE5OGwwamRiMnltcW96bHk0ZWFuIn0.GvKanc6UveWSvIjS9HfBPA";
-
     /// <summary>
     /// 场景跳转传值
     /// Name,MapListPanel

Assets/Scripts/Scenes/LoginController.cs

@@ -94,9 +94,12 @@ public class LoginController : MonoBehaviour
     /*退出按钮*/
     //其他
     [SerializeField] RawImage loading;
+    Transform toolContainer;
+
     // Start is called before the first frame update
     void Start()
     {
+        UIManager.Instance.ModalsPanel = this.transform.Find("ModalPanel").GetComponent<PFUIPanel>();
         var userInfosJson = PlayerPrefs.GetString("UserInfos");
         userInfos = JsonConvert.DeserializeObject<List<QUserInfo>>(userInfosJson);
         if (userInfos == null) userInfos = new List<QUserInfo>();
@@ -148,13 +151,13 @@ public class LoginController : MonoBehaviour
             signPage2.Find("previous").GetComponent<Button>().onClick.AddListener(goRegPrev);
             signPage2.Find("sign").GetComponent<Button>().onClick.AddListener(goRegEnd);
             //注册2 字段
-            regOptions = new LoginRegOptions();
             var years = signPage2.Find("Year").GetComponent<Dropdown>();
             var months = signPage2.Find("Month").GetComponent<Dropdown>();
             var days = signPage2.Find("Day").GetComponent<Dropdown>();
             var genders = signPage2.Find("Gender").GetComponent<Dropdown>();
             var countrys = signPage2.Find("Country").GetComponent<Dropdown>();
             var units = signPage2.Find("Unit").GetComponent<Dropdown>();
+            regOptions = new LoginRegOptions();
             years.options = regOptions.years;
             months.options = regOptions.months;
             days.options = regOptions.days;
@@ -358,6 +361,14 @@ public class LoginController : MonoBehaviour
             });
         }
         imagexf = transform.Find("Panel").Find("LoginContainer").Find("Imagexf");
+        toolContainer = transform.Find("Panel").Find("ToolContainer");
+        if (toolContainer != null) 
+        {
+            toolContainer.Find("Setting").GetComponent<Button>().onClick.AddListener(() => 
+            {
+                UIManager.ShowSettingModal();
+            });
+        }
     }
     private void AdjustWxQrCode() 
     {
@@ -674,15 +685,26 @@ public class LoginController : MonoBehaviour
         var data = userResult;
         if (data == null) return;
         //ConfigHelper.CurrentUser = res.data;
-        if (gou != null && gou.gameObject.activeSelf && !userInfos.Exists(x => x.Id == data.Id))
+        if (gou != null && gou.gameObject.activeSelf)
         {
-            userInfos.Add(new QUserInfo
+            var u = userInfos.Find(x => x.Id == data.Id);
+            if (u == null)
             {
-                Id = data.Id,
+                userInfos.Add(new QUserInfo
-                NickName = data.Nickname,
+                {
-                Avatar = data.WxHeadImg,
+                    Id = data.Id,
-                Cookie = data.cookie
+                    NickName = data.Nickname,
-            });
+                    Avatar = data.WxHeadImg,
+                    Cookie = data.cookie
+                });
+            }
+            else 
+            {
+                u.Id = data.Id;
+                u.NickName = data.Nickname;
+                u.Avatar = data.WxHeadImg;
+                u.Cookie = data.cookie;
+            }
             PlayerPrefs.SetString("UserInfos", JsonConvert.SerializeObject(userInfos));
         }
         App.CurrentUser = data;

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

@@ -68,6 +68,10 @@ namespace Assets.Scripts.UI.Prefab.Login
             if (c == null) return null;
             return Resources.Load<Texture>(c.source);
         }
+        public Texture GetCountryImage(string code)
+        {
+            return GetCountryImage(GetCountryIndexByCode(code));
+        }
         public int GetCountryIndexByCode(string code)
         {
             var c = countryList.FindIndex(x => x.abbreviation.ToLower() == code.ToLower());

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

@@ -31,6 +31,7 @@ public class MapItem : MonoBehaviour
         transform.Find("Name").GetComponent<Text>().text = myMap.Name;
         Utils.DisplayImage(StartCoroutine, transform.Find("MapTitleImg").GetComponent<RawImage>(), myMap.CoverImage);
         transform.Find("CollectImg").gameObject.SetActive(myMap.IsFavorite);
+        transform.Find("Hot").gameObject.SetActive(myMap.IsFire);
         var props = transform.Find("Props");        
         props.Find("DistanceText").GetComponent<Text>().text = $"{myMap.Distance.ToString("#0.00")}KM";
         props.Find("EleText").GetComponent<Text>().text = $"{(myMap.TotalClimb ?? 0.0).ToString("#0.00")}M";
@@ -40,5 +41,6 @@ public class MapItem : MonoBehaviour
         var diff = tabContainer.Find("Diff");
         diff.Find("Text").GetComponent<Text>().text = myMap.Hard;
         tabContainer.Find("3d").gameObject.SetActive(myMap.Enable3D);
+        tabContainer.Find("Country").GetComponent<RawImage>().texture = UIManager.Instance.loginRegOptions.GetCountryImage(myMap.CountryCode);
     }
 }

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

@@ -13,6 +13,7 @@ using UnityEngine.UI;
 public class EditUserController : PFUIPanel
 {
     private Button mSaveButton;
+    private Button mReturnButton;
     private PFUIDropdown mSexDropdown;
     private PFUIDropdown mDayDropdown;
     private PFUIDropdown mMonthDropdown;
@@ -33,6 +34,7 @@ public class EditUserController : PFUIPanel
         mMonthDropdown = panel.Find("MonthDropdown").GetComponent<PFUIDropdown>();
         mDayDropdown = panel.Find("DayDropdown").GetComponent<PFUIDropdown>();
         mSaveButton = this.transform.Find("SaveButton").GetComponent<Button>();
+        mReturnButton = transform.Find("CancelButton").GetComponent<Button>();
         mHeadImage = this.transform.Find("HeadImage").GetComponent<RawImage>();
 
         mSexDropdown.ClearOptions();
@@ -80,12 +82,17 @@ public class EditUserController : PFUIPanel
         //    new Dropdown.OptionData()
         //});
 
-        LoadDataSync();        
+        LoadDataSyncAsync();        
 
     }
-
+    async System.Threading.Tasks.Task Login() 
-    async void LoadDataSync()
     {
+        var result = await new UserApi().Login("13115011550", "laozhong", "");
+        App.CurrentUser = result.data;
+    }
+    async System.Threading.Tasks.Task LoadDataSyncAsync()
+    {
+        await Login();
         Material material = null;
         if (material == null)
         {
@@ -95,33 +102,38 @@ public class EditUserController : PFUIPanel
         material.SetVector(Shader.PropertyToID("_WidthHeightRadius"), new Vector4(rect.width, rect.height, rect.height, 0));
         mHeadImage.material = material;
 
-        //var currentUser = App.CurrentUser;
+        var currentUser = App.CurrentUser;
-        //mIdText.text = "ID:" + currentUser.Id.ToString();
+        mIdText.text = "ID:" + currentUser.Id.ToString();
-        //mNameText.text = currentUser.Nickname;
+        mNameText.text = currentUser.Nickname;
-
-        //if (!string.IsNullOrWhiteSpace(currentUser.WxHeadImg))
-        //{
-        //    Utils.DisplayImage(StartCoroutine, mHeadImage, currentUser.WxHeadImg);
-        //}
-        //if (currentUser.Sex == 1)
-        //{
-        //    mSexDropdown.SelectValue("男");
-        //}
-        //else
-        //{
-        //    mSexDropdown.SelectValue("女");
-        //}
-        //if (currentUser.Birthday.HasValue)
-        //{
-        //    var birthday = currentUser.Birthday.Value;
-        //    mYearDropdown.SelectValue(birthday.Year.ToString());
-        //    mMonthDropdown.SelectValue(birthday.Month.ToString());
-        //    mDayDropdown.SelectValue(birthday.Day.ToString());
-        //}
 
+        if (!string.IsNullOrWhiteSpace(currentUser.WxHeadImg))
+        {
+            Utils.DisplayImage(StartCoroutine, mHeadImage, currentUser.WxHeadImg);
+        }
+        if (currentUser.Sex == 1)
+        {
+            mSexDropdown.SelectValue("男");
+        }
+        else
+        {
+            mSexDropdown.SelectValue("女");
+        }
+        if (currentUser.Birthday.HasValue)
+        {
+            var birthday = currentUser.Birthday.Value;
+            mYearDropdown.SelectValue(birthday.Year.ToString());
+            mMonthDropdown.SelectValue(birthday.Month.ToString());
+            mDayDropdown.SelectValue(birthday.Day.ToString());
+        }
+        UIManager.AddEvent(mReturnButton.gameObject, EventTriggerType.PointerClick, Return);
         UIManager.AddEvent(mSaveButton.gameObject, EventTriggerType.PointerClick, Save);
     }
 
+    private void Return(BaseEventData arg0)
+    {
+        UIManager.ShowUserInfoPanel();
+    }
+
     // Start is called before the first frame update
     protected override void Start()
     {

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

@@ -59,7 +59,10 @@ public class HomeController : PFUIPanel
         {
             UIManager.ShowAlert("test");
         });
-
+        UIManager.AddEvent(transform.Find("MainNav").Find("Setting").gameObject, EventTriggerType.PointerClick, x =>
+        {
+            UIManager.ShowSettingModal();
+        });
         GetSummary();
     }
 

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

@@ -39,7 +39,7 @@ public class MapListController : PFUIPanel
         }
     }
     private bool isEnd = false;
-    protected override void Start() 
+    protected override void Start()
     {
         //if (hardSelector != null) 
         //{

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

@@ -19,9 +19,10 @@ public class ResultListController : MonoBehaviour
     // Start is called before the first frame update
     int pageIndex = 0, pageSize = 20;
     string name = "";
+    Transform[] contents;
     void Start()
     {
-        ApiBase.SetCookie("73385F5F719B610D132C1ECF3E9143272BF15214D57ED91CD7A9DFD832407471535112AAEB8E9271F75D54FBBF2D99F18FA313C1EEA5676F5D722D7FBB07C926BEC5905591BF9AFDDC6336552DF273112C2DA1794E6FA2F465B11FECD2E82E52");
+        //ApiBase.SetCookie("73385F5F719B610D132C1ECF3E9143272BF15214D57ED91CD7A9DFD832407471535112AAEB8E9271F75D54FBBF2D99F18FA313C1EEA5676F5D722D7FBB07C926BEC5905591BF9AFDDC6336552DF273112C2DA1794E6FA2F465B11FECD2E82E52");
         InitialColor();
         scroll = transform.Find("ListPanel").Find("Scroll").GetComponent<ScrollRect>();
         btnMatch = transform.Find("ListPanel").Find("BtnMatch");
@@ -32,6 +33,7 @@ public class ResultListController : MonoBehaviour
         routeContent = routeScroll.Find("Viewport").Find("Content");
         matchScroll = scrollContent.Find("MatchList");
         matchContent = matchScroll.Find("Viewport").Find("Content");
+        contents = new Transform[] { routeContent, matchContent};
         if (btnMatch != null) 
         {
             btnMatch.GetComponent<Button>().onClick.AddListener(() => StartScroll(0));
@@ -45,7 +47,7 @@ public class ResultListController : MonoBehaviour
             searchInput.Find("Button").GetComponent<Button>().onClick.AddListener(() =>
             {
                 name = searchInput.GetComponent<InputField>().text;
-                Refresh();
+                Refresh(contents[scrollIndex]);
             });
         }
         if (routeScroll != null)
@@ -71,13 +73,13 @@ public class ResultListController : MonoBehaviour
         }
         if (scrollrect.verticalNormalizedPosition >= 1)
         {
-            Refresh();
+            Refresh(contents[scrollIndex]);
         }
     }
 
-    private void Refresh()
+    private void Refresh(Transform content)
     {
-        routeContent.transform.DestroyChildren();
+        content.transform.DestroyChildren();
         pageIndex = 0;
         GetList();
     }
@@ -94,8 +96,8 @@ public class ResultListController : MonoBehaviour
             else
             {
                 isEnd = false;
-                DisplayRouteResult(r.data,routeContent);
+                DisplayRouteResult(r.data,contents[scrollIndex]);
-                DisplayRouteResult(r.data, matchContent);
+                //DisplayRouteResult(r.data, matchContent);
             }
         }
         else 

Assets/Scripts/UI/Prefab/SettingContoller.cs

@@ -0,0 +1,31 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class SettingContoller : PFUIPanel
+{
+    // Start is called before the first frame update
+    Transform exit;
+    protected override void Awake()
+    {
+        exit = transform.Find("Main").Find("Exit");
+        if (exit != null) 
+        {
+            exit.GetComponent<Button>().onClick.AddListener(()=> 
+            {
+                Close();
+            });
+        }
+    }
+    void Start()
+    {
+
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+}

Assets/Scripts/UI/Prefab/SettingContoller.cs.meta

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

Assets/Scripts/UIManager.cs

@@ -4,10 +4,12 @@ using UnityEngine;
 using UnityEngine.Events;
 using UnityEngine.EventSystems;
 using DG.Tweening;
+using Assets.Scripts.UI.Prefab.Login;
 
 public class UIManager : MonoBehaviour
 {
     private PFUIPanel mMainPanel;
+
     public PFUIPanel MainPanel
     {
         get
@@ -48,7 +50,14 @@ public class UIManager : MonoBehaviour
             return this.GetPanelInstance("DevicePanel", ref this.mDeviceController);
         }
     }
-
+    private SettingContoller mSettingContoller;
+    public SettingContoller SettingModal 
+    {
+        get 
+        {
+            return this.GetPanelInstance("SettingModal", ref this.mSettingContoller);
+        } 
+    }
     private MapListController mMapListController;
     public MapListController MapListPanel
     {
@@ -95,12 +104,13 @@ public class UIManager : MonoBehaviour
     private void Awake()
     {
         UIManager.Instance = this;
+        loginRegOptions = new LoginRegOptions();
     }
 
     // Start is called before the first frame update
     void Start()
     {
-
+        
     }
 
     // Update is called once per frame
@@ -226,7 +236,10 @@ public class UIManager : MonoBehaviour
     {
         UIManager.Show(UIManager.Instance.DevicePanel, null, true);
     }
-
+    public static void ShowSettingModal()
+    {
+        UIManager.Show(UIManager.Instance.SettingModal, null, true);
+    }
     public static void ShowEditUserPanel()
     {
         UIManager.Show(UIManager.Instance.EditUserPanel, UIManager.Instance.MainPanel);
@@ -312,6 +325,8 @@ public class UIManager : MonoBehaviour
         }
     }
 
+    public LoginRegOptions loginRegOptions { get; private set; }
+    
 
     private void OnDestroy()
     {

ProjectSettings/GraphicsSettings.asset

@@ -38,7 +38,6 @@ GraphicsSettings:
   - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
-  - {fileID: 16003, guid: 0000000000000000f000000000000000, type: 0}
   m_PreloadedShaders: []
   m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
     type: 0}