Merge remote-tracking branch 'origin/master'

Assets/Art/UIAssets/decorate/dec_daoyou_dibu.png.meta

@@ -0,0 +1,133 @@
+fileFormatVersion: 2
+guid: CCkb53ysAHn/uE36BsX2AOjLSXw8/T5htXfS2dqjHWzMI+jvgob0IZlbWO+p
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  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
+    flipGreenChannel: 0
+  isReadable: 0
+  webStreaming: 0
+  priorityLevel: 0
+  uploadedMode: 2
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 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: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/UIAssets/decorate/dec_duihuakuang_xiaojiujiu.png.meta

@@ -0,0 +1,133 @@
+fileFormatVersion: 2
+guid: WykYs3j5UXOCqE5E5Nu1dSMnfNclRlWQMHntt7b1KI+vtsN4DlWnfpf0Wj9c
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  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
+    flipGreenChannel: 0
+  isReadable: 0
+  webStreaming: 0
+  priorityLevel: 0
+  uploadedMode: 2
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 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: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/UIAssets/decorate/dec_lh_chuyunmiao.png.meta

@@ -0,0 +1,133 @@
+fileFormatVersion: 2
+guid: WS5K43/+VHjmTcNjKvrhYjfeXuVEfmRUj8rUj1PhOfJBNqp1zLYwNpIVhyXY
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  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
+    flipGreenChannel: 0
+  isReadable: 0
+  webStreaming: 0
+  priorityLevel: 0
+  uploadedMode: 2
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 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: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/UIAssets/decorate/dec_lh_fengdaoren.png.meta

@@ -0,0 +1,133 @@
+fileFormatVersion: 2
+guid: BnkW5H+sUX4C9mv38H0+Qp/SJ4qzWQSRZJJTaDEWtVd1pWKUF+I25Zj1qwkX
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  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
+    flipGreenChannel: 0
+  isReadable: 0
+  webStreaming: 0
+  priorityLevel: 0
+  uploadedMode: 2
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 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: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/UIAssets/decorate/dec_lh_fengyao.png.meta

@@ -0,0 +1,133 @@
+fileFormatVersion: 2
+guid: XHxKvXytW3Ojxt7Z/m8nNq4nZzborxdsK6HL+97Oxt+bjFHzmKE+gHDqknIz
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  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
+    flipGreenChannel: 0
+  isReadable: 0
+  webStreaming: 0
+  priorityLevel: 0
+  uploadedMode: 2
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 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: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/UIAssets/decorate/dec_lh_linfeng.png.meta

@@ -0,0 +1,133 @@
+fileFormatVersion: 2
+guid: B3sbsCuqAXxH2jIRkjYTec5SgyqtLK1TkUYHeeXfj+jjKLiS9WLybdSMbM3J
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  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
+    flipGreenChannel: 0
+  isReadable: 0
+  webStreaming: 0
+  priorityLevel: 0
+  uploadedMode: 2
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 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: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/UIAssets/decorate/dec_lh_liuqingyan2.png.meta

@@ -0,0 +1,133 @@
+fileFormatVersion: 2
+guid: WilJsCyuV32322eQNbz1tTSIsT4WGxYqYnKmQ4LZhYaiAUX9xOdLyLtiU6i1
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  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
+    flipGreenChannel: 0
+  isReadable: 0
+  webStreaming: 0
+  priorityLevel: 0
+  uploadedMode: 2
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 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: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/UIAssets/decorate/dec_lh_quelinger.png.meta

@@ -0,0 +1,133 @@
+fileFormatVersion: 2
+guid: XXoYt3ikAX8WXJ2bDfcYYjc7a8oE7MoKsiA1U6ddPK+zoBEbv5UYURVs4zFV
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  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
+    flipGreenChannel: 0
+  isReadable: 0
+  webStreaming: 0
+  priorityLevel: 0
+  uploadedMode: 2
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 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: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/UIAssets/decorate/dec_lh_wanxi.png.meta

@@ -0,0 +1,133 @@
+fileFormatVersion: 2
+guid: XCgXsiirUS99RP04tF0altC96g87RiC8zv+TqNv3n108f+b+RpzhbFQQWaqf
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  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
+    flipGreenChannel: 0
+  isReadable: 0
+  webStreaming: 0
+  priorityLevel: 0
+  uploadedMode: 2
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 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: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/UIAssets/decorate/dec_lh_xiner.png.meta

@@ -0,0 +1,133 @@
+fileFormatVersion: 2
+guid: BylK4Sz4Vn++5F1zpQT7qqbXrQf9R/7AXsp81bc2+4FSkOxuH0iioF/qoFt+
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  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
+    flipGreenChannel: 0
+  isReadable: 0
+  webStreaming: 0
+  priorityLevel: 0
+  uploadedMode: 2
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 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: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/UIAssets/decorate/dec_lh_xuyou.png.meta

@@ -0,0 +1,133 @@
+fileFormatVersion: 2
+guid: DnkYsXv8BylykIbuYXKq+gaaNaw1D9uj4j1ZU9p3oF5eeFmxrgHXgEDqxNnT
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  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
+    flipGreenChannel: 0
+  isReadable: 0
+  webStreaming: 0
+  priorityLevel: 0
+  uploadedMode: 2
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 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: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/UIAssets/decorate/dec_lh_yunzhi.png.meta

@@ -0,0 +1,133 @@
+fileFormatVersion: 2
+guid: DStN4Xn4BynNkDaZvZw/wp5q7Bq07TcoT3o9W8aVLaJkMbNYaeY7UOMjcYmm
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  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
+    flipGreenChannel: 0
+  isReadable: 0
+  webStreaming: 0
+  priorityLevel: 0
+  uploadedMode: 2
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 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: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_glow_add.mat

@@ -57,7 +57,7 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0.387241
+    - _Alpha: 0
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0

Assets/Art/VFX/Materials/UIMat/ui_renwu_lg.mat

@@ -57,13 +57,13 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0.20088696
+    - _Alpha: 0
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0
     - _MainSpeedU: 0.5
     - _MainSpeedV: 0.5
-    - _MainTexOffsetU: 0.21108508
+    - _MainTexOffsetU: 0.64
     - _MainTexOffsetV: 0
     - _MainTilingU: 0.8
     - _MainTilingV: 1

Assets/Editor/GameRuntimeConfigInspector.cs

@@ -25,6 +25,11 @@ namespace Fort23.Editor
                 // LogTool.Log("清理本地储存成功.");
                 AccountFileInfo.Instance.DeleteFile(AccountFileInfo.Instance.persistentDataPath);
             }
+            
+            if (GUILayout.Button("打开数据文件夹"))
+            {
+                Application.OpenURL(Application.persistentDataPath);
+            }
 
             // EditorUtility.SetDirty(runtimeConfig);
         }

Assets/Res/Config/DaoyouLevelupConfig.json

@@ -11,10 +11,10 @@
       "name": 2026,
       "exp": 2000,
       "prizeID": [
-        1701
+        1002
       ],
       "prizeNum": [
-        1
+        2000
       ],
       "guajiGrowup": 100
     },
@@ -23,10 +23,10 @@
       "name": 2027,
       "exp": 3000,
       "prizeID": [
-        1701
+        1002
       ],
       "prizeNum": [
-        2
+        2500
       ],
       "guajiGrowup": 112
     },
@@ -35,10 +35,10 @@
       "name": 2028,
       "exp": 4000,
       "prizeID": [
-        1703
+        1002
       ],
       "prizeNum": [
-        1
+        3000
       ],
       "guajiGrowup": 125
     },
@@ -47,10 +47,10 @@
       "name": 2029,
       "exp": 5000,
       "prizeID": [
-        1703
+        1002
       ],
       "prizeNum": [
-        1
+        3500
       ],
       "guajiGrowup": 137
     },
@@ -59,10 +59,10 @@
       "name": 2030,
       "exp": 6000,
       "prizeID": [
-        1703
+        1002
       ],
       "prizeNum": [
-        2
+        4000
       ],
       "guajiGrowup": 150
     },
@@ -71,10 +71,10 @@
       "name": 2031,
       "exp": 7000,
       "prizeID": [
-        1703
+        1002
       ],
       "prizeNum": [
-        2
+        4500
       ],
       "guajiGrowup": 162
     },
@@ -83,10 +83,10 @@
       "name": 2032,
       "exp": 8000,
       "prizeID": [
-        1704
+        1002
       ],
       "prizeNum": [
-        1
+        5000
       ],
       "guajiGrowup": 175
     },
@@ -95,10 +95,10 @@
       "name": 2033,
       "exp": 9000,
       "prizeID": [
-        1704
+        1002
       ],
       "prizeNum": [
-        1
+        5500
       ],
       "guajiGrowup": 187
     },
@@ -107,10 +107,10 @@
       "name": 2034,
       "exp": -1,
       "prizeID": [
-        1704
+        1002
       ],
       "prizeNum": [
-        1
+        6000
       ],
       "guajiGrowup": 200
     }

Assets/Res/Config/DaoyouModelConfig.json

@@ -7,9 +7,9 @@
       "bodyIcon": "bg_lh_quelinger",
       "bodyPos": [
         0,
-        124
+        207
       ],
-      "headIcon": "",
+      "headIcon": "dec_lh_quelinger",
       "growupRate": 90,
       "des": [
         1963
@@ -26,7 +26,7 @@
         13005
       ],
       "guajiBuffID": [
-        30,
+        2,
         11,
         23
       ],
@@ -53,9 +53,9 @@
       "bodyIcon": "bg_lh_yunzhi",
       "bodyPos": [
         0,
-        53
+        85
       ],
-      "headIcon": "",
+      "headIcon": "dec_lh_yunzhi",
       "growupRate": 90,
       "des": [
         1964
@@ -72,7 +72,7 @@
         13010
       ],
       "guajiBuffID": [
-        30,
+        2,
         11,
         33
       ],
@@ -99,9 +99,9 @@
       "bodyIcon": "bg_lh_fengyao",
       "bodyPos": [
         0,
-        53
+        106
       ],
-      "headIcon": "",
+      "headIcon": "dec_lh_fengyao",
       "growupRate": 100,
       "des": [
         1965
@@ -118,7 +118,7 @@
         13015
       ],
       "guajiBuffID": [
-        30,
+        2,
         11,
         43
       ],
@@ -145,9 +145,9 @@
       "bodyIcon": "bg_lh_wanxi",
       "bodyPos": [
         0,
-        0
+        190
       ],
-      "headIcon": "",
+      "headIcon": "dec_lh_wanxi",
       "growupRate": 100,
       "des": [
         1966
@@ -164,7 +164,7 @@
         13020
       ],
       "guajiBuffID": [
-        30,
+        2,
         12,
         22
       ],
@@ -191,9 +191,9 @@
       "bodyIcon": "bg_lh_xiner",
       "bodyPos": [
         0,
-        184
+        210
       ],
-      "headIcon": "",
+      "headIcon": "dec_lh_xiner",
       "growupRate": 110,
       "des": [
         1967
@@ -210,7 +210,7 @@
         13025
       ],
       "guajiBuffID": [
-        30,
+        2,
         12,
         32
       ],
@@ -237,9 +237,9 @@
       "bodyIcon": "bg_lh_liuqingyan2",
       "bodyPos": [
         0,
-        15
+        136
       ],
-      "headIcon": "",
+      "headIcon": "dec_lh_liuqingyan2",
       "growupRate": 110,
       "des": [
         1968
@@ -256,7 +256,7 @@
         13501
       ],
       "guajiBuffID": [
-        30,
+        2,
         13,
         41
       ],
@@ -283,9 +283,9 @@
       "bodyIcon": "bg_lh_xuyou",
       "bodyPos": [
         0,
-        227
+        265
       ],
-      "headIcon": "",
+      "headIcon": "dec_lh_xuyou",
       "growupRate": 100,
       "des": [
         1969
@@ -302,7 +302,7 @@
         13502
       ],
       "guajiBuffID": [
-        30,
+        2,
         22,
         33
       ],
@@ -329,9 +329,9 @@
       "bodyIcon": "bg_lh_fengdaoren",
       "bodyPos": [
         0,
-        48
+        146
       ],
-      "headIcon": "",
+      "headIcon": "dec_lh_fengdaoren",
       "growupRate": 100,
       "des": [
         1970
@@ -348,7 +348,7 @@
         13503
       ],
       "guajiBuffID": [
-        30,
+        2,
         32,
         43
       ],
@@ -375,9 +375,9 @@
       "bodyIcon": "bg_lh_chuyunmiao",
       "bodyPos": [
         0,
-        0
+        108
       ],
-      "headIcon": "",
+      "headIcon": "dec_lh_chuyunmiao",
       "growupRate": 100,
       "des": [
         1971
@@ -394,7 +394,7 @@
         13504
       ],
       "guajiBuffID": [
-        30,
+        2,
         42,
         23
       ],
@@ -421,9 +421,9 @@
       "bodyIcon": "bg_lh_linfeng",
       "bodyPos": [
         0,
-        0
+        107
       ],
-      "headIcon": "",
+      "headIcon": "dec_lh_linfeng",
       "growupRate": 100,
       "des": [
         1972
@@ -440,7 +440,7 @@
         13505
       ],
       "guajiBuffID": [
-        30,
+        2,
         22,
         43
       ],

Assets/Res/Config/DaoyouguajiResourcLevel.json

