调整样式

.gitignore

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

Assets/Mapbox/Unity/Map/AbstractMap.cs

@@ -215,9 +215,19 @@ namespace Mapbox.Unity.Map
 			}
 		}
 
+		/// <summary>
+		/// 孙涛修改，增加最大缩放判断
+		/// </summary>
+		/// <param name="zoom"></param>
 		public void SetZoom(float zoom)
 		{
-			Options.locationOptions.zoom = zoom;
+			if (MaxZoom.HasValue)
+			{
+				Options.locationOptions.zoom = Mathf.Max(MaxZoom.Value, zoom);
+			}
+			else {
+				Options.locationOptions.zoom = zoom;
+			}
 		}
 
 		/// <summary>
@@ -1220,6 +1230,19 @@ namespace Mapbox.Unity.Map
 			_options.scalingOptions.HasChanged = true;
 		}
 
+		private float? _MaxZoom;
+		public float? MaxZoom
+        {
+            get
+            {
+				return _MaxZoom;
+            }
+            set
+            {
+				_MaxZoom = value;
+            }
+        }
+
 		#endregion
 
 		#region Events

Assets/Resources/Images/ANT+_2.png.meta

@@ -0,0 +1,104 @@
+fileFormatVersion: 2
+guid: 949827eb2b969cf428344bdc38c42fb2
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: -1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Images/Ride.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: c424b00c77060e24db3aa7985281b01e
+guid: e776371cfc6ebb14e85a103db9c67744
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Assets/Resources/Images/man.png.meta

@@ -0,0 +1,104 @@
+fileFormatVersion: 2
+guid: 2a3c5c12765c1da43901afbec2c179f2
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: -1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Sound.meta

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

Assets/Resources/UI/Control/PFUIText.prefab

@@ -13,7 +13,7 @@ GameObject:
   - component: {fileID: 2018962972499165246}
   - component: {fileID: 2018962972499165247}
   m_Layer: 5
-  m_Name: PfText
+  m_Name: PFUIText
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0

Assets/Resources/UI/Font.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 367a7d51917d3cc4199ac3c7a3fe8ecb
+guid: 2769b318daa55d848a184702774e2628
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Assets/Resources/UI/Font/GenSenMaruGothicTW-Bold.ttf.meta

@@ -0,0 +1,25 @@
+fileFormatVersion: 2
+guid: 1db9e217733971041be26b076fda6083
+TrueTypeFontImporter:
+  externalObjects: {}
+  serializedVersion: 4
+  fontSize: 16
+  forceTextureCase: -2
+  characterSpacing: 0
+  characterPadding: 1
+  includeFontData: 1
+  fontName: GenSenMaruGothic TW TTF
+  fontNames:
+  - GenSenMaruGothic TW TTF
+  fallbackFontReferences:
+  - {fileID: 12800000, guid: 8180b991008992c45b6bf1a979c7baca, type: 3}
+  - {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3}
+  - {fileID: 12800000, guid: dc2b8edfb87f74143913c268624f8711, type: 3}
+  customCharacters: 
+  fontRenderingMode: 0
+  ascentCalculationMode: 1
+  useLegacyBoundsCalculation: 0
+  shouldRoundAdvanceValue: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/UI/Font/GenSenMaruGothicTW-Heavy.ttf.meta

@@ -0,0 +1,24 @@
+fileFormatVersion: 2
+guid: 9428f2aab98e9c34d923a9174035a197
+TrueTypeFontImporter:
+  externalObjects: {}
+  serializedVersion: 4
+  fontSize: 16
+  forceTextureCase: -2
+  characterSpacing: 0
+  characterPadding: 1
+  includeFontData: 1
+  fontName: GenSenMaruGothic TW TTF
+  fontNames:
+  - GenSenMaruGothic TW TTF
+  fallbackFontReferences:
+  - {fileID: 12800000, guid: 4394d1802932d4741b987ebf2c16b64b, type: 3}
+  - {fileID: 12800000, guid: 8180b991008992c45b6bf1a979c7baca, type: 3}
+  customCharacters: 
+  fontRenderingMode: 0
+  ascentCalculationMode: 1
+  useLegacyBoundsCalculation: 0
+  shouldRoundAdvanceValue: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/UI/Font/GenSenMaruGothicTW-Medium.ttf.meta

@@ -0,0 +1,25 @@
+fileFormatVersion: 2
+guid: dc2b8edfb87f74143913c268624f8711
+TrueTypeFontImporter:
+  externalObjects: {}
+  serializedVersion: 4
+  fontSize: 16
+  forceTextureCase: -2
+  characterSpacing: 0
+  characterPadding: 1
+  includeFontData: 1
+  fontName: GenSenMaruGothic TW TTF
+  fontNames:
+  - GenSenMaruGothic TW TTF
+  fallbackFontReferences:
+  - {fileID: 12800000, guid: 4394d1802932d4741b987ebf2c16b64b, type: 3}
+  - {fileID: 12800000, guid: 8180b991008992c45b6bf1a979c7baca, type: 3}
+  - {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3}
+  customCharacters: 
+  fontRenderingMode: 0
+  ascentCalculationMode: 1
+  useLegacyBoundsCalculation: 0
+  shouldRoundAdvanceValue: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/UI/Font/GenSenMaruGothicTW-Regular.ttf.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: 8180b991008992c45b6bf1a979c7baca
+TrueTypeFontImporter:
+  externalObjects: {}
+  serializedVersion: 4
+  fontSize: 16
+  forceTextureCase: -2
+  characterSpacing: 0
+  characterPadding: 1
+  includeFontData: 1
+  fontName: GenSenMaruGothic TW TTF
+  fontNames:
+  - GenSenMaruGothic TW TTF
+  fallbackFontReferences:
+  - {fileID: 12800000, guid: 4394d1802932d4741b987ebf2c16b64b, type: 3}
+  customCharacters: 
+  fontRenderingMode: 0
+  ascentCalculationMode: 1
+  useLegacyBoundsCalculation: 0
+  shouldRoundAdvanceValue: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -1,5 +1,104 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &628269285932116249
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3375573268376707168}
+  - component: {fileID: 7696400418172266878}
+  - component: {fileID: 4897197053936486456}
+  - component: {fileID: 5064155270663215810}
+  m_Layer: 0
+  m_Name: Hot
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3375573268376707168
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 628269285932116249}
+  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: 8514581898389219816}
+  m_Father: {fileID: 1644731075966996399}
+  m_RootOrder: 5
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 182, y: -50}
+  m_SizeDelta: {x: 46, y: 17}
+  m_Pivot: {x: 0, y: 1}
+--- !u!222 &7696400418172266878
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 628269285932116249}
+  m_CullTransparentMesh: 0
+--- !u!114 &4897197053936486456
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 628269285932116249}
+  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: 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 &5064155270663215810
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 628269285932116249}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7245fe6cb36dc7b4e921e9ae44200f43, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Direction: 0
+  m_Color1: {r: 1, g: 0.45490196, b: 0.52156866, a: 1}
+  m_Color2: {r: 0.9764706, g: 0.1882353, b: 0.5254902, a: 1}
+  m_Color3: {r: 1, g: 1, b: 1, a: 1}
+  m_Color4: {r: 1, g: 1, b: 1, a: 1}
+  m_Rotation: 0
+  m_Offset1: 0
+  m_Offset2: 0
+  m_GradientStyle: 0
+  m_ColorSpace: -1
+  m_IgnoreAspectRatio: 1
 --- !u!1 &1006707989137105944
 GameObject:
   m_ObjectHideFlags: 0
