修改细节

2021-04-27 18:26:30 +08:00 · 2021-04-27 18:26:30 +08:00 · 86a5b68317
commit 86a5b68317
parent 1002b0433a
39 changed files with 3489 additions and 2760 deletions
--- a/Assets/Cyp/Common.meta
+++ b/Assets/Cyp/Common.meta
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 70c79ab2ae1f7d74ba14708c3d4a2e6d
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Cyp/Common/Global.cs
+++ b/Assets/Cyp/Common/Global.cs
@ -1,19 +0,0 @@
-using Assets.Scripts.Apis;
-using Assets.Scripts.Apis.Models;
-using Newtonsoft.Json.Linq;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Assets.Cyp.Common
-{
-    public static class Global
-    {
-        public static UserResultModel CurrentUser { get; set; }
-        public static UserApi userApi = new UserApi();
-        public static MapApi mapApi = new MapApi();
-        public static MapInterruptRecordApi mapInterruptRecordApi = new MapInterruptRecordApi();
-    }
-}
--- a/Assets/Cyp/Common/Global.cs.meta
+++ b/Assets/Cyp/Common/Global.cs.meta
@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: f084ba73ccb087147bbf5c9d7201a06e
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Cyp/Common/Utils.cs
+++ b/Assets/Cyp/Common/Utils.cs
@ -1,60 +0,0 @@
-using Newtonsoft.Json;
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using UnityEngine;
-using UnityEngine.Networking;
-using UnityEngine.UI;
-
-namespace Assets.Cyp.Common
-{
-    public static class Utils
-    {
-        
-        /*显示简略提示，需要拖Toast的预制件，且保证其他组件名字不是Toast,ToastContainer*/
-        public static void showToast(GameObject game,string text,int duration = 1) 
-        {
-            var toast = Utils.FindUpParent(game.transform).Find("ToastContainer");
-            if (toast!=null) 
-            {
-                toast.GetComponent<Toast>().showToast(JsonConvert.SerializeObject(new
-                {
-                    text,
-                    duration
-                }));
-                //toast.SendMessage("showToast", );
-            }
-        }
-        /*显示简略提示，需要拖Toast的预制件，且保证其他组件名字不是Toast,ToastContainer*/
-
-        /*显示网络图片*/
-        public delegate Coroutine StartCoroutine(IEnumerator routine);
-        public static void DisplayImage(StartCoroutine startCoroutine,RawImage img, string url) 
-        {
-            startCoroutine(DownloadImage(img, url));
-        }
-        static IEnumerator DownloadImage(RawImage img,string MediaUrl)
-        {
-            UnityWebRequest request = UnityWebRequestTexture.GetTexture(MediaUrl);
-            yield return request.SendWebRequest();
-            if (request.isNetworkError || request.isHttpError)
-                Debug.Log(request.error);
-            else
-                img.texture = ((DownloadHandlerTexture)request.downloadHandler).texture;
-        }
-        /*显示网络图片*/
-
-        /*获取最顶层对象*/
-        public static Transform FindUpParent(Transform zi)
-        {
-            if (zi.parent == null)
-                return zi;
-            else
-                return FindUpParent(zi.parent);
-        }
-        /*获取最顶层对象*/
-    }
-}
--- a/Assets/Cyp/Common/Utils.cs.meta
+++ b/Assets/Cyp/Common/Utils.cs.meta
@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 5b26057ccd9f0954f8ffbddd5c7ca8a8
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Cyp/DemoScript.cs
+++ b/Assets/Cyp/DemoScript.cs
@ -1,24 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using UnityEngine.SceneManagement;
-using UnityEngine.UI;
-
-public class DemoScript : MonoBehaviour
-{
-    [SerializeField] Button button;
-    // Start is called before the first frame update
-    void Start()
-    {
-        button.onClick.AddListener(()=> 
-        {
-            SceneManager.UnloadSceneAsync("4-Demo");
-        });
-    }
-
-    // Update is called once per frame
-    void Update()
-    {
-        
-    }
-}
--- a/Assets/Cyp/DemoScript.cs.meta
+++ b/Assets/Cyp/DemoScript.cs.meta
@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 232bc1a830e1f7344887323f3b110026
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Cyp/ImageRotate.cs
+++ b/Assets/Cyp/ImageRotate.cs
@ -1,30 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using UnityEngine.UI;
-
-public class ImageRotate : MonoBehaviour
-{
-    float rotation = 360;
-    // Use this for initialization
-    void Start()
-    {
-        //Debug.Log ("Material used: "+animMat.name);
-    }
-
-    void Update()
-    {
-        Debug.Log(Time.deltaTime);
-        transform.Rotate(Vector3.back);
-        //if (Time.frameCount % 1 == 0) 
-        //{
-        //    float i = new System.Random().NextDouble() < .5 ? -0.5f : 2f;
-        //    transform.rotation = Quaternion.Euler(0, 0, rotation += (float)(i * new System.Random().NextDouble()));
-        //    if (rotation < 0)
-        //    {
-        //        rotation = 360;
-        //    }
-        //}
-
-    }
-}
--- a/Assets/Cyp/ImageRotate.cs.meta
+++ b/Assets/Cyp/ImageRotate.cs.meta
@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 219017a4cf0dd2d4b8118d5723644209
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Cyp/Main.cs
+++ b/Assets/Cyp/Main.cs
@ -1,68 +0,0 @@
-using Assets.Cyp.Common;
-using Newtonsoft.Json.Linq;
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using UnityEngine.Networking;
-using UnityEngine.SceneManagement;
-using UnityEngine.UI;
-
-public class Main : MonoBehaviour
-{
-    [SerializeField] Text NickName;
-    [SerializeField] Text TotalKM;
-    [SerializeField] RawImage Avatar;
-    [SerializeField] GameObject BtnRide;
-    // Start is called before the first frame update
-    void Start()
-    {
-        if (Global.CurrentUser != null)
-        {
-            SetCurrentUser();
-        }
-        GetSummary();
-        if (BtnRide != null) 
-        {
-            BtnRide.GetComponent<Button>().onClick.AddListener(GoRide);
-        }
-    }
-    void GoRide() 
-    {
-        SceneManager.LoadScene("3-MapList");
-        Utils.showToast(gameObject,"去骑行");
-    }
-    void SetCurrentUser() 
-    {
-        var user = Global.CurrentUser;
-        NickName.text = user.Nickname;
-        Utils.DisplayImage(StartCoroutine, Avatar, user.WxHeadImg);
-    }
-    void GetSummary() 
-    {
-        var res = Global.userApi.GetSummary();
-        if (res.result)
-        {
-            TotalKM.text = $"{res.data.TotalDistance.ToString("#0.00")}KM";
-        }
-        else 
-        {
-            Utils.showToast(gameObject, res.errMsg);
-        }
-        //var res = await NoAuthApi.GetCurrentUser();
-        //if (res.result)
-        //{
-        //    Global.CurrentUser = res.data;
-        //    SetCurrentUser();
-        //}
-        //else 
-        //{
-        //    Utils.showToast(gameObject, res.errMsg);
-        //}
-    }
-    // Update is called once per frame
-    void Update()
-    {
-        
-    }
-}
--- a/Assets/Cyp/Main.cs.meta
+++ b/Assets/Cyp/Main.cs.meta
@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: f568140fc83dae647a243568c6c096b9
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/NuGet.meta
+++ b/Assets/NuGet.meta
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 28846541fe6079246969686c44014e51
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Resources/Images/64-17.png
+++ b/Assets/Resources/Images/64-17.png
--- a/Assets/Resources/Images/64-17.png.meta
+++ b/Assets/Resources/Images/64-17.png.meta
@ -0,0 +1,116 @@
+fileFormatVersion: 2
+guid: 96bc99033bf6d1d49b8252599543005d
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: -1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 17, y: 17, z: 17, w: 17}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Resources/UI/Control/PfUIButton.prefab
+++ b/Assets/Resources/UI/Control/PfUIButton.prefab
@ -14,7 +14,6 @@ GameObject:
  - component: {fileID: 3475867170677891149}
  - component: {fileID: 1006258579742512774}
  - component: {fileID: 8304386005369837238}
