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

# Conflicts:
#	Assets/Mapbox/User/Modifiers.meta
#	Assets/Resources/UI/Control/PFUISlider.prefab.meta
#	Assets/StreamingAssets.meta

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: 9281e8bf86b8d70459ba6c65898fee31
+guid: f161296c0ad4a2047a2d64918bb11cf5
-folderAsset: yes
+PrefabImporter:
-DefaultImporter:
   externalObjects: {}
   userData: 
   assetBundleName: 

Assets/Resources/UI/Control/PfUIButton.prefab

@@ -1,5 +1,108 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &3113082501854063731
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 545917028276686471}
+  - component: {fileID: 2773518605446052280}
+  - component: {fileID: 1123028309966834811}
+  - component: {fileID: 3475867170677891149}
+  - component: {fileID: 1006258579742512774}
+  m_Layer: 5
+  m_Name: Tooltips
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &545917028276686471
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3113082501854063731}
+  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: 5329299856310536127}
+  m_Father: {fileID: 3150550772099312288}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 0, y: -50}
+  m_SizeDelta: {x: 0, y: 34}
+  m_Pivot: {x: 0, y: 1}
+--- !u!222 &2773518605446052280
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3113082501854063731}
+  m_CullTransparentMesh: 0
+--- !u!114 &1123028309966834811
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3113082501854063731}
+  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.5188679, g: 0.15527831, b: 0.07587219, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &3475867170677891149
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3113082501854063731}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 0
+--- !u!225 &1006258579742512774
+CanvasGroup:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3113082501854063731}
+  m_Enabled: 1
+  m_Alpha: 1
+  m_Interactable: 1
+  m_BlocksRaycasts: 1
+  m_IgnoreParentGroups: 0
 --- !u!1 &3150550772099312289
 GameObject:
   m_ObjectHideFlags: 0
@@ -9,9 +112,9 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 3150550772099312288}
+  - component: {fileID: 2665063159965378333}
   - component: {fileID: 3150550772099312291}
   - component: {fileID: 53319763305559075}
-  - component: {fileID: 2665063159965378333}
   - component: {fileID: 8688565590564084001}
   m_Layer: 5
   m_Name: PfUIButton
@@ -32,6 +135,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 3150550772916003704}
+  - {fileID: 545917028276686471}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -40,57 +144,6 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 160, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &3150550772099312291
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3150550772099312289}
-  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: 2
-  m_Colors:
-    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
-    m_HighlightedColor: {r: 1, g: 1, b: 1, 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: 2665063159965378333}
-  m_OnClick:
-    m_PersistentCalls:
-      m_Calls: []
---- !u!222 &53319763305559075
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3150550772099312289}
-  m_CullTransparentMesh: 0
 --- !u!114 &2665063159965378333
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -120,6 +173,57 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!114 &3150550772099312291
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3150550772099312289}
+  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: 2665063159965378333}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!222 &53319763305559075
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3150550772099312289}
+  m_CullTransparentMesh: 0
 --- !u!114 &8688565590564084001
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -133,7 +237,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   mType: 0
-  text: {fileID: 0}
+  Tooltips: 
 --- !u!1 &3150550772916003705
 GameObject:
   m_ObjectHideFlags: 0
@@ -211,4 +315,97 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: BUTTON
+  m_Text: 
+--- !u!1 &7516030328870189652
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5329299856310536127}
+  - component: {fileID: 6797175061521168176}
+  - component: {fileID: 8702220197490285681}
+  - component: {fileID: 412546516092973110}
+  m_Layer: 5
+  m_Name: Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5329299856310536127
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7516030328870189652}
+  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: 545917028276686471}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 30}
+  m_Pivot: {x: 0, y: 1}
+--- !u!222 &6797175061521168176
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7516030328870189652}
+  m_CullTransparentMesh: 0
+--- !u!114 &8702220197490285681
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7516030328870189652}
+  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: 8180b991008992c45b6bf1a979c7baca, type: 3}
+    m_FontSize: 12
+    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: 
+--- !u!114 &412546516092973110
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7516030328870189652}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 0

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

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

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

@@ -30,7 +30,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 6863560505873109966}
-  m_RootOrder: 11
+  m_RootOrder: 10
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -104,7 +104,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 6863560505873109966}
-  m_RootOrder: 10
+  m_RootOrder: 9
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -159,6 +159,7 @@ GameObject:
   - component: {fileID: 7085836960468588645}
   - component: {fileID: 8848262766535284511}
   - component: {fileID: 7721364887894712837}
+  - component: {fileID: 7596951301422095937}
   m_Layer: 5
   m_Name: Count
   m_TagString: Untagged
@@ -173,18 +174,18 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2594476502820618556}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
-  m_Father: {fileID: 6863560505873109966}
+  m_Father: {fileID: 4667647203674207684}
-  m_RootOrder: 3
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 308, y: -107}
+  m_AnchoredPosition: {x: 55, y: 0}
-  m_SizeDelta: {x: 40, y: 19}
+  m_SizeDelta: {x: 0, y: 19}
-  m_Pivot: {x: 0, y: 1}
+  m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &8848262766535284511
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -219,13 +220,27 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 10
     m_MaxSize: 40
