设置页面，调些细节

Assets/Mapbox/User.meta

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

Assets/Resources/UI/Control/PFUIDropdown.prefab

@@ -168,7 +168,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0.13725491, g: 0.13725491, b: 0.1764706, a: 1}
   m_RaycastTarget: 1
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -908,7 +908,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0.20784314, g: 0.20784314, b: 0.2627451, a: 1}
   m_RaycastTarget: 1
   m_Maskable: 1
   m_OnCullStateChanged:

Assets/Resources/UI/Control/PFUISlider.prefab

@@ -0,0 +1,394 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &6542106739689800851
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6542106739689800850}
+  - component: {fileID: 6542106739689800848}
+  - component: {fileID: 6542106739689800849}
+  m_Layer: 5
+  m_Name: Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6542106739689800850
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6542106739689800851}
+  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: 6542106740173953756}
+  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: 5, y: 0}
+  m_SizeDelta: {x: 33, y: 20}
+  m_Pivot: {x: 0, y: 0.5}
+--- !u!222 &6542106739689800848
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6542106739689800851}
+  m_CullTransparentMesh: 0
+--- !u!114 &6542106739689800849
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6542106739689800851}
+  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: 10
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 100%
+--- !u!1 &6542106740173953757
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6542106740173953756}
+  - component: {fileID: 6542106740173953755}
+  - component: {fileID: 8181076332128458379}
+  m_Layer: 5
+  m_Name: PFUISlider
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6542106740173953756
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6542106740173953757}
+  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: 6542106740516171145}
+  - {fileID: 6542106741493414558}
+  - {fileID: 6542106739689800850}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 140, y: 20}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &6542106740173953755
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6542106740173953757}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, 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: 6542106740370086310}
+  m_FillRect: {fileID: 6542106740370086311}
+  m_HandleRect: {fileID: 0}
+  m_Direction: 0
+  m_MinValue: 0
+  m_MaxValue: 1
+  m_WholeNumbers: 0
+  m_Value: 0
+  m_OnValueChanged:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!114 &8181076332128458379
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6542106740173953757}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e288f268809db2a4bbc2b31a9fe797e4, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!1 &6542106740370086296
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6542106740370086311}
+  - component: {fileID: 6542106740370086309}
+  - component: {fileID: 6542106740370086310}
+  - component: {fileID: 6542106740370086308}
+  m_Layer: 5
+  m_Name: Fill
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6542106740370086311
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6542106740370086296}
+  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: 6542106741493414558}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 5, y: 0}
+  m_SizeDelta: {x: 10, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6542106740370086309
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6542106740370086296}
+  m_CullTransparentMesh: 0
+--- !u!114 &6542106740370086310
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6542106740370086296}
+  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.9764706, g: 0.1882353, b: 0.5254902, 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 &6542106740370086308
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6542106740370086296}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  radius: 6
+--- !u!1 &6542106740516171146
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6542106740516171145}
+  - component: {fileID: 6542106740516171159}
+  - component: {fileID: 6542106740516171144}
+  - component: {fileID: 6542106740516171158}
+  m_Layer: 5
+  m_Name: Background
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6542106740516171145
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6542106740516171146}
+  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: 6542106740173953756}
+  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 &6542106740516171159
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6542106740516171146}
+  m_CullTransparentMesh: 0
+--- !u!114 &6542106740516171144
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6542106740516171146}
+  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.25490198, g: 0.25882354, b: 0.31764707, 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 &6542106740516171158
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6542106740516171146}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  radius: 6
+--- !u!1 &6542106741493414559
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6542106741493414558}
+  m_Layer: 5
+  m_Name: Fill Area
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6542106741493414558
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6542106741493414559}
+  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: 6542106740370086311}
+  m_Father: {fileID: 6542106740173953756}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -5, y: 0}
+  m_SizeDelta: {x: -10, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}

Assets/Resources/UI/Control/PFUISlider.prefab.meta

@@ -1,7 +1,6 @@
 fileFormatVersion: 2
-guid: 9a0a7989900f2c34abeee17c663d08dc
+guid: f161296c0ad4a2047a2d64918bb11cf5
-folderAsset: yes
+PrefabImporter:
-DefaultImporter:
   externalObjects: {}
   userData: 
   assetBundleName: 

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

@@ -110,10 +110,10 @@ RectTransform:
   m_Father: {fileID: 5307116753344173197}
   m_RootOrder: 8
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 1, y: 1}
+  m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -12, y: 0}
+  m_AnchoredPosition: {x: -12, y: -2}
-  m_SizeDelta: {x: 28, y: 22}
+  m_SizeDelta: {x: 28, y: -2}
   m_Pivot: {x: 1, y: 1}
 --- !u!222 &1325622395784352468
 CanvasRenderer:
@@ -2016,11 +2016,11 @@ RectTransform:
   m_Father: {fileID: 5307116753344173197}
   m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 1, y: 1}
+  m_AnchorMin: {x: 1, y: 0.5}
-  m_AnchorMax: {x: 1, y: 1}
+  m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: -44, y: -5}
+  m_AnchoredPosition: {x: -44, y: 0}
   m_SizeDelta: {x: 12, y: 12}