@@ -12,7 +111,7 @@ GameObject:
   - component: {fileID: 5310671687985071753}
   - component: {fileID: 7900034461715759898}
   m_Layer: 5
-  m_Name: Image
+  m_Name: DistanceIcon
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -58,13 +157,13 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0.36078432, g: 0.36078432, b: 0.43137255, a: 1}
   m_RaycastTarget: 1
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 6a8817fc534bb6c4b9a0de57f35882fa, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 8adf51874688e8b48a396a83ccc7ad9d, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -105,11 +204,12 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
-  - {fileID: 1644731077207170621}
+  - {fileID: 8586563145068443211}
   - {fileID: 7789815627924313506}
   - {fileID: 592474734359368031}
   - {fileID: 7546774928026946670}
   - {fileID: 2525110298282261934}
+  - {fileID: 3375573268376707168}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -190,84 +290,6 @@ MonoBehaviour:
   m_GradientStyle: 0
   m_ColorSpace: -1
   m_IgnoreAspectRatio: 1
---- !u!1 &1644731077207170620
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1644731077207170621}
-  - component: {fileID: 1644731077207170611}
-  - component: {fileID: 1644731077207170610}
-  m_Layer: 5
-  m_Name: name
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &1644731077207170621
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1644731077207170620}
-  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: 1644731075966996399}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 12, y: -10}
-  m_SizeDelta: {x: -24, y: 34}
-  m_Pivot: {x: 0, y: 1}
---- !u!222 &1644731077207170611
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1644731077207170620}
-  m_CullTransparentMesh: 0
---- !u!114 &1644731077207170610
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1644731077207170620}
-  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: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 12
-    m_FontStyle: 1
-    m_BestFit: 0
-    m_MinSize: 1
-    m_MaxSize: 40
-    m_Alignment: 0
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: Name
 --- !u!1 &2605937531982105974
 GameObject:
   m_ObjectHideFlags: 0
@@ -333,7 +355,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, type: 3}
     m_FontSize: 12
     m_FontStyle: 0
     m_BestFit: 0
@@ -411,7 +433,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, type: 3}
     m_FontSize: 12
     m_FontStyle: 0
     m_BestFit: 0
@@ -436,7 +458,7 @@ GameObject:
   - component: {fileID: 8071121334430382672}
   - component: {fileID: 4161665701330225276}
   m_Layer: 5
-  m_Name: Image (1)
+  m_Name: BikeIcon
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -482,7 +504,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0.9764706, g: 0.1882353, b: 0.5254902, a: 1}
   m_RaycastTarget: 1
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -498,3 +520,325 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1001 &7650792506464872912
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 3375573268376707168}
+    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: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
+        type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 46
+      objectReference: {fileID: 0}
+    - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 16
+      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: -23
+      objectReference: {fileID: 0}
+    - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 8
+      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: PFUIText
+      objectReference: {fileID: 0}
+    - target: {fileID: 2018962972499165246, guid: d1deda2310a3a7241a8e0d559585b30d,
+        type: 3}
+      propertyPath: m_Text
+      value: HOT
+      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: 25a07681c3624944d93fef973de82719,
+        type: 3}
+    - target: {fileID: 2018962972499165246, guid: d1deda2310a3a7241a8e0d559585b30d,
+        type: 3}
+      propertyPath: m_FontData.m_MinSize
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2018962972499165246, guid: d1deda2310a3a7241a8e0d559585b30d,
+        type: 3}
+      propertyPath: m_FontData.m_FontSize
+      value: 12
+      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 &8514581898389219816 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
+    type: 3}
+  m_PrefabInstance: {fileID: 7650792506464872912}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &7722923011652269683
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 1644731075966996399}
+    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: -24
+      objectReference: {fileID: 0}
+    - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 34
+      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: 12
+      objectReference: {fileID: 0}
+    - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -10
+      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: name
+      objectReference: {fileID: 0}
+    - target: {fileID: 2018962972499165246, guid: d1deda2310a3a7241a8e0d559585b30d,
+        type: 3}
+      propertyPath: m_Text
+      value: Name
+      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: 25a07681c3624944d93fef973de82719,
+        type: 3}
+    - target: {fileID: 2018962972499165246, guid: d1deda2310a3a7241a8e0d559585b30d,
+        type: 3}
+      propertyPath: m_FontData.m_FontStyle
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: d1deda2310a3a7241a8e0d559585b30d, type: 3}
+--- !u!224 &8586563145068443211 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
+    type: 3}
+  m_PrefabInstance: {fileID: 7722923011652269683}
+  m_PrefabAsset: {fileID: 0}

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

@@ -213,14 +213,14 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, type: 3}
     m_FontSize: 14
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 10
     m_MaxSize: 40
-    m_Alignment: 3
+    m_Alignment: 6
-    m_AlignByGeometry: 0
+    m_AlignByGeometry: 1
     m_RichText: 1
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
@@ -291,7 +291,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, type: 3}
     m_FontSize: 14
     m_FontStyle: 0
     m_BestFit: 0
@@ -304,6 +304,77 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: 0%
+--- !u!1 &3911929221497280277
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5529212295301498890}
+  - component: {fileID: 7218183401790191712}
+  - component: {fileID: 7121275946044093878}
+  m_Layer: 5
+  m_Name: AltitudeGraph
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5529212295301498890
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3911929221497280277}
+  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_RootOrder: 15
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 20, y: -198}
+  m_SizeDelta: {x: 323, y: 34}
+  m_Pivot: {x: 0, y: 1}
+--- !u!222 &7218183401790191712
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3911929221497280277}
+  m_CullTransparentMesh: 0
+--- !u!114 &7121275946044093878
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3911929221497280277}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, 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_Texture: {fileID: 0}
+  m_UVRect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1
+    height: 1
 --- !u!1 &4286186333184849785
 GameObject:
   m_ObjectHideFlags: 0