-    m_Alignment: 6
+    m_Alignment: 8
     m_AlignByGeometry: 1
     m_RichText: 1
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: 000
+  m_Text: 0000
+--- !u!114 &7596951301422095937
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2594476502820618556}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 0
 --- !u!1 &3724904730239188879
 GameObject:
   m_ObjectHideFlags: 0
@@ -334,7 +349,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 6863560505873109966}
-  m_RootOrder: 15
+  m_RootOrder: 14
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -375,6 +390,84 @@ MonoBehaviour:
     y: 0
     width: 1
     height: 1
+--- !u!1 &4155153187793549579
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4667647203674207684}
+  - component: {fileID: 2040361415639770238}
+  - component: {fileID: 7032021839252054285}
+  m_Layer: 5
+  m_Name: CountWrap
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4667647203674207684
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4155153187793549579}
+  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: 4561642187198993313}
+  - {fileID: 7085836960468588645}
+  m_Father: {fileID: 6863560505873109966}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -20, y: -117}
+  m_SizeDelta: {x: 0, y: 20}
+  m_Pivot: {x: 1, y: 0.5}
+--- !u!114 &2040361415639770238
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4155153187793549579}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 5
+  m_Spacing: 4
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+--- !u!114 &7032021839252054285
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4155153187793549579}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 0
 --- !u!1 &4286186333184849785
 GameObject:
   m_ObjectHideFlags: 0
@@ -485,7 +578,7 @@ RectTransform:
   m_Children:
   - {fileID: 8497929000405638754}
   m_Father: {fileID: 6863560505873109966}
-  m_RootOrder: 12
+  m_RootOrder: 11
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -660,7 +753,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 6863560505873109966}
-  m_RootOrder: 13
+  m_RootOrder: 12
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -812,7 +905,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 6863560505873109966}
-  m_RootOrder: 14
+  m_RootOrder: 13
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -886,13 +979,12 @@ RectTransform:
   - {fileID: 6863560505884541798}
   - {fileID: 8334077500523104476}
   - {fileID: 4052172461455070761}
-  - {fileID: 7085836960468588645}
+  - {fileID: 4667647203674207684}
   - {fileID: 3395037359819743163}
   - {fileID: 9153523518070882339}
   - {fileID: 7202064334367090665}
   - {fileID: 2224189869626763640}
   - {fileID: 7796454748637946497}
-  - {fileID: 4561642187198993313}
   - {fileID: 7171638826596304883}
   - {fileID: 8022915073535944964}
   - {fileID: 8243496190560064870}
@@ -1130,16 +1222,16 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7582904632417415396}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
-  m_Father: {fileID: 6863560505873109966}
+  m_Father: {fileID: 4667647203674207684}
-  m_RootOrder: 9
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 288, y: -109}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 16, y: 16}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &2810234525063364866

Assets/Resources/UI/Prefab/Confirm.prefab

@@ -0,0 +1,892 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &622109425373367070
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 622109425373367065}
+  - component: {fileID: 622109425373367067}
+  - component: {fileID: 622109425373367061}
+  - component: {fileID: 622109425373367066}
+  - component: {fileID: -1194897098396014303}
+  m_Layer: 5
+  m_Name: Confirm
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &622109425373367065
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 622109425373367070}
+  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: 8014569244817905014}
+  - {fileID: 6926614531869201853}
+  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!114 &622109425373367067
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 622109425373367070}
+  m_Enabled: 0
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 4
+  m_Spacing: 0
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+--- !u!222 &622109425373367061
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 622109425373367070}
+  m_CullTransparentMesh: 0
+--- !u!114 &622109425373367066
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 622109425373367070}
+  m_Enabled: 0
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 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 &-1194897098396014303
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 622109425373367070}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 6618e32f03c775a4b9bf59d1da2a8d24, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!1 &6049983423013398610
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8014569244817905014}
+  - component: {fileID: 2049781763563526083}
+  - component: {fileID: 8653815565734179576}
+  m_Layer: 5
+  m_Name: Panel
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8014569244817905014
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6049983423013398610}
+  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: 622109425373367065}
+  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 &2049781763563526083
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6049983423013398610}
+  m_CullTransparentMesh: 0
+--- !u!114 &8653815565734179576
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6049983423013398610}
+  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.011764706, g: 0.011764706, b: 0.011764706, a: 0.41960785}
+  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!1 &9006553523437628275
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6926614531869201853}
+  - component: {fileID: 757814200154182014}
+  - component: {fileID: 8043846748049501632}
+  - component: {fileID: 2858685368029142219}
+  m_Layer: 5
+  m_Name: GameObject
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6926614531869201853
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9006553523437628275}
+  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: 6998294380103572464}
+  - {fileID: 4078893100382479266}
+  - {fileID: 3999750805029216534}
+  - {fileID: 7242676706303758629}
+  m_Father: {fileID: 622109425373367065}
+  m_RootOrder: 1
+  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: 662, y: 276}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &757814200154182014
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9006553523437628275}
+  m_Enabled: 0
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 4
+  m_Spacing: 0
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+--- !u!222 &8043846748049501632
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9006553523437628275}
+  m_CullTransparentMesh: 0
+--- !u!114 &2858685368029142219
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9006553523437628275}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 970fa7b2c5134aa4689616c9085aa237, type: 3}
+  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!1001 &2033649105751149494
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 6926614531869201853}
+    m_Modifications:
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_Pivot.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_Pivot.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 140
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 38
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 187
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -198
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312289, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_Name
+      value: Ok
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772916003707, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_Text
+      value: Yes
+      objectReference: {fileID: 0}
+    - target: {fileID: 8688565590564084001, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: mType
+      value: 2
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3}
+--- !u!224 &3999750805029216534 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+    type: 3}
+  m_PrefabInstance: {fileID: 2033649105751149494}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &2639091280825295770
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 6926614531869201853}
+    m_Modifications:
+    - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
+        type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
+        type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
+        type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
+        type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: -160
+      objectReference: {fileID: 0}
+    - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 90
+      objectReference: {fileID: 0}
+    - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -130
+      objectReference: {fileID: 0}
+    - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2018962972499165241, guid: d1deda2310a3a7241a8e0d559585b30d,
+        type: 3}
+      propertyPath: m_Name
+      value: Content
+      objectReference: {fileID: 0}
+    - target: {fileID: 2018962972499165246, guid: d1deda2310a3a7241a8e0d559585b30d,
+        type: 3}
+      propertyPath: m_Text
+      value: Content
+      objectReference: {fileID: 0}
+    - target: {fileID: 2018962972499165246, guid: d1deda2310a3a7241a8e0d559585b30d,
+        type: 3}
+      propertyPath: m_Color.b
+      value: 0.5254902
+      objectReference: {fileID: 0}
+    - target: {fileID: 2018962972499165246, guid: d1deda2310a3a7241a8e0d559585b30d,
+        type: 3}
+      propertyPath: m_Color.g
+      value: 0.1882353
+      objectReference: {fileID: 0}
+    - target: {fileID: 2018962972499165246, guid: d1deda2310a3a7241a8e0d559585b30d,
+        type: 3}
+      propertyPath: m_Color.r
+      value: 0.9764706
+      objectReference: {fileID: 0}
+    - target: {fileID: 2018962972499165246, guid: d1deda2310a3a7241a8e0d559585b30d,
+        type: 3}
+      propertyPath: m_FontData.m_Font
+      value: 
+      objectReference: {fileID: 12800000, guid: dc2b8edfb87f74143913c268624f8711,
+        type: 3}
+    - target: {fileID: 2018962972499165246, guid: d1deda2310a3a7241a8e0d559585b30d,
+        type: 3}
+      propertyPath: m_FontData.m_MinSize
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 2018962972499165246, guid: d1deda2310a3a7241a8e0d559585b30d,
+        type: 3}
+      propertyPath: m_FontData.m_FontSize
+      value: 20
+      objectReference: {fileID: 0}
+    - target: {fileID: 2018962972499165246, guid: d1deda2310a3a7241a8e0d559585b30d,
+        type: 3}
+      propertyPath: m_FontData.m_Alignment
+      value: 4
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: d1deda2310a3a7241a8e0d559585b30d, type: 3}
+--- !u!224 &4078893100382479266 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
+    type: 3}
+  m_PrefabInstance: {fileID: 2639091280825295770}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &5708920744184167301
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 6926614531869201853}
+    m_Modifications:
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_Pivot.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_Pivot.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 140
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 38
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 347
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -198
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312289, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_Name
+      value: Cancel
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772916003707, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_Text
+      value: CANCEL
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3}
+--- !u!224 &7242676706303758629 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+    type: 3}
+  m_PrefabInstance: {fileID: 5708920744184167301}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &9014556673738890184
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 6926614531869201853}
+    m_Modifications:
+    - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
+        type: 3}
+      propertyPath: m_Pivot.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
+        type: 3}
+      propertyPath: m_Pivot.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
+        type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
+        type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: -160
+      objectReference: {fileID: 0}
+    - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 50
+      objectReference: {fileID: 0}
+    - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 80
+      objectReference: {fileID: 0}
+    - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -40
+      objectReference: {fileID: 0}
+    - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2018962972499165241, guid: d1deda2310a3a7241a8e0d559585b30d,
+        type: 3}
+      propertyPath: m_Name
+      value: Title
+      objectReference: {fileID: 0}
+    - target: {fileID: 2018962972499165246, guid: d1deda2310a3a7241a8e0d559585b30d,
+        type: 3}
+      propertyPath: m_Text
+      value: Title
+      objectReference: {fileID: 0}
+    - target: {fileID: 2018962972499165246, guid: d1deda2310a3a7241a8e0d559585b30d,
+        type: 3}
+      propertyPath: m_Color.b
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2018962972499165246, guid: d1deda2310a3a7241a8e0d559585b30d,
+        type: 3}
+      propertyPath: m_Color.g
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2018962972499165246, guid: d1deda2310a3a7241a8e0d559585b30d,
+        type: 3}
+      propertyPath: m_Color.r
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2018962972499165246, guid: d1deda2310a3a7241a8e0d559585b30d,
+        type: 3}
+      propertyPath: m_FontData.m_Font
+      value: 
+      objectReference: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197,
+        type: 3}
+    - target: {fileID: 2018962972499165246, guid: d1deda2310a3a7241a8e0d559585b30d,
+        type: 3}
+      propertyPath: m_FontData.m_MinSize
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 2018962972499165246, guid: d1deda2310a3a7241a8e0d559585b30d,
+        type: 3}
+      propertyPath: m_FontData.m_FontSize
+      value: 38
+      objectReference: {fileID: 0}
+    - target: {fileID: 2018962972499165246, guid: d1deda2310a3a7241a8e0d559585b30d,
+        type: 3}
+      propertyPath: m_FontData.m_Alignment
+      value: 4
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: d1deda2310a3a7241a8e0d559585b30d, type: 3}
+--- !u!224 &6998294380103572464 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
+    type: 3}
+  m_PrefabInstance: {fileID: 9014556673738890184}
+  m_PrefabAsset: {fileID: 0}