@@ -2,2403 +2,2403 @@
   "configList": [
     {
       "ID": 1,
-      "para1": 5,
-      "para2": 50,
-      "para3": 3,
-      "para4": 3,
-      "para5": 201
+      "para1": 200,
+      "para2": 2000,
+      "para3": 100,
+      "para4": 100,
+      "para5": 501
     },
     {
       "ID": 2,
-      "para1": 5,
-      "para2": 51,
-      "para3": 3,
-      "para4": 3,
-      "para5": 202
+      "para1": 200,
+      "para2": 2020,
+      "para3": 101,
+      "para4": 101,
+      "para5": 502
     },
     {
       "ID": 3,
-      "para1": 5,
-      "para2": 51,
-      "para3": 3,
-      "para4": 3,
-      "para5": 203
+      "para1": 200,
+      "para2": 2040,
+      "para3": 102,
+      "para4": 102,
+      "para5": 503
     },
     {
       "ID": 4,
-      "para1": 5,
-      "para2": 52,
-      "para3": 3,
-      "para4": 3,
-      "para5": 204
+      "para1": 200,
+      "para2": 2060,
+      "para3": 103,
+      "para4": 103,
+      "para5": 504
     },
     {
       "ID": 5,
-      "para1": 5,
-      "para2": 52,
-      "para3": 3,
-      "para4": 3,
-      "para5": 205
+      "para1": 200,
+      "para2": 2080,
+      "para3": 104,
+      "para4": 104,
+      "para5": 505
     },
     {
       "ID": 6,
-      "para1": 6,
-      "para2": 53,
-      "para3": 3,
-      "para4": 3,
-      "para5": 206
+      "para1": 220,
+      "para2": 2100,
+      "para3": 105,
+      "para4": 105,
+      "para5": 506
     },
     {
       "ID": 7,
-      "para1": 6,
-      "para2": 53,
-      "para3": 3,
-      "para4": 3,
-      "para5": 207
+      "para1": 220,
+      "para2": 2120,
+      "para3": 106,
+      "para4": 106,
+      "para5": 507
     },
     {
       "ID": 8,
-      "para1": 6,
-      "para2": 54,
-      "para3": 3,
-      "para4": 3,
-      "para5": 208
+      "para1": 220,
+      "para2": 2140,
+      "para3": 107,
+      "para4": 107,
+      "para5": 508
     },
     {
       "ID": 9,
-      "para1": 6,
-      "para2": 54,
-      "para3": 3,
-      "para4": 3,
-      "para5": 209
+      "para1": 220,
+      "para2": 2160,
+      "para3": 108,
+      "para4": 108,
+      "para5": 509
     },
     {
       "ID": 10,
-      "para1": 6,
-      "para2": 55,
-      "para3": 3,
-      "para4": 3,
-      "para5": 210
+      "para1": 220,
+      "para2": 2180,
+      "para3": 109,
+      "para4": 109,
+      "para5": 510
     },
     {
       "ID": 11,
-      "para1": 6,
-      "para2": 55,
-      "para3": 3,
-      "para4": 3,
-      "para5": 211
+      "para1": 220,
+      "para2": 2200,
+      "para3": 110,
+      "para4": 110,
+      "para5": 511
     },
     {
       "ID": 12,
-      "para1": 6,
-      "para2": 56,
-      "para3": 3,
-      "para4": 3,
-      "para5": 212
+      "para1": 220,
+      "para2": 2220,
+      "para3": 111,
+      "para4": 111,
+      "para5": 512
     },
     {
       "ID": 13,
-      "para1": 6,
-      "para2": 56,
-      "para3": 3,
-      "para4": 3,
-      "para5": 213
+      "para1": 220,
+      "para2": 2240,
+      "para3": 112,
+      "para4": 112,
+      "para5": 513
     },
     {
       "ID": 14,
-      "para1": 6,
-      "para2": 57,
-      "para3": 3,
-      "para4": 3,
-      "para5": 214
+      "para1": 220,
+      "para2": 2260,
+      "para3": 113,
+      "para4": 113,
+      "para5": 514
     },
     {
       "ID": 15,
-      "para1": 6,
-      "para2": 57,
-      "para3": 3,
-      "para4": 3,
-      "para5": 215
+      "para1": 220,
+      "para2": 2280,
+      "para3": 114,
+      "para4": 114,
+      "para5": 515
     },
     {
       "ID": 16,
-      "para1": 6,
-      "para2": 58,
-      "para3": 3,
-      "para4": 3,
-      "para5": 216
+      "para1": 240,
+      "para2": 2300,
+      "para3": 115,
+      "para4": 115,
+      "para5": 516
     },
     {
       "ID": 17,
-      "para1": 6,
-      "para2": 58,
-      "para3": 3,
-      "para4": 3,
-      "para5": 217
+      "para1": 240,
+      "para2": 2320,
+      "para3": 116,
+      "para4": 116,
+      "para5": 517
     },
     {
       "ID": 18,
-      "para1": 6,
-      "para2": 59,
-      "para3": 3,
-      "para4": 3,
-      "para5": 218
+      "para1": 240,
+      "para2": 2340,
+      "para3": 117,
+      "para4": 117,
+      "para5": 518
     },
     {
       "ID": 19,
-      "para1": 6,
-      "para2": 59,
-      "para3": 3,
-      "para4": 3,
-      "para5": 219
+      "para1": 240,
+      "para2": 2360,
+      "para3": 118,
+      "para4": 118,
+      "para5": 519
     },
     {
       "ID": 20,
-      "para1": 6,
-      "para2": 60,
-      "para3": 3,
-      "para4": 3,
-      "para5": 220
+      "para1": 240,
+      "para2": 2380,
+      "para3": 119,
+      "para4": 119,
+      "para5": 520
     },
     {
       "ID": 21,
-      "para1": 6,
-      "para2": 60,
-      "para3": 3,
-      "para4": 3,
-      "para5": 221
+      "para1": 240,
+      "para2": 2400,
+      "para3": 120,
+      "para4": 120,
+      "para5": 521
     },
     {
       "ID": 22,
-      "para1": 6,
-      "para2": 61,
-      "para3": 3,
-      "para4": 3,
-      "para5": 222
+      "para1": 240,
+      "para2": 2420,
+      "para3": 121,
+      "para4": 121,
+      "para5": 522
     },
     {
       "ID": 23,
-      "para1": 6,
-      "para2": 61,
-      "para3": 3,
-      "para4": 3,
-      "para5": 223
+      "para1": 240,
+      "para2": 2440,
+      "para3": 122,
+      "para4": 122,
+      "para5": 523
     },
     {
       "ID": 24,
-      "para1": 6,
-      "para2": 62,
-      "para3": 3,
-      "para4": 3,
-      "para5": 224
+      "para1": 240,
+      "para2": 2460,
+      "para3": 123,
+      "para4": 123,
+      "para5": 524
     },
     {
       "ID": 25,
-      "para1": 6,
-      "para2": 62,
-      "para3": 3,
-      "para4": 3,
-      "para5": 225
+      "para1": 240,
+      "para2": 2480,
+      "para3": 124,
+      "para4": 124,
+      "para5": 525
     },
     {
       "ID": 26,
-      "para1": 7,
-      "para2": 63,
-      "para3": 3,
-      "para4": 3,
-      "para5": 226
+      "para1": 260,
+      "para2": 2500,
+      "para3": 125,
+      "para4": 125,
+      "para5": 526
     },
     {
       "ID": 27,
-      "para1": 7,
-      "para2": 63,
-      "para3": 3,
-      "para4": 3,
-      "para5": 227
+      "para1": 260,
+      "para2": 2520,
+      "para3": 126,
+      "para4": 126,
+      "para5": 527
     },
     {
       "ID": 28,
-      "para1": 7,
-      "para2": 64,
-      "para3": 3,
-      "para4": 3,
-      "para5": 228
+      "para1": 260,
+      "para2": 2540,
+      "para3": 127,
+      "para4": 127,
+      "para5": 528
     },
     {
       "ID": 29,
-      "para1": 7,
-      "para2": 64,
-      "para3": 3,
-      "para4": 3,
-      "para5": 229
+      "para1": 260,
+      "para2": 2560,
+      "para3": 128,
+      "para4": 128,
+      "para5": 529
     },
     {
       "ID": 30,
-      "para1": 7,
-      "para2": 65,
-      "para3": 3,
-      "para4": 3,
-      "para5": 230
+      "para1": 260,
+      "para2": 2580,
+      "para3": 129,
+      "para4": 129,
+      "para5": 530
     },
     {
       "ID": 31,
-      "para1": 7,
-      "para2": 65,
-      "para3": 3,
-      "para4": 3,
-      "para5": 231
+      "para1": 260,
+      "para2": 2600,
+      "para3": 130,
+      "para4": 130,
+      "para5": 531
     },
     {
       "ID": 32,
-      "para1": 7,
-      "para2": 66,
-      "para3": 3,
-      "para4": 3,
-      "para5": 232
+      "para1": 260,
+      "para2": 2620,
+      "para3": 131,
+      "para4": 131,
+      "para5": 532
     },
     {
       "ID": 33,
-      "para1": 7,
-      "para2": 66,
-      "para3": 3,
-      "para4": 3,
-      "para5": 233
+      "para1": 260,
+      "para2": 2640,
+      "para3": 132,
+      "para4": 132,
+      "para5": 533
     },
     {
       "ID": 34,
-      "para1": 7,
-      "para2": 67,
-      "para3": 3,
-      "para4": 3,
-      "para5": 234
+      "para1": 260,
+      "para2": 2660,
+      "para3": 133,
+      "para4": 133,
+      "para5": 534
     },
     {
       "ID": 35,
-      "para1": 7,
-      "para2": 67,
-      "para3": 3,
-      "para4": 3,
-      "para5": 235
+      "para1": 260,
+      "para2": 2680,
+      "para3": 134,
+      "para4": 134,
+      "para5": 535
     },
     {
       "ID": 36,
-      "para1": 7,
-      "para2": 68,
-      "para3": 3,
-      "para4": 3,
-      "para5": 236
+      "para1": 280,
+      "para2": 2700,
+      "para3": 135,
+      "para4": 135,
+      "para5": 536
     },
     {
       "ID": 37,
-      "para1": 7,
-      "para2": 68,
-      "para3": 3,
-      "para4": 3,
-      "para5": 237
+      "para1": 280,
+      "para2": 2720,
+      "para3": 136,
+      "para4": 136,
+      "para5": 537
     },
     {
       "ID": 38,
-      "para1": 7,
-      "para2": 69,
-      "para3": 3,
-      "para4": 3,
-      "para5": 238
+      "para1": 280,
+      "para2": 2740,
+      "para3": 137,
+      "para4": 137,
+      "para5": 538
     },
     {
       "ID": 39,
-      "para1": 7,
-      "para2": 69,
-      "para3": 3,
-      "para4": 3,
-      "para5": 239
+      "para1": 280,
+      "para2": 2760,
+      "para3": 138,
+      "para4": 138,
+      "para5": 539
     },
     {
       "ID": 40,
-      "para1": 7,
-      "para2": 70,
-      "para3": 3,
-      "para4": 3,
-      "para5": 240
+      "para1": 280,
+      "para2": 2780,
+      "para3": 139,
+      "para4": 139,
+      "para5": 540
     },
     {
       "ID": 41,
-      "para1": 7,
-      "para2": 70,
-      "para3": 4,
-      "para4": 4,
-      "para5": 241
+      "para1": 280,
+      "para2": 2800,
+      "para3": 140,
+      "para4": 140,
+      "para5": 541
     },
     {
       "ID": 42,
-      "para1": 7,
-      "para2": 71,
-      "para3": 4,
-      "para4": 4,
-      "para5": 242
+      "para1": 280,
+      "para2": 2820,
+      "para3": 141,
+      "para4": 141,
+      "para5": 542
     },
     {
       "ID": 43,
-      "para1": 7,
-      "para2": 71,
-      "para3": 4,
-      "para4": 4,
-      "para5": 243
+      "para1": 280,
+      "para2": 2840,
+      "para3": 142,
+      "para4": 142,
+      "para5": 543
     },
     {
       "ID": 44,
-      "para1": 7,
-      "para2": 72,
-      "para3": 4,
-      "para4": 4,
-      "para5": 244
+      "para1": 280,
+      "para2": 2860,
+      "para3": 143,
+      "para4": 143,
+      "para5": 544
     },
     {
       "ID": 45,
-      "para1": 7,
-      "para2": 72,
-      "para3": 4,
-      "para4": 4,
-      "para5": 245
+      "para1": 280,
+      "para2": 2880,
+      "para3": 144,
+      "para4": 144,
+      "para5": 545
     },
     {
       "ID": 46,
-      "para1": 8,
-      "para2": 73,
-      "para3": 4,
-      "para4": 4,
-      "para5": 246
+      "para1": 300,
+      "para2": 2900,
+      "para3": 145,
+      "para4": 145,
+      "para5": 546
     },
     {
       "ID": 47,
-      "para1": 8,
-      "para2": 73,
-      "para3": 4,
-      "para4": 4,
-      "para5": 247
+      "para1": 300,
+      "para2": 2920,
+      "para3": 146,
+      "para4": 146,
+      "para5": 547
     },
     {
       "ID": 48,
-      "para1": 8,
-      "para2": 74,
-      "para3": 4,
-      "para4": 4,
-      "para5": 248
+      "para1": 300,
+      "para2": 2940,
+      "para3": 147,
+      "para4": 147,
+      "para5": 548
     },
     {
       "ID": 49,
-      "para1": 8,
-      "para2": 74,
-      "para3": 4,
-      "para4": 4,
-      "para5": 249
+      "para1": 300,
+      "para2": 2960,
+      "para3": 148,
+      "para4": 148,
+      "para5": 549
     },
     {
       "ID": 50,
-      "para1": 8,
-      "para2": 75,
-      "para3": 4,
-      "para4": 4,
-      "para5": 250
+      "para1": 300,
+      "para2": 2980,
+      "para3": 149,
+      "para4": 149,
+      "para5": 550
     },
     {
       "ID": 51,
-      "para1": 8,
-      "para2": 75,
-      "para3": 4,
-      "para4": 4,
-      "para5": 251
+      "para1": 300,
+      "para2": 3000,
+      "para3": 150,
+      "para4": 150,
+      "para5": 551
     },
     {
       "ID": 52,
-      "para1": 8,
-      "para2": 76,
-      "para3": 4,
-      "para4": 4,
-      "para5": 252
+      "para1": 300,
+      "para2": 3020,
+      "para3": 151,
+      "para4": 151,
+      "para5": 552
     },
     {
       "ID": 53,
-      "para1": 8,
-      "para2": 76,
-      "para3": 4,
-      "para4": 4,
-      "para5": 253
+      "para1": 300,
+      "para2": 3040,
+      "para3": 152,
+      "para4": 152,
+      "para5": 553
     },
     {
       "ID": 54,
-      "para1": 8,
-      "para2": 77,
-      "para3": 4,
-      "para4": 4,
-      "para5": 254
+      "para1": 300,
+      "para2": 3060,
+      "para3": 153,
+      "para4": 153,
+      "para5": 554
     },
     {
       "ID": 55,
-      "para1": 8,
-      "para2": 77,
-      "para3": 4,
-      "para4": 4,
-      "para5": 255
+      "para1": 300,
+      "para2": 3080,
+      "para3": 154,
+      "para4": 154,
+      "para5": 555
     },
     {
       "ID": 56,
-      "para1": 8,
-      "para2": 78,
-      "para3": 4,
-      "para4": 4,
-      "para5": 256
+      "para1": 320,
+      "para2": 3100,
+      "para3": 155,
+      "para4": 155,
+      "para5": 556
     },
     {
       "ID": 57,
-      "para1": 8,
-      "para2": 78,
-      "para3": 4,
-      "para4": 4,
-      "para5": 257
+      "para1": 320,
+      "para2": 3120,
+      "para3": 156,
+      "para4": 156,
+      "para5": 557
     },
     {
       "ID": 58,
-      "para1": 8,
-      "para2": 79,
-      "para3": 4,
-      "para4": 4,
-      "para5": 258
+      "para1": 320,
+      "para2": 3140,
+      "para3": 157,
+      "para4": 157,
+      "para5": 558
     },
     {
       "ID": 59,
-      "para1": 8,
-      "para2": 79,
-      "para3": 4,
-      "para4": 4,
-      "para5": 259
+      "para1": 320,
+      "para2": 3160,
+      "para3": 158,
+      "para4": 158,
+      "para5": 559
     },
     {
       "ID": 60,
-      "para1": 8,
-      "para2": 80,
-      "para3": 4,
-      "para4": 4,
-      "para5": 260
+      "para1": 320,
+      "para2": 3180,
+      "para3": 159,
+      "para4": 159,
+      "para5": 560
     },
     {
       "ID": 61,
-      "para1": 8,
-      "para2": 80,
-      "para3": 4,
-      "para4": 4,
-      "para5": 261
+      "para1": 320,
+      "para2": 3200,
+      "para3": 160,
+      "para4": 160,
+      "para5": 561
     },
     {
       "ID": 62,
-      "para1": 8,
-      "para2": 81,
-      "para3": 4,
-      "para4": 4,
-      "para5": 262
+      "para1": 320,
+      "para2": 3220,
+      "para3": 161,
+      "para4": 161,
+      "para5": 562
     },
     {
       "ID": 63,
-      "para1": 8,
-      "para2": 81,
-      "para3": 4,
-      "para4": 4,
-      "para5": 263
+      "para1": 320,
+      "para2": 3240,
+      "para3": 162,
+      "para4": 162,
+      "para5": 563
     },
     {
       "ID": 64,
-      "para1": 8,
-      "para2": 82,
-      "para3": 4,
-      "para4": 4,
-      "para5": 264
+      "para1": 320,
+      "para2": 3260,
+      "para3": 163,
+      "para4": 163,
+      "para5": 564
     },
     {
       "ID": 65,
-      "para1": 8,
-      "para2": 82,
-      "para3": 4,
-      "para4": 4,
-      "para5": 265
+      "para1": 320,
+      "para2": 3280,
+      "para3": 164,
+      "para4": 164,
+      "para5": 565
     },
     {
       "ID": 66,
-      "para1": 9,
-      "para2": 83,
-      "para3": 4,
-      "para4": 4,
-      "para5": 266
+      "para1": 340,
+      "para2": 3300,
+      "para3": 165,
+      "para4": 165,
+      "para5": 566
     },
     {
       "ID": 67,
-      "para1": 9,
-      "para2": 83,
-      "para3": 4,
-      "para4": 4,
-      "para5": 267
+      "para1": 340,
+      "para2": 3320,
+      "para3": 166,
+      "para4": 166,
+      "para5": 567
     },
     {
       "ID": 68,
-      "para1": 9,
-      "para2": 84,
-      "para3": 4,
-      "para4": 4,
-      "para5": 268
+      "para1": 340,
+      "para2": 3340,
+      "para3": 167,
+      "para4": 167,
+      "para5": 568
     },
     {
       "ID": 69,
-      "para1": 9,
-      "para2": 84,
-      "para3": 4,
-      "para4": 4,
-      "para5": 269
+      "para1": 340,
+      "para2": 3360,
+      "para3": 168,
+      "para4": 168,
+      "para5": 569
     },
     {
       "ID": 70,
-      "para1": 9,
-      "para2": 85,
-      "para3": 4,
-      "para4": 4,
-      "para5": 270
+      "para1": 340,
+      "para2": 3380,
+      "para3": 169,
+      "para4": 169,
+      "para5": 570
     },
     {
       "ID": 71,
-      "para1": 9,
-      "para2": 85,
-      "para3": 4,
-      "para4": 4,
-      "para5": 271
+      "para1": 340,
+      "para2": 3400,
+      "para3": 170,
+      "para4": 170,
+      "para5": 571
     },
     {
       "ID": 72,
-      "para1": 9,
-      "para2": 86,
-      "para3": 4,
-      "para4": 4,
-      "para5": 272
+      "para1": 340,
+      "para2": 3420,
+      "para3": 171,
+      "para4": 171,
+      "para5": 572
     },
     {
       "ID": 73,
-      "para1": 9,
-      "para2": 86,
-      "para3": 4,
-      "para4": 4,
-      "para5": 273
+      "para1": 340,
+      "para2": 3440,
+      "para3": 172,
+      "para4": 172,
+      "para5": 573
     },
     {
       "ID": 74,
-      "para1": 9,
-      "para2": 87,
-      "para3": 4,
-      "para4": 4,
-      "para5": 274
+      "para1": 340,
+      "para2": 3460,
+      "para3": 173,
+      "para4": 173,
+      "para5": 574
     },
     {
       "ID": 75,
-      "para1": 9,
-      "para2": 87,
-      "para3": 4,
-      "para4": 4,
-      "para5": 275
+      "para1": 340,
+      "para2": 3480,
+      "para3": 174,
+      "para4": 174,
+      "para5": 575
     },
     {
       "ID": 76,
-      "para1": 9,
-      "para2": 88,
-      "para3": 4,
-      "para4": 4,
-      "para5": 276
+      "para1": 360,
+      "para2": 3500,
+      "para3": 175,
+      "para4": 175,
+      "para5": 576
     },
     {
       "ID": 77,
-      "para1": 9,
-      "para2": 88,
-      "para3": 4,
-      "para4": 4,
-      "para5": 277
+      "para1": 360,
+      "para2": 3520,
+      "para3": 176,
+      "para4": 176,
+      "para5": 577
     },
     {
       "ID": 78,
-      "para1": 9,
-      "para2": 89,
-      "para3": 4,
-      "para4": 4,
-      "para5": 278
+      "para1": 360,
+      "para2": 3540,
+      "para3": 177,
+      "para4": 177,
+      "para5": 578
     },
     {
       "ID": 79,
-      "para1": 9,
-      "para2": 89,
-      "para3": 4,
-      "para4": 4,
-      "para5": 279
+      "para1": 360,
+      "para2": 3560,
+      "para3": 178,
+      "para4": 178,
+      "para5": 579
     },
     {
       "ID": 80,
-      "para1": 9,
-      "para2": 90,
-      "para3": 4,
-      "para4": 4,
-      "para5": 280
+      "para1": 360,
+      "para2": 3580,
+      "para3": 179,
+      "para4": 179,
+      "para5": 580
     },
     {
       "ID": 81,
-      "para1": 9,
-      "para2": 90,
-      "para3": 5,
-      "para4": 5,
-      "para5": 281
+      "para1": 360,
+      "para2": 3600,
+      "para3": 180,
+      "para4": 180,
+      "para5": 581
     },
     {
       "ID": 82,
-      "para1": 9,
-      "para2": 91,
-      "para3": 5,
-      "para4": 5,
-      "para5": 282
+      "para1": 360,
+      "para2": 3620,
+      "para3": 181,
+      "para4": 181,
+      "para5": 582
     },
     {
       "ID": 83,
-      "para1": 9,
-      "para2": 91,
-      "para3": 5,
-      "para4": 5,
-      "para5": 283
+      "para1": 360,
+      "para2": 3640,
+      "para3": 182,
+      "para4": 182,
+      "para5": 583
     },
     {
       "ID": 84,
-      "para1": 9,
-      "para2": 92,
-      "para3": 5,
-      "para4": 5,
-      "para5": 284
+      "para1": 360,
+      "para2": 3660,
+      "para3": 183,
+      "para4": 183,
+      "para5": 584
     },
     {
       "ID": 85,
-      "para1": 9,
-      "para2": 92,
-      "para3": 5,
-      "para4": 5,
-      "para5": 285
+      "para1": 360,
+      "para2": 3680,
+      "para3": 184,
+      "para4": 184,
+      "para5": 585
     },
     {
       "ID": 86,
-      "para1": 10,
-      "para2": 93,
-      "para3": 5,
-      "para4": 5,
-      "para5": 286
+      "para1": 380,
+      "para2": 3700,
+      "para3": 185,
+      "para4": 185,
+      "para5": 586
     },
     {
       "ID": 87,
-      "para1": 10,
-      "para2": 93,
-      "para3": 5,
-      "para4": 5,
-      "para5": 287
+      "para1": 380,
+      "para2": 3720,
+      "para3": 186,
+      "para4": 186,
+      "para5": 587
     },
     {
       "ID": 88,
-      "para1": 10,
-      "para2": 94,
-      "para3": 5,
-      "para4": 5,
-      "para5": 288
+      "para1": 380,
+      "para2": 3740,
+      "para3": 187,
+      "para4": 187,
+      "para5": 588
     },
     {
       "ID": 89,
-      "para1": 10,
-      "para2": 94,
-      "para3": 5,
-      "para4": 5,
-      "para5": 289
+      "para1": 380,
+      "para2": 3760,
+      "para3": 188,
+      "para4": 188,
+      "para5": 589
     },
     {
       "ID": 90,
-      "para1": 10,
-      "para2": 95,
-      "para3": 5,
-      "para4": 5,
-      "para5": 290
+      "para1": 380,
+      "para2": 3780,
+      "para3": 189,
+      "para4": 189,
+      "para5": 590
     },
     {
       "ID": 91,
-      "para1": 10,
-      "para2": 95,
-      "para3": 5,
-      "para4": 5,
-      "para5": 291
+      "para1": 380,
+      "para2": 3800,
+      "para3": 190,
+      "para4": 190,
+      "para5": 591
     },
     {
       "ID": 92,
-      "para1": 10,
-      "para2": 96,
-      "para3": 5,
-      "para4": 5,
-      "para5": 292
+      "para1": 380,
+      "para2": 3820,
+      "para3": 191,
+      "para4": 191,
+      "para5": 592
     },
     {
       "ID": 93,
-      "para1": 10,
-      "para2": 96,
-      "para3": 5,
-      "para4": 5,
-      "para5": 293
+      "para1": 380,
+      "para2": 3840,
+      "para3": 192,
+      "para4": 192,
+      "para5": 593
     },
     {
       "ID": 94,
-      "para1": 10,
-      "para2": 97,
-      "para3": 5,
-      "para4": 5,
-      "para5": 294
+      "para1": 380,
+      "para2": 3860,
+      "para3": 193,
+      "para4": 193,
+      "para5": 594
     },
     {
       "ID": 95,
-      "para1": 10,
-      "para2": 97,
-      "para3": 5,
-      "para4": 5,
-      "para5": 295
+      "para1": 380,
+      "para2": 3880,
+      "para3": 194,
+      "para4": 194,
+      "para5": 595
     },
     {
       "ID": 96,
-      "para1": 10,
-      "para2": 98,
-      "para3": 5,
-      "para4": 5,
-      "para5": 296
+      "para1": 400,
+      "para2": 3900,
+      "para3": 195,
+      "para4": 195,
+      "para5": 596
     },
     {
       "ID": 97,
-      "para1": 10,
-      "para2": 98,
-      "para3": 5,
-      "para4": 5,
-      "para5": 297
+      "para1": 400,
+      "para2": 3920,
+      "para3": 196,
+      "para4": 196,
+      "para5": 597
     },
     {
       "ID": 98,
-      "para1": 10,
-      "para2": 99,
-      "para3": 5,
-      "para4": 5,
-      "para5": 298
+      "para1": 400,
+      "para2": 3940,
+      "para3": 197,
+      "para4": 197,
+      "para5": 598
     },
     {
       "ID": 99,
-      "para1": 10,
-      "para2": 99,
-      "para3": 5,
-      "para4": 5,
-      "para5": 299
+      "para1": 400,
+      "para2": 3960,
+      "para3": 198,
+      "para4": 198,
+      "para5": 599
     },
     {
       "ID": 100,
-      "para1": 10,
-      "para2": 100,
-      "para3": 5,
-      "para4": 5,
-      "para5": 300
+      "para1": 400,
+      "para2": 3980,
+      "para3": 199,
+      "para4": 199,
+      "para5": 600
     },
     {
       "ID": 101,
-      "para1": 10,
-      "para2": 100,
-      "para3": 5,
-      "para4": 5,
-      "para5": 301
+      "para1": 400,
+      "para2": 4000,
+      "para3": 200,
+      "para4": 200,
+      "para5": 601
     },
     {
       "ID": 102,
-      "para1": 10,
-      "para2": 101,
-      "para3": 5,
-      "para4": 5,
-      "para5": 302
+      "para1": 400,
+      "para2": 4020,
+      "para3": 201,
+      "para4": 201,
+      "para5": 602
     },
     {
       "ID": 103,
-      "para1": 10,
-      "para2": 101,
-      "para3": 5,
-      "para4": 5,
-      "para5": 303
+      "para1": 400,
+      "para2": 4040,
+      "para3": 202,
+      "para4": 202,
+      "para5": 603
     },
     {
       "ID": 104,
-      "para1": 10,
-      "para2": 102,
-      "para3": 5,
-      "para4": 5,
-      "para5": 304
+      "para1": 400,
+      "para2": 4060,
+      "para3": 203,
+      "para4": 203,
+      "para5": 604
     },
     {
       "ID": 105,
-      "para1": 10,
-      "para2": 102,
-      "para3": 5,
-      "para4": 5,
-      "para5": 305
+      "para1": 400,
+      "para2": 4080,
+      "para3": 204,
+      "para4": 204,
+      "para5": 605
     },
     {
       "ID": 106,
-      "para1": 11,
-      "para2": 103,
-      "para3": 5,
-      "para4": 5,
-      "para5": 306
+      "para1": 420,
+      "para2": 4102,
+      "para3": 205,
+      "para4": 205,
+      "para5": 606
     },
     {
       "ID": 107,
-      "para1": 11,
-      "para2": 103,
-      "para3": 5,
-      "para4": 5,
-      "para5": 307
+      "para1": 420,
+      "para2": 4122,
+      "para3": 206,
+      "para4": 206,
+      "para5": 607
     },
     {
       "ID": 108,
-      "para1": 11,
-      "para2": 104,
-      "para3": 5,
-      "para4": 5,
-      "para5": 308
+      "para1": 420,
+      "para2": 4142,
+      "para3": 207,
+      "para4": 207,
+      "para5": 608
     },
     {
       "ID": 109,
-      "para1": 11,
-      "para2": 104,
-      "para3": 5,
-      "para4": 5,
-      "para5": 309
+      "para1": 420,
+      "para2": 4162,
+      "para3": 208,
+      "para4": 208,
+      "para5": 609
     },
     {
       "ID": 110,
-      "para1": 11,
-      "para2": 105,
-      "para3": 5,
-      "para4": 5,
-      "para5": 310
+      "para1": 420,
+      "para2": 4184,
+      "para3": 209,
+      "para4": 209,
+      "para5": 610
     },
     {
       "ID": 111,
-      "para1": 11,
-      "para2": 105,
-      "para3": 5,
-      "para4": 5,
-      "para5": 311
+      "para1": 420,
+      "para2": 4204,
+      "para3": 210,
+      "para4": 210,
+      "para5": 611
     },
     {
       "ID": 112,
-      "para1": 11,
-      "para2": 106,
-      "para3": 5,
-      "para4": 5,
-      "para5": 312
+      "para1": 420,
+      "para2": 4226,
+      "para3": 211,
+      "para4": 211,
+      "para5": 612
     },
     {
       "ID": 113,
-      "para1": 11,
-      "para2": 106,
-      "para3": 5,
-      "para4": 5,
-      "para5": 313
+      "para1": 420,
+      "para2": 4246,
+      "para3": 212,
+      "para4": 212,
+      "para5": 613
     },
     {
       "ID": 114,
-      "para1": 11,
-      "para2": 107,
-      "para3": 5,
-      "para4": 5,
-      "para5": 314
+      "para1": 420,
+      "para2": 4268,
+      "para3": 213,
+      "para4": 213,
+      "para5": 614
     },
     {
       "ID": 115,
-      "para1": 11,
-      "para2": 107,
-      "para3": 5,
-      "para4": 5,
-      "para5": 315
+      "para1": 420,
+      "para2": 4290,
+      "para3": 214,
+      "para4": 214,
+      "para5": 615
     },
     {
       "ID": 116,
-      "para1": 11,
-      "para2": 108,
-      "para3": 5,
-      "para4": 5,
-      "para5": 316
+      "para1": 440,
+      "para2": 4310,
+      "para3": 215,
+      "para4": 215,
+      "para5": 616
     },
     {
       "ID": 117,
-      "para1": 11,
-      "para2": 108,
-      "para3": 5,
-      "para4": 5,
-      "para5": 317
+      "para1": 440,
+      "para2": 4332,
+      "para3": 216,
+      "para4": 216,
+      "para5": 617
     },
     {
       "ID": 118,
-      "para1": 11,
-      "para2": 109,
-      "para3": 5,
-      "para4": 5,
-      "para5": 318
+      "para1": 440,
+      "para2": 4354,
+      "para3": 217,
+      "para4": 217,
+      "para5": 618
     },
     {
       "ID": 119,
-      "para1": 11,
-      "para2": 109,
-      "para3": 5,
-      "para4": 5,
-      "para5": 319
+      "para1": 440,
+      "para2": 4376,
+      "para3": 218,
+      "para4": 218,
+      "para5": 619
     },
     {
       "ID": 120,
-      "para1": 11,
-      "para2": 110,
-      "para3": 5,
-      "para4": 5,
-      "para5": 320
+      "para1": 440,
+      "para2": 4398,
+      "para3": 219,
+      "para4": 219,
+      "para5": 620
     },
     {
       "ID": 121,
-      "para1": 11,
-      "para2": 111,
-      "para3": 6,
-      "para4": 6,
-      "para5": 321
+      "para1": 440,
+      "para2": 4420,
+      "para3": 220,
+      "para4": 220,
+      "para5": 621
     },
     {
       "ID": 122,
-      "para1": 11,
-      "para2": 111,
-      "para3": 6,
-      "para4": 6,
-      "para5": 322
+      "para1": 440,
+      "para2": 4442,
+      "para3": 221,
+      "para4": 221,
+      "para5": 622
     },
     {
       "ID": 123,
-      "para1": 11,
-      "para2": 112,
-      "para3": 6,
-      "para4": 6,
-      "para5": 323
+      "para1": 440,
+      "para2": 4464,
+      "para3": 222,
+      "para4": 222,
+      "para5": 623
     },
     {
       "ID": 124,
-      "para1": 11,
-      "para2": 112,
-      "para3": 6,
-      "para4": 6,
-      "para5": 324
+      "para1": 440,
+      "para2": 4486,
+      "para3": 223,
+      "para4": 223,
+      "para5": 624
     },
     {
       "ID": 125,
-      "para1": 12,
-      "para2": 113,
-      "para3": 6,
-      "para4": 6,
-      "para5": 325
+      "para1": 460,
+      "para2": 4508,
+      "para3": 224,
+      "para4": 224,
+      "para5": 625
     },
     {
       "ID": 126,
-      "para1": 12,
-      "para2": 113,
-      "para3": 6,
-      "para4": 6,
-      "para5": 326
+      "para1": 460,
+      "para2": 4532,
+      "para3": 225,
+      "para4": 225,
+      "para5": 626
     },
     {
       "ID": 127,
-      "para1": 12,
-      "para2": 114,
-      "para3": 6,
-      "para4": 6,
-      "para5": 327
+      "para1": 460,
+      "para2": 4554,
+      "para3": 226,
+      "para4": 226,
+      "para5": 627
     },
     {
       "ID": 128,
-      "para1": 12,
-      "para2": 114,
-      "para3": 6,
-      "para4": 6,
-      "para5": 328
+      "para1": 460,
+      "para2": 4576,
+      "para3": 227,
+      "para4": 227,
+      "para5": 628
     },
     {
       "ID": 129,
-      "para1": 12,
-      "para2": 115,
-      "para3": 6,
-      "para4": 6,
-      "para5": 329
+      "para1": 460,
+      "para2": 4600,
+      "para3": 228,
+      "para4": 228,
+      "para5": 629
     },
     {
       "ID": 130,
-      "para1": 12,
-      "para2": 116,
-      "para3": 6,
-      "para4": 6,
-      "para5": 330
+      "para1": 460,
+      "para2": 4622,
+      "para3": 229,
+      "para4": 229,
+      "para5": 630
     },
     {
       "ID": 131,
-      "para1": 12,
-      "para2": 116,
-      "para3": 6,
-      "para4": 6,
-      "para5": 331
+      "para1": 460,
+      "para2": 4646,
+      "para3": 230,
+      "para4": 230,
+      "para5": 631
     },
     {
       "ID": 132,
-      "para1": 12,
-      "para2": 117,
-      "para3": 6,
-      "para4": 6,
-      "para5": 332
+      "para1": 460,
+      "para2": 4668,
+      "para3": 231,
+      "para4": 231,
+      "para5": 632
     },
     {
       "ID": 133,
-      "para1": 12,
-      "para2": 117,
-      "para3": 6,
-      "para4": 6,
-      "para5": 333
+      "para1": 460,
+      "para2": 4692,
+      "para3": 232,
+      "para4": 232,
+      "para5": 633
     },
     {
       "ID": 134,
-      "para1": 12,
-      "para2": 118,
-      "para3": 6,
-      "para4": 6,
-      "para5": 334
+      "para1": 480,
+      "para2": 4716,
+      "para3": 233,
+      "para4": 233,
+      "para5": 634
     },
     {
       "ID": 135,
-      "para1": 12,
-      "para2": 119,
-      "para3": 6,
-      "para4": 6,
-      "para5": 335
+      "para1": 480,
+      "para2": 4740,
+      "para3": 234,
+      "para4": 234,
+      "para5": 635
     },
     {
       "ID": 136,
-      "para1": 12,
-      "para2": 119,
-      "para3": 6,
-      "para4": 6,
-      "para5": 336
+      "para1": 480,
+      "para2": 4762,
+      "para3": 235,
+      "para4": 235,
+      "para5": 636
     },
     {
       "ID": 137,
-      "para1": 12,
-      "para2": 120,
-      "para3": 6,
-      "para4": 6,
-      "para5": 337
+      "para1": 480,
+      "para2": 4786,
+      "para3": 236,
+      "para4": 236,
+      "para5": 637
     },
     {
       "ID": 138,
-      "para1": 12,
-      "para2": 120,
-      "para3": 6,
-      "para4": 6,
-      "para5": 338
+      "para1": 480,
+      "para2": 4810,
+      "para3": 237,
+      "para4": 237,
+      "para5": 638
     },
     {
       "ID": 139,
-      "para1": 12,
-      "para2": 121,
-      "para3": 6,
-      "para4": 6,
-      "para5": 339
+      "para1": 480,
+      "para2": 4834,
+      "para3": 238,
+      "para4": 238,
+      "para5": 639
     },
     {
       "ID": 140,
-      "para1": 12,
-      "para2": 121,
-      "para3": 6,
-      "para4": 6,
-      "para5": 340
+      "para1": 480,
+      "para2": 4858,
+      "para3": 239,
+      "para4": 239,
+      "para5": 640
     },
     {
       "ID": 141,
-      "para1": 12,
-      "para2": 122,
-      "para3": 6,
-      "para4": 6,
-      "para5": 341
+      "para1": 480,
+      "para2": 4884,
+      "para3": 240,
+      "para4": 240,
+      "para5": 641
     },
     {
       "ID": 142,
-      "para1": 13,
-      "para2": 123,
-      "para3": 6,
-      "para4": 6,
-      "para5": 342
+      "para1": 500,
+      "para2": 4908,
+      "para3": 241,
+      "para4": 241,
+      "para5": 642
     },
     {
       "ID": 143,
-      "para1": 13,
-      "para2": 123,
-      "para3": 6,
-      "para4": 6,
-      "para5": 343
+      "para1": 500,
+      "para2": 4932,
+      "para3": 242,
+      "para4": 242,
+      "para5": 643
     },
     {
       "ID": 144,
-      "para1": 13,
-      "para2": 124,
-      "para3": 6,
-      "para4": 6,
-      "para5": 344
+      "para1": 500,
+      "para2": 4956,
+      "para3": 243,
+      "para4": 243,
+      "para5": 644
     },
     {
       "ID": 145,
-      "para1": 13,
-      "para2": 125,
-      "para3": 6,
-      "para4": 6,
-      "para5": 345
+      "para1": 500,
+      "para2": 4982,
+      "para3": 244,
+      "para4": 244,
+      "para5": 645
     },
     {
       "ID": 146,
-      "para1": 13,
-      "para2": 125,
-      "para3": 6,
-      "para4": 6,
-      "para5": 346
+      "para1": 500,
+      "para2": 5006,
+      "para3": 245,
+      "para4": 245,
+      "para5": 646
     },
     {
       "ID": 147,
-      "para1": 13,
-      "para2": 126,
-      "para3": 6,
-      "para4": 6,
-      "para5": 347
+      "para1": 500,
+      "para2": 5032,
+      "para3": 246,
+      "para4": 246,
+      "para5": 647
     },
     {
       "ID": 148,
-      "para1": 13,
-      "para2": 126,
-      "para3": 6,
-      "para4": 6,
-      "para5": 348
+      "para1": 500,
+      "para2": 5056,
+      "para3": 247,
+      "para4": 247,
+      "para5": 648
     },
     {
       "ID": 149,
-      "para1": 13,
-      "para2": 127,
-      "para3": 6,
-      "para4": 6,
-      "para5": 349
+      "para1": 500,
+      "para2": 5082,
+      "para3": 248,
+      "para4": 248,
+      "para5": 649
     },
     {
       "ID": 150,
-      "para1": 13,
-      "para2": 128,
-      "para3": 6,
-      "para4": 6,
-      "para5": 350
+      "para1": 520,
+      "para2": 5108,
+      "para3": 249,
+      "para4": 249,
+      "para5": 650
     },
     {
       "ID": 151,
-      "para1": 13,
-      "para2": 128,
-      "para3": 6,
-      "para4": 6,
-      "para5": 351
+      "para1": 520,
+      "para2": 5132,
+      "para3": 250,
+      "para4": 250,
+      "para5": 651
     },
     {
       "ID": 152,
-      "para1": 13,
-      "para2": 129,
-      "para3": 6,
-      "para4": 6,
-      "para5": 352
+      "para1": 520,
+      "para2": 5158,
+      "para3": 251,
+      "para4": 251,
+      "para5": 652
     },
     {
       "ID": 153,
-      "para1": 13,
-      "para2": 130,
-      "para3": 6,
-      "para4": 6,
-      "para5": 353
+      "para1": 520,
+      "para2": 5184,
+      "para3": 252,
+      "para4": 252,
+      "para5": 653
     },
     {
       "ID": 154,
-      "para1": 13,
-      "para2": 130,
-      "para3": 6,
-      "para4": 6,
-      "para5": 354
+      "para1": 520,
+      "para2": 5210,
+      "para3": 253,
+      "para4": 253,
+      "para5": 654
     },
     {
       "ID": 155,
-      "para1": 13,
-      "para2": 131,
-      "para3": 6,
-      "para4": 6,
-      "para5": 355
+      "para1": 520,
+      "para2": 5236,
+      "para3": 254,
+      "para4": 254,
+      "para5": 655
     },
     {
       "ID": 156,
-      "para1": 13,
-      "para2": 132,
-      "para3": 6,
-      "para4": 6,
-      "para5": 356
+      "para1": 520,
+      "para2": 5262,
+      "para3": 255,
+      "para4": 255,
+      "para5": 656
     },
     {
       "ID": 157,
-      "para1": 13,
-      "para2": 132,
-      "para3": 6,
-      "para4": 6,
-      "para5": 357
+      "para1": 520,
+      "para2": 5288,
+      "para3": 256,
+      "para4": 256,
+      "para5": 657
     },
     {
       "ID": 158,
-      "para1": 14,
-      "para2": 133,
-      "para3": 6,
-      "para4": 6,
-      "para5": 358
+      "para1": 540,
+      "para2": 5316,
+      "para3": 257,
+      "para4": 257,
+      "para5": 658
     },
     {
       "ID": 159,
-      "para1": 14,
-      "para2": 134,
-      "para3": 6,
-      "para4": 6,
-      "para5": 359
+      "para1": 540,
+      "para2": 5342,
+      "para3": 258,
+      "para4": 258,
+      "para5": 659
     },
     {
       "ID": 160,
-      "para1": 14,
-      "para2": 134,
-      "para3": 6,
-      "para4": 6,
-      "para5": 360
+      "para1": 540,
+      "para2": 5368,
+      "para3": 259,
+      "para4": 259,
+      "para5": 660
     },
     {
       "ID": 161,
-      "para1": 14,
-      "para2": 135,
-      "para3": 7,
-      "para4": 7,
-      "para5": 361
+      "para1": 540,
+      "para2": 5396,
+      "para3": 260,
+      "para4": 260,
+      "para5": 661
     },
     {
       "ID": 162,
-      "para1": 14,
-      "para2": 136,
-      "para3": 7,
-      "para4": 7,
-      "para5": 362
+      "para1": 540,
+      "para2": 5422,
+      "para3": 261,
+      "para4": 261,
+      "para5": 662
     },
     {
       "ID": 163,
-      "para1": 14,
-      "para2": 136,
-      "para3": 7,
-      "para4": 7,
-      "para5": 363
+      "para1": 540,
+      "para2": 5450,
+      "para3": 262,
+      "para4": 262,
+      "para5": 663
     },
     {
       "ID": 164,
-      "para1": 14,
-      "para2": 137,
-      "para3": 7,
-      "para4": 7,
-      "para5": 364
+      "para1": 540,
+      "para2": 5476,
+      "para3": 263,
+      "para4": 263,
+      "para5": 664
     },
     {
       "ID": 165,
-      "para1": 14,
-      "para2": 138,
-      "para3": 7,
-      "para4": 7,
-      "para5": 365
+      "para1": 560,
+      "para2": 5504,
+      "para3": 264,
+      "para4": 264,
+      "para5": 665
     },
     {
       "ID": 166,
-      "para1": 14,
-      "para2": 138,
-      "para3": 7,
-      "para4": 7,
-      "para5": 366
+      "para1": 560,
+      "para2": 5532,
+      "para3": 265,
+      "para4": 265,
+      "para5": 666
     },
     {
       "ID": 167,
-      "para1": 14,
-      "para2": 139,
-      "para3": 7,
-      "para4": 7,
-      "para5": 367
+      "para1": 560,
+      "para2": 5560,
+      "para3": 266,
+      "para4": 266,
+      "para5": 667
     },
     {
       "ID": 168,
-      "para1": 14,
-      "para2": 140,
-      "para3": 7,
-      "para4": 7,
-      "para5": 368
+      "para1": 560,
+      "para2": 5588,
+      "para3": 267,
+      "para4": 267,
+      "para5": 668
     },
     {
       "ID": 169,
-      "para1": 14,
-      "para2": 140,
-      "para3": 7,
-      "para4": 7,
-      "para5": 369
+      "para1": 560,
+      "para2": 5616,
+      "para3": 268,
+      "para4": 268,
+      "para5": 669
     },
     {
       "ID": 170,
-      "para1": 14,
-      "para2": 141,
-      "para3": 7,
-      "para4": 7,
-      "para5": 370
+      "para1": 560,
+      "para2": 5644,
+      "para3": 269,
+      "para4": 269,
+      "para5": 670
     },
     {
       "ID": 171,
-      "para1": 14,
-      "para2": 142,
-      "para3": 7,
-      "para4": 7,
-      "para5": 371
+      "para1": 560,
+      "para2": 5672,
+      "para3": 270,
+      "para4": 270,
+      "para5": 671
     },
     {
       "ID": 172,
-      "para1": 14,
-      "para2": 143,
-      "para3": 7,
-      "para4": 7,
-      "para5": 372
+      "para1": 560,
+      "para2": 5700,
+      "para3": 271,
+      "para4": 271,
+      "para5": 672
     },
     {
       "ID": 173,
-      "para1": 15,
-      "para2": 143,
-      "para3": 7,
-      "para4": 7,
-      "para5": 373
+      "para1": 580,
+      "para2": 5728,
+      "para3": 272,
+      "para4": 272,
+      "para5": 673
     },
     {
       "ID": 174,
-      "para1": 15,
-      "para2": 144,
-      "para3": 7,
-      "para4": 7,
-      "para5": 374
+      "para1": 580,
+      "para2": 5756,
+      "para3": 273,
+      "para4": 273,
+      "para5": 674
     },
     {
       "ID": 175,
-      "para1": 15,
-      "para2": 145,
-      "para3": 7,
-      "para4": 7,
-      "para5": 375
+      "para1": 580,
+      "para2": 5786,
+      "para3": 274,
+      "para4": 274,
+      "para5": 675
     },
     {
       "ID": 176,
-      "para1": 15,
-      "para2": 145,
-      "para3": 7,
-      "para4": 7,
-      "para5": 376
+      "para1": 580,
+      "para2": 5814,
+      "para3": 275,
+      "para4": 275,
+      "para5": 676
     },
     {
       "ID": 177,
-      "para1": 15,
-      "para2": 146,
-      "para3": 7,
-      "para4": 7,
-      "para5": 377
+      "para1": 580,
+      "para2": 5844,
+      "para3": 276,
+      "para4": 276,
+      "para5": 677
     },
     {
       "ID": 178,
-      "para1": 15,
-      "para2": 147,
-      "para3": 7,
-      "para4": 7,
-      "para5": 378
+      "para1": 580,
+      "para2": 5872,
+      "para3": 277,
+      "para4": 277,
+      "para5": 678
     },
     {
       "ID": 179,
-      "para1": 15,
-      "para2": 148,
-      "para3": 7,
-      "para4": 7,
-      "para5": 379
+      "para1": 600,
+      "para2": 5902,
+      "para3": 278,
+      "para4": 278,
+      "para5": 679
     },
     {
       "ID": 180,
-      "para1": 15,
-      "para2": 148,
-      "para3": 7,
-      "para4": 7,
-      "para5": 380
+      "para1": 600,
+      "para2": 5932,
+      "para3": 279,
+      "para4": 279,
+      "para5": 680
     },
     {
       "ID": 181,
-      "para1": 15,
-      "para2": 149,
-      "para3": 7,
-      "para4": 7,
-      "para5": 381
+      "para1": 600,
+      "para2": 5962,
+      "para3": 280,
+      "para4": 280,
+      "para5": 681
     },
     {
       "ID": 182,
-      "para1": 15,
-      "para2": 150,
-      "para3": 7,
-      "para4": 7,
-      "para5": 382
+      "para1": 600,
+      "para2": 5992,
+      "para3": 281,
+      "para4": 281,
+      "para5": 682
     },
     {
       "ID": 183,
-      "para1": 15,
-      "para2": 151,
-      "para3": 7,
-      "para4": 7,
-      "para5": 383
+      "para1": 600,
+      "para2": 6022,
+      "para3": 282,
+      "para4": 282,
+      "para5": 683
     },
     {
       "ID": 184,
-      "para1": 15,
-      "para2": 151,
-      "para3": 7,
-      "para4": 7,
-      "para5": 384
+      "para1": 600,
+      "para2": 6052,
+      "para3": 283,
+      "para4": 283,
+      "para5": 684
     },
     {
       "ID": 185,
-      "para1": 15,
-      "para2": 152,
-      "para3": 7,
-      "para4": 7,
-      "para5": 385
+      "para1": 600,
+      "para2": 6082,
+      "para3": 284,
+      "para4": 284,
+      "para5": 685
     },
     {
       "ID": 186,
-      "para1": 16,
-      "para2": 153,
-      "para3": 7,
-      "para4": 7,
-      "para5": 386
+      "para1": 620,
+      "para2": 6112,
+      "para3": 285,
+      "para4": 285,
+      "para5": 686
     },
     {
       "ID": 187,
-      "para1": 16,
-      "para2": 154,
-      "para3": 7,
-      "para4": 7,
-      "para5": 387
+      "para1": 620,
+      "para2": 6142,
+      "para3": 286,
+      "para4": 286,
+      "para5": 687
     },
     {
       "ID": 188,
-      "para1": 16,
-      "para2": 154,
-      "para3": 7,
-      "para4": 7,
-      "para5": 388
+      "para1": 620,
+      "para2": 6174,
+      "para3": 287,
+      "para4": 287,
+      "para5": 688
     },
     {
       "ID": 189,
-      "para1": 16,
-      "para2": 155,
-      "para3": 7,
-      "para4": 7,
-      "para5": 389
+      "para1": 620,
+      "para2": 6204,
+      "para3": 288,
+      "para4": 288,
+      "para5": 689
     },
     {
       "ID": 190,
-      "para1": 16,
-      "para2": 156,
-      "para3": 7,
-      "para4": 7,
-      "para5": 390
+      "para1": 620,
+      "para2": 6236,
+      "para3": 289,
+      "para4": 289,
+      "para5": 690
     },
     {
       "ID": 191,
-      "para1": 16,
-      "para2": 157,
-      "para3": 7,
-      "para4": 7,
-      "para5": 391
+      "para1": 620,
+      "para2": 6266,
+      "para3": 290,
+      "para4": 290,
+      "para5": 691
     },
     {
       "ID": 192,
-      "para1": 16,
-      "para2": 157,
-      "para3": 7,
-      "para4": 7,
-      "para5": 392
+      "para1": 620,
+      "para2": 6298,
+      "para3": 291,
+      "para4": 291,
+      "para5": 692
     },
     {
       "ID": 193,
-      "para1": 16,
-      "para2": 158,
-      "para3": 7,
-      "para4": 7,
-      "para5": 393
+      "para1": 640,
+      "para2": 6330,
+      "para3": 292,
+      "para4": 292,
+      "para5": 693
     },
     {
       "ID": 194,
-      "para1": 16,
-      "para2": 159,
-      "para3": 7,
-      "para4": 7,
-      "para5": 394
+      "para1": 640,
+      "para2": 6360,
+      "para3": 293,
+      "para4": 293,
+      "para5": 694
     },
     {
       "ID": 195,
-      "para1": 16,
-      "para2": 160,
-      "para3": 7,
-      "para4": 7,
-      "para5": 395
+      "para1": 640,
+      "para2": 6392,
+      "para3": 294,
+      "para4": 294,
+      "para5": 695
     },
     {
       "ID": 196,
-      "para1": 16,
-      "para2": 161,
-      "para3": 7,
-      "para4": 7,
-      "para5": 396
+      "para1": 640,
+      "para2": 6424,
+      "para3": 295,
+      "para4": 295,
+      "para5": 696
     },
     {
       "ID": 197,
-      "para1": 16,
-      "para2": 161,
-      "para3": 7,
-      "para4": 7,
-      "para5": 397
+      "para1": 640,
+      "para2": 6456,
+      "para3": 296,
+      "para4": 296,
+      "para5": 697
     },
     {
       "ID": 198,
-      "para1": 16,
-      "para2": 162,
-      "para3": 7,
-      "para4": 7,
-      "para5": 398
+      "para1": 640,
+      "para2": 6488,
+      "para3": 297,
+      "para4": 297,
+      "para5": 698
     },
     {
       "ID": 199,
-      "para1": 17,
-      "para2": 163,
-      "para3": 7,
-      "para4": 7,
-      "para5": 399
+      "para1": 660,
+      "para2": 6522,
+      "para3": 298,
+      "para4": 298,
+      "para5": 699
     },
     {
       "ID": 200,
-      "para1": 17,
-      "para2": 164,
-      "para3": 7,
-      "para4": 7,
-      "para5": 400
+      "para1": 660,
+      "para2": 6554,
+      "para3": 299,
+      "para4": 299,
+      "para5": 700
     },
     {
       "ID": 201,
-      "para1": 17,
-      "para2": 165,
-      "para3": 8,
-      "para4": 8,
-      "para5": 401
+      "para1": 660,
+      "para2": 6586,
+      "para3": 300,
+      "para4": 300,
+      "para5": 701
     },
     {
       "ID": 202,
-      "para1": 17,
-      "para2": 166,
-      "para3": 8,
-      "para4": 8,
-      "para5": 402
+      "para1": 660,
+      "para2": 6620,
+      "para3": 301,
+      "para4": 301,
+      "para5": 702
     },
     {
       "ID": 203,
-      "para1": 17,
-      "para2": 166,
-      "para3": 8,
-      "para4": 8,
-      "para5": 403
+      "para1": 660,
+      "para2": 6652,
+      "para3": 302,
+      "para4": 302,
+      "para5": 703
     },
     {
       "ID": 204,
-      "para1": 17,
-      "para2": 167,
-      "para3": 8,
-      "para4": 8,
-      "para5": 404
+      "para1": 660,
+      "para2": 6686,
+      "para3": 303,
+      "para4": 303,
+      "para5": 704
     },
     {
       "ID": 205,
-      "para1": 17,
-      "para2": 168,
-      "para3": 8,
-      "para4": 8,
-      "para5": 405
+      "para1": 680,
+      "para2": 6720,
+      "para3": 304,
+      "para4": 304,
+      "para5": 705
     },
     {
       "ID": 206,
-      "para1": 17,
-      "para2": 169,
-      "para3": 8,
-      "para4": 8,
-      "para5": 406
+      "para1": 680,
+      "para2": 6752,
+      "para3": 305,
+      "para4": 305,
+      "para5": 706
     },
     {
       "ID": 207,
-      "para1": 17,
-      "para2": 170,
-      "para3": 8,
-      "para4": 8,
-      "para5": 407
+      "para1": 680,
+      "para2": 6786,
+      "para3": 306,
+      "para4": 306,
+      "para5": 707
     },
     {
       "ID": 208,
-      "para1": 17,
-      "para2": 171,
-      "para3": 8,
-      "para4": 8,
-      "para5": 408
+      "para1": 680,
+      "para2": 6820,
+      "para3": 307,
+      "para4": 307,
+      "para5": 708
     },
     {
       "ID": 209,
-      "para1": 17,
-      "para2": 171,
-      "para3": 8,
-      "para4": 8,
-      "para5": 409
+      "para1": 680,
+      "para2": 6854,
+      "para3": 308,
+      "para4": 308,
+      "para5": 709
     },
     {
       "ID": 210,
-      "para1": 17,
-      "para2": 172,
-      "para3": 8,
-      "para4": 8,
-      "para5": 410
+      "para1": 680,
+      "para2": 6890,
+      "para3": 309,
+      "para4": 309,
+      "para5": 710
     },
     {
       "ID": 211,
-      "para1": 18,
-      "para2": 173,
-      "para3": 8,
-      "para4": 8,
-      "para5": 411
+      "para1": 700,
+      "para2": 6924,
+      "para3": 310,
+      "para4": 310,
+      "para5": 711
     },
     {
       "ID": 212,
-      "para1": 18,
-      "para2": 174,
-      "para3": 8,
-      "para4": 8,
-      "para5": 412
+      "para1": 700,
+      "para2": 6958,
+      "para3": 311,
+      "para4": 311,
+      "para5": 712
     },
     {
       "ID": 213,
-      "para1": 18,
-      "para2": 175,
-      "para3": 8,
-      "para4": 8,
-      "para5": 413
+      "para1": 700,
+      "para2": 6992,
+      "para3": 312,
+      "para4": 312,
+      "para5": 713
     },
     {
       "ID": 214,
-      "para1": 18,
-      "para2": 176,
-      "para3": 8,
-      "para4": 8,
-      "para5": 414
+      "para1": 700,
+      "para2": 7028,
+      "para3": 313,
+      "para4": 313,
+      "para5": 714
     },
     {
       "ID": 215,
-      "para1": 18,
-      "para2": 177,
-      "para3": 8,
-      "para4": 8,
-      "para5": 415
+      "para1": 700,
+      "para2": 7064,
+      "para3": 314,
+      "para4": 314,
+      "para5": 715
     },
     {
       "ID": 216,
-      "para1": 18,
-      "para2": 177,
-      "para3": 8,
-      "para4": 8,
-      "para5": 416
+      "para1": 700,
+      "para2": 7098,
+      "para3": 315,
+      "para4": 315,
+      "para5": 716
     },
     {
       "ID": 217,
-      "para1": 18,
-      "para2": 178,
-      "para3": 8,
-      "para4": 8,
-      "para5": 417
+      "para1": 720,
+      "para2": 7134,
+      "para3": 316,
+      "para4": 316,
+      "para5": 717
     },
     {
       "ID": 218,
-      "para1": 18,
-      "para2": 179,
-      "para3": 8,
-      "para4": 8,
-      "para5": 418
+      "para1": 720,
+      "para2": 7170,
+      "para3": 317,
+      "para4": 317,
+      "para5": 718
     },
     {
       "ID": 219,
-      "para1": 18,
-      "para2": 180,
-      "para3": 8,
-      "para4": 8,
-      "para5": 419
+      "para1": 720,
+      "para2": 7206,
+      "para3": 318,
+      "para4": 318,
+      "para5": 719
     },
     {
       "ID": 220,
-      "para1": 18,
-      "para2": 181,
-      "para3": 8,
-      "para4": 8,
-      "para5": 420
+      "para1": 720,
+      "para2": 7242,
+      "para3": 319,
+      "para4": 319,
+      "para5": 720
     },
     {
       "ID": 221,
-      "para1": 18,
-      "para2": 182,
-      "para3": 8,
-      "para4": 8,
-      "para5": 421
+      "para1": 720,
+      "para2": 7278,
+      "para3": 320,
+      "para4": 320,
+      "para5": 721
     },
     {
       "ID": 222,
-      "para1": 19,
-      "para2": 183,
-      "para3": 8,
-      "para4": 8,
-      "para5": 422
+      "para1": 740,
+      "para2": 7314,
+      "para3": 321,
+      "para4": 321,
+      "para5": 722
     },
     {
       "ID": 223,
-      "para1": 19,
-      "para2": 184,
-      "para3": 8,
-      "para4": 8,
-      "para5": 423
+      "para1": 740,
+      "para2": 7350,
+      "para3": 322,
+      "para4": 322,
+      "para5": 723
     },
     {
       "ID": 224,
-      "para1": 19,
-      "para2": 185,
-      "para3": 8,
-      "para4": 8,
-      "para5": 424
+      "para1": 740,
+      "para2": 7388,
+      "para3": 323,
+      "para4": 323,
+      "para5": 724
     },
     {
       "ID": 225,
-      "para1": 19,
-      "para2": 186,
-      "para3": 8,
-      "para4": 8,
-      "para5": 425
+      "para1": 740,
+      "para2": 7424,
+      "para3": 324,
+      "para4": 324,
+      "para5": 725
     },
     {
       "ID": 226,
-      "para1": 19,
-      "para2": 187,
-      "para3": 8,
-      "para4": 8,
-      "para5": 426
+      "para1": 740,
+      "para2": 7462,
+      "para3": 325,
+      "para4": 325,
+      "para5": 726
     },
     {
       "ID": 227,
-      "para1": 19,
-      "para2": 187,
-      "para3": 8,
-      "para4": 8,
-      "para5": 427
+      "para1": 740,
+      "para2": 7498,
+      "para3": 326,
+      "para4": 326,
+      "para5": 727
     },
     {
       "ID": 228,
-      "para1": 19,
-      "para2": 188,
-      "para3": 8,
-      "para4": 8,
-      "para5": 428
+      "para1": 760,
+      "para2": 7536,
+      "para3": 327,
+      "para4": 327,
+      "para5": 728
     },
     {
       "ID": 229,
-      "para1": 19,
-      "para2": 189,
-      "para3": 8,
-      "para4": 8,
-      "para5": 429
+      "para1": 760,
+      "para2": 7574,
+      "para3": 328,
+      "para4": 328,
+      "para5": 729
     },
     {
       "ID": 230,
-      "para1": 19,
-      "para2": 190,
-      "para3": 8,
-      "para4": 8,
-      "para5": 430
+      "para1": 760,
+      "para2": 7612,
+      "para3": 329,
+      "para4": 329,
+      "para5": 730
     },
     {
       "ID": 231,
-      "para1": 19,
-      "para2": 191,
-      "para3": 8,
-      "para4": 8,
-      "para5": 431
+      "para1": 760,
+      "para2": 7650,
+      "para3": 330,
+      "para4": 330,
+      "para5": 731
     },
     {
       "ID": 232,
-      "para1": 19,
-      "para2": 192,
-      "para3": 8,
-      "para4": 8,
-      "para5": 432
+      "para1": 760,
+      "para2": 7688,
+      "para3": 331,
+      "para4": 331,
+      "para5": 732
     },
     {
       "ID": 233,
-      "para1": 20,
-      "para2": 193,
-      "para3": 8,
-      "para4": 8,
-      "para5": 433
+      "para1": 780,
+      "para2": 7726,
+      "para3": 332,
+      "para4": 332,
+      "para5": 733
     },
     {
       "ID": 234,
-      "para1": 20,
-      "para2": 194,
-      "para3": 8,
-      "para4": 8,
-      "para5": 434
+      "para1": 780,
+      "para2": 7766,
+      "para3": 333,
+      "para4": 333,
+      "para5": 734
     },
     {
       "ID": 235,
-      "para1": 20,
-      "para2": 195,
-      "para3": 8,
-      "para4": 8,
-      "para5": 435
+      "para1": 780,
+      "para2": 7804,
+      "para3": 334,
+      "para4": 334,
+      "para5": 735
     },
     {
       "ID": 236,
-      "para1": 20,
-      "para2": 196,
-      "para3": 8,
-      "para4": 8,
-      "para5": 436
+      "para1": 780,
+      "para2": 7842,
+      "para3": 335,
+      "para4": 335,
+      "para5": 736
     },
     {
       "ID": 237,
-      "para1": 20,
-      "para2": 197,
-      "para3": 8,
-      "para4": 8,
-      "para5": 437
+      "para1": 780,
+      "para2": 7882,
+      "para3": 336,
+      "para4": 336,
+      "para5": 737
     },
     {
       "ID": 238,
-      "para1": 20,
-      "para2": 198,
-      "para3": 8,
-      "para4": 8,
-      "para5": 438
+      "para1": 800,
+      "para2": 7922,
+      "para3": 337,
+      "para4": 337,
+      "para5": 738
     },
     {
       "ID": 239,
-      "para1": 20,
-      "para2": 199,
-      "para3": 8,
-      "para4": 8,
-      "para5": 439
+      "para1": 800,
+      "para2": 7962,
+      "para3": 338,
+      "para4": 338,
+      "para5": 739
     },
     {
       "ID": 240,
-      "para1": 20,
-      "para2": 200,
-      "para3": 8,
-      "para4": 8,
-      "para5": 440
+      "para1": 800,
+      "para2": 8000,
+      "para3": 339,
+      "para4": 339,
+      "para5": 740
     },
     {
       "ID": 241,
-      "para1": 20,
-      "para2": 201,
-      "para3": 9,
-      "para4": 9,
-      "para5": 441
+      "para1": 800,
+      "para2": 8040,
+      "para3": 340,
+      "para4": 340,
+      "para5": 741
     },
     {
       "ID": 242,
-      "para1": 20,
-      "para2": 202,
-      "para3": 9,
-      "para4": 9,
-      "para5": 442
+      "para1": 800,
+      "para2": 8082,
+      "para3": 341,
+      "para4": 341,
+      "para5": 742
     },
     {
       "ID": 243,
-      "para1": 21,
-      "para2": 203,
-      "para3": 9,
-      "para4": 9,
-      "para5": 443
+      "para1": 820,
+      "para2": 8122,
+      "para3": 342,
+      "para4": 342,
+      "para5": 743
     },
     {
       "ID": 244,
-      "para1": 21,
-      "para2": 204,
-      "para3": 9,
-      "para4": 9,
-      "para5": 444
+      "para1": 820,
+      "para2": 8162,
+      "para3": 343,
+      "para4": 343,
+      "para5": 744
     },
     {
       "ID": 245,
-      "para1": 21,
-      "para2": 205,
-      "para3": 9,
-      "para4": 9,
-      "para5": 445
+      "para1": 820,
+      "para2": 8204,
+      "para3": 344,
+      "para4": 344,
+      "para5": 745
     },
     {
       "ID": 246,
-      "para1": 21,
-      "para2": 206,
-      "para3": 9,
-      "para4": 9,
-      "para5": 446
+      "para1": 820,
+      "para2": 8244,
+      "para3": 345,
+      "para4": 345,
+      "para5": 746
     },
     {
       "ID": 247,
-      "para1": 21,
-      "para2": 207,
-      "para3": 9,
-      "para4": 9,
-      "para5": 447
+      "para1": 820,
+      "para2": 8286,
+      "para3": 346,
+      "para4": 346,
+      "para5": 747
     },
     {
       "ID": 248,
-      "para1": 21,
-      "para2": 208,
-      "para3": 9,
-      "para4": 9,
-      "para5": 448
+      "para1": 840,
+      "para2": 8326,
+      "para3": 347,
+      "para4": 347,
+      "para5": 748
     },
     {
       "ID": 249,
-      "para1": 21,
-      "para2": 209,
-      "para3": 9,
-      "para4": 9,
-      "para5": 449
+      "para1": 840,
+      "para2": 8368,
+      "para3": 348,
+      "para4": 348,
+      "para5": 749
     },
     {
       "ID": 250,
-      "para1": 21,
-      "para2": 210,
-      "para3": 9,
-      "para4": 9,
-      "para5": 450
+      "para1": 840,
+      "para2": 8410,
+      "para3": 349,
+      "para4": 349,
+      "para5": 750
     },
     {
       "ID": 251,
-      "para1": 21,
-      "para2": 211,
-      "para3": 9,
-      "para4": 9,
-      "para5": 451
+      "para1": 840,
+      "para2": 8452,
+      "para3": 350,
+      "para4": 350,
+      "para5": 751
     },
     {
       "ID": 252,
-      "para1": 21,
-      "para2": 212,
-      "para3": 9,
-      "para4": 9,
-      "para5": 452
+      "para1": 840,
+      "para2": 8494,
+      "para3": 351,
+      "para4": 351,
+      "para5": 752
     },
     {
       "ID": 253,
-      "para1": 22,
-      "para2": 213,
-      "para3": 9,
-      "para4": 9,
-      "para5": 453
+      "para1": 860,
+      "para2": 8536,
+      "para3": 352,
+      "para4": 352,
+      "para5": 753
     },
     {
       "ID": 254,
-      "para1": 22,
-      "para2": 215,
-      "para3": 9,
-      "para4": 9,
-      "para5": 454
+      "para1": 860,
+      "para2": 8580,
+      "para3": 353,
+      "para4": 353,
+      "para5": 754
     },
     {
       "ID": 255,
-      "para1": 22,
-      "para2": 216,
-      "para3": 9,
-      "para4": 9,
-      "para5": 455
+      "para1": 860,
+      "para2": 8622,
+      "para3": 354,
+      "para4": 354,
+      "para5": 755
     },
     {
       "ID": 256,
-      "para1": 22,
-      "para2": 217,
-      "para3": 9,
-      "para4": 9,
-      "para5": 456
+      "para1": 860,
+      "para2": 8666,
+      "para3": 355,
+      "para4": 355,
+      "para5": 756
     },
     {
       "ID": 257,
-      "para1": 22,
-      "para2": 218,
-      "para3": 9,
-      "para4": 9,
-      "para5": 457
+      "para1": 880,
+      "para2": 8708,
+      "para3": 356,
+      "para4": 356,
+      "para5": 757
     },
     {
       "ID": 258,
-      "para1": 22,
-      "para2": 219,
-      "para3": 9,
-      "para4": 9,
-      "para5": 458
+      "para1": 880,
+      "para2": 8752,
+      "para3": 357,
+      "para4": 357,
+      "para5": 758
     },
     {
       "ID": 259,
-      "para1": 22,
-      "para2": 220,
-      "para3": 9,
-      "para4": 9,
-      "para5": 459
+      "para1": 880,
+      "para2": 8796,
+      "para3": 358,
+      "para4": 358,
+      "para5": 759
     },
     {
       "ID": 260,
-      "para1": 22,
-      "para2": 221,
-      "para3": 9,
-      "para4": 9,
-      "para5": 460
+      "para1": 880,
+      "para2": 8840,
+      "para3": 359,
+      "para4": 359,
+      "para5": 760
     },
     {
       "ID": 261,
-      "para1": 22,
-      "para2": 222,
-      "para3": 9,
-      "para4": 9,
-      "para5": 461
+      "para1": 880,
+      "para2": 8884,
+      "para3": 360,
+      "para4": 360,
+      "para5": 761
     },
     {
       "ID": 262,
-      "para1": 23,
-      "para2": 223,
-      "para3": 9,
-      "para4": 9,
-      "para5": 462
+      "para1": 900,
+      "para2": 8928,
+      "para3": 361,
+      "para4": 361,
+      "para5": 762
     },
     {
       "ID": 263,
-      "para1": 23,
-      "para2": 224,
-      "para3": 9,
-      "para4": 9,
-      "para5": 463
+      "para1": 900,
+      "para2": 8974,
+      "para3": 362,
+      "para4": 362,
+      "para5": 763
     },
     {
       "ID": 264,
-      "para1": 23,
-      "para2": 225,
-      "para3": 9,
-      "para4": 9,
-      "para5": 464
+      "para1": 900,
+      "para2": 9018,
+      "para3": 363,
+      "para4": 363,
+      "para5": 764
     },
     {
       "ID": 265,
-      "para1": 23,
-      "para2": 227,
-      "para3": 9,
-      "para4": 9,
-      "para5": 465
+      "para1": 900,
+      "para2": 9064,
+      "para3": 364,
+      "para4": 364,
+      "para5": 765
     },
     {
       "ID": 266,
-      "para1": 23,
-      "para2": 228,
-      "para3": 9,
-      "para4": 9,
-      "para5": 466
+      "para1": 920,
+      "para2": 9108,
+      "para3": 365,
+      "para4": 365,
+      "para5": 766
     },
     {
       "ID": 267,
-      "para1": 23,
-      "para2": 229,
-      "para3": 9,
-      "para4": 9,
-      "para5": 467
+      "para1": 920,
+      "para2": 9154,
+      "para3": 366,
+      "para4": 366,
+      "para5": 767
     },
     {
       "ID": 268,
-      "para1": 23,
-      "para2": 230,
-      "para3": 9,
-      "para4": 9,
-      "para5": 468
+      "para1": 920,
+      "para2": 9200,
+      "para3": 367,
+      "para4": 367,
+      "para5": 768
     },
     {
       "ID": 269,
-      "para1": 23,
-      "para2": 231,
-      "para3": 9,
-      "para4": 9,
-      "para5": 469
+      "para1": 920,
+      "para2": 9246,
+      "para3": 368,
+      "para4": 368,
+      "para5": 769
     },
     {
       "ID": 270,
-      "para1": 23,
-      "para2": 232,
-      "para3": 9,
-      "para4": 9,
-      "para5": 470
+      "para1": 920,
+      "para2": 9292,
+      "para3": 369,
+      "para4": 369,
+      "para5": 770
     },
     {
       "ID": 271,
-      "para1": 24,
-      "para2": 233,
-      "para3": 9,
-      "para4": 9,
-      "para5": 471
+      "para1": 940,
+      "para2": 9338,
+      "para3": 370,
+      "para4": 370,
+      "para5": 771
     },
     {
       "ID": 272,
-      "para1": 24,
-      "para2": 235,
-      "para3": 9,
-      "para4": 9,
-      "para5": 472
+      "para1": 940,
+      "para2": 9386,
+      "para3": 371,
+      "para4": 371,
+      "para5": 772
     },
     {
       "ID": 273,
-      "para1": 24,
-      "para2": 236,
-      "para3": 9,
-      "para4": 9,
-      "para5": 473
+      "para1": 940,
+      "para2": 9432,
+      "para3": 372,
+      "para4": 372,
+      "para5": 773
     },
     {
       "ID": 274,
-      "para1": 24,
-      "para2": 237,
-      "para3": 9,
-      "para4": 9,
-      "para5": 474
+      "para1": 940,
+      "para2": 9480,
+      "para3": 373,
+      "para4": 373,
+      "para5": 774
     },
     {
       "ID": 275,
-      "para1": 24,
-      "para2": 238,
-      "para3": 9,
-      "para4": 9,
-      "para5": 475
+      "para1": 960,
+      "para2": 9526,
+      "para3": 374,
+      "para4": 374,
+      "para5": 775
     },
     {
       "ID": 276,
-      "para1": 24,
-      "para2": 239,
-      "para3": 9,
-      "para4": 9,
-      "para5": 476
+      "para1": 960,
+      "para2": 9574,
+      "para3": 375,
+      "para4": 375,
+      "para5": 776
     },
     {
       "ID": 277,
-      "para1": 24,
-      "para2": 241,
-      "para3": 9,
-      "para4": 9,
-      "para5": 477
+      "para1": 960,
+      "para2": 9622,
+      "para3": 376,
+      "para4": 376,
+      "para5": 777
     },
     {
       "ID": 278,
-      "para1": 24,
-      "para2": 242,
-      "para3": 9,
-      "para4": 9,
-      "para5": 478
+      "para1": 960,
+      "para2": 9670,
+      "para3": 377,
+      "para4": 377,
+      "para5": 778
     },
     {
       "ID": 279,
-      "para1": 25,
-      "para2": 243,
-      "para3": 9,
-      "para4": 9,
-      "para5": 479
+      "para1": 980,
+      "para2": 9718,
+      "para3": 378,
+      "para4": 378,
+      "para5": 779
     },
     {
       "ID": 280,
-      "para1": 25,
-      "para2": 244,
-      "para3": 9,
-      "para4": 9,
-      "para5": 480
+      "para1": 980,
+      "para2": 9768,
+      "para3": 379,
+      "para4": 379,
+      "para5": 780
     },
     {
       "ID": 281,
-      "para1": 25,
-      "para2": 245,
-      "para3": 10,
-      "para4": 10,
-      "para5": 481
+      "para1": 980,
+      "para2": 9816,
+      "para3": 380,
+      "para4": 380,
+      "para5": 781
     },
     {
       "ID": 282,
-      "para1": 25,
-      "para2": 247,
-      "para3": 10,
-      "para4": 10,
-      "para5": 482
+      "para1": 980,
+      "para2": 9866,
+      "para3": 381,
+      "para4": 381,
+      "para5": 782
     },
     {
       "ID": 283,
-      "para1": 25,
-      "para2": 248,
-      "para3": 10,
-      "para4": 10,
-      "para5": 483
+      "para1": 1000,
+      "para2": 9914,
+      "para3": 382,
+      "para4": 382,
+      "para5": 783
     },
     {
       "ID": 284,
-      "para1": 25,
-      "para2": 249,
-      "para3": 10,
-      "para4": 10,
-      "para5": 484
+      "para1": 1000,
+      "para2": 9964,
+      "para3": 383,
+      "para4": 383,
+      "para5": 784
     },
     {
       "ID": 285,
-      "para1": 25,
-      "para2": 250,
-      "para3": 10,
-      "para4": 10,
-      "para5": 485
+      "para1": 1000,
+      "para2": 10014,
+      "para3": 384,
+      "para4": 384,
+      "para5": 785
     },
     {
       "ID": 286,
-      "para1": 25,
-      "para2": 252,
-      "para3": 10,
-      "para4": 10,
-      "para5": 486
+      "para1": 1000,
+      "para2": 10064,
+      "para3": 385,
+      "para4": 385,
+      "para5": 786
     },
     {
       "ID": 287,
-      "para1": 26,
-      "para2": 253,
-      "para3": 10,
-      "para4": 10,
-      "para5": 487
+      "para1": 1020,
+      "para2": 10114,
+      "para3": 386,
+      "para4": 386,
+      "para5": 787
     },
     {
       "ID": 288,
-      "para1": 26,
-      "para2": 254,
-      "para3": 10,
-      "para4": 10,
-      "para5": 488
+      "para1": 1020,
+      "para2": 10166,
+      "para3": 387,
+      "para4": 387,
+      "para5": 788
     },
     {
       "ID": 289,
-      "para1": 26,
-      "para2": 255,
-      "para3": 10,
-      "para4": 10,
-      "para5": 489
+      "para1": 1020,
+      "para2": 10216,
+      "para3": 388,
+      "para4": 388,
+      "para5": 789
     },
     {
       "ID": 290,
-      "para1": 26,
-      "para2": 257,
-      "para3": 10,
-      "para4": 10,
-      "para5": 490
+      "para1": 1020,
+      "para2": 10268,
+      "para3": 389,
+      "para4": 389,
+      "para5": 790
     },
     {
       "ID": 291,
-      "para1": 26,
-      "para2": 258,
-      "para3": 10,
-      "para4": 10,
-      "para5": 491
+      "para1": 1040,
+      "para2": 10318,
+      "para3": 390,
+      "para4": 390,
+      "para5": 791
     },
     {
       "ID": 292,
-      "para1": 26,
-      "para2": 259,
-      "para3": 10,
-      "para4": 10,
-      "para5": 492
+      "para1": 1040,
+      "para2": 10370,
+      "para3": 391,
+      "para4": 391,
+      "para5": 792
     },
     {
       "ID": 293,
-      "para1": 26,
-      "para2": 261,
-      "para3": 10,
-      "para4": 10,
-      "para5": 493
+      "para1": 1040,
+      "para2": 10422,
+      "para3": 392,
+      "para4": 392,
+      "para5": 793
     },
     {
       "ID": 294,
-      "para1": 26,
-      "para2": 262,
-      "para3": 10,
-      "para4": 10,
-      "para5": 494
+      "para1": 1040,
+      "para2": 10474,
+      "para3": 393,
+      "para4": 393,
+      "para5": 794
     },
     {
       "ID": 295,
-      "para1": 27,
-      "para2": 263,
-      "para3": 10,
-      "para4": 10,
-      "para5": 495
+      "para1": 1060,
+      "para2": 10526,
+      "para3": 394,
+      "para4": 394,
+      "para5": 795
     },
     {
       "ID": 296,
-      "para1": 27,
-      "para2": 264,
-      "para3": 10,
-      "para4": 10,
-      "para5": 496
+      "para1": 1060,
+      "para2": 10578,
+      "para3": 395,
+      "para4": 395,
+      "para5": 796
     },
     {
       "ID": 297,
-      "para1": 27,
-      "para2": 266,
-      "para3": 10,
-      "para4": 10,
-      "para5": 497
+      "para1": 1060,
+      "para2": 10632,
+      "para3": 396,
+      "para4": 396,
+      "para5": 797
     },
     {
       "ID": 298,
-      "para1": 27,
-      "para2": 267,
-      "para3": 10,
-      "para4": 10,
-      "para5": 498
+      "para1": 1060,
+      "para2": 10684,
+      "para3": 397,
+      "para4": 397,
+      "para5": 798
     },
     {
       "ID": 299,
-      "para1": 27,
-      "para2": 268,
-      "para3": 10,
-      "para4": 10,
-      "para5": 499
+      "para1": 1080,
+      "para2": 10738,
+      "para3": 398,
+      "para4": 398,
+      "para5": 799
     },
     {
       "ID": 300,
-      "para1": 27,
-      "para2": 270,
-      "para3": 10,
-      "para4": 10,
-      "para5": 500
+      "para1": 1080,
+      "para2": 10792,
+      "para3": 399,
+      "para4": 399,
+      "para5": 800
     }
   ]
 }

