Merge branch 'master' of http://192.168.123.2:3000/ck/XiuXianGame

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

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: CHxJvCP8VCilGfkRBxDjBOMvLUup9UTHECtu1qXLDYF1k1DfoRzPKIhX/lGj
+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
+  - serializedVersion: 3
+    buildTarget: iPhone
+    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: Android
+    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: WeixinMiniGame
+    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: HMIAndroid
+    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: OpenHarmony
+    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_juxing_135.png.meta

@@ -52,7 +52,7 @@ TextureImporter:
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
   spritePixelsToUnits: 100
-  spriteBorder: {x: 30, y: 0, z: 31, w: 0}
+  spriteBorder: {x: 30, y: 14, z: 31, w: 13}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
   alphaIsTransparency: 1

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

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: DH1LsHn7U3w0VVBcG4A9qEi4IwgEFDfEgwKExSwf0YQGjpYnj7bqXUaJMFjI
+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
+  - serializedVersion: 3
+    buildTarget: iPhone
+    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: Android
+    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: WeixinMiniGame
+    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: HMIAndroid
+    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: OpenHarmony
+    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_xiaodidian_db.png.meta

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: Wi4csn+lVC2SLfw1NVtSnc7Iw2+29QUl9oBvFTYFSVQLRWN/UOogg3WzNDbc
+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
+  - serializedVersion: 3
+    buildTarget: iPhone
+    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: Android
+    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: WeixinMiniGame
+    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: HMIAndroid
+    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: OpenHarmony
+    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_xiaodidian_jdt.png.meta

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: DH4fsi2tAXhv21UqsS6KP/vdQmmLtDDWLvRLq77yKiMotAA+pG7MeRgHkoGy
+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
+  - serializedVersion: 3
+    buildTarget: iPhone
+    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: Android
+    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: WeixinMiniGame
+    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: HMIAndroid
+    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: OpenHarmony
+    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_xiaodidian_jdt_db.png.meta

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: XXMftH+tAi/2ME6CaXz0YioM/jcbqcZKyA1/AJfTLOqfKsxXs9kdNJ9aojOi
+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
+  - serializedVersion: 3
+    buildTarget: iPhone
+    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: Android
+    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: WeixinMiniGame
+    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: HMIAndroid
+    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: OpenHarmony
+    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/Res/Config/EventConfig.json

@@ -19,6 +19,14 @@
       "PrizeType": [
         5
       ],
+      "PrizeIDs": [
+        1003,
+        999001
+      ],
+      "PrizeNums": [
+        -1000,
+        1
+      ],
       "RefreshProbability": 100,
       "RefreshCount": 0,
       "placeID": 0,
@@ -941,6 +949,47 @@
       "EventName": 4027,
       "Description": 4102
     },