-  m_Pivot: {x: 1, y: 1}
+  m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &8442301620115864138
 CanvasRenderer:
   m_ObjectHideFlags: 0

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

@@ -3158,7 +3158,7 @@ MonoBehaviour:
   m_Elasticity: 0.1
   m_Inertia: 1
   m_DecelerationRate: 0.135
-  m_ScrollSensitivity: 30
+  m_ScrollSensitivity: 50
   m_Viewport: {fileID: 1558821634151186375}
   m_HorizontalScrollbar: {fileID: 0}
   m_VerticalScrollbar: {fileID: 0}

Assets/Scenes/3-MapList.unity

@@ -293,92 +293,6 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!21 &1023817635
-Material:
-  serializedVersion: 6
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: RoundedCornersTextureMaterial(Clone)
-  m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3}
-  m_ShaderKeywords: 
-  m_LightmapFlags: 4
-  m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
-  stringTagMap: {}
-  disabledShaderPasses: []
-  m_SavedProperties:
-    serializedVersion: 3
-    m_TexEnvs:
-    - _BumpMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailAlbedoMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailMask:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailNormalMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _EmissionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MainTex:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MetallicGlossMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _OcclusionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _ParallaxMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    m_Floats:
-    - _BumpScale: 1
-    - _ColorMask: 15
-    - _Cutoff: 0.5
-    - _DetailNormalMapScale: 1
-    - _DstBlend: 0
-    - _GlossMapScale: 1
-    - _Glossiness: 0.5
-    - _GlossyReflections: 1
-    - _Height: 50
-    - _Metallic: 0
-    - _Mode: 0
-    - _OcclusionStrength: 1
-    - _Parallax: 0.02
-    - _Radius: 15
-    - _SmoothnessTextureChannel: 0
-    - _SpecularHighlights: 1
-    - _SrcBlend: 1
-    - _Stencil: 0
-    - _StencilComp: 8
-    - _StencilOp: 0
-    - _StencilReadMask: 255
-    - _StencilWriteMask: 255
-    - _UVSec: 0
-    - _UseUIAlphaClip: 0
-    - _Width: 50
-    - _ZWrite: 1
-    m_Colors:
-    - _Color: {r: 1, g: 1, b: 1, a: 1}
-    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-    - _WidthHeightRadius: {r: 710, g: 496, b: 60, a: 0}
 --- !u!1 &1079865532
 GameObject:
   m_ObjectHideFlags: 0
@@ -469,92 +383,6 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!21 &1671613168
-Material:
-  serializedVersion: 6
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: RoundedCornersTextureMaterial(Clone)
-  m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3}
-  m_ShaderKeywords: 
-  m_LightmapFlags: 4
-  m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
-  stringTagMap: {}
-  disabledShaderPasses: []
-  m_SavedProperties:
-    serializedVersion: 3
-    m_TexEnvs:
-    - _BumpMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailAlbedoMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailMask:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailNormalMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _EmissionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MainTex:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MetallicGlossMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _OcclusionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _ParallaxMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    m_Floats:
-    - _BumpScale: 1
-    - _ColorMask: 15
-    - _Cutoff: 0.5
-    - _DetailNormalMapScale: 1
-    - _DstBlend: 0
-    - _GlossMapScale: 1
-    - _Glossiness: 0.5
-    - _GlossyReflections: 1
-    - _Height: 50
-    - _Metallic: 0
-    - _Mode: 0
-    - _OcclusionStrength: 1
-    - _Parallax: 0.02
-    - _Radius: 15
-    - _SmoothnessTextureChannel: 0
-    - _SpecularHighlights: 1
-    - _SrcBlend: 1
-    - _Stencil: 0
-    - _StencilComp: 8
-    - _StencilOp: 0
-    - _StencilReadMask: 255
-    - _StencilWriteMask: 255
-    - _UVSec: 0
-    - _UseUIAlphaClip: 0
-    - _Width: 50
-    - _ZWrite: 1
-    m_Colors:
-    - _Color: {r: 1, g: 1, b: 1, a: 1}
-    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-    - _WidthHeightRadius: {r: 670, g: 346, b: 40, a: 0}
 --- !u!1 &1678571397
 GameObject:
   m_ObjectHideFlags: 0