@@ -369,7 +440,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, type: 3}
     m_FontSize: 14
     m_FontStyle: 0
     m_BestFit: 0
@@ -546,7 +617,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, type: 3}
     m_FontSize: 14
     m_FontStyle: 0
     m_BestFit: 0
@@ -698,7 +769,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, type: 3}
     m_FontSize: 12
     m_FontStyle: 0
     m_BestFit: 0
@@ -827,6 +898,7 @@ RectTransform:
   - {fileID: 8243496190560064870}
   - {fileID: 2722580046731890951}
   - {fileID: 8991763474801765394}
+  - {fileID: 5529212295301498890}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -949,7 +1021,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, type: 3}
     m_FontSize: 18
     m_FontStyle: 0
     m_BestFit: 0
@@ -1311,7 +1383,7 @@ PrefabInstance:
     - target: {fileID: 3150550772916003707, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
       propertyPath: m_FontData.m_FontStyle
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8688565590564084001, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
@@ -1451,7 +1523,7 @@ PrefabInstance:
     - target: {fileID: 3150550772916003707, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
       propertyPath: m_FontData.m_FontStyle
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3}

Assets/Resources/UI/Prefab/Device/ConnectDeviceModal.prefab

@@ -232,7 +232,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, type: 3}
     m_FontSize: 14
     m_FontStyle: 0
     m_BestFit: 0
@@ -384,9 +384,9 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: bd658c45bc0743949ae710339d462afd, type: 3}
     m_FontSize: 20
-    m_FontStyle: 1
+    m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 0
     m_MaxSize: 40

Assets/Resources/UI/Prefab/Device/DeviceItem.prefab

@@ -217,9 +217,9 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: bb4c2b248704c75488b5f24a63a5f370, type: 3}
     m_FontSize: 16
-    m_FontStyle: 1
+    m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 1
     m_MaxSize: 40

Assets/Resources/UI/Prefab/Device/DeviceView.prefab

@@ -240,7 +240,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, type: 3}
     m_FontSize: 14
     m_FontStyle: 0
     m_BestFit: 0
@@ -435,9 +435,9 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: bd658c45bc0743949ae710339d462afd, type: 3}
     m_FontSize: 20
-    m_FontStyle: 1
+    m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 2
     m_MaxSize: 40
@@ -513,9 +513,9 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: bd658c45bc0743949ae710339d462afd, type: 3}
     m_FontSize: 12
-    m_FontStyle: 1
+    m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 1
     m_MaxSize: 40
@@ -692,9 +692,9 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: bd658c45bc0743949ae710339d462afd, type: 3}
     m_FontSize: 32
-    m_FontStyle: 1
+    m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 3
     m_MaxSize: 48
@@ -770,7 +770,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, type: 3}
     m_FontSize: 14
     m_FontStyle: 0
     m_BestFit: 0
@@ -795,6 +795,17 @@ PrefabInstance:
       propertyPath: m_Text
       value: CHANGE
       objectReference: {fileID: 0}
+    - target: {fileID: 128304049968949179, guid: f9b4f89e2e3738c459fe1a4f852d6774,
+        type: 3}
+      propertyPath: m_FontData.m_Font
+      value: 
+      objectReference: {fileID: 12800000, guid: bd658c45bc0743949ae710339d462afd,
+        type: 3}
+    - target: {fileID: 128304049968949179, guid: f9b4f89e2e3738c459fe1a4f852d6774,
+        type: 3}
+      propertyPath: m_FontData.m_FontStyle
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 6055053651375121365, guid: f9b4f89e2e3738c459fe1a4f852d6774,
         type: 3}
       propertyPath: m_Color.b
@@ -940,6 +951,17 @@ PrefabInstance:
       propertyPath: m_Text
       value: SEARCH
       objectReference: {fileID: 0}
+    - target: {fileID: 128304049968949179, guid: f9b4f89e2e3738c459fe1a4f852d6774,
+        type: 3}
+      propertyPath: m_FontData.m_Font
+      value: 
+      objectReference: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719,
+        type: 3}
+    - target: {fileID: 128304049968949179, guid: f9b4f89e2e3738c459fe1a4f852d6774,
+        type: 3}
+      propertyPath: m_FontData.m_FontStyle
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 6238379916544863262, guid: f9b4f89e2e3738c459fe1a4f852d6774,
         type: 3}
       propertyPath: m_Name
@@ -1070,6 +1092,17 @@ PrefabInstance:
       propertyPath: m_Text
       value: PAIR
       objectReference: {fileID: 0}
+    - target: {fileID: 128304049968949179, guid: f9b4f89e2e3738c459fe1a4f852d6774,
+        type: 3}
+      propertyPath: m_FontData.m_Font
+      value: 
+      objectReference: {fileID: 12800000, guid: bd658c45bc0743949ae710339d462afd,
+        type: 3}
+    - target: {fileID: 128304049968949179, guid: f9b4f89e2e3738c459fe1a4f852d6774,
+        type: 3}
+      propertyPath: m_FontData.m_FontStyle
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 6055053651375121365, guid: f9b4f89e2e3738c459fe1a4f852d6774,
         type: 3}
       propertyPath: m_Color.b

Assets/Resources/UI/Prefab/Home/UserInfo.prefab

@@ -153,7 +153,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: bd658c45bc0743949ae710339d462afd, type: 3}
     m_FontSize: 24
     m_FontStyle: 0
     m_BestFit: 0
@@ -305,7 +305,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: 452cd41c1fcf96e4c8d8341a2f0ada65, type: 3}
     m_FontSize: 10
     m_FontStyle: 0
     m_BestFit: 0
@@ -383,7 +383,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, type: 3}
     m_FontSize: 14
     m_FontStyle: 0
     m_BestFit: 0
@@ -609,7 +609,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: bd658c45bc0743949ae710339d462afd, type: 3}
     m_FontSize: 24
     m_FontStyle: 0
     m_BestFit: 0
@@ -687,7 +687,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: 452cd41c1fcf96e4c8d8341a2f0ada65, type: 3}
     m_FontSize: 10
     m_FontStyle: 0
     m_BestFit: 0