Assets/Res/Config/DropGroupConfig.json

@@ -123,7 +123,7 @@
       "ID": 18,
       "dropRate": 740,
       "dropItemID": [
-        11
+        12
       ]
     },
     {

Assets/Res/Config/DropItemConfig.json

@@ -93,16 +93,10 @@
         1005,
         1006,
         1001,
-        1001,
-        1001,
-        1001,
-        1001,
-        1001,
-        1001,
         1001
       ],
-      "dropMinV": -100,
-      "dropMaxV": -100,
+      "dropMinV": -300,
+      "dropMaxV": -300,
       "dropCountGoupID": -1
     },
     {

Assets/Res/Config/EventNPC.json

@@ -18,7 +18,7 @@
       "ID": 3,
       "name": 1954,
       "isNpc": true,
-      "icon": "bg_lh_chidaoren",
+      "icon": "bg_lh_yunzhi",
       "DaoyouID": 2
     },
     {
@@ -124,7 +124,7 @@
       "name": 3006,
       "isNpc": true,
       "icon": "bg_lh_xuyou",
-      "DaoyouID": 0
+      "DaoyouID": 5
     },
     {
       "ID": 107,
@@ -229,14 +229,14 @@
       "name": 2097,
       "isNpc": true,
       "icon": "bg_lh_yunzhi",
-      "DaoyouID": 0
+      "DaoyouID": 2
     },
     {
       "ID": 122,
       "name": 2098,
       "isNpc": true,
       "icon": "bg_lh_fengyao",
-      "DaoyouID": 0
+      "DaoyouID": 3
     },
     {
       "ID": 123,
@@ -299,7 +299,7 @@
       "name": 2107,
       "isNpc": true,
       "icon": "bg_lh_xiner",
-      "DaoyouID": 0
+      "DaoyouID": 7
     },
     {
       "ID": 132,
@@ -320,7 +320,7 @@
       "name": 2110,
       "isNpc": true,
       "icon": "bg_lh_liuqingyan1",
-      "DaoyouID": 0
+      "DaoyouID": 8
     },
     {
       "ID": 135,
@@ -362,7 +362,7 @@
       "name": 2116,
       "isNpc": true,
       "icon": "bg_lh_chuyunmiao",
-      "DaoyouID": 0
+      "DaoyouID": 9
     },
     {
       "ID": 141,
@@ -376,7 +376,7 @@
       "name": 2118,
       "isNpc": true,
       "icon": "bg_lh_linfeng",
-      "DaoyouID": 0
+      "DaoyouID": 10
     },
     {
       "ID": 143,
@@ -474,7 +474,7 @@
       "name": 2132,
       "isNpc": true,
       "icon": "bg_lh_liuqingyan2",
-      "DaoyouID": 0
+      "DaoyouID": 8
     },
     {
       "ID": 157,

Assets/Res/Config/GameConstantConfig.json

@@ -30,7 +30,7 @@
       ],
       "DetectEventCount": 100,
       "BasicCDperSkill": 2000.0,