-  - component: {fileID: 5144527249442959283}
  m_Layer: 5
  m_Name: Tooltips
  m_TagString: Untagged
@ -69,8 +68,8 @@ MonoBehaviour:
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_Sprite: {fileID: 0}
-  m_Type: 0
+  m_Sprite: {fileID: 21300000, guid: 96bc99033bf6d1d49b8252599543005d, type: 3}
+  m_Type: 1
  m_PreserveAspect: 0
  m_FillCenter: 1
  m_FillMethod: 4
@ -130,19 +129,6 @@ MonoBehaviour:
  m_ChildControlHeight: 0
  m_ChildScaleWidth: 0
  m_ChildScaleHeight: 0
--- !u!114 &5144527249442959283
-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: adb30198aa32dd140b5750692dd48104, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  radius: 17
 --- !u!1 &3150550772099312289
 GameObject:
  m_ObjectHideFlags: 0
--- a/Assets/Resources/UI/Prefab/MainNav.prefab
+++ b/Assets/Resources/UI/Prefab/MainNav.prefab
@ -145,6 +145,11 @@ PrefabInstance:
      propertyPath: m_SizeDelta.x
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 545917028276686471, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -58
+      objectReference: {fileID: 0}
    - target: {fileID: 1123028309966834811, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
        type: 3}
      propertyPath: m_Material
@ -274,22 +279,22 @@ PrefabInstance:
    - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
        type: 3}
      propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
        type: 3}
      propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
        type: 3}
      propertyPath: m_AnchoredPosition.x
-      value: 20
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
        type: 3}
      propertyPath: m_AnchoredPosition.y
-      value: -9
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 8688565590564084001, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
        type: 3}
@ -321,6 +326,11 @@ PrefabInstance:
      propertyPath: m_SizeDelta.x
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 545917028276686471, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -58
+      objectReference: {fileID: 0}
    - target: {fileID: 1123028309966834811, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
        type: 3}
      propertyPath: m_Material
@ -450,22 +460,22 @@ PrefabInstance:
    - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
        type: 3}
      propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
        type: 3}
      propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
        type: 3}
      propertyPath: m_AnchoredPosition.x
-      value: 20
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
        type: 3}
      propertyPath: m_AnchoredPosition.y
-      value: -9
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 8688565590564084001, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
        type: 3}
@ -497,6 +507,11 @@ PrefabInstance:
      propertyPath: m_SizeDelta.x
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 545917028276686471, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -58
+      objectReference: {fileID: 0}
    - target: {fileID: 1123028309966834811, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
        type: 3}
      propertyPath: m_Color.b
@ -651,12 +666,12 @@ PrefabInstance:
    - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
        type: 3}
      propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
        type: 3}
      propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
        type: 3}
@ -666,12 +681,12 @@ PrefabInstance:
    - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
        type: 3}
      propertyPath: m_AnchoredPosition.x
-      value: 20
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
        type: 3}
      propertyPath: m_AnchoredPosition.y
-      value: -2
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 8688565590564084001, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
        type: 3}
@ -703,6 +718,11 @@ PrefabInstance:
      propertyPath: m_SizeDelta.x
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 545917028276686471, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -58
+      objectReference: {fileID: 0}
    - target: {fileID: 1123028309966834811, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
        type: 3}
      propertyPath: m_Material
@ -832,22 +852,22 @@ PrefabInstance:
    - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
        type: 3}
      propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
        type: 3}
      propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
        type: 3}
      propertyPath: m_AnchoredPosition.x
-      value: 20
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
        type: 3}
      propertyPath: m_AnchoredPosition.y
-      value: -9
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 8688565590564084001, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
        type: 3}
@ -879,6 +899,11 @@ PrefabInstance:
      propertyPath: m_SizeDelta.x
      value: 40
      objectReference: {fileID: 0}
+    - target: {fileID: 545917028276686471, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -58
+      objectReference: {fileID: 0}
    - target: {fileID: 1123028309966834811, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
        type: 3}
      propertyPath: m_Material
--- a/Assets/Resources/UI/Prefab/Panel/BigMapPanel.prefab
+++ b/Assets/Resources/UI/Prefab/Panel/BigMapPanel.prefab
@ -1332,6 +1332,11 @@ PrefabInstance:
      propertyPath: m_SizeDelta.x
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 545917028276686471, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -58
+      objectReference: {fileID: 0}
    - target: {fileID: 1123028309966834811, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
        type: 3}
      propertyPath: m_Material
@ -1596,12 +1601,12 @@ PrefabInstance:
    - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e,
        type: 3}
      propertyPath: m_SizeDelta.x
-      value: 226
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e,
        type: 3}
      propertyPath: m_SizeDelta.y
-      value: 64
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e,
        type: 3}
--- a/Assets/Resources/UI/Prefab/Panel/EditUserPanel.prefab
+++ b/Assets/Resources/UI/Prefab/Panel/EditUserPanel.prefab
@ -208,6 +208,84 @@ RectTransform:
  m_AnchoredPosition: {x: 415, y: -40}
  m_SizeDelta: {x: 274, y: 73}
  m_Pivot: {x: 0, y: 1}
+--- !u!1 &821335241954842408
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2018388856339575706}
+  - component: {fileID: 3799652773543315128}
+  - component: {fileID: 7415062289742581368}
+  m_Layer: 5
+  m_Name: Unit
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2018388856339575706
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 821335241954842408}
+  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: 8698039833564966881}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 0.5}
+  m_AnchorMax: {x: 1, y: 0.5}
+  m_AnchoredPosition: {x: -20, y: 0}
+  m_SizeDelta: {x: 31, y: 20}
+  m_Pivot: {x: 1, y: 0.5}
+--- !u!222 &3799652773543315128
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 821335241954842408}
+  m_CullTransparentMesh: 0
+--- !u!114 &7415062289742581368
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 821335241954842408}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.36078432, g: 0.36078432, b: 0.43137258, 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: 14
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 5
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: MM
 --- !u!1 &956475305525563487
 GameObject:
  m_ObjectHideFlags: 0
@ -358,6 +436,7 @@ RectTransform:
  - {fileID: 6793074959398544408}
  - {fileID: 4499205945845230731}
  - {fileID: 1569894540830352816}
