修改连接设备界面;修改大地图在panel上缩放大地图也缩放的问题

Assets/Resources/Images/Signal_1.png.meta

@@ -0,0 +1,104 @@
+fileFormatVersion: 2
+guid: c8bf9a7776d716b4db8c80b65a648469
+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/Signal_2.png.meta

@@ -0,0 +1,104 @@
+fileFormatVersion: 2
+guid: 06916ce30a8274a4eb000d5781570ad3
+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/Signal_3.png.meta

@@ -0,0 +1,104 @@
+fileFormatVersion: 2
+guid: 7ba84d52fa6fd2b428fe76e532bc7c6c
+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/link_ant+_2.png.meta

@@ -0,0 +1,104 @@
+fileFormatVersion: 2
+guid: 0b4912f50e70fe94485136c6f248136f
+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/link_bluetooth_2.png.meta

@@ -0,0 +1,104 @@
+fileFormatVersion: 2
+guid: 0ccaf81a4ca1c1e4ea20f4c52f30a579
+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/UI/Prefab/Device/DeviceItem.prefab

@@ -104,7 +104,8 @@ RectTransform:
   m_Children:
   - {fileID: 4347642619387382541}
   - {fileID: 5333104648953487716}
-  - {fileID: 4582282901144642708}
+  - {fileID: 6514089965287851756}
+  - {fileID: 965028425746119384}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -153,6 +154,80 @@ MonoBehaviour:
     m_DisabledTrigger: Disabled
   m_Interactable: 1
   m_TargetGraphic: {fileID: 0}
+--- !u!1 &6092777681612193971
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6514089965287851756}
+  - component: {fileID: 6121838685697673260}
+  - component: {fileID: 7411279575339221392}
+  m_Layer: 5
+  m_Name: Network
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6514089965287851756
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6092777681612193971}
+  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: 189965521107699628}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0.5}
+  m_AnchoredPosition: {x: 42, y: 0}
+  m_SizeDelta: {x: 24, y: 24}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6121838685697673260
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6092777681612193971}
+  m_CullTransparentMesh: 0
+--- !u!114 &7411279575339221392
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6092777681612193971}
+  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: 0b4912f50e70fe94485136c6f248136f, 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 &6417040487747213529
 GameObject:
   m_ObjectHideFlags: 0
@@ -187,7 +262,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 50, y: -12}
+  m_AnchoredPosition: {x: 64, y: -12}
   m_SizeDelta: {x: 220, y: 30}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &7318458415531256946
@@ -231,7 +306,7 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: New Text
---- !u!1 &8513862428541677370
+--- !u!1 &6790451822861370522
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -239,73 +314,69 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 4582282901144642708}
+  - component: {fileID: 965028425746119384}
-  - component: {fileID: 828510373746272033}
+  - component: {fileID: 4105398655127643970}
-  - component: {fileID: 1484798634535886974}
+  - component: {fileID: 8805901114678668108}
   m_Layer: 5
-  m_Name: Type
+  m_Name: Signal
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!224 &4582282901144642708
+--- !u!224 &965028425746119384
 RectTransform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8513862428541677370}
+  m_GameObject: {fileID: 6790451822861370522}
   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: 189965521107699628}
-  m_RootOrder: 2
+  m_RootOrder: 3
   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: -43.46, y: 15}
+  m_AnchoredPosition: {x: -58, y: 0}
-  m_SizeDelta: {x: 65.85498, y: 30}
+  m_SizeDelta: {x: 16, y: 16}
-  m_Pivot: {x: 1, y: 1}
+  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &828510373746272033
+--- !u!222 &4105398655127643970
 CanvasRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8513862428541677370}
+  m_GameObject: {fileID: 6790451822861370522}
   m_CullTransparentMesh: 0
---- !u!114 &1484798634535886974
+--- !u!114 &8805901114678668108
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8513862428541677370}
+  m_GameObject: {fileID: 6790451822861370522}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.9764706, g: 0.1882353, b: 0.5254902, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_FontData:
+  m_Sprite: {fileID: 0}
-    m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3}
+  m_Type: 0
-    m_FontSize: 16
+  m_PreserveAspect: 0
-    m_FontStyle: 0
+  m_FillCenter: 1
-    m_BestFit: 0
+  m_FillMethod: 4
-    m_MinSize: 1
+  m_FillAmount: 1
-    m_MaxSize: 40
+  m_FillClockwise: 1
-    m_Alignment: 3
+  m_FillOrigin: 0
-    m_AlignByGeometry: 0
+  m_UseSpriteMesh: 0
-    m_RichText: 1
+  m_PixelsPerUnitMultiplier: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: ANT+

Assets/Scenes/MainScene.unity

@@ -323,6 +323,50 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 273807000}
   m_CullTransparentMesh: 0
+--- !u!1 &508680359
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 508680361}
+  - component: {fileID: 508680360}
+  m_Layer: 0
+  m_Name: AppCenter
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &508680360
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 508680359}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b9a3a6a28c6a80a46adde9b4e01eeb93, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  Settings: {fileID: 11400000, guid: 060d0d087b61870459a222c8d67af46a, type: 2}
+--- !u!4 &508680361
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 508680359}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 708.2801, y: 231.04446, z: 981.1338}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 6
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &724627085
 GameObject:
   m_ObjectHideFlags: 0
@@ -739,6 +783,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: ff5927b9099e57740a8e1c1296251a99, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  mMainPanel: {fileID: 0}
   Root: {fileID: 0}
 --- !u!4 &1962586927
 Transform:

Assets/Scripts/Devices/Ble/BleDeviceAdapter.cs

@@ -95,7 +95,7 @@ namespace Assets.Scripts.Devices.Ble
                 if (discoveredDevices.ContainsKey(device.Peripheral.Address))
                 {
                     discoveredDevices[device.Peripheral.Address].SignalStrength = device.Rssi;
-                    //Debug.Log($"设备{ device.Peripheral.Name }信号量：{ device.Rssi }");                    
+                    Debug.Log($"设备{ device.Peripheral.Name }信号量：{ device.Rssi }");
                 }
             });
         }

Assets/Scripts/Devices/Ble/Scan/BleAdvertisementInfo.cs

@@ -14,7 +14,7 @@ namespace Assets.Scripts.Ble.Scan
 	public class BleAdvertisementInfo
     {
         public BlePeripheralInfo Peripheral { get; }
-		public int Rssi { get; }
+		public int Rssi { get; set; }
 
 		public SensorType SensorType { get; internal set; }
 		public BleAdvertisementInfo(BlePeripheralInfo peripheral, int rssi, bool connectible, List<Guid> services, byte[] manufactureData, SensorType sensor)

Assets/Scripts/Devices/Ble/Win/BleWinHwInterface.cs

@@ -155,6 +155,7 @@ namespace Assets.Scripts.Ble
                 return;
             }
             pCache[addressStr].SensorType = sensor;
+            pCache[addressStr].Rssi = rssi;
             //Debug.Log(sensor);
             //pCache[address.ToString()].SensorType = sensor;
   

Assets/Scripts/Devices/Ble/Win/WclBleGattClient.cs

@@ -21,66 +21,52 @@ namespace Assets.Scripts.Ble.Win
 			this.mPtr = WclBleGattClient.WCLGattClientCreate(this.CConnectEvent, this.CDisconnectEvent, this.FCharacteristicChangedEvent);
 		}
 
-		// Token: 0x06002086 RID: 8326
 		[DllImport("WclBlePluginCPP.dll", CallingConvention = CallingConvention.StdCall)]
 		[return: MarshalAs(UnmanagedType.I4)]
 		private static extern int WCLGattClientConnect([MarshalAs(UnmanagedType.SysInt)][In] IntPtr Client, [MarshalAs(UnmanagedType.SysInt)][In] IntPtr Radio, [MarshalAs(UnmanagedType.I8)][In] long Address);
 
-		// Token: 0x06002087 RID: 8327
 		[DllImport("WclBlePluginCPP.dll", CallingConvention = CallingConvention.StdCall)]
 		[return: MarshalAs(UnmanagedType.SysInt)]
 		private static extern IntPtr WCLGattClientCreate([MarshalAs(UnmanagedType.FunctionPtr)][In] WclBleGattClient.GATTCLIENT_CONNECT OnConnect, [MarshalAs(UnmanagedType.FunctionPtr)][In] WclBleGattClient.GATTCLIENT_DISCONNECT OnDisconnect, [MarshalAs(UnmanagedType.FunctionPtr)][In] WclBleGattClient.GATTCLIENT_ONCHANGED OnChanged);
 
-		// Token: 0x06002088 RID: 8328
 		[DllImport("WclBlePluginCPP.dll", CallingConvention = CallingConvention.StdCall)]
 		private static extern void WCLGattClientDestroy([MarshalAs(UnmanagedType.SysInt)][In] IntPtr Client);
 
-		// Token: 0x06002089 RID: 8329
 		[DllImport("WclBlePluginCPP.dll", CallingConvention = CallingConvention.StdCall)]
 		[return: MarshalAs(UnmanagedType.I4)]
 		private static extern int WCLGattClientDisconnect([MarshalAs(UnmanagedType.SysInt)][In] IntPtr Client);
 
-		// Token: 0x0600208A RID: 8330
 		[DllImport("WclBlePluginCPP.dll", CallingConvention = CallingConvention.StdCall)]
 		private static extern void WCLGattClientFreeMem([MarshalAs(UnmanagedType.SysInt)][In] IntPtr pMem);
 
-		// Token: 0x0600208B RID: 8331
 		[DllImport("WclBlePluginCPP.dll", CallingConvention = CallingConvention.StdCall)]
 		[return: MarshalAs(UnmanagedType.I4)]
 		private static extern int WCLGattClientGetCharacteristics([MarshalAs(UnmanagedType.SysInt)][In] IntPtr Client, [In] ref GattService Service, [In][Out] ref GattCharacteristics Chars);
 
-		// Token: 0x0600208C RID: 8332
 		[DllImport("WclBlePluginCPP.dll", CallingConvention = CallingConvention.StdCall)]
 		[return: MarshalAs(UnmanagedType.I4)]
 		private static extern int WCLGattClientGetServices([MarshalAs(UnmanagedType.SysInt)][In] IntPtr Client, [In][Out] ref GattServices Services);
 
-		// Token: 0x0600208D RID: 8333
 		[DllImport("WclBlePluginCPP.dll", CallingConvention = CallingConvention.StdCall)]
 		[return: MarshalAs(UnmanagedType.U4)]
 		private static extern WclBleGattClientState WCLGattClientGetState([MarshalAs(UnmanagedType.SysInt)][In] IntPtr Client);
 
-		// Token: 0x0600208E RID: 8334
 		[DllImport("WclBlePluginCPP.dll", CallingConvention = CallingConvention.StdCall)]
 		[return: MarshalAs(UnmanagedType.I4)]
 		private static extern int WCLGattClientReadCharacteristicValue([MarshalAs(UnmanagedType.SysInt)][In] IntPtr Client, [In] ref GattCharacteristic Char, [MarshalAs(UnmanagedType.SysInt)][In][Out] ref IntPtr ppValue, [MarshalAs(UnmanagedType.U4)][In][Out] ref uint pSize);
 
-		// Token: 0x0600208F RID: 8335
 		[DllImport("WclBlePluginCPP.dll", CallingConvention = CallingConvention.StdCall)]
 		[return: MarshalAs(UnmanagedType.I4)]
 		private static extern int WCLGattClientSubscribeCharacteristic([MarshalAs(UnmanagedType.SysInt)][In] IntPtr Client, [In] ref GattCharacteristic Char);
 
-		// Token: 0x06002090 RID: 8336
 		[DllImport("WclBlePluginCPP.dll", CallingConvention = CallingConvention.StdCall)]
 		[return: MarshalAs(UnmanagedType.I4)]
 		private static extern int WCLGattClientUnsubscribeCharacteristic([MarshalAs(UnmanagedType.SysInt)][In] IntPtr Client, [In] ref GattCharacteristic Char);
 
-		// Token: 0x06002091 RID: 8337
 		[DllImport("WclBlePluginCPP.dll", CallingConvention = CallingConvention.StdCall)]
 		[return: MarshalAs(UnmanagedType.I4)]
 		private static extern int WCLGattClientWriteCharacteristicValue([MarshalAs(UnmanagedType.SysInt)][In] IntPtr Client, [In] ref GattCharacteristic Char, [MarshalAs(UnmanagedType.SysInt)][In] IntPtr pValue, [MarshalAs(UnmanagedType.U4)][In] uint Size);
 
-		// Token: 0x170005D4 RID: 1492
-		// (get) Token: 0x06002092 RID: 8338 RVA: 0x00087790 File Offset: 0x00085990
 		public WclBleGattClientState State
 		{
 			get
@@ -89,7 +75,6 @@ namespace Assets.Scripts.Ble.Win
 			}
 		}
 
-		// Token: 0x06002093 RID: 8339 RVA: 0x000877A4 File Offset: 0x000859A4
 		public void Connect()
 		{
 			if (this.mPtr != IntPtr.Zero)
@@ -102,7 +87,6 @@ namespace Assets.Scripts.Ble.Win
 			}
 		}
 
-		// Token: 0x06002094 RID: 8340 RVA: 0x000877F4 File Offset: 0x000859F4
 		public void Disconnect()
 		{
 			if (this.mPtr != IntPtr.Zero)
@@ -113,7 +97,6 @@ namespace Assets.Scripts.Ble.Win
 			}
 		}
 
-		// Token: 0x06002095 RID: 8341 RVA: 0x00087864 File Offset: 0x00085A64
 		public int DiscoverCharacteristics(GattService service, out GattCharacteristics characteristics)
 		{
 			characteristics = new GattCharacteristics
@@ -124,7 +107,6 @@ namespace Assets.Scripts.Ble.Win
 			return WclBleGattClient.WCLGattClientGetCharacteristics(this.mPtr, ref service, ref characteristics);
 		}
 
-		// Token: 0x06002096 RID: 8342 RVA: 0x000878B0 File Offset: 0x00085AB0
 		public int DiscoverServices(out GattServices services)
 		{
 			services = new GattServices
@@ -135,7 +117,6 @@ namespace Assets.Scripts.Ble.Win
 			return WclBleGattClient.WCLGattClientGetServices(this.mPtr, ref services);
 		}
 
-		// Token: 0x06002097 RID: 8343 RVA: 0x000878F8 File Offset: 0x00085AF8
 		public int ReadCharacteristicValue(GattCharacteristic characteristic, out byte[] value)
 		{
 			value = null;
@@ -151,13 +132,11 @@ namespace Assets.Scripts.Ble.Win
 			return num2;
 		}
 
-		// Token: 0x06002098 RID: 8344 RVA: 0x00087953 File Offset: 0x00085B53
 		public int SubscribeCharacteristic(GattCharacteristic characteristic)
 		{
 			return WclBleGattClient.WCLGattClientSubscribeCharacteristic(this.mPtr, ref characteristic);
 		}
 
-		// Token: 0x06002099 RID: 8345 RVA: 0x00087968 File Offset: 0x00085B68
 		public int WriteCharacteristic(GattCharacteristic characteristic, byte[] value)
 		{
 			IntPtr intPtr;
@@ -179,7 +158,6 @@ namespace Assets.Scripts.Ble.Win
 			return result;
 		}
 
-		// Token: 0x0600209A RID: 8346 RVA: 0x000879D4 File Offset: 0x00085BD4
 		public void Dispose()
 		{
 			WclBleGattClient.WCLGattClientDestroy(this.mPtr);
@@ -190,7 +168,6 @@ namespace Assets.Scripts.Ble.Win
 			this.FCharacteristicChangedEvent = null;
 		}
 
-		// Token: 0x0600209B RID: 8347 RVA: 0x00087A0C File Offset: 0x00085C0C
 		private void OnCharacteristicChanged(IntPtr sender, ushort handle, IntPtr pValue, uint valueLen)
 		{
 			//Debug.Log("char changed");
@@ -213,7 +190,6 @@ namespace Assets.Scripts.Ble.Win
 			}
 		}
 
-		// Token: 0x0600209C RID: 8348 RVA: 0x00087A80 File Offset: 0x00085C80
 		private void OnConnected(IntPtr client, int error)
 		{
 			try
@@ -232,7 +208,6 @@ namespace Assets.Scripts.Ble.Win
 			}
 		}
 
-		// Token: 0x0600209D RID: 8349 RVA: 0x00087AD0 File Offset: 0x00085CD0
 		private void OnDisconnected(IntPtr client, int reason)
 		{
 			try
@@ -249,53 +224,34 @@ namespace Assets.Scripts.Ble.Win
 			}
 		}
 
-		// Token: 0x0400130B RID: 4875
 		public WclBleGattClient.GattCharacteristicChanged CharacteristicChanged;
 
-		// Token: 0x0400130C RID: 4876
 		public WclBleGattClient.GattConnectionChanged Connected;
 
-		// Token: 0x0400130D RID: 4877
 		public WclBleGattClient.GattConnectionChanged Disconnected;
 
-		// Token: 0x0400130F RID: 4879
 		private WclBleGattClient.GATTCLIENT_CONNECT CConnectEvent;
 
-		// Token: 0x04001310 RID: 4880
 		private WclBleGattClient.GATTCLIENT_DISCONNECT CDisconnectEvent;
 
-		// Token: 0x04001311 RID: 4881
 		private WclBleGattClient.GATTCLIENT_ONCHANGED FCharacteristicChangedEvent;
 
-		// Token: 0x04001312 RID: 4882
 		private readonly long gattAddress;
 
-		// Token: 0x04001313 RID: 4883
 		private IntPtr mPtr;
 
-		// Token: 0x04001314 RID: 4884
 		private IntPtr rPtr;
 
-		// Token: 0x020008FB RID: 2299
-		// (Invoke) Token: 0x06003F5A RID: 16218
 		public delegate void GattCharacteristicChanged(WclBleGattClient connection, ushort handle, byte[] value);
 
-		// Token: 0x020008FC RID: 2300
-		// (Invoke) Token: 0x06003F5E RID: 16222
 		public delegate void GattConnectionChanged(WclBleGattClient connection, int error);
 
-		// Token: 0x020008FD RID: 2301
-		// (Invoke) Token: 0x06003F62 RID: 16226
 		[UnmanagedFunctionPointer(CallingConvention.StdCall, SetLastError = false)]
 		private delegate void GATTCLIENT_CONNECT([MarshalAs(UnmanagedType.SysInt)][In] IntPtr Sender, [MarshalAs(UnmanagedType.I4)][In] int Error);
 
-		// Token: 0x020008FE RID: 2302
-		// (Invoke) Token: 0x06003F66 RID: 16230
 		[UnmanagedFunctionPointer(CallingConvention.StdCall, SetLastError = false)]
 		private delegate void GATTCLIENT_DISCONNECT([MarshalAs(UnmanagedType.SysInt)][In] IntPtr Sender, [MarshalAs(UnmanagedType.I4)][In] int Reason);
 
-		// Token: 0x020008FF RID: 2303
-		// (Invoke) Token: 0x06003F6A RID: 16234
 		[UnmanagedFunctionPointer(CallingConvention.StdCall, SetLastError = false)]
 		private delegate void GATTCLIENT_ONCHANGED([MarshalAs(UnmanagedType.SysInt)][In] IntPtr Sender, [MarshalAs(UnmanagedType.U2)][In] ushort Handle, [MarshalAs(UnmanagedType.SysInt)][In] IntPtr Value, [MarshalAs(UnmanagedType.U4)][In] uint ValueLen);
 

Assets/Scripts/Scenes/MainController.cs

@@ -68,12 +68,13 @@ public class MainController : MonoBehaviour
         }
         else
         {
-            UIManager.ShowHomePanel();
+            //UIManager.ShowHomePanel();
             //UIManager.ShowUserInfoPanel();
             //UIManager.ShowEditUserPanel();
             //UIManager.ShowBigMapPanel();
             //UIManager.ShowEarthPanel();
         }
+        UIManager.ShowDevicePanel();
     }
 
     // Update is called once per frame

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

@@ -10,7 +10,9 @@ public class DeviceItem : Selectable, IEventSystemHandler, IPointerClickHandler
 {
     private bool isOn;
     private Text mText;
-    private Text mType;
+    private Image network;
+    private Image signal;
+    private float timer = 0f;
     public AbstractDevice DeviceInfo
     {
         get;set;
@@ -19,7 +21,8 @@ public class DeviceItem : Selectable, IEventSystemHandler, IPointerClickHandler
     protected override void Awake()
     {
         mText = this.transform.Find("Name").GetComponent<Text>();
-        mType = this.transform.Find("Type").GetComponent<Text>();
+        network = this.transform.Find("Network").GetComponent<Image>();
+        signal = this.transform.Find("Signal").GetComponent<Image>();
     }
 
     // Start is called before the first frame update
@@ -37,10 +40,41 @@ public class DeviceItem : Selectable, IEventSystemHandler, IPointerClickHandler
         //    this.SetSelectedStyle();
         }
 
-        mType.text = DeviceInfo.Network.ToString();
+        if(DeviceInfo.Network == NetworkType.BLE)
+        {
+            network.sprite = Resources.Load<Sprite>("Images/link_bluetooth_2");
+        }
+        else
+        {
+            signal.enabled = false;
+        }
+        SetSignal();
     }
 
 
+    private void SetSignal()
+    {
+        if(DeviceInfo == null)
+        {
+            return;
+        }
+        //Debug.Log(DeviceInfo.SignalStrength);
+
+        var signalValue = DeviceInfo.SignalStrength * -1;
+        if (signalValue >= 0 && signalValue <= 30)
+        {
+            signal.sprite = Resources.Load<Sprite>("Images/Signal_1");
+        }
+        else if (signalValue > 30 && signalValue <= 70)
+        {
+            signal.sprite = Resources.Load<Sprite>("Images/Signal_2");
+        }
+        else if (signalValue > 70 && signalValue <= 97)
+        {
+            signal.sprite = Resources.Load<Sprite>("Images/Signal_3");
+        }
+    }
+
     public override void OnPointerEnter(PointerEventData eventData)
     {
         //base.OnPointerEnter(eventData);
@@ -59,6 +93,8 @@ public class DeviceItem : Selectable, IEventSystemHandler, IPointerClickHandler
         shadow.enabled = true;
         ColorUtility.TryParseHtmlString("#F93086", out Color color1);
         shadow.effectColor = color1;
+
+        network.color = color1;
     }
 
     public override void Select()
@@ -82,7 +118,15 @@ public class DeviceItem : Selectable, IEventSystemHandler, IPointerClickHandler
     // Update is called once per frame
     void Update()
     {
-        
+        if (timer >= 2)
+        {
+            timer = 0f;
+
+            SetSignal();
+
+            return;
+        }
+        timer += Time.deltaTime;
     }
 
     public void OnPointerClick(PointerEventData eventData)
@@ -110,6 +154,7 @@ public class DeviceItem : Selectable, IEventSystemHandler, IPointerClickHandler
         else
         {
             mText.color = Color.white;
+            network.color = Color.white;
             var shadow = mText.gameObject.GetComponent<Shadow>();
             if (shadow != null)
             {

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

@@ -252,8 +252,17 @@ public class DeviceView : MonoBehaviour
             logo.sprite = sprite1;
 
             title.text = connectedDevice.Name;
-            noDevice.text = connectedDevice.DeviceNumber.ToString();
+            if (connectedDevice.Network == NetworkType.BLE)
+            {
+                noDevice.enabled = false;
+            }
+            else
+            {
+                noDevice.enabled = true;
+                noDevice.text = connectedDevice.DeviceNumber.ToString();
+            }
             searchState.text = "Connecting...";
+
         }
         else if (connectedDevice.State == DeviceState.Connected)
         {

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

@@ -99,6 +99,17 @@ public class BigMapController : PFUIPanel
         var panel = canvas.transform.Find("Panel");
         base.SetRounded(panel, 30f);
 
+
+        var qtcm = this.transform.Find("Map").GetComponent<QuadTreeCameraMovement>();
+        UIManager.AddEvent(panel.gameObject, EventTriggerType.PointerEnter, (e) =>
+        {             
+            qtcm.enabled = false;
+        });
+        UIManager.AddEvent(panel.gameObject, EventTriggerType.PointerExit, (e) =>
+        {
+            qtcm.enabled = true;
+        });
+
         content = panel.Find("Scroll View").Find("Viewport").Find("Content").gameObject;
         var input = panel.Find("InputField");
         base.SetRounded(input, 20f);