+    {
+      "ID": 10000,
+      "EventLinksId": [
+        1000001,
+        1000002,
+        1000003,
+        1000004,
+        1000005,
+        1000006,
+        1000007,
+        1000008,
+        1000009,
+        1000010,
+        1000011,
+        1000012,
+        1000013,
+        1000014,
+        1000015,
+        1000016,
+        1000017,
+        1000018,
+        1000019,
+        1000020,
+        1000021,
+        102
+      ],
+      "EventTriggerType": 4,
+      "EventTag": 1,
+      "EventType": 1,
+      "Score": 10,
+      "EventQuality": 1,
+      "RefreshProbability": 0,
+      "RefreshCount": 0,
+      "placeID": 1,
+      "SmallPlacesId": 0,
+      "XiantuID": 1,
+      "EventConditionId": 0,
+      "EventCount": 0,
+      "EventName": 4259,
+      "Description": 0
+    },
     {
       "ID": 10001,
       "EventLinksId": [
@@ -4472,6 +4521,305 @@
       "EventCount": 3,
       "EventName": 4249,
       "Description": 0
+    },
+    {
+      "ID": 9117,
+      "EventLinksId": [
+        911701,
+        911702,
+        911703,
+        911704,
+        911705,
+        911706,
+        911707,
+        911708,
+        911709,
+        911710,
+        911711,
+        102
+      ],
+      "EventTriggerType": 6,
+      "EventTag": 2,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 3,
+      "RefreshProbability": 30,
+      "RefreshCount": 1,
+      "placeID": 1,
+      "SmallPlacesId": 1,
+      "XiantuID": 0,
+      "EventConditionId": 0,
+      "EventCount": 3,
+      "EventName": 4250,
+      "Description": 0
+    },
+    {
+      "ID": 9118,
+      "EventLinksId": [
+        911801,
+        911802,
+        911803,
+        911804,
+        911805,
+        911806,
+        911807,
+        911808,
+        102
+      ],
+      "EventTriggerType": 6,
+      "EventTag": 2,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 3,
+      "RefreshProbability": 30,
+      "RefreshCount": 1,
+      "placeID": 1,
+      "SmallPlacesId": 1,
+      "XiantuID": 0,
+      "EventConditionId": 10,
+      "EventValue": [
+        9117
+      ],
+      "EventCount": 3,
+      "EventName": 4251,
+      "Description": 0
+    },
+    {
+      "ID": 9119,
+      "EventLinksId": [
+        911901,
+        911902,
+        911903,
+        911904,
+        911905,
+        911906,
+        911907,
+        911908,
+        911909,
+        911910,
+        911911,
+        911912,
+        911913,
+        102
+      ],
+      "EventTriggerType": 6,
+      "EventTag": 2,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 3,
+      "RefreshProbability": 30,
+      "RefreshCount": 1,
+      "placeID": 1,
+      "SmallPlacesId": 1,
+      "XiantuID": 0,
+      "EventConditionId": 10,
+      "EventValue": [
+        9118
+      ],
+      "EventCount": 3,
+      "EventName": 4252,
+      "Description": 0
+    },
+    {
+      "ID": 9120,
+      "EventLinksId": [
+        912001,
+        912002,
+        912003,
+        912004,
+        912005,
+        912006,
+        912007,
+        912008,
+        102
+      ],
+      "EventTriggerType": 6,
+      "EventTag": 2,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 3,
+      "RefreshProbability": 30,
+      "RefreshCount": 1,
+      "placeID": 1,
+      "SmallPlacesId": 2,
+      "XiantuID": 0,
+      "EventConditionId": 10,
+      "EventValue": [
+        9119
+      ],
+      "EventCount": 3,
+      "EventName": 4253,
+      "Description": 0
+    },
+    {
+      "ID": 9121,
+      "EventLinksId": [
+        912101,
+        912102,
+        912103,
+        912104,
+        912105,
+        912106,
+        102
+      ],
+      "EventTriggerType": 6,
+      "EventTag": 2,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 3,
+      "RefreshProbability": 30,
+      "RefreshCount": 1,
+      "placeID": 1,
+      "SmallPlacesId": 2,
+      "XiantuID": 0,
+      "EventConditionId": 10,
+      "EventValue": [
+        9120
+      ],
+      "EventCount": 3,
+      "EventName": 4254,
+      "Description": 0
+    },
+    {
+      "ID": 9122,
+      "EventLinksId": [
+        912201,
+        912202,
+        912203,
+        912204,
+        912205,
+        912206,
+        912207,
+        912208,
+        912209,
+        912210,
+        912211,
+        912212,
+        912213,
+        912214,
+        912215,
+        102
+      ],
+      "EventTriggerType": 6,
+      "EventTag": 2,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 3,
+      "RefreshProbability": 30,
+      "RefreshCount": 1,
+      "placeID": 1,
+      "SmallPlacesId": 2,
+      "XiantuID": 0,
+      "EventConditionId": 10,
+      "EventValue": [
+        9121
+      ],
+      "EventCount": 3,
+      "EventName": 4255,
+      "Description": 0
+    },
+    {
+      "ID": 9123,
+      "EventLinksId": [
+        912301,
+        912302,
+        912303,
+        912304,
+        912305,
+        912306,
+        912307,
+        912308,
+        912309,
+        912310,
+        912311,
+        912312,
+        912313,
+        912314,
+        912315,
+        912316,
+        912317,
+        912318,
+        912319,
+        912320,
+        912321,
+        912322,
+        912323,
+        912324,
+        912325,
+        912326,
+        912327,
+        912328,
+        912329,
+        102
+      ],
+      "EventTriggerType": 6,
+      "EventTag": 2,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 3,
+      "RefreshProbability": 30,
+      "RefreshCount": 1,
+      "placeID": 1,
+      "SmallPlacesId": 3,
+      "XiantuID": 0,
+      "EventConditionId": 0,
+      "EventCount": 3,
+      "EventName": 4256,
+      "Description": 0
+    },
+    {
+      "ID": 9124,
+      "EventLinksId": [
+        912401,
+        912402,
+        912403,
+        912404,
+        912405,
+        102
+      ],
+      "EventTriggerType": 6,
+      "EventTag": 2,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 3,
+      "RefreshProbability": 30,
+      "RefreshCount": 1,
+      "placeID": 1,
+      "SmallPlacesId": 3,
+      "XiantuID": 0,
+      "EventConditionId": 10,
+      "EventValue": [
+        9123
+      ],
+      "EventCount": 3,
+      "EventName": 4257,
+      "Description": 0
+    },
+    {
+      "ID": 9125,
+      "EventTriggerType": 6,
+      "EventTag": 2,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 3,
+      "PrizeIDs": [
+        20014
+      ],
+      "PrizeNums": [
+        1
+      ],
+      "RefreshProbability": 30,
+      "RefreshCount": 1,
+      "placeID": 1,
+      "SmallPlacesId": 3,
+      "XiantuID": 0,
+      "EventConditionId": 10,
+      "EventValue": [
+        9124
+      ],
+      "EventCount": 3,
+      "EventName": 4258,
+      "Description": 0
     }
   ]
 }