+  - {fileID: 381125011854744830}
  - {fileID: 6078028875546532601}
  - {fileID: 4691314474035008895}
  - {fileID: 4499205944832415859}
@ -382,6 +461,84 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 6d865b6d0ecb54044a4600bc590d8c29, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
+--- !u!1 &1273472110172321477
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5319161592036447294}
+  - component: {fileID: 6856005623792070645}
+  - component: {fileID: 760440415804788684}
+  m_Layer: 5
+  m_Name: Unit
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5319161592036447294
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1273472110172321477}
+  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: 8698039832891251293}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 0.5}
+  m_AnchorMax: {x: 1, y: 0.5}
+  m_AnchoredPosition: {x: -20, y: 0}
+  m_SizeDelta: {x: 31, y: 20}
+  m_Pivot: {x: 1, y: 0.5}
+--- !u!222 &6856005623792070645
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1273472110172321477}
+  m_CullTransparentMesh: 0
+--- !u!114 &760440415804788684
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1273472110172321477}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.36078432, g: 0.36078432, b: 0.43137258, 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: 14
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 5
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: KG
 --- !u!1 &1430963830256375805
 GameObject:
  m_ObjectHideFlags: 0
@ -1165,7 +1322,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  m_Material: {fileID: 0}
-  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_Color: {r: 0.36078432, g: 0.36078432, b: 0.43137255, a: 1}
  m_RaycastTarget: 1
  m_Maskable: 1
  m_OnCullStateChanged:
@ -1938,6 +2095,84 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  m_HorizontalFit: 2
  m_VerticalFit: 0
+--- !u!1 &3097023329138281688
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1728457861112749299}
+  - component: {fileID: 2913741589045964048}
+  - component: {fileID: 7811826741715651250}
+  m_Layer: 5
+  m_Name: Unit
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1728457861112749299
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3097023329138281688}
+  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: 8698039833552491262}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 0.5}
+  m_AnchorMax: {x: 1, y: 0.5}
+  m_AnchoredPosition: {x: -20, y: 0}
+  m_SizeDelta: {x: 31, y: 20}
+  m_Pivot: {x: 1, y: 0.5}
+--- !u!222 &2913741589045964048
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3097023329138281688}
+  m_CullTransparentMesh: 0
+--- !u!114 &7811826741715651250
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3097023329138281688}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.36078432, g: 0.36078432, b: 0.43137258, 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: 14
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 5
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: KG
 --- !u!1 &3421880255376027768
 GameObject:
  m_ObjectHideFlags: 0
@ -2373,7 +2608,7 @@ RectTransform:
  - {fileID: 4691314475355282599}
  - {fileID: 7867955887922114904}
  m_Father: {fileID: 956475306156679521}
-  m_RootOrder: 9
+  m_RootOrder: 10
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 1}
  m_AnchorMax: {x: 0, y: 1}
@ -2740,7 +2975,7 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 1}
  m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0, y: -50}
+  m_AnchoredPosition: {x: 0, y: -58}
  m_SizeDelta: {x: 0, y: 34}
  m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &5538971169794999911
@ -3814,7 +4049,7 @@ RectTransform:
  - {fileID: 6078028875826647841}
  - {fileID: 8679283750394117854}
  m_Father: {fileID: 956475306156679521}
-  m_RootOrder: 8
+  m_RootOrder: 9
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 1}
  m_AnchorMax: {x: 0, y: 1}
@ -4032,7 +4267,7 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 1}
  m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0, y: -50}
+  m_AnchoredPosition: {x: 0, y: -58}
  m_SizeDelta: {x: 0, y: 34}
  m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &6457592632356309473
@ -4136,6 +4371,84 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  radius: 17
+--- !u!1 &6282317594484996498
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3816434181731277215}
+  - component: {fileID: 6050184882012969629}
+  - component: {fileID: 5490119320765753047}
+  m_Layer: 5
+  m_Name: Unit
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3816434181731277215
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6282317594484996498}
+  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: 8698039831671925482}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 0.5}
+  m_AnchorMax: {x: 1, y: 0.5}
+  m_AnchoredPosition: {x: -20, y: 0}
+  m_SizeDelta: {x: 31, y: 20}
+  m_Pivot: {x: 1, y: 0.5}
+--- !u!222 &6050184882012969629
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6282317594484996498}
+  m_CullTransparentMesh: 0
+--- !u!114 &5490119320765753047
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6282317594484996498}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.36078432, g: 0.36078432, b: 0.43137258, 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: 14
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 5
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: BPM
 --- !u!1 &7762191863046212826
 GameObject:
  m_ObjectHideFlags: 0
@ -4221,6 +4534,172 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  radius: 70
+--- !u!1 &8123422662560869943
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 381125011854744830}
+  - component: {fileID: 4845237385284378173}
+  - component: {fileID: 5149655297030004105}
+  - component: {fileID: 5282762711194151699}
+  m_Layer: 5
+  m_Name: LTPanel
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &381125011854744830
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8123422662560869943}
+  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: 956475306156679521}
+  m_RootOrder: 8
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 60, y: -30}
+  m_SizeDelta: {x: 118, y: 64}
+  m_Pivot: {x: 0, y: 1}
+--- !u!222 &4845237385284378173
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8123422662560869943}
+  m_CullTransparentMesh: 0
+--- !u!114 &5149655297030004105
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8123422662560869943}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.13725491, g: 0.13725491, b: 0.1764706, a: 0.8}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 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 &5282762711194151699
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8123422662560869943}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  radius: 32
+--- !u!1 &8211716632784190946
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 993703589525712116}
+  - component: {fileID: 547430139547077235}
+  - component: {fileID: 6980507802082684031}
+  m_Layer: 5
+  m_Name: Unit
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &993703589525712116
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8211716632784190946}
+  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: 8698039832972322733}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 0.5}
+  m_AnchorMax: {x: 1, y: 0.5}
+  m_AnchoredPosition: {x: -20, y: 0}
+  m_SizeDelta: {x: 31, y: 20}
+  m_Pivot: {x: 1, y: 0.5}
+--- !u!222 &547430139547077235
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8211716632784190946}
+  m_CullTransparentMesh: 0
+--- !u!114 &6980507802082684031
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8211716632784190946}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.36078432, g: 0.36078432, b: 0.43137258, 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: 14
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 5
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: CM
 --- !u!1 &8227621284685144316
 GameObject:
  m_ObjectHideFlags: 0
@ -4329,7 +4808,7 @@ PrefabInstance:
    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
        type: 3}
      propertyPath: m_RootOrder
-      value: 10
+      value: 11
      objectReference: {fileID: 0}
    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
        type: 3}
@ -4494,7 +4973,7 @@ PrefabInstance:
    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
        type: 3}
      propertyPath: m_RootOrder
-      value: 11
+      value: 12
      objectReference: {fileID: 0}
    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
        type: 3}
@ -6909,7 +7388,7 @@ PrefabInstance:
    - target: {fileID: 3150550772916003707, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
        type: 3}
      propertyPath: m_Text