@@ -812,7 +812,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: 452cd41c1fcf96e4c8d8341a2f0ada65, type: 3}
     m_FontSize: 10
     m_FontStyle: 0
     m_BestFit: 0
@@ -866,6 +866,8 @@ RectTransform:
   - {fileID: 4566599627557342350}
   - {fileID: 4566599628192613341}
   - {fileID: 4566599629016508004}
+  - {fileID: 7275502706204060242}
+  - {fileID: 3459981280928128198}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1043,7 +1045,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, type: 3}
     m_FontSize: 14
     m_FontStyle: 0
     m_BestFit: 0
@@ -1195,7 +1197,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: bd658c45bc0743949ae710339d462afd, type: 3}
     m_FontSize: 24
     m_FontStyle: 0
     m_BestFit: 0
@@ -1273,7 +1275,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: bd658c45bc0743949ae710339d462afd, type: 3}
     m_FontSize: 24
     m_FontStyle: 0
     m_BestFit: 0
@@ -1398,7 +1400,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, type: 3}
     m_FontSize: 14
     m_FontStyle: 0
     m_BestFit: 0
@@ -1598,7 +1600,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, type: 3}
     m_FontSize: 14
     m_FontStyle: 0
     m_BestFit: 0
@@ -1750,9 +1752,9 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: bd658c45bc0743949ae710339d462afd, type: 3}
     m_FontSize: 32
-    m_FontStyle: 0
+    m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 3
     m_MaxSize: 40
@@ -1762,7 +1764,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: 8462KCAL
+  m_Text: 0000KCAL
 --- !u!1 &4566599627981592891
 GameObject:
   m_ObjectHideFlags: 0
@@ -1902,9 +1904,9 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: bd658c45bc0743949ae710339d462afd, type: 3}
     m_FontSize: 32
-    m_FontStyle: 0
+    m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 3
     m_MaxSize: 40
@@ -1914,7 +1916,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: 91274KM
+  m_Text: 0000KM
 --- !u!1 &4566599628192613340
 GameObject:
   m_ObjectHideFlags: 0
@@ -2100,7 +2102,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, type: 3}
     m_FontSize: 14
     m_FontStyle: 0
     m_BestFit: 0
@@ -2178,7 +2180,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, type: 3}
     m_FontSize: 14
     m_FontStyle: 0
     m_BestFit: 0
@@ -2256,9 +2258,9 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: bd658c45bc0743949ae710339d462afd, type: 3}
     m_FontSize: 32
-    m_FontStyle: 0
+    m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 3
     m_MaxSize: 40
@@ -2268,7 +2270,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: 242M
+  m_Text: 000M
 --- !u!1 &4566599629016508011
 GameObject:
   m_ObjectHideFlags: 0
@@ -2315,6 +2317,80 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4566599629016508011}
   m_CullTransparentMesh: 0
+--- !u!1 &6527932267091740730
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3459981280928128198}
+  - component: {fileID: 5707476663510439821}
+  - component: {fileID: 2764351249887253553}
+  m_Layer: 5
+  m_Name: SexIcon
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3459981280928128198
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6527932267091740730}
+  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: 2589794478191162465}
+  m_RootOrder: 14
+  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: -68, y: 303}
+  m_SizeDelta: {x: 24, y: 24}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5707476663510439821
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6527932267091740730}
+  m_CullTransparentMesh: 0
+--- !u!114 &2764351249887253553
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6527932267091740730}
+  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!1001 &4515319442379514431
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -2442,6 +2518,11 @@ PrefabInstance:
       propertyPath: m_Text
       value: More
       objectReference: {fileID: 0}
+    - target: {fileID: 3150550772916003707, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_FontData.m_FontStyle
+      value: 1
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3}
 --- !u!224 &1517891333614586015 stripped
@@ -2450,3 +2531,159 @@ RectTransform:
     type: 3}
   m_PrefabInstance: {fileID: 4515319442379514431}
   m_PrefabAsset: {fileID: 0}
+--- !u!1001 &8715321839789107818
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 2589794478191162465}
+    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: 13
+      objectReference: {fileID: 0}
+    - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
+        type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
+        type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0.5
+      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: 19
+      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: -6.899994
+      objectReference: {fileID: 0}
+    - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 102.5
+      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: IDText
+      objectReference: {fileID: 0}
+    - target: {fileID: 2018962972499165246, guid: d1deda2310a3a7241a8e0d559585b30d,
+        type: 3}
+      propertyPath: m_Text
+      value: ID:000
+      objectReference: {fileID: 0}
+    - target: {fileID: 2018962972499165246, guid: d1deda2310a3a7241a8e0d559585b30d,
+        type: 3}
+      propertyPath: m_Color.b
+      value: 0.49019608
+      objectReference: {fileID: 0}
+    - target: {fileID: 2018962972499165246, guid: d1deda2310a3a7241a8e0d559585b30d,
+        type: 3}
+      propertyPath: m_Color.g
+      value: 0.43137255
+      objectReference: {fileID: 0}
+    - target: {fileID: 2018962972499165246, guid: d1deda2310a3a7241a8e0d559585b30d,
+        type: 3}
+      propertyPath: m_Color.r
+      value: 0.43137255
+      objectReference: {fileID: 0}
+    - target: {fileID: 2018962972499165246, guid: d1deda2310a3a7241a8e0d559585b30d,
+        type: 3}
+      propertyPath: m_FontData.m_Font
+      value: 
+      objectReference: {fileID: 12800000, guid: bb4c2b248704c75488b5f24a63a5f370,
+        type: 3}
+    - 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 &7275502706204060242 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
+    type: 3}
+  m_PrefabInstance: {fileID: 8715321839789107818}
+  m_PrefabAsset: {fileID: 0}

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

@@ -324,9 +324,9 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, type: 3}
     m_FontSize: 14
-    m_FontStyle: 2
+    m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 10
     m_MaxSize: 40
@@ -336,7 +336,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: Enter text...
+  m_Text: Search Road
 --- !u!1 &1438309948063184099
 GameObject:
   m_ObjectHideFlags: 0

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

@@ -1,83 +1,5 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
---- !u!1 &1721424399715677124
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 8540350976322887840}
-  - component: {fileID: 5933915444681685300}
-  - component: {fileID: 212711484308567273}
-  m_Layer: 5
-  m_Name: Text
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &8540350976322887840
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1721424399715677124}
-  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: 6682760290205143075}
-  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 &5933915444681685300
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1721424399715677124}
-  m_CullTransparentMesh: 0
---- !u!114 &212711484308567273
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1721424399715677124}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
-  m_RaycastTarget: 1
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 14
-    m_FontStyle: 0
-    m_BestFit: 0
-    m_MinSize: 10
-    m_MaxSize: 40
-    m_Alignment: 4
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: Return
 --- !u!1 &2085210787015337199
 GameObject:
   m_ObjectHideFlags: 0