Assets/Res/Config/EventNPC.json

@@ -251,6 +251,48 @@
       "name": 0,
       "icon": "",
       "DaoyouID": 0
+    },
+    {
+      "ID": 131,
+      "name": 0,
+      "icon": "",
+      "DaoyouID": 0
+    },
+    {
+      "ID": 132,
+      "name": 0,
+      "icon": "",
+      "DaoyouID": 0
+    },
+    {
+      "ID": 133,
+      "name": 0,
+      "icon": "",
+      "DaoyouID": 0
+    },
+    {
+      "ID": 134,
+      "name": 0,
+      "icon": "",
+      "DaoyouID": 0
+    },
+    {
+      "ID": 135,
+      "name": 0,
+      "icon": "",
+      "DaoyouID": 0
+    },
+    {
+      "ID": 136,
+      "name": 0,
+      "icon": "",
+      "DaoyouID": 0
+    },
+    {
+      "ID": 137,
+      "name": 0,
+      "icon": "",
+      "DaoyouID": 0
     }
   ]
 }

Assets/Res/Config/GroupConfig.json

@@ -754,6 +754,15 @@
         9001
       ]
     },
+    {
+      "ID": 10001,
+      "GroupMonsterLevel": [
+        5
+      ],
+      "GroupMonster": [
+        9002
+      ]
+    },
     {
       "ID": 4001,
       "GroupMonsterLevel": [
@@ -773,12 +782,66 @@
       ]
     },
     {
-      "ID": 10001,
+      "ID": 4003,
       "GroupMonsterLevel": [
-        5
+        90
       ],
       "GroupMonster": [
-        9002
+        9001
+      ]
+    },
+    {
+      "ID": 4004,
+      "GroupMonsterLevel": [
+        110
+      ],
+      "GroupMonster": [
+        9001
+      ]
+    },
+    {
+      "ID": 4005,
+      "GroupMonsterLevel": [
+        120
+      ],
+      "GroupMonster": [
+        9001
+      ]
+    },
+    {
+      "ID": 4006,
+      "GroupMonsterLevel": [
+        130
+      ],
+      "GroupMonster": [
+        9001
+      ]
+    },
+    {
+      "ID": 4007,
+      "GroupMonsterLevel": [
+        140
+      ],
+      "GroupMonster": [
+        9001
+      ]
+    },
+    {
+      "ID": 4008,
+      "GroupMonsterLevel": [
+        150
+      ],
+      "GroupMonster": [
+        9001
+      ]
+    },
+    {
+      "ID": 4009,
+      "GroupMonsterLevel": [
+        160
+      ],
+      "GroupMonster": [
+        9001
       ]
     }
   ]

Assets/Res/Config/ItemConfig.json

@@ -4547,6 +4547,31 @@
       "sort": 0,
       "itemDesc2": 0
     },
+    {
+      "ID": 20014,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_item_20014",
+      "itemTag": 21,
+      "quality": 2,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 0,
+      "sort": 0,
+      "itemDesc2": 0
+    },
     {
       "ID": 21001,
       "itemName": 3194,

Assets/Res/Config/LevelbattleConfig.json

@@ -540,6 +540,16 @@
       "MonsterGroupTruePower": 100,
       "MonsterGroupPower": 100
     },