-      value: DEFINE
+      value: EDIT
      objectReference: {fileID: 0}
    - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
        type: 3}
@ -7091,6 +7570,11 @@ PrefabInstance:
      propertyPath: m_Name
      value: UnitDropdown
      objectReference: {fileID: 0}
+    - target: {fileID: 2531553338690931336, guid: 5ee52e0b78bd38244a2b473e2236800c,
+        type: 3}
+      propertyPath: m_Interactable
+      value: 0
+      objectReference: {fileID: 0}
    - target: {fileID: 6258245508770672658, guid: 5ee52e0b78bd38244a2b473e2236800c,
        type: 3}
      propertyPath: m_Pivot.x
--- a/Assets/Resources/UI/Prefab/Panel/MapListPanel.prefab
+++ b/Assets/Resources/UI/Prefab/Panel/MapListPanel.prefab
@ -140,11 +140,11 @@ RectTransform:
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 3292737747453648276}
-  - {fileID: 6134162133417953293}
  - {fileID: 6653062728990783300}
  - {fileID: 1879042590406371758}
  - {fileID: 1264410277530038736}
  - {fileID: 2240393815621593325}
+  - {fileID: 6134162133417953293}
  m_Father: {fileID: 0}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -914,7 +914,7 @@ RectTransform:
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 465239219729653177}
-  m_RootOrder: 5
+  m_RootOrder: 4
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 1}
  m_AnchorMax: {x: 0, y: 1}
@ -2651,7 +2651,7 @@ RectTransform:
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 465239219729653177}
-  m_RootOrder: 4
+  m_RootOrder: 3
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 1}
  m_AnchorMax: {x: 0, y: 1}
@ -3969,7 +3969,7 @@ RectTransform:
  - {fileID: 1429559311419137021}
  - {fileID: 1856582807434622599}
  m_Father: {fileID: 465239219729653177}
-  m_RootOrder: 2
+  m_RootOrder: 1
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 1}
  m_AnchorMax: {x: 0.5, y: 1}
@ -4209,7 +4209,7 @@ RectTransform:
  m_Children:
  - {fileID: 3950243154990735955}
  m_Father: {fileID: 465239219729653177}
-  m_RootOrder: 3
+  m_RootOrder: 2
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 1}
  m_AnchorMax: {x: 0, y: 1}
@ -4375,6 +4375,11 @@ PrefabInstance:
      propertyPath: m_SizeDelta.x
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 545917028276686471, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -58
+      objectReference: {fileID: 0}
    - target: {fileID: 1123028309966834811, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
        type: 3}
      propertyPath: m_Material
@ -4683,6 +4688,12 @@ PrefabInstance:
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3}
+--- !u!1 &8149286171844735752 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 4089475371085219485, guid: 5ee52e0b78bd38244a2b473e2236800c,
+    type: 3}
+  m_PrefabInstance: {fileID: 5321188461237024149}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &5464789140640568869 stripped
 GameObject:
  m_CorrespondingSourceObject: {fileID: 148192672769352624, guid: 5ee52e0b78bd38244a2b473e2236800c,
@ -4707,18 +4718,18 @@ GameObject:
    type: 3}
  m_PrefabInstance: {fileID: 5321188461237024149}
  m_PrefabAsset: {fileID: 0}
--- !u!1 &5779092891361109961 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 1867831574853112412, guid: 5ee52e0b78bd38244a2b473e2236800c,
-    type: 3}
-  m_PrefabInstance: {fileID: 5321188461237024149}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &3075247155673026290 stripped
 GameObject:
  m_CorrespondingSourceObject: {fileID: 7166863393051868007, guid: 5ee52e0b78bd38244a2b473e2236800c,
    type: 3}
  m_PrefabInstance: {fileID: 5321188461237024149}
  m_PrefabAsset: {fileID: 0}
+--- !u!1 &5779092891361109961 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 1867831574853112412, guid: 5ee52e0b78bd38244a2b473e2236800c,
+    type: 3}
+  m_PrefabInstance: {fileID: 5321188461237024149}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &6398833330297696636 stripped
 GameObject:
  m_CorrespondingSourceObject: {fileID: 1231050277644289257, guid: 5ee52e0b78bd38244a2b473e2236800c,
@ -4731,12 +4742,6 @@ GameObject:
    type: 3}
  m_PrefabInstance: {fileID: 5321188461237024149}
  m_PrefabAsset: {fileID: 0}
--- !u!1 &8149286171844735752 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 4089475371085219485, guid: 5ee52e0b78bd38244a2b473e2236800c,
-    type: 3}
-  m_PrefabInstance: {fileID: 5321188461237024149}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &6073211655158443556
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -4882,15 +4887,21 @@ GameObject:
    type: 3}
  m_PrefabInstance: {fileID: 6073211655158443556}
  m_PrefabAsset: {fileID: 0}
+--- !u!1 &5594525415673429112 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 1867831574853112412, guid: 5ee52e0b78bd38244a2b473e2236800c,
+    type: 3}
+  m_PrefabInstance: {fileID: 6073211655158443556}
+  m_PrefabAsset: {fileID: 0}
 --- !u!224 &185106026378206774 stripped
 RectTransform:
  m_CorrespondingSourceObject: {fileID: 6258245508770672658, guid: 5ee52e0b78bd38244a2b473e2236800c,
    type: 3}
  m_PrefabInstance: {fileID: 6073211655158443556}
  m_PrefabAsset: {fileID: 0}
--- !u!1 &6216688916544654740 stripped
+--- !u!1 &4998415483215112909 stripped
 GameObject:
-  m_CorrespondingSourceObject: {fileID: 148192672769352624, guid: 5ee52e0b78bd38244a2b473e2236800c,
+  m_CorrespondingSourceObject: {fileID: 1231050277644289257, guid: 5ee52e0b78bd38244a2b473e2236800c,
    type: 3}
  m_PrefabInstance: {fileID: 6073211655158443556}
  m_PrefabAsset: {fileID: 0}
@ -4912,24 +4923,18 @@ GameObject:
    type: 3}
  m_PrefabInstance: {fileID: 6073211655158443556}
  m_PrefabAsset: {fileID: 0}
--- !u!1 &5594525415673429112 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 1867831574853112412, guid: 5ee52e0b78bd38244a2b473e2236800c,
-    type: 3}
-  m_PrefabInstance: {fileID: 6073211655158443556}
-  m_PrefabAsset: {fileID: 0}
--- !u!1 &4998415483215112909 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 1231050277644289257, guid: 5ee52e0b78bd38244a2b473e2236800c,
-    type: 3}
-  m_PrefabInstance: {fileID: 6073211655158443556}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &3745822250017908288 stripped
 GameObject:
  m_CorrespondingSourceObject: {fileID: 7472514873862735972, guid: 5ee52e0b78bd38244a2b473e2236800c,
    type: 3}
  m_PrefabInstance: {fileID: 6073211655158443556}
  m_PrefabAsset: {fileID: 0}