@@ -673,7 +595,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, type: 3}
     m_FontSize: 14
     m_FontStyle: 0
     m_BestFit: 0
@@ -751,9 +673,9 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: bd658c45bc0743949ae710339d462afd, type: 3}
     m_FontSize: 20
-    m_FontStyle: 1
+    m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 2
     m_MaxSize: 40
@@ -867,8 +789,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: 8540350976322887840}
   m_Father: {fileID: 4032660314221060952}
   m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1022,7 +943,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, type: 3}
     m_FontSize: 14
     m_FontStyle: 0
     m_BestFit: 0
@@ -1047,6 +968,17 @@ PrefabInstance:
       propertyPath: m_Text
       value: PAIR
       objectReference: {fileID: 0}
+    - target: {fileID: 128304049968949179, guid: f9b4f89e2e3738c459fe1a4f852d6774,
+        type: 3}
+      propertyPath: m_FontData.m_Font
+      value: 
+      objectReference: {fileID: 12800000, guid: bd658c45bc0743949ae710339d462afd,
+        type: 3}
+    - target: {fileID: 128304049968949179, guid: f9b4f89e2e3738c459fe1a4f852d6774,
+        type: 3}
+      propertyPath: m_FontData.m_FontStyle
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 6055053651375121365, guid: f9b4f89e2e3738c459fe1a4f852d6774,
         type: 3}
       propertyPath: m_Color.b
@@ -1192,6 +1124,17 @@ PrefabInstance:
       propertyPath: m_Text
       value: CHANGE
       objectReference: {fileID: 0}
+    - target: {fileID: 128304049968949179, guid: f9b4f89e2e3738c459fe1a4f852d6774,
+        type: 3}
+      propertyPath: m_FontData.m_Font
+      value: 
+      objectReference: {fileID: 12800000, guid: bd658c45bc0743949ae710339d462afd,
+        type: 3}
+    - target: {fileID: 128304049968949179, guid: f9b4f89e2e3738c459fe1a4f852d6774,
+        type: 3}
+      propertyPath: m_FontData.m_FontStyle
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 6055053651375121365, guid: f9b4f89e2e3738c459fe1a4f852d6774,
         type: 3}
       propertyPath: m_Color.b
@@ -1722,6 +1665,17 @@ PrefabInstance:
       propertyPath: m_Text
       value: SEARCH
       objectReference: {fileID: 0}
+    - target: {fileID: 128304049968949179, guid: f9b4f89e2e3738c459fe1a4f852d6774,
+        type: 3}
+      propertyPath: m_FontData.m_Font
+      value: 
+      objectReference: {fileID: 12800000, guid: bd658c45bc0743949ae710339d462afd,
+        type: 3}
+    - target: {fileID: 128304049968949179, guid: f9b4f89e2e3738c459fe1a4f852d6774,
+        type: 3}
+      propertyPath: m_FontData.m_FontStyle
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 6055053651375121365, guid: f9b4f89e2e3738c459fe1a4f852d6774,
         type: 3}
       propertyPath: m_Color.b

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

@@ -112,26 +112,6 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 1777885814862178517}
     m_Modifications:
-    - target: {fileID: 1517891333614586013, guid: 652cdefe0475dfd429e5a7e92bc3fa31,
-        type: 3}
-      propertyPath: mType
-      value: 2
-      objectReference: {fileID: 0}
-    - target: {fileID: 1517891333821268292, guid: 652cdefe0475dfd429e5a7e92bc3fa31,
-        type: 3}
-      propertyPath: m_FontData.m_FontStyle
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 2589794477215490372, guid: 652cdefe0475dfd429e5a7e92bc3fa31,
-        type: 3}
-      propertyPath: m_Enabled
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 2589794477215490372, guid: 652cdefe0475dfd429e5a7e92bc3fa31,
-        type: 3}
-      propertyPath: m_Softness
-      value: 1
-      objectReference: {fileID: 0}
     - target: {fileID: 2589794478191162464, guid: 652cdefe0475dfd429e5a7e92bc3fa31,
         type: 3}
       propertyPath: m_Name
@@ -257,6 +237,24 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 1777885814862178517}
     m_Modifications:
+    - target: {fileID: 3324359233536132662, guid: 0cf36a704cf17794aab167386641cf2a,
+        type: 3}
+      propertyPath: m_FontData.m_Font
+      value: 
+      objectReference: {fileID: 12800000, guid: bd658c45bc0743949ae710339d462afd,
+        type: 3}
+    - target: {fileID: 3324359234025609929, guid: 0cf36a704cf17794aab167386641cf2a,
+        type: 3}
+      propertyPath: m_FontData.m_Font
+      value: 
+      objectReference: {fileID: 12800000, guid: bd658c45bc0743949ae710339d462afd,
+        type: 3}
+    - target: {fileID: 3324359234272836253, guid: 0cf36a704cf17794aab167386641cf2a,
+        type: 3}
+      propertyPath: m_FontData.m_Font
+      value: 
+      objectReference: {fileID: 12800000, guid: bd658c45bc0743949ae710339d462afd,
+        type: 3}
     - target: {fileID: 3324359234648502169, guid: 0cf36a704cf17794aab167386641cf2a,
         type: 3}
       propertyPath: m_Name

Assets/Scenes/MainScene.unity

@@ -121,6 +121,84 @@ NavMeshSettings:
     debug:
       m_Flags: 0
   m_NavMeshData: {fileID: 0}
+--- !u!1 &154299661
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 154299662}
+  - component: {fileID: 154299664}
+  - component: {fileID: 154299663}
+  m_Layer: 5
+  m_Name: Version
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &154299662
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 154299661}
+  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: 273807004}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 0}
+  m_AnchorMax: {x: 1, y: 0}
+  m_AnchoredPosition: {x: -20, y: 20}
+  m_SizeDelta: {x: 160, y: 19}
+  m_Pivot: {x: 1, y: 0}
+--- !u!114 &154299663
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 154299661}
+  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.61960787, g: 0.61960787, b: 0.6784314, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, 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: Version:0.0.0
+--- !u!222 &154299664
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 154299661}
+  m_CullTransparentMesh: 0
 --- !u!1 &273807000
 GameObject:
   m_ObjectHideFlags: 0
@@ -215,6 +293,7 @@ RectTransform:
   m_Children:
   - {fileID: 730655536}
   - {fileID: 1985738406}
+  - {fileID: 154299662}
   m_Father: {fileID: 0}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -706,10 +785,10 @@ RectTransform:
   m_Father: {fileID: 273807004}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 1, y: 1}
+  m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_SizeDelta: {x: 1600, y: 900}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1985738407
 MonoBehaviour:

Assets/Scripts/Apis/MapInterruptRecordApi.cs

@@ -41,7 +41,7 @@ namespace Assets.Scripts.Apis
             }
             catch (Exception e)
             {
-                Debug.Log(e.ToString());
+                Debug.LogError(e.ToString());
                 return result;
             }
             

Assets/Scripts/Apis/Models/NearRouteModel.cs

@@ -33,5 +33,9 @@ namespace Assets.Scripts.Apis.Models
         public bool IsFavorite { get; set; }
 
         public bool Enable3D { get; set; }
+        /// <summary>
+        /// 海拔线
+        /// </summary>
+        public string AltitudeGraph { get; set; }
     }
 }

Assets/Scripts/Apis/Models/RouteResult.cs

@@ -35,7 +35,7 @@ namespace Assets.Scripts.Apis.Models
         /// <summary>
         /// 
         /// </summary>
-        public string RankingsId { get; set; }
+        public List<string> RankingsId { get; set; }
         /// <summary>
         /// 
         /// </summary>

Assets/Scripts/App.cs

@@ -7,7 +7,7 @@ using UnityEngine;
 
 public static class App
 {
-    public static string Host = "http://192.168.0.101:5082/";
+    public static string Host = "http://192.168.0.97:5082/";
 
     public static string AppVersion = "1.0.0";
 

Assets/Scripts/Scenes/MainController.cs

@@ -2,13 +2,16 @@
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
+using UnityEngine.UI;
 
 public class MainController : MonoBehaviour
 {
     [SerializeField]GameObject root;
+    private Text Version;
     private void Awake()
     {
-        
+        Version = this.transform.Find("Version").GetComponent<Text>();
+        Version.text = "Version:"+App.AppVersion;
     }
 
     // Start is called before the first frame update

Assets/Scripts/UI/Control/PFUIInputField.cs

@@ -90,7 +90,7 @@ namespace Assets.Scripts.UI.Control
                 outline.enabled = false;
             }
 
-            UIManager.AddEvent(this.mInnerInputField.gameObject, EventTriggerType.PointerClick, new UnityAction<BaseEventData>(this.OnSelect));
+            //UIManager.AddEvent(this.mInnerInputField.gameObject, EventTriggerType.PointerClick, new UnityAction<BaseEventData>(this.OnSelect));
             UIManager.AddEvent(this.mInnerInputField.gameObject, EventTriggerType.Select, new UnityAction<BaseEventData>(this.OnSelect));
             UIManager.AddEvent(this.mInnerInputField.gameObject, EventTriggerType.Deselect, new UnityAction<BaseEventData>(this.OnDeselect));
             UIManager.AddEvent(this.mInnerInputField.gameObject, EventTriggerType.PointerEnter, new UnityAction<BaseEventData>((e) =>

Assets/Scripts/UI/Control/PFUIText.cs

@@ -4,10 +4,16 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using UnityEngine;
+using UnityEngine.UI;
 
 namespace Assets.Scripts.UI.Control
 {
-    public class PfText : PFUIComponentBase
+    [RequireComponent(typeof(Text))]
+    public class PFUIText : PFUIComponentBase
     {
+        protected void Awake()
+        {
+            
+        }
     }
 }

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

@@ -8,7 +8,7 @@ using UnityEngine;
 using UnityEngine.EventSystems;
 using UnityEngine.UI;
 
-public class Item : MonoBehaviour, IPointerClickHandler
+public class Item : PFUIPanel //, IPointerClickHandler
 {
     private Text text;
 
@@ -49,7 +49,8 @@ public class Item : MonoBehaviour, IPointerClickHandler
         }
     }
     public Action onClick;
-    private void Awake()
+    private Transform hot;
+    protected override void Awake()
     {
         text = this.transform.Find("name").GetComponent<Text>();
         km = this.transform.Find("km").GetComponent<Text>();
@@ -63,6 +64,11 @@ public class Item : MonoBehaviour, IPointerClickHandler
         var rect = ((RectTransform)transform).rect;
         material.SetVector(Shader.PropertyToID("_WidthHeightRadius"), new Vector4(rect.width, rect.height, rect.height * 0.5f, 0));
         this.GetComponent<Image>().material = material;
+
+        hot = this.transform.Find("Hot");
+        SetRounded(hot, 17);
+
+        UIManager.AddEvent(this.gameObject, EventTriggerType.PointerClick, OnPointerClick);
     }
 
     public void Selected(bool value)
@@ -74,28 +80,42 @@ public class Item : MonoBehaviour, IPointerClickHandler
             this.GetComponent<UIGradient>().color2 = Utils.HexToColor("F93086");
 
             this.GetComponent<Image>().color = Color.white;
-            this.transform.Find("km").GetComponent<Text>().color = Color.white;
+            km.color = Color.white;
-            this.transform.Find("count").GetComponent<Text>().color = Color.white;
+            count.color = Color.white;
+            this.transform.Find("DistanceIcon").GetComponent<Image>().color = Color.white;
+            this.transform.Find("BikeIcon").GetComponent<Image>().color = Color.white;
+
+
+            hot.GetComponent<UIGradient>().color1 = Color.white;
+            hot.GetComponent<UIGradient>().color2 = Color.white;
+            hot.Find("PFUIText").GetComponent<Text>().color = Utils.HexToColor("F93086");
         }
         else
         {
             this.GetComponent<UIGradient>().enabled = false;
             this.GetComponent<Image>().color = Utils.HexToColor("353543");
-            this.transform.Find("km").GetComponent<Text>().color = Utils.HexToColor("5C5C6E");
+            km.color = Utils.HexToColor("5C5C6E");
-            this.transform.Find("count").GetComponent<Text>().color = Utils.HexToColor("F93086");
+            count.color = Utils.HexToColor("F93086");
+            this.transform.Find("DistanceIcon").GetComponent<Image>().color = Utils.HexToColor("5C5C6E");
+            this.transform.Find("BikeIcon").GetComponent<Image>().color = Utils.HexToColor("F93086");
+
+            hot.GetComponent<UIGradient>().color1 = Utils.HexToColor("FF7485");
+            hot.GetComponent<UIGradient>().color2 = Utils.HexToColor("F93086");
+            hot.Find("PFUIText").GetComponent<Text>().color = Color.white;
+
         }
     }
 
     public void SetModel(NearRouteModel model)
     {
         this.Text = model.Name;
-        this.Distance = model.Distance + "KM";
+        this.Distance = model.Distance.ToString("0.0") + "KM";
         this.Count = model.TheHeat.ToString();
 
     }
 
     // Start is called before the first frame update