+    {
+      "ID": 10001,
+      "Group": [
+        100001
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
     {
       "ID": 4001,
       "Group": [
@@ -561,9 +571,69 @@
       "MonsterGroupPower": 100
     },
     {
-      "ID": 10001,
+      "ID": 4003,
       "Group": [
-        100001
+        4003
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 4004,
+      "Group": [
+        4004
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 4005,
+      "Group": [
+        4005
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 4006,
+      "Group": [
+        4006
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 4007,
+      "Group": [
+        4007
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 4008,
+      "Group": [
+        4008
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 4009,
+      "Group": [
+        4009
       ],
       "combatTime": 120.0,
       "combatType": 1,

Assets/Res/UI/AppBarPanel/AppBarPanel.prefab

@@ -209,7 +209,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 22.2, y: -26.4}
-  m_SizeDelta: {x: 98, y: 83}
+  m_SizeDelta: {x: 85, y: 86}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6263514538251950369
 CanvasRenderer:
@@ -341,7 +341,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.1, y: -44.3}
+  m_AnchoredPosition: {x: 0.1, y: -47.50001}
   m_SizeDelta: {x: 88.376205, y: 38.2085}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3274072020448486571
@@ -374,7 +374,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 28
+    m_FontSize: 35
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 2
@@ -422,7 +422,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 182, y: 179}
+  m_SizeDelta: {x: 172, y: 171}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &68198010094673762
 CanvasRenderer:
@@ -512,7 +512,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 22.5, y: -25.6}
-  m_SizeDelta: {x: 91, y: 91}
+  m_SizeDelta: {x: 91, y: 67}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1937265048322601381
 CanvasRenderer:
@@ -644,7 +644,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.1, y: -44.3}
+  m_AnchoredPosition: {x: 0.1, y: -47.5}
   m_SizeDelta: {x: 88.376205, y: 38.2085}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6468258095934692119
@@ -677,7 +677,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 28
+    m_FontSize: 35
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 2
@@ -859,7 +859,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.1, y: -44.3}
+  m_AnchoredPosition: {x: 0.1, y: -47.50001}
   m_SizeDelta: {x: 88.376205, y: 38.2085}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5311815257834640554
@@ -892,7 +892,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 28
+    m_FontSize: 35
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 2
@@ -1031,7 +1031,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: -278.2, y: 51.301716}
+  m_AnchoredPosition: {x: -279.4, y: 27.2}
   m_SizeDelta: {x: 182, y: 187.5966}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &9120908431640298670
@@ -1486,7 +1486,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, y: -23.599976}
+  m_AnchoredPosition: {x: -0.31704, y: 27.8}
   m_SizeDelta: {x: 172.6341, y: 88.0802}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9118942833055612608
@@ -1519,11 +1519,11 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 54
+    m_FontSize: 72
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 2
-    m_MaxSize: 54
+    m_MaxSize: 75
     m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
@@ -1543,7 +1543,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_EffectColor: {r: 0.78, g: 0.5495412, b: 0.10217998, a: 1}
+  m_EffectColor: {r: 0.12941177, g: 0.4666667, b: 0.52156866, a: 1}
   m_EffectDistance: {x: 1.5, y: -1.5}
   m_UseGraphicAlpha: 1
 --- !u!1 &2634108884773401188
@@ -1583,7 +1583,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 22.5, y: -25.5}
-  m_SizeDelta: {x: 50, y: 37}
+  m_SizeDelta: {x: 51, y: 51}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8719992337400722114
 CanvasRenderer:
@@ -1852,7 +1852,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 22.5, y: -27.1}
-  m_SizeDelta: {x: 91, y: 96}
+  m_SizeDelta: {x: 84, y: 87}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5167439644883526304
 CanvasRenderer:
@@ -1967,7 +1967,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &6871685477673824771
 RectTransform:
   m_ObjectHideFlags: 0
@@ -2075,7 +2075,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 22.5, y: -25.5}
-  m_SizeDelta: {x: 32, y: 55}
+  m_SizeDelta: {x: 57, y: 46}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4856364321762759249
 CanvasRenderer:
@@ -2767,7 +2767,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 22, y: -25.6}
-  m_SizeDelta: {x: 81, y: 103}
+  m_SizeDelta: {x: 91, y: 82}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1991973135826434428
 CanvasRenderer:
@@ -2876,6 +2876,7 @@ GameObject:
   - component: {fileID: 8586065168883585880}
   - component: {fileID: 8938417049478677008}
   - component: {fileID: 6163054391845323626}
+  - component: {fileID: 4099233569721547878}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text_divineSensePoint
@@ -2901,8 +2902,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 17.7, y: -78.6}
-  m_SizeDelta: {x: 0, y: 31.8101}
+  m_AnchoredPosition: {x: -0.0000014305, y: -35.549}
+  m_SizeDelta: {x: 0, y: 38.6171}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8586065168883585880
 CanvasRenderer:
@@ -2934,7 +2935,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 28
+    m_FontSize: 32
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 1
@@ -2960,6 +2961,21 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_HorizontalFit: 2
   m_VerticalFit: 0
+--- !u!114 &4099233569721547878
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5817671988682709348}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 0.12941177, g: 0.46666667, b: 0.52156866, a: 1}
+  m_EffectDistance: {x: 1, y: -1}
+  m_UseGraphicAlpha: 1
 --- !u!1 &5848168123700866973
 GameObject:
   m_ObjectHideFlags: 0
@@ -3807,7 +3823,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.1, y: -44.3}
+  m_AnchoredPosition: {x: 0.1, y: -47.50001}
   m_SizeDelta: {x: 88.376205, y: 38.2085}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &997768621759475326
@@ -3840,7 +3856,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 28
+    m_FontSize: 35
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 2
@@ -3889,7 +3905,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 22.5, y: -25.5}
-  m_SizeDelta: {x: 43, y: 44}
+  m_SizeDelta: {x: 56, y: 31}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &39534253641356633
 CanvasRenderer:
@@ -4024,7 +4040,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 22.5, y: -25.5}
-  m_SizeDelta: {x: 45, y: 51}
+  m_SizeDelta: {x: 50, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9062925167079628804
 CanvasRenderer:

Assets/Res/UI/BoxPanel/BoxPanel.prefab

@@ -957,7 +957,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 44.9, y: 21.2}
-  m_SizeDelta: {x: 79, y: 84}
+  m_SizeDelta: {x: 94, y: 94}
   m_Pivot: {x: 0, y: 0}
 --- !u!222 &1879604139991815501
 CanvasRenderer:
@@ -1041,7 +1041,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_fanhui1
+  _icon_name: dec_fanhuianniu
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:

Assets/Res/UI/HeroInformainPanel/ExpElixirItemWidget.prefab

@@ -762,12 +762,12 @@ MonoBehaviour:
   m_PixelsPerUnitMultiplier: 1
   _icon_name: dec_zhujiao
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: bec1e4479c1593746876da07861f4d67, type: 3}
   packInfo:
-    packName: tongyong
-    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
-    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
-    lasetJsonGUID: 009d01eadc79b5b12c19322b6a4cd057
+    packName: mainUI
+    packgJsonPath: /Art/UIAssets/TextrueJson\mainUI.txt
+    packgSpritePath: Assets/Res/UIAtlas/mainUI.spriteatlasv2
+    lasetJsonGUID: b2f66576a0322eca4f466600e3b8eb35
   imageH: 0
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}

Assets/Res/UI/MainPanel/主界面.png.meta → Assets/Res/UI/MainPanel/主界面2.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: Dn4Z4yj8Aiq1doPKc3yfmTV2VUabJ2TaQeemBrmB4+9NENBE6rcytIfxHUFZ
+guid: Xn5N4SmoWy5zw8OdLE+dFWFJOp9VCvfOg44ku0btX+ESbTZrij+btBjhP+GI
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

Assets/Res/UI/ShopPanel/EnergyWidget.prefab

@@ -98,7 +98,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 586894738918592578}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
   m_Name: 
@@ -169,8 +169,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: 1.9105, y: 0}
-  m_SizeDelta: {x: 104.9, y: 44.694}
+  m_AnchoredPosition: {x: 2.659, y: 0}
+  m_SizeDelta: {x: 79.382, y: 44.694}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4830072340555722385
 CanvasRenderer:
@@ -193,7 +193,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.90196085, g: 0.86666673, b: 0.7058824, 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
@@ -202,7 +202,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: bb5b55cc5861a4951990bcc1caccc50e, type: 3}
-    m_FontSize: 26
+    m_FontSize: 28
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 2
@@ -213,7 +213,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: 420000
+  m_Text: 4200
 --- !u!1 &2245206468840536257
 GameObject:
   m_ObjectHideFlags: 0
@@ -251,7 +251,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 33.836975, y: 12.322754}
-  m_SizeDelta: {x: 151.67401, y: 52.6455}
+  m_SizeDelta: {x: 150, y: 52}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5554054428056264509
 CanvasRenderer:
@@ -327,8 +327,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: -66.7, y: 1.2}
-  m_SizeDelta: {x: 59.3358, y: 59.3358}
+  m_AnchoredPosition: {x: -65.2, y: 1.2}
+  m_SizeDelta: {x: 55.5112, y: 55.5112}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4099161695515857595
 CanvasRenderer:
@@ -368,7 +368,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: icon_Coins_s
+  _icon_name: icon_GradeBadge_Challenger
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: 77f77eea85838ad4b8734050364b4892, type: 3}
   packInfo:
@@ -480,7 +480,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, y: 0}
+  m_AnchoredPosition: {x: 31.9, y: 0}
   m_SizeDelta: {x: 147.9615, y: 25}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5984184458604740083
@@ -542,7 +542,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 9208053142604902796}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
   m_Name: 

Assets/Res/UIAtlas/mainUI.spriteatlasv2

@@ -13,6 +13,7 @@ SpriteAtlasAsset:
     packables:
     - {fileID: 2800000, guid: ae82be5937ad4014daf528f0d94826c0, type: 3}
     - {fileID: 2800000, guid: fe20de899c745ab4088ed3e00ff842da, type: 3}
+    - {fileID: 2800000, guid: 49fb1d6c854f9d8448a8778727340bce, type: 3}
     - {fileID: 2800000, guid: 4b3193a71116f5045b1c205bbc779db4, type: 3}
     - {fileID: 2800000, guid: d735f8b29f2b06b4fb594575b21fa9ef, type: 3}
     - {fileID: 2800000, guid: 8da129d26a92b6748827d26230e51210, type: 3}
@@ -22,7 +23,6 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: b8fa6983179b3be4783331e63c25e825, type: 3}
     - {fileID: 2800000, guid: a12eb982dbdc0894586e7d39acac50e7, type: 3}
     - {fileID: 2800000, guid: 5473c79ffd6b84e4c9de2b607f6fbb01, type: 3}
-    - {fileID: 2800000, guid: e9c501f96c7be424c883cfdf777dcc15, type: 3}
     - {fileID: 2800000, guid: caf59be6b62f1ff40b2937ade714bf4d, type: 3}
     - {fileID: 2800000, guid: 0b973e74b13091140a3e9ee1c6e106ea, type: 3}
     - {fileID: 2800000, guid: 19448b5e8c48ae748b181fc098a42ebd, type: 3}
@@ -32,6 +32,10 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: 1db9d86baf4548f449f6aec203999ca0, type: 3}
     - {fileID: 2800000, guid: bfcfc5758571af94a87e12b34550e4d4, type: 3}
     - {fileID: 2800000, guid: 26056759d931a034ca372b0684e5fb75, type: 3}
+    - {fileID: 2800000, guid: 37d5cf072ef6255459698e96d2a39252, type: 3}
+    - {fileID: 2800000, guid: ed37e87f0e84a9f42b0f00ff86787a6f, type: 3}
+    - {fileID: 2800000, guid: 340770b3a8a2f864e8ced377cc141f61, type: 3}
+    - {fileID: 2800000, guid: b901e0ad2eae56e46ab4dba9a7d3d7d7, type: 3}
     - {fileID: 2800000, guid: 64b6c3a351604d24f984b56c14a92652, type: 3}
     - {fileID: 2800000, guid: 4289786de6682ad4a8f4b1648006584c, type: 3}
     - {fileID: 2800000, guid: 9c0b0fd4eb2445f4cabe4b5febe52f66, type: 3}

Assets/Res/UIAtlas/tongyong.spriteatlasv2

@@ -22,6 +22,7 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: 9a900330dc689094f8567dfbac18f61a, type: 3}
     - {fileID: 2800000, guid: 58acd5bd1d8ea2448b0b4a001b241419, type: 3}
     - {fileID: 2800000, guid: 8ea63d948b4761f4d959380d2c15b004, type: 3}
+    - {fileID: 2800000, guid: 76f99a7c409c06f4bb33a37aeb19dea3, type: 3}
     - {fileID: 2800000, guid: 0c95c42a3e36b4e468f5731426e9e70b, type: 3}
     - {fileID: 2800000, guid: 50db720a997df0f4bb76d75ca3128dc6, type: 3}
     - {fileID: 2800000, guid: 25ea5a471ccb19146804285a8e6916ed, type: 3}
@@ -38,7 +39,6 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: 48bc9ebf2521a0e4ba05629c238ff562, type: 3}
     - {fileID: 2800000, guid: 8d23bd6df991bc6409f6b98f584e7296, type: 3}
     - {fileID: 2800000, guid: 9b116a8b642a3c04298780f10d94e7fe, type: 3}
-    - {fileID: 2800000, guid: 8da129d26a92b6748827d26230e51210, type: 3}
     - {fileID: 2800000, guid: a5ccafc312c87454980e5ecb377412c2, type: 3}
     - {fileID: 2800000, guid: a8adb5f9798a7a34eae5b6fcd60714e5, type: 3}
     - {fileID: 2800000, guid: 54c8c2c415e515049a7094c35cc44570, type: 3}
@@ -53,7 +53,6 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: 7a4d82b8d51add842a86c03efe809031, type: 3}
     - {fileID: 2800000, guid: 17b5819cad711404c975f429ddaacb35, type: 3}
     - {fileID: 2800000, guid: 471869ab4e95d7148ae33f596ff58701, type: 3}
-    - {fileID: 2800000, guid: ed5c755d642c4154ebee5e36e03b7842, type: 3}
     - {fileID: 2800000, guid: 6c45afd6bc7e1db429d58030b64f1609, type: 3}
     - {fileID: 2800000, guid: a3178eda8f1ba914b82935602d128450, type: 3}
     - {fileID: 2800000, guid: 38eaee97ee6e25b4aa8c8bbad454f1e1, type: 3}
@@ -94,7 +93,6 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: b2018e9616f1890438f6f28bc67f50fa, type: 3}
     - {fileID: 2800000, guid: 60a33a59f5029d84bb8be15fa6d8fd3b, type: 3}
     - {fileID: 2800000, guid: aab5d08daf2ba124b8b06d79a6fac235, type: 3}
-    - {fileID: 2800000, guid: edb5160d800601f4eaa33d950e35bb0a, type: 3}
     - {fileID: 2800000, guid: c193021d18c48174fa2774c5bb9ce942, type: 3}
     - {fileID: 2800000, guid: 36d1a43a781cecc4aa51cd92c408f96a, type: 3}
     - {fileID: 2800000, guid: 6a4ae9d9bf667354a8611accc71f8d50, type: 3}
@@ -131,7 +129,6 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: e8b66ebe511cc1d4e85937a30bccd4a3, type: 3}
     - {fileID: 2800000, guid: 7e5ce0d678f92704a9674a80dc521664, type: 3}
     - {fileID: 2800000, guid: aec6227823c7f75498752720902c7876, type: 3}
-    - {fileID: 2800000, guid: 9c0b0fd4eb2445f4cabe4b5febe52f66, type: 3}
     - {fileID: 2800000, guid: 416044e3ca43d5d47adb73e0b3c82e5e, type: 3}
     - {fileID: 2800000, guid: f35dc32a18ad6fb489c4dbf540976a3d, type: 3}
     - {fileID: 2800000, guid: 2d8b2d09e8a3bcf4c9c2758292dbe4a7, type: 3}

Assets/Scripts/GameData/ExcelConfig/SkillConfig.cs

@@ -1,5 +1,5 @@
 // Auto Generated Code By excel2json
-// Generate From Excel\Skill.xlsx. SheetName: SkillConfig
+// Generate From Excel\skill.xlsx. SheetName: SkillConfig
 
 using System;
 using Fort23.GameData;

Assets/Scripts/GameData/ExcelConfig/SkillConstant.cs

@@ -1,5 +1,5 @@
 // Auto Generated Code By excel2json
-// Generate From Excel\Skill.xlsx. SheetName: SkillConstant
+// Generate From Excel\skill.xlsx. SheetName: SkillConstant
 
 using System;
 using Fort23.GameData;

Assets/Scripts/GameData/ExcelConfig/SkillPowerupConfig.cs

@@ -1,5 +1,5 @@
 // Auto Generated Code By excel2json
-// Generate From Excel\Skill.xlsx. SheetName: SkillPowerupConfig
+// Generate From Excel\skill.xlsx. SheetName: SkillPowerupConfig
 
 using System;
 using Fort23.GameData;

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

@@ -8,8 +8,8 @@ namespace Fort23.Mono
     public partial class TitlePanel : UIPanel
     {
         List<EnergyWidget> widgets = new List<EnergyWidget>();
-        
-         List<int> moRen =new List<int>() { 1001, 1002 };
+
+        List<int> moRen = new List<int>() { 1001, 1002 };
 
         private void Init()
         {
@@ -29,7 +29,6 @@ namespace Fort23.Mono
 
         public async static CTask<TitlePanel> OpenPanel(List<int> items = null)
         {
-           
             TitlePanel appBarPanel = null;
             if (UIManager.Instance.GetComponent<TitlePanel>() == null)
             {
@@ -51,7 +50,7 @@ namespace Fort23.Mono
             {
                 items = moRen;
             }
-            
+
             foreach (var energyWidget in widgets)
             {
                 UIManager.Instance.DormancyGComponent(energyWidget);
@@ -61,7 +60,8 @@ namespace Fort23.Mono
             Text_JingJie.text =
                 LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[0]) +
                 LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[1]) +
-                LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[2]);
+                LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[2]) +
+                PlayerManager.Instance.myHero.powerUpConfig.jingjie3 * 10 + "%";
 
             Slider_Exp.maxValue = PlayerManager.Instance.myHero.powerUpConfig.levelUpExp;
 

Assets/Scripts/GameUI/UI/MainPanel/MainPanel.cs

@@ -17,7 +17,8 @@ namespace Fort23.Mono
 
         // private ShengShiEventWidget shengShiEventWidget;
 
-
+        List<int> moRen = new List<int>() { 1001, 1002 };
+        List<EnergyWidget> widgets = new List<EnergyWidget>();
         List<ShengShiConditionWidget> _shengShiConditionWidgets = new List<ShengShiConditionWidget>();
 
         private void Init()
@@ -50,7 +51,7 @@ namespace Fort23.Mono
             {
                 await PlayerGuideManager.Instance.SetGuid(1);
             }
-            
+
             if (PlayerGuideManager.Instance.GuideIsCanDo(4))
             {
                 await PlayerGuideManager.Instance.SetGuid(4);
@@ -200,13 +201,25 @@ namespace Fort23.Mono
 
 
             Text_EventNum.text = EventSystemManager.Instance.GetShenShiCount().ToString();
-            Text_Jingjie.text =
+            Text_jingjie.text =
                 LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[0]) +
                 LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[1]) +
-                LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[2]);
+                LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[2]) +
+                PlayerManager.Instance.myHero.powerUpConfig.jingjie3 * 10 + "%";
 
+            foreach (var energyWidget in widgets)
+            {
+                UIManager.Instance.DormancyGComponent(energyWidget);
+            }
 
-            Slider_Exp.maxValue = PlayerManager.Instance.myHero.powerUpConfig.levelUpExp;
+            widgets.Clear();
+            foreach (var item in moRen)
+            {
+                EnergyWidget energyWidget =
+                    await UIManager.Instance.CreateGComponent<EnergyWidget>(null, Group_ResourceBar);
+                energyWidget.CustomInit(item);
+                widgets.Add(energyWidget);
+            }
 
             // UpdateTaskInfo();
         }
@@ -220,6 +233,7 @@ namespace Fort23.Mono
                 ConfigComponent.Instance.Get<PlacesConfig>(smallPlacesConfig.PlacesId);
 
 
+            Text_bigMapName.text = LanguageManager.Instance.Text(placesConfig.placeName);
             Text_ExplorationProgress.text =
                 $"{LanguageManager.Instance.Text(placesConfig.placeName)} - {LanguageManager.Instance.Text(smallPlacesConfig.placeName)}";
             Slider_SmallJD.maxValue = smallPlacesConfig.CompletionEventCount;