Assets/Resources/UI/Prefab/Confirm.prefab.meta

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

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/BigMapPanel.prefab

@@ -996,6 +996,7 @@ GameObject:
   - component: {fileID: 5033434782108908188}
   - component: {fileID: 6054987918574992224}
   - component: {fileID: 8245745535680522155}
+  - component: {fileID: 7420979896629821451}
   m_Layer: 5
   m_Name: GoList
   m_TagString: Untagged
@@ -1059,6 +1060,49 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!114 &7420979896629821451
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4034944497026403675}
+  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: 8245745535680522155}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &4780901690327224105
 GameObject:
   m_ObjectHideFlags: 0

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

@@ -30,7 +30,7 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
-  - {fileID: 4110286611030698458}
+  - {fileID: 1079225629459415319}
   - {fileID: 3931130817493022313}
   - {fileID: 4277467338018245799}
   m_Father: {fileID: 0}
@@ -192,6 +192,11 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 8600990077643662720, guid: 652cdefe0475dfd429e5a7e92bc3fa31,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 652cdefe0475dfd429e5a7e92bc3fa31, type: 3}
 --- !u!224 &4277467338018245799 stripped
@@ -355,13 +360,23 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!1001 &2132237384658419801
+--- !u!1001 &3055618140784683156
 PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
     m_TransformParent: {fileID: 1777885814862178517}
     m_Modifications:
+    - target: {fileID: 1372841062299834888, guid: a1999d0576fee6248a9c5a507ae8d10e,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2054923810110871857, guid: a1999d0576fee6248a9c5a507ae8d10e,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 2638424933752433026, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}
       propertyPath: m_Name
@@ -472,11 +487,36 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 5131057264773265704, guid: a1999d0576fee6248a9c5a507ae8d10e,
+        type: 3}
+      propertyPath: Tooltips
+      value: Device
+      objectReference: {fileID: 0}
+    - target: {fileID: 5143865119848873080, guid: a1999d0576fee6248a9c5a507ae8d10e,
+        type: 3}
+      propertyPath: m_Text
+      value: 
+      objectReference: {fileID: 0}
+    - target: {fileID: 6347209353323850145, guid: a1999d0576fee6248a9c5a507ae8d10e,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8197454007437855745, guid: a1999d0576fee6248a9c5a507ae8d10e,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8526344065104504758, guid: a1999d0576fee6248a9c5a507ae8d10e,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3}
---- !u!224 &4110286611030698458 stripped
+--- !u!224 &1079225629459415319 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e,
     type: 3}
-  m_PrefabInstance: {fileID: 2132237384658419801}
+  m_PrefabInstance: {fileID: 3055618140784683156}
   m_PrefabAsset: {fileID: 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/Apis/ApiBase.cs

@@ -438,27 +438,30 @@ namespace Assets.Scripts.Apis
                 url1 = ConfigHelper.Host + url1;
             }
             //AddLanguage();
-            var request = (HttpWebRequest)WebRequest.Create(url1);
+            //var request = (HttpWebRequest)WebRequest.Create(url1);
-            request.Method = "GET";
+            //request.Method = "GET";
-            //foreach (var item in httpClient.DefaultRequestHeaders)
+            ////foreach (var item in httpClient.DefaultRequestHeaders)
+            ////{
+            ////    request.Headers.Add(item.Key, item.Value.First());
+            ////}
+            //request.UserAgent = httpClient.DefaultRequestHeaders.UserAgent.ToString();
+            //request.Accept = "application/json";
+            //request.Headers.Add("Language", "en");
+            //request.AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate;
+            //request.CookieContainer = new CookieContainer();
+            //foreach (Cookie item in cookies)
             //{
-            //    request.Headers.Add(item.Key, item.Value.First());
+            //    request.CookieContainer.Add(item);
             //}