-    void Start()
+    protected override void Start()
     {
         
     }
@@ -106,7 +126,7 @@ public class Item : MonoBehaviour, IPointerClickHandler
         
     }
 
-    public void OnPointerClick(PointerEventData eventData)
+    public void OnPointerClick(BaseEventData eventData)
     {
         if(onClick != null)
         {

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

@@ -9,6 +9,7 @@ using UnityEngine.SceneManagement;
 using UnityEngine.UI;
 using System;
 using System.Linq;
+using Assets.Scripts;
 
 public class Tips : MonoBehaviour
 {
@@ -30,6 +31,7 @@ public class Tips : MonoBehaviour
     private List<CountryModel> countryList;
     private GameObject level;
     private GameObject m3DIcon;
+    private RawImage altitudeGraph;
     private void Awake()
     {
         var materialSource = Resources.Load<Material>("UI/Material/RoundedCornersTextureMaterial");
@@ -63,6 +65,8 @@ public class Tips : MonoBehaviour
         level.GetComponent<Image>().material = material1;
 
         m3DIcon = this.transform.Find("3DIcon").gameObject;
+
+        altitudeGraph = this.transform.Find("AltitudeGraph").GetComponent<RawImage>();
     }
 
     // Start is called before the first frame update
@@ -81,7 +85,7 @@ public class Tips : MonoBehaviour
     {
         if (this.isActiveAndEnabled)
         {
-            if(_model.Id == model.Id)
+            if(_model != null && _model.Id == model.Id)
             {
                 //this.gameObject.SetActive(false);
                 return;
@@ -94,10 +98,10 @@ public class Tips : MonoBehaviour
         Name.text = _model.Name;
 
         Count.text = _model.TheHeat.ToString();
-        Distance.text = _model.Distance.ToString("#.0")+"KM";
+        Distance.text = _model.Distance.ToString("0.0")+"KM";
-        TotalClimb.text = _model.TotalClimb.ToString();
+        TotalClimb.text = _model.TotalClimb.ToString("0") +"FT";
 
-        averageGrade.text = _model.AverageGrade.ToString() + "%";
+        averageGrade.text = _model.AverageGrade.ToString("0.0") + "%";
 
         //var country = countryList.SingleOrDefault(r => r.abbreviation.Equals(_model.CountryCode, StringComparison.InvariantCultureIgnoreCase));
         //if(country )
@@ -110,7 +114,12 @@ public class Tips : MonoBehaviour
         level.transform.Find("Text").GetComponent<Text>().text = _model.Hard;
 
         m3DIcon.SetActive(_model.Enable3D);
-        
+
+
+        //altitudeGraph
+
+        Utils.DisplayImage(StartCoroutine, altitudeGraph, _model.AltitudeGraph);
+        //Utils.DisplayImage(StartCoroutine, altitudeGraph, "http://192.168.0.97:5082/Map/AltitudeGraph?id=1215");
     }
 
 
@@ -137,9 +146,11 @@ public class Tips : MonoBehaviour
         }
         this.transform.localPosition = localPosition;
         this.transform.localScale = new Vector2(2, 2);
-        this.SetModel(model);
+        
         //tips.Show();
         this.gameObject.SetActive(true);
+
+        this.SetModel(model);
     }
     public void Hide()
     {

Assets/Scripts/UI/Prefab/Device/ConnectDeviceModal.cs

@@ -42,15 +42,14 @@ public class ConnectDeviceModal : PFUIPanel
         var panel = container.Find("Panel");
         content = panel.Find("Scroll View").Find("Viewport").Find("Content").GetComponent<VerticalLayoutGroup>();
 
-        Material material = null;
+        //Material material = null;
-        if (material == null)
+        //if (material == null)
-        {
+        //{
-            material = Instantiate(Resources.Load<Material>("UI/Material/RoundedCornersTextureMaterial"));
+        //    material = Instantiate(Resources.Load<Material>("UI/Material/RoundedCornersTextureMaterial"));
-        }
+        //}
-        var rect = ((RectTransform)panel.transform).rect;
+        //var rect = ((RectTransform)panel.transform).rect;
-        material.SetVector(Shader.PropertyToID("_WidthHeightRadius"), new Vector4(rect.width, rect.height, 20f, 0));
+        //material.SetVector(Shader.PropertyToID("_WidthHeightRadius"), new Vector4(rect.width, rect.height, 20f, 0));
-        panel.GetComponent<Image>().material = material;
+        base.SetRounded(panel.GetComponent<Image>().transform, 20f);        
-        
 
         UIManager.AddEvent(closeBtn.gameObject, EventTriggerType.PointerClick, new UnityEngine.Events.UnityAction<BaseEventData>(e =>
         {

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

@@ -39,6 +39,7 @@ public class BigMapController : PFUIPanel
         begin = Resources.Load("UI/Prefab/BigMap/Begin");
 
         mapManager = this.transform.Find("Map").GetComponent<AbstractMap>();
+        mapManager.MaxZoom = 4;
         mapManager.OnInitialized += MapManager_OnInitialized;
         mapManager.OnUpdated += MapManager_OnUpdated;
 
@@ -57,7 +58,7 @@ public class BigMapController : PFUIPanel
             mapManager.Destroy();
             UIManager.ShowMapListPanel();
             //this.gameObject.SetActive(false);
-            DestroyImmediate(this.gameObject);
+            //DestroyImmediate(this.gameObject);
         });
 
         var panel = canvas.transform.Find("Panel");
@@ -91,7 +92,7 @@ public class BigMapController : PFUIPanel
 
         UIManager.AddEvent(headImage.gameObject, EventTriggerType.PointerClick, (e) =>
         {
-            UIManager.ShowEditUserPanel();
+            UIManager.ShowUserInfoPanel();
         });
     }
 
@@ -126,6 +127,8 @@ public class BigMapController : PFUIPanel
     }
     private void MapManager_OnUpdated()
     {
+        Debug.Log("update");
+
         foreach (var item in linesCache)
         {
             //if(item.Value.LineObject != null)

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

@@ -40,14 +40,19 @@ public class DeviceController : PFUIPanel
             //UIManager.CloseModal();
             this.Close();
         }));
+        //UIManager.AddEvent(mReturnBtn.gameObject, EventTriggerType.PointerUp, (e) =>
+        //{
+        //    Debug.Log("aaaaaaaaaaaaaa");
+        //});
 
         var bg = this.transform.Find("Status").Find("Bg");
         antStatus = bg.Find("Ant+").GetComponent<Image>();
 
         ant0 = Resources.Load<Sprite>("Images/ANT+_0");
-        ant1 = Resources.Load<Sprite>("Images/ANT+_1");
+        ant1 = Resources.Load<Sprite>("Images/ANT+_2");
 
-        Debug.Log("device start");
+
+        base.SetRounded(bg, 64);
     }
     
 

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

@@ -100,9 +100,10 @@ public class HomeController : PFUIPanel
         userInfo.Find("GroupTop").Find("FtpContainer").Find("FtpValue").GetComponent<Text>().text = App.CurrentUser.FTP.ToString();
         userInfo.Find("GroupTop").Find("WeightContainer").Find("WeightValue").GetComponent<Text>().text = App.CurrentUser.Weight.ToString();
         userInfo.Find("GroupTop").Find("WKGContainer").Find("WKGValue").GetComponent<Text>().text = $"{App.CurrentUser.Weight}kg/{App.CurrentUser.BicycleWeight}kg";
-        userInfo.Find("CaloriesContainer").Find("CaloriesValue").GetComponent<Text>().text = summary.Kcal;
+        userInfo.Find("CaloriesContainer").Find("CaloriesValue").GetComponent<Text>().text = summary.Kcal +" KCAL";
-        userInfo.Find("KMContainer").Find("KMValue").GetComponent<Text>().text = summary.TotalDistance.ToString();
+        userInfo.Find("KMContainer").Find("KMValue").GetComponent<Text>().text = summary.TotalDistance.ToString("0") +" KM";
-        userInfo.Find("ClimbContainer").Find("ClimbValue").GetComponent<Text>().text = summary.TotalClimb;
+        userInfo.Find("ClimbContainer").Find("ClimbValue").GetComponent<Text>().text = summary.TotalClimb +" M";
+        userInfo.Find("IDText").GetComponent<Text>().text = "ID:"+App.CurrentUser.Id;
         //var user = ConfigHelper.CurrentUser;
         //Ftp.text = summary.Ftp.ToString();
         //Weight.text = user.Weight.ToString();
@@ -148,4 +149,9 @@ public class HomeController : PFUIPanel
     {
         
     }
+
+    public override void Show()
+    {
+        base.Show();
+    }
 }

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