-      "Daoyoushowuptime": 180,
+      "Daoyoushowuptime": 300,
       "DaoyouguajiDuration": [
         120,
         240
@@ -51,7 +51,8 @@
         0.023148
       ],
       "daolvfavoratePara": 200,
-      "offlineexpMaxTime": 86400
+      "offlineexpMaxTime": 86400,
+      "daoyouMaxshowupNum": 3
     }
   ]
 }

Assets/Res/Config/GroupConfig.json

@@ -262,7 +262,7 @@
     {
       "ID": 3001,
       "GroupMonsterLevel": [
-        16
+        11
       ],
       "GroupMonster": [
         7007
@@ -271,7 +271,7 @@
     {
       "ID": 3002,
       "GroupMonsterLevel": [
-        26
+        21
       ],
       "GroupMonster": [
         7001
@@ -280,7 +280,7 @@
     {
       "ID": 3003,
       "GroupMonsterLevel": [
-        16
+        11
       ],
       "GroupMonster": [
         7007
@@ -289,7 +289,7 @@
     {
       "ID": 3004,
       "GroupMonsterLevel": [
-        21
+        16
       ],
       "GroupMonster": [
         7007
@@ -298,7 +298,7 @@
     {
       "ID": 3005,
       "GroupMonsterLevel": [
-        21
+        16
       ],
       "GroupMonster": [
         5003
@@ -307,7 +307,7 @@
     {
       "ID": 3006,
       "GroupMonsterLevel": [
-        26
+        21
       ],
       "GroupMonster": [
         5003
@@ -316,7 +316,7 @@
     {
       "ID": 3007,
       "GroupMonsterLevel": [
-        36
+        31
       ],
       "GroupMonster": [
         5003
@@ -325,7 +325,7 @@
     {
       "ID": 3008,
       "GroupMonsterLevel": [
-        36
+        31
       ],
       "GroupMonster": [
         7001
@@ -391,16 +391,16 @@
         126
       ],
       "GroupMonster": [
-        9001
+        7004
       ]
     },
     {
       "ID": 3016,
       "GroupMonsterLevel": [
-        0
+        46
       ],
       "GroupMonster": [
-        9001
+        5007
       ]
     },
     {
@@ -415,7 +415,7 @@
     {
       "ID": 4001,
       "GroupMonsterLevel": [
-        11
+        8
       ],
       "GroupMonster": [
         5002
@@ -424,7 +424,7 @@
     {
       "ID": 4002,
       "GroupMonsterLevel": [
-        36
+        23
       ],
       "GroupMonster": [
         5007
@@ -433,7 +433,7 @@
     {
       "ID": 4003,
       "GroupMonsterLevel": [
-        21
+        20
       ],
       "GroupMonster": [
         5001
@@ -442,7 +442,7 @@
     {
       "ID": 4004,
       "GroupMonsterLevel": [
-        41
+        25
       ],
       "GroupMonster": [
         5001
@@ -451,7 +451,7 @@
     {
       "ID": 4005,
       "GroupMonsterLevel": [
-        41
+        25
       ],
       "GroupMonster": [
         5003
@@ -460,7 +460,7 @@
     {
       "ID": 4006,
       "GroupMonsterLevel": [
-        16
+        30
       ],
       "GroupMonster": [
         5002
@@ -469,7 +469,7 @@
     {
       "ID": 4007,
       "GroupMonsterLevel": [
-        36
+        35
       ],
       "GroupMonster": [
         5005
@@ -478,7 +478,7 @@
     {
       "ID": 4008,
       "GroupMonsterLevel": [
-        56
+        40
       ],
       "GroupMonster": [
         5001
@@ -487,7 +487,7 @@
     {
       "ID": 4009,
       "GroupMonsterLevel": [
-        31
+        26
       ],
       "GroupMonster": [
         5002
@@ -496,7 +496,7 @@
     {
       "ID": 4010,
       "GroupMonsterLevel": [
-        41
+        31
       ],
       "GroupMonster": [
         5004
@@ -639,9 +639,6 @@
     },
     {
       "ID": 4026,
-      "GroupMonsterLevel": [
-        1
-      ],
       "GroupMonster": [
         1008
       ]

Assets/Res/Config/LanguageChineseConfig_skill.json

@@ -674,27 +674,27 @@
     },
     {
       "ID": 1020070,
-      "txt": "极速齿轮"
+      "txt": "疾风法印"
     },
     {
       "ID": 1020071,
-      "txt": "极速齿轮"
+      "txt": "疾风法印"
     },
     {
       "ID": 1020072,
-      "txt": "极速齿轮"
+      "txt": "疾风法印"
     },
     {
       "ID": 1020073,
-      "txt": "极速齿轮"
+      "txt": "疾风法印"
     },
     {
       "ID": 1020074,
-      "txt": "极速齿轮"
+      "txt": "疾风法印"
     },
     {
       "ID": 1020075,
-      "txt": "极速齿轮"
+      "txt": "疾风法印"
     },
     {
       "ID": 1020080,
@@ -2754,27 +2754,27 @@
     },
     {
       "ID": 1120080,
-      "txt": "后方功法为剑功法时，催动功法后额外释放{0}道剑气，对敌人造成{1}%攻击力的伤害，并无视护盾类效果"
+      "txt": "后方功法催动时释放{0}道剑气，对敌人造成{1}%攻击力的伤害，并无视护盾类效果"
     },
     {
       "ID": 1120081,
-      "txt": "后方功法为剑功法时，催动功法后额外释放{0}道剑气，对敌人造成{1}%攻击力的伤害，并无视护盾类效果"
+      "txt": "后方功法催动时释放{0}道剑气，对敌人造成{1}%攻击力的伤害，并无视护盾类效果"
     },
     {
       "ID": 1120082,
-      "txt": "后方功法为剑功法时，催动功法后额外释放{0}道剑气，对敌人造成{1}%攻击力的伤害，并无视护盾类效果"
+      "txt": "后方功法催动时释放{0}道剑气，对敌人造成{1}%攻击力的伤害，并无视护盾类效果"
     },
     {
       "ID": 1120083,
-      "txt": "后方功法为剑功法时，催动功法后额外释放{0}道剑气，对敌人造成{1}%攻击力的伤害，并无视护盾类效果"
+      "txt": "后方功法催动时释放{0}道剑气，对敌人造成{1}%攻击力的伤害，并无视护盾类效果"
     },
     {
       "ID": 1120084,
-      "txt": "后方功法为剑功法时，催动功法后额外释放{0}道剑气，对敌人造成{1}%攻击力的伤害，并无视护盾类效果"
+      "txt": "后方功法催动时释放{0}道剑气，对敌人造成{1}%攻击力的伤害，并无视护盾类效果"
     },
     {
       "ID": 1120085,
-      "txt": "后方功法为剑功法时，催动功法后额外释放{0}道剑气，对敌人造成{1}%攻击力的伤害，并无视护盾类效果\n该剑气会对敌人施加{2}层流血"
+      "txt": "后方功法催动时释放{0}道剑气，对敌人造成{1}%攻击力的伤害，并无视护盾类效果\n该剑气会对敌人施加{2}层流血"
     },
     {
       "ID": 1120090,
@@ -4710,7 +4710,7 @@
     },
     {
       "ID": 1220085,
-      "txt": "前槽位也生效，剑气增强"
+      "txt": "额外对敌人施加流血"
     },
     {
       "ID": 1220091,
@@ -4730,7 +4730,7 @@
     },
     {
       "ID": 1220095,
-      "txt": "前槽位也生效，剑气增强"
+      "txt": "人物攻击永久+3%"
     },
     {
       "ID": 1220101,
@@ -4750,7 +4750,7 @@
     },
     {
       "ID": 1220105,
-      "txt": "前槽位也生效，剑气增强"
+      "txt": "残血时提升恢复量"
     },
     {
       "ID": 1220111,
@@ -4770,7 +4770,7 @@
     },
     {
       "ID": 1220115,
-      "txt": "前槽位也生效，剑气增强"
+      "txt": "人物生命永久+3%"
     },
     {
       "ID": 1220121,
@@ -4790,7 +4790,7 @@
     },
     {
       "ID": 1220125,
-      "txt": "前槽位也生效，剑气增强"
+      "txt": "人物攻击永久+3%"
     },
     {
       "ID": 1220131,
@@ -4810,7 +4810,7 @@
     },
     {
       "ID": 1220135,
-      "txt": "前槽位也生效，剑气增强"
+      "txt": "人物防御永久+3%"
     },
     {
       "ID": 1220141,
@@ -4830,7 +4830,7 @@
     },
     {
       "ID": 1220145,
-      "txt": "前槽位也生效，剑气增强"
+      "txt": "人物生命永久+3%"
     },
     {
       "ID": 1220151,
@@ -4850,7 +4850,7 @@
     },
     {
       "ID": 1220155,
-      "txt": "前槽位也生效，剑气增强"
+      "txt": "人物攻击永久+3%"
     },
     {
       "ID": 1220161,
@@ -4870,7 +4870,7 @@
     },
     {
       "ID": 1220165,
-      "txt": "前槽位也生效，剑气增强"
+      "txt": "人物防御永久+3%"
     },
     {
       "ID": 1220171,
@@ -4890,7 +4890,7 @@
     },
     {
       "ID": 1220175,
-      "txt": "前槽位也生效，剑气增强"
+      "txt": "人物生命永久+3%"
     },
     {
       "ID": 1220181,
@@ -4910,7 +4910,7 @@
     },
     {
       "ID": 1220185,
-      "txt": "前槽位也生效，剑气增强"
+      "txt": "人物攻击永久+3%"
     },
     {
       "ID": 1220191,
@@ -4930,7 +4930,7 @@
     },
     {
       "ID": 1220195,
-      "txt": "前槽位也生效，剑气增强"
+      "txt": "人物防御永久+3%"
     },
     {
       "ID": 1231011,
@@ -5134,23 +5134,23 @@
     },
     {
       "ID": 1235021,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 1235022,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 1235023,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 1235024,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 1235025,
-      "txt": ""
+      "txt": "0"
     }
   ]
 }

Assets/Res/Config/OpenBoxConfig.json

@@ -34,7 +34,7 @@
       ],
       "reward1": 999005,
       "reward2": 999006,
-      "reward2para1": 100,
+      "reward2para1": 99,
       "ProgressRewardChoukaCount": -1,
       "betPara1": [
         2.0,
@@ -81,7 +81,7 @@
       ],
       "reward1": 999009,
       "reward2": 999010,
-      "reward2para1": 100,
+      "reward2para1": 99,
       "ProgressRewardChoukaCount": 200,
       "betPara1": [
         2.0,

Assets/Res/Config/SentimentEffectConfig.json

@@ -128,7 +128,7 @@
       "massge": 3141,
       "pos": 1,
       "lastSentimentEffectId": -1,
-      "unlockLevel": 11,
+      "unlockLevel": 0,
       "effectType": 1,
       "effectVale": [
         2
@@ -145,7 +145,7 @@
       "massge": 10520,
       "pos": 1,
       "lastSentimentEffectId": -1,
-      "unlockLevel": 21,
+      "unlockLevel": 0,
       "effectType": 1,
       "effectVale": [
         3
@@ -162,7 +162,7 @@
       "massge": 10521,
       "pos": 1,
       "lastSentimentEffectId": -1,
-      "unlockLevel": 31,
+      "unlockLevel": 0,
       "effectType": 1,
       "effectVale": [
         4
@@ -179,7 +179,7 @@
       "massge": 10522,
       "pos": 1,
       "lastSentimentEffectId": -1,
-      "unlockLevel": 41,
+      "unlockLevel": 0,
       "effectType": 1,
       "effectVale": [
         5
@@ -196,7 +196,7 @@
       "massge": 10523,
       "pos": 1,
       "lastSentimentEffectId": -1,
-      "unlockLevel": 51,
+      "unlockLevel": 0,
       "effectType": 1,
       "effectVale": [
         6
@@ -213,7 +213,7 @@
       "massge": 3142,
       "pos": 2,
       "lastSentimentEffectId": 1,
-      "unlockLevel": 11,
+      "unlockLevel": 1,
       "effectType": 6,
       "effectVale": [
         2
@@ -230,7 +230,7 @@
       "massge": 10524,
       "pos": 2,
       "lastSentimentEffectId": 1,
-      "unlockLevel": 21,
+      "unlockLevel": 1,
       "effectType": 6,
       "effectVale": [
         3
@@ -247,7 +247,7 @@
       "massge": 10525,
       "pos": 2,
       "lastSentimentEffectId": 1,
-      "unlockLevel": 31,
+      "unlockLevel": 1,
       "effectType": 6,
       "effectVale": [
         4
@@ -264,7 +264,7 @@
       "massge": 10526,
       "pos": 2,
       "lastSentimentEffectId": 1,
-      "unlockLevel": 41,
+      "unlockLevel": 1,
       "effectType": 6,
       "effectVale": [
         5
@@ -281,7 +281,7 @@
       "massge": 10527,
       "pos": 2,
       "lastSentimentEffectId": 1,
-      "unlockLevel": 51,
+      "unlockLevel": 1,
       "effectType": 6,
       "effectVale": [
         6
@@ -298,7 +298,7 @@
       "massge": 3143,
       "pos": 3,
       "lastSentimentEffectId": -1,
-      "unlockLevel": 11,
+      "unlockLevel": 0,
       "effectType": 7,
       "effectVale": [
         2
@@ -315,7 +315,7 @@
       "massge": 10528,
       "pos": 3,
       "lastSentimentEffectId": -1,
-      "unlockLevel": 21,
+      "unlockLevel": 0,
       "effectType": 7,
       "effectVale": [
         3
@@ -332,7 +332,7 @@
       "massge": 10529,
       "pos": 3,
       "lastSentimentEffectId": -1,
-      "unlockLevel": 31,
+      "unlockLevel": 0,
       "effectType": 7,
       "effectVale": [
         4
@@ -349,7 +349,7 @@
       "massge": 10530,
       "pos": 3,
       "lastSentimentEffectId": -1,
-      "unlockLevel": 41,
+      "unlockLevel": 0,
       "effectType": 7,
       "effectVale": [
         5
@@ -366,7 +366,7 @@
       "massge": 10531,
       "pos": 3,
       "lastSentimentEffectId": -1,
-      "unlockLevel": 51,
+      "unlockLevel": 0,
       "effectType": 7,
       "effectVale": [
         6
@@ -383,7 +383,7 @@
       "massge": 3144,
       "pos": 4,
       "lastSentimentEffectId": 111,
-      "unlockLevel": 31,
+      "unlockLevel": 1,
       "effectType": 5,
       "effectVale": [
         106,
@@ -401,7 +401,7 @@
       "massge": 10532,
       "pos": 4,
       "lastSentimentEffectId": 111,
-      "unlockLevel": 41,
+      "unlockLevel": 2,
       "effectType": 5,
       "effectVale": [
         106,
@@ -419,7 +419,7 @@
       "massge": 10533,
       "pos": 4,
       "lastSentimentEffectId": 111,
-      "unlockLevel": 51,
+      "unlockLevel": 3,
       "effectType": 5,
       "effectVale": [
         106,
@@ -437,7 +437,7 @@
       "massge": 10534,
       "pos": 4,
       "lastSentimentEffectId": 111,
-      "unlockLevel": 61,
+      "unlockLevel": 4,
       "effectType": 5,
       "effectVale": [
         106,
@@ -455,7 +455,7 @@
       "massge": 10535,
       "pos": 4,
       "lastSentimentEffectId": 111,
-      "unlockLevel": 71,
+      "unlockLevel": 5,
       "effectType": 5,
       "effectVale": [
         106,
@@ -473,7 +473,7 @@
       "massge": 3145,
       "pos": 5,
       "lastSentimentEffectId": 112,
-      "unlockLevel": 31,
+      "unlockLevel": 1,
       "effectType": 8,
       "effectVale": [
         2
@@ -490,7 +490,7 @@
       "massge": 10536,
       "pos": 5,
       "lastSentimentEffectId": 112,
-      "unlockLevel": 41,
+      "unlockLevel": 2,
       "effectType": 8,
       "effectVale": [
         3
@@ -507,7 +507,7 @@
       "massge": 10537,
       "pos": 5,
       "lastSentimentEffectId": 112,
-      "unlockLevel": 51,
+      "unlockLevel": 3,
       "effectType": 8,
       "effectVale": [
         4
@@ -524,7 +524,7 @@
       "massge": 10538,
       "pos": 5,
       "lastSentimentEffectId": 112,
-      "unlockLevel": 61,
+      "unlockLevel": 4,
       "effectType": 8,
       "effectVale": [
         5
@@ -541,7 +541,7 @@
       "massge": 10539,
       "pos": 5,
       "lastSentimentEffectId": 112,
-      "unlockLevel": 71,
+      "unlockLevel": 5,
       "effectType": 8,
       "effectVale": [
         6
@@ -558,7 +558,7 @@
       "massge": 3146,
       "pos": 8,
       "lastSentimentEffectId": 115,
-      "unlockLevel": 51,
+      "unlockLevel": 1,
       "effectType": 9,
       "effectVale": [
         2,
@@ -576,7 +576,7 @@
       "massge": 10540,
       "pos": 8,
       "lastSentimentEffectId": 115,
-      "unlockLevel": 61,
+      "unlockLevel": 2,
       "effectType": 9,
       "effectVale": [
         3,
@@ -594,7 +594,7 @@
       "massge": 10541,
       "pos": 8,
       "lastSentimentEffectId": 115,
-      "unlockLevel": 71,
+      "unlockLevel": 3,
       "effectType": 9,
       "effectVale": [
         4,
@@ -612,7 +612,7 @@
       "massge": 10542,
       "pos": 8,
       "lastSentimentEffectId": 115,
-      "unlockLevel": 81,
+      "unlockLevel": 4,
       "effectType": 9,
       "effectVale": [
         5,
@@ -630,7 +630,7 @@
       "massge": 10543,
       "pos": 8,
       "lastSentimentEffectId": 115,
-      "unlockLevel": 91,
+      "unlockLevel": 5,
       "effectType": 9,
       "effectVale": [
         6,

Assets/Res/Config/SkillConfig.json

@@ -5762,7 +5762,7 @@
       "effectUpK": 100,
       "effectValue": [
         1.0,
-        120.0
+        80.0
       ],
       "intensifierIndex": [
         2
@@ -5791,7 +5791,7 @@
       "effectUpK": 100,
       "effectValue": [
         1.0,
-        130.0
+        90.0
       ],
       "intensifierIndex": [
         2
@@ -5829,7 +5829,7 @@
       "effectUpK": 100,
       "effectValue": [
         1.0,
-        140.0
+        100.0
       ],
       "intensifierIndex": [
         2
@@ -5867,7 +5867,7 @@
       "effectUpK": 100,
       "effectValue": [
         1.0,
-        150.0
+        110.0
       ],
       "intensifierIndex": [
         2
@@ -5905,7 +5905,7 @@
       "effectUpK": 100,
       "effectValue": [
         1.0,
-        160.0
+        120.0
       ],
       "intensifierIndex": [
         2
@@ -5943,7 +5943,7 @@
       "effectUpK": 100,
       "effectValue": [
         2.0,
-        170.0,
+        130.0,
         1.0
       ],
       "intensifierIndex": [
@@ -6170,9 +6170,12 @@
         102
       ],
       "addPropertyValue": [
-        12.0
+        15.0
       ],
       "PromoteLan": 1220095,
+      "PromoteLanPara": [
+        3.0
+      ],
       "PromoteLanPara_1": [
         1.0,
         -1.0
@@ -6557,9 +6560,12 @@
         101
       ],
       "addPropertyValue": [
-        12.0
+        15.0
       ],
-      "PromoteLan": 1220115
+      "PromoteLan": 1220115,
+      "PromoteLanPara": [
+        3.0
+      ]
     },
     {
       "ID": 20120,
@@ -6740,9 +6746,12 @@
         102
       ],
       "addPropertyValue": [
-        12.0
+        15.0
       ],
       "PromoteLan": 1220125,
+      "PromoteLanPara": [
+        3.0
+      ],
       "PromoteLanPara_1": [
         1.0
       ]
@@ -6926,9 +6935,12 @@
         103
       ],
       "addPropertyValue": [
-        12.0
+        15.0
       ],
       "PromoteLan": 1220135,
+      "PromoteLanPara": [
+        3.0
+      ],
       "PromoteLanPara_1": [
         1.0
       ]
@@ -7147,9 +7159,12 @@
         101
       ],
       "addPropertyValue": [
-        12.0
+        15.0
       ],
       "PromoteLan": 1220145,
+      "PromoteLanPara": [
+        3.0
+      ],
       "PromoteLanPara_1": [
         0.0,
         -1.0
@@ -7369,9 +7384,12 @@
         102
       ],
       "addPropertyValue": [
-        12.0
+        15.0
       ],
       "PromoteLan": 1220155,
+      "PromoteLanPara": [
+        3.0
+      ],
       "PromoteLanPara_1": [
         0.0,
         -1.0,
@@ -7587,9 +7605,12 @@
         103
       ],
       "addPropertyValue": [
-        12.0
+        15.0
       ],
       "PromoteLan": 1220165,
+      "PromoteLanPara": [
+        3.0
+      ],
       "PromoteLanPara_1": [
         1.0
       ]
@@ -7791,9 +7812,12 @@
         101
       ],
       "addPropertyValue": [
-        12.0
+        15.0
       ],
       "PromoteLan": 1220175,
+      "PromoteLanPara": [
+        3.0
+      ],
       "PromoteLanPara_1": [
         1.0
       ]
@@ -7998,9 +8022,12 @@
         102
       ],
       "addPropertyValue": [
-        12.0
+        15.0
       ],
-      "PromoteLan": 1220185
+      "PromoteLan": 1220185,
+      "PromoteLanPara": [
+        3.0
+      ]
     },
     {
       "ID": 20190,
@@ -8199,9 +8226,12 @@
         103
       ],
       "addPropertyValue": [
-        12.0
+        15.0
       ],
       "PromoteLan": 1220195,
+      "PromoteLanPara": [
+        3.0
+      ],
       "PromoteLanPara_1": [
         1.0
       ]
@@ -14727,7 +14757,7 @@
       "level": 1,
       "effectUpK": 100,
       "effectValue": [
-        300.0
+        100.0
       ],
       "intensifierIndex": [
         1
@@ -14751,7 +14781,7 @@
       "level": 2,
       "effectUpK": 100,
       "effectValue": [
-        400.0
+        120.0
       ],
       "intensifierIndex": [
         1
@@ -14775,7 +14805,7 @@
       "level": 3,
       "effectUpK": 100,
       "effectValue": [
-        500.0
+        140.0
       ],
       "intensifierIndex": [
         1
@@ -14799,7 +14829,7 @@
       "level": 4,
       "effectUpK": 100,
       "effectValue": [
-        600.0
+        160.0
       ],
       "intensifierIndex": [
         1
@@ -14823,7 +14853,7 @@
       "level": 5,
       "effectUpK": 100,
       "effectValue": [
-        700.0
+        180.0
       ],
       "intensifierIndex": [
         1
@@ -14847,7 +14877,7 @@
       "level": 6,
       "effectUpK": 100,
       "effectValue": [
-        800.0
+        200.0
       ],
       "intensifierIndex": [
         1

Assets/Res/Config/TowerInfoConfig.json

@@ -16,7 +16,7 @@
       ],
       "rewardCount": [
         1,
-        5200
+        13000
       ],
       "unlockValue": 0
     },
@@ -36,7 +36,7 @@
       ],
       "rewardCount": [
         1,
-        5200
+        13000
       ],
       "unlockValue": 0
     },
@@ -56,7 +56,7 @@
       ],
       "rewardCount": [
         1,
-        5600
+        14000
       ],
       "unlockValue": 0
     },
@@ -76,7 +76,7 @@
       ],
       "rewardCount": [
         1,
-        5600
+        14000
       ],
       "unlockValue": 0
     },
@@ -96,7 +96,7 @@
       ],
       "rewardCount": [
         1,
-        5600
+        14000
       ],
       "unlockValue": 0
     },
@@ -116,7 +116,7 @@
       ],
       "rewardCount": [
         1,
-        5600
+        14000
       ],
       "unlockValue": 0
     },
@@ -136,7 +136,7 @@
       ],
       "rewardCount": [
         1,
-        6000
+        15000
       ],
       "unlockValue": 0
     },
@@ -156,7 +156,7 @@
       ],
       "rewardCount": [
         1,
-        6000
+        15000
       ],
       "unlockValue": 0
     },
@@ -176,7 +176,7 @@
       ],
       "rewardCount": [
         1,
-        6000
+        15000
       ],
       "unlockValue": 0
     },
@@ -196,7 +196,7 @@
       ],
       "rewardCount": [
         1,
-        6000
+        15000
       ],
       "unlockValue": 0
     },
@@ -216,7 +216,7 @@
       ],
       "rewardCount": [
         1,
-        6400
+        16000
       ],
       "unlockValue": 0
     },
@@ -236,7 +236,7 @@
       ],
       "rewardCount": [
         1,
-        6400
+        16000
       ],
       "unlockValue": 0
     },
@@ -256,7 +256,7 @@
       ],
       "rewardCount": [
         1,
-        6400
+        16000
       ],
       "unlockValue": 0
     },
@@ -276,7 +276,7 @@
       ],
       "rewardCount": [
         1,
-        6400
+        16000
       ],
       "unlockValue": 0
     },
@@ -296,7 +296,7 @@
       ],
       "rewardCount": [
         1,
-        6800
+        17000
       ],
       "unlockValue": 0
     },
@@ -316,7 +316,7 @@
       ],
       "rewardCount": [
         1,
-        6800
+        17000
       ],
       "unlockValue": 0
     },
@@ -336,7 +336,7 @@
       ],
       "rewardCount": [
         1,
-        6800
+        17000
       ],
       "unlockValue": 0
     },
@@ -356,7 +356,7 @@
       ],
       "rewardCount": [
         1,
-        6800
+        17000
       ],
       "unlockValue": 0
     },
@@ -376,7 +376,7 @@
       ],
       "rewardCount": [
         1,
-        7200
+        18000
       ],
       "unlockValue": 0
     },
@@ -396,7 +396,7 @@
       ],
       "rewardCount": [
         1,
-        7200
+        18000
       ],
       "unlockValue": 0
     },
@@ -416,7 +416,7 @@
       ],
       "rewardCount": [
         1,
-        7200
+        18000
       ],
       "unlockValue": 0
     },
@@ -436,7 +436,7 @@
       ],
       "rewardCount": [
         1,
-        7200
+        18000
       ],
       "unlockValue": 0
     },
@@ -456,7 +456,7 @@
       ],
       "rewardCount": [
         1,
-        7600
+        19000
       ],
       "unlockValue": 0
     },
@@ -476,7 +476,7 @@
       ],
       "rewardCount": [
         1,
-        7600
+        19000
       ],
       "unlockValue": 0
     },
@@ -496,7 +496,7 @@
       ],
       "rewardCount": [
         1,
-        7600
+        19000
       ],
       "unlockValue": 0
     },
@@ -516,7 +516,7 @@
       ],
       "rewardCount": [
         1,
-        7600
+        19000
       ],
       "unlockValue": 0
     },
@@ -536,7 +536,7 @@
       ],
       "rewardCount": [
         1,
-        8000
+        20000
       ],
       "unlockValue": 0
     },
@@ -556,7 +556,7 @@
       ],
       "rewardCount": [
         1,
-        8000
+        20000
       ],
       "unlockValue": 0
     },
@@ -576,7 +576,7 @@
       ],
       "rewardCount": [
         1,
-        8000
+        20000
       ],
       "unlockValue": 0
     },
@@ -596,7 +596,7 @@
       ],
       "rewardCount": [
         1,
-        8000
+        20000
       ],
       "unlockValue": 0
     },
@@ -616,7 +616,7 @@
       ],
       "rewardCount": [
         1,
-        8400
+        21000
       ],
       "unlockValue": 0
     },
@@ -636,7 +636,7 @@
       ],
       "rewardCount": [
         1,
-        8400
+        21000
       ],
       "unlockValue": 0
     },
@@ -656,7 +656,7 @@
       ],
       "rewardCount": [
         1,
-        8400
+        21000
       ],
       "unlockValue": 0
     },
@@ -676,7 +676,7 @@
       ],
       "rewardCount": [
         1,
-        8400
+        21000
       ],
       "unlockValue": 0
     },