-            request.UserAgent = httpClient.DefaultRequestHeaders.UserAgent.ToString();
-            request.Accept = "application/json";
-            request.Headers.Add("Language", "en");
-            request.AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate;
-            request.CookieContainer = new CookieContainer();
-            foreach (Cookie item in cookies)
-            {
-                request.CookieContainer.Add(item);
-            }
 
-            var res = request.GetResponse();
+            //var res = request.GetResponse();
-            using (var stream = new StreamReader(res.GetResponseStream()))
+            //using (var stream = new StreamReader(res.GetResponseStream()))
-            {
+            //{
-                return stream.ReadToEnd();
+            //    return stream.ReadToEnd();
-            }
+            //}
+            var res = GetAsync(url).GetAwaiter().GetResult();
+
+            return System.Text.Encoding.UTF8.GetString(res);
         }
 
         public T Get<T>(string url)

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,11 +232,14 @@ 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");
                  if (gou.gameObject.activeSelf)
@@ -277,17 +281,23 @@ 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;
                  wxBrowser.Url = "chrome://version/";
@@ -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);
                  pageNums = 4;
                  Canvas.ForceUpdateCanvases();
                  StartScrollPanel(1);
              });
-            
             wxLogin2.Find("Next").GetComponent<Button>().onClick.AddListener(()=> 
             {
                 this.goSign(false);
@@ -339,7 +349,8 @@ 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)
                  {
                      StartScrollPanel(3);
@@ -352,11 +363,15 @@ public class LoginController : MonoBehaviour
                      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);
              });
+            //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();
              });
-            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/Control/PFUIText.cs

@@ -11,9 +11,22 @@ namespace Assets.Scripts.UI.Control
     [RequireComponent(typeof(Text))]
     public class PFUIText : PFUIComponentBase
     {
+        private Text text;
+
+        public string Text
+        {
+            get
+            {
+                return text.text;
+            }
+            set
+            {
+                text.text = value;
+            }
+        }
         protected void Awake()
         {
-            
+            text = this.transform.GetComponent<Text>();
         }
     }
 }

Assets/Scripts/UI/Control/PfUIButton.cs

@@ -6,6 +6,8 @@ using System.Threading.Tasks;
 using UnityEngine;
 using UnityEngine.UI;
 using UnityEngine.EventSystems;