+--- !u!1 &6216688916544654740 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 148192672769352624, guid: 5ee52e0b78bd38244a2b473e2236800c,
+    type: 3}
+  m_PrefabInstance: {fileID: 6073211655158443556}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &6653062728498872177
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -5049,18 +5054,18 @@ PrefabInstance:
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 07e45aecba1a2d542b043157aa2e9322, type: 3}
--- !u!224 &7944455583227005010 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 3608523562535466787, guid: 07e45aecba1a2d542b043157aa2e9322,
-    type: 3}
-  m_PrefabInstance: {fileID: 6653062728498872177}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &6709540780725584165 stripped
 GameObject:
  m_CorrespondingSourceObject: {fileID: 92744388873403988, guid: 07e45aecba1a2d542b043157aa2e9322,
    type: 3}
  m_PrefabInstance: {fileID: 6653062728498872177}
  m_PrefabAsset: {fileID: 0}
+--- !u!224 &7944455583227005010 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 3608523562535466787, guid: 07e45aecba1a2d542b043157aa2e9322,
+    type: 3}
+  m_PrefabInstance: {fileID: 6653062728498872177}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &4976321847170018841 stripped
 GameObject:
  m_CorrespondingSourceObject: {fileID: 1827088261433348456, guid: 07e45aecba1a2d542b043157aa2e9322,
@ -5094,6 +5099,46 @@ PrefabInstance:
      propertyPath: m_AnchoredPosition.y
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 1409429025663639838, guid: a1999d0576fee6248a9c5a507ae8d10e,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1409429025663639838, guid: a1999d0576fee6248a9c5a507ae8d10e,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1409429025663639838, guid: a1999d0576fee6248a9c5a507ae8d10e,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1409429025663639838, guid: a1999d0576fee6248a9c5a507ae8d10e,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1450106334936664745, guid: a1999d0576fee6248a9c5a507ae8d10e,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1450106334936664745, guid: a1999d0576fee6248a9c5a507ae8d10e,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1450106334936664745, guid: a1999d0576fee6248a9c5a507ae8d10e,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1450106334936664745, guid: a1999d0576fee6248a9c5a507ae8d10e,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
    - target: {fileID: 1617869899094122649, guid: a1999d0576fee6248a9c5a507ae8d10e,
        type: 3}
      propertyPath: m_SizeDelta.x
@ -5142,7 +5187,7 @@ PrefabInstance:
    - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e,
        type: 3}
      propertyPath: m_RootOrder
-      value: 1
+      value: 5
      objectReference: {fileID: 0}
    - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e,
        type: 3}
@ -5167,12 +5212,12 @@ PrefabInstance:
    - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e,
        type: 3}
      propertyPath: m_SizeDelta.x
-      value: 226
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e,
        type: 3}
      propertyPath: m_SizeDelta.y
-      value: 64
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e,
        type: 3}
@ -5249,6 +5294,26 @@ PrefabInstance:
      propertyPath: m_SizeDelta.x
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 4204578097682859198, guid: a1999d0576fee6248a9c5a507ae8d10e,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4204578097682859198, guid: a1999d0576fee6248a9c5a507ae8d10e,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4204578097682859198, guid: a1999d0576fee6248a9c5a507ae8d10e,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4204578097682859198, guid: a1999d0576fee6248a9c5a507ae8d10e,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
    - target: {fileID: 4586126367539938617, guid: a1999d0576fee6248a9c5a507ae8d10e,
        type: 3}
      propertyPath: m_SizeDelta.x
@ -5334,6 +5399,26 @@ PrefabInstance:
      propertyPath: m_AnchoredPosition.y
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 9135822971364406318, guid: a1999d0576fee6248a9c5a507ae8d10e,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9135822971364406318, guid: a1999d0576fee6248a9c5a507ae8d10e,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9135822971364406318, guid: a1999d0576fee6248a9c5a507ae8d10e,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9135822971364406318, guid: a1999d0576fee6248a9c5a507ae8d10e,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3}
 --- !u!224 &6134162133417953293 stripped
--- a/Assets/Resources/UI/Prefab/Panel/UserInfoPanel.prefab
+++ b/Assets/Resources/UI/Prefab/Panel/UserInfoPanel.prefab
@ -386,7 +386,7 @@ RectTransform:
  - {fileID: 1879534887716360359}
  - {fileID: 3908859068725394776}
  m_Father: {fileID: 5404217439901075764}
-  m_RootOrder: 1
+  m_RootOrder: 2
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 1}
  m_AnchorMax: {x: 0, y: 1}
@ -526,7 +526,7 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 1}
  m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0, y: -50}
+  m_AnchoredPosition: {x: 0, y: -58}
  m_SizeDelta: {x: 0, y: 34}
  m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &1716423704532503143
@ -909,6 +909,94 @@ MonoBehaviour:
    m_VerticalOverflow: 0
    m_LineSpacing: 1
  m_Text: times
+--- !u!1 &3201984282376345136
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4876487271982587869}
+  - component: {fileID: 2260727799122030265}
+  - component: {fileID: 4402049335017691716}
+  - component: {fileID: 8230274760154259895}
+  m_Layer: 5
+  m_Name: LTPanel
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4876487271982587869
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3201984282376345136}
+  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: 5404217439901075764}
+  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: 60, y: -30}
+  m_SizeDelta: {x: 118, y: 64}
+  m_Pivot: {x: 0, y: 1}
+--- !u!222 &2260727799122030265
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3201984282376345136}
+  m_CullTransparentMesh: 0
+--- !u!114 &4402049335017691716
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3201984282376345136}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.13725491, g: 0.13725491, b: 0.1764706, a: 0.8}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 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 &8230274760154259895
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3201984282376345136}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  radius: 32
 --- !u!1 &3384042931061406690
 GameObject:
  m_ObjectHideFlags: 0
@ -971,7 +1059,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  m_Material: {fileID: 0}
-  m_Color: {r: 0.20784314, g: 0.20784314, b: 0.2627451, a: 1}
+  m_Color: {r: 0.13725491, g: 0.13725491, b: 0.1764706, a: 0.6509804}
  m_RaycastTarget: 1
  m_Maskable: 1
  m_OnCullStateChanged:
@ -1062,7 +1150,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  m_Material: {fileID: 0}
-  m_Color: {r: 0.20784314, g: 0.20784314, b: 0.2627451, a: 1}
+  m_Color: {r: 0.13725491, g: 0.13725491, b: 0.1764706, a: 0.6509804}
  m_RaycastTarget: 1
  m_Maskable: 1
  m_OnCullStateChanged:
@ -1558,7 +1646,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  m_Material: {fileID: 0}
-  m_Color: {r: 0.20784314, g: 0.20784314, b: 0.2627451, a: 1}
+  m_Color: {r: 0.13725491, g: 0.13725491, b: 0.1764706, a: 0.6509804}
  m_RaycastTarget: 1
  m_Maskable: 1
  m_OnCullStateChanged:
@ -1649,7 +1737,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  m_Material: {fileID: 0}
-  m_Color: {r: 0.20784314, g: 0.20784314, b: 0.2627451, a: 1}
+  m_Color: {r: 0.13725491, g: 0.13725491, b: 0.1764706, a: 0.6509804}
  m_RaycastTarget: 1
  m_Maskable: 1
  m_OnCullStateChanged:
@ -1678,6 +1766,80 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  radius: 30
+--- !u!1 &4942029506225374654
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4945080816380747117}
+  - component: {fileID: 1002548830126738735}
+  - component: {fileID: 3346485444472629278}
+  m_Layer: 5
+  m_Name: SexIcon
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4945080816380747117
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4942029506225374654}
+  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: 6411762837200755527}
+  m_RootOrder: 14
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 91, y: -171}
+  m_SizeDelta: {x: 24, y: 24}
+  m_Pivot: {x: 0, y: 1}
+--- !u!222 &1002548830126738735
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4942029506225374654}
+  m_CullTransparentMesh: 0
+--- !u!114 &3346485444472629278
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4942029506225374654}
+  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: 2a3c5c12765c1da43901afbec2c179f2, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &5049100858162210264
 GameObject:
  m_ObjectHideFlags: 0
@ -2153,6 +2315,7 @@ RectTransform:
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 6411762837200755527}
+  - {fileID: 4876487271982587869}
  - {fileID: 1879534888550127999}
  - {fileID: 8802067605570913056}
  m_Father: {fileID: 5404217438093112801}
@ -2785,6 +2948,7 @@ RectTransform:
  - {fileID: 6411762837444288610}
  - {fileID: 6411762837061016328}
  - {fileID: 6411762836543330313}
+  - {fileID: 4945080816380747117}
  m_Father: {fileID: 5404217439901075764}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -4709,7 +4873,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  m_Material: {fileID: 0}
-  m_Color: {r: 0.20784314, g: 0.20784314, b: 0.2627451, a: 1}
+  m_Color: {r: 0.13725491, g: 0.13725491, b: 0.1764706, a: 0.6509804}
  m_RaycastTarget: 1
  m_Maskable: 1
  m_OnCullStateChanged:
@ -4772,7 +4936,7 @@ RectTransform:
  - {fileID: 8802067606874180344}
  - {fileID: 6200687317142480647}
  m_Father: {fileID: 5404217439901075764}
-  m_RootOrder: 2
+  m_RootOrder: 3
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 1}
  m_AnchorMax: {x: 0, y: 1}
@ -4990,7 +5154,7 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 1}
  m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0, y: -50}
+  m_AnchoredPosition: {x: 0, y: -58}
  m_SizeDelta: {x: 0, y: 34}
  m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &8638955888985804856
--- a/Assets/Resources/UI/Prefab/ResultList/RideResultList.prefab
+++ b/Assets/Resources/UI/Prefab/ResultList/RideResultList.prefab
@ -497,7 +497,7 @@ MonoBehaviour:
    m_HorizontalOverflow: 0
    m_VerticalOverflow: 0
    m_LineSpacing: 1
-  m_Text: "You haven\u2019t get a match yet"
+  m_Text: Found Nothing
 --- !u!1 &7007734862324335738
 GameObject:
  m_ObjectHideFlags: 0
--- a/Assets/Resources/UI/Prefab/ResultList/RideResultList.prefab.meta
+++ b/Assets/Resources/UI/Prefab/ResultList/RideResultList.prefab.meta
--- a/Assets/Resources/UI/Prefab/ToastContainer.prefab
+++ b/Assets/Resources/UI/Prefab/ToastContainer.prefab
@ -15,7 +15,7 @@ GameObject:
  - component: {fileID: 112077214919202944}
  - component: {fileID: 1578934454411558168}
  - component: {fileID: 8153319542030502509}
-  - component: {fileID: 2290594246778007045}
+  - component: {fileID: 3688729358500726461}
  m_Layer: 5
  m_Name: ToastContainer
  m_TagString: Untagged
@ -42,7 +42,7 @@ RectTransform:
  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: 227, y: 0}
+  m_SizeDelta: {x: 0, y: 48}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1964787418795620593
 CanvasRenderer:
@ -132,9 +132,9 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  m_HorizontalFit: 0
-  m_VerticalFit: 2
--- !u!114 &2290594246778007045
+  m_HorizontalFit: 2
+  m_VerticalFit: 0
+--- !u!114 &3688729358500726461
 MonoBehaviour:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
@ -148,16 +148,16 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  m_Padding:
    m_Left: 20
-    m_Right: 0
+    m_Right: 20
    m_Top: 12
    m_Bottom: 12
-  m_ChildAlignment: 3
-  m_Spacing: 20
+  m_ChildAlignment: 4
+  m_Spacing: 10
  m_ChildForceExpandWidth: 1
  m_ChildForceExpandHeight: 1
  m_ChildControlWidth: 0
  m_ChildControlHeight: 0
-  m_ChildScaleWidth: 0
+  m_ChildScaleWidth: 1
  m_ChildScaleHeight: 0
 --- !u!1 &3711362548065282552
 GameObject:
@ -169,8 +169,8 @@ GameObject:
  m_Component:
  - component: {fileID: 5008244665294165580}
  - component: {fileID: 5181308658082223272}
-  - component: {fileID: 7408275987611877051}
-  - component: {fileID: 3212646786526738585}
+  - component: {fileID: 5789125156700906347}
+  - component: {fileID: 8568980804807182099}
  m_Layer: 5
  m_Name: Container
  m_TagString: Untagged
@ -195,8 +195,8 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 74, y: 0}
-  m_SizeDelta: {x: 143, y: 0}
+  m_AnchoredPosition: {x: 54, y: 0}
+  m_SizeDelta: {x: 0, y: 19}
  m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &5181308658082223272
 CanvasRenderer:
@ -206,7 +206,7 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 3711362548065282552}
  m_CullTransparentMesh: 0
--- !u!114 &7408275987611877051
+--- !u!114 &5789125156700906347
 MonoBehaviour:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
@ -215,7 +215,21 @@ MonoBehaviour:
  m_GameObject: {fileID: 3711362548065282552}
  m_Enabled: 1
  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 0
+--- !u!114 &8568980804807182099
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3711362548065282552}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
  m_Padding:
@ -228,23 +242,9 @@ MonoBehaviour:
  m_ChildForceExpandWidth: 1
  m_ChildForceExpandHeight: 1
  m_ChildControlWidth: 1
-  m_ChildControlHeight: 1
+  m_ChildControlHeight: 0
  m_ChildScaleWidth: 0
  m_ChildScaleHeight: 0
--- !u!114 &3212646786526738585
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3711362548065282552}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_HorizontalFit: 0
-  m_VerticalFit: 2
 --- !u!1 &5551920471330652729
 GameObject:
  m_ObjectHideFlags: 0
@ -355,7 +355,7 @@ RectTransform:
  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 0, y: 0}
  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 143, y: 0}
+  m_SizeDelta: {x: 0, y: 19}
  m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &3132621560751603177
 CanvasRenderer:
@ -410,5 +410,5 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  m_HorizontalFit: 0
-  m_VerticalFit: 2
+  m_HorizontalFit: 2
+  m_VerticalFit: 0
--- a/Assets/Scenes/1-Login.unity
+++ b/Assets/Scenes/1-Login.unity
--- a/Assets/Scenes/Ride/Scripts/NearByItemScript.cs
+++ b/Assets/Scenes/Ride/Scripts/NearByItemScript.cs
@ -1,5 +1,4 @@
-using Assets.Cyp.Common;
-using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
--- a/Assets/Scenes/Ride/Scripts/SelectPlayerItemScript.cs
+++ b/Assets/Scenes/Ride/Scripts/SelectPlayerItemScript.cs
@ -1,4 +1,4 @@
-using Assets.Cyp.Common;
+using Assets.Scripts;
 using System.Collections;
 using UnityEngine;
 using UnityEngine.Networking;