@@ -739,142 +567,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1944211662}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: 0.41259822, y: -0.015262868, z: -0.03366878, w: 0.9101627}
-  m_LocalPosition: {x: 0, y: 1, z: -10}
+  m_LocalPosition: {x: 0, y: 651, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 48.593002, y: -4.8190002, z: -6.4140005}
---- !u!1001 &5497100762265630693
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 5779676824772088956}
-    m_Modifications:
-    - target: {fileID: 1496775925185796126, guid: d3bf9bac235aeab49820f8f08edbb10e,
-        type: 3}
-      propertyPath: m_Material
-      value: 
-      objectReference: {fileID: 1671613168}
-    - target: {fileID: 1496775926230021874, guid: d3bf9bac235aeab49820f8f08edbb10e,
-        type: 3}
-      propertyPath: m_Name
-      value: NewsModal
-      objectReference: {fileID: 0}
-    - target: {fileID: 1496775926230021875, guid: d3bf9bac235aeab49820f8f08edbb10e,
-        type: 3}
-      propertyPath: m_Pivot.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 1496775926230021875, guid: d3bf9bac235aeab49820f8f08edbb10e,
-        type: 3}
-      propertyPath: m_Pivot.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 1496775926230021875, guid: d3bf9bac235aeab49820f8f08edbb10e,
-        type: 3}
-      propertyPath: m_RootOrder
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1496775926230021875, guid: d3bf9bac235aeab49820f8f08edbb10e,
-        type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1496775926230021875, guid: d3bf9bac235aeab49820f8f08edbb10e,
-        type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1496775926230021875, guid: d3bf9bac235aeab49820f8f08edbb10e,
-        type: 3}
-      propertyPath: m_AnchorMin.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1496775926230021875, guid: d3bf9bac235aeab49820f8f08edbb10e,
-        type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1496775926230021875, guid: d3bf9bac235aeab49820f8f08edbb10e,
-        type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1496775926230021875, guid: d3bf9bac235aeab49820f8f08edbb10e,
-        type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1496775926230021875, guid: d3bf9bac235aeab49820f8f08edbb10e,
-        type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1496775926230021875, guid: d3bf9bac235aeab49820f8f08edbb10e,
-        type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1496775926230021875, guid: d3bf9bac235aeab49820f8f08edbb10e,
-        type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1496775926230021875, guid: d3bf9bac235aeab49820f8f08edbb10e,
-        type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1496775926230021875, guid: d3bf9bac235aeab49820f8f08edbb10e,
-        type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1496775926230021875, guid: d3bf9bac235aeab49820f8f08edbb10e,
-        type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1496775926230021875, guid: d3bf9bac235aeab49820f8f08edbb10e,
-        type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1496775926230021875, guid: d3bf9bac235aeab49820f8f08edbb10e,
-        type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1496775926230021875, guid: d3bf9bac235aeab49820f8f08edbb10e,
-        type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1496775926230021875, guid: d3bf9bac235aeab49820f8f08edbb10e,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1496775926230021875, guid: d3bf9bac235aeab49820f8f08edbb10e,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1496775926230021875, guid: d3bf9bac235aeab49820f8f08edbb10e,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1496775926840385229, guid: d3bf9bac235aeab49820f8f08edbb10e,
-        type: 3}
-      propertyPath: m_Material
-      value: 
-      objectReference: {fileID: 1023817635}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: d3bf9bac235aeab49820f8f08edbb10e, type: 3}
 --- !u!222 &5779676824772088946
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -893,8 +592,7 @@ RectTransform:
   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_Children: []
-  - {fileID: 6380542679705764118}
   m_Father: {fileID: 1678571401}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -920,9 +618,3 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!224 &6380542679705764118 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 1496775926230021875, guid: d3bf9bac235aeab49820f8f08edbb10e,
-    type: 3}
-  m_PrefabInstance: {fileID: 5497100762265630693}
-  m_PrefabAsset: {fileID: 0}

Assets/Scripts/ConfigHelper.cs