+using UnityEngine.Events;
+using DG.Tweening;
 
 namespace Assets.Scripts.UI.Control
 {
@@ -16,14 +18,18 @@ namespace Assets.Scripts.UI.Control
         {
             Normal,
             Border,
-            Primary
+            Primary,
+            Image
         }
 
         [SerializeField] Type mType;
+        [SerializeField] string Tooltips;
+        private GameObject tooltips;
         private Image image;
-        public Text text;
+        private Text text;
-        private Texture2D cursor;
+        //private Texture2D cursor;
         private Outline outline;
+        private Button mButton;
         
         protected void Awake()
         {
@@ -35,11 +41,16 @@ namespace Assets.Scripts.UI.Control
             }
 
             //设置光标
-            cursor = Resources.Load<Texture2D>("Images/PointerButtonHover");
+            //cursor = Resources.Load<Texture2D>("Images/PointerButtonHover");
 
             image = gameObject.GetComponent<Image>();
             text = this.transform.Find("Text").GetComponent<Text>();
-
+            if(mType == Type.Image)
+            {
+                text.gameObject.SetActive(false);
+            }
+            else
+            {
                 Material material = null;
                 if (material == null)
                 {
@@ -48,6 +59,17 @@ namespace Assets.Scripts.UI.Control
                 var rect = ((RectTransform)transform).rect;
                 material.SetVector(Shader.PropertyToID("_WidthHeightRadius"), new Vector4(rect.width, rect.height, rect.height * 0.5f, 0));
                 image.material = material;
+            }
+
+            tooltips = this.transform.Find("Tooltips").gameObject;
+            if (!string.IsNullOrWhiteSpace(Tooltips))
+            {
+                //
+                tooltips.transform.Find("Text").GetComponent<Text>().text = Tooltips;
+            }            
+            tooltips.SetActive(false);
+            
+            mButton = this.GetComponent<Button>();
 
             InitColor();
             BindEvent();
@@ -87,8 +109,13 @@ namespace Assets.Scripts.UI.Control
             UIManager.AddEvent(this.gameObject, EventTriggerType.PointerEnter, new UnityEngine.Events.UnityAction<UnityEngine.EventSystems.BaseEventData>(e =>
             {
                 if (!this.isActiveAndEnabled) return;
-                Cursor.SetCursor(cursor, Vector2.zero, CursorMode.Auto);
+                //Cursor.SetCursor(cursor, Vector2.zero, CursorMode.Auto);
-
+                if (!string.IsNullOrWhiteSpace(Tooltips))
+                {
+                    tooltips.GetComponent<CanvasGroup>().alpha = 0f;
+                    tooltips.SetActive(true);
+                    tooltips.GetComponent<CanvasGroup>().DOFade(1f, 0.2f);
+                }
                 switch (mType)
                 {
                     case Type.Normal:
@@ -112,10 +139,14 @@ namespace Assets.Scripts.UI.Control
             }));
 
             //鼠标离开
-            UIManager.AddEvent(this.gameObject, EventTriggerType.PointerExit, new UnityEngine.Events.UnityAction<UnityEngine.EventSystems.BaseEventData>(e =>
+            UIManager.AddEvent(this.gameObject, EventTriggerType.PointerExit, new UnityAction<BaseEventData>(e =>
             {
                 if (!this.isActiveAndEnabled) return;
-                Cursor.SetCursor(null, Vector2.zero, CursorMode.Auto);
+                if (!string.IsNullOrWhiteSpace(Tooltips))
+                {
+                    tooltips.SetActive(false);
+                }
+                //Cursor.SetCursor(null, Vector2.zero, CursorMode.Auto);
                 switch (mType)
                 {
                     case Type.Normal:
@@ -170,7 +201,7 @@ namespace Assets.Scripts.UI.Control
             UIManager.AddEvent(this.gameObject, EventTriggerType.PointerUp, new UnityEngine.Events.UnityAction<BaseEventData>(e =>
             {
                 if (!this.isActiveAndEnabled) return;
-                Cursor.SetCursor(null, Vector2.zero, CursorMode.Auto);
+                //Cursor.SetCursor(null, Vector2.zero, CursorMode.Auto);
 
                 switch (mType)
                 {
@@ -200,6 +231,7 @@ namespace Assets.Scripts.UI.Control
         public void SetEnabled(bool value)
         {
             base.enabled = value;
+            mButton.enabled = value;
             if (base.enabled)
             {
                 InitColor();

Assets/Scripts/UI/Prefab/BigMap/Tips.cs

@@ -42,7 +42,7 @@ public class Tips : MonoBehaviour
         this.GetComponent<Image>().material = material;
 
         Name = this.transform.Find("Name").GetComponent<Text>();
-        Count = this.transform.Find("Count").GetComponent<Text>();
+        Count = this.transform.Find("CountWrap").Find("Count").GetComponent<Text>();
         Distance = this.transform.Find("Distance").GetComponent<Text>();
         TotalClimb = this.transform.Find("TotalClimb").GetComponent<Text>();
 
@@ -115,7 +115,6 @@ public class Tips : MonoBehaviour
 
         m3DIcon.SetActive(_model.Enable3D);
 
-
         //altitudeGraph
 
         Utils.DisplayImage(StartCoroutine, altitudeGraph, _model.AltitudeGraph);
@@ -129,31 +128,52 @@ public class Tips : MonoBehaviour
         //{
         //    position.y = position.z;
         //}
-        this.transform.position = position;
+        this.Move(position);
         
-        var localPosition = this.transform.localPosition;
-        if (localPosition.y + 150 > localPosition.z)
-        {
-            localPosition.y = localPosition.z -150;
-        }
-        if(localPosition.x * -1f > localPosition.z)
-        {
-            localPosition.x = localPosition.z * -1f;
-        }
-        else if(localPosition.x > localPosition.z *2)
-        {
-            localPosition.x = localPosition.z * 2;
-        }
-        this.transform.localPosition = localPosition;
-        this.transform.localScale = new Vector2(2, 2);
-        
-        //tips.Show();
         this.gameObject.SetActive(true);
 
         this.SetModel(model);
     }
+
+    public void Move(Vector3 position)
+    {
+        this.transform.position = position;
+
+        var localPosition = this.transform.localPosition;
+        Debug.Log(localPosition.y);
+        if(localPosition.y > 128)
+        {
+            localPosition.y = 128;
+        }
+        if(localPosition.x < -465)
+        {
+            localPosition.x = -465f;
+        }
+        if(localPosition.x > 1080)
+        {
+            localPosition.x = 1080;
+        }
+        //if (localPosition.y + 150 > localPosition.z)
+        //{
+        //    localPosition.y = localPosition.z -150;
+        //}
+        //if(localPosition.x * -1f > localPosition.z)
+        //{
+        //    localPosition.x = localPosition.z * -1f;
+        //}
+        //else if(localPosition.x > localPosition.z *2)
+        //{
+        //    localPosition.x = localPosition.z * 2;
+        //}
+        this.transform.localPosition = localPosition;
+        this.transform.localScale = new Vector2(2, 2);
+
+        Debug.Log($"{ this.transform.localPosition.y }, { this.transform.localPosition.y }");
+    }
+
     public void Hide()
     {
-        this.gameObject.SetActive(false);
+        //this.gameObject.SetActive(false);
+        DestroyImmediate(this.gameObject);
     }
 }

Assets/Scripts/UI/Prefab/Confirm.cs

@@ -0,0 +1,100 @@
+
+using UnityEngine;
+using UnityEngine.UI;
+using DG.Tweening;
+using Assets.Scripts.UI.Control;
+using System;
+using UnityEngine.EventSystems;
+using UnityEngine.Events;
+
+public class Confirm : PFUIPanel
+{
+    private PFUIText _title;
+    private PFUIText _content;
+    private PfUIButton _ok;
+    private UnityAction _callback;
+    private PfUIButton _cancel;
+    protected override void Awake()
+    {
+        //var rect = this.gameObject.AddComponent<RectTransform>();
+        //var layout = this.gameObject.AddComponent<VerticalLayoutGroup>();
+        //layout.spacing = 20f;
+        //layout.childAlignment = TextAnchor.MiddleCenter;
+
+        var wrap = this.transform.Find("GameObject");
+        _title = wrap.Find("Title").GetComponent<PFUIText>();
+        _content = wrap.Find("Content").GetComponent<PFUIText>();
+        //text.transform.SetParent(layout.transform);
+        //text.text = "阿斯达克法拉盛地方";
+        ///text = layout.transform.GetChild(0).gameObject.AddComponent<Text>();
+
+        //text = GetComponentInChildren<Transform>().gameObject.AddComponent<Text>();
+
+        _ok = wrap.Find("Ok").GetComponent<PfUIButton>();
+        _cancel = wrap.Find("Cancel").GetComponent<PfUIButton>();
+        //button.onClick.AddListener(() =>
+        //{
+        //    this.Close();
+        //    //this.Destroy(true);
+        //    //DestroyImmediate(this);
+        //});
+        UIManager.AddEvent(_ok.gameObject, EventTriggerType.PointerClick, (e) =>
+        {
+            if(_callback != null)
+            {
+                _callback();
+            }
+        });
+        UIManager.AddEvent(_cancel.gameObject, EventTriggerType.PointerClick, (e) =>
+        {
+            this.Close();
+        });
+    }
+
+    // Start is called before the first frame update
+    protected override void Start()
+    {
+        
+    }
+
+    public void Set(string title, string content, UnityAction callback)
+    {
+        //if(text == null)
+        //{
+        //    return;
+        //}
+        //text.text = txt;
+        _title.Text = title;
+        _content.Text = content;
+        _callback = callback;
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+
+    public override void Show()
+    {
+        var panel = this.transform.Find("Panel");
+        var bg = panel.GetComponent<Image>();
+        //bg.alphaHitTestMinimumThreshold
+        
+        var color = bg.color;
+        color.a = 0.6f;
+        bg.color = color;
+        base.Show();
+    }
+
+    public override void Close()
+    {
+        var panel = this.transform.Find("Panel");
+        var bg = panel.GetComponent<Image>();
+
+        bg.DOFade(0, 0.2f).OnComplete(() =>
+        {
+            this.gameObject.SetActive(false);
+        });
+    }
+}

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

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 6618e32f03c775a4b9bf59d1da2a8d24
+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/MainNav.cs

@@ -35,8 +35,10 @@ public class MainNav : MonoBehaviour
 
         UIManager.AddEvent(exit, EventTriggerType.PointerClick, (e) =>
         {
+            UIManager.ShowConfirm("Quit", "Do you want to quit PowerFun?", ()=> {
                 Application.Quit();
             });
+        });
 
         UIManager.AddEvent(transform.Find("Setting").gameObject, EventTriggerType.PointerClick, x =>
         {

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/BigMapController.cs

@@ -30,7 +30,23 @@ public class BigMapController : PFUIPanel
     UnityEngine.Object begin;
     Sprite end;
     private Dictionary<int, LineItem> linesCache = new Dictionary<int, LineItem>();
-    Tips tips;
+    UnityEngine.Object tipsObject;
+    private Tips _tips;
+    private Tips tips
+    {
+        get
+        {
+            if (_tips == null)
+            {
+                _tips = ((GameObject)Instantiate(tipsObject, canvas.transform.Find("TipsContainer"))).GetComponent<Tips>();
+            }
+            return _tips;
+        }
+        set
+        {
+            _tips = value;
+        }
+    }
     int timer = 0;
     protected override void Awake()
     {
@@ -76,8 +92,9 @@ public class BigMapController : PFUIPanel
         var searchBtn = input.Find("Search").gameObject;
         UIManager.AddEvent(searchBtn, EventTriggerType.PointerClick, Search);
 
-        tips = ((GameObject)Instantiate(Resources.Load("UI/Prefab/BigMap/Tips"), canvas.transform.Find("TipsContainer"))).GetComponent<Tips>();
+        tipsObject = Resources.Load("UI/Prefab/BigMap/Tips");
-        tips.Hide();
+        //tips = ((GameObject)Instantiate(tipsObject, canvas.transform.Find("TipsContainer"))).GetComponent<Tips>();
+        //tips.Hide();
 
         BindHeadImage();
     }
@@ -228,6 +245,7 @@ public class BigMapController : PFUIPanel
                 if(item.Value.Selected)
                 {
                     tips.Hide();
+                    tips = null;
                 }
             }
         }
@@ -289,11 +307,16 @@ public class BigMapController : PFUIPanel
             line.Item = iii;
             iii.onClick = () =>
             {
+                if(tips != null)
+                {
+                    tips.Hide();
+                    tips = null;
+                }
                 if (line.Selected)
                 {
                     line.Selected = false;
-                    tips.Hide();
+                    //tips.Hide();
-                    //iii.Selected(false);
+                    //tips = null;
                     return;
                 }
                 line.Selected = true;
@@ -360,7 +383,8 @@ public class BigMapController : PFUIPanel
             line.Selected = true;
             var position = line.BeginMarker.transform.position;
             //position.z += 25;
-            tips.Show(position, line.Model);
+            //tips.Show(position, line.Model);
+            tips.Move(position);
         }
     }
     /// <summary>

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/HomeController.cs

@@ -1,6 +1,7 @@
 using Assets.Scripts;
 using Assets.Scripts.Apis;
 using Assets.Scripts.Apis.Models;
+using Assets.Scripts.UI.Control;
 using DG.Tweening;
 using System;
 using System.Collections;
@@ -57,10 +58,11 @@ public class HomeController : PFUIPanel
         {
             UIManager.ShowUserInfoPanel();
         });
-
+        userInfo.Find("BtnMore").GetComponent<PfUIButton>().SetEnabled(false);
         UIManager.AddEvent(userInfo.Find("BtnMore").gameObject, EventTriggerType.PointerClick, x =>
         {
             UIManager.ShowAlert("test");
+            //UIManager.ShowConfirm("Quit", "Do you want to quit PowerFun?", null);
         });
         GetSummary();
     }
@@ -157,6 +159,5 @@ public class HomeController : PFUIPanel
         base.Show();
 
         cg.DOFade(1f, 0.3f);       
-       
     }
 }

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

@@ -6,6 +6,8 @@ using UnityEngine.EventSystems;
 using DG.Tweening;
 using Assets.Scripts.UI.Prefab.Login;
 using Newtonsoft.Json;
+using UnityEngine.UI;
+using Assets.Scripts.UI.Control;
 
 public class UIManager : MonoBehaviour
 {
@@ -126,6 +128,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")},
@@ -353,7 +361,16 @@ public class UIManager : MonoBehaviour
         }
         EventTrigger.Entry pointerEvent = new EventTrigger.Entry();
         pointerEvent.eventID = eventTriggerType;
-        pointerEvent.callback.AddListener(call);
+        pointerEvent.callback.AddListener((e)=> {
+            if (gameObject.activeInHierarchy == false) return;
+            var btn = gameObject.GetComponent<Button>();
+            if(btn != null && btn.enabled == false)
+            {
+                return;
+            }
+
+            call(e);
+        });
         et.triggers.Add(pointerEvent);
 
         if (eventTriggerType == EventTriggerType.PointerClick)
@@ -363,17 +380,19 @@ public class UIManager : MonoBehaviour
             {
                 cursor = Resources.Load<Texture2D>("Images/PointerButtonHover");
             }
-            UIManager.AddEvent(gameObject, EventTriggerType.PointerEnter, (e)=>{
+            UIManager.AddEvent(gameObject, EventTriggerType.PointerEnter, (e) =>
-                if (!gameObject.activeInHierarchy) return;
+            {
+                //if (!gameObject.activeInHierarchy) return;
                 Cursor.SetCursor(cursor, Vector2.zero, CursorMode.Auto);
             });
-            UIManager.AddEvent(gameObject, EventTriggerType.PointerUp, (e) => {
+            UIManager.AddEvent(gameObject, EventTriggerType.PointerUp, (e) =>
-                if (!gameObject.activeInHierarchy) return;
+            {
+                //if (!gameObject.activeInHierarchy) return;
                 Cursor.SetCursor(null, Vector2.zero, CursorMode.Auto);
             });
-            UIManager.AddEvent(gameObject, EventTriggerType.PointerExit, (e) => {
+            UIManager.AddEvent(gameObject, EventTriggerType.PointerExit, (e) =>
-                if (!gameObject.activeInHierarchy) return;
+            {
-                
+                //if (!gameObject.activeInHierarchy) return;
                 Cursor.SetCursor(null, Vector2.zero, CursorMode.Auto);
             });
         }
@@ -422,6 +441,26 @@ public class UIManager : MonoBehaviour
         }
     }
 
+    Confirm confirm = null;
+    public static void ShowConfirm(string title, string content, UnityAction action)
+    {
+        if (UIManager.Instance == null)
+        {
+            return;
+        }
+        if(UIManager.Instance.confirm == null)
+        {
+            UIManager.Instance.confirm = UIManager.Instance.GetInstance<Confirm>("Confirm", ref UIManager.Instance.confirm);            
+            UIManager.Show(UIManager.Instance.confirm, null, true);
+            UIManager.Instance.confirm.Set(title, content, action);
+        }
+        else
+        {            
+            UIManager.Instance.confirm.Show();
+            UIManager.Instance.confirm.Set(title, content, action);
+        }
+    }
+
     public LoginRegOptions loginRegOptions { get; private set; }
     private List<QUserInfo> _userInfos;
     public List<QUserInfo> userInfos
@@ -437,6 +476,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;
         }
+
     }
 }