--- a/Assets/Scenes/Ride/Scripts/SingleUIManager.cs
+++ b/Assets/Scenes/Ride/Scripts/SingleUIManager.cs
@ -10,10 +10,10 @@ using System;
 using Assets.Scenes.Ride.Scripts.Model;
 using UnityEngine.SceneManagement;
 using System.Collections.Generic;
-using Assets.Cyp.Common;
 using System.Threading.Tasks;
 using UnityEngine.EventSystems;
 using ChartAndGraph;
+using Assets.Scripts;

 namespace Assets.Scenes.Ride.Scripts
 {
--- a/Assets/Scripts/Devices/Ant/AntConnector.cs
+++ b/Assets/Scripts/Devices/Ant/AntConnector.cs
@ -146,7 +146,7 @@ namespace Assets.Scripts.Devices.Ant
        private void Log(string str)
        {
            //System.IO.File.AppendAllText(@"D:\work\PowerFun\PowerFun-Unity\Build\log.txt", str+"\r\n");
-            Debug.LogError(str);
+            //Debug.LogError(str);
        }

        private void antDevice_serialError(ANT_Device sender, ANT_Device.serialErrorCode error, bool isCritical)
--- a/Assets/Scripts/Scenes/LoginController.cs
+++ b/Assets/Scripts/Scenes/LoginController.cs
@ -431,6 +431,7 @@ public class LoginController : MonoBehaviour
            { "Days",signForm.days},
        };
        avatar = Resources.Load<Texture>("Images/New Account");
+        transform.Find("Version").GetComponent<Text>().text = $"V{App.AppVersion}";
    }

    async void GetRotateImage()
--- a/Assets/Scripts/UI/Control/PFUIDropdown.cs
+++ b/Assets/Scripts/UI/Control/PFUIDropdown.cs
@ -72,11 +72,20 @@ namespace Assets.Scripts.UI.Control
                {
                    mOnValueChange(i);
                }
+                SetWhite(i);
                outline.enabled = false;
                
            });
+            SetWhite(this.GetComponent<Dropdown>().value);
            outline = transform.GetComponent<Outline>();
        }
+        public void SetWhite(int index) 
+        {
+            if (index != -1 && this.GetComponent<Dropdown>().interactable)
+            {
+                this.GetComponent<Dropdown>().captionText.color = Utils.HexToColorHtml("#ffffff");
+            }
+        }
        public void SetValidate() 
        {
            outline.enabled = true;
@ -136,7 +145,7 @@ namespace Assets.Scripts.UI.Control

        public void OnPointerClick(PointerEventData eventData)
        {
-            if (GetComponent<Dropdown>().value == -1) return;
+            if (GetComponent<Dropdown>().value == -1 || !GetComponent<Dropdown>().interactable) return;
            var x = transform.Find("Dropdown List").GetComponent<ScrollRect>().content;
            x.GetChild(SelectedIndex + 1).Find("Item Label").GetComponent<Text>().color = Utils.HexToColorHtml("#f93086");
        }
--- a/Assets/Scripts/UI/Control/PfUIButton.cs
+++ b/Assets/Scripts/UI/Control/PfUIButton.cs
@ -65,6 +65,7 @@ namespace Assets.Scripts.UI.Control
            if (!string.IsNullOrWhiteSpace(Tooltips))
            {
                //
+                //tooltips.GetComponent<RectTransform>().localPosition.
                tooltips.transform.Find("Text").GetComponent<Text>().text = Tooltips;
            }            
            tooltips.SetActive(false);
--- a/Assets/Scripts/UI/Prefab/Device/ConnectDeviceModal.cs
+++ b/Assets/Scripts/UI/Prefab/Device/ConnectDeviceModal.cs
@ -8,6 +8,7 @@ using UnityEngine.EventSystems;
 using UnityEngine.UI;
 using Assets.Scripts.Devices.Ant.Interfaces;
 using Assets.Scripts.UI.Control;
+using Assets.Scripts;

 public class ConnectDeviceModal : PFUIPanel
 {
@ -21,7 +22,17 @@ public class ConnectDeviceModal : PFUIPanel
        {
            Debug.Log(value);
            mSensorType = value;
-            Logo.sprite = Resources.Load<Sprite>("Images/Devices/Trainer_3");
+            var deviceInfoStr = Utils.deviceDict[value.ToString()];
+            if (deviceInfoStr != null) 
+            {
+                var deviceInfo = deviceInfoStr.Split('|');
+                if (deviceInfo.Length == 2) 
+                {
+                    Title.text = deviceInfo[0];
+                    Logo.sprite = Resources.Load<Sprite>(deviceInfo[1]);
+                }
+            }
+            
        }
    }
    private Image Logo;
@ -29,7 +40,7 @@ public class ConnectDeviceModal : PFUIPanel
    private VerticalLayoutGroup content;
    private PfUIButton connectBtn;
    private Dictionary<ushort, DeviceItem> deviceList;
-    private Text noDevice;
+    private Text noDevice,Title;
    private RectTransform searchIconRect;

    protected override void Awake()
@ -41,6 +52,7 @@ public class ConnectDeviceModal : PFUIPanel
        var container = this.transform.Find("GameObject");
        var closeBtn = container.Find("CloseBtn");
        Logo = container.Find("Logo").GetComponent<Image>();
+        Title = container.Find("Title").GetComponent<Text>();
        var panel = container.Find("Panel");
        content = panel.Find("Scroll View").Find("Viewport").Find("Content").GetComponent<VerticalLayoutGroup>();

--- a/Assets/Scripts/UI/Prefab/FeedbackController.cs
+++ b/Assets/Scripts/UI/Prefab/FeedbackController.cs
@ -70,7 +70,7 @@ public class FeedbackController : PFUIPanel
    {
        if (App.CurrentUser == null) return;
        main.Find("Email").Find("Value").Find("Text").GetComponent<Text>().text = App.CurrentUser.Phone;
-        main.Find("ID").Find("Value").Find("Text").GetComponent<Text>().text = App.CurrentUser.Id.ToString();
+        main.Find("ID").Find("Value").Find("Text").GetComponent<Text>().text = App.CurrentUser.Id.ToString("#000000");
        main.Find("Version").Find("Value").Find("Text").GetComponent<Text>().text = App.AppVersion;
        main.Find("Time").Find("Value").Find("Text").GetComponent<Text>().text = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
    }
--- a/Assets/Scripts/UI/Prefab/MapList/MapFilterOptions.cs
+++ b/Assets/Scripts/UI/Prefab/MapList/MapFilterOptions.cs
@ -40,7 +40,7 @@ namespace Assets.Scripts.UI.Prefab.MapList
            {"HC","750-99999" },
        };
        public static List<Dropdown.OptionData> sorts = new string[] {
-            "Distance","Name","Difficulty","Hot"//,"Times"
+            "Hot","Name","Distance","Difficulty"//,"Times"
        }.Select(x => new Dropdown.OptionData(x)).ToList();
        public static Dictionary<string, string> diffDisplayDict = new Dictionary<string, string>()
        {
--- a/Assets/Scripts/UI/Prefab/Panel/EditUserController.cs
+++ b/Assets/Scripts/UI/Prefab/Panel/EditUserController.cs
@ -205,7 +205,7 @@ public class EditUserController : PFUIPanel
            mMonthDropdown.SelectValue(birthday.Month.ToString());
            mDayDropdown.SelectValue(birthday.Day.ToString());
        }