@@ -297,21 +311,21 @@ namespace Fort23.Mono
         }
 
 
-        [CustomMethod(CustomMethodType.Update)]
-        public void Update()
-        {
-            if (Input.GetKeyDown(KeyCode.Y))
-            {
-                EventSystemManager.Instance.DetectRandomEvents();
-            }
-
-
-            int currentMiao = (int)((TimeHelper.ClientNow() - PlayerManager.Instance.myHero.heroData.upTime) / 1000);
-
-            float allexp = currentMiao * PlayerManager.Instance.myHero.powerUpConfig.AutoXiuwei;
-
-            Slider_Exp.value = PlayerManager.Instance.myHero.heroData.exp + allexp;
-        }
+        // [CustomMethod(CustomMethodType.Update)]
+        // public void Update()
+        // {
+        //     if (Input.GetKeyDown(KeyCode.Y))
+        //     {
+        //         EventSystemManager.Instance.DetectRandomEvents();
+        //     }
+        //
+        //
+        //     int currentMiao = (int)((TimeHelper.ClientNow() - PlayerManager.Instance.myHero.heroData.upTime) / 1000);
+        //
+        //     float allexp = currentMiao * PlayerManager.Instance.myHero.powerUpConfig.AutoXiuwei;
+        //
+        //     Slider_Exp.value = PlayerManager.Instance.myHero.heroData.exp + allexp;
+        // }
 
 
         public async static CTask<MainPanel> OpenPanel()
@@ -328,6 +342,12 @@ namespace Fort23.Mono
             }
 
             _shengShiConditionWidgets.Clear();
+            foreach (var energyWidget in widgets)
+            {
+                UIManager.Instance.DormancyGComponent(energyWidget);
+            }
+
+            widgets.Clear();
             base.Close();
         }
     }

Assets/Scripts/GameUI/UI/MainPanel/MainPanelData.cs

@@ -63,13 +63,13 @@ namespace Fort23.Mono
 	      return _Btn_Chat;
 	     }
 	   }
-	  private Text _Text_Jingjie;
-	  public Text Text_Jingjie
+	  private Object _Text_Jingjie;
+	  public Object Text_Jingjie
 	   {
 	   get{
 	      if (_Text_Jingjie == null)
 	       {
-	         _Text_Jingjie  = GetUIUnit<Text>("Text_Jingjie"); 
+	         _Text_Jingjie  = GetUIUnit<Object>("Text_Jingjie"); 
 	       }
 	      return _Text_Jingjie;
 	     }
@@ -96,24 +96,24 @@ namespace Fort23.Mono
 	      return _Text_PlayerName;
 	     }
 	   }
-	  private Slider _Slider_Map;
-	  public Slider Slider_Map
+	  private Object _Slider_Map;
+	  public Object Slider_Map
 	   {
 	   get{
 	      if (_Slider_Map == null)
 	       {
-	         _Slider_Map  = GetUIUnit<Slider>("Slider_Map"); 
+	         _Slider_Map  = GetUIUnit<Object>("Slider_Map"); 
 	       }
 	      return _Slider_Map;
 	     }
 	   }
-	  private Slider _Slider_Exp;
-	  public Slider Slider_Exp
+	  private Object _Slider_Exp;
+	  public Object Slider_Exp
 	   {
 	   get{
 	      if (_Slider_Exp == null)
 	       {
-	         _Slider_Exp  = GetUIUnit<Slider>("Slider_Exp"); 
+	         _Slider_Exp  = GetUIUnit<Object>("Slider_Exp"); 
 	       }
 	      return _Slider_Exp;
 	     }
@@ -250,6 +250,39 @@ namespace Fort23.Mono
 	      return _Btn_ChangeMap;
 	     }
 	   }
+	  private RectTransform _Group_ResourceBar;
+	  public RectTransform Group_ResourceBar
+	   {
+	   get{
+	      if (_Group_ResourceBar == null)
+	       {
+	         _Group_ResourceBar  = GetUIUnit<RectTransform>("Group_ResourceBar"); 
+	       }
+	      return _Group_ResourceBar;
+	     }
+	   }
+	  private Text _Text_jingjie;
+	  public Text Text_jingjie
+	   {
+	   get{
+	      if (_Text_jingjie == null)
+	       {
+	         _Text_jingjie  = GetUIUnit<Text>("Text_jingjie"); 
+	       }
+	      return _Text_jingjie;
+	     }
+	   }
+	  private Text _Text_bigMapName;
+	  public Text Text_bigMapName
+	   {
+	   get{
+	      if (_Text_bigMapName == null)
+	       {
+	         _Text_bigMapName  = GetUIUnit<Text>("Text_bigMapName"); 
+	       }
+	      return _Text_bigMapName;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{