@@ -9,13 +9,20 @@ using System.Threading.Tasks;
 
 namespace Assets.Scripts
 {
-    public class ConfigHelper
+    public static class ConfigHelper
     {
         public static string Host = App.Host;
 
         public static string AppVersion = App.AppVersion;
-        
+        public static UserApi _userApi;
-        public static UserApi userApi = new UserApi();
+        public static UserApi userApi 
+        {
+            get 
+            {
+                if (_userApi == null) _userApi = new UserApi();
+                return _userApi;
+            }
+        }
         public static MapApi mapApi = new MapApi();
         public static MapInterruptRecordApi mapInterruptRecordApi = new MapInterruptRecordApi();
         public static ThirdPartApi thirdPartApi = new ThirdPartApi();

Assets/Scripts/Scenes/LoginController.cs

@@ -9,6 +9,7 @@ using Newtonsoft.Json.Linq;
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Linq;
 using System.Reflection;
 using System.Text;
 using System.Text.RegularExpressions;
@@ -231,22 +232,25 @@ public class LoginController : MonoBehaviour
         if (loginContainer != null) 
         {
             var returnQuick = loginContainer.Find("returnQuick").GetComponent<Button>();
-            returnQuick.onClick.AddListener(ReturnQuick);
+            UIManager.AddEvent(returnQuick.gameObject, EventTriggerType.PointerClick, (b) =>
+            {
+                ReturnQuick();
+            });
             var sign = loginContainer.Find("reg").GetComponent<Button>();
             sign.onClick.AddListener(() => goSign());
             remember = loginContainer.Find("rememberButton").GetComponent<Button>();
-            remember.onClick.AddListener(() =>
+            UIManager.AddEvent(remember.gameObject, EventTriggerType.PointerClick, (b) =>
-            {
+             {
-                var gou = remember.transform.Find("Gou");
+                 var gou = remember.transform.Find("Gou");
-                if (gou.gameObject.activeSelf)
+                 if (gou.gameObject.activeSelf)
-                {
+                 {
-                    gou.gameObject.SetActive(false);
+                     gou.gameObject.SetActive(false);
-                }
+                 }
-                else
+                 else
-                {
+                 {
-                    gou.gameObject.SetActive(true);
+                     gou.gameObject.SetActive(true);
-                }
+                 }
-            });
+             });
             var wechatLogin = loginContainer.Find("otherContainer").Find("Wechat").GetComponent<Button>();
             wechatLogin.onClick.AddListener(() =>
             {
@@ -277,26 +281,32 @@ public class LoginController : MonoBehaviour
         if (signContainer != null) 
         {
             var loginr2 = signContainer.Find("loginr2").GetComponent<Button>();
-            loginr2.onClick.AddListener(goLoginReturn2);
+            UIManager.AddEvent(loginr2.gameObject, EventTriggerType.PointerClick, (b) =>
+             {
+                 goLoginReturn2();
+             });
         }
         if (exit != null)
         {
-            exit.onClick.AddListener(() => Application.Quit());
+            UIManager.AddEvent(exit.gameObject, EventTriggerType.PointerClick, (b) =>
+            {
+                Application.Quit();
+            });
         }
         
         wxLogin1 = mainContent.Find("FormContainer-Login").Find("Mask").Find("FormContainer-wx1");
         if (wxLogin1 != null)
         {
-            wxLogin1.Find("Image").GetComponent<Button>().onClick.AddListener(() =>
+            UIManager.AddEvent(wxLogin1.Find("Image").gameObject, EventTriggerType.PointerClick, (b) =>
-            {
+             {
-                wxLock = true;
+                 wxLock = true;
-                wxBrowser.Url = "chrome://version/";
+                 wxBrowser.Url = "chrome://version/";
-                wxLogin1.DOLocalMoveY(-573, 0.3f).onComplete = () =>
+                 wxLogin1.DOLocalMoveY(-573, 0.3f).onComplete = () =>
-                {
+                 {
-                    wxLock = false;
+                     wxLock = false;
-                    wxLogin1.gameObject.SetActive(false);
+                     wxLogin1.gameObject.SetActive(false);
-                };
+                 };
-            });
+             });
             wxBrowser = wxLogin1.Find("Browser (GUI)").GetComponent<Browser>();
             if (wxBrowser != null)
             {
@@ -323,14 +333,14 @@ public class LoginController : MonoBehaviour
         wxLogin2 = mainContent.Find("FormContainer-wx2");
         if (wxLogin2!=null) 
         {
-            wxLogin2.Find("return").GetComponent<Button>().onClick.AddListener(() => {
+            UIManager.AddEvent(wxLogin2.Find("return").gameObject, EventTriggerType.PointerClick, (b) =>
-                wxLogin2.gameObject.SetActive(false);
+             {
-                //wxLogin3.gameObject.SetActive(false);
+                 wxLogin2.gameObject.SetActive(false);
-                pageNums = 4;
+                 //wxLogin3.gameObject.SetActive(false);
-                Canvas.ForceUpdateCanvases();
+                 pageNums = 4;
-                StartScrollPanel(1); 
+                 Canvas.ForceUpdateCanvases();
-            });
+                 StartScrollPanel(1);
-            
+             });
             wxLogin2.Find("Next").GetComponent<Button>().onClick.AddListener(()=> 
             {
                 this.goSign(false);
@@ -339,24 +349,29 @@ public class LoginController : MonoBehaviour
         wxLogin3 = mainContent.Find("FormContainer-wx3");
         if (wxLogin3 != null)
         {
-            wxLogin3.Find("return").GetComponent<Button>().onClick.AddListener(() => {
+            UIManager.AddEvent(wxLogin3.Find("return").gameObject, EventTriggerType.PointerClick, (b) =>
-                if (signContainer.gameObject.activeSelf)
+             {
-                {
+                 if (signContainer.gameObject.activeSelf)
-                    StartScrollPanel(3);
+                 {
-                }
+                     StartScrollPanel(3);
-                else 
+                 }
-                {
+                 else
-                    signContainer.gameObject.SetActive(true);
+                 {
-                    pageNums = 4;
+                     signContainer.gameObject.SetActive(true);
-                    //wxLogin3.gameObject.SetActive(false);
+                     pageNums = 4;
-                    StartScrollPanel(1);
+                     //wxLogin3.gameObject.SetActive(false);
-                }
+                     StartScrollPanel(1);
-            });
+                 }
-            wxLogin3.Find("rememberButton").GetComponent<Button>().onClick.AddListener(()=> 
+             });
-            {
+            UIManager.AddEvent(wxLogin3.Find("rememberButton").gameObject, EventTriggerType.PointerClick, (b) =>
-                var gou = wxLogin3.Find("rememberButton").Find("Gou").gameObject;
+             {
-                gou.SetActive(!gou.activeSelf);
+                 var gou = wxLogin3.Find("rememberButton").Find("Gou").gameObject;
-            });
+                 gou.SetActive(!gou.activeSelf);
+             });
+            //wxLogin3.Find("rememberButton").GetComponent<Button>().onClick.AddListener(()=> 
+            //{
+                
+            //});
             wxLogin3.Find("Next").GetComponent<Button>().onClick.AddListener(() => 
             {
                 goMain(wxLogin3.Find("rememberButton").Find("Gou"));
@@ -368,14 +383,22 @@ public class LoginController : MonoBehaviour
         toolContainer = transform.Find("Panel").Find("ToolContainer");
         if (toolContainer != null) 
         {
-            toolContainer.Find("Setting").GetComponent<Button>().onClick.AddListener(() => 
+            UIManager.AddEvent(toolContainer.Find("Setting").gameObject, EventTriggerType.PointerClick, (b) =>
-            {
+             {
-                UIManager.ShowSettingModal();
+                 UIManager.ShowSettingModal();
-            });
+             });
-            toolContainer.Find("Msg").GetComponent<Button>().onClick.AddListener(() =>
+            //toolContainer.Find("Setting").GetComponent<Button>().onClick.AddListener(() => 
+            //{
+            //    UIManager.ShowSettingModal();
+            //});
+            UIManager.AddEvent(toolContainer.Find("Msg").gameObject, EventTriggerType.PointerClick, (b) =>
             {
                 UIManager.ShowNewsModal();
             });
+            //toolContainer.Find("Msg").GetComponent<Button>().onClick.AddListener(() =>
+            //{
+            //    UIManager.ShowNewsModal();
+            //});
         }
     }
     private void AdjustWxQrCode() 
@@ -769,6 +792,7 @@ public class LoginController : MonoBehaviour
                 userInfos.Remove(u);
             }
             UIManager.Instance.userInfos = userInfos;
+            UIManager.Instance.userInfoIndex = 0;
         }
         App.CurrentUser = data;
         //App.CurrentUser = new UserModel
@@ -786,8 +810,8 @@ public class LoginController : MonoBehaviour
     }
     public void SaveInfo(UserResultModel data) 
     {
-        var u = userInfos.Find(x => x.Id == data.Id);
+        var index = userInfos.FindIndex(x => x.Id == data.Id);
-        if (u == null)
+        if (index == -1)
         {
             userInfos.Add(new QUserInfo
             {
@@ -796,19 +820,27 @@ public class LoginController : MonoBehaviour
                 Avatar = data.WxHeadImg,
                 Cookie = data.cookie
             });
+            index = userInfos.Count - 1;
         }
         else
         {
-            userInfos.Insert(0, new QUserInfo
+            var u = userInfos[index];
-            {
+            u.Id = data.Id;
-                Id = data.Id,
+            u.NickName = data.Nickname;
-                NickName = data.Nickname,
+            u.Avatar = data.WxHeadImg;
-                Avatar = data.WxHeadImg,
+            u.Cookie = data.cookie;
-                Cookie = data.cookie
+            //userInfos.Insert(0, new QUserInfo
-            });
+            //{
-            userInfos.Remove(u);
+            //    Id = data.Id,
+            //    NickName = data.Nickname,
+            //    Avatar = data.WxHeadImg,
+            //    Cookie = data.cookie
+            //});
+            //userInfos.Remove(u);
         }
         UIManager.Instance.userInfos = userInfos;
+        UIManager.Instance.userInfoIndex = index;
+        //PlayerPrefs.SetInt("UserInfoIndex", index);
     }
     async void Submit() 
     {
@@ -844,6 +876,13 @@ public class LoginController : MonoBehaviour
         {
             loginForm.password.ActivateInputField();
         }
+        if (Input.GetKey(KeyCode.KeypadEnter) || Input.GetKey(KeyCode.Return)) 
+        {
+            if (loginForm != null && !string.IsNullOrEmpty(loginForm.email.text) && !string.IsNullOrEmpty(loginForm.password.text)) 
+            {
+                Submit();
+            }
+        }
         if (startCaptcha) 
         {
             CaptchaTimerTick();

Assets/Scripts/UI/Control/PFUISlider.cs

@@ -0,0 +1,31 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class PFUISlider : MonoBehaviour
+{
+    private Text text;
+    private Slider slider;
+    private void Awake()
+    {
+        text = transform.Find("Text").GetComponent<Text>();
+        slider = transform.GetComponent<Slider>();
+        text.text = $"{(slider.value * 100).ToString("#0")}%";
+        slider.onValueChanged.AddListener((f) =>
+        {
+            text.text = $"{(f * 100).ToString("#0")}%";
+        });
+    }
+    // Start is called before the first frame update
+    void Start()
+    {
+        
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+}

Assets/Scripts/UI/Control/PFUISlider.cs.meta

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

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

@@ -47,7 +47,9 @@ public class QuickLoginScroll : MonoBehaviour
         }
         //scroll.horizontalNormalizedPosition = 0;
         Canvas.ForceUpdateCanvases();
-        scroll.horizontalNormalizedPosition = contentSize/2;
+        var i = PlayerPrefs.GetInt("UserInfoIndex");
+        Debug.Log($"51 {i}");
+        scroll.horizontalNormalizedPosition = contentSize/2+i*contentSize;
         SetColor();
     }
     void goLeft()

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

@@ -84,6 +84,7 @@ public class QuickLoginUser : MonoBehaviour
         var userInfos = UIManager.Instance.userInfos;
         userInfos.RemoveAt(index);
         UIManager.Instance.userInfos = userInfos;
+        UIManager.Instance.userInfoIndex = 0;
     }
 
     public void setActive() 

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

@@ -61,7 +61,6 @@ public class MapItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandler
         //});
         transform.GetComponent<Button>().onClick.AddListener(() => 
         {
-            Debug.Log(123);
             UIManager.ShowMapDetailPanel(myMap.Id);
         });
         transform.Find("Name").GetComponent<Text>().text = myMap.Name;

Assets/Scripts/UI/Prefab/NewsController.cs

@@ -2,6 +2,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
+using UnityEngine.EventSystems;
 using UnityEngine.UI;
 
 public class NewsController : PFUIPanel
@@ -13,7 +14,7 @@ public class NewsController : PFUIPanel
         exit = transform.Find("Main").Find("Exit");
         if (exit != null)
         {
-            exit.GetComponent<Button>().onClick.AddListener(() =>
+            UIManager.AddEvent(exit.gameObject, EventTriggerType.PointerClick, (b) =>
             {
                 Close();
             });

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

@@ -200,21 +200,20 @@ public class EditUserController : PFUIPanel
         mPhone.Text = currentUser.ContactPhone;
         mAddr.Text = currentUser.ContactAddress;
     }
-
     // Start is called before the first frame update
     protected override void Start()
     {
         base.Start();
         mConutryDropdown.ClearOptions();
         mConutryDropdown.AddOptions(UIManager.Instance.loginRegOptions.countrys);
-        mConutryDropdown.SelectIndex(UIManager.Instance.loginRegOptions.countryDefaultValue);
-        mConutryDropdown.transform.Find("RawImage").GetComponent<RawImage>().texture =
-            UIManager.Instance.loginRegOptions.GetCountryImage(UIManager.Instance.loginRegOptions.countryDefaultValue);
         mConutryDropdown.OnValueChange = (int index) =>
         {
             mConutryDropdown.transform.Find("RawImage").GetComponent<RawImage>().texture =
             UIManager.Instance.loginRegOptions.GetCountryImage(index);
         };
+        mConutryDropdown.SelectValue(App.CurrentUser.Country);
+        //mConutryDropdown.transform.Find("RawImage").GetComponent<RawImage>().texture =
+        //    UIManager.Instance.loginRegOptions.GetCountryImage(UIManager.Instance.loginRegOptions.countryDefaultValue);
         var rect = ((RectTransform)mHeadImage.transform).rect;
         SetRounded(mHeadImage.transform, rect.height);
         UIManager.AddEvent(mSaveButton.gameObject, EventTriggerType.PointerClick, Save);

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

@@ -9,6 +9,7 @@ using System.Collections.Generic;
 using System.Linq;
 using UnityEditor;
 using UnityEngine;
+using UnityEngine.Events;
 using UnityEngine.EventSystems;
 using UnityEngine.SceneManagement;
 using UnityEngine.UI;
@@ -46,7 +47,7 @@ public class MapListController : PFUIPanel
         //{
         //    hardSelector.onValueChanged.AddListener(ChangeHard);
         //}
-        ApiBase.SetCookie("15A37DF28842CBA8E4E550BFA24186C8222D392F3EE18D9E95A49CC32796D2E3F6E40385C6A114942546EE1DD793DF34880DE48090B91AD2460EB887B59664BB3965F3371DDA1F1401EC7F27C5A1084566E47069F12CB6BBC0BC7A84ADC5582B");
+        //ApiBase.SetCookie("15A37DF28842CBA8E4E550BFA24186C8222D392F3EE18D9E95A49CC32796D2E3F6E40385C6A114942546EE1DD793DF34880DE48090B91AD2460EB887B59664BB3965F3371DDA1F1401EC7F27C5A1084566E47069F12CB6BBC0BC7A84ADC5582B");
         btnMapMode = this.transform.Find("SwitchMode").gameObject;
         SetRounded(btnMapMode.transform, 64);
         UIManager.AddEvent(btnMapMode, EventTriggerType.PointerClick, (e) =>
@@ -104,6 +105,10 @@ public class MapListController : PFUIPanel
         GetList();
         if (scroll != null) 
         {
+            //scroll.GetComponent<ScrollRect>().onValueChanged.AddListener((v) =>
+            //{
+            //    OnEndDrag(null);
+            //});
             UIManager.AddEvent(scroll, UnityEngine.EventSystems.EventTriggerType.EndDrag, OnEndDrag);
         }
         //UIManager.AddEvent(transform.Find("Panel").Find("Panel"))
@@ -146,10 +151,14 @@ public class MapListController : PFUIPanel
         searchInput = transform.Find("Panel").Find("Panel").Find("SearchInput");
         if (searchInput != null) 
         {
+            searchInput.GetComponent<InputField>().onEndEdit.AddListener((s) =>
+            {
+                Debug.Log(Input.GetKeyUp(KeyCode.A));
+                //onEndEdit(s);
+            });
             searchInput.Find("Button").GetComponent<Button>().onClick.AddListener(() =>
             {
-                ftname = searchInput.GetComponent<InputField>().text;
+                onEndEdit();
-                Refresh();
             });
         }
         sorts = transform.Find("Panel").Find("Panel").Find("FilterOptions");
@@ -187,7 +196,15 @@ public class MapListController : PFUIPanel
             });
         }
     }
-
+    void onEndEdit() 
+    {
+        var t = searchInput.GetComponent<InputField>().text;
+        if (!string.IsNullOrEmpty(t)) 
+        {
+            ftname = t;
+            Refresh();
+        }
+    }
     /// <summary>
     /// 绑定头像
     /// </summary>
@@ -213,13 +230,13 @@ public class MapListController : PFUIPanel
     private void OnEndDrag(BaseEventData arg0)
     {
         var scrollrect = scroll.GetComponent<ScrollRect>();
+        Debug.Log(scrollrect.verticalNormalizedPosition);
         if (scrollrect.verticalNormalizedPosition <= 0) 
         {
-            Debug.Log(scrollrect.verticalNormalizedPosition);
             pageIndex++;
             GetList();
         }
-        if (scrollrect.verticalNormalizedPosition >= 1) 
+        if (scrollrect.verticalNormalizedPosition >= (pageIndex == 0 ? 1.2:1)) 
         {
             Refresh();
         }
@@ -281,6 +298,7 @@ public class MapListController : PFUIPanel
     {
         content.transform.DestroyChildren();
         pageIndex = 0;
+        isEnd = false;
         GetList();
     }
     void ResetList()
@@ -291,9 +309,29 @@ public class MapListController : PFUIPanel
         Refresh();
     }
     // Update is called once per frame
+    bool startMouse = false;
     void Update()
     {
-        
+        if (Input.GetAxis("Mouse ScrollWheel") != 0)
+        {
+            if (scroll.GetComponent<ScrollRect>().verticalNormalizedPosition <= 0 ||
+                scroll.GetComponent<ScrollRect>().verticalNormalizedPosition >= (pageIndex == 0 ? 1.2 : 1)) 
+            {
+                startMouse = true;
+            }
+        }
+        else 
+        {
+            if (startMouse) 
+            {
+                startMouse = false;
+                OnEndDrag(null);
+            }
+        }
+        if (Input.GetKey(KeyCode.KeypadEnter) || Input.GetKey(KeyCode.Return)) 
+        {
+            onEndEdit();
+        }
     }
 
     public override void Show()

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

@@ -11,9 +11,8 @@ public class UserInfoController : PFUIPanel
     // Start is called before the first frame update
     UserApi userApi;
     Transform infoPanel,summaryPanel;
-    protected override void Start()
+    protected override void Awake()
     {
-        userApi = ConfigHelper.userApi;
         this.transform.localPosition = new Vector3(0, 0, 0);
 
         Button exitBtn = this.transform.Find("InfoPanel").Find("Button").GetComponent<Button>();
@@ -42,16 +41,20 @@ public class UserInfoController : PFUIPanel
         //    UIManager.ShowEditUserPanel();
         //});
         summaryPanel = transform.Find("SummaryPanel");
+    }
+    public override void Show()
+    {
+        base.Show();
         Load();
     }
-    async void Load() 
+    void Load() 
     {
         //if (!App.FromLogin)
         //{
         //    var result = await userApi.Login("15651831367", "123456", "");
         //    App.CurrentUser = result.data;
         //}
-        var r = userApi.GetSummary();
+        var r = ConfigHelper.userApi.GetSummary();
         if (r.result) 
         {
             var summary = r.data;

Assets/Scripts/UI/Prefab/SettingContoller.cs

@@ -4,11 +4,26 @@ using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.UI;
 using UnityEngine.EventSystems;
+using Assets.Scripts;
+using System;
 
+public class Settings 
+{
+    public int AutoPause { set; get; }
+    public float Sensitivity { set; get; }
+    public int IMode { set; get; }
+    public int Unit { set; get; }
+    public float Volume { set; get; }
+    public int WMode { set; get; }
+    public int Language { set; get; }
+}
 public class SettingContoller : PFUIPanel
 {
     // Start is called before the first frame update
     Transform exit;
+    Button[] AutoPause, IMode, Unit, WMode, Language;
+    Slider Sensitivity, Volume;
+    Settings settings;
     protected override void Awake()
     {
         exit = transform.Find("Main").Find("Exit");
@@ -20,27 +35,111 @@ public class SettingContoller : PFUIPanel
             //});
             UIManager.AddEvent(exit.gameObject, EventTriggerType.PointerClick, (e) =>
             {
+                UIManager.Instance.settings = settings;
                 Close();
             });
         }
+        var inner = transform.Find("Main").Find("Inner");
+        AutoPause = new Button[]
+        {
+            inner.Find("AutoPause").Find("BtnOpen").GetComponent<Button>(),
+            inner.Find("AutoPause").Find("BtnClose").GetComponent<Button>()
+        };
+        IMode = new Button[]
+        {
+            inner.Find("IMode").Find("BtnSimple").GetComponent<Button>(),
+            inner.Find("IMode").Find("BtnFull").GetComponent<Button>()
+        };
+        Unit = new Button[]
+        {
+            inner.Find("Unit").Find("BtnMetric").GetComponent<Button>(),
+            inner.Find("Unit").Find("BtnImperial").GetComponent<Button>()
+        };
+        WMode = new Button[]
+        {
+            inner.Find("WMode").Find("BtnWindow").GetComponent<Button>(),
+            inner.Find("WMode").Find("BtnFull").GetComponent<Button>()
+        };
+        Language = new Button[]
+        {
+            inner.Find("Language").Find("BtnChinese").GetComponent<Button>(),
+            inner.Find("Language").Find("BtnEnglish").GetComponent<Button>()
+        };
+        Sensitivity = inner.Find("Sensitivity").Find("Slider").GetComponent<Slider>();
+        Volume = inner.Find("Volume").Find("Slider").GetComponent<Slider>();
+        AddClick();
+        LoadSettings();
     }
+
+    private void AddClick()
+    {
+        AddClick(WMode);
+        AddClick(Unit);
+        AddClick(IMode);
+        AddClick(AutoPause);
+        AddClick(Language);
+        Sensitivity.onValueChanged.AddListener((f) => { settings.Sensitivity = f; });
+        Volume.onValueChanged.AddListener((f) => { settings.Volume = f; });
+    }
+
+    private void LoadSettings()
+    {
+        settings = UIManager.Instance.settings;
+        SetValue(WMode, settings.WMode,"WMode");
+        SetValue(Unit, settings.Unit, "Unit");
+        SetValue(IMode, settings.IMode, "IMode");
+        SetValue(AutoPause, settings.AutoPause, "AutoPause");
+        SetValue(Language, settings.Language, "Language");
+        Sensitivity.value = settings.Sensitivity;
+        Volume.value = settings.Volume;
+    }
+
     protected override void Start()
     {
 
     }
 
+    
     // Update is called once per frame
     void Update()
     {
         
     }
+    void AddClick(Button[] buttons) 
+    {
+        for (int i = 0; i < buttons.Length; i++) 
+        {
+            int index = i;
+            UIManager.AddEvent(buttons[i].gameObject, EventTriggerType.PointerClick, (b) =>
+            {
+                SetValue(buttons, index,buttons[index].transform.parent.name);
+            });
+        }
+    }
+    void SetValue(Button[] buttons, int value,string valueName)
+    {
+        for (int i = 0; i < buttons.Length; i++)
+        {
+            var b = buttons[i];
+            if (i == value)
+            {
+                b.GetComponent<Image>().color = Utils.HexToColorHtml("#F93086");
+                b.transform.Find("Text").GetComponent<Text>().color = Utils.HexToColorHtml("#FFFFFF");
+                settings.GetType().GetProperty(valueName).SetValue(UIManager.Instance.settings,i);
+            }
+            else 
+            {
+                b.GetComponent<Image>().color = Utils.HexToColorHtml("#414251");
+                b.transform.Find("Text").GetComponent<Text>().color = Utils.HexToColorHtml("#9e9ead");
+            }
+        }
+    }
 
     public override void Show()
     {
         var cg = this.GetComponent<CanvasGroup>();
         cg.alpha = 0;
         base.Show();
-
         cg.DOFade(1f, 0.3f);
     }
 }

Assets/Scripts/UIManager.cs

@@ -126,6 +126,12 @@ public class UIManager : MonoBehaviour
         var userInfosJson = PlayerPrefs.GetString("UserInfos");
         userInfos = JsonConvert.DeserializeObject<List<QUserInfo>>(userInfosJson);
         if (userInfos == null) userInfos = new List<QUserInfo>();
+
+        var settingsJson = PlayerPrefs.GetString("Settings");
+        settings = JsonConvert.DeserializeObject<Settings>(settingsJson);
+        if (settings == null) settings = new Settings();
+
+        userInfoIndex = PlayerPrefs.GetInt("UserInfoIndex");
         collectDict = new Dictionary<bool, Sprite> {
             { false,Resources.Load<Sprite>("Images/p-4灰")},
             { true,Resources.Load<Sprite>("Images/p-4")},
@@ -437,6 +443,32 @@ public class UIManager : MonoBehaviour
         } 
     }
     public Dictionary<bool, Sprite> collectDict { get; private set; }
+    private int _userInfoIndex;
+    public int userInfoIndex 
+    { 
+        get 
+        {
+            return _userInfoIndex;
+        }
+        set 
+        {
+            _userInfoIndex = value;
+            PlayerPrefs.SetInt("UserInfoIndex", value);
+        } 
+    }
+    private Settings _settings;
+    public Settings settings 
+    {
+        get
+        {
+            return _settings;
+        }
+        set
+        {
+            _settings = value;
+            PlayerPrefs.SetString("Settings", JsonConvert.SerializeObject(value));
+        }
+    }
     private void OnDestroy()
     {
         UIManager.Instance = null;

Assets/Scripts/Utils/Utils.cs

@@ -168,5 +168,6 @@ namespace Assets.Scripts
                 str = String.Concat(str, random.Next(10).ToString());
             return str;
         }
+
     }
 }