-        mID.text = currentUser.Id.ToString();
+        mID.text = currentUser.Id.ToString("000000");
        mNickName.Text = currentUser.Nickname;
        mFTP.Text = currentUser.FTP.ToString();
        mWeight.Text = currentUser.Weight.ToString();
@ -324,7 +324,8 @@ public class EditUserController : PFUIPanel
                userinfos[i].NickName = user.Nickname;
                UIManager.Instance.userInfos = userinfos;
            }
-            UIManager.ShowAlert("Success");
+            Utils.showToast(gameObject, "Success", type: 1);
+            //UIManager.ShowAlert("Success");
        }
        LoadDataSync();
        //App.CurrentUser = user;
@ -346,11 +347,13 @@ public class EditUserController : PFUIPanel
                UIManager.Instance.userInfos = userinfos;
            }
            App.CurrentUser.WxHeadImg = img;
-            UIManager.ShowAlert("Success");
+            Utils.showToast(gameObject, "Success", type: 1);
+            //UIManager.ShowAlert();
        }
        else 
        {
-            UIManager.ShowAlert(r.errMsg);
+            Utils.showToast(gameObject, r.errMsg);
+            //UIManager.ShowAlert();
        }
    }
    void Cancel(BaseEventData e)
--- a/Assets/Scripts/UI/Prefab/Panel/MapListController.cs
+++ b/Assets/Scripts/UI/Prefab/Panel/MapListController.cs
@ -169,7 +169,7 @@ public class MapListController : PFUIPanel
        {
            var drop = sorts.GetComponent<Dropdown>();
            drop.options = MapFilterOptions.sorts;
-            drop.value = 3;
+            drop.value = 0;
            drop.onValueChanged.AddListener((int index)=> 
            {
                sort = drop.options[index].text;
--- a/Assets/Scripts/UI/Prefab/Panel/UserInfoController.cs
+++ b/Assets/Scripts/UI/Prefab/Panel/UserInfoController.cs
@ -84,7 +84,10 @@ public class UserInfoController : PFUIPanel
            infoPanel.Find("Weight").Find("Value").GetComponent<Text>().text = $"{user.Weight}KG";
            infoPanel.Find("BW").Find("Value").GetComponent<Text>().text = $"{user.BicycleWeight}KG";
            infoPanel.Find("WD").Find("Value").GetComponent<Text>().text = $"{user.WheelDiameter}MM";
-
+            if (user.Sex == 2)
+            {
+                infoPanel.Find("SexIcon").GetComponent<Image>().sprite = Resources.Load<Sprite>("Images/woman");
+            }
            summaryPanel.Find("Number").Find("Value").GetComponent<Text>().text = summary.Count.ToString();
            summaryPanel.Find("Time").Find("Value").GetComponent<Text>().text = summary.TotalTicks.ToString();
            summaryPanel.Find("KM").Find("Value").GetComponent<Text>().text = summary.TotalDistance.ToString();
--- a/Assets/Scripts/UI/Prefab/ResultList/RouteItem.cs
+++ b/Assets/Scripts/UI/Prefab/ResultList/RouteItem.cs
@ -36,7 +36,7 @@ public class RouteItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandle
        row2 = left.Find("Main").Find("Row2");
        Utils.DisplayImage(StartCoroutine, transform.Find("CoverImage").GetComponent<RawImage>(), result.RouteImage);
        left.Find("Main").Find("Name").GetComponent<Text>().text = result.RouteName;
-        left.Find("Main").Find("Time").GetComponent<Text>().text = result.CreateTime.ToString("yyyy-MM-dd HH-mm-ss");
+        left.Find("Main").Find("Time").GetComponent<Text>().text = result.CreateTime.ToString("yyyy-MM-dd HH:mm:ss");
        row1.Find("Time").GetComponent<Text>().text = $"<color={titleColor}>Riding time:</color>{result.TrainingTime}";
        row1.Find("Distance").GetComponent<Text>().text = $"<color={titleColor}>Mileage:</color>{result.EndDistance.ToString("#0.00")}KM";
        row1.Find("Times").GetComponent<Text>().text = $"<color={titleColor}>Times:</color>{result.Count}";
--- a/Assets/Scripts/Utils/Utils.cs
+++ b/Assets/Scripts/Utils/Utils.cs
@ -97,19 +97,43 @@ namespace Assets.Scripts
                _toastDict = value;
            }
        }
+        private static Dictionary<string, string> _deviceDict;
+        public static Dictionary<string, string> deviceDict 
+        {
+            get 
+            {
+                if (_deviceDict == null) 
+                {
+                    _deviceDict = new Dictionary<string, string>
+                    {
+                        {"Trainer","Smart Trainer|Images/Devices/Trainer_3" },
+                        {"Power","Power Meter|Images/Devices/Power_3" },
+                        {"Cadence","Cadence Sensor|Images/Devices/Cadence_3" },
+                        {"HeartRate","Heart Rate Monitor|Images/Devices/Heart Rate_3" },
+                        {"SpeedCadence","Speed Meter|Images/Devices/Speed_3" },
+                    };
+                }
+                return _deviceDict;
+            }
+            private set 
+            {
+                _deviceDict = value;
+            }
+        }
        public static void showToast(GameObject game,string text,int duration = 1,int type = 0) 
        {
            //type 0错误 1正确
            var parent = Utils.FindUpParent(game.transform);
            var toast = parent.Find("ToastContainer");
-            if (toast == null) 
+            if (toast != null) 
            {
-                var newToast = MonoBehaviour.Instantiate(Resources.Load<GameObject>("UI/Prefab/ToastContainer"));
-                newToast.name = "ToastContainer";
-                newToast.GetComponent<RectTransform>().position = new Vector3(Screen.width / 2, Screen.height / 2, 0);
-                newToast.transform.parent = parent;
-                toast = newToast.transform;
+                MonoBehaviour.DestroyImmediate(toast.gameObject);
            }
+            var newToast = MonoBehaviour.Instantiate(Resources.Load<GameObject>("UI/Prefab/ToastContainer"));
+            newToast.name = "ToastContainer";
+            newToast.GetComponent<RectTransform>().position = new Vector3(Screen.width / 2, Screen.height / 2, 0);
+            newToast.transform.parent = parent;
+            toast = newToast.transform;
            var toastStyle = toastDict[type].Split('|');
            toast.Find("Image").GetComponent<Image>().sprite = Resources.Load<Sprite>(toastStyle[0]);
            toast.GetComponent<Image>().color = HexToColorHtml(toastStyle[1]);