@@ -205,7 +205,7 @@ public class MapListController : PFUIPanel
 
         UIManager.AddEvent(headImage.gameObject, EventTriggerType.PointerClick, (e) =>
         {
-            UIManager.ShowEditUserPanel();
+            UIManager.ShowUserInfoPanel();
         });
     }
 

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

@@ -5,6 +5,7 @@ using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.EventSystems;
+using UnityEngine.SceneManagement;
 using UnityEngine.UI;
 
 public class RouteItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandler
@@ -23,8 +24,10 @@ public class RouteItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandle
         
     }
     string titleColor = "#5c5c6e";
+    RouteResult data;
     public void Initial(RouteResult result)
     {
+        data = result;
         left = transform.Find("Left");
         row1 = left.Find("Main").Find("Row1");
         row2 = left.Find("Main").Find("Row2");
@@ -61,17 +64,23 @@ public class RouteItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandle
 
     private void Delete()
     {
-        throw new NotImplementedException();
+        //throw new NotImplementedException();
+        UIManager.ShowAlert("暂未实现");
     }
 
     private void GoReRide()
     {
-        throw new NotImplementedException();
+        //throw new NotImplementedException();
+        //UIManager.ShowAlert("去骑行");
+
+        App.RouteIdParam = data.RouteId;
+        SceneManager.LoadScene("Ride");
     }
 
     private void GoContinue()
     {
-        throw new NotImplementedException();
+        //throw new NotImplementedException();
+        UIManager.ShowAlert("暂未实现");
     }
 
     public void OnPointerExit(PointerEventData eventData)

Assets/Scripts/UIManager.cs

@@ -343,6 +343,7 @@ public class UIManager : MonoBehaviour
         //prePanel = bigMap.GetComponent<PFUIPanel>();
     }
 
+    static Texture2D cursor;
     public static void AddEvent(GameObject gameObject, EventTriggerType eventTriggerType, UnityAction<BaseEventData> call)
     {
         EventTrigger et = gameObject.GetComponent<EventTrigger>();
@@ -354,6 +355,27 @@ public class UIManager : MonoBehaviour
         pointerEvent.eventID = eventTriggerType;
         pointerEvent.callback.AddListener(call);
         et.triggers.Add(pointerEvent);
+
+        if(eventTriggerType == EventTriggerType.PointerClick)
+        {
+            //设置光标
+            if (cursor == null)
+            {
+                cursor = Resources.Load<Texture2D>("Images/PointerButtonHover");
+            }
+            UIManager.AddEvent(gameObject, EventTriggerType.PointerEnter, (e)=>{
+                if (!gameObject.activeInHierarchy) return;
+                Cursor.SetCursor(cursor, Vector2.zero, CursorMode.Auto);
+            });
+            UIManager.AddEvent(gameObject, EventTriggerType.PointerUp, (e) => {
+                if (!gameObject.activeInHierarchy) return;
+                Cursor.SetCursor(null, Vector2.zero, CursorMode.Auto);
+            });
+            UIManager.AddEvent(gameObject, EventTriggerType.PointerExit, (e) => {
+                if (!gameObject.activeInHierarchy) return;
+                Cursor.SetCursor(null, Vector2.zero, CursorMode.Auto);
+            });
+        }
     }
 
     public static void Close(MonoBehaviour obj)

Assets/StreamingAssets.meta

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

ProjectSettings/ProjectSettings.asset

@@ -568,7 +568,7 @@ PlayerSettings:
   monoEnv: 
   splashScreenBackgroundSourceLandscape: {fileID: 0}
   splashScreenBackgroundSourcePortrait: {fileID: 0}
-  blurSplashScreenBackground: 1
+  blurSplashScreenBackground: 0
   spritePackerPolicy: 
   webGLMemorySize: 16
   webGLExceptionSupport: 1