@@ -696,7 +696,7 @@
       ],
       "rewardCount": [
         1,
-        8800
+        22000
       ],
       "unlockValue": 0
     },
@@ -716,7 +716,7 @@
       ],
       "rewardCount": [
         1,
-        8800
+        22000
       ],
       "unlockValue": 0
     },
@@ -736,7 +736,7 @@
       ],
       "rewardCount": [
         1,
-        8800
+        22000
       ],
       "unlockValue": 0
     },
@@ -756,7 +756,7 @@
       ],
       "rewardCount": [
         1,
-        8800
+        22000
       ],
       "unlockValue": 0
     },
@@ -776,7 +776,7 @@
       ],
       "rewardCount": [
         1,
-        9200
+        23000
       ],
       "unlockValue": 0
     },
@@ -796,7 +796,7 @@
       ],
       "rewardCount": [
         1,
-        9200
+        23000
       ],
       "unlockValue": 0
     },
@@ -816,7 +816,7 @@
       ],
       "rewardCount": [
         1,
-        9200
+        23000
       ],
       "unlockValue": 0
     },
@@ -836,7 +836,7 @@
       ],
       "rewardCount": [
         1,
-        9200
+        23000
       ],
       "unlockValue": 0
     },
@@ -856,7 +856,7 @@
       ],
       "rewardCount": [
         1,
-        9600
+        24000
       ],
       "unlockValue": 0
     },
@@ -876,7 +876,7 @@
       ],
       "rewardCount": [
         1,
-        9600
+        24000
       ],
       "unlockValue": 0
     },
@@ -896,7 +896,7 @@
       ],
       "rewardCount": [
         1,
-        9600
+        24000
       ],
       "unlockValue": 0
     },
@@ -916,7 +916,7 @@
       ],
       "rewardCount": [
         1,
-        10000
+        25000
       ],
       "unlockValue": 0
     },
@@ -936,7 +936,7 @@
       ],
       "rewardCount": [
         1,
-        10000
+        25000
       ],
       "unlockValue": 0
     },
@@ -956,7 +956,7 @@
       ],
       "rewardCount": [
         1,
-        10000
+        25000
       ],
       "unlockValue": 0
     },
@@ -976,7 +976,7 @@
       ],
       "rewardCount": [
         1,
-        10400
+        26000
       ],
       "unlockValue": 0
     },
@@ -996,7 +996,7 @@
       ],
       "rewardCount": [
         1,
-        10400
+        26000
       ],
       "unlockValue": 0
     },
@@ -1016,7 +1016,7 @@
       ],
       "rewardCount": [
         1,
-        10400
+        26000
       ],
       "unlockValue": 0
     },
@@ -1036,7 +1036,7 @@
       ],
       "rewardCount": [
         1,
-        10800
+        27000
       ],
       "unlockValue": 0
     },
@@ -1056,7 +1056,7 @@
       ],
       "rewardCount": [
         1,
-        10800
+        27000
       ],
       "unlockValue": 0
     },
@@ -1076,7 +1076,7 @@
       ],
       "rewardCount": [
         1,
-        10800
+        27000
       ],
       "unlockValue": 0
     },
@@ -1096,7 +1096,7 @@
       ],
       "rewardCount": [
         1,
-        11200
+        28000
       ],
       "unlockValue": 0
     },
@@ -1116,7 +1116,7 @@
       ],
       "rewardCount": [
         1,
-        11200
+        28000
       ],
       "unlockValue": 0
     },
@@ -1136,7 +1136,7 @@
       ],
       "rewardCount": [
         1,
-        11200
+        28000
       ],
       "unlockValue": 0
     },
@@ -1156,7 +1156,7 @@
       ],
       "rewardCount": [
         1,
-        11600
+        29000
       ],
       "unlockValue": 0
     },
@@ -1176,7 +1176,7 @@
       ],
       "rewardCount": [
         1,
-        11600
+        29000
       ],
       "unlockValue": 0
     },
@@ -1196,7 +1196,7 @@
       ],
       "rewardCount": [
         1,
-        12000
+        30000
       ],
       "unlockValue": 0
     },
@@ -1216,7 +1216,7 @@
       ],
       "rewardCount": [
         1,
-        12000
+        30000
       ],
       "unlockValue": 0
     },
@@ -1236,7 +1236,7 @@
       ],
       "rewardCount": [
         1,
-        12000
+        30000
       ],
       "unlockValue": 0
     },
@@ -1256,7 +1256,7 @@
       ],
       "rewardCount": [
         1,
-        12400
+        31000
       ],
       "unlockValue": 0
     },
@@ -1276,7 +1276,7 @@
       ],
       "rewardCount": [
         1,
-        12400
+        31000
       ],
       "unlockValue": 0
     },
@@ -1296,7 +1296,7 @@
       ],
       "rewardCount": [
         1,
-        12400
+        31000
       ],
       "unlockValue": 0
     },
@@ -1316,7 +1316,7 @@
       ],
       "rewardCount": [
         1,
-        12800
+        32000
       ],
       "unlockValue": 0
     },
@@ -1336,7 +1336,7 @@
       ],
       "rewardCount": [
         1,
-        12800
+        32000
       ],
       "unlockValue": 0
     },
@@ -1356,7 +1356,7 @@
       ],
       "rewardCount": [
         1,
-        13200
+        33000
       ],
       "unlockValue": 0
     },
@@ -1376,7 +1376,7 @@
       ],
       "rewardCount": [
         1,
-        13200
+        33000
       ],
       "unlockValue": 0
     },
@@ -1396,7 +1396,7 @@
       ],
       "rewardCount": [
         1,
-        13200
+        33000
       ],
       "unlockValue": 0
     },
@@ -1416,7 +1416,7 @@
       ],
       "rewardCount": [
         1,
-        13600
+        34000
       ],
       "unlockValue": 0
     },
@@ -1436,7 +1436,7 @@
       ],
       "rewardCount": [
         1,
-        13600
+        34000
       ],
       "unlockValue": 0
     },
@@ -1456,7 +1456,7 @@
       ],
       "rewardCount": [
         1,
-        14000
+        35000
       ],
       "unlockValue": 0
     },
@@ -1476,7 +1476,7 @@
       ],
       "rewardCount": [
         1,
-        14000
+        35000
       ],
       "unlockValue": 0
     },
@@ -1496,7 +1496,7 @@
       ],
       "rewardCount": [
         1,
-        14000
+        35000
       ],
       "unlockValue": 0
     },
@@ -1516,7 +1516,7 @@
       ],
       "rewardCount": [
         1,
-        14400
+        36000
       ],
       "unlockValue": 0
     },
@@ -1536,7 +1536,7 @@
       ],
       "rewardCount": [
         1,
-        14400
+        36000
       ],
       "unlockValue": 0
     },
@@ -1556,7 +1556,7 @@
       ],
       "rewardCount": [
         1,
-        14800
+        37000
       ],
       "unlockValue": 0
     },
@@ -1576,7 +1576,7 @@
       ],
       "rewardCount": [
         1,
-        14800
+        37000
       ],
       "unlockValue": 0
     },
@@ -1596,7 +1596,7 @@
       ],
       "rewardCount": [
         1,
-        15200
+        38000
       ],
       "unlockValue": 0
     },
@@ -1616,7 +1616,7 @@
       ],
       "rewardCount": [
         1,
-        15200
+        38000
       ],
       "unlockValue": 0
     },
@@ -1636,7 +1636,7 @@
       ],
       "rewardCount": [
         1,
-        15600
+        39000
       ],
       "unlockValue": 0
     },
@@ -1656,7 +1656,7 @@
       ],
       "rewardCount": [
         1,
-        15600
+        39000
       ],
       "unlockValue": 0
     },
@@ -1676,7 +1676,7 @@
       ],
       "rewardCount": [
         1,
-        16000
+        40000
       ],
       "unlockValue": 0
     },
@@ -1696,7 +1696,7 @@
       ],
       "rewardCount": [
         1,
-        16000
+        40000
       ],
       "unlockValue": 0
     },
@@ -1716,7 +1716,7 @@
       ],
       "rewardCount": [
         1,
-        16400
+        41000
       ],
       "unlockValue": 0
     },
@@ -1736,7 +1736,7 @@
       ],
       "rewardCount": [
         1,
-        16400
+        41000
       ],
       "unlockValue": 0
     },
@@ -1756,7 +1756,7 @@
       ],
       "rewardCount": [
         1,
-        16800
+        42000
       ],
       "unlockValue": 0
     },
@@ -1776,7 +1776,7 @@
       ],
       "rewardCount": [
         1,
-        16800
+        42000
       ],
       "unlockValue": 0
     },
@@ -1796,7 +1796,7 @@
       ],
       "rewardCount": [
         1,
-        17200
+        43000
       ],
       "unlockValue": 0
     },
@@ -1816,7 +1816,7 @@
       ],
       "rewardCount": [
         1,
-        17200
+        43000
       ],
       "unlockValue": 0
     },
@@ -1836,7 +1836,7 @@
       ],
       "rewardCount": [
         1,
-        17600
+        44000
       ],
       "unlockValue": 0
     },
@@ -1856,7 +1856,7 @@
       ],
       "rewardCount": [
         1,
-        18000
+        45000
       ],
       "unlockValue": 0
     },
@@ -1876,7 +1876,7 @@
       ],
       "rewardCount": [
         1,
-        18400
+        46000
       ],
       "unlockValue": 0
     },
@@ -1896,7 +1896,7 @@
       ],
       "rewardCount": [
         1,
-        19200
+        48000
       ],
       "unlockValue": 0
     },
@@ -1916,7 +1916,7 @@
       ],
       "rewardCount": [
         1,
-        19600
+        49000
       ],
       "unlockValue": 0
     },
@@ -1936,7 +1936,7 @@
       ],
       "rewardCount": [
         1,
-        20000
+        50000
       ],
       "unlockValue": 0
     },
@@ -1956,7 +1956,7 @@
       ],
       "rewardCount": [
         1,
-        20400
+        51000
       ],
       "unlockValue": 0
     },
@@ -1976,7 +1976,7 @@
       ],
       "rewardCount": [
         1,
-        21200
+        53000
       ],
       "unlockValue": 0
     },
@@ -1996,7 +1996,7 @@
       ],
       "rewardCount": [
         1,
-        21600
+        54000
       ],
       "unlockValue": 0
     }

Assets/Res/UI/AppBarPanel/AppBarPanel.prefab

@@ -4968,7 +4968,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Content: {fileID: 2303318506788104112}
-  m_Horizontal: 1
+  m_Horizontal: 0
   m_Vertical: 1
   m_MovementType: 1
   m_Elasticity: 0.1

Assets/Res/UI/BattleSettlementPanel.prefab

@@ -1689,6 +1689,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Text_Desc1
+    gameObject: {fileID: 7578527787724932468}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!1 &7117668935224744481
 GameObject:
@@ -1751,7 +1756,7 @@ GameObject:
   - component: {fileID: 7578527787724932468}
   m_Layer: 5
   m_HasEditorInfo: 1
-  m_Name: Text_Desc (1)
+  m_Name: Text_Desc1
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -1771,9 +1776,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 185075131536662509}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: -639}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: 0, y: 173}
   m_SizeDelta: {x: 601.6, y: 68}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2445952998002896366

Assets/Res/UI/DaoYouPanel/Btn_Tongyong.prefab

@@ -341,7 +341,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 31
+    m_FontSize: 32
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 2

Assets/Res/UI/DaoYouPanel/DaoYouInfoPanel.prefab

@@ -35,7 +35,7 @@ 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: 18.2, y: 2.2}
+  m_AnchoredPosition: {x: 20, y: 2.2}
   m_SizeDelta: {x: 25, y: 26}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &744498413847965706
@@ -191,6 +191,7 @@ GameObject:
   - component: {fileID: 7861361364591785620}
   - component: {fileID: 2592117225002795013}
   - component: {fileID: 599767346031559948}
+  - component: {fileID: 1029725069993258739}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Fill
@@ -210,7 +211,8 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 7976174467344622624}
   m_Father: {fileID: 8745201384845463338}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
@@ -269,6 +271,19 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!114 &1029725069993258739
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 68691510019113155}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_ShowMaskGraphic: 1
 --- !u!1 &73317371746886061
 GameObject:
   m_ObjectHideFlags: 0
@@ -798,9 +813,9 @@ RectTransform:
   - {fileID: 5422397682402119819}
   m_Father: {fileID: 149326191559001960}
   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.0013685, y: 110.72443}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: 0.0013685, y: 664.7244}
   m_SizeDelta: {x: 750, y: 886.7512}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4946174474217477249
@@ -879,7 +894,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 40
+    m_FontSize: 32
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 3
@@ -1061,7 +1076,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 31.5949, y: 0}
+  m_AnchoredPosition: {x: 48, y: -2}
   m_SizeDelta: {x: -63.1898, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7163272866229212282
@@ -1085,7 +1100,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.91372555, g: 0.9058824, b: 0.9215687, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1094,7 +1109,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 66
+    m_FontSize: 52
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 10
@@ -1105,7 +1120,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u7384\u7389"
+  m_Text: "\u96C0\u7075\u513F"
 --- !u!1 &957334741870432535
 GameObject:
   m_ObjectHideFlags: 0
@@ -1232,7 +1247,7 @@ 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: 283.9711, y: -0.8999634}
+  m_AnchoredPosition: {x: 247, y: -0.8999634}
   m_SizeDelta: {x: 29.7794, y: 29.7794}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &8269233364737267016
@@ -1256,7 +1271,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.17499542, g: 0.27735734, b: 0.3066036, a: 1}
+  m_Color: {r: 0.58431375, g: 0.68235296, b: 0.59607846, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1367,8 +1382,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 197.0892, y: -53}
-  m_SizeDelta: {x: 394.1784, y: 0}
+  m_AnchoredPosition: {x: 150, y: -96}
+  m_SizeDelta: {x: 300, y: 0}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &8219955351092879517
 CanvasRenderer:
@@ -1391,7 +1406,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.19215688, g: 0.1764706, b: 0.14901961, a: 1}
+  m_Color: {r: 0.16981101, g: 0.049022578, b: 0.04004974, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1400,18 +1415,18 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 30
-    m_FontStyle: 1
+    m_FontSize: 40
+    m_FontStyle: 0
     m_BestFit: 0
-    m_MinSize: 1
-    m_MaxSize: 40
+    m_MinSize: 0
+    m_MaxSize: 183
     m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 1
     m_LineSpacing: 1
-  m_Text: "\u5F00\u5FC3"
+  m_Text: "\u4ECA\u5929\u7684\u5FC3\u60C5\u4E48\u4E48\u54D2!"
 --- !u!114 &2485191496078184997
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1515,7 +1530,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 46
+    m_FontSize: 42
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 3
@@ -1720,7 +1735,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 36
+    m_FontSize: 40
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 2
@@ -2157,7 +2172,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.8000001, g: 0.8196079, b: 0.81568635, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -2315,10 +2330,10 @@ RectTransform:
   - {fileID: 5836252166898464303}
   m_Father: {fileID: 9037135992368401232}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 0}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0.6822316}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 1108.2}
+  m_SizeDelta: {x: 750, y: 0.19995117}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &399209848103943354
 CanvasRenderer:
@@ -2858,7 +2873,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 36
+    m_FontSize: 40
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 2
@@ -2967,18 +2982,18 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 46
+    m_FontSize: 42
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 3
-    m_MaxSize: 46
+    m_MaxSize: 48
     m_Alignment: 3
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u559C\u6B22\u793C\u7269"
+  m_Text: "\u559C\u6B22\u7684\u793C\u7269"
 --- !u!114 &3448716094321876748
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -3029,7 +3044,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0.000061035156}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8486095640457923278
@@ -3132,7 +3147,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: 102.980064, y: 137.5}
+  m_AnchoredPosition: {x: 0, y: 137.5}
   m_SizeDelta: {x: 494.86, y: 35.9968}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4125139517950329887
@@ -3166,17 +3181,17 @@ MonoBehaviour:
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_FontSize: 30
-    m_FontStyle: 1
+    m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 2
     m_MaxSize: 40
-    m_Alignment: 0
+    m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u9001\u73A9\u5BB6\u559C\u6B22\u5F97\u7269\u54C1\u597D\u611F\u5EA6\u52A0\u5F97\u66F4\u591A\u54DF"
+  m_Text: "\u8D60\u9001\u9053\u53CB\u559C\u6B22\u7684\u793C\u7269"
 --- !u!114 &4178572551010760513
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -3504,7 +3519,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.3529412, g: 0.31764707, b: 0.3019608, a: 1}
+  m_Color: {r: 0.122641206, g: 0.11062628, b: 0.105286315, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -3513,8 +3528,8 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 30
-    m_FontStyle: 1
+    m_FontSize: 32
+    m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 2
     m_MaxSize: 40
@@ -3734,6 +3749,95 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!1 &3245384902160382418
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7713905150900871881}
+  - component: {fileID: 4326224566549432808}
+  - component: {fileID: 7148053329663934994}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Icon_Select
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7713905150900871881
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3245384902160382418}
+  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: 5836252166898464303}
+  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: -240.5305, y: 239.78943}
+  m_SizeDelta: {x: 110, y: 110}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4326224566549432808
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3245384902160382418}
+  m_CullTransparentMesh: 1
+--- !u!114 &7148053329663934994
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3245384902160382418}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.1573993, g: 1, b: 0, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_juxing_fang_hujiao
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: a168dc0f25a20a224c1e318163e47f34
+  imageH: 110
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &3269525500137286496
 GameObject:
   m_ObjectHideFlags: 0
@@ -3770,7 +3874,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: 67.84, y: -319.34}
+  m_AnchoredPosition: {x: 0, y: -323}
   m_SizeDelta: {x: 505.1024, y: 31.711}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8461724369163925533
@@ -3804,11 +3908,11 @@ MonoBehaviour:
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_FontSize: 28
-    m_FontStyle: 1
+    m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 2
     m_MaxSize: 40
-    m_Alignment: 0
+    m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
@@ -4435,9 +4539,10 @@ GameObject:
   - component: {fileID: 1947956645310402617}
   - component: {fileID: 234858011452441900}
   - component: {fileID: 2761026854192904416}
+  - component: {fileID: 7246171821947695717}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: myImage (1)
+  m_Name: NameRoot
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -4460,7 +4565,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: -58.6, y: 11.9}
+  m_AnchoredPosition: {x: -39, y: 9}
   m_SizeDelta: {x: 329, y: 135}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &234858011452441900
@@ -4484,7 +4589,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.18823531, g: 0.454902, b: 0.46274513, a: 1}
+  m_Color: {r: 0.06214389, g: 0.6933961, b: 0.6900855, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -4514,6 +4619,21 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!114 &7246171821947695717
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3600457664988807249}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7e884cfd2aa14b98baf1ef3f9d1fc5b0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  offsetX: 0
+  anchorPointType: 2
+  isUpdate: 0
 --- !u!1 &3641049731285540800
 GameObject:
   m_ObjectHideFlags: 0
@@ -4878,10 +4998,10 @@ RectTransform:
   - {fileID: 6015065027993439653}
   m_Father: {fileID: 9037135992368401232}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMin: {x: 0.5, y: 0.6822316}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0, y: -0.000061035156}
-  m_SizeDelta: {x: 750, y: 515.78}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 750, y: -1.2199707}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &2133170375772490070
 CanvasRenderer:
@@ -5395,6 +5515,7 @@ RectTransform:
   - {fileID: 8564065976731006734}
   - {fileID: 5559529533166581890}
   - {fileID: 1744558580528090098}
+  - {fileID: 7713905150900871881}
   - {fileID: 774778019378967937}
   - {fileID: 6714861516730245370}
   - {fileID: 3298569070802226294}
@@ -6052,7 +6173,7 @@ 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: 281.0711, y: 3.4000092}
+  m_AnchoredPosition: {x: 244, y: 1}
   m_SizeDelta: {x: 29.7794, y: 29.7794}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &6172267074859294437
@@ -6076,7 +6197,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.17499542, g: 0.27735734, b: 0.3066036, a: 1}
+  m_Color: {r: 0.583965, g: 0.683, b: 0.5956162, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -6219,7 +6340,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 46
+    m_FontSize: 42
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 3
@@ -6324,6 +6445,95 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: 1
+--- !u!1 &5148372826667046155
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7976174467344622624}
+  - component: {fileID: 8229155369495215477}
+  - component: {fileID: 1051250069218886472}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7976174467344622624
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5148372826667046155}
+  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: 7861361364591785620}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 0.5}
+  m_AnchorMax: {x: 1, y: 0.5}
+  m_AnchoredPosition: {x: -100.01, y: 0.00000047683716}
+  m_SizeDelta: {x: 100, y: 22}
+  m_Pivot: {x: 1, y: 0.5}
+--- !u!222 &8229155369495215477
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5148372826667046155}
+  m_CullTransparentMesh: 1
+--- !u!114 &1051250069218886472
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5148372826667046155}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 0.8748327, b: 0, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_jianbian_tiao2
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: a168dc0f25a20a224c1e318163e47f34
+  imageH: 100
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &5276004169157575716
 GameObject:
   m_ObjectHideFlags: 0
@@ -6360,7 +6570,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -295.22, y: -188.45}
+  m_AnchoredPosition: {x: -295.22, y: -199}
   m_SizeDelta: {x: -651.2059, y: -823.6446}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5310920071325626268
@@ -6398,7 +6608,7 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 2
     m_MaxSize: 40
-    m_Alignment: 3
+    m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
@@ -6487,7 +6697,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 46
+    m_FontSize: 42
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 3
@@ -6546,8 +6756,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: 165.8, y: -27.1}
-  m_SizeDelta: {x: 272.8918, y: 76.393}
+  m_AnchoredPosition: {x: 131, y: -154}
+  m_SizeDelta: {x: 280, y: 74}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &5475174839614059240
 GameObject:
@@ -6823,7 +7033,7 @@ GameObject:
   - component: {fileID: 7337676148118970194}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: myImage
+  m_Name: BtnRoot
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -6845,10 +7055,10 @@ RectTransform:
   - {fileID: 8584488876590990322}
   m_Father: {fileID: 149326191559001960}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: -402.9}
-  m_SizeDelta: {x: 750, y: 97.85}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: 0, y: 151.1}
+  m_SizeDelta: {x: 750, y: 97.850006}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6379878544651680598
 CanvasRenderer:
@@ -6956,7 +7166,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: 0.000009536743, y: 0}
+  m_AnchoredPosition: {x: 0.0000076293945, y: 0}
   m_SizeDelta: {x: 12.0853, y: 19.7181}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2038504056846951328
@@ -7047,7 +7257,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: -15.5, y: -127.1}
-  m_SizeDelta: {x: 302, y: 107}
+  m_SizeDelta: {x: 385.7, y: 120}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4670394487777031405
 CanvasRenderer:
@@ -7070,7 +7280,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 1, g: 0.46226406, b: 0.7060526, a: 0.7058824}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -7087,7 +7297,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_daoyou_songli_di
+  _icon_name: dec_xudb
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: 0d383e80d99516a44a603bb1ccd73209, type: 3}
   packInfo:
@@ -7280,9 +7490,10 @@ GameObject:
   - component: {fileID: 1418411134778499142}
   - component: {fileID: 8931983443319189626}
   - component: {fileID: 6691099693272610869}
+  - component: {fileID: 6301324928613682989}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: myImage
+  m_Name: JingjieRoot
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -7305,8 +7516,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: -211.26437, y: -128.4}
-  m_SizeDelta: {x: 327.4713, y: 63.6956}
+  m_AnchoredPosition: {x: -211.26437, y: -122}
+  m_SizeDelta: {x: 333, y: 51.9}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &8931983443319189626
 CanvasRenderer:
@@ -7359,6 +7570,21 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!114 &6301324928613682989
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5970111009504445614}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7e884cfd2aa14b98baf1ef3f9d1fc5b0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  offsetX: 0
+  anchorPointType: 2
+  isUpdate: 0
 --- !u!1 &6048444918962297173
 GameObject:
   m_ObjectHideFlags: 0
@@ -7657,9 +7883,9 @@ RectTransform:
   - {fileID: 3093436952733600723}
   m_Father: {fileID: 149326191559001960}
   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.0017529, y: 110.72}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: 0.0017529, y: 664.72}
   m_SizeDelta: {x: 750, y: 886.75}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6963037805459712225
@@ -7813,8 +8039,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: 282.51, y: -22.7}
-  m_SizeDelta: {x: 110.66, y: 36.4585}
+  m_AnchoredPosition: {x: 208.07814, y: 5.6}
+  m_SizeDelta: {x: 224.3377, y: 32.512}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &686079759204038695
 CanvasRenderer:
@@ -7846,18 +8072,18 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 33
+    m_FontSize: 30
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 2
     m_MaxSize: 40
-    m_Alignment: 3
+    m_Alignment: 5
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: 35/100
+  m_Text: 7000.1/8000
 --- !u!1 &6741654833168219823
 GameObject:
   m_ObjectHideFlags: 0
@@ -7869,9 +8095,10 @@ GameObject:
   - component: {fileID: 6226328605185051319}
   - component: {fileID: 1916760802098350641}
   - component: {fileID: 6695956009848624283}
+  - component: {fileID: 7282711932981084345}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: myImage (3)
+  m_Name: MapRoot
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -7895,7 +8122,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 297.48, y: -51.980633}
+  m_AnchoredPosition: {x: 297.48, y: -64}
   m_SizeDelta: {x: 155.04, y: 46.1422}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &1916760802098350641
@@ -7919,7 +8146,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.42352945, g: 0.5529412, b: 0.5176471, a: 1}
+  m_Color: {r: 0.21426654, g: 0.42452818, b: 0.3671841, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -7949,6 +8176,21 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!114 &7282711932981084345
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6741654833168219823}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7e884cfd2aa14b98baf1ef3f9d1fc5b0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  offsetX: 0
+  anchorPointType: 2
+  isUpdate: 0
 --- !u!1 &6856112115365969682
 GameObject:
   m_ObjectHideFlags: 0
@@ -8050,7 +8292,7 @@ GameObject:
   - component: {fileID: 6566338979143667368}
   - component: {fileID: 3426517287418739909}
   - component: {fileID: 6681611969160843806}
-  - component: {fileID: 3457877069773292889}
+  - component: {fileID: 1673723515708135352}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text_GiftGailv
@@ -8120,7 +8362,7 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u9001\u793C\u6982\u7387\uFF1A20%"
---- !u!114 &3457877069773292889
+--- !u!114 &1673723515708135352
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -8129,12 +8371,13 @@ MonoBehaviour:
   m_GameObject: {fileID: 6928571901326992704}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Script: {fileID: 11500000, guid: d8d4ef1212a480c4286901b11158a0b7, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_EffectColor: {r: 0.6666667, g: 0.46274513, b: 0.24313727, a: 1}
-  m_EffectDistance: {x: 1, y: -1}
-  m_UseGraphicAlpha: 1
+  effectColor: {r: 1, g: 0.46031806, b: 0.40094328, a: 0.3529412}
+  effectDistanceX: 2
+  effectDistanceY: 2
+  samplingRate: 10
 --- !u!1 &7080839778448439822
 GameObject:
   m_ObjectHideFlags: 0
@@ -8174,7 +8417,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {x: 1, y: 0}
-  m_AnchoredPosition: {x: -72.6, y: 15.344986}
+  m_AnchoredPosition: {x: -72.600006, y: 15.344971}
   m_SizeDelta: {x: 301, y: 63}
   m_Pivot: {x: 1, y: 0}
 --- !u!222 &5830593562695430765
@@ -8367,8 +8610,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: 231.8, y: -156.32}
-  m_SizeDelta: {x: 61.6906, y: 58.7529}
+  m_AnchoredPosition: {x: 262, y: -14}
+  m_SizeDelta: {x: 42, y: 40}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1114926871017867092
 CanvasRenderer:
@@ -9143,8 +9386,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: 0, y: -25.6}
-  m_SizeDelta: {x: 413.1909, y: 26.218}
+  m_AnchoredPosition: {x: 57.348297, y: -25.6}
+  m_SizeDelta: {x: 527.8875, y: 26.218}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1514700554931142703
 MonoBehaviour:
@@ -9420,7 +9663,7 @@ MonoBehaviour:
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_FontSize: 36
-    m_FontStyle: 1
+    m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 3
     m_MaxSize: 47
@@ -10032,7 +10275,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_ty_juxing_dahu
+  _icon_name: dec_juxing_shaadow
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
@@ -10200,7 +10443,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 210}
   m_SizeDelta: {x: 750, y: 1624}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &2618094518405530268
@@ -10231,7 +10474,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 4c1fca290e143d5448a92f1fd291820e, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 0b2b6fa156e4ba84fa1db191d7765dc3, type: 3}
   m_Type: 0
   m_PreserveAspect: 1
   m_FillCenter: 1
@@ -10241,7 +10484,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: bg_lh_xuyou
+  _icon_name: bg_lh_queyinger
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 0}
   packInfo:
@@ -10499,6 +10742,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Icon_Select
+    gameObject: {fileID: 7148053329663934994}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 0
 --- !u!1001 &2591569182256414571
 PrefabInstance:

Assets/Res/UI/DaoYouPanel/DaoYouWidget.prefab

@@ -204,7 +204,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: -60.4534, y: -68.9}
+  m_AnchoredPosition: {x: -62.2, y: -68.9}
   m_SizeDelta: {x: 41.9068, y: 41}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8410658926350979671
@@ -284,7 +284,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 51, y: 62.5}
+  m_AnchoredPosition: {x: 47.6, y: 62.5}
   m_SizeDelta: {x: 155, y: 27}
   m_Pivot: {x: 0, y: 0}
 --- !u!222 &6170327155665396521
@@ -373,7 +373,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: 12.7056, y: -72.5}
+  m_AnchoredPosition: {x: 9.305591, y: -72.5}
   m_SizeDelta: {x: 148.6651, y: 27}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7362884660115140346
@@ -406,8 +406,8 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 20
-    m_FontStyle: 1
+    m_FontSize: 24
+    m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 2
     m_MaxSize: 40
@@ -451,7 +451,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 5903262738701838961}
-  - {fileID: 478163653924081884}
   - {fileID: 3875262291450751451}
   - {fileID: 2736209200660457035}
   - {fileID: 9093301904999720884}
@@ -459,8 +458,10 @@ RectTransform:
   - {fileID: 6812575939048321609}
   - {fileID: 1623775965119322130}
   - {fileID: 1526403630989814365}
+  - {fileID: 5666380379173347377}
   - {fileID: 5414614616448102811}
   - {fileID: 7758856192761180473}
+  - {fileID: 478163653924081884}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -608,7 +609,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 31, y: 59.1}
+  m_AnchoredPosition: {x: 27.59999, y: 59.1}
   m_SizeDelta: {x: 41, y: 41}
   m_Pivot: {x: 0, y: 0}
 --- !u!222 &715602625814661088
@@ -916,7 +917,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 009d01eadc79b5b12c19322b6a4cd057
-  imageH: 0
+  imageH: 40
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -975,8 +976,6 @@ GameObject:
   m_Component:
   - component: {fileID: 2736209200660457035}
   - component: {fileID: 8734794614212195349}
-  - component: {fileID: 6104747821594720494}
-  - component: {fileID: 2104736237068248475}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Icon_Daoyou (1)
@@ -1013,13 +1012,60 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5421723427925135863}
   m_CullTransparentMesh: 1
---- !u!114 &6104747821594720494
+--- !u!1 &5745186779856990117
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5414614616448102811}
+  - component: {fileID: 6786146373864765451}
+  - component: {fileID: 5175445926330125294}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5414614616448102811
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5745186779856990117}
+  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:
+  - {fileID: 8661795095469256590}
+  m_Father: {fileID: 5070300881352391495}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 6.1003, y: 6.7533}
+  m_SizeDelta: {x: 51.8856, y: 45.3999}
+  m_Pivot: {x: 0, y: 0}
+--- !u!222 &6786146373864765451
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5745186779856990117}
+  m_CullTransparentMesh: 1
+--- !u!114 &5175445926330125294
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5421723427925135863}
+  m_GameObject: {fileID: 5745186779856990117}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
@@ -1034,8 +1080,8 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_Sprite: {fileID: 0}
-  m_Type: 1
-  m_PreserveAspect: 1
+  m_Type: 0
+  m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 4
   m_FillAmount: 1
@@ -1043,33 +1089,20 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_juxing_yuanjiao16
+  _icon_name: dec_taoxin
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 0d383e80d99516a44a603bb1ccd73209, type: 3}
   packInfo:
-    packName: tongyong
-    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
-    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
-    lasetJsonGUID: c13218952bde6161116e17f06242217f
-  imageH: 151.51894
+    packName: daoyou
+    packgJsonPath: /Art/UIAssets/TextrueJson\daoyou.txt
+    packgSpritePath: Assets/Res/UIAtlas/daoyou.spriteatlasv2
+    lasetJsonGUID: edd8757281c361370f022860a59cdd97
+  imageH: 100
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
---- !u!114 &2104736237068248475
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5421723427925135863}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_ShowMaskGraphic: 0
---- !u!1 &5745186779856990117
+--- !u!1 &7402500123449210940
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1077,52 +1110,51 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 5414614616448102811}
-  - component: {fileID: 6786146373864765451}
-  - component: {fileID: 5175445926330125294}
+  - component: {fileID: 5666380379173347377}
+  - component: {fileID: 8061481370321837824}
+  - component: {fileID: 1708189953013448729}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: myImage
+  m_Name: dibutiao
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!224 &5414614616448102811
+--- !u!224 &5666380379173347377
 RectTransform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5745186779856990117}
+  m_GameObject: {fileID: 7402500123449210940}
   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:
-  - {fileID: 8661795095469256590}
+  m_Children: []
   m_Father: {fileID: 5070300881352391495}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 6.1003, y: 6.7533}
-  m_SizeDelta: {x: 51.8856, y: 45.3999}
-  m_Pivot: {x: 0, y: 0}
---- !u!222 &6786146373864765451
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 2.800003, y: -237.1}
+  m_SizeDelta: {x: 217, y: 57}
+  m_Pivot: {x: 0, y: 1}
+--- !u!222 &8061481370321837824
 CanvasRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5745186779856990117}
+  m_GameObject: {fileID: 7402500123449210940}
   m_CullTransparentMesh: 1
---- !u!114 &5175445926330125294
+--- !u!114 &1708189953013448729
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5745186779856990117}
+  m_GameObject: {fileID: 7402500123449210940}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
@@ -1146,7 +1178,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_taoxin
+  _icon_name: dec_daoyou_dibu
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: 0d383e80d99516a44a603bb1ccd73209, type: 3}
   packInfo:
@@ -1194,8 +1226,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: 0, y: -132.7}
-  m_SizeDelta: {x: 397.5739, y: 552.7843}
+  m_AnchoredPosition: {x: 0, y: -25.5}
+  m_SizeDelta: {x: 217, y: 291}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3324098185976957936
 CanvasRenderer:
@@ -1225,7 +1257,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 03130e562c0aeca4383835e226fa650c, type: 3}
+  m_Sprite: {fileID: 0}
   m_Type: 0
   m_PreserveAspect: 1
   m_FillCenter: 1
@@ -1235,14 +1267,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: bg_lh_lingji
+  _icon_name: dec_lh_liuqingyan2
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 0}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 0d383e80d99516a44a603bb1ccd73209, type: 3}
   packInfo:
-    packName: bg
-    packgJsonPath: /Art/UIAssets/TextrueJson/bg.txt
-    packgSpritePath: Assets/Res/UIAtlas/bg.spriteatlasv2
-    lasetJsonGUID: a8c60c0bafc6a50970ede1f51833bf09
+    packName: daoyou
+    packgJsonPath: /Art/UIAssets/TextrueJson\daoyou.txt
+    packgSpritePath: Assets/Res/UIAtlas/daoyou.spriteatlasv2
+    lasetJsonGUID: 4396bdbc42e680fec37d635d99c5fb72
   imageH: 151.51894
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}

Assets/Res/UI/DaoYouPanel/DaoYouaaFfixWidget.prefab

@@ -271,6 +271,7 @@ GameObject:
   - component: {fileID: 7869838569737806745}
   - component: {fileID: 7982240772326421710}
   - component: {fileID: 6374737024246323474}
+  - component: {fileID: 41904762996154385}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: DaoYouaaFfixWidget
@@ -377,7 +378,56 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Btn_DaoYouaaFfixWidget
+    gameObject: {fileID: 41904762996154385}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
+--- !u!114 &41904762996154385
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3054950519963356202}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 7982240772326421710}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &4690716534689735017
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/SentimentPanel/SentimentInfoPanel.prefab

@@ -2311,7 +2311,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 628, y: 1360}
+  m_SizeDelta: {x: 750, y: 1624}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &4159330424245520485
 MonoBehaviour:
@@ -2700,7 +2700,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8879216144060700877, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 77
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8879216144060700877, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
       propertyPath: m_SizeDelta.y

Assets/Res/UI/SkillSelectPanel/GongFaUpgradePanel.prefab

@@ -1098,6 +1098,7 @@ RectTransform:
   - {fileID: 5473342035507285947}
   - {fileID: 753562404598425228}
   - {fileID: 1062516556747891371}
+  - {fileID: 3050497527537795491}
   - {fileID: 5964692562241983256}
   - {fileID: 1219834969852229682}
   - {fileID: 2507585154746067127}
@@ -1405,6 +1406,15 @@ MonoBehaviour:
     - gameObject: {fileID: 4649527201698735611}
     - gameObject: {fileID: 6899362910355405383}
     - gameObject: {fileID: 2266735464070336714}
+  - key: Btn_Rest
+    gameObject: {fileID: 7192584731598602621}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 8243822813260717961}
+    - gameObject: {fileID: 4649527201698735611}
+    - gameObject: {fileID: 6899362910355405383}
+    - gameObject: {fileID: 2266735464070336714}
   isAssetBundle: 1
 --- !u!1 &2864693667708896535
 GameObject:
@@ -1605,6 +1615,230 @@ MonoBehaviour:
   m_FlexibleWidth: -1
   m_FlexibleHeight: -1
   m_LayoutPriority: 1
+--- !u!1 &2985746228315747806
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3050497527537795491}
+  - component: {fileID: 1738658701210907711}
+  - component: {fileID: 8779855129492413753}
+  - component: {fileID: 7192584731598602621}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Btn_Rest
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &3050497527537795491
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2985746228315747806}
+  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:
+  - {fileID: 8100594656288996914}
+  m_Father: {fileID: 6694772361877173011}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -65.4, y: -45.4}
+  m_SizeDelta: {x: 53.0398, y: 53.0398}
+  m_Pivot: {x: 1, y: 1}
+--- !u!222 &1738658701210907711
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2985746228315747806}
+  m_CullTransparentMesh: 1
+--- !u!114 &8779855129492413753
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2985746228315747806}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.24313727, g: 0.20784315, b: 0.14117648, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_ty_yuan
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 009d01eadc79b5b12c19322b6a4cd057
+  imageH: 100
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!114 &7192584731598602621
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2985746228315747806}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 8779855129492413753}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!1 &3191778558194080149
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8100594656288996914}
+  - component: {fileID: 4249454982721208177}
+  - component: {fileID: 7377174464466216454}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Btn_Rest (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8100594656288996914
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3191778558194080149}
+  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: 3050497527537795491}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 35.3188, y: 31.7271}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4249454982721208177
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3191778558194080149}
+  m_CullTransparentMesh: 1
+--- !u!114 &7377174464466216454
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3191778558194080149}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_fuhao_cz
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 009d01eadc79b5b12c19322b6a4cd057
+  imageH: 100
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &3256041832133504665
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UIAtlas/daoyou.spriteatlasv2

@@ -16,6 +16,7 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: 4d118f9973f5cec48bf218f2a6f2fd2c, type: 3}
     - {fileID: 2800000, guid: f61bb6c000db0184ea2e4d5d3d0e22ef, type: 3}
     - {fileID: 2800000, guid: 6fdc06e61a9e9564d98f26ce96c46498, type: 3}
+    - {fileID: 2800000, guid: 7c4bf1c2d392ebc49ac448db62396d1b, type: 3}
     - {fileID: 2800000, guid: c687908e89ca56a4cad47662d1e20be3, type: 3}
     - {fileID: 2800000, guid: 9f8d72a6e9cc0574aa32de62153d9262, type: 3}
     - {fileID: 2800000, guid: ffd484f1bffdc0b4688e188172afa2c3, type: 3}
@@ -32,6 +33,16 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: 97cacd303a45ee040b9fb23754493568, type: 3}
     - {fileID: 2800000, guid: 7be1ebce8bb60e449925cb98417f2869, type: 3}
     - {fileID: 2800000, guid: bcc9fc139ef095046b682188ab4f1a56, type: 3}
+    - {fileID: 2800000, guid: fdefec73d7c6535439b20dfd1147b634, type: 3}
+    - {fileID: 2800000, guid: 939ae1252116e2346be00c92bab63b6b, type: 3}
+    - {fileID: 2800000, guid: c6e8f0889ffb8e940b4e18fdd9403fc9, type: 3}
+    - {fileID: 2800000, guid: 814517b72cc69804a944b33069075848, type: 3}
+    - {fileID: 2800000, guid: ecf56346b74606645a0d2f365d1b890b, type: 3}
+    - {fileID: 2800000, guid: b072b9b4bef930f438325967cd5309aa, type: 3}
+    - {fileID: 2800000, guid: cb87262d505ca3041bafe5595aa5b1cc, type: 3}
+    - {fileID: 2800000, guid: 8ced6e54c7cc19144bb17b2770aa8b6b, type: 3}
+    - {fileID: 2800000, guid: 1374aadb6ab42f84db32ab828087ad66, type: 3}
+    - {fileID: 2800000, guid: 2abdcedbec0c0b14e82035ff24fc2c19, type: 3}
     - {fileID: 2800000, guid: 02a732c03a39407478a6ca7dfa4a9d56, type: 3}
     - {fileID: 2800000, guid: fd3427389adcc1649b3052e4ee4aad7c, type: 3}
     - {fileID: 2800000, guid: e9596307895e7b44bb12b263c4e8cb93, type: 3}

Assets/Res/UIAtlas/tongyong.spriteatlasv2

@@ -35,6 +35,7 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: 48bc9ebf2521a0e4ba05629c238ff562, type: 3}
     - {fileID: 2800000, guid: 8d23bd6df991bc6409f6b98f584e7296, type: 3}
     - {fileID: 2800000, guid: 9b116a8b642a3c04298780f10d94e7fe, type: 3}
+    - {fileID: 2800000, guid: dc76bd286982c8a448cc80245cd64b31, type: 3}
     - {fileID: 2800000, guid: da985347d9c869e43affe58a0528f584, type: 3}
     - {fileID: 2800000, guid: a5ccafc312c87454980e5ecb377412c2, type: 3}
     - {fileID: 2800000, guid: a8adb5f9798a7a34eae5b6fcd60714e5, type: 3}

Assets/Scripts/Core/CTask/CTaskAwaitBufferT.cs

@@ -31,6 +31,14 @@ namespace Fort23.Core
             return _results.ToArray();
             
         }
+        
+        public List<T> GetResultsLists()
+        {
+
+            
+            return _results.ToList();
+            
+        }
 
         public void Clear()
         {

Assets/Scripts/GameData/ExcelConfig/GameConstantConfig.cs

@@ -214,6 +214,16 @@ namespace Excel2Json
 #endif
 		
 
+		/// <summary>
+		///道友同时出现挂机的最大数量
+		/// </summary>
+#if !COMBAT_SERVER
+		public int daoyouMaxshowupNum;
+#else
+		public int daoyouMaxshowupNum{ set; get; }
+#endif
+		
+
 	}
 
 }

Assets/Scripts/GameLogic/Combat/Skill/SkillBasic.cs

@@ -583,7 +583,13 @@ namespace GameLogic.Combat.Skill
         public void TimeLineTrigger(string groupName, ILifetCycleHitPoint targetEntity,
             ITimelineFxLogic timelineFxLogic, TriggerData triggerData, ISkillFeatures skillFeatures)
         {
-            if (targetEntity == null || _isDis)
+            if (targetEntity == null || _isDis||CombatHeroEntity==null||CombatHeroEntity.CurrCombatHeroInfo==null)
+            {
+                return;
+            }
+
+            ShowBaiscEntity th=   targetEntity.This<CombatHeroHitPoint>().combatHeroEntity;
+            if (th == null || th.CurrCombatHeroInfo == null)
             {
                 return;
             }

Assets/Scripts/GameLogic/Hero/HeroInfo.cs

@@ -30,7 +30,6 @@ namespace GameLogic.Hero
 
         // public List<int> ImmortalBond = new List<int>();
 
-      
 
         public HeroInfo()
         {
@@ -96,25 +95,25 @@ namespace GameLogic.Hero
                 foreach (var i1 in daoyouModelConfig.daolvSkillID)
                 {
                     daolvSkill daolvSkill = ConfigComponent.Instance.Get<daolvSkill>(i1);
-                    // //唯一只加一次
-                    // if (daolvSkill.type == 1)
-                    // {
-                    //     if (!daolvBlMap.ContainsKey(i1))
-                    //     {
-                    //         daolvBlMap.Add(i1, daolvSkill.para[0]);
-                    //     }
-                    // }
-                    // else
-                    // {
-                    //     if (!daolvBlMap.ContainsKey(i1))
-                    //     {
-                    //         daolvBlMap.Add(i1, daolvSkill.para[0]);
-                    //     }
-                    //     else
-                    //     {
-                    //         daolvBlMap[i1] += daolvSkill.para[0];
-                    //     }
-                    // }
+                    //唯一只加一次
+                    if (daolvSkill.type == 1)
+                    {
+                        if (!daolvBlMap.ContainsKey(i1))
+                        {
+                            daolvBlMap.Add(i1, daolvSkill.para[0]);
+                        }
+                    }
+                    else
+                    {
+                        if (!daolvBlMap.ContainsKey(i1))
+                        {
+                            daolvBlMap.Add(i1, daolvSkill.para[0]);
+                        }
+                        else
+                        {
+                            daolvBlMap[i1] += daolvSkill.para[0];
+                        }
+                    }
 
 
                     DaoLVBiData daoLvBiData;
@@ -131,18 +130,27 @@ namespace GameLogic.Hero
                     }
                     else
                     {
-                        daoLvBiData = new DaoLVBiData();
-                        daoLvBiData.id = i1;
-                        daoLvBiData.value = daolvSkill.para[0];
-                        daolvBl.Add(daoLvBiData);
-                        // if (!daolvBlMap.ContainsKey(i1))
-                        // {
-                        //     daolvBlMap.Add(i1, daolvSkill.para[0]);
-                        // }
-                        // else
-                        // {
-                        //     daolvBlMap[i1] += daolvSkill.para[0];
-                        // }
+                        daoLvBiData = daolvBl.FirstOrDefault(d => d.id == i1);
+                        if (daoLvBiData == null)
+                        {
+                            daoLvBiData = new DaoLVBiData();
+                            daoLvBiData.id = i1;
+                            daoLvBiData.value = daolvSkill.para[0];
+                            daolvBl.Add(daoLvBiData);
+                        }
+                        else
+                        {
+                            daoLvBiData.value += daolvSkill.para[0];
+                        }
+
+                        if (!daolvBlMap.ContainsKey(i1))
+                        {
+                            daolvBlMap.Add(i1, daolvSkill.para[0]);
+                        }
+                        else
+                        {
+                            daolvBlMap[i1] += daolvSkill.para[0];
+                        }
                     }
                 }
             }
@@ -314,8 +322,5 @@ namespace GameLogic.Hero
                     break;
             }
         }
-
-       
-
     }
 }

Assets/Scripts/GameLogic/Player/AccountFileInfo.cs

@@ -281,7 +281,7 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
         /// <summary>
         /// 经验
         /// </summary>
-        public int exp;
+        public float exp;
 
         /// <summary>
         /// 已经领取奖励的好感等级

Assets/Scripts/GameLogic/Player/PlayerManager.cs

@@ -112,6 +112,7 @@ public class PlayerManager : Singleton<PlayerManager>
             }
         }
 
+        EveryDayRefence();
         CalculateOfflineRewards();
         AccountFileInfo.Instance.SavePlayerData();
         SummonManager.CustomInit();
@@ -207,6 +208,7 @@ public class PlayerManager : Singleton<PlayerManager>
 
 
             int count = Random.Range(0, daoYouDatas.Count + 1);
+            count = count > gameConstantConfig.daoyouMaxshowupNum ? gameConstantConfig.daoyouMaxshowupNum : count;
             List<AccountFileInfo.DaoYouGuaiJiData> daoyou = new List<AccountFileInfo.DaoYouGuaiJiData>();
             for (int i = 0; i < count; i++)
             {
@@ -382,25 +384,7 @@ public class PlayerManager : Singleton<PlayerManager>
         }
 
         //每天刷新
-        if (TimeHelper.ClientNow() > AccountFileInfo.Instance.playerData.nextRefence)
-        {
-            AccountFileInfo.Instance.playerData.nextRefence =
-                TimeHelper.GetBaseRefreshTime(TimeHelper.ClientNow());
-            AccountFileInfo.Instance.playerData.todayUseExpElixrPanelCount = 0;
-            AccountFileInfo.Instance.playerData.todayDivineSensePoint = 0;
-
-            foreach (var playerDataSummonData in AccountFileInfo.Instance.playerData.SummonDatas)
-            {
-                playerDataSummonData.onePayCount = 0;
-                playerDataSummonData.tenPayCount = 0;
-                playerDataSummonData.oneFreeCount = 0;
-                playerDataSummonData.nextOneFreeTime = 0;
-                playerDataSummonData.tenFreeCount = 0;
-                playerDataSummonData.nextTenFreeTime = 0;
-            }
-
-            AccountFileInfo.Instance.SavePlayerData();
-        }
+        EveryDayRefence();
 
 
         foreach (var keyValuePair in AccountFileInfo.Instance.playerData.daoYouGuaiJiDatas)
@@ -422,7 +406,7 @@ public class PlayerManager : Singleton<PlayerManager>
                 int randomValue1 = Random.Range(0, 101);
                 LogTool.Log("道友随机怪率：" + randomValue1 + " 比例:" + bl);
                 List<AccountFileInfo.ItemData> itemDatas = new List<AccountFileInfo.ItemData>();
-                if (randomValue1 >= bl)
+                if (randomValue1 < bl)
                 {
                     for (var i = 1; i < daoyouModelConfig.guajiBuffID.Length; i++)
                     {
@@ -464,9 +448,33 @@ public class PlayerManager : Singleton<PlayerManager>
         }
     }
 
-    public async CTask ChangeMap(int mapId,bool isShowUI = true)
+    private void EveryDayRefence()
+    {
+        if (TimeHelper.ClientNow() > AccountFileInfo.Instance.playerData.nextRefence)
+        {
+            AccountFileInfo.Instance.playerData.nextRefence =
+                TimeHelper.GetBaseRefreshTime(TimeHelper.ClientNow());
+            AccountFileInfo.Instance.playerData.todayUseExpElixrPanelCount = 0;
+            AccountFileInfo.Instance.playerData.todayDivineSensePoint = 0;
+
+            foreach (var playerDataSummonData in AccountFileInfo.Instance.playerData.SummonDatas)
+            {
+                playerDataSummonData.onePayCount = 0;
+                playerDataSummonData.tenPayCount = 0;
+                playerDataSummonData.oneFreeCount = 0;
+                playerDataSummonData.nextOneFreeTime = 0;
+                playerDataSummonData.tenFreeCount = 0;
+                playerDataSummonData.nextTenFreeTime = 0;
+            }
+
+            AccountFileInfo.Instance.SavePlayerData();
+        }
+    }
+
+    public async CTask ChangeMap(int mapId, bool isShowUI = true)
     {
-        SmallPlacesConfig currentSmallPlacesConfig = ConfigComponent.Instance.Get<SmallPlacesConfig>(PlayerManager.Instance.CurrentsmallPlaces.id);
+        SmallPlacesConfig currentSmallPlacesConfig =
+            ConfigComponent.Instance.Get<SmallPlacesConfig>(PlayerManager.Instance.CurrentsmallPlaces.id);
         SmallPlacesConfig smallPlacesConfig = ConfigComponent.Instance.Get<SmallPlacesConfig>(mapId);
         if (smallPlacesConfig.ID == 0)
             return;
@@ -518,7 +526,6 @@ public class PlayerManager : Singleton<PlayerManager>
 
         if (currentSmallPlacesConfig.PlacesId == smallPlacesConfig.PlacesId)
         {
-        
             CombatController.currActiveCombat.ChangeState(CombatController.miniSceneSwitch);
         }
         else
@@ -526,9 +533,9 @@ public class PlayerManager : Singleton<PlayerManager>
             CombatController.currActiveCombat.ChangeState(CombatController.sceneSwitch);
         }
 
-    
+
         await _cTask;
-        if(isShowUI)
+        if (isShowUI)
             UIManager.Instance.ShowLastHindAllShowPanel();
         EventManager.Instance.Dispatch(CustomEventType.ChangeMap, null);
     }
@@ -603,16 +610,17 @@ public class PlayerManager : Singleton<PlayerManager>
 
     public void CalculateOfflineRewards()
     {
-        // return;
+        int exitMiao = (int)((TimeHelper.ClientNow() - AccountFileInfo.Instance.playerData.ExitTime) / 1000);
+        if (exitMiao <= 0)
+            return;
         if (AccountFileInfo.Instance.playerData.QiankundaiDropTimer <=
-            PlayerManager.Instance.gameConstantConfig.qiankundaiMaxTime &&
-            AccountFileInfo.Instance.playerData.ExitTime > 0)
+            gameConstantConfig.qiankundaiMaxTime &&
+            exitMiao > 0)
         {
-            int miao = (int)((TimeHelper.ClientNow() - AccountFileInfo.Instance.playerData.ExitTime) / 1000);
-            miao = AccountFileInfo.Instance.playerData.QiankundaiDropTimer + miao >=
-                   PlayerManager.Instance.gameConstantConfig.qiankundaiMaxTime
-                ? PlayerManager.Instance.gameConstantConfig.qiankundaiMaxTime - miao
-                : miao;
+            int miao = AccountFileInfo.Instance.playerData.QiankundaiDropTimer + exitMiao;
+            miao = miao >= gameConstantConfig.qiankundaiMaxTime
+                ? gameConstantConfig.qiankundaiMaxTime - AccountFileInfo.Instance.playerData.QiankundaiDropTimer
+                : exitMiao;
             AccountFileInfo.Instance.playerData.QiankundaiDropTimer += miao;
             for (int i = 0; i < miao; i++)
             {
@@ -620,6 +628,50 @@ public class PlayerManager : Singleton<PlayerManager>
             }
         }
 
+
+        HeroPowerUpConfig heroPowerUpConfig = myHero.powerUpConfig;
+
+        if (AccountFileInfo.Instance.playerData.divineSensePoint < heroPowerUpConfig.ShenshiMax)
+        {
+            int miao = 0;
+            if (AccountFileInfo.Instance.playerData.todayDivineSensePoint <
+                gameConstantConfig.shenshiPointRecSPD[0])
+            {
+                float todayResidueShenShi = gameConstantConfig.shenshiPointRecSPD[0] -
+                                            AccountFileInfo.Instance.playerData.todayDivineSensePoint;
+                todayResidueShenShi =
+                    AccountFileInfo.Instance.playerData.divineSensePoint + todayResidueShenShi >
+                    heroPowerUpConfig.ShenshiMax
+                        ? heroPowerUpConfig.ShenshiMax - AccountFileInfo.Instance.playerData.divineSensePoint
+                        : todayResidueShenShi;
+
+                miao = (int)(todayResidueShenShi / gameConstantConfig.shenshiPointRecSPD[1]);
+
+                miao = miao > exitMiao ? exitMiao : miao;
+
+                float todayResidue = gameConstantConfig.shenshiPointRecSPD[1] * miao;
+                todayResidue = todayResidue + AccountFileInfo.Instance.playerData.divineSensePoint >
+                               heroPowerUpConfig.ShenshiMax
+                    ? heroPowerUpConfig.ShenshiMax - AccountFileInfo.Instance.playerData.divineSensePoint
+                    : todayResidue;
+                AccountFileInfo.Instance.playerData.todayDivineSensePoint += todayResidue;
+                AccountFileInfo.Instance.playerData.divineSensePoint += todayResidue;
+            }
+
+            int residueExitMiao = exitMiao - miao;
+            if (residueExitMiao > 0)
+            {
+                float todaySs2 = gameConstantConfig.shenshiPointRecSPD[2] * residueExitMiao;
+                float allShenshi = todaySs2 + AccountFileInfo.Instance.playerData.divineSensePoint;
+                todaySs2 = allShenshi > heroPowerUpConfig.ShenshiMax
+                    ? heroPowerUpConfig.ShenshiMax - allShenshi
+                    : todaySs2;
+                AccountFileInfo.Instance.playerData.divineSensePoint += todaySs2;
+            }
+        }
+
+
+        EventManager.Instance.Dispatch(CustomEventType.DivineSensePointChange, null);
         AccountFileInfo.Instance.playerData.ExitTime = 0;
         AccountFileInfo.Instance.SavePlayerData();
     }

Assets/Scripts/GameLogic/Player/SummonManager.cs

@@ -18,6 +18,8 @@ namespace GameLogic.Player
         //积分规则
         public Map<int, List<OpenBoxScoreRule>> openBoxScoreRuleMap = new Map<int, List<OpenBoxScoreRule>>();
 
+        private static readonly System.Random random = new System.Random();
+
         public void CustomInit()
         {
             OpenBoxConfig[] openBoxConfigs = ConfigComponent.Instance.GetAll<OpenBoxConfig>();
@@ -97,9 +99,8 @@ namespace GameLogic.Player
                             return null;
                         }
 
-#endif
-
                         await TimerComponent.Instance.WaitAsync(1000);
+#endif
                     }
                     else
                     {
@@ -169,6 +170,7 @@ namespace GameLogic.Player
                             return null;
                         }
 
+                        await TimerComponent.Instance.WaitAsync(1000);
 #endif
                     }
                     else
@@ -206,7 +208,7 @@ namespace GameLogic.Player
                     summonData.tenPayCount++;
                 }
             }
-            
+
             AccountFileInfo.Instance.SavePlayerData();
             return allIitem;
         }
@@ -223,18 +225,19 @@ namespace GameLogic.Player
 
             for (int i = 0; i < count; i++)
             {
-                // 十连保底1
-                if (summonData.baodiCount1 >= 9)
+                // 十连保底2
+                if (summonData.baodiCount2 >= openBoxConfig.reward2para1)
                 {
-                    var addItem = ProcessBaodi1(summonData, openBoxConfig, baodiItemSet);
+                    var addItem = ProcessBaodi2(summonData, openBoxConfig);
                     allItem.AddRange(addItem);
                     continue;
                 }
 
-                // 十连保底2
-                if (summonData.baodiCount2 >= openBoxConfig.reward2para1)
+
+                // 十连保底1
+                if (summonData.baodiCount1 >= 9)
                 {
-                    var addItem = ProcessBaodi2(summonData, openBoxConfig);
+                    var addItem = ProcessBaodi1(summonData, openBoxConfig, baodiItemSet);
                     allItem.AddRange(addItem);
                     continue;
                 }
@@ -251,9 +254,24 @@ namespace GameLogic.Player
 
 
             AccountFileInfo.Instance.SavePlayerData();
+            Shuffle(allItem);
             return allItem;
         }
 
+
+        public static void Shuffle<T>(IList<T> list)
+        {
+            int n = list.Count;
+            while (n > 1)
+            {
+                n--;
+                int k = random.Next(n + 1);
+                T value = list[k];
+                list[k] = list[n];
+                list[n] = value;
+            }
+        }
+
         // 计算保底物品集合
         private HashSet<int> CalculateBaodiItems(int rewardId)
         {
@@ -301,6 +319,7 @@ namespace GameLogic.Player
             var addItem = DropManager.Instance.DropItem(config.reward2);
             // PlayerManager.Instance.BagController.AddItem(addItem);
             summonData.baodiCount2 = 0;
+            summonData.baodiCount1 = 0;
             AccountFileInfo.Instance.SavePlayerData();
             return addItem;
         }
@@ -320,6 +339,7 @@ namespace GameLogic.Player
             {
                 int poolIndex = index % config.reward.Length;
                 addItem = DropManager.Instance.DropItem(config.reward[poolIndex]);
+                // summonData.baodiCount2++;
                 index++;
             }
 
@@ -327,6 +347,7 @@ namespace GameLogic.Player
             // PlayerManager.Instance.BagController.AddItem(addItem);
             summonData.baodiCount1++;
 
+
             return addItem;
         }
 

Assets/Scripts/GameUI/GameApplctionMono.cs

@@ -63,7 +63,7 @@ namespace GameUI
 
         private void OnApplicationFocus(bool hasFocus)
         {
-            if (hasFocus && PlayerManager.Instance.isLogin)
+            if (!hasFocus && PlayerManager.Instance.isLogin)
             {
                 // 退出时记录时间
                 AccountFileInfo.Instance.playerData.ExitTime = TimeHelper.ClientNow();

Assets/Scripts/GameUI/UI/AppBarPanel/AppBarPanel.cs

@@ -111,15 +111,15 @@ namespace Fort23.Mono
             await DivineSenceInfoPanel.OpenPanel((count, useItems) => { Bnt_shengShi_onClick(count, useItems); });
         }
 
-        public async void Btn_Shop_Click(int shopId = 0,bool isQz = false)
+        public async void Btn_Shop_Click(int shopId = 0)
         {
             CloseMenu();
-            if (currentOpenUIPanel is ShopPanel && !isQz)
+            if (currentOpenUIPanel is ShopPanel)
             {
                 return;
             }
 
-    
+
             UIPanel uiPanel = currentOpenUIPanel;
 
             CombatDrive.Instance.CombatController.isUpdate = false;
@@ -127,11 +127,7 @@ namespace Fort23.Mono
             if (uiPanel is CaveMainPanel || uiPanel is SkillSelectPanel || uiPanel is ShopPanel ||
                 uiPanel is MainHeroPanel)
             {
-                if (!(currentOpenUIPanel is ShopPanel))
-                {
-                     UIManager.Instance.HideUIUIPanel(uiPanel, isBreadcrumbBarPanel: false);
-                }
-               
+                UIManager.Instance.HideUIUIPanel(uiPanel, isBreadcrumbBarPanel: false);
             }
 
             if (!shopPanel.IsClose)
@@ -221,8 +217,7 @@ namespace Fort23.Mono
                 PlayerGuideManager.Instance.StepInit();
                 PlayerGuideManager.Instance.SetOnClickMask(true);
             }
-                
-    
+
 
             EventSystemManager.Instance.isTriggerEvent = true;
             CombatDrive.Instance.CombatController.ChangeState(CombatController.idle);

Assets/Scripts/GameUI/UI/BattleSettlementPanel/BattleSettlementPanel.cs

@@ -56,6 +56,7 @@ namespace Fort23.Mono
                 AudioManager.Instance.PlayAudio("combat_win.wav");
                 WinRoot.SetActive(true);
                 FailRoot.SetActive(false);
+                Text_Desc1.gameObject.SetActive(true);
             }
             else
             {
@@ -63,6 +64,7 @@ namespace Fort23.Mono
                 AudioManager.Instance.PlayAudio("shibai.wav");
                 WinRoot.SetActive(false);
                 FailRoot.SetActive(true);
+                Text_Desc1.gameObject.SetActive(false);
             }
         }
 

Assets/Scripts/GameUI/UI/BattleSettlementPanel/BattleSettlementPanelData.cs

@@ -118,6 +118,17 @@ namespace Fort23.Mono
 	      return _Btn_cxtz;
 	     }
 	   }
+	  private Text _Text_Desc1;
+	  public Text Text_Desc1
+	   {
+	   get{
+	      if (_Text_Desc1 == null)
+	       {
+	         _Text_Desc1  = GetUIUnit<Text>("Text_Desc1"); 
+	       }
+	      return _Text_Desc1;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

Assets/Scripts/GameUI/UI/BoxPanel/BoxPanel.cs

@@ -22,7 +22,11 @@ namespace Fort23.Mono
             if (summonData.tenFreeCount < openBoxConfig.oneConsumeFreePara_1[1] &&
                 PlayerManager.Instance.serverTime >= summonData.nextTenFreeTime)
             {
-                return await PlayerManager.Instance.SummonManager.Summon(configId, 10);
+                await MarskPanel.OpenPanel();
+                List<ItemInfo> itemInfos = await PlayerManager.Instance.SummonManager.Summon(configId, 10);
+                MarskPanel.ClosePanel();
+                return itemInfos;
+                // return await PlayerManager.Instance.SummonManager.Summon(configId, 10);
             }
             else
             {
@@ -35,8 +39,11 @@ namespace Fort23.Mono
                     return null;
                 }
 
-
-                return await PlayerManager.Instance.SummonManager.Summon(configId, 10);
+                await MarskPanel.OpenPanel();
+                List<ItemInfo> itemInfos = await PlayerManager.Instance.SummonManager.Summon(configId, 10);
+                MarskPanel.ClosePanel();
+                return itemInfos;
+                // return await PlayerManager.Instance.SummonManager.Summon(configId, 10);
             }
         }
 
@@ -48,7 +55,10 @@ namespace Fort23.Mono
             if (summonData.oneFreeCount < openBoxConfig.oneConsumeFreePara[1] &&
                 PlayerManager.Instance.serverTime >= summonData.nextOneFreeTime)
             {
-                return await PlayerManager.Instance.SummonManager.Summon(configId, 1);
+                await MarskPanel.OpenPanel();
+                List<ItemInfo> itemInfos = await PlayerManager.Instance.SummonManager.Summon(configId, 1);
+                MarskPanel.ClosePanel();
+                return itemInfos;
             }
             else
             {
@@ -70,7 +80,11 @@ namespace Fort23.Mono
                     return item;
                 }
 
-                return await PlayerManager.Instance.SummonManager.Summon(configId, 1);
+                await MarskPanel.OpenPanel();
+                List<ItemInfo> itemInfos = await PlayerManager.Instance.SummonManager.Summon(configId, 1);
+                MarskPanel.ClosePanel();
+                return itemInfos;
+                // return await PlayerManager.Instance.SummonManager.Summon(configId, 1);
             }
         }
     }

Assets/Scripts/GameUI/UI/BoxPanel/WidgetItemType2.cs

@@ -120,6 +120,10 @@ namespace Fort23.Mono
                 {
                     icon.icon_name = "dec_gfbook_tu";
                 }
+                else if (skillConfig.attribute == 0)
+                {
+                    icon.icon_name = "dec_gfbook_fuzhu";
+                }
 
                 Icon_Skill.gameObject.SetActive(true);
                 Icon_Skill.icon_name = skillConfig.icon;

Assets/Scripts/GameUI/UI/CombatPanel/SkillSelectPanel.cs

@@ -32,6 +32,8 @@ namespace Fort23.Mono
 
         private int currenRoadSkilId;
 
+        private SkillInfo currentOnclickskillWidget;
+
         /// <summary>
         /// 1.执行升级逻辑 2.执行更换逻辑
         /// </summary>
@@ -127,7 +129,7 @@ namespace Fort23.Mono
                     }
 
                     //木
-                    if (allSkill[i].skillConfig.attribute == 2)
+                    if (allSkill[i].skillConfig.attribute == 4)
                     {
                         if (skills[1] == null || skills[1].skillConfig.level > allSkill[i].skillConfig.level)
                         {
@@ -136,7 +138,7 @@ namespace Fort23.Mono
                     }
 
                     //水
-                    if (allSkill[i].skillConfig.attribute == 4)
+                    if (allSkill[i].skillConfig.attribute == 2)
                     {
                         if (skills[2] == null || skills[2].skillConfig.level > allSkill[i].skillConfig.level)
                         {
@@ -388,6 +390,8 @@ namespace Fort23.Mono
                 CloseSelect();
                 BaoChun();
                 showSkillInfo.Sort(Sort);
+       
+              
                 Content.Init(this, showSkillInfo.Count);
                 AudioManager.Instance.PlayAudio("ui_xiazhenggongfa.wav");
                 RedDotManager.Instance.TarGetRedDotUpDate(14);
@@ -586,8 +590,9 @@ namespace Fort23.Mono
         List<List<int>> indexList = new List<List<int>>()
         {
             new List<int>() { 9, 8, 7 }, //金
-            new List<int>() { 1, 0, 9 }, //木
-            new List<int>() { 7, 6, 5 }, //水
+          
+            new List<int>() { 1, 2, 3 }, //木
+            new List<int>() { 1, 0, 9 }, //水
 
             new List<int>() { 5, 4, 3 }, //火
             new List<int>() { 7, 6, 5 }, //土
@@ -670,7 +675,15 @@ namespace Fort23.Mono
 
             CloseSelect();
             showSkillInfo.Sort(Sort);
-            Content.Init(this, showSkillInfo.Count);
+            int startIndex = 0;
+            for (int i = 0; i < showSkillInfo.Count; i++)
+            {
+                if (showSkillInfo[i] == currentOnclickskillWidget)
+                {
+                    startIndex = i;
+                }
+            }
+            Content.Init(this, showSkillInfo.Count,startIndex);
         }
 
         private int Sort(SkillInfo type1, SkillInfo type2)
@@ -1036,13 +1049,13 @@ namespace Fort23.Mono
                 }
 
                 //木
-                if (skillConfig.skillConfig.attribute == 2)
+                if (skillConfig.skillConfig.attribute == 4)
                 {
                     index = 1;
                 }
 
                 //水
-                if (skillConfig.skillConfig.attribute == 4)
+                if (skillConfig.skillConfig.attribute == 2)
                 {
                     index = 2;
                 }
@@ -1374,6 +1387,7 @@ namespace Fort23.Mono
             SkillWidget skillWidget = obj as SkillWidget;
             if (infoType == 1)
             {
+                currentOnclickskillWidget = skillWidget.skillConfigId;
                 GongFaUpgradePanel gongFaUpgradePanel = await GongFaUpgradePanel.Open(skillWidget.skillConfigId);
                 await gongFaUpgradePanel.UIClosed();
                 Sort(type1, type2);
@@ -1508,6 +1522,7 @@ namespace Fort23.Mono
             Icon_Select.gameObject.SetActive(false);
             _wuXingGongFaWidgets.Clear();
             CloseSelect();
+            currentOnclickskillWidget = null;
             // ChangeInfoType(1);
             await base.Close();
         }

Assets/Scripts/GameUI/UI/CombatPanel/SkillWidget.cs

@@ -67,13 +67,13 @@ namespace Fort23.Mono
             }
 
             //木
-            if (skillConfigId.skillConfig.attribute == 2)
+            if (skillConfigId.skillConfig.attribute == 4)
             {
                 ShuXingCsc.ChangeState(1);
             }
 
             //水
-            if (skillConfigId.skillConfig.attribute == 4)
+            if (skillConfigId.skillConfig.attribute == 2)
             {
                 ShuXingCsc.ChangeState(2);
             }

Assets/Scripts/GameUI/UI/DaoYouPanel/DaoYouInfoPanel.cs

@@ -17,6 +17,8 @@ namespace Fort23.Mono
 
         private DaoyouModelConfig _daoyouModelConfig;
 
+        private ItemInfo currentSelectWidgetItem;
+
         List<WidgetItem> widgetItems = new List<WidgetItem>();
         List<WidgetItem> giveWidgetItems = new List<WidgetItem>();
         List<DaoYouLevelWidget> _daoYouLevelWidgets = new List<DaoYouLevelWidget>();
@@ -43,16 +45,10 @@ namespace Fort23.Mono
 
         public override void AddButtonEvent()
         {
-            Btn_CiZuiHelp.onClick.AddListener(() =>
-            {
-                HelpTipPanel.OpenTipMessagePanel(10791);
-            });
-            
-            Btn_SendGift.onClick.AddListener(() =>
-            {
-                HelpTipPanel.OpenTipMessagePanel(10790);
-            });
-            
+            Btn_CiZuiHelp.onClick.AddListener(() => { HelpTipPanel.OpenTipMessagePanel(10791); });
+
+            Btn_SongLiHelp.onClick.AddListener(() => { HelpTipPanel.OpenTipMessagePanel(10790); });
+
             Btn_Emotion.onClick.AddListener((() => { ShowMessage(); }));
 
             Btn_Facorability.onClick.AddListener(() =>
@@ -117,6 +113,7 @@ namespace Fort23.Mono
             Btn_Back.onClick.AddListener(() =>
             {
                 ClosePoolGive();
+                currentSelectWidgetItem = null;
                 GiveGite.gameObject.SetActive(false);
                 AppBarPanel.OpenPanel(this);
             });
@@ -164,13 +161,14 @@ namespace Fort23.Mono
                         //喜好礼物翻倍
                         if (_daoyouModelConfig.PreferGiftID.Contains(daoyouGiftConfig.ItemID))
                         {
-                            daoYouData.exp += (int)(daoyouGiftConfig.emotionValue * bl * 0.001f * PlayerManager.Instance.gameConstantConfig.daolvfavoratePara * 0.01f);
+                            daoYouData.exp += (daoyouGiftConfig.emotionValue * bl * 0.001f *
+                                               PlayerManager.Instance.gameConstantConfig.daolvfavoratePara *
+                                               0.01f);
                         }
                         else
                         {
-                            daoYouData.exp += (int)(daoyouGiftConfig.emotionValue * bl * 0.001f);
+                            daoYouData.exp += (daoyouGiftConfig.emotionValue * bl * 0.001f);
                         }
-                       
                     }
 
 
@@ -183,6 +181,10 @@ namespace Fort23.Mono
                             daoYouData.exp -= configs[i].exp;
                             daoYouData.favorabilityLv++;
                         }
+                        else
+                        {
+                            break;
+                        }
                     }
 
                     AudioManager.Instance.PlayAudio("ui_shiyonghuode");
@@ -225,7 +227,8 @@ namespace Fort23.Mono
             Text_message.text = LanguageManager.Instance.Text(emotionConfig.des);
             ShowMessage();
             Icon_bodyIcon.icon_name = _daoyouModelConfig.bodyIcon;
-            Icon_bodyIcon.GetComponent<RectTransform>().anchoredPosition = new Vector2(_daoyouModelConfig.bodyPos[0],_daoyouModelConfig.bodyPos[1]);
+            Icon_bodyIcon.GetComponent<RectTransform>().anchoredPosition =
+                new Vector2(_daoyouModelConfig.bodyPos[0], _daoyouModelConfig.bodyPos[1]);
             await UpdateUI();
             return await base.AsyncInit(uiData);
         }
@@ -283,7 +286,7 @@ namespace Fort23.Mono
                 Btn_Eveent.gameObject.SetActive(false);
             }
 
-            Slider_Emotion.fillAmount = daoYouData.emotionValue / 100;
+            Slider_Emotion.fillAmount = daoYouData.emotionValue / 100f;
 
             HeroPowerUpConfig heroPowerUpConfig =
                 ConfigComponent.Instance.Get<HeroPowerUpConfig>(PlayerManager.Instance.GetDaoYouLevel(daoYouData));
@@ -323,48 +326,96 @@ namespace Fort23.Mono
             Text_CurrentName.text = LanguageManager.Instance.Text(currentDaoyouLevelupConfig.name);
             Text_CurrentLevel.text = daoYouData.favorabilityLv.ToString();
             Slider_LeveUp.maxValue = currentDaoyouLevelupConfig.exp;
-            Text_Exp.text = $"{daoYouData.exp}/{currentDaoyouLevelupConfig.exp}";
+
+            DaoyouLevelupConfig[] configs = ConfigComponent.Instance.GetAll<DaoyouLevelupConfig>();
+            if (daoYouData.favorabilityLv >= configs.Length)
+            {
+                Text_Exp.text = $"{daoYouData.exp.ToString("0.0")}/MAX";
+            }
+            else
+            {
+                Text_Exp.text = $"{daoYouData.exp.ToString("0.0")}/{currentDaoyouLevelupConfig.exp}";
+            }
+
+
             Slider_LeveUp.value = daoYouData.exp;
 
+            CTaskAwaitBuffer taskAwaitBuffer = new CTaskAwaitBuffer();
+
+            CTaskAwaitBuffer<WidgetItem> cts = null;
             if (_daoyouModelConfig.PreferGiftID != null)
             {
+                cts = new CTaskAwaitBuffer<WidgetItem>();
                 foreach (var i in _daoyouModelConfig.PreferGiftID)
                 {
-                    WidgetItem widgetItem =
-                        await UIManager.Instance.CreateGComponent<WidgetItem>(null, LoveItemContent);
-                    widgetItems.Add(widgetItem);
-                    if (_daoyouModelConfig.shownPreferGiftID.Contains(i) ||
-                        (daoYouData != null && daoYouData.loveIds.Contains(i)))
+                    cts.AddTask(UIManager.Instance.CreateGComponent<WidgetItem>(null, LoveItemContent));
+                }
+
+
+                taskAwaitBuffer.AddTask(cts.WaitAll());
+            }
+
+            CTaskAwaitBuffer<DaoYouaaFfixWidget> cts2 = null;
+
+            if (_daoyouModelConfig.daolvSkillID != null)
+            {
+                cts2 = new CTaskAwaitBuffer<DaoYouaaFfixWidget>();
+                for (var i = 0; i < _daoyouModelConfig.daolvSkillID.Length; i++)
+                {
+                    cts2.AddTask(UIManager.Instance.CreateGComponent<DaoYouaaFfixWidget>(null, DaoLvContent));
+                }
+
+                taskAwaitBuffer.AddTask(cts2.WaitAll());
+            }
+
+            CTaskAwaitBuffer<DaoYouLevelWidget> cts1 = new CTaskAwaitBuffer<DaoYouLevelWidget>();
+            foreach (var daoyouLevelupConfig in configs)
+            {
+                cts1.AddTask(UIManager.Instance.CreateGComponent<DaoYouLevelWidget>(null, DaoYouLevelWidgetContent));
+            }
+
+            taskAwaitBuffer.AddTask(cts1.WaitAll());
+
+            await taskAwaitBuffer.WaitAll();
+
+            if (_daoyouModelConfig.PreferGiftID != null)
+            {
+                widgetItems = cts.GetResultsLists();
+
+                for (var i = 0; i < _daoyouModelConfig.PreferGiftID.Length; i++)
+                {
+                    if (_daoyouModelConfig.shownPreferGiftID.Contains(_daoyouModelConfig.PreferGiftID[i]) ||
+                        (daoYouData != null && daoYouData.loveIds.Contains(_daoyouModelConfig.PreferGiftID[i])))
                     {
-                        widgetItem.InitWidget(new ItemInfo(i, 0));
+                        widgetItems[i].InitWidget(new ItemInfo(_daoyouModelConfig.PreferGiftID[i], 0));
                     }
                     else
                     {
-                        widgetItem.ShowWenhao();
+                        widgetItems[i].ShowWenhao();
                     }
                 }
             }
 
+
             if (_daoyouModelConfig.daolvSkillID != null)
             {
-                foreach (var i in _daoyouModelConfig.daolvSkillID)
+                daoYouaaFfixWidgets = cts2.GetResultsLists();
+                for (var i = 0; i < _daoyouModelConfig.daolvSkillID.Length; i++)
                 {
-                    DaoYouaaFfixWidget daoYouaaFfixWidge =
-                        await UIManager.Instance.CreateGComponent<DaoYouaaFfixWidget>(null, DaoLvContent);
-                    daoYouaaFfixWidge.CustomInit(i);
-                    daoYouaaFfixWidgets.Add(daoYouaaFfixWidge);
+                    daoYouaaFfixWidgets[i].CustomInit(_daoyouModelConfig.daolvSkillID[i]);
                 }
             }
 
-
-            DaoyouLevelupConfig[] configs = ConfigComponent.Instance.GetAll<DaoyouLevelupConfig>();
-            foreach (var daoyouLevelupConfig in configs)
+            _daoYouLevelWidgets = cts1.GetResultsLists();
+            for (var i = 0; i < configs.Length; i++)
             {
-                DaoYouLevelWidget daoYouLevelWidget =
-                    await UIManager.Instance.CreateGComponent<DaoYouLevelWidget>(null, DaoYouLevelWidgetContent);
-                daoYouLevelWidget.CustomInit(daoYouData, daoyouLevelupConfig.ID);
-                _daoYouLevelWidgets.Add(daoYouLevelWidget);
+                _daoYouLevelWidgets[i].CustomInit(daoYouData, configs[i].ID);
             }
+
+            taskAwaitBuffer?.Dispose();
+            cts?.Dispose();
+            cts1?.Dispose();
+            cts2?.Dispose();
         }
 
 
@@ -423,19 +474,45 @@ namespace Fort23.Mono
 
         private async CTask CreatItem(List<ItemInfo> shownItems)
         {
-            // ClosePoolGive();
+            using (CTaskAwaitBuffer<WidgetItem> cts = new CTaskAwaitBuffer<WidgetItem>())
+            {
+                foreach (var itemInfo in shownItems)
+                {
+                    cts.AddTask(UIManager.Instance.CreateGComponent<WidgetItem>(null, GiveGiftContent));
+                }
 
-            foreach (var itemInfo in shownItems)
+                giveWidgetItems = await cts.WaitAll();
+            }
+
+            for (var i = 0; i < shownItems.Count; i++)
             {
-                WidgetItem widgetItem = await UIManager.Instance.CreateGComponent<WidgetItem>(null, GiveGiftContent);
-                widgetItem.InitWidget(itemInfo, false);
-                widgetItem.OnClick = OnClick;
-                giveWidgetItems.Add(widgetItem);
+                giveWidgetItems[i].InitWidget(shownItems[i], false);
+                giveWidgetItems[i].OnClick = OnClick;
             }
 
+
             if (giveWidgetItems.Count > 0)
             {
-                giveWidgetItems[0].OnPointerClick();
+                if (currentSelectWidgetItem != null)
+                {
+                    bool isHave = false;
+                    foreach (var giveWidgetItem in giveWidgetItems)
+                    {
+                        if (giveWidgetItem.itemInfo == currentSelectWidgetItem)
+                        {
+                            giveWidgetItem.OnPointerClick();
+                            isHave = true;
+                            break;
+                        }
+                    }
+
+                    if (!isHave)
+                        giveWidgetItems[0].OnPointerClick();
+                }
+                else
+                {
+                    giveWidgetItems[0].OnPointerClick();
+                }
             }
         }
 
@@ -446,6 +523,7 @@ namespace Fort23.Mono
         private async void OnClick(ItemWidgetBasic obj)
         {
             WidgetItem widgetItem = obj as WidgetItem;
+            currentSelectWidgetItem = widgetItem.itemInfo;
             if (widgetItem1 == null)
             {
                 widgetItem1 = await UIManager.Instance.CreateGComponent<WidgetItem>(null, WidgetItemRoot);
@@ -453,6 +531,13 @@ namespace Fort23.Mono
             }
 
             widgetItem1.InitWidget(widgetItem.itemInfo);
+            
+            Icon_Select.transform.SetParent(widgetItem.transform);
+            Icon_Select.transform.SetAsFirstSibling();
+            Icon_Select.transform.GetComponent<RectTransform>().anchoredPosition = Vector2.zero;
+            Icon_Select.gameObject.SetActive(true);
+            
+       
             daoyouGiftConfig = default;
 
             foreach (var giftConfig in daoyouGiftConfigs)
@@ -533,6 +618,11 @@ namespace Fort23.Mono
             Slider_Give.value = 0;
             Slider_Give.minValue = 0;
             Slider_Give.maxValue = 0;
+            
+            
+            Icon_Select.transform.SetParent(GiveGite.transform);
+            Icon_Select.gameObject.SetActive(false);
+            
 
             foreach (var giveWidgetItem in giveWidgetItems)
             {

Assets/Scripts/GameUI/UI/DaoYouPanel/DaoYouInfoPanelData.cs

@@ -426,6 +426,17 @@ namespace Fort23.Mono
 	      return _Btn_CiZuiHelp;
 	     }
 	   }
+	  private MyImage _Icon_Select;
+	  public MyImage Icon_Select
+	   {
+	   get{
+	      if (_Icon_Select == null)
+	       {
+	         _Icon_Select  = GetUIUnit<MyImage>("Icon_Select"); 
+	       }
+	      return _Icon_Select;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

Assets/Scripts/GameUI/UI/DaoYouPanel/DaoYouPanel.cs

@@ -32,21 +32,43 @@ namespace Fort23.Mono
         {
             TitlePanel.ClosePanel();
             AppBarPanel.OpenPanel(this);
+            CustomInit();
             return base.GetFocus();
         }
 
         public async override CTask<bool> AsyncInit(object[] uiData)
         {
-            DaoyouModelConfig[] daoyouModelConfigs = ConfigComponent.Instance.GetAll<DaoyouModelConfig>();
-            foreach (var daoyouModelConfig in daoyouModelConfigs)
+            await CustomInit();
+            return await base.AsyncInit(uiData);
+        }
+
+        public async CTask CustomInit()
+        {
+            foreach (var daoYouWidget in daoYouWidgets)
             {
-                DaoYouWidget daoYouWidget = await UIManager.Instance.CreateGComponent<DaoYouWidget>(null, Content);
-                daoYouWidget.CustomInit(daoyouModelConfig.ID);
-                daoYouWidget.OnClick = OnClick;
-                daoYouWidgets.Add(daoYouWidget);
+                UIManager.Instance.DormancyGComponent(daoYouWidget);
             }
 
-            return await base.AsyncInit(uiData);
+            daoYouWidgets.Clear();
+
+            DaoyouModelConfig[] daoyouModelConfigs = ConfigComponent.Instance.GetAll<DaoyouModelConfig>();
+
+            using (CTaskAwaitBuffer<DaoYouWidget> cts = new CTaskAwaitBuffer<DaoYouWidget>())
+            {
+                foreach (var daoyouModelConfig in daoyouModelConfigs)
+                {
+                    cts.AddTask(UIManager.Instance.CreateGComponent<DaoYouWidget>(null, Content));
+                }
+
+                daoYouWidgets = await cts.WaitAll();
+            }
+            
+            for (var i = 0; i < daoyouModelConfigs.Length; i++)
+            {
+                daoYouWidgets[i].CustomInit(daoyouModelConfigs[i].ID);
+                daoYouWidgets[i].OnClick = OnClick;
+            }
+      
         }
 
         private void OnClick(ItemWidgetBasic obj)

Assets/Scripts/GameUI/UI/DaoYouPanel/DaoYouWidget.cs

@@ -34,7 +34,7 @@ namespace Fort23.Mono
         {
             _daoyouModelConfig = ConfigComponent.Instance.Get<DaoyouModelConfig>(configId);
             _daoYouData = AccountFileInfo.Instance.playerData.daoYouDatas.FirstOrDefault(dy => dy.id == configId);
-            Icon_Daoyou.icon_name = _daoyouModelConfig.bodyIcon;
+            Icon_Daoyou.icon_name = _daoyouModelConfig.headIcon;
 
             Text_Name.text = LanguageManager.Instance.Text(_daoyouModelConfig.name);
             if (_daoYouData != null)
@@ -52,7 +52,7 @@ namespace Fort23.Mono
             }
             else
             {
-                Slider_Emotion.fillAmount = _daoYouData.emotionValue / 100;
+                Slider_Emotion.fillAmount = _daoYouData.emotionValue / 100f;
             }
 
 

Assets/Scripts/GameUI/UI/DaoYouPanel/DaoYouaaFfixWidget.cs

@@ -5,39 +5,46 @@ using GameLogic.Hero;
 
 namespace Fort23.Mono
 {
-	[UIBinding(prefab = "DaoYouaaFfixWidget"  )]
-	public partial class DaoYouaaFfixWidget : UIComponent
-	{
-		private void Init()
-		{
+    [UIBinding(prefab = "DaoYouaaFfixWidget")]
+    public partial class DaoYouaaFfixWidget : UIComponent
+    {
+        private daolvSkill daolvSkill;
+        private float value;
 
-		}
-		public override void AddEvent()
-		{
+        private void Init()
+        {
+        }
 
-		}
-		public override void DelEvent()
-		{
+        public override void AddEvent()
+        {
+        }
 
-		}
-		public override void AddButtonEvent()
-		{
+        public override void DelEvent()
+        {
+        }
 
-		}
+        public override void AddButtonEvent()
+        {
+            Btn_DaoYouaaFfixWidget.onClick.AddListener(() =>
+            {
+                TipMessagePanel.OpenTipMessagePanel(LanguageManager.Instance.Text(daolvSkill.des, value));
+            });
+        }
 
-		public void CustomInit(int configId)
-		{
-			daolvSkill daolvSkill = ConfigComponent.Instance.Get<daolvSkill>(configId);
-			Text_Name.text = LanguageManager.Instance.Text(daolvSkill.name);
-			Icon_Weiyi.gameObject.SetActive(daolvSkill.type == 1);
-		}
-		
-		public void CustomInit(DaoLVBiData daoLVBiData)
-		{
-			daolvSkill daolvSkill = ConfigComponent.Instance.Get<daolvSkill>(daoLVBiData.id);
-			Text_Name.text = LanguageManager.Instance.Text(daolvSkill.name);
-			Icon_Weiyi.gameObject.SetActive(daolvSkill.type == 1);
-		}
+        public void CustomInit(int configId)
+        {
+            daolvSkill = ConfigComponent.Instance.Get<daolvSkill>(configId);
+            value = daolvSkill.para[0];
+            Text_Name.text = LanguageManager.Instance.Text(daolvSkill.name);
+            Icon_Weiyi.gameObject.SetActive(daolvSkill.type == 1);
+        }
 
-	}
-}
+        public void CustomInit(DaoLVBiData daoLVBiData)
+        {
+            daolvSkill = ConfigComponent.Instance.Get<daolvSkill>(daoLVBiData.id);
+            value = daoLVBiData.value;
+            Text_Name.text = LanguageManager.Instance.Text(daolvSkill.name);
+            Icon_Weiyi.gameObject.SetActive(daolvSkill.type == 1);
+        }
+    }
+}

Assets/Scripts/GameUI/UI/DaoYouPanel/DaoYouaaFfixWidgetData.cs

@@ -30,6 +30,17 @@ namespace Fort23.Mono
 	      return _Icon_Weiyi;
 	     }
 	   }
+	  private Button _Btn_DaoYouaaFfixWidget;
+	  public Button Btn_DaoYouaaFfixWidget
+	   {
+	   get{
+	      if (_Btn_DaoYouaaFfixWidget == null)
+	       {
+	         _Btn_DaoYouaaFfixWidget  = GetUIUnit<Button>("Btn_DaoYouaaFfixWidget"); 
+	       }
+	      return _Btn_DaoYouaaFfixWidget;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

Assets/Scripts/GameUI/UI/GongFaUpgradePanel/GongFaUpgradePanel.cs

@@ -6,6 +6,7 @@ using Core.Language;
 using Excel2Json;
 using Fort23.Core;
 using Fort23.UTool;
+using GameLogic.Bag;
 using GameLogic.Hero;
 using GameLogic.Player;
 using UnityEngine;
@@ -76,6 +77,70 @@ namespace Fort23.Mono
             Btn_UpStarOk.onClick.AddListener(() => { UpStarClick(); });
 
             Btn_UpGradeOkLongPress.longPress = () => { UpgradeClick(); };
+
+            Btn_Rest.onClick.AddListener(async () =>
+            {
+                bool relust = await TipsPanle.OpenPnael(10799);
+                if (!relust)
+                {
+                    return;
+                }
+
+                Dictionary<int, ItemInfo> itemInfo = new Dictionary<int, ItemInfo>();
+
+                for (int i = 1; i < _skillInfo.SkillPowerupConfig.ID; i++)
+                {
+                    SkillPowerupConfig skillPowerupConfig = ConfigComponent.Instance.Get<SkillPowerupConfig>(i);
+                    for (var i1 = 0; i1 < skillPowerupConfig.LevelupItem.Length; i1++)
+                    {
+                        if (itemInfo.ContainsKey(skillPowerupConfig.LevelupItem[i1]))
+                        {
+                            itemInfo[skillPowerupConfig.LevelupItem[i1]].count += skillPowerupConfig.LevelupItemNum[i1];
+                        }
+                        else
+                        {
+                            itemInfo.Add(skillPowerupConfig.LevelupItem[i1], new ItemInfo(
+                                skillPowerupConfig.LevelupItem[i1],
+                                skillPowerupConfig.LevelupItemNum[i1]));
+                        }
+                    }
+                }
+
+                // ItemConfig itemConfig = ConfigComponent.Instance.Get<ItemConfig>(_skillInfo.skillConfig.PieceID);
+                //
+                // SkillConstant skillConstant = ConfigComponent.Instance.Get<SkillConstant>(itemConfig.quality);
+                // int count = 0;
+                // for (int i = 0; i < _skillInfo.skillConfig.level - 1; i++)
+                // {
+                //     count += skillConstant.SkillPromoteNeedPieceNum[i];
+                // }
+                //
+                // if (count > 0)
+                // {
+                //     if (itemInfo.ContainsKey(_skillInfo.skillConfig.PieceID))
+                //     {
+                //         itemInfo[_skillInfo.skillConfig.PieceID].count += count;
+                //     }
+                //     else
+                //     {
+                //         itemInfo.Add(_skillInfo.skillConfig.PieceID, new ItemInfo(_skillInfo.skillConfig.PieceID,
+                //             count));
+                //     }
+                // }
+
+
+                // _skillInfo.SkillData.star = 1;
+                _skillInfo.SkillData.level = 1;
+                _skillInfo.CustomInt(_skillInfo.SkillData);
+                PlayerManager.Instance.myHero.ComputeHeroInfo();
+                CustomInit(_skillInfo);
+                foreach (var keyValuePair in itemInfo)
+                {
+                    PlayerManager.Instance.BagController.AddItem(keyValuePair.Value);
+                }
+
+                RewardsPanel.OpenPanel(itemInfo);
+            });
         }
 
         private void UpStarClick()
@@ -201,8 +266,10 @@ namespace Fort23.Mono
                 UIManager.Instance.DormancyGComponent(gongFaUpgradeInfoWidget);
             }
 
+           
             _gongFaUpgradeInfoWidgets.Clear();
             _skillInfo = skillInfo;
+            Btn_Rest.gameObject.SetActive(_skillInfo.SkillPowerupConfig.ID > 1);
             RedDotComType02.CustomInit(13, _skillInfo);
             RedDotComType01.CustomInit(12, _skillInfo);
             _skillPowerupConfigs = ConfigComponent.Instance.GetAll<SkillPowerupConfig>().ToList();
@@ -219,7 +286,6 @@ namespace Fort23.Mono
             {
                 QualityCsc.ChangeState(0);
                 Text_Quality.text = LanguageManager.Instance.Text(10797);
-              
             }
             else if (itemConfig.quality == 4)
             {
@@ -250,11 +316,11 @@ namespace Fort23.Mono
                     csc.ChangeState(0);
                     Icon_Attribute.icon_name = "dec_jin2";
                     break;
-                case 2:
+                case 4:
                     csc.ChangeState(1);
                     Icon_Attribute.icon_name = "dec_mu2";
                     break;
-                case 4:
+                case 2:
                     csc.ChangeState(2);
                     Icon_Attribute.icon_name = "dec_shui2";
                     break;
@@ -266,7 +332,7 @@ namespace Fort23.Mono
                     csc.ChangeState(4);
                     Icon_Attribute.icon_name = "dec_tu2";
                     break;
-                
+
                 case 0:
                     csc.ChangeState(5);
                     Icon_Attribute.icon_name = "dec_fuzhu2";

Assets/Scripts/GameUI/UI/GongFaUpgradePanel/GongFaUpgradePanelData.cs

@@ -340,6 +340,17 @@ namespace Fort23.Mono
 	      return _QualityCsc;
 	     }
 	   }
+	  private Button _Btn_Rest;
+	  public Button Btn_Rest
+	   {
+	   get{
+	      if (_Btn_Rest == null)
+	       {
+	         _Btn_Rest  = GetUIUnit<Button>("Btn_Rest"); 
+	       }
+	      return _Btn_Rest;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

Assets/Scripts/GameUI/UI/LevelChoosePanel/PlacesInfoPanel.cs

@@ -92,7 +92,7 @@ namespace Fort23.Mono
             AccountFileInfo.PlacesData placesData = PlayerManager.Instance.GetPlacesData(placesConfig.ID);
             int jindu = placesData == null ? 0 : placesData.progress;
             Text_PlacesComplteProgress.text =
-                LanguageManager.Instance.Text(10378, (jindu / placesConfig.TotalScore * 100f).ToString("0"));
+                LanguageManager.Instance.Text(10378, ((float)jindu / placesConfig.TotalScore * 100f).ToString("0"));
             return await base.AsyncInit(uiData);
         }
 

Assets/Scripts/GameUI/UI/RewardsPanel/RewardsPanel.cs

@@ -89,7 +89,7 @@ namespace Fort23.Mono
             txtlName.text = title;
         }
 
-        public async void InitRewardsPanel(Dictionary<string, ItemInfo> rewardsDic, Action onClose = null)
+        public async void InitRewardsPanel(Dictionary<int, ItemInfo> rewardsDic, Action onClose = null)
         {
             this.onClose = onClose;
             foreach (var widgetItem in widgetItems)
@@ -98,7 +98,7 @@ namespace Fort23.Mono
             }
 
             widgetItems.Clear();
-            foreach (KeyValuePair<string, ItemInfo> keyValuePair in rewardsDic)
+            foreach (KeyValuePair<int, ItemInfo> keyValuePair in rewardsDic)
             {
                 GenerateWidget(keyValuePair.Value);
             }
@@ -113,7 +113,7 @@ namespace Fort23.Mono
         }
 
 
-        public async static CTask<RewardsPanel> OpenPanel(Dictionary<string, ItemInfo> rewardsDic,
+        public async static CTask<RewardsPanel> OpenPanel(Dictionary<int, ItemInfo> rewardsDic,
             Action onClose = null)
         {
             RewardsPanel rewardsPanel =

Assets/Scripts/GameUI/UI/RewardsPanel/WidgetItem.cs

@@ -121,6 +121,10 @@ namespace Fort23.Mono
                 {
                     icon.icon_name = "dec_gfbook_tu";
                 }
+                else if (skillConfig.attribute == 0)
+                {
+                    icon.icon_name = "dec_gfbook_fuzhu";
+                }
 
                 Icon_Item2.gameObject.SetActive(false);
                 Icon_Skill.gameObject.SetActive(true);

Assets/Scripts/GameUI/UI/ShopPanel/ShopBuyItemPanel.cs

@@ -160,7 +160,18 @@ namespace Fort23.Mono
             }
             else
             {
-                Text_Price.text = _shopItemConfig.price.ToString();
+                
+                if (_shopItemConfig.price > PlayerManager.Instance.BagController.GetItemCount(_shopItemConfig.costItemId))
+                {
+                    Text_Price.text =
+                        $"<color=red>{PlayerManager.Instance.BagController.GetItemCount(_shopItemConfig.costItemId).ToStringEx()}</color>/{_shopItemConfig.price.ToStringEx()}";
+                }
+                else
+                {
+                    Text_Price.text = $"{PlayerManager.Instance.BagController.GetItemCount(_shopItemConfig.costItemId).ToStringEx()}/{_shopItemConfig.price.ToStringEx()}";
+                }
+                
+               
                 ImageCurrency.gameObject.SetActive(true);
             }
 
@@ -289,7 +300,18 @@ namespace Fort23.Mono
             }
             else
             {
-                Text_Price.text = $"{(count * _shopItemConfig.price).ToString()}";
+                int allCount = count * _shopItemConfig.price;
+                
+                if (allCount > PlayerManager.Instance.BagController.GetItemCount(_shopItemConfig.costItemId))
+                {
+                    Text_Price.text =
+                        $"<color=red>{PlayerManager.Instance.BagController.GetItemCount(_shopItemConfig.costItemId).ToStringEx()}</color>/{allCount.ToStringEx()}";
+                }
+                else
+                {
+                    Text_Price.text = $"{PlayerManager.Instance.BagController.GetItemCount(_shopItemConfig.costItemId).ToStringEx()}/{allCount.ToStringEx()}";
+                }
+                
                 ImageCurrency.gameObject.SetActive(true);
             }
 

Assets/Scripts/GameUI/UI/ShopPanel/ShopPanel.cs

@@ -154,6 +154,37 @@ namespace Fort23.Mono
             return await base.AsyncInit(uiData);
         }
 
+
+        public void SelectWidget(int shopId)
+        {
+            this.shopId = shopId;
+            currentSelectedShopBtnWidget = null;
+            if (currentSelectedShopBtnWidget == null)
+            {
+                foreach (var shopBtnWidget in _shopBtnWidgets)
+                {
+                    if (shopBtnWidget.ShopGroupConfig.ID == shopId)
+                    {
+                        currentSelectedShopBtnWidget = shopBtnWidget;
+                        break;
+                    }
+                }
+
+                if (currentSelectedShopBtnWidget == null)
+                {
+                    _shopBtnWidgets[0]?.OnPointerClick();
+                }
+                else
+                {
+                    currentSelectedShopBtnWidget.OnPointerClick();
+                }
+            }
+            else
+            {
+                currentSelectedShopBtnWidget.OnPointerClick();
+            }
+        }
+
         private async void OnClick(ItemWidgetBasic obj)
         {
             ShopBtnWidget shopBtnWidget = obj as ShopBtnWidget;

Assets/Scripts/GameUI/UI/XianTuLogPanel/XianTuLogPanel.cs

@@ -271,13 +271,18 @@ namespace Fort23.Mono
             xianTuSaiXuanWidget1.OnClick = OnClick;
 
             BigMapConfig[] bigMapConfigs = ConfigComponent.Instance.GetAll<BigMapConfig>();
-            foreach (var bigMapConfig in bigMapConfigs)
-            {
-                XianTuSaiXuanWidget xianTuSaiXuanWidget = await UIManager.Instance.CreateGComponent<XianTuSaiXuanWidget>(null, BigMapConnect);
-                xianTuSaiXuanWidget.CustomInit(1, bigMapConfig.ID);
-                xianTuSaiXuanWidget.OnClick = OnClick;
-                bigMapXianTuSaiWidgets.Add(xianTuSaiXuanWidget);
-            }
+            // foreach (var bigMapConfig in bigMapConfigs)
+            // {
+            //     XianTuSaiXuanWidget xianTuSaiXuanWidget = await UIManager.Instance.CreateGComponent<XianTuSaiXuanWidget>(null, BigMapConnect);
+            //     xianTuSaiXuanWidget.CustomInit(1, bigMapConfig.ID);
+            //     xianTuSaiXuanWidget.OnClick = OnClick;
+            //     bigMapXianTuSaiWidgets.Add(xianTuSaiXuanWidget);
+            // }
+            
+            XianTuSaiXuanWidget xianTuSaiXuanWidget = await UIManager.Instance.CreateGComponent<XianTuSaiXuanWidget>(null, BigMapConnect);
+            xianTuSaiXuanWidget.CustomInit(1, bigMapConfigs[0].ID);
+            xianTuSaiXuanWidget.OnClick = OnClick;
+            bigMapXianTuSaiWidgets.Add(xianTuSaiXuanWidget);
 
             eventLogTitleWidget = await UIManager.Instance.CreateGComponentForObject<EventLogTitleWidget>(EventLogTitleWidgetGam, null);
 

Assets/Scripts/GameUI/UI/XianTuLogPanel/XianTuSaiXuanWidget.cs

@@ -41,7 +41,8 @@ namespace Fort23.Mono
                 }
                 else
                 {
-                    Text_Name.text = LanguageManager.Instance.Text(_bigMapConfig.mapName);
+                    string[] fruits =  LanguageManager.Instance.Text(_bigMapConfig.mapName).Split('.');
+                    Text_Name.text =fruits[1];
                 }
             }
             else if (type == 2)

Assets/Scripts/GameUI/Utility/SkiptoHelper.cs

@@ -34,7 +34,16 @@ namespace Mono.Utility
                     return;
                 //商店界面
                 case 4:
-                    UIManager.Instance.GetComponent<AppBarPanel>().Btn_Shop_Click(skiptoConfig.SkipArguments[0], true);
+                    ShopPanel shopPanel = UIManager.Instance.GetComponent<ShopPanel>();
+                    if (shopPanel != null && !shopPanel.IsClose)
+                    {
+                        shopPanel.SelectWidget(skiptoConfig.SkipArguments[0]);
+                    }
+                    else
+                    {
+                        UIManager.Instance.GetComponent<AppBarPanel>().Btn_Shop_Click(skiptoConfig.SkipArguments[0]);
+                    }
+
                     return;
                 //实用神识界面
                 case 5: