提交水文数据，大屏真实数据

Assets/Art/UI/GIF.meta

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

Assets/Art/UI/GIF/img_png_jy.meta

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

Assets/Art/UI/GIF/img_png_jy/001.png.meta

@@ -0,0 +1,135 @@
+fileFormatVersion: 2
+guid: 7104bffb926376d42a0de38b165bc5ac
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  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
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  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
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 128
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 80
+    crunchedCompression: 1
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/UI/GIF/img_png_jy/002.png.meta

@@ -0,0 +1,135 @@
+fileFormatVersion: 2
+guid: 434918e23cfb4c64781a797919c4fa5e
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  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
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  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
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 128
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 80
+    crunchedCompression: 1
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/UI/GIF/img_png_jy/003.png.meta

@@ -0,0 +1,135 @@
+fileFormatVersion: 2
+guid: a961c21f86309464f8ceb2ad86d33d2e
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  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
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  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
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 128
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 80
+    crunchedCompression: 1
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/UI/GIF/img_png_jy/004.png.meta

@@ -0,0 +1,135 @@
+fileFormatVersion: 2
+guid: 43a46db7010cd794da77482afd4b8d64
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  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
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  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
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 128
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 80
+    crunchedCompression: 1
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/UI/GIF/img_png_jy/005.png.meta

@@ -0,0 +1,135 @@
+fileFormatVersion: 2
+guid: f7f89cfb95826134bb53b9890b13e7fc
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  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
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  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
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 128
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 80
+    crunchedCompression: 1
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/UI/GIF/img_png_jy/006.png.meta

@@ -0,0 +1,135 @@
+fileFormatVersion: 2
+guid: 7a08e1448f357444bbeeec163b00c958
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  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
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  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
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 128
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 80
+    crunchedCompression: 1
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/UI/GIF/img_png_jy/007.png.meta

@@ -0,0 +1,135 @@
+fileFormatVersion: 2
+guid: 1a994e2a6ece267409a83da5c96a1461
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  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
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  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
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 128
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 80
+    crunchedCompression: 1
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/UI/GIF/img_png_jy/008.png.meta

@@ -0,0 +1,135 @@
+fileFormatVersion: 2
+guid: 7f78ee9a29e3b5c479c75a04b968940e
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  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
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  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
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 128
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 80
+    crunchedCompression: 1
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/UI/GIF/img_png_jy/009.png.meta

@@ -0,0 +1,135 @@
+fileFormatVersion: 2
+guid: 4bbfa9ca615bc164d9753aeb573918e8
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  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
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  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
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 128
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 80
+    crunchedCompression: 1
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/UI/GIF/img_png_jy/010.png.meta

@@ -0,0 +1,135 @@
+fileFormatVersion: 2
+guid: 95fea9c5c33887c44a4e1e831ccd109c
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  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
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  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
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 128
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 80
+    crunchedCompression: 1
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/UI/YZT/B01/B01Kuang.spriteatlas

@@ -40,7 +40,7 @@ SpriteAtlas:
       blockOffset: 1
       allowAlphaSplitting: 0
       enableRotation: 1
-      enableTightPacking: 1
+      enableTightPacking: 0
       enableAlphaDilation: 0
     secondaryTextureSettings: {}
     variantMultiplier: 1

Assets/Art/UI/YZT/B06/B06.spriteatlas

@@ -40,7 +40,7 @@ SpriteAtlas:
       blockOffset: 1
       allowAlphaSplitting: 0
       enableRotation: 0
-      enableTightPacking: 1
+      enableTightPacking: 0
       enableAlphaDilation: 0
     secondaryTextureSettings: {}
     variantMultiplier: 1

Assets/Art/UI/YZT/img_dot_zsw@2x.png.meta

@@ -0,0 +1,135 @@
+fileFormatVersion: 2
+guid: 219e2fd83cd592043893239e6ad1bf1d
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  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
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  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
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 256
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 80
+    crunchedCompression: 1
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Prefabs/UI/DropUnit.prefab

@@ -35,8 +35,8 @@ RectTransform:
   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: 33.482, y: -8.6163}
-  m_SizeDelta: {x: 97.036, y: 33.1814}
+  m_AnchoredPosition: {x: 29.444, y: 5.6376}
+  m_SizeDelta: {x: 88.969, y: 30.423}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6459042250240962373
 CanvasRenderer:
@@ -68,94 +68,18 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: 85c13d115126ca04ca985ec0156f4c61, type: 3}
-    m_FontSize: 22
+    m_FontSize: 18
     m_FontStyle: 1
     m_BestFit: 0
-    m_MinSize: 2
+    m_MinSize: 1
     m_MaxSize: 40
-    m_Alignment: 0
+    m_Alignment: 3
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: 22
---- !u!1 &1624013431478121196
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 3438031288772285149}
-  - component: {fileID: 476743535333968277}
-  - component: {fileID: 3285726699936540114}
-  m_Layer: 5
-  m_Name: Image
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &3438031288772285149
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1624013431478121196}
-  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_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 5788919897251584376}
-  m_RootOrder: 5
-  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: 32, y: 10.299988}
-  m_SizeDelta: {x: 41.925, y: 41.925}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &476743535333968277
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1624013431478121196}
-  m_CullTransparentMesh: 1
---- !u!114 &3285726699936540114
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1624013431478121196}
-  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: 0
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: e629fea0096f1484c9a566a089871059, 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 &4354463763875380971
 GameObject:
   m_ObjectHideFlags: 0
@@ -191,8 +115,8 @@ RectTransform:
   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: 111.40001, y: -5.600006}
-  m_SizeDelta: {x: 98.6583, y: 68.624}
+  m_AnchoredPosition: {x: 99.65048, y: -3.3776016}
+  m_SizeDelta: {x: 79.3178, y: 35.4109}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8766836728288742198
 CanvasRenderer:
@@ -222,7 +146,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 3e9bd81ca4a29834bbc0afd525451e5c, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 3232c9c33a6bd6b4abd3f4f856303f4a, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -267,7 +191,7 @@ RectTransform:
   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: 53.6307, y: -7.0256014}
+  m_AnchoredPosition: {x: 47.049, y: 5.9322}
   m_SizeDelta: {x: 56.7385, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7122349644628200800
@@ -349,7 +273,7 @@ RectTransform:
   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: 26.9, y: 16}
+  m_AnchoredPosition: {x: 26.895, y: -14.6}
   m_SizeDelta: {x: 83.8706, y: 19.7249}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5551579160232869484
@@ -429,7 +353,6 @@ RectTransform:
   - {fileID: 961031170113577064}
   - {fileID: 4379098532721751069}
   - {fileID: 6346073814117287939}
-  - {fileID: 3438031288772285149}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -460,7 +383,19 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   nameText: {fileID: 3370987044950052234}
   digitText: {fileID: 1225433394572872483}
+  image: {fileID: 4458753958702916661}
   bingObj: {fileID: 0}
+  sprites:
+  - {fileID: 21300000, guid: 7104bffb926376d42a0de38b165bc5ac, type: 3}
+  - {fileID: 21300000, guid: 434918e23cfb4c64781a797919c4fa5e, type: 3}
+  - {fileID: 21300000, guid: a961c21f86309464f8ceb2ad86d33d2e, type: 3}
+  - {fileID: 21300000, guid: 43a46db7010cd794da77482afd4b8d64, type: 3}
+  - {fileID: 21300000, guid: f7f89cfb95826134bb53b9890b13e7fc, type: 3}
+  - {fileID: 21300000, guid: 7a08e1448f357444bbeeec163b00c958, type: 3}
+  - {fileID: 21300000, guid: 1a994e2a6ece267409a83da5c96a1461, type: 3}
+  - {fileID: 21300000, guid: 7f78ee9a29e3b5c479c75a04b968940e, type: 3}
+  - {fileID: 21300000, guid: 4bbfa9ca615bc164d9753aeb573918e8, type: 3}
+  - {fileID: 21300000, guid: 95fea9c5c33887c44a4e1e831ccd109c, type: 3}
 --- !u!1 &7749858048814902718
 GameObject:
   m_ObjectHideFlags: 0
@@ -496,8 +431,8 @@ RectTransform:
   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: 32.476, y: 0}
-  m_SizeDelta: {x: 42.878, y: 71.463}
+  m_AnchoredPosition: {x: 39.6, y: 5.6376}
+  m_SizeDelta: {x: 24, y: 80}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6045668410873031996
 CanvasRenderer:
@@ -527,7 +462,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: d2d0a157101c938438fc7532370a958a, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 95fea9c5c33887c44a4e1e831ccd109c, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1

Assets/Prefabs/UI/SWHeightUnit.prefab

@@ -35,8 +35,8 @@ RectTransform:
   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: 17.48291, y: 34.4}
-  m_SizeDelta: {x: 83.8706, y: 19.7249}
+  m_AnchoredPosition: {x: 0, y: -18.2}
+  m_SizeDelta: {x: 193.4, y: 28.7864}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &884583675277709012
 CanvasRenderer:
@@ -68,12 +68,12 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: 85c13d115126ca04ca985ec0156f4c61, type: 3}
-    m_FontSize: 12
-    m_FontStyle: 0
+    m_FontSize: 16
+    m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 1
     m_MaxSize: 40
-    m_Alignment: 0
+    m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
@@ -118,9 +118,9 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 960, y: 540}
-  m_SizeDelta: {x: 240, y: 108}
-  m_Pivot: {x: 0.87, y: 0.2}
+  m_AnchoredPosition: {x: 865.28125, y: 532}
+  m_SizeDelta: {x: 195, y: 114}
+  m_Pivot: {x: 0.5, y: 0.15}
 --- !u!222 &3008402944905094414
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -149,7 +149,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 9a80eb1725a28a64481412071cc85632, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 219e2fd83cd592043893239e6ad1bf1d, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -173,8 +173,88 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   nameText: {fileID: 8036006287103540530}
   valueText: {fileID: 5786029107628702619}
+  dwzValueText: {fileID: 2821014657487730557}
   bingObj: {fileID: 0}
-  layoutGroup: {fileID: 0}
+--- !u!1 &2348982590723579985
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1340814942816929575}
+  - component: {fileID: 4812520170865313016}
+  - component: {fileID: 3765493677048138652}
+  m_Layer: 5
+  m_Name: Unit
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1340814942816929575
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2348982590723579985}
+  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_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4492321345001509165}
+  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: 96.1, y: -41.100037}
+  m_SizeDelta: {x: 12, y: 30.3042}
+  m_Pivot: {x: 0, y: 0.5}
+--- !u!222 &4812520170865313016
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2348982590723579985}
+  m_CullTransparentMesh: 1
+--- !u!114 &3765493677048138652
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2348982590723579985}
+  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: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 85c13d115126ca04ca985ec0156f4c61, type: 3}
+    m_FontSize: 12
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: m
 --- !u!1 &4092680537418251090
 GameObject:
   m_ObjectHideFlags: 0
@@ -210,7 +290,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: 86, y: -15.1521}
+  m_AnchoredPosition: {x: 96.1, y: -15.1521}
   m_SizeDelta: {x: 12, y: 30.3042}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &1000649346985467138
@@ -290,7 +370,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: 24, y: -15.1521}
+  m_AnchoredPosition: {x: 29.5, y: -15.1521}
   m_SizeDelta: {x: 62, y: 30.3042}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &1796557245521567741
@@ -314,7 +394,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.9450981, g: 0.57254905, b: 0.10980393, a: 1}
+  m_Color: {r: 1, g: 0.585451, b: 0, a: 1}
   m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -366,13 +446,16 @@ RectTransform:
   - {fileID: 2096676826575661560}
   - {fileID: 5484191645523972304}
   - {fileID: 7804796807733395106}
+  - {fileID: 8764758994739287044}
+  - {fileID: 1737269805304864516}
+  - {fileID: 1340814942816929575}
   m_Father: {fileID: 1232816447255914944}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0.000015258789, y: -1.4385147}
-  m_SizeDelta: {x: 112, y: 30.3042}
+  m_AnchoredPosition: {x: 42.75, y: 28.876}
+  m_SizeDelta: {x: 134.4, y: 57.752}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &6970587796717354711
 GameObject:
@@ -453,4 +536,164 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u6C34\u4F4D"
+  m_Text: "\u4E0A\u95F8"
+--- !u!1 &7661421400308574244
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8764758994739287044}
+  - component: {fileID: 5460402660725311710}
+  - component: {fileID: 8575375103872485545}
+  m_Layer: 5
+  m_Name: SW
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8764758994739287044
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7661421400308574244}
+  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_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4492321345001509165}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 0, y: -41.1}
+  m_SizeDelta: {x: 24, y: 30.3042}
+  m_Pivot: {x: 0, y: 0.5}
+--- !u!222 &5460402660725311710
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7661421400308574244}
+  m_CullTransparentMesh: 1
+--- !u!114 &8575375103872485545
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7661421400308574244}
+  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: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 85c13d115126ca04ca985ec0156f4c61, type: 3}
+    m_FontSize: 12
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u4E0B\u95F8"
+--- !u!1 &8089338825089076131
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1737269805304864516}
+  - component: {fileID: 1209400931740749524}
+  - component: {fileID: 2821014657487730557}
+  m_Layer: 5
+  m_Name: Digit
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1737269805304864516
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8089338825089076131}
+  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_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4492321345001509165}
+  m_RootOrder: 4
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 29.5, y: -41.100037}
+  m_SizeDelta: {x: 62, y: 30.3042}
+  m_Pivot: {x: 0, y: 0.5}
+--- !u!222 &1209400931740749524
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8089338825089076131}
+  m_CullTransparentMesh: 1
+--- !u!114 &2821014657487730557
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8089338825089076131}
+  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: 0.585451, b: 0, a: 1}
+  m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 85c13d115126ca04ca985ec0156f4c61, type: 3}
+    m_FontSize: 22
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 40
+    m_Alignment: 0
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 22.22

Assets/Prefabs/UI/XHYZT/GCJK.prefab

@@ -271,7 +271,7 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 1
     m_MaxSize: 40
-    m_Alignment: 4
+    m_Alignment: 3
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
@@ -8880,7 +8880,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: 520, y: -998}
+  m_AnchoredPosition: {x: 520, y: -1028}
   m_SizeDelta: {x: 160, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &2536395915099292973
@@ -16364,8 +16364,8 @@ RectTransform:
   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: -4, y: 0}
-  m_SizeDelta: {x: 40, y: 28.7}
+  m_AnchoredPosition: {x: 16.779785, y: 0}
+  m_SizeDelta: {x: 81.5596, y: 28.7}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2540043382539386219
 CanvasRenderer:
@@ -16402,7 +16402,7 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 1
     m_MaxSize: 40
-    m_Alignment: 4
+    m_Alignment: 3
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0

Assets/Prefabs/UI/XHYZT/YZT.prefab

@@ -7513,7 +7513,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: 85c13d115126ca04ca985ec0156f4c61, type: 3}
-    m_FontSize: 14
+    m_FontSize: 12
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 10
@@ -12404,7 +12404,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: 85c13d115126ca04ca985ec0156f4c61, type: 3}
-    m_FontSize: 14
+    m_FontSize: 12
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 10
@@ -17894,7 +17894,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: 85c13d115126ca04ca985ec0156f4c61, type: 3}
-    m_FontSize: 14
+    m_FontSize: 12
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 10
@@ -22918,7 +22918,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: 85c13d115126ca04ca985ec0156f4c61, type: 3}
-    m_FontSize: 14
+    m_FontSize: 12
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 10
@@ -71715,7 +71715,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 111812538808285058, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_FontData.m_FontSize
-      value: 14
+      value: 12
       objectReference: {fileID: 0}
     - target: {fileID: 147662649263144384, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_RootOrder
@@ -71723,11 +71723,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 326188567858121770, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_FontData.m_FontSize
-      value: 22
+      value: 20
       objectReference: {fileID: 0}
     - target: {fileID: 326188567858121770, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_FontData.m_Alignment
-      value: 0
+      value: 5
       objectReference: {fileID: 0}
     - target: {fileID: 460911096415139328, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_Pivot.x
@@ -71767,7 +71767,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 945803636209886290, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_FontData.m_FontSize
-      value: 22
+      value: 20
       objectReference: {fileID: 0}
     - target: {fileID: 1383460009076738757, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_FontData.m_FontSize
@@ -71861,6 +71861,10 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.x
       value: -322.8
       objectReference: {fileID: 0}
+    - target: {fileID: 1541446365347038603, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -257.6
+      objectReference: {fileID: 0}
     - target: {fileID: 1559715956713332183, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_XAxes.Array.data[0].m_Data.Array.size
       value: 20
@@ -72351,11 +72355,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 2135825325739122964, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_FontData.m_FontSize
-      value: 22
+      value: 20
       objectReference: {fileID: 0}
     - target: {fileID: 2135825325739122964, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_FontData.m_Alignment
-      value: 0
+      value: 4
       objectReference: {fileID: 0}
     - target: {fileID: 2525328614039315907, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_FontData.m_FontSize
@@ -72363,11 +72367,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 2566612413710843487, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_FontData.m_FontSize
-      value: 14
+      value: 12
       objectReference: {fileID: 0}
     - target: {fileID: 2615164947690551326, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_FontData.m_FontSize
-      value: 14
+      value: 12
       objectReference: {fileID: 0}
     - target: {fileID: 2770093976782315242, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_AnchorMax.y
@@ -72423,7 +72427,19 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 3169167877720908528, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_FontData.m_FontSize
-      value: 14
+      value: 12
+      objectReference: {fileID: 0}
+    - target: {fileID: 3207917500950191387, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3207917500950191387, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3207917500950191387, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3352105003607594484, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_LocalScale.x
@@ -72439,15 +72455,23 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 3510888411018517588, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_FontData.m_FontSize
-      value: 14
+      value: 12
       objectReference: {fileID: 0}
     - target: {fileID: 3530059151739218716, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_FontData.m_FontSize
       value: 20
       objectReference: {fileID: 0}
+    - target: {fileID: 3550536312476746078, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: -450
+      objectReference: {fileID: 0}
+    - target: {fileID: 3550536312476746078, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 283.6
+      objectReference: {fileID: 0}
     - target: {fileID: 3849734796666704938, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_FontData.m_FontSize
-      value: 14
+      value: 12
       objectReference: {fileID: 0}
     - target: {fileID: 4009633061977214278, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_Pivot.x
@@ -72483,19 +72507,23 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4060482825754872435, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_FontData.m_FontSize
-      value: 14
+      value: 12
+      objectReference: {fileID: 0}
+    - target: {fileID: 4089993771362847366, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_Text
+      value: 06:00
       objectReference: {fileID: 0}
     - target: {fileID: 4089993771362847366, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_FontData.m_FontSize
-      value: 14
+      value: 12
       objectReference: {fileID: 0}
     - target: {fileID: 4167554329067063442, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_FontData.m_FontSize
-      value: 26
+      value: 24
       objectReference: {fileID: 0}
     - target: {fileID: 4386093845087736489, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_FontData.m_FontSize
-      value: 14
+      value: 12
       objectReference: {fileID: 0}
     - target: {fileID: 4391112173941036512, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_AnchorMax.y
@@ -72523,11 +72551,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4593809646013671186, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_FontData.m_FontSize
-      value: 20
+      value: 18
       objectReference: {fileID: 0}
     - target: {fileID: 4669849478266447156, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_FontData.m_FontSize
-      value: 14
+      value: 12
       objectReference: {fileID: 0}
     - target: {fileID: 4716281616329964945, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_FontData.m_FontSize
@@ -72539,7 +72567,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4813307170030965000, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_FontData.m_FontSize
-      value: 22
+      value: 20
       objectReference: {fileID: 0}
     - target: {fileID: 4852276453729456451, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_AnchorMax.y
@@ -72565,6 +72593,10 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.x
       value: -148.07999
       objectReference: {fileID: 0}
+    - target: {fileID: 5033510405257207482, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -257.6
+      objectReference: {fileID: 0}
     - target: {fileID: 5282194405771002524, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_RootOrder
       value: 13
@@ -72607,7 +72639,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 5781059839288312397, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_FontData.m_FontSize
-      value: 22
+      value: 20
       objectReference: {fileID: 0}
     - target: {fileID: 5975994242751112698, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_LocalScale.x
@@ -72637,21 +72669,53 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.x
       value: -60.72
       objectReference: {fileID: 0}
+    - target: {fileID: 6354638661296059220, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -257.6
+      objectReference: {fileID: 0}
     - target: {fileID: 6629825323659450963, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_AnchoredPosition.x
       value: -25.5
       objectReference: {fileID: 0}
+    - target: {fileID: 6651749329946112543, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6651749329946112543, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6651749329946112543, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6651749329946112543, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -24
+      objectReference: {fileID: 0}
+    - target: {fileID: 6815751226784268551, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6815751226784268551, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6815751226784268551, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 6854920185328929070, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_AnchorMax.x
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 6854920185328929070, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 6854920185328929070, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: -3
       objectReference: {fileID: 0}
     - target: {fileID: 6900245865505881427, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_AnchorMax.y
@@ -72681,13 +72745,17 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.x
       value: -235.44
       objectReference: {fileID: 0}
+    - target: {fileID: 7022941898941240310, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -257.6
+      objectReference: {fileID: 0}
     - target: {fileID: 7357958510519679404, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_AnchorMax.x
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 7357958510519679404, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 7436440575482265988, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_SizeDelta.y
@@ -72695,7 +72763,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7748069699087661519, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_FontData.m_FontSize
-      value: 14
+      value: 12
       objectReference: {fileID: 0}
     - target: {fileID: 7782033956750603786, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_LocalScale.x
@@ -72775,12 +72843,16 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8798129731853488896, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_FontData.m_FontSize
-      value: 24
+      value: 22
       objectReference: {fileID: 0}
     - target: {fileID: 8851685009053881938, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_AnchoredPosition.x
       value: -410.16
       objectReference: {fileID: 0}
+    - target: {fileID: 8851685009053881938, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -257.6
+      objectReference: {fileID: 0}
     - target: {fileID: 8911340057817439627, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_SizeDelta.x
       value: 35
@@ -72801,9 +72873,17 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.x
       value: 26.639984
       objectReference: {fileID: 0}
+    - target: {fileID: 8911340057817439627, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -257.6
+      objectReference: {fileID: 0}
+    - target: {fileID: 8929098227400706064, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_Text
+      value: 06:00
+      objectReference: {fileID: 0}
     - target: {fileID: 8929098227400706064, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_FontData.m_FontSize
-      value: 14
+      value: 12
       objectReference: {fileID: 0}
     - target: {fileID: 9049237788644734330, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_FontData.m_FontSize
@@ -72815,7 +72895,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 9140269857173685474, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_FontData.m_FontSize
-      value: 22
+      value: 20
       objectReference: {fileID: 0}
     - target: {fileID: 9222553401123001510, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_AnchorMax.y

Assets/Scripts/HttpHelper.cs

@@ -97,7 +97,7 @@ public class HttpHelper : MonoBehaviour
             InitXHGKData(); //已完成迁移
         }
 
-        if (GlobalData.pageIndex == PageIndex.Page1)
+        if (GlobalData.pageIndex == PageIndex.Page1 || GlobalData.pageIndex == PageIndex.Page2)
         {
             Debug.Log("HttpInitGCJKData");
             //可以并行，无需等待
@@ -143,7 +143,8 @@ public class HttpHelper : MonoBehaviour
         if (GlobalData.pageIndex == PageIndex.Page2)
         {
             Debug.Log("HttpInitDPSWData");
-            InitDPSWData();
+            //InitDPSWData();
+            InitDPXHQData();
         }
 
         if (GlobalData.pageIndex == PageIndex.Page2)
@@ -327,6 +328,62 @@ public class HttpHelper : MonoBehaviour
         }
     }
 
+    public async Task InitDPXHQData() {
+        GlobalData.floodStorageArea = new FloodStorageArea();
+        bool successInternet = true;
+        UnityWebRequest requestData = UnityWebRequest.Get(ServerAddress.APIGetDPXHQData );
+        requestData.timeout = timeOut;
+        await requestData.SendWebRequest();
+        try
+        {
+            if (requestData.result != UnityWebRequest.Result.Success)
+            {
+                Debug.LogWarning("大屏蓄洪区数据联网不成功，读本地缓存数据,原因:返request不成功");
+                successInternet = false;
+            }
+            else
+            {
+                string postResult = requestData.downloadHandler.text;
+                if (useAes)
+                {
+                    postResult = AESCrypto.Decrypt(postResult);
+
+                }
+                JObject jsonObject = JObject.Parse(postResult);
+
+                // 提取data字段的值
+                JToken dataToken = jsonObject["data"];
+                JToken codeToken = jsonObject["code"];
+                if (codeToken.ToString() == "200")
+                {
+                    //LocationWeatherData data1 =
+                    //    JsonConvert.DeserializeObject<LocationWeatherData>(dataToken.ToString());
+                    //GlobalData.locationWeatherData.Add(data1);
+                }
+                else
+                {
+                    Debug.LogWarning("大屏蓄洪区数据联网不成功，读本地缓存数据,原因:返序列化失败");
+                    successInternet = false;
+                }
+            }
+        }
+        catch (Exception e)
+        {
+            successInternet = false;
+            Debug.LogWarning("大屏蓄洪区数据联网不成功，读本地缓存数据,原因:" + e.ToString());
+        }
+
+        if (!successInternet) {
+            WWW www = new WWW(Application.streamingAssetsPath + "/xhq.json");
+            await new UnityAsync.WaitUntil(() => { return www.isDone; });
+           // Debug.Log(www.text);
+            GlobalData.floodStorageArea =
+                JsonConvert.DeserializeObject<FloodStorageArea>(www.text.ToString());
+            www.Dispose();
+            //Debug.Log(GlobalData.floodStorageArea.pumpStations.value);
+        }
+        requestData.Dispose();
+    }
 
     private async Task InitDPSWData()
     {

Assets/Scripts/UI/Data/GlobalData.cs

@@ -154,6 +154,12 @@ public class GlobalData
     /// </summary>
     public static FloodGateStatusData floorGateData = new FloodGateStatusData();
 
+
+    /// <summary>
+    /// 大屏蓄洪区数据
+    /// </summary>
+    public static FloodStorageArea floodStorageArea = new FloodStorageArea();
+
     /// <summary>
     /// 大屏水文数据
     /// </summary>

Assets/Scripts/UI/Tools/ServerAddress.cs

@@ -153,6 +153,11 @@ public class ServerAddress
     /// </summary>
     public static string APIGetFloodGateData = YZTServerAddress + "/open/data/gateStatusData";
 
+    /// <summary>
+    /// 获取大屏的蓄洪区数据
+    /// </summary>
+    public static string APIGetDPXHQData = YZTServerAddress + "/open/data/xxxxxxxxx";
+
     /// <summary>
     /// 获取大屏的水文数据
     /// </summary>

Assets/Scripts/UI/Tools/TipShower.cs

@@ -0,0 +1,31 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.EventSystems;
+using UnityEngine.UI;
+public class TipShower : MonoBehaviour,IPointerEnterHandler,IPointerExitHandler
+{
+
+    public RectTransform tips;
+
+    public string data;
+    public void OnPointerEnter(PointerEventData eventData)
+    {
+        currentShower = this;
+        tips.anchoredPosition = this.GetComponent<RectTransform>().anchoredPosition;
+        tips.gameObject.SetActive(true);
+        tips.GetComponentInChildren<Text>().text = data;
+        LayoutRebuilder.ForceRebuildLayoutImmediate(tips.GetChild(0).GetComponent<RectTransform>()); ; // 强制重新计算布局
+        LayoutRebuilder.ForceRebuildLayoutImmediate(tips.GetComponent<RectTransform>()); // 强制重新计算布局
+    }
+    public static TipShower currentShower = null;
+    public void OnPointerExit(PointerEventData eventData)
+    {
+        if (currentShower == this) {
+            tips.gameObject.SetActive(false);
+            currentShower = null;
+        }
+    }
+
+   
+}

Assets/Scripts/UI/Tools/TipShower.cs.meta

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

Assets/Scripts/UI/UIView/BigScreen/BigScreenLayer.cs

@@ -21,7 +21,7 @@ public class FloodGate
     //public float CurrentFlow;
     [FormerlySerializedAs("CurrentOpening")] public float opening_degree;
     public bool gate_breakdown;
-    public string updateTime=>GetTime();
+    public string updateTime => GetTime();
     public long record_ts;
     public string station_name;
 
@@ -70,7 +70,27 @@ public class FloodGateStatusData
     }
 }
 
+[Serializable]
+public class ValueWithDescription
+{
+    public float value;
+    public string description;
+}
+
 
+[Serializable]
+public class FloodStorageArea
+{
+    public ValueWithDescription area;
+    public ValueWithDescription leveeLength;
+    public ValueWithDescription storageCapacity;
+    public ValueWithDescription designWaterLevel;
+    public ValueWithDescription operationStandard;
+    public ValueWithDescription safetyZones;
+    public ValueWithDescription gateStations;
+    public ValueWithDescription pumpStations;
+    public ValueWithDescription drainageStations;
+}
 
 
 [System.Serializable]
@@ -141,6 +161,7 @@ public class BigScreenLayer : MonoBehaviour
 {
     public VerticalLayoutGroup content;
 
+    public Text[] floodStorageAreaData;
 
     public RectTransform znz;
 
@@ -230,6 +251,8 @@ public class BigScreenLayer : MonoBehaviour
         _obsSearchInputField = this.transform.Find("BigSc/ShiPinJuZhen/InputField").GetComponent<InputField>();
         _obsSearchInputField.onValueChanged.AddListener(SearchObsItem);
 
+        InitFloodAreaData();
+
         InitFloodGateData();
 
         InitHydrologicalData();
@@ -438,7 +461,7 @@ public class BigScreenLayer : MonoBehaviour
     {
         await new WaitUntil(() =>
         {
-            return GlobalData.locationWeatherData.Count > 0;
+            return GlobalData.swDatas.Count > 0 && GlobalData.qXZDatas.Count > 0 && GlobalData.sWZDatas.Count > 0;
         });
         ChangeLocationWeatherData(0);
         swDrop0.onValueChanged.AddListener((index) =>
@@ -449,333 +472,427 @@ public class BigScreenLayer : MonoBehaviour
 
     private void ChangeLocationWeatherData(int index)
     {
-        swValue1.text = GlobalData.locationWeatherData[index].currentWaterLevel.ToString();
-        swValue2.text = GlobalData.locationWeatherData[index].rainfall.ToString();
-        swValue3.text = GlobalData.locationWeatherData[index].temperature.ToString();
-        swValue4.text = GlobalData.locationWeatherData[index].weather.ToString();
-        swValue5.text = GlobalData.locationWeatherData[index].floodDischarge.ToString();
-    }
-    private async Task InitFloodGateData()
-    {
-        await new WaitUntil(() =>
-        {
-            return GlobalData.floorGateData.success;
-        });
-       
-        await new WaitUntil(() =>
-        {
-            return GlobalData.buYuanSensorData.data.Count>0&&GlobalData.taoKouSensorData.data.Count>0;
-        });
-        
-        floodTexts[0].text = (GlobalData.floorGateData.BuYuanOperationalGates + GlobalData.floorGateData.TaoKouOperationalGates).ToString();
-        floodTexts[1].text = (GlobalData.floorGateData.BuYuanTotalGates + GlobalData.floorGateData.TaoKouTotalGates - GlobalData.floorGateData.BuYuanOperationalGates - GlobalData.floorGateData.TaoKouOperationalGates).ToString();
-        floodTexts[2].text = (GlobalData.floorGateData.BuYuanTotalGates + GlobalData.floorGateData.TaoKouTotalGates).ToString();
-        floodButton.onClick.AddListener(() =>
-        {
-            popWindow.gameObject.SetActive(true);
-        });
-        floodListExitBtn.onClick.AddListener(() =>
-        {
-            popWindow.gameObject.SetActive(false);
-        });
-        floodListBtns[0].onClick.AddListener(() =>
-        {
-            floodListBtns[0].GetComponent<Image>().sprite = sprites[0];
-            floodListBtns[1].GetComponent<Image>().sprite = sprites[1];
-            floodLists[0].transform.parent.parent.parent.gameObject.SetActive(true);
-            floodLists[1].transform.parent.parent.parent.gameObject.SetActive(false);
-        });
-        floodListBtns[1].onClick.AddListener(() =>
-        {
-            floodListBtns[0].GetComponent<Image>().sprite = sprites[1];
-            floodListBtns[1].GetComponent<Image>().sprite = sprites[0];
-            floodLists[0].transform.parent.parent.parent.gameObject.SetActive(false);
-            floodLists[1].transform.parent.parent.parent.gameObject.SetActive(true);
-        });
-        var buyuanData = GlobalData.buYuanSensorData.data;
-        for (int i = 0; i < buyuanData.Count; i++)
-        {
-            GameObject floodGateDataObj = Instantiate(floodDataPrefab);
-            floodGateDataObj.transform.SetParent(floodLists[0].transform);
-            floodGateDataObj.transform.localScale = Vector3.one;
-            floodGateDataObj.transform.GetChild(1).GetComponent<Text>().text = (i + 1).ToString("00") + "号闸门";
-            floodGateDataObj.transform.GetChild(7).GetComponent<Text>().text = buyuanData[i].gate_opening ? "开启" : "关闭";
-            floodGateDataObj.transform.GetChild(8).GetComponent<Text>().text =   "- m³/s";
-            floodGateDataObj.transform.GetChild(9).GetComponent<Text>().text =   "m";
-            floodGateDataObj.transform.GetChild(10).GetComponent<Text>().text = buyuanData[i].opening_degree*0.01 + "m";
-            floodGateDataObj.transform.GetChild(11).GetComponent<Text>().text = buyuanData[i].gate_breakdown ? "故障":"正常";
+        string swkey = "";
+        string qxKey = "";
+        string swKey = "";
+        if (index == 0)
+        {
+            swkey = "补元(上)";
+            qxKey = "新滩";
+            swKey = "新滩";
         }
-        var taokouData = GlobalData.taoKouSensorData.data;
-        for (int i = 0; i < taokouData.Count; i++)
-        {
-            GameObject floodGateDataObj = Instantiate(floodDataPrefab);
-            floodGateDataObj.transform.SetParent(floodLists[1].transform);
-            floodGateDataObj.transform.localScale = Vector3.one;
-            floodGateDataObj.transform.GetChild(1).GetComponent<Text>().text = (i + 1).ToString("00") + "号闸门";
-            floodGateDataObj.transform.GetChild(7).GetComponent<Text>().text = taokouData[i].gate_opening ? "开启" : "关闭";
-            floodGateDataObj.transform.GetChild(8).GetComponent<Text>().text =   "- m³/s";
-            floodGateDataObj.transform.GetChild(9).GetComponent<Text>().text =   "m";
-            floodGateDataObj.transform.GetChild(10).GetComponent<Text>().text = taokouData[i].opening_degree*0.01 + "m";
-            floodGateDataObj.transform.GetChild(11).GetComponent<Text>().text = taokouData[i].gate_breakdown ? "故障":"正常";
+        else
+        {
+            swkey = "套口(上)";
+            qxKey = "大沙";
+            swKey = "大沙";
         }
-        // for (int i = 0; i < GlobalData.floorGateData.BuYuan.FloodGates.Length; i++)
-        // {
-        //     GameObject floodGateDataObj = Instantiate(floodDataPrefab);
-        //     floodGateDataObj.transform.SetParent(floodLists[0].transform);
-        //     floodGateDataObj.transform.localScale = Vector3.one;
-        //     floodGateDataObj.transform.GetChild(1).GetComponent<Text>().text = (i + 1).ToString("00") + "号闸门";
-        //     floodGateDataObj.transform.GetChild(7).GetComponent<Text>().text = GlobalData.floorGateData.BuYuan.FloodGates[i].IsOpen ? "开启" : "关闭";
-        //     floodGateDataObj.transform.GetChild(8).GetComponent<Text>().text = GlobalData.floorGateData.BuYuan.FloodGates[i].CurrentFlow + "m³/s";
-        //     floodGateDataObj.transform.GetChild(9).GetComponent<Text>().text = GlobalData.floorGateData.BuYuan.CurrentWaterLevel + "m";
-        //     floodGateDataObj.transform.GetChild(10).GetComponent<Text>().text = GlobalData.floorGateData.BuYuan.FloodGates[i].CurrentOpening + "°";
-        //     switch (GlobalData.floorGateData.BuYuan.FloodGates[i].Status)
-        //     {
-        //         case 0:
-        //             floodGateDataObj.transform.GetChild(11).GetComponent<Text>().text = "故障";
-        //             break;
-        //         case 1:
-        //             floodGateDataObj.transform.GetChild(11).GetComponent<Text>().text = "正常";
-        //             break;
-        //     }
-        // }
-        // for (int i = 0; i < GlobalData.floorGateData.TaoKou.FloodGates.Length; i++)
-        // {
-        //     GameObject floodGateDataObj = Instantiate(floodDataPrefab);
-        //     floodGateDataObj.transform.SetParent(floodLists[1].transform);
-        //     floodGateDataObj.transform.localScale = Vector3.one;
-        //     floodGateDataObj.transform.GetChild(1).GetComponent<Text>().text = (i + 1).ToString("00") + "号闸门";
-        //     floodGateDataObj.transform.GetChild(7).GetComponent<Text>().text = GlobalData.floorGateData.TaoKou.FloodGates[i].IsOpen ? "开启" : "关闭";
-        //     floodGateDataObj.transform.GetChild(8).GetComponent<Text>().text = GlobalData.floorGateData.TaoKou.FloodGates[i].CurrentFlow + "m³/s";
-        //     floodGateDataObj.transform.GetChild(9).GetComponent<Text>().text = GlobalData.floorGateData.TaoKou.CurrentWaterLevel + "m";
-        //     floodGateDataObj.transform.GetChild(10).GetComponent<Text>().text = GlobalData.floorGateData.TaoKou.FloodGates[i].CurrentOpening + "°";
-        //     switch (GlobalData.floorGateData.TaoKou.FloodGates[i].Status)
-        //     {
-        //         case 0:
-        //             floodGateDataObj.transform.GetChild(11).GetComponent<Text>().text = "故障";
-        //             break;
-        //         case 1:
-        //             floodGateDataObj.transform.GetChild(11).GetComponent<Text>().text = "正常";
-        //             break;
-        //     }
-        // }
-        List<double> doubles = new List<double>();
-        doubles.Add(90);
-        doubles.Add(100);
-        floodRingChart.UpdateData(0, 0, doubles);
 
+        float swH = -1.0f;
+        for (int i = 0; i < GlobalData.swDatas.Count; i++) {
+            if (GlobalData.swDatas[i].stnm == swkey) {
+                swH = GlobalData.swDatas[i].upz ?? 0;
+                break;
+            }
+        }
 
-    }
-
-    private async Task InitInspectionStatistics()
-    {
-        await new WaitUntil(() =>
+        int qxIndex = 0;
+        for (int i = 0; i < GlobalData.qXZDatas.Count; i++)
         {
-            return GlobalData.InspectionStat.Count > 0;
-        });
-        currentYunIndex = 0;
-        yunValue1.text = GlobalData.InspectionStat[0].daily.operationStaffCount.ToString();
-        yunValue2.text = GlobalData.InspectionStat[0].daily.inspectionTasksCount.ToString();
-        yunValue3.text = GlobalData.InspectionStat[0].daily.inspectionKilometers.ToString();
-        yunValue4.text = GlobalData.InspectionStat[0].daily.faultHazardCount.ToString();
-        yunValue5.text = GlobalData.InspectionStat[0].daily.processedFaultCount.ToString();
-        yunValue6.text = GlobalData.InspectionStat[0].daily.engineeringMaintenanceCount.ToString();
-        yunDrop0.onValueChanged.AddListener((index) =>
-        {
-            currentYunIndex = index;
-            SwitchStationStat(yunDrop1.value);
-        });
-        yunDrop1.onValueChanged.AddListener((index) =>
+            if (GlobalData.qXZDatas[i].STNM.Contains(qxKey))
+            {
+                qxIndex = i;
+                break;
+            }
+        }
+
+        int swIndex = 0;
+        for (int i = 0; i < GlobalData.sWZDatas.Count; i++)
         {
-            SwitchStationStat(index);
-        });
-    }
+            if (GlobalData.sWZDatas[i].STNM.Contains(swkey))
+            {
+                swIndex = i;
+                break;
+            }
+        }
 
-    void SwitchStationStat(int index)
-    {
-        switch (index)
-        {
-            case 0:
-                yunValue1.text = GlobalData.InspectionStat[currentYunIndex].daily.operationStaffCount.ToString();
-                yunValue2.text = GlobalData.InspectionStat[currentYunIndex].daily.inspectionTasksCount.ToString();
-                yunValue3.text = GlobalData.InspectionStat[currentYunIndex].daily.inspectionKilometers.ToString();
-                yunValue4.text = GlobalData.InspectionStat[currentYunIndex].daily.faultHazardCount.ToString();
-                yunValue5.text = GlobalData.InspectionStat[currentYunIndex].daily.processedFaultCount.ToString();
-                yunValue6.text = GlobalData.InspectionStat[currentYunIndex].daily.engineeringMaintenanceCount.ToString();
+        swValue1.text = swH.ToString();
+        swValue2.text = GlobalData.qXZDatas[qxIndex].dropSum6.ToString();
+        //swValue3.text = GlobalData.locationWeatherData[index].temperature.ToString();
+        string we = GlobalData.sWZDatas[swIndex].wth.ToString();
+        string weatherText = "";
+        switch (we)
+        {
+            case "9":
+                weatherText = "晴天";
                 break;
-            case 1:
-                yunValue1.text = GlobalData.InspectionStat[currentYunIndex].monthly.operationStaffCount.ToString();
-                yunValue2.text = GlobalData.InspectionStat[currentYunIndex].monthly.inspectionTasksCount.ToString();
-                yunValue3.text = GlobalData.InspectionStat[currentYunIndex].monthly.inspectionKilometers.ToString();
-                yunValue4.text = GlobalData.InspectionStat[currentYunIndex].monthly.faultHazardCount.ToString();
-                yunValue5.text = GlobalData.InspectionStat[currentYunIndex].monthly.processedFaultCount.ToString();
-                yunValue6.text = GlobalData.InspectionStat[currentYunIndex].monthly.engineeringMaintenanceCount.ToString();
+            case "8":
+                weatherText = "阴天";
                 break;
-            case 2:
-                yunValue1.text = GlobalData.InspectionStat[currentYunIndex].yearly.operationStaffCount.ToString();
-                yunValue2.text = GlobalData.InspectionStat[currentYunIndex].yearly.inspectionTasksCount.ToString();
-                yunValue3.text = GlobalData.InspectionStat[currentYunIndex].yearly.inspectionKilometers.ToString();
-                yunValue4.text = GlobalData.InspectionStat[currentYunIndex].yearly.faultHazardCount.ToString();
-                yunValue5.text = GlobalData.InspectionStat[currentYunIndex].yearly.processedFaultCount.ToString();
-                yunValue6.text = GlobalData.InspectionStat[currentYunIndex].yearly.engineeringMaintenanceCount.ToString();
+            case "7":
+                weatherText = "雨天";
+                break;
+            case "6":
+                weatherText = "雨夹雪";
+                break;
+            case "5":
+                weatherText = "雪天";
                 break;
-
         }
+        swValue4.text = weatherText;
+        //swValue5.text = GlobalData.locationWeatherData[index].floodDischarge.ToString();
     }
 
-    private async Task InitLayerBtns()
-    {
-        await new WaitUntil(() =>
+    private async Task InitFloodAreaData()
         {
-            return GlobalData.layerUnitDatas.Count > 0;
-        });
-        layerBtns = new List<LayerBtn>();
-        for (int i = 0; i < zTLayer.layerDatas.Length; i++)
+            //Debug.Log(111111111);
+            await new WaitUntil(() =>
+            {
+                if (GlobalData.floodStorageArea.pumpStations != null)
+                    return GlobalData.floodStorageArea.pumpStations.value > 0;
+                return false;
+            });
+            //Debug.Log(111111111);
+            floodStorageAreaData[0].text = GlobalData.floodStorageArea.area.value + "km²";
+            floodStorageAreaData[0].transform.parent.GetComponent<TipShower>().data = GlobalData.floodStorageArea.area.description;
+            floodStorageAreaData[1].text = GlobalData.floodStorageArea.leveeLength.value + "km";
+            floodStorageAreaData[1].transform.parent.GetComponent<TipShower>().data = GlobalData.floodStorageArea.leveeLength.description;
+            floodStorageAreaData[2].text = GlobalData.floodStorageArea.storageCapacity.value + "亿m";
+            floodStorageAreaData[2].transform.parent.GetComponent<TipShower>().data = GlobalData.floodStorageArea.storageCapacity.description;
+            floodStorageAreaData[3].text = GlobalData.floodStorageArea.designWaterLevel.value + "m";
+            floodStorageAreaData[3].transform.parent.GetComponent<TipShower>().data = GlobalData.floodStorageArea.designWaterLevel.description;
+            floodStorageAreaData[4].text = GlobalData.floodStorageArea.operationStandard.value + "级";
+            floodStorageAreaData[4].transform.parent.GetComponent<TipShower>().data = GlobalData.floodStorageArea.operationStandard.description;
+            floodStorageAreaData[5].text = GlobalData.floodStorageArea.safetyZones.value + "项";
+            floodStorageAreaData[5].transform.parent.GetComponent<TipShower>().data = GlobalData.floodStorageArea.safetyZones.description;
+            floodStorageAreaData[6].text = GlobalData.floodStorageArea.gateStations.value + "项";
+            floodStorageAreaData[6].transform.parent.GetComponent<TipShower>().data = GlobalData.floodStorageArea.gateStations.description;
+            floodStorageAreaData[7].text = GlobalData.floodStorageArea.pumpStations.value + "项";
+            floodStorageAreaData[7].transform.parent.GetComponent<TipShower>().data = GlobalData.floodStorageArea.pumpStations.description;
+            floodStorageAreaData[8].text = GlobalData.floodStorageArea.drainageStations.value + "项";
+            floodStorageAreaData[8].transform.parent.GetComponent<TipShower>().data = GlobalData.floodStorageArea.drainageStations.description;
+        }
+        private async Task InitFloodGateData()
+        {
+            await new WaitUntil(() =>
+            {
+                return GlobalData.floorGateData.success;
+            });
+
+            await new WaitUntil(() =>
+            {
+                return GlobalData.buYuanSensorData.data.Count > 0 && GlobalData.taoKouSensorData.data.Count > 0;
+            });
+
+            floodTexts[0].text = (GlobalData.floorGateData.BuYuanOperationalGates + GlobalData.floorGateData.TaoKouOperationalGates).ToString();
+            floodTexts[1].text = (GlobalData.floorGateData.BuYuanTotalGates + GlobalData.floorGateData.TaoKouTotalGates - GlobalData.floorGateData.BuYuanOperationalGates - GlobalData.floorGateData.TaoKouOperationalGates).ToString();
+            floodTexts[2].text = (GlobalData.floorGateData.BuYuanTotalGates + GlobalData.floorGateData.TaoKouTotalGates).ToString();
+            floodButton.onClick.AddListener(() =>
+            {
+                popWindow.gameObject.SetActive(true);
+            });
+            floodListExitBtn.onClick.AddListener(() =>
+            {
+                popWindow.gameObject.SetActive(false);
+            });
+            floodListBtns[0].onClick.AddListener(() =>
+            {
+                floodListBtns[0].GetComponent<Image>().sprite = sprites[0];
+                floodListBtns[1].GetComponent<Image>().sprite = sprites[1];
+                floodLists[0].transform.parent.parent.parent.gameObject.SetActive(true);
+                floodLists[1].transform.parent.parent.parent.gameObject.SetActive(false);
+            });
+            floodListBtns[1].onClick.AddListener(() =>
+            {
+                floodListBtns[0].GetComponent<Image>().sprite = sprites[1];
+                floodListBtns[1].GetComponent<Image>().sprite = sprites[0];
+                floodLists[0].transform.parent.parent.parent.gameObject.SetActive(false);
+                floodLists[1].transform.parent.parent.parent.gameObject.SetActive(true);
+            });
+            var buyuanData = GlobalData.buYuanSensorData.data;
+            for (int i = 0; i < buyuanData.Count; i++)
+            {
+                GameObject floodGateDataObj = Instantiate(floodDataPrefab);
+                floodGateDataObj.transform.SetParent(floodLists[0].transform);
+                floodGateDataObj.transform.localScale = Vector3.one;
+                floodGateDataObj.transform.GetChild(1).GetComponent<Text>().text = (i + 1).ToString("00") + "号闸门";
+                floodGateDataObj.transform.GetChild(7).GetComponent<Text>().text = buyuanData[i].gate_opening ? "开启" : "关闭";
+                floodGateDataObj.transform.GetChild(8).GetComponent<Text>().text = "- m³/s";
+                floodGateDataObj.transform.GetChild(9).GetComponent<Text>().text = "m";
+                floodGateDataObj.transform.GetChild(10).GetComponent<Text>().text = buyuanData[i].opening_degree * 0.01 + "m";
+                floodGateDataObj.transform.GetChild(11).GetComponent<Text>().text = buyuanData[i].gate_breakdown ? "故障" : "正常";
+            }
+            var taokouData = GlobalData.taoKouSensorData.data;
+            for (int i = 0; i < taokouData.Count; i++)
+            {
+                GameObject floodGateDataObj = Instantiate(floodDataPrefab);
+                floodGateDataObj.transform.SetParent(floodLists[1].transform);
+                floodGateDataObj.transform.localScale = Vector3.one;
+                floodGateDataObj.transform.GetChild(1).GetComponent<Text>().text = (i + 1).ToString("00") + "号闸门";
+                floodGateDataObj.transform.GetChild(7).GetComponent<Text>().text = taokouData[i].gate_opening ? "开启" : "关闭";
+                floodGateDataObj.transform.GetChild(8).GetComponent<Text>().text = "- m³/s";
+                floodGateDataObj.transform.GetChild(9).GetComponent<Text>().text = "m";
+                floodGateDataObj.transform.GetChild(10).GetComponent<Text>().text = taokouData[i].opening_degree * 0.01 + "m";
+                floodGateDataObj.transform.GetChild(11).GetComponent<Text>().text = taokouData[i].gate_breakdown ? "故障" : "正常";
+            }
+            // for (int i = 0; i < GlobalData.floorGateData.BuYuan.FloodGates.Length; i++)
+            // {
+            //     GameObject floodGateDataObj = Instantiate(floodDataPrefab);
+            //     floodGateDataObj.transform.SetParent(floodLists[0].transform);
+            //     floodGateDataObj.transform.localScale = Vector3.one;
+            //     floodGateDataObj.transform.GetChild(1).GetComponent<Text>().text = (i + 1).ToString("00") + "号闸门";
+            //     floodGateDataObj.transform.GetChild(7).GetComponent<Text>().text = GlobalData.floorGateData.BuYuan.FloodGates[i].IsOpen ? "开启" : "关闭";
+            //     floodGateDataObj.transform.GetChild(8).GetComponent<Text>().text = GlobalData.floorGateData.BuYuan.FloodGates[i].CurrentFlow + "m³/s";
+            //     floodGateDataObj.transform.GetChild(9).GetComponent<Text>().text = GlobalData.floorGateData.BuYuan.CurrentWaterLevel + "m";
+            //     floodGateDataObj.transform.GetChild(10).GetComponent<Text>().text = GlobalData.floorGateData.BuYuan.FloodGates[i].CurrentOpening + "°";
+            //     switch (GlobalData.floorGateData.BuYuan.FloodGates[i].Status)
+            //     {
+            //         case 0:
+            //             floodGateDataObj.transform.GetChild(11).GetComponent<Text>().text = "故障";
+            //             break;
+            //         case 1:
+            //             floodGateDataObj.transform.GetChild(11).GetComponent<Text>().text = "正常";
+            //             break;
+            //     }
+            // }
+            // for (int i = 0; i < GlobalData.floorGateData.TaoKou.FloodGates.Length; i++)
+            // {
+            //     GameObject floodGateDataObj = Instantiate(floodDataPrefab);
+            //     floodGateDataObj.transform.SetParent(floodLists[1].transform);
+            //     floodGateDataObj.transform.localScale = Vector3.one;
+            //     floodGateDataObj.transform.GetChild(1).GetComponent<Text>().text = (i + 1).ToString("00") + "号闸门";
+            //     floodGateDataObj.transform.GetChild(7).GetComponent<Text>().text = GlobalData.floorGateData.TaoKou.FloodGates[i].IsOpen ? "开启" : "关闭";
+            //     floodGateDataObj.transform.GetChild(8).GetComponent<Text>().text = GlobalData.floorGateData.TaoKou.FloodGates[i].CurrentFlow + "m³/s";
+            //     floodGateDataObj.transform.GetChild(9).GetComponent<Text>().text = GlobalData.floorGateData.TaoKou.CurrentWaterLevel + "m";
+            //     floodGateDataObj.transform.GetChild(10).GetComponent<Text>().text = GlobalData.floorGateData.TaoKou.FloodGates[i].CurrentOpening + "°";
+            //     switch (GlobalData.floorGateData.TaoKou.FloodGates[i].Status)
+            //     {
+            //         case 0:
+            //             floodGateDataObj.transform.GetChild(11).GetComponent<Text>().text = "故障";
+            //             break;
+            //         case 1:
+            //             floodGateDataObj.transform.GetChild(11).GetComponent<Text>().text = "正常";
+            //             break;
+            //     }
+            // }
+            List<double> doubles = new List<double>();
+            doubles.Add(90);
+            doubles.Add(100);
+            floodRingChart.UpdateData(0, 0, doubles);
+
+
+        }
+
+        private async Task InitInspectionStatistics()
         {
-            LayerBtn layerBtn = Instantiate(zTLayer.layerBtnPrefab);
+            await new WaitUntil(() =>
+            {
+                return GlobalData.InspectionStat.Count > 0;
+            });
+            currentYunIndex = 0;
+            yunValue1.text = GlobalData.InspectionStat[0].daily.operationStaffCount.ToString();
+            yunValue2.text = GlobalData.InspectionStat[0].daily.inspectionTasksCount.ToString();
+            yunValue3.text = GlobalData.InspectionStat[0].daily.inspectionKilometers.ToString();
+            yunValue4.text = GlobalData.InspectionStat[0].daily.faultHazardCount.ToString();
+            yunValue5.text = GlobalData.InspectionStat[0].daily.processedFaultCount.ToString();
+            yunValue6.text = GlobalData.InspectionStat[0].daily.engineeringMaintenanceCount.ToString();
+            yunDrop0.onValueChanged.AddListener((index) =>
+            {
+                currentYunIndex = index;
+                SwitchStationStat(yunDrop1.value);
+            });
+            yunDrop1.onValueChanged.AddListener((index) =>
+            {
+                SwitchStationStat(index);
+            });
+        }
 
-            layerBtn.SetUseful(false);
-            int index = i;
-            int num = 0;
-            if (i == 0)
+        void SwitchStationStat(int index)
+        {
+            switch (index)
             {
-                List<LayerUnitData> tempDatas = new List<LayerUnitData>(GlobalData.layerUnitDatas);
-                for (int j = 0; j < tempDatas.Count; j++)
+                case 0:
+                    yunValue1.text = GlobalData.InspectionStat[currentYunIndex].daily.operationStaffCount.ToString();
+                    yunValue2.text = GlobalData.InspectionStat[currentYunIndex].daily.inspectionTasksCount.ToString();
+                    yunValue3.text = GlobalData.InspectionStat[currentYunIndex].daily.inspectionKilometers.ToString();
+                    yunValue4.text = GlobalData.InspectionStat[currentYunIndex].daily.faultHazardCount.ToString();
+                    yunValue5.text = GlobalData.InspectionStat[currentYunIndex].daily.processedFaultCount.ToString();
+                    yunValue6.text = GlobalData.InspectionStat[currentYunIndex].daily.engineeringMaintenanceCount.ToString();
+                    break;
+                case 1:
+                    yunValue1.text = GlobalData.InspectionStat[currentYunIndex].monthly.operationStaffCount.ToString();
+                    yunValue2.text = GlobalData.InspectionStat[currentYunIndex].monthly.inspectionTasksCount.ToString();
+                    yunValue3.text = GlobalData.InspectionStat[currentYunIndex].monthly.inspectionKilometers.ToString();
+                    yunValue4.text = GlobalData.InspectionStat[currentYunIndex].monthly.faultHazardCount.ToString();
+                    yunValue5.text = GlobalData.InspectionStat[currentYunIndex].monthly.processedFaultCount.ToString();
+                    yunValue6.text = GlobalData.InspectionStat[currentYunIndex].monthly.engineeringMaintenanceCount.ToString();
+                    break;
+                case 2:
+                    yunValue1.text = GlobalData.InspectionStat[currentYunIndex].yearly.operationStaffCount.ToString();
+                    yunValue2.text = GlobalData.InspectionStat[currentYunIndex].yearly.inspectionTasksCount.ToString();
+                    yunValue3.text = GlobalData.InspectionStat[currentYunIndex].yearly.inspectionKilometers.ToString();
+                    yunValue4.text = GlobalData.InspectionStat[currentYunIndex].yearly.faultHazardCount.ToString();
+                    yunValue5.text = GlobalData.InspectionStat[currentYunIndex].yearly.processedFaultCount.ToString();
+                    yunValue6.text = GlobalData.InspectionStat[currentYunIndex].yearly.engineeringMaintenanceCount.ToString();
+                    break;
+
+            }
+        }
+
+        private async Task InitLayerBtns()
+        {
+            await new WaitUntil(() =>
+            {
+                return GlobalData.layerUnitDatas.Count > 0;
+            });
+            layerBtns = new List<LayerBtn>();
+            for (int i = 0; i < zTLayer.layerDatas.Length; i++)
+            {
+                LayerBtn layerBtn = Instantiate(zTLayer.layerBtnPrefab);
+
+                layerBtn.SetUseful(false);
+                int index = i;
+                int num = 0;
+                if (i == 0)
                 {
-                    if (tempDatas[j].special == "1")
+                    List<LayerUnitData> tempDatas = new List<LayerUnitData>(GlobalData.layerUnitDatas);
+                    for (int j = 0; j < tempDatas.Count; j++)
                     {
-                        int tempJ = j;
-                        SecLayerBtn secLayerBtn = Instantiate(zTLayer.secLayerBtnPrefab);
-                        secLayerBtn.SetLayerBtnData(tempDatas[j].name);
-                        secLayerBtn.GetComponent<RectTransform>().SetParent(layerBtn.secContent.GetComponent<RectTransform>());
-                        secLayerBtn.btn.onClick.AddListener(() =>
+                        if (tempDatas[j].special == "1")
                         {
-                            StaticLod.instance.OnFoucusStatic(tempDatas[tempJ].namePri);
-                            miniMap.gameObject.SetActive(false);
-                            ChangeRightContent(tempJ);
-                        });
-                        num++;
+                            int tempJ = j;
+                            SecLayerBtn secLayerBtn = Instantiate(zTLayer.secLayerBtnPrefab);
+                            secLayerBtn.SetLayerBtnData(tempDatas[j].name);
+                            secLayerBtn.GetComponent<RectTransform>().SetParent(layerBtn.secContent.GetComponent<RectTransform>());
+                            secLayerBtn.btn.onClick.AddListener(() =>
+                            {
+                                StaticLod.instance.OnFoucusStatic(tempDatas[tempJ].namePri);
+                                miniMap.gameObject.SetActive(false);
+                                ChangeRightContent(tempJ);
+                            });
+                            num++;
+                        }
                     }
+                    layerBtn.secContent.gameObject.SetActive(true);
                 }
-                layerBtn.secContent.gameObject.SetActive(true);
-            }
-            else
-            {
-                List<LayerUnitData> tempDatas = new List<LayerUnitData>(GlobalData.layerUnitDatas);
-                for (int j = 0; j < tempDatas.Count; j++)
+                else
                 {
-                    Debug.Log(zTLayer.layerDatas.Length);
-                    Debug.Log(i);
-                    if ((int)tempDatas[j].type == zTLayer.layerDatas[i].layerID)
+                    List<LayerUnitData> tempDatas = new List<LayerUnitData>(GlobalData.layerUnitDatas);
+                    for (int j = 0; j < tempDatas.Count; j++)
                     {
-                        int tempJ = j;
-                        SecLayerBtn secLayerBtn = Instantiate(zTLayer.secLayerBtnPrefab);
-                        secLayerBtn.SetLayerBtnData(tempDatas[j].name);
-                        secLayerBtn.GetComponent<RectTransform>().SetParent(layerBtn.secContent.GetComponent<RectTransform>());
-                        secLayerBtn.btn.onClick.AddListener(() =>
+                        //Debug.Log(zTLayer.layerDatas.Length);
+                        //Debug.Log(i);
+                        if ((int)tempDatas[j].type == zTLayer.layerDatas[i].layerID)
                         {
-                            StaticLod.instance.OnFoucusStatic(tempDatas[tempJ].namePri);
-                            miniMap.gameObject.SetActive(false);
-                            ChangeRightContent(tempJ);
-                        });
-                        num++;
+                            int tempJ = j;
+                            SecLayerBtn secLayerBtn = Instantiate(zTLayer.secLayerBtnPrefab);
+                            secLayerBtn.SetLayerBtnData(tempDatas[j].name);
+                            secLayerBtn.GetComponent<RectTransform>().SetParent(layerBtn.secContent.GetComponent<RectTransform>());
+                            secLayerBtn.btn.onClick.AddListener(() =>
+                            {
+                                StaticLod.instance.OnFoucusStatic(tempDatas[tempJ].namePri);
+                                miniMap.gameObject.SetActive(false);
+                                ChangeRightContent(tempJ);
+                            });
+                            num++;
+                        }
                     }
                 }
-            }
 
-            layerBtn.btn.GetComponent<Button>().onClick.AddListener(() =>
-            {
-                for (int j = 0; j < layerBtns.Count; j++)
+                layerBtn.btn.GetComponent<Button>().onClick.AddListener(() =>
                 {
-                    layerBtns[j].SetUseful(false);
-                    layerBtns[j].secContent.gameObject.SetActive(false);
-                }
-                layerBtns[index].SetUseful(true);
-                layerBtns[index].secContent.gameObject.SetActive(true);
-            });
-
-            layerBtn.SetLayerBtnData(zTLayer.layerSprite[zTLayer.layerDatas[i].layerID], zTLayer.layerDatas[i].layerName, num.ToString());
-            layerBtn.GetComponent<RectTransform>().SetParent(content.GetComponent<RectTransform>());
-            layerBtn.transform.localScale = Vector3.one;
-            layerBtns.Add(layerBtn);
+                    for (int j = 0; j < layerBtns.Count; j++)
+                    {
+                        layerBtns[j].SetUseful(false);
+                        layerBtns[j].secContent.gameObject.SetActive(false);
+                    }
+                    layerBtns[index].SetUseful(true);
+                    layerBtns[index].secContent.gameObject.SetActive(true);
+                });
+
+                layerBtn.SetLayerBtnData(zTLayer.layerSprite[zTLayer.layerDatas[i].layerID], zTLayer.layerDatas[i].layerName, num.ToString());
+                layerBtn.GetComponent<RectTransform>().SetParent(content.GetComponent<RectTransform>());
+                layerBtn.transform.localScale = Vector3.one;
+                layerBtns.Add(layerBtn);
+            }
+            content.GetComponent<VerticalLayoutGroup>().SetLayoutVertical();
+            layerBtns[0].SetUseful(true);
         }
-        content.GetComponent<VerticalLayoutGroup>().SetLayoutVertical();
-        layerBtns[0].SetUseful(true);
-    }
 
-    void ChangeRightContent(int index)
-    {
-        rightContent.parent.gameObject.SetActive(true);
-        for (int i = 0; i < rightContent.childCount; i++)
+        void ChangeRightContent(int index)
         {
-            rightContent.GetChild(i).gameObject.SetActive(false);
+            rightContent.parent.gameObject.SetActive(true);
+            for (int i = 0; i < rightContent.childCount; i++)
+            {
+                rightContent.GetChild(i).gameObject.SetActive(false);
+            }
+            rightContent.GetChild(index).gameObject.SetActive(true);
         }
-        rightContent.GetChild(index).gameObject.SetActive(true);
-    }
 
-    // Update is called once per frame
-    void Update()
-    {
-        znz.transform.rotation = Quaternion.Lerp(znz.transform.rotation, Quaternion.Euler(0, 0, CameraManager.instance.mainCamera.transform.localEulerAngles.y), Time.deltaTime * 4);
-    }
-
-    public async Task InitObsItems()
-    {
-        await new WaitUntil(() =>
+        // Update is called once per frame
+        void Update()
         {
-            return GlobalData.obsDatas_by.Count > 0&& GlobalData.obsDatas_tk.Count>0;
-        });
-        for (int i = 0; i < obsItemList.Count; i++)
-        {
-            Destroy(obsItemList[i].gameObject);
+            znz.transform.rotation = Quaternion.Lerp(znz.transform.rotation, Quaternion.Euler(0, 0, CameraManager.instance.mainCamera.transform.localEulerAngles.y), Time.deltaTime * 4);
         }
-        obsItemList.Clear();
-        var obsDatasBy = GlobalData.obsDatas_by;
-        for (int i = 0; i < obsDatasBy.Count; i++)
+
+        public async Task InitObsItems()
         {
-            var tempObj = Instantiate(obsItemPrefab, obsItemContent).GetComponent<ObsItem>();
-            tempObj.SetData(obsDatasBy[i]);
-            tempObj._button.onClick.AddListener(() =>
+            await new WaitUntil(() =>
             {
-                ShowObsPanel(tempObj._data);
+                return GlobalData.obsDatas_by.Count > 0 && GlobalData.obsDatas_tk.Count > 0;
             });
-            obsItemList.Add(tempObj);
-        }
-        var obsDatasTk = GlobalData.obsDatas_tk;
-        for (int i = 0; i < obsDatasTk.Count; i++)
-        {
-            var tempObj = Instantiate(obsItemPrefab, obsItemContent).GetComponent<ObsItem>();
-            tempObj.SetData(obsDatasTk[i]);
-            tempObj._button.onClick.AddListener(() =>
+            for (int i = 0; i < obsItemList.Count; i++)
             {
-                ShowObsPanel(tempObj._data);
-            });
-            obsItemList.Add(tempObj);
+                Destroy(obsItemList[i].gameObject);
+            }
+            obsItemList.Clear();
+            var obsDatasBy = GlobalData.obsDatas_by;
+            for (int i = 0; i < obsDatasBy.Count; i++)
+            {
+                var tempObj = Instantiate(obsItemPrefab, obsItemContent).GetComponent<ObsItem>();
+                tempObj.SetData(obsDatasBy[i]);
+                tempObj._button.onClick.AddListener(() =>
+                {
+                    ShowObsPanel(tempObj._data);
+                });
+                obsItemList.Add(tempObj);
+            }
+            var obsDatasTk = GlobalData.obsDatas_tk;
+            for (int i = 0; i < obsDatasTk.Count; i++)
+            {
+                var tempObj = Instantiate(obsItemPrefab, obsItemContent).GetComponent<ObsItem>();
+                tempObj.SetData(obsDatasTk[i]);
+                tempObj._button.onClick.AddListener(() =>
+                {
+                    ShowObsPanel(tempObj._data);
+                });
+                obsItemList.Add(tempObj);
+            }
+
         }
-        
-    }
 
-    public void SearchObsItem(string s_name)
-    {
-        if (s_name.Equals(""))
+        public void SearchObsItem(string s_name)
         {
-            for (int i = 0; i < obsItemList.Count; i++)
+            if (s_name.Equals(""))
             {
-                obsItemList[i].gameObject.SetActive(true);
+                for (int i = 0; i < obsItemList.Count; i++)
+                {
+                    obsItemList[i].gameObject.SetActive(true);
+                }
             }
-        }
-        else
-        {
-            for (int i = 0; i < obsItemList.Count; i++)
+            else
             {
-                obsItemList[i].gameObject.SetActive(obsItemList[i]._data.name.Contains(s_name));
+                for (int i = 0; i < obsItemList.Count; i++)
+                {
+                    obsItemList[i].gameObject.SetActive(obsItemList[i]._data.name.Contains(s_name));
+                }
             }
         }
-    }
 
-    public void ShowObsPanel(ObsData _data)
-    {
-        obsPlayerPanel.gameObject.SetActive(true);
-        obsPlayerPanel.SetObsData(_data);
-        obsPlayerPanel.SetTitle(_data.name);
+        public void ShowObsPanel(ObsData _data)
+        {
+            obsPlayerPanel.gameObject.SetActive(true);
+            obsPlayerPanel.SetObsData(_data);
+            obsPlayerPanel.SetTitle(_data.name);
+        }
     }
-}

Assets/Scripts/UI/UIView/GCJK/DropUnit.cs

@@ -8,18 +8,34 @@ public class DropUnit : MonoBehaviour
 {
     public Text nameText;
     public Text digitText;
-
+    public Image image;
     public GameObject bingObj;
+
+    public Sprite[] sprites;
+
+    private int index = 0;
+    private float currentIndex = 0;
     public void Init(double lgtd,double lttd,string na,string di)
     {
         Vector3 temp = CoordinateConverter.GeoToUGUISmall(lgtd, lttd);
         this.GetComponent<RectTransform>().anchoredPosition3D = temp;
+        image.sprite = sprites[0];
         nameText.text = na;
         digitText.text = di;
+        currentIndex = 0;
+        
+
+        index = (int)Mathf.Clamp(Mathf.Round(float.Parse(di) / 2.0f), 0,9);
+
     }
 
     void Update()
     {
         this.GetComponent<RectTransform>().anchoredPosition = CameraManager.instance.secondCamera.WorldToScreenPoint(bingObj.transform.position) * 1920.0f / Screen.width;
+        if (index > currentIndex) {
+            //Debug.Log((int)(currentIndex));
+            currentIndex += Time.deltaTime;
+            image.sprite = sprites[(int)(currentIndex)];
+        }
     }
 }

Assets/Scripts/UI/UIView/GCJK/GCJKLayer.cs

@@ -431,6 +431,7 @@ public class GCJKLayer : YZTRootLayer
             miniMapSWContent.gameObject.SetActive(false);
             qxDataBtn.GetComponent<UnityEngine.UI.Image>().sprite = highLightBtn;
             swDataBtn.GetComponent<UnityEngine.UI.Image>().sprite = normalBtn;
+            dropToggle.gameObject.SetActive(true);
             weatherToggle.gameObject.SetActive(false);
         });
 
@@ -440,6 +441,7 @@ public class GCJKLayer : YZTRootLayer
             miniMapSWContent.gameObject.SetActive(true);
             swDataBtn.GetComponent<UnityEngine.UI.Image>().sprite = highLightBtn;
             qxDataBtn.GetComponent<UnityEngine.UI.Image>().sprite = normalBtn;
+            dropToggle.gameObject.SetActive(false);
             weatherToggle.gameObject.SetActive(true);
         });
 
@@ -490,23 +492,23 @@ public class GCJKLayer : YZTRootLayer
                 dropUnit.bingObj.name = GlobalData.qXZDatas[i].STNM;
             }
 
-            for (int i = 0; i < GlobalData.sWZDatas.Count; i++)
-            {
-                GameObject gameObject = Instantiate(dropUnitPrefab);
-                DropUnit dropUnit = gameObject.GetComponent<DropUnit>();
-                dropUnit.transform.SetParent(miniMapSWContent.transform);
-                dropUnit.Init(GlobalData.sWZDatas[i].LGTD, GlobalData.sWZDatas[i].LTTD, GlobalData.sWZDatas[i].STNM,
-                    GlobalData.sWZDatas[i].dropSum6.ToString());
-                dropUnits.Add(dropUnit);
-
-                dropUnit.bingObj = Instantiate(runtimePointObj).gameObject;
-                dropUnit.bingObj.transform.SetParent(shaPan.transform.GetChild(10));
-                dropUnit.bingObj.transform.localEulerAngles = Vector3.zero;
-                dropUnit.bingObj.transform.localScale = Vector3.one;
-                dropUnit.bingObj.transform.localPosition =
-                    CoordinateConverter.GeoToUGUISmall(GlobalData.sWZDatas[i].LGTD, GlobalData.sWZDatas[i].LTTD);
-                dropUnit.bingObj.name = GlobalData.sWZDatas[i].STNM;
-            }
+            //for (int i = 0; i < GlobalData.sWZDatas.Count; i++)
+            //{
+            //    GameObject gameObject = Instantiate(dropUnitPrefab);
+            //    DropUnit dropUnit = gameObject.GetComponent<DropUnit>();
+            //    dropUnit.transform.SetParent(miniMapSWContent.transform);
+            //    dropUnit.Init(GlobalData.sWZDatas[i].LGTD, GlobalData.sWZDatas[i].LTTD, GlobalData.sWZDatas[i].STNM,
+            //        GlobalData.sWZDatas[i].dropSum6.ToString());
+            //    dropUnits.Add(dropUnit);
+
+            //    dropUnit.bingObj = Instantiate(runtimePointObj).gameObject;
+            //    dropUnit.bingObj.transform.SetParent(shaPan.transform.GetChild(10));
+            //    dropUnit.bingObj.transform.localEulerAngles = Vector3.zero;
+            //    dropUnit.bingObj.transform.localScale = Vector3.one;
+            //    dropUnit.bingObj.transform.localPosition =
+            //        CoordinateConverter.GeoToUGUISmall(GlobalData.sWZDatas[i].LGTD, GlobalData.sWZDatas[i].LTTD);
+            //    dropUnit.bingObj.name = GlobalData.sWZDatas[i].STNM;
+            //}
         }
         else
         {
@@ -519,11 +521,11 @@ public class GCJKLayer : YZTRootLayer
                 index++;
             }
 
-            for (int i = 0; i < GlobalData.sWZDatas.Count; i++)
-            {
-                dropUnits[i + index].Init(GlobalData.sWZDatas[i].LGTD, GlobalData.sWZDatas[i].LTTD,
-                    GlobalData.sWZDatas[i].STNM, GlobalData.sWZDatas[i].dropSum6.ToString());
-            }
+            //for (int i = 0; i < GlobalData.sWZDatas.Count; i++)
+            //{
+            //    dropUnits[i + index].Init(GlobalData.sWZDatas[i].LGTD, GlobalData.sWZDatas[i].LTTD,
+            //        GlobalData.sWZDatas[i].STNM, GlobalData.sWZDatas[i].dropSum6.ToString());
+            //}
         }
 
         if (weatherUnits.Count <= 0)

Assets/Scripts/UI/UIView/GCJK/SWHeightUnit.cs

@@ -7,7 +7,7 @@ public class SWHeightUnit : MonoBehaviour
 {
     public Text nameText;
     public Text valueText;
-
+    public Text dwzValueText;
     public GameObject bingObj;
 
     // Start is called before the first frame update
@@ -15,7 +15,7 @@ public class SWHeightUnit : MonoBehaviour
     {
         
     }
-    public void Init(string slgtd, string slttd, string na, string we)
+    public void Init(string slgtd, string slttd, string na, string upz,string dwz)
     {
         double lgtd = double.Parse(slgtd);
         double lttd = double.Parse(slttd);
@@ -23,8 +23,10 @@ public class SWHeightUnit : MonoBehaviour
         
         nameText.text = na;
         float value = 0.0f;
-        if(float.TryParse(we,out value))
-            valueText.text = value.ToString("0.00");
+        //if(float.TryParse(we,out value))
+        //    valueText.text = value.ToString("0.00");
+        valueText.text = upz;
+        dwzValueText.text = dwz;
         this.GetComponent<RectTransform>().anchoredPosition3D = temp;
     }
     // Update is called once per frame

Assets/Scripts/UI/UIView/SWYJ/SWYJLayer.cs

@@ -401,38 +401,100 @@ public class SWYJLayer : YZTRootLayer
         });
     }
 
+  
+    public class StationDataFix
+    {
+        public string stnm;      // 站名
+        public string lgtd;      // 经度
+        public string lttd;      // 纬度
+
+        public float? upz;       // 上水位
+        public float? dwz;       // 下水位
+        public float? tgtq;      // 流量
+    }
+
+    Dictionary<string, StationDataFix> stationDataLib = new Dictionary<string, StationDataFix>();
     public async void OnGlobalSWBtnClick()
     {
         CameraManager.SwitchCamera(1);
         viewMode = ViewMode.miniMap;
         GameObject shaPan = GameObject.FindGameObjectWithTag("ShaPan");
-        if (sWHeightUnits.Count < 1)
+
+        stationDataLib.Clear();
+
+        for (int i = 0; i < GlobalData.swDatas.Count; i++)
         {
-            for (int i = 0; i < GlobalData.swDatas.Count; i++)
+            string keyName = GlobalData.swDatas[i].stnm.Replace("上", "").Replace("下", "").Replace("(", "").Replace(")", "");
+            if (stationDataLib.ContainsKey(keyName))
+            {
+                if (GlobalData.swDatas[i].stnm.Contains("上"))
+                {
+                    stationDataLib[keyName].upz = GlobalData.swDatas[i].upz;
+                }
+                else if (GlobalData.swDatas[i].stnm.Contains("下"))
+                {
+                    stationDataLib[keyName].dwz = GlobalData.swDatas[i].dwz;
+                }
+                else
+                {
+                    stationDataLib[keyName].upz = GlobalData.swDatas[i].upz;
+                    stationDataLib[keyName].dwz = GlobalData.swDatas[i].dwz;
+                }
+            }
+            else
             {
+                StationDataFix stationDataFix = new StationDataFix();
+                stationDataFix.lgtd = GlobalData.swDatas[i].lgtd;
+                stationDataFix.lttd = GlobalData.swDatas[i].lttd;
+                stationDataFix.stnm = keyName;
+                if (GlobalData.swDatas[i].stnm.Contains("上"))
+                {
+                    stationDataFix.upz = GlobalData.swDatas[i].upz;
+                }
+                else if (GlobalData.swDatas[i].stnm.Contains("下"))
+                {
+                    stationDataFix.dwz = GlobalData.swDatas[i].dwz;
+                }
+                else
+                {
+                    stationDataFix.upz = GlobalData.swDatas[i].upz;
+                    stationDataFix.dwz = GlobalData.swDatas[i].dwz;
+                }
+                stationDataLib.Add(keyName, stationDataFix);
+            }
+        }
+
+        if (sWHeightUnits.Count < 1)
+        {
+            foreach (var key in stationDataLib.Keys) {
                 GameObject gameObject = Instantiate(sWHeightUnitPrefab);
                 SWHeightUnit swHUnit = gameObject.GetComponent<SWHeightUnit>();
                 swHUnit.transform.SetParent(miniMapSWContent.transform);
-                float max = math.max(GlobalData.swDatas[i].upz ?? 0, GlobalData.swDatas[i].dwz ?? 0);
-                swHUnit.Init(GlobalData.swDatas[i].lgtd, GlobalData.swDatas[i].lttd, GlobalData.swDatas[i].stnm, max.ToString());
+                float upz = stationDataLib[key].upz ?? 0;
+                float dwz = stationDataLib[key].dwz ?? 0;
+                swHUnit.Init(stationDataLib[key].lgtd, stationDataLib[key].lttd, stationDataLib[key].stnm, upz.ToString("0.00"), dwz.ToString("0.00"));
                 sWHeightUnits.Add(swHUnit);
 
                 swHUnit.bingObj = Instantiate(runtimePointObj).gameObject;
                 swHUnit.bingObj.transform.SetParent(shaPan.transform.GetChild(11));
                 swHUnit.bingObj.transform.localEulerAngles = Vector3.zero;
                 swHUnit.bingObj.transform.localScale = Vector3.one;
-                double lgtd = double.Parse(GlobalData.swDatas[i].lgtd);
-                double lttd = double.Parse(GlobalData.swDatas[i].lttd);
+                double lgtd = double.Parse(stationDataLib[key].lgtd);
+                double lttd = double.Parse(stationDataLib[key].lttd);
                 swHUnit.bingObj.transform.localPosition = CoordinateConverter.GeoToUGUISmall(lgtd, lttd);
-                swHUnit.bingObj.name = GlobalData.swDatas[i].stnm;
+                swHUnit.bingObj.name = stationDataLib[key].stnm;
             }
+
         }
         else
         {
-            for (int i = 0; i < GlobalData.swDatas.Count; i++)
+            int i = 0;
+            foreach (var key in stationDataLib.Keys)
             {
-                float max = math.max(GlobalData.swDatas[i].upz ?? 0, GlobalData.swDatas[i].dwz ?? 0);
-                sWHeightUnits[i].Init(GlobalData.swDatas[i].lgtd, GlobalData.swDatas[i].lttd, GlobalData.swDatas[i].stnm, max.ToString());
+                float upz = stationDataLib[key].upz ?? 0;
+                float dwz = stationDataLib[key].dwz ?? 0;
+                sWHeightUnits[i].Init(stationDataLib[key].lgtd, stationDataLib[key].lttd, stationDataLib[key].stnm, upz.ToString("0.00"), dwz.ToString("0.00"));
+                i += 0;
             }
         }
         miniMap.gameObject.SetActive(true);

Assets/StreamingAssets/xhq.json

@@ -0,0 +1,38 @@
+{
+    "area": {
+        "value": 2797,
+        "description": "蓄滞洪区面积（平方公里）"
+    },
+    "leveeLength": {
+        "value": 334.51,
+        "description": "围堤总长（公里）"
+    },
+    "storageCapacity": {
+        "value": 160,
+        "description": "160亿立方米设计蓄洪容积，181亿立方米有效蓄洪容积"
+    },
+    "designWaterLevel": {
+        "value": 32.5,
+        "description": "32.5米设计蓄洪水位（吴淞高程）"
+    },
+    "operationStandard": {
+        "value": 1,
+        "description": "在荆江河段或城陵矶河段达到特定洪水条件时启用，如荆江分洪区、宛市扩大区、虎西备蓄区运用后，预报荆江分洪区内蓄洪水位仍将超过42.00米时，或三峡水库水位达到155.0米后，城陵矶水位仍将达到34.40米并继续上涨时。"
+    },
+    "safetyZones": {
+        "value": 12,
+        "description": "规划安全区12处，实际建成并具备运用条件的仅杨林山自然安全区1处，面积0.4平方公里。"
+    },
+    "gateStations": {
+        "value": 35,
+        "description": "套口进洪闸1座,补元退洪闸1座,‌围堤涵闸‌：共33座，其中长江干堤23座，东荆河堤4座，主隔堤6座"
+    },
+    "pumpStations": {
+        "value": 4,
+        "description": "高潭口泵站,高潭口二站,‌半路堤电力排灌站,新滩口泵站"
+    },
+    "drainageStations": {
+        "value": 4,
+        "description": "主要依托高潭口泵站、高潭口二站、半路堤电力排灌站和新滩口泵站进行排涝，同时修建了排涝河工程以辅助排涝"
+    }
+}