功法升级界面修改

Assets/Art/UIAssets/Button/btn_lingwu.png.meta

@@ -52,7 +52,7 @@ TextureImporter:
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
   spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteBorder: {x: 127, y: 0, z: 126, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
   alphaIsTransparency: 1
@@ -189,7 +189,7 @@ TextureImporter:
     physicsShape: []
     bones: []
     spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
+    internalID: 1537655665
     vertices: []
     indices: 
     edges: []

Assets/Art/UIAssets/Button/btn_shengji.png.meta

@@ -52,7 +52,7 @@ TextureImporter:
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
   spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteBorder: {x: 127, y: 0, z: 126, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
   alphaIsTransparency: 1
@@ -189,7 +189,7 @@ TextureImporter:
     physicsShape: []
     bones: []
     spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
+    internalID: 1537655665
     vertices: []
     indices: 
     edges: []

Assets/Art/UIAssets/TextrueJson/gongfa.txt

@@ -1 +1 @@
-{"packName":"gongfa","isTyPack":false,"newTextureJson":[{"textrueName":"btn_lingwu","filePath":"/Button/btn_lingwu.png"},{"textrueName":"btn_shengji","filePath":"/Button/btn_shengji.png"},{"textrueName":"dec_gfdengjidiban","filePath":"/decorate/dec_gfdengjidiban.png"},{"textrueName":"dec_gfdiban","filePath":"/decorate/dec_gfdiban.png"},{"textrueName":"dec_gficondiban","filePath":"/decorate/dec_gficondiban.png"},{"textrueName":"dec_gfLVdiban","filePath":"/decorate/dec_gfLVdiban.png"},{"textrueName":"dec_gfnamediban","filePath":"/decorate/dec_gfnamediban.png"},{"textrueName":"dec_gfxingji","filePath":"/decorate/dec_gfxingji.png"},{"textrueName":"dec_gfxingjidiban","filePath":"/decorate/dec_gfxingjidiban.png"},{"textrueName":"dec_gfxxdiban","filePath":"/decorate/dec_gfxxdiban.png"},{"textrueName":"dec_gfxxlan","filePath":"/decorate/dec_gfxxlan.png"},{"textrueName":"dec_gfxxlanXuanzhong","filePath":"/decorate/dec_gfxxlanXuanzhong.png"},{"textrueName":"dec_moni","filePath":"/decorate/dec_moni.png"},{"textrueName":"dec_shuliangdiban","filePath":"/decorate/dec_shuliangdiban.png"},{"textrueName":"dec_tiaozheng","filePath":"/decorate/dec_tiaozheng.png"},{"textrueName":"dec_weixuanzhong","filePath":"/decorate/dec_weixuanzhong.png"},{"textrueName":"dec_xuanzhong","filePath":"/decorate/dec_xuanzhong.png"}],"keyToValue":{}}
+{"packName":"gongfa","isTyPack":false,"newTextureJson":[{"textrueName":"btn_lingwu","filePath":"/Button/btn_lingwu.png"},{"textrueName":"btn_shengji","filePath":"/Button/btn_shengji.png"},{"textrueName":"dec_diban","filePath":"/decorate/dec_diban.png"},{"textrueName":"dec_gfdengjidiban","filePath":"/decorate/dec_gfdengjidiban.png"},{"textrueName":"dec_gfdiban","filePath":"/decorate/dec_gfdiban.png"},{"textrueName":"dec_gficondiban","filePath":"/decorate/dec_gficondiban.png"},{"textrueName":"dec_gfLVdiban","filePath":"/decorate/dec_gfLVdiban.png"},{"textrueName":"dec_gfnamediban","filePath":"/decorate/dec_gfnamediban.png"},{"textrueName":"dec_gfxingji","filePath":"/decorate/dec_gfxingji.png"},{"textrueName":"dec_gfxingjidiban","filePath":"/decorate/dec_gfxingjidiban.png"},{"textrueName":"dec_gfxxdiban","filePath":"/decorate/dec_gfxxdiban.png"},{"textrueName":"dec_gfxxlanXuanzhong","filePath":"/decorate/dec_gfxxlanXuanzhong.png"},{"textrueName":"dec_jiantou","filePath":"/decorate/dec_jiantou.png"},{"textrueName":"dec_moni","filePath":"/decorate/dec_moni.png"},{"textrueName":"dec_shangdiban","filePath":"/decorate/dec_shangdiban.png"},{"textrueName":"dec_shuliangdiban","filePath":"/decorate/dec_shuliangdiban.png"},{"textrueName":"dec_tiaomulandiban","filePath":"/decorate/dec_tiaomulandiban.png"},{"textrueName":"dec_tiaozheng","filePath":"/decorate/dec_tiaozheng.png"},{"textrueName":"dec_weixuanzhong","filePath":"/decorate/dec_weixuanzhong.png"},{"textrueName":"dec_xiadiban","filePath":"/decorate/dec_xiadiban.png"},{"textrueName":"dec_xuanzhong","filePath":"/decorate/dec_xuanzhong.png"},{"textrueName":"dec_zhongdiban","filePath":"/decorate/dec_zhongdiban.png"}],"keyToValue":{}}

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

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: WSgftXz8Aigw/mecR/XSYbpasJXQWM4UdI+GuAGMiXCR1pa88KNYoyEgsMyg
+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: 48, y: 0, z: 52, 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: 1537655665
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: BnIZvSn7UC/FX7oWOCQ84Bs337/Gu052NlD76d7tgnzaKB/EVNevPjo+aHhf
+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_shangdiban.png.meta

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: CnhJvCL5AHpM/WQOZ0VJEfW7LxAO/LsEbE5QC4+84mrbE/p9NkLyxaAFVmZg
+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: 50, y: 0, z: 53, 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: 1537655665
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: XSsXs36oB3jiF/TmzhoFSq6wCi0WBSfbGJhyYU2CnPkvIMG51vdnDoli1xW8
+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: 45, y: 0, z: 44, 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: 1537655665
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: BihJ4C77B3yTl+34N2l61O9QTLofXQo5Tc/TvOhRBdq7DVHp+xlbg6uTigYO
+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: 63, y: 45, z: 63, w: 45}
+  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: 1537655665
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: CXMesCKsUSgO5gFXUcPwmhjbfgAJw/Fqlzg2n91OyKRPtkwaWGYG2sGTNVED
+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: 38, y: 0, z: 39, 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: 1537655665
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/UI/AppBarPanel/AppBarPanel.prefab

@@ -965,8 +965,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: -295, y: -3}
-  m_SizeDelta: {x: 68, y: 59}
+  m_AnchoredPosition: {x: -295, y: 0}
+  m_SizeDelta: {x: 79, y: 84}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2585392310292376427
 CanvasRenderer:
@@ -1006,7 +1006,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: btn_close_02
+  _icon_name: dec_fanhui1
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:

Assets/Res/UI/DivineSence/BossInfoPanel.prefab

@@ -620,7 +620,7 @@ RectTransform:
   m_GameObject: {fileID: 3166934592360034193}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0.7, y: 0.7, z: 0.7}
+  m_LocalScale: {x: 0.6, y: 0.6, z: 0.6}
   m_ConstrainProportionsScale: 1
   m_Children:
   - {fileID: 6908018645680633753}
@@ -629,7 +629,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 0, y: -46.2}
-  m_SizeDelta: {x: 579.78, y: 0}
+  m_SizeDelta: {x: 706.78, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &8924209297497028959
 CanvasRenderer:
@@ -673,8 +673,8 @@ MonoBehaviour:
   m_ChildAlignment: 0
   m_StartCorner: 0
   m_StartAxis: 0
-  m_CellSize: {x: 138, y: 170}
-  m_Spacing: {x: 9.26, y: 9.26}
+  m_CellSize: {x: 172, y: 236}
+  m_Spacing: {x: 6.26, y: 6.26}
   m_Constraint: 1
   m_ConstraintCount: 4
 --- !u!1 &3552915526930824737

Assets/Res/UI/ShopPanel/EnergyWidget.prefab

@@ -19,7 +19,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &3010089067676543759
 RectTransform:
   m_ObjectHideFlags: 0
@@ -29,16 +29,15 @@ RectTransform:
   m_GameObject: {fileID: 586894738918592578}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 1
-  m_Children:
-  - {fileID: 8474923475632131845}
+  m_Children: []
   m_Father: {fileID: 6527561963321663096}
   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: -4.3, y: 0.0001925389}
-  m_SizeDelta: {x: 60, y: 62}
+  m_AnchoredPosition: {x: 11.7, y: 3.3}
+  m_SizeDelta: {x: 52, y: 52}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5365322635743840051
 CanvasRenderer:
@@ -122,14 +121,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: btn_ResourceBar_Single_Btn_Blue1
+  _icon_name: dec_ziyuanjia
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 23f1ff3af41427347a63b9cc35608247, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
-    packName: all
-    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
-    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
-    lasetJsonGUID: 9ac47f5fba5fc4d9c019e3c208c4513e
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 8de890b954c861b7d182629dcafc0d3a
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -144,7 +143,7 @@ GameObject:
   m_Component:
   - component: {fileID: 6554596081216309278}
   - component: {fileID: 4830072340555722385}
-  - component: {fileID: 2020022124238206156}
+  - component: {fileID: 6440966455622951679}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text_Count
@@ -170,7 +169,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 5.3, y: 0}
-  m_SizeDelta: {x: 85, y: 40}
+  m_SizeDelta: {x: 85, y: 44.694}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4830072340555722385
 CanvasRenderer:
@@ -180,7 +179,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2235163630326853260}
   m_CullTransparentMesh: 1
---- !u!114 &2020022124238206156
+--- !u!114 &6440966455622951679
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -189,86 +188,31 @@ MonoBehaviour:
   m_GameObject: {fileID: 2235163630326853260}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0.90196085, g: 0.86666673, b: 0.7058824, 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_text: 1234567
-  m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 7137805b022d44869b12d93cb388c588, type: 2}
-  m_sharedMaterial: {fileID: 8527393934874279224, guid: 7137805b022d44869b12d93cb388c588, type: 2}
-  m_fontSharedMaterials: []
-  m_fontMaterial: {fileID: 0}
-  m_fontMaterials: []
-  m_fontColor32:
-    serializedVersion: 2
-    rgba: 4294967295
-  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
-  m_enableVertexGradient: 0
-  m_colorMode: 3
-  m_fontColorGradient:
-    topLeft: {r: 1, g: 1, b: 1, a: 1}
-    topRight: {r: 1, g: 1, b: 1, a: 1}
-    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
-    bottomRight: {r: 1, g: 1, b: 1, a: 1}
-  m_fontColorGradientPreset: {fileID: 0}
-  m_spriteAsset: {fileID: 0}
-  m_tintAllSprites: 0
-  m_StyleSheet: {fileID: 0}
-  m_TextStyleHashCode: -1183493901
-  m_overrideHtmlColors: 0
-  m_faceColor:
-    serializedVersion: 2
-    rgba: 4294967295
-  m_fontSize: 21.3
-  m_fontSizeBase: 22
-  m_fontWeight: 400
-  m_enableAutoSizing: 1
-  m_fontSizeMin: 18
-  m_fontSizeMax: 26
-  m_fontStyle: 0
-  m_HorizontalAlignment: 2
-  m_VerticalAlignment: 512
-  m_textAlignment: 65535
-  m_characterSpacing: -3
-  m_wordSpacing: 0
-  m_lineSpacing: 0
-  m_lineSpacingMax: 0
-  m_paragraphSpacing: 0
-  m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
-  m_wordWrappingRatios: 0.4
-  m_overflowMode: 0
-  m_linkedTextComponent: {fileID: 0}
-  parentLinkedComponent: {fileID: 0}
-  m_enableKerning: 1
-  m_enableExtraPadding: 0
-  checkPaddingRequired: 0
-  m_isRichText: 1
-  m_parseCtrlCharacters: 1
-  m_isOrthographic: 1
-  m_isCullingEnabled: 0
-  m_horizontalMapping: 0
-  m_verticalMapping: 0
-  m_uvLineOffset: 0
-  m_geometrySortingOrder: 0
-  m_IsTextObjectScaleStatic: 0
-  m_VertexBufferAutoSizeReduction: 0
-  m_useMaxVisibleDescender: 1
-  m_pageToDisplay: 1
-  m_margin: {x: 0, y: 0, z: 0, w: 0}
-  m_isUsingLegacyAnimationComponent: 0
-  m_isVolumetricText: 0
-  m_hasFontAssetChanged: 0
-  m_baseMaterial: {fileID: 0}
-  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: bb5b55cc5861a4951990bcc1caccc50e, type: 3}
+    m_FontSize: 32
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 3
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 420
 --- !u!1 &2245206468840536257
 GameObject:
   m_ObjectHideFlags: 0
@@ -307,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.674, y: 52.6455}
+  m_SizeDelta: {x: 151.67401, y: 52.6455}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5554054428056264509
 CanvasRenderer:
@@ -336,7 +280,7 @@ MonoBehaviour:
     isList: 0
     ListCollectorDatas: []
   - key: Text_Count
-    gameObject: {fileID: 2020022124238206156}
+    gameObject: {fileID: 6440966455622951679}
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
@@ -346,94 +290,6 @@ MonoBehaviour:
     isList: 0
     ListCollectorDatas: []
   isAssetBundle: 1
---- !u!1 &3915255936335808019
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 8474923475632131845}
-  - component: {fileID: 6412463004780607695}
-  - component: {fileID: 1755594497913369446}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: Icon_Add
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &8474923475632131845
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3915255936335808019}
-  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: 3010089067676543759}
-  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: -30, y: 3}
-  m_SizeDelta: {x: 33, y: 34}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &6412463004780607695
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3915255936335808019}
-  m_CullTransparentMesh: 1
---- !u!114 &1755594497913369446
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3915255936335808019}
-  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: icon_Single_Btn_Blue2
-  isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 23f1ff3af41427347a63b9cc35608247, type: 3}
-  packInfo:
-    packName: all
-    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
-    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
-    lasetJsonGUID: 9ac47f5fba5fc4d9c019e3c208c4513e
-  useGradient: 0
-  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
-  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
-  direction: 0
 --- !u!1 &4311744359091135946
 GameObject:
   m_ObjectHideFlags: 0
@@ -471,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: -58.4, y: -0.00000047684}
-  m_SizeDelta: {x: 55.2738, y: 58.6233}
+  m_AnchoredPosition: {x: -68.7, y: 3}
+  m_SizeDelta: {x: 79.4773, y: 84.2935}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4099161695515857595
 CanvasRenderer:
@@ -594,8 +450,8 @@ GameObject:
   m_Component:
   - component: {fileID: 6618987967785114178}
   - component: {fileID: 5984184458604740083}
-  - component: {fileID: 4370159050225736156}
   - component: {fileID: 5991244219049863566}
+  - component: {fileID: 7036042581768901039}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Coin
@@ -622,8 +478,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: 9.1, y: 0}
-  m_SizeDelta: {x: 120, y: 42}
+  m_AnchoredPosition: {x: 16.5, y: 4.1}
+  m_SizeDelta: {x: 176, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5984184458604740083
 CanvasRenderer:
@@ -633,36 +489,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 9208053142604902796}
   m_CullTransparentMesh: 1
---- !u!114 &4370159050225736156
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 9208053142604902796}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 0.11764706, g: 0.11372549, b: 0.14901961, 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: 21300000, guid: 83aedc4dd182a4b859ab60b44189cda6, type: 3}
-  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
 --- !u!114 &5991244219049863566
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -703,7 +529,49 @@ MonoBehaviour:
     m_SelectedTrigger: Selected
     m_DisabledTrigger: Disabled
   m_Interactable: 1
-  m_TargetGraphic: {fileID: 4370159050225736156}
+  m_TargetGraphic: {fileID: 7036042581768901039}
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &7036042581768901039
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9208053142604902796}
+  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_ziyuandi
+  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: 8de890b954c861b7d182629dcafc0d3a
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0

Assets/Res/UI/SkillSelectPanel/Btn_UpStar.prefab

@@ -0,0 +1,471 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &2289986991244638643
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1428057306796271496}
+  - component: {fileID: 6522901598737418434}
+  - component: {fileID: 762127593571635398}
+  - component: {fileID: 7406722881946432920}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: UpStarItemRoot
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &1428057306796271496
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2289986991244638643}
+  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: 190212745799934930}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 80, y: -52.5471}
+  m_SizeDelta: {x: 72.3319, y: 32.0112}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6522901598737418434
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2289986991244638643}
+  m_CullTransparentMesh: 1
+--- !u!114 &762127593571635398
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2289986991244638643}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 0
+--- !u!114 &7406722881946432920
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2289986991244638643}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 4
+  m_Spacing: 6
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
+--- !u!1 &6681106713277912565
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4167896752109910920}
+  - component: {fileID: 8366347749769642313}
+  - component: {fileID: 988966570303324014}
+  - component: {fileID: 1114264307383380045}
+  - component: {fileID: 6527365135982362874}
+  - component: {fileID: 8314412305974709541}
+  - component: {fileID: 3316492997268049364}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Btn_UpStar
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4167896752109910920
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6681106713277912565}
+  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: 190212745799934930}
+  m_Father: {fileID: 0}
+  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: -115.7, y: -745.8}
+  m_SizeDelta: {x: 0, y: 80}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8366347749769642313
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6681106713277912565}
+  m_CullTransparentMesh: 1
+--- !u!114 &988966570303324014
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6681106713277912565}
+  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: 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: btn_lingwu
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: ec7ecef974a85f145b7ba1bd986de220, type: 3}
+  packInfo:
+    packName: gongfa
+    packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
+    packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
+    lasetJsonGUID: 6f6d3dad490d22d3028cfa941e8122a5
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!114 &1114264307383380045
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6681106713277912565}
+  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: 988966570303324014}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!114 &6527365135982362874
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6681106713277912565}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 4
+  m_Spacing: 0
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
+--- !u!114 &8314412305974709541
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6681106713277912565}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 0
+--- !u!114 &3316492997268049364
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6681106713277912565}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreLayout: 0
+  m_MinWidth: 253
+  m_MinHeight: -1
+  m_PreferredWidth: -1
+  m_PreferredHeight: -1
+  m_FlexibleWidth: -1
+  m_FlexibleHeight: -1
+  m_LayoutPriority: 1
+--- !u!1 &7651066652616930091
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 190212745799934930}
+  - component: {fileID: 125408759325352028}
+  - component: {fileID: 912377578735023465}
+  - component: {fileID: 478771495642520220}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: UpStarRoot
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &190212745799934930
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7651066652616930091}
+  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: 7321088728748222176}
+  - {fileID: 1428057306796271496}
+  m_Father: {fileID: 4167896752109910920}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 126.5, y: -40}
+  m_SizeDelta: {x: 160, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &125408759325352028
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7651066652616930091}
+  m_CullTransparentMesh: 1
+--- !u!114 &912377578735023465
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7651066652616930091}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 30
+    m_Right: 30
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 4
+  m_Spacing: 0
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
+--- !u!114 &478771495642520220
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7651066652616930091}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 2
+--- !u!1 &8897923578061223545
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7321088728748222176}
+  - component: {fileID: 4723846304678677736}
+  - component: {fileID: 1857144795658525653}
+  - component: {fileID: 2744753013028234318}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text (Legacy) (4)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7321088728748222176
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8897923578061223545}
+  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: 190212745799934930}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 100, y: 36.5415}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4723846304678677736
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8897923578061223545}
+  m_CullTransparentMesh: 1
+--- !u!114 &1857144795658525653
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8897923578061223545}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.9686275, g: 0.9803922, b: 0.93725497, 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_FontData:
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 36
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 41
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u9886\u609F"
+--- !u!114 &2744753013028234318
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8897923578061223545}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 0.20392159, g: 0.37647063, b: 0.32941177, a: 1}
+  m_EffectDistance: {x: 1, y: -1}
+  m_UseGraphicAlpha: 1

Assets/Res/UI/SkillSelectPanel/Btn_UpStar.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: CXpNvCKrVHjlNmDDoiNv3orUxEr7IZeLIRFr5uvuhRFtIb25Ro/5bv9CXk9T
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/UI/SkillSelectPanel/GongFaUpgradeInfoWidget.prefab

@@ -31,16 +31,15 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 8441426342995145705}
   - {fileID: 8441639509481527171}
-  - {fileID: 1997086601353049712}
-  - {fileID: 436368807920140684}
+  - {fileID: 9076459003287357443}
+  - {fileID: 8441426342995145705}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 281.365, y: -36.37025}
-  m_SizeDelta: {x: 562.73, y: 72.7405}
+  m_SizeDelta: {x: 605, y: 84}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &604480498201615927
 CanvasRenderer:
@@ -93,6 +92,16 @@ MonoBehaviour:
     - gameObject: {fileID: 2001195971316176758}
     - gameObject: {fileID: 2252680199180135381}
     - gameObject: {fileID: 6118155954852721740}
+  - key: Icon_Marsk
+    gameObject: {fileID: 3937650637442666922}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 1589540111446213810}
+    - gameObject: {fileID: 6321609247404304824}
+    - gameObject: {fileID: 2001195971316176758}
+    - gameObject: {fileID: 2252680199180135381}
+    - gameObject: {fileID: 6118155954852721740}
   isAssetBundle: 1
 --- !u!1 &655531457772110114
 GameObject:
@@ -130,7 +139,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 22, y: 22}
+  m_SizeDelta: {x: 38, y: 36}
   m_Pivot: {x: 1, y: 0}
 --- !u!222 &3421994071673068509
 CanvasRenderer:
@@ -170,14 +179,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_star_1
+  _icon_name: dec_gfxingji
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: ec7ecef974a85f145b7ba1bd986de220, type: 3}
   packInfo:
-    packName: tongyong
-    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
-    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
-    lasetJsonGUID: 4ebd7d8d5739e3c27ba90d2ae88ba1cc
+    packName: gongfa
+    packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
+    packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
+    lasetJsonGUID: 1fc57c8d04bebfe9417e3e2522efd20c
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -208,17 +217,17 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1129627276819182953}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  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: 2626495479702332815}
+  m_Father: {fileID: 8441639509481527171}
   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: 93.6, y: -4.1}
-  m_SizeDelta: {x: 262.3878, y: 50.1749}
+  m_AnchoredPosition: {x: 128.66287, y: -0.84017795}
+  m_SizeDelta: {x: 332.5135, y: 82.3198}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4804870061492611367
 CanvasRenderer:
@@ -241,7 +250,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_Color: {r: 0.48627454, g: 0.4666667, b: 0.40000004, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -249,9 +258,9 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 30
-    m_FontStyle: 0
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 38
+    m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 10
     m_MaxSize: 40
@@ -298,7 +307,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 22, y: 22}
+  m_SizeDelta: {x: 38, y: 36}
   m_Pivot: {x: 1, y: 0}
 --- !u!222 &8293329037066986781
 CanvasRenderer:
@@ -338,14 +347,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_star_1
+  _icon_name: dec_gfxingji
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: ec7ecef974a85f145b7ba1bd986de220, type: 3}
   packInfo:
-    packName: tongyong
-    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
-    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
-    lasetJsonGUID: 4ebd7d8d5739e3c27ba90d2ae88ba1cc
+    packName: gongfa
+    packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
+    packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
+    lasetJsonGUID: 1fc57c8d04bebfe9417e3e2522efd20c
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -386,7 +395,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 22, y: 22}
+  m_SizeDelta: {x: 38, y: 36}
   m_Pivot: {x: 1, y: 0}
 --- !u!222 &5139621201629885650
 CanvasRenderer:
@@ -426,14 +435,102 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_star_1
+  _icon_name: dec_gfxingji
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: ec7ecef974a85f145b7ba1bd986de220, type: 3}
+  packInfo:
+    packName: gongfa
+    packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
+    packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
+    lasetJsonGUID: 1fc57c8d04bebfe9417e3e2522efd20c
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &3937650637442666922
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 9076459003287357443}
+  - component: {fileID: 5308843141979772203}
+  - component: {fileID: 15893702091055592}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Icon_Marsk
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &9076459003287357443
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3937650637442666922}
+  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: 2626495479702332815}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5308843141979772203
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3937650637442666922}
+  m_CullTransparentMesh: 1
+--- !u!114 &15893702091055592
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3937650637442666922}
+  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, g: 0, b: 0, a: 0.6392157}
+  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_tiaomulandiban
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: ec7ecef974a85f145b7ba1bd986de220, type: 3}
   packInfo:
-    packName: tongyong
-    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
-    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
-    lasetJsonGUID: 4ebd7d8d5739e3c27ba90d2ae88ba1cc
+    packName: gongfa
+    packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
+    packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
+    lasetJsonGUID: 1fc57c8d04bebfe9417e3e2522efd20c
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -474,7 +571,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 22, y: 22}
+  m_SizeDelta: {x: 38, y: 36}
   m_Pivot: {x: 1, y: 0}
 --- !u!222 &268575509521219861
 CanvasRenderer:
@@ -514,14 +611,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_star_1
+  _icon_name: dec_gfxingji
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: ec7ecef974a85f145b7ba1bd986de220, type: 3}
   packInfo:
-    packName: tongyong
-    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
-    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
-    lasetJsonGUID: 4ebd7d8d5739e3c27ba90d2ae88ba1cc
+    packName: gongfa
+    packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
+    packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
+    lasetJsonGUID: 1fc57c8d04bebfe9417e3e2522efd20c
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -561,8 +658,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.6842, y: 0.234}
-  m_SizeDelta: {x: 574.6017, y: 83.7012}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 629, y: 109}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6601645833327092406
 CanvasRenderer:
@@ -585,7 +682,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 0.9176218, b: 0, 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
@@ -602,14 +699,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: 
+  _icon_name: dec_gfxxlanXuanzhong
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: ec7ecef974a85f145b7ba1bd986de220, type: 3}
   packInfo:
-    packName: tongyong
-    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
-    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
-    lasetJsonGUID: 8924b78c393d2a2d8f9dd44d02a397a9
+    packName: gongfa
+    packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
+    packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
+    lasetJsonGUID: 1fc57c8d04bebfe9417e3e2522efd20c
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -644,12 +741,14 @@ 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: 1997086601353049712}
+  - {fileID: 436368807920140684}
   m_Father: {fileID: 2626495479702332815}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -0.000030517578, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1158047690897084148
@@ -673,7 +772,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.9137255, g: 0.89411765, b: 0.96862745, 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
@@ -681,7 +780,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_Sprite: {fileID: 0}
-  m_Type: 0
+  m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 4
@@ -690,14 +789,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: 
+  _icon_name: dec_tiaomulandiban
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 0}
+  CurrSpriteAtlas: {fileID: 100100200, guid: ec7ecef974a85f145b7ba1bd986de220, type: 3}
   packInfo:
-    packName: 
-    packgJsonPath: 
-    packgSpritePath: 
-    lasetJsonGUID: 
+    packName: gongfa
+    packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
+    packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
+    lasetJsonGUID: 1fc57c8d04bebfe9417e3e2522efd20c
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -729,7 +828,7 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5475763993520793499}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  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
@@ -739,11 +838,11 @@ RectTransform:
   - {fileID: 2075704369294728403}
   - {fileID: 1398198344503143719}
   - {fileID: 391061909760223855}
-  m_Father: {fileID: 2626495479702332815}
+  m_Father: {fileID: 8441639509481527171}
   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: 40.6, y: -7.2}
+  m_AnchoredPosition: {x: 42.13504, y: 6}
   m_SizeDelta: {x: 0, y: 30.6108}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &4119734836969264571
@@ -830,7 +929,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 22, y: 22}
+  m_SizeDelta: {x: 38, y: 36}
   m_Pivot: {x: 1, y: 0}
 --- !u!222 &7699704085918563341
 CanvasRenderer:
@@ -870,14 +969,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_star_1
+  _icon_name: dec_gfxingji
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: ec7ecef974a85f145b7ba1bd986de220, type: 3}
   packInfo:
-    packName: tongyong
-    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
-    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
-    lasetJsonGUID: 4ebd7d8d5739e3c27ba90d2ae88ba1cc
+    packName: gongfa
+    packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
+    packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
+    lasetJsonGUID: 1fc57c8d04bebfe9417e3e2522efd20c
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}

Assets/Res/UI/SkillSelectPanel/SkillSelectPanel.prefab

@@ -2060,7 +2060,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 5473342035507285947}
-  - {fileID: 4962336735051820175}
   - {fileID: 6870355629153732168}
   - {fileID: 6565763541845300463}
   - {fileID: 4487645842108660236}
@@ -3859,7 +3858,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_Sprite: {fileID: 0}
-  m_Type: 0
+  m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 4
@@ -3868,15 +3867,15 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: 
-  isNotLoadDeftIcon: 1
-  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  _icon_name: dec_diban
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: ec7ecef974a85f145b7ba1bd986de220, type: 3}
   packInfo:
-    packName: tongyong
-    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
-    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
-    lasetJsonGUID: 8de890b954c861b7d182629dcafc0d3a
-  useGradient: 1
+    packName: gongfa
+    packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
+    packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
+    lasetJsonGUID: d888d6e73899265a3799225e04fd014b
+  useGradient: 0
   topOrLeftColor: {r: 0.098039225, g: 0.16862746, b: 0.18431373, a: 1}
   bottomOrRightColor: {r: 0.5568628, g: 0.76470596, b: 0.74509805, a: 1}
   direction: 0
@@ -4182,82 +4181,6 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u5168\u90E8"
---- !u!1 &5952158511686725727
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 4962336735051820175}
-  - component: {fileID: 918148156888368738}
-  - component: {fileID: 8962730917411756447}
-  m_Layer: 5
-  m_HasEditorInfo: 1
-  m_Name: Image (1)
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 0
---- !u!224 &4962336735051820175
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5952158511686725727}
-  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: 6694772361877173011}
-  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: 750, y: 1624}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &918148156888368738
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5952158511686725727}
-  m_CullTransparentMesh: 1
---- !u!114 &8962730917411756447
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5952158511686725727}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 7718e083904347a4092070d8a2f9a58d, type: 3}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &6601605642981940278
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/SkillSelectPanel/SkillWidget.prefab

@@ -114,7 +114,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: -4.6391296, y: -74.3}
+  m_AnchoredPosition: {x: -4.6391296, y: -99.1}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4846741517815700259
@@ -281,7 +281,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.8745099, g: 0.8745099, b: 0.8745099, 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

Assets/Res/UIAtlas/gongfa.spriteatlasv2

@@ -13,6 +13,7 @@ SpriteAtlasAsset:
     packables:
     - {fileID: 2800000, guid: 9a900330dc689094f8567dfbac18f61a, type: 3}
     - {fileID: 2800000, guid: 8ea63d948b4761f4d959380d2c15b004, type: 3}
+    - {fileID: 2800000, guid: fb00faac5d5651a448d9318437472d9b, type: 3}
     - {fileID: 2800000, guid: fe4b311cfd2d91341951749b21feaa39, type: 3}
     - {fileID: 2800000, guid: 2d108f29fea8b454fb4bfb050da2bec4, type: 3}
     - {fileID: 2800000, guid: 2b1ab59fc604d6b4a9a6f21f22607f3f, type: 3}
@@ -21,12 +22,16 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: 824f0bdb20b2fbc47af943cd71787cde, type: 3}
     - {fileID: 2800000, guid: bc486180f131d6948a0f29c63a44d634, type: 3}
     - {fileID: 2800000, guid: a43596f72a2a40c418fe1d99db773cb8, type: 3}
-    - {fileID: 2800000, guid: bcf86c0fa14658349b63db5b935e2dfb, type: 3}
     - {fileID: 2800000, guid: cbb0fb435ec21494bacd2f72c35c30b1, type: 3}
+    - {fileID: 2800000, guid: 98683f3d3a2adab4eb7041d000f8dc66, type: 3}
     - {fileID: 2800000, guid: eca526fb63a44b34e842b64ef53d3f42, type: 3}
+    - {fileID: 2800000, guid: 52f98dc1c08412c47b031b11d5f3c92b, type: 3}
     - {fileID: 2800000, guid: 5a02bbdeed7d4c24a869162ba8a43756, type: 3}
+    - {fileID: 2800000, guid: ba86d5d3161dba94aaeff92ff7e57d15, type: 3}
     - {fileID: 2800000, guid: 1c9cbf3bcd6bf2747b4302e616928bea, type: 3}
     - {fileID: 2800000, guid: 6607462b8d1a684468a38176cc3b5d19, type: 3}
+    - {fileID: 2800000, guid: 9bfe4fd79eb566f4ea8a19c63dd1f5ec, type: 3}
     - {fileID: 2800000, guid: 26b9c815f60b040449bd1193a2239b56, type: 3}
+    - {fileID: 2800000, guid: 6915812c09980c247b3299784faddfae, type: 3}
   m_IsVariant: 0
   m_IsPlaceholder: 0

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

@@ -39,7 +39,6 @@ namespace Fort23.Mono
 
         public void InitSkillWidget(SkillInfo skillId)
         {
-           
             skillConfigId = skillId;
             SkillConfig skillConfig = skillId.skillConfig;
             icon.icon_name = skillConfig.icon;
@@ -47,39 +46,52 @@ namespace Fort23.Mono
             Text_Level.text = skillConfigId.SkillPowerupConfig.ID.ToString() + "级";
             Text_SkillName.text = LanguageManager.Instance.Text(skillConfig.name);
 
-            for (var i = 0; i < StarRoot.Count; i++)
-            {
-                MyImage myImage = StarRoot[i] as MyImage;
-                myImage.gameObject.SetActive(false);
-            }
-
-            int yinstar = skillConfigId.skillConfig.level - 5;
             for (var i = 0; i < StarRoot.Count; i++)
             {
                 MyImage icon = StarRoot[i] as MyImage;
-                if (skillConfigId.skillConfig.level > 5)
+                if (i < skillConfigId.skillConfig.level - 1)
                 {
-                    if (i < yinstar)
-                    {
-                        icon.icon_name = "dec_star_2";
-                        icon.gameObject.SetActive(true);
-                    }
-                    else
-                    {
-                        icon.icon_name = "dec_gfxingji";
-                        icon.gameObject.SetActive(true);
-                    }
+                    icon.gameObject.SetActive(true);
                 }
                 else
                 {
-                    if (i < skillConfigId.skillConfig.level)
-                    {
-                        icon.icon_name = "dec_gfxingji";
-                        icon.gameObject.SetActive(true);
-                    }
+                    icon.gameObject.SetActive(false);
                 }
             }
 
+            // for (var i = 0; i < StarRoot.Count; i++)
+            // {
+            //     MyImage myImage = StarRoot[i] as MyImage;
+            //     myImage.gameObject.SetActive(false);
+            // }
+            //
+            // int yinstar = skillConfigId.skillConfig.level - 5;
+            // for (var i = 0; i < StarRoot.Count; i++)
+            // {
+            //     MyImage icon = StarRoot[i] as MyImage;
+            //     if (skillConfigId.skillConfig.level > 5)
+            //     {
+            //         if (i < yinstar)
+            //         {
+            //             icon.icon_name = "dec_star_2";
+            //             icon.gameObject.SetActive(true);
+            //         }
+            //         else
+            //         {
+            //             icon.icon_name = "dec_gfxingji";
+            //             icon.gameObject.SetActive(true);
+            //         }
+            //     }
+            //     else
+            //     {
+            //         if (i < skillConfigId.skillConfig.level)
+            //         {
+            //             icon.icon_name = "dec_gfxingji";
+            //             icon.gameObject.SetActive(true);
+            //         }
+            //     }
+            // }
+
             switch (skillConfig.SkillType)
             {
                 case 1:
@@ -93,5 +105,11 @@ namespace Fort23.Mono
                     break;
             }
         }
+
+        public override void DormancyObj()
+        {
+            Icon_Marsk.gameObject.SetActive(false);
+            base.DormancyObj();
+        }
     }
 }

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

@@ -32,11 +32,11 @@ namespace Fort23.Mono
 
             if (_skillInfo.skillConfig.level <= currentSkillInfo.skillConfig.level)
             {
-                own.transform.RecoverColor();
+                Icon_Marsk.gameObject.SetActive(false);
             }
             else
             {
-                own.transform.Gray();
+                Icon_Marsk.gameObject.SetActive(true);
             }
 
             if (_skillInfo.skillConfig.level == currentSkillInfo.skillConfig.level + 1)
@@ -49,39 +49,54 @@ namespace Fort23.Mono
             }
 
             Text_Desc.text = UtilTools.GetString(LanguageManager.Instance.Text(skillInfo.skillConfig.PromoteLan), skillInfo.skillConfig.PromoteLanPara);
-            for (var i = 0; i < StarRoot.Count; i++)
-            {
-                MyImage myImage = StarRoot[i] as MyImage;
-                myImage.gameObject.SetActive(false);
-            }
-
-            int yinstar = skillInfo.skillConfig.level - 5;
+            // for (var i = 0; i < StarRoot.Count; i++)
+            // {
+            //     MyImage myImage = StarRoot[i] as MyImage;
+            //     myImage.gameObject.SetActive(false);
+            // }
+            
             for (var i = 0; i < StarRoot.Count; i++)
             {
                 MyImage icon = StarRoot[i] as MyImage;
-                if (skillInfo.skillConfig.level > 5)
+                if ( i < skillInfo.skillConfig.level-1)
                 {
-                  
-                    if (i < yinstar)
-                    {
-                        icon.icon_name = "dec_star_2";
-                        icon.gameObject.SetActive(true);
-                    }
-                    else
-                    {
-                        icon.icon_name = "dec_star_1";
-                        icon.gameObject.SetActive(true);
-                    }
+                    icon.gameObject.SetActive(true);
+                
                 }
                 else
                 {
-                    if (i < skillInfo.skillConfig.level)
-                    {
-                        icon.icon_name = "dec_star_1";
-                        icon.gameObject.SetActive(true);
-                    }
+                    icon.gameObject.SetActive(false);
                 }
             }
+            
+
+            // int yinstar = skillInfo.skillConfig.level - 5;
+            // for (var i = 0; i < StarRoot.Count; i++)
+            // {
+            //     MyImage icon = StarRoot[i] as MyImage;
+            //     if (skillInfo.skillConfig.level > 5)
+            //     {
+            //       
+            //         if (i < yinstar)
+            //         {
+            //             icon.icon_name = "dec_star_2";
+            //             icon.gameObject.SetActive(true);
+            //         }
+            //         else
+            //         {
+            //             icon.icon_name = "dec_gfxingji";
+            //             icon.gameObject.SetActive(true);
+            //         }
+            //     }
+            //     else
+            //     {
+            //         if (i < skillInfo.skillConfig.level)
+            //         {
+            //             icon.icon_name = "dec_gfxingji";
+            //             icon.gameObject.SetActive(true);
+            //         }
+            //     }
+            // }
         }
 
         public override void DormancyObj()

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

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

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

@@ -5,6 +5,7 @@ using Excel2Json;
 using Fort23.Core;
 using Fort23.UTool;
 using GameLogic.Hero;
+using GameLogic.Player;
 using UnityEngine;
 using UnityEngine.UI;
 using Utility;
@@ -21,7 +22,13 @@ namespace Fort23.Mono
         private List<SkillPowerupConfig> _skillPowerupConfigs;
         private SkillConstant skillConstant;
 
-        bool isUpgrade = false;
+        List<ItemWidgetType1> _itemWidgetType1 = new List<ItemWidgetType1>();
+
+        List<EnergyWidget> _energyWidgets = new List<EnergyWidget>();
+
+        bool isUpStar = false;
+
+        bool isUpGrad = false;
 
         private void Init()
         {
@@ -41,12 +48,11 @@ namespace Fort23.Mono
         {
             Btn_Back.onClick.AddListener(() =>
             {
-                if (isUpgrade)
+                if (isUpStar || isUpGrad)
                 {
-                    isUpgrade = false;
-                    Btn_UpStar.GetComponent<RectTransform>().sizeDelta = new Vector2(185.0133f, 76.141f);
-                    Btn_UpStar.GetComponent<RectTransform>().anchoredPosition = new Vector2(-137.8784f, -704.8f);
-                    Btn_UpGrade.gameObject.SetActive(true);
+                    isUpStar = false;
+                    isUpGrad = false;
+                    UpdateStarBtn();
                     return;
                 }
 
@@ -61,6 +67,13 @@ namespace Fort23.Mono
                     return;
                 }
 
+                if (!isUpGrad)
+                {
+                    isUpGrad = true;
+                    UpdateStarBtn();
+                    return;
+                }
+
                 if (_skillInfo.SkillData.level >= _skillPowerupConfigs.Count)
                 {
                     TipMessagePanel.OpenTipMessagePanel("已经满级！");
@@ -74,10 +87,22 @@ namespace Fort23.Mono
                     return;
                 }
 
-                if (!PlayerManager.Instance.BagController.DeductItem(_skillInfo.SkillPowerupConfig.LevelupItem[0], _skillInfo.SkillPowerupConfig.LevelupItemNum[0]))
+                for (var i = 0; i < _skillInfo.SkillPowerupConfig.LevelupItem.Length; i++)
                 {
-                    TipMessagePanel.OpenTipMessagePanel("道具不足！");
-                    return;
+                    if (!PlayerManager.Instance.BagController.IsEnough(_skillInfo.SkillPowerupConfig.LevelupItem[i], _skillInfo.SkillPowerupConfig.LevelupItemNum[i]))
+                    {
+                        TipMessagePanel.OpenTipMessagePanel("道具不足！");
+                        return;
+                    }
+                }
+
+                for (var i = 0; i < _skillInfo.SkillPowerupConfig.LevelupItem.Length; i++)
+                {
+                    if (!PlayerManager.Instance.BagController.DeductItem(_skillInfo.SkillPowerupConfig.LevelupItem[i], _skillInfo.SkillPowerupConfig.LevelupItemNum[i]))
+                    {
+                        TipMessagePanel.OpenTipMessagePanel("道具不足！");
+                        return;
+                    }
                 }
 
                 _skillInfo.SkillData.level++;
@@ -88,12 +113,10 @@ namespace Fort23.Mono
 
             Btn_UpStar.onClick.AddListener(() =>
             {
-                if (!isUpgrade)
+                if (!isUpStar)
                 {
-                    isUpgrade = true;
-                    Btn_UpStar.GetComponent<RectTransform>().sizeDelta = new Vector2(569.34f, 76.141f);
-                    Btn_UpStar.GetComponent<RectTransform>().anchoredPosition = new Vector2(54.285f, -704.8f);
-                    Btn_UpGrade.gameObject.SetActive(false);
+                    isUpStar = true;
+                    UpdateStarBtn();
                     return;
                 }
 
@@ -142,51 +165,8 @@ namespace Fort23.Mono
 
             skillConstant = ConfigComponent.Instance.Get<SkillConstant>(1);
 
-            if (PlayerManager.Instance.myHero.level.Value < _skillInfo.SkillPowerupConfig.PlayerLevelLimit)
-            {
-                Btn_UpGrade.gameObject.transform.Gray(true);
-                HeroPowerUpConfig heroPowerUpConfig = ConfigComponent.Instance.Get<HeroPowerUpConfig>(_skillInfo.SkillPowerupConfig.PlayerLevelLimit);
-                UpGradeRoot.SetActive(false);
-                Text_UpGrade.gameObject.SetActive(true);
-                Text_UpGrade.text = $"需境界达到{LanguageManager.Instance.Text(heroPowerUpConfig.jingjie1) + LanguageManager.Instance.Text(heroPowerUpConfig.jingjie2) + LanguageManager.Instance.Text(heroPowerUpConfig.jingjie3)}";
-            }
-            else
-            {
-                Btn_UpGrade.gameObject.transform.RecoverColor();
-                if (skillConfig.level < 10)
-                {
-                    UpGradeRoot.SetActive(true);
-                    Text_UpGrade.gameObject.SetActive(false);
-                    ItemConfig upStarItemConfig = ConfigComponent.Instance.Get<ItemConfig>(skillConfig.PieceID);
-                    Icon_UpstarIcon.icon_name = upStarItemConfig.icon;
-                    int count = skillConstant.SkillPromoteNeedPieceNum[skillConfig.level];
-                    Text_UpStarCount.text = $"{count}/{PlayerManager.Instance.BagController.GetItemCount(skillConfig.PieceID)}";
-                }
-                else
-                {
-                    UpGradeRoot.SetActive(false);
-                    Text_UpGrade.gameObject.SetActive(true);
-                    Text_UpGrade.text = $"已满级";
-                }
-            }
-
-
-            if (_skillInfo.SkillData.level < _skillPowerupConfigs.Count)
-            {
-                UpStarRoot.SetActive(true);
-                Text_UpStar.gameObject.SetActive(false);
-                ItemConfig upGradeItemConfig = ConfigComponent.Instance.Get<ItemConfig>(_skillInfo.SkillPowerupConfig.LevelupItem[0]);
-
-                Icon_UpstarIcon.icon_name = upGradeItemConfig.icon;
-
-                Text_UpGradeItemCount.text = $"{_skillInfo.SkillPowerupConfig.LevelupItemNum[0]}/{PlayerManager.Instance.BagController.GetItemCount(upGradeItemConfig.ID)}";
-            }
-            else
-            {
-                UpStarRoot.SetActive(false);
-                Text_UpStar.gameObject.SetActive(true);
-                Text_UpStar.text = $"已满星";
-            }
+            
+            UpdateStarBtn();
 
 
             Text_GongFaDesc.text = UtilTools.GetString(LanguageManager.Instance.Text(skillConfig.dec), _skillInfo.effectValue);
@@ -195,66 +175,77 @@ namespace Fort23.Mono
             switch (skillConfig.attribute)
             {
                 case 1:
-                    Icon_Attribute.GetComponent<CustomStateController>().ChangeState(0);
-                    Text_Attribute.text = "金";
+                    Icon_Attribute.icon_name = "dec_jin";
                     break;
                 case 2:
-                    Icon_Attribute.GetComponent<CustomStateController>().ChangeState(1);
-                    Text_Attribute.text = "木";
+                    Icon_Attribute.icon_name = "dec_mu";
                     break;
                 case 4:
-                    Icon_Attribute.GetComponent<CustomStateController>().ChangeState(2);
-                    Text_Attribute.text = "水";
+                    Icon_Attribute.icon_name = "dec_shui";
                     break;
                 case 8:
-                    Icon_Attribute.GetComponent<CustomStateController>().ChangeState(3);
-                    Text_Attribute.text = "火";
+                    Icon_Attribute.icon_name = "dec_huo";
                     break;
                 case 16:
-                    Icon_Attribute.GetComponent<CustomStateController>().ChangeState(4);
-                    Text_Attribute.text = "土";
+                    Icon_Attribute.icon_name = "dec_tu";
                     break;
             }
-
-            for (var i = 0; i < StarRoot.Count; i++)
-            {
-                MyImage myImage = StarRoot[i] as MyImage;
-                myImage.gameObject.SetActive(false);
-            }
-
-            int yinstar = skillInfo.skillConfig.level - 5;
+            
             for (var i = 0; i < StarRoot.Count; i++)
             {
                 MyImage icon = StarRoot[i] as MyImage;
-                if (skillInfo.skillConfig.level > 5)
+                if ( i < skillInfo.skillConfig.level-1)
                 {
-                    if (i < yinstar)
-                    {
-                        icon.icon_name = "dec_star_2";
-                        icon.gameObject.SetActive(true);
-                    }
-                    else
-                    {
-                        icon.icon_name = "dec_star_1";
-                        icon.gameObject.SetActive(true);
-                    }
+                    icon.gameObject.SetActive(true);
+                
                 }
                 else
                 {
-                    if (i < skillInfo.skillConfig.level)
-                    {
-                        icon.icon_name = "dec_star_1";
-                        icon.gameObject.SetActive(true);
-                    }
+                    icon.gameObject.SetActive(false);
                 }
             }
 
+            // for (var i = 0; i < StarRoot.Count; i++)
+            // {
+            //     MyImage myImage = StarRoot[i] as MyImage;
+            //     myImage.gameObject.SetActive(false);
+            // }
+            //
+            // int yinstar = skillInfo.skillConfig.level - 5;
+            // for (var i = 0; i < StarRoot.Count; i++)
+            // {
+            //     MyImage icon = StarRoot[i] as MyImage;
+            //     if (skillInfo.skillConfig.level > 5)
+            //     {
+            //         if (i < yinstar)
+            //         {
+            //             icon.icon_name = "dec_star_2";
+            //             icon.gameObject.SetActive(true);
+            //         }
+            //         else
+            //         {
+            //             icon.icon_name = "dec_gfxingji";
+            //             icon.gameObject.SetActive(true);
+            //         }
+            //     }
+            //     else
+            //     {
+            //         if (i < skillInfo.skillConfig.level)
+            //         {
+            //             icon.icon_name = "dec_gfxingji";
+            //             icon.gameObject.SetActive(true);
+            //         }
+            //     }
+            // }
+
 
             List<SkillConfig> allSkillConfigs = ConfigComponent.Instance.GetAll<SkillConfig>().ToList();
             configs = allSkillConfigs.Where(s => s.IDGroup == skillConfig.IDGroup).ToList();
 
             for (var i = 0; i < configs.Count; i++)
             {
+                if(configs[i].level == 1)
+                    continue;
                 SkillInfo skillInfo1 = new SkillInfo(configs[i].ID, _skillInfo.SkillPowerupConfig.ID);
                 GongFaUpgradeInfoWidget gongFaUpgradeInfoWidget = await UIManager.Instance.CreateGComponent<GongFaUpgradeInfoWidget>(null, Content);
                 gongFaUpgradeInfoWidget.CustomInit(_skillInfo, skillInfo1);
@@ -262,6 +253,95 @@ namespace Fort23.Mono
             }
         }
 
+        private async CTask UpdateStarBtn()
+        {
+            foreach (var itemWidgetType1 in _itemWidgetType1)
+            {
+                UIManager.Instance.DormancyGComponent(itemWidgetType1);
+            }
+
+            _itemWidgetType1.Clear();
+
+            foreach (var energyWidget in _energyWidgets)
+            {
+                UIManager.Instance.DormancyGComponent(energyWidget);
+            }
+
+            _energyWidgets.Clear();
+
+
+            if (isUpGrad)
+            {
+                if (_skillInfo.SkillData.level < _skillPowerupConfigs.Count)
+                {
+                    Btn_UpStar.gameObject.SetActive(false);
+                    UpGradeItemRoot.SetActive(true);
+                    for (var i = 0; i < _skillInfo.SkillPowerupConfig.LevelupItem.Length; i++)
+                    {
+                        ItemWidgetType1 itemWidgetType1 = await UIManager.Instance.CreateGComponentForObject<ItemWidgetType1>(ItemWidgetType1Gam, null, UpGradeItemRoot.GetComponent<RectTransform>(), isInstance: true);
+                        itemWidgetType1.CustomInit(_skillInfo.SkillPowerupConfig.LevelupItem[i], _skillInfo.SkillPowerupConfig.LevelupItemNum[i]);
+                        _itemWidgetType1.Add(itemWidgetType1);
+
+                        EnergyWidget energyWidget =
+                            await UIManager.Instance.CreateGComponent<EnergyWidget>(null, EnergyRoot);
+                        energyWidget.CustomInit(_skillInfo.SkillPowerupConfig.LevelupItem[i]);
+                        _energyWidgets.Add(energyWidget);
+                    }
+                }
+                else
+                {
+                    Btn_UpStar.gameObject.SetActive(true);
+                    UpGradeItemRoot.SetActive(false);
+                }
+            }
+
+
+            // if (PlayerManager.Instance.myHero.level.Value < _skillInfo.SkillPowerupConfig.PlayerLevelLimit)
+            // {
+            //     Btn_UpStar.gameObject.transform.Gray(true);
+            // }
+            // else
+            // {
+            //     Btn_UpStar.gameObject.transform.RecoverColor();
+
+            if (isUpStar)
+            {
+                if (_skillInfo.skillConfig.level < 6)
+                {
+                    Btn_UpGrade.gameObject.SetActive(false);
+                    UpStarItemRoot.SetActive(true);
+                    int count = skillConstant.SkillPromoteNeedPieceNum[_skillInfo.skillConfig.level];
+                    ItemWidgetType1 itemWidgetType1 = await UIManager.Instance.CreateGComponentForObject<ItemWidgetType1>(ItemWidgetType1Gam, null, UpStarItemRoot.GetComponent<RectTransform>(), isInstance: true);
+                    itemWidgetType1.CustomInit(_skillInfo.skillConfig.PieceID, count);
+                    _itemWidgetType1.Add(itemWidgetType1);
+
+                    EnergyWidget energyWidget =
+                        await UIManager.Instance.CreateGComponent<EnergyWidget>(null, EnergyRoot);
+                    energyWidget.CustomInit(_skillInfo.skillConfig.PieceID);
+                    _energyWidgets.Add(energyWidget);
+                }
+                else
+                {
+                    Btn_UpGrade.gameObject.SetActive(true);
+                    UpStarItemRoot.SetActive(false);
+                }
+            }
+            else
+            {
+                Btn_UpGrade.gameObject.SetActive(true);
+                UpStarItemRoot.SetActive(false);
+            }
+            // }
+
+            if (!isUpGrad && !isUpStar)
+            {
+                Btn_UpGrade.gameObject.SetActive(true);
+                Btn_UpStar.gameObject.SetActive(true);
+                UpStarItemRoot.SetActive(false);
+                UpGradeItemRoot.SetActive(false);
+            }
+        }
+
         public async static CTask<GongFaUpgradePanel> Open(SkillInfo skillInfo)
         {
             GongFaUpgradePanel gongFaUpgradePanel = await UIManager.Instance.LoadAndOpenPanel<GongFaUpgradePanel>(null);
@@ -276,8 +356,14 @@ namespace Fort23.Mono
                 UIManager.Instance.DormancyGComponent(gongFaUpgradeInfoWidget);
             }
 
+            foreach (var itemWidgetType1 in _itemWidgetType1)
+            {
+                UIManager.Instance.DormancyGComponent(itemWidgetType1);
+            }
+
+            _itemWidgetType1.Clear();
             _gongFaUpgradeInfoWidgets.Clear();
-            isUpgrade = false;
+            isUpStar = false;
             base.Close();
         }
     }

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

@@ -129,92 +129,81 @@ namespace Fort23.Mono
 	      return _Btn_UpGrade;
 	     }
 	   }
-	  private MyImage _Icon_UpstarIcon;
-	  public MyImage Icon_UpstarIcon
-	   {
-	   get{
-	      if (_Icon_UpstarIcon == null)
-	       {
-	         _Icon_UpstarIcon  = GetUIUnit<MyImage>("Icon_UpstarIcon"); 
-	       }
-	      return _Icon_UpstarIcon;
-	     }
-	   }
-	  private Text _Text_UpGradeItemCount;
-	  public Text Text_UpGradeItemCount
+	  private GameObject _UpStarRoot;
+	  public GameObject UpStarRoot
 	   {
 	   get{
-	      if (_Text_UpGradeItemCount == null)
+	      if (_UpStarRoot == null)
 	       {
-	         _Text_UpGradeItemCount  = GetUIUnit<Text>("Text_UpGradeItemCount"); 
+	         _UpStarRoot  = GetUIUnit<GameObject>("UpStarRoot"); 
 	       }
-	      return _Text_UpGradeItemCount;
+	      return _UpStarRoot;
 	     }
 	   }
-	  private Text _Text_UpStarCount;
-	  public Text Text_UpStarCount
+	  private Text _Text_SkillCd;
+	  public Text Text_SkillCd
 	   {
 	   get{
-	      if (_Text_UpStarCount == null)
+	      if (_Text_SkillCd == null)
 	       {
-	         _Text_UpStarCount  = GetUIUnit<Text>("Text_UpStarCount"); 
+	         _Text_SkillCd  = GetUIUnit<Text>("Text_SkillCd"); 
 	       }
-	      return _Text_UpStarCount;
+	      return _Text_SkillCd;
 	     }
 	   }
-	  private Text _Text_UpStar;
-	  public Text Text_UpStar
+	  private GameObject _ItemWidgetType1Gam;
+	  public GameObject ItemWidgetType1Gam
 	   {
 	   get{
-	      if (_Text_UpStar == null)
+	      if (_ItemWidgetType1Gam == null)
 	       {
-	         _Text_UpStar  = GetUIUnit<Text>("Text_UpStar"); 
+	         _ItemWidgetType1Gam  = GetUIUnit<GameObject>("ItemWidgetType1Gam"); 
 	       }
-	      return _Text_UpStar;
+	      return _ItemWidgetType1Gam;
 	     }
 	   }
-	  private Text _Text_UpGrade;
-	  public Text Text_UpGrade
+	  private GameObject _UpStarItemRoot;
+	  public GameObject UpStarItemRoot
 	   {
 	   get{
-	      if (_Text_UpGrade == null)
+	      if (_UpStarItemRoot == null)
 	       {
-	         _Text_UpGrade  = GetUIUnit<Text>("Text_UpGrade"); 
+	         _UpStarItemRoot  = GetUIUnit<GameObject>("UpStarItemRoot"); 
 	       }
-	      return _Text_UpGrade;
+	      return _UpStarItemRoot;
 	     }
 	   }
-	  private GameObject _UpGradeRoot;
-	  public GameObject UpGradeRoot
+	  private GameObject _UpGradeItemRoot;
+	  public GameObject UpGradeItemRoot
 	   {
 	   get{
-	      if (_UpGradeRoot == null)
+	      if (_UpGradeItemRoot == null)
 	       {
-	         _UpGradeRoot  = GetUIUnit<GameObject>("UpGradeRoot"); 
+	         _UpGradeItemRoot  = GetUIUnit<GameObject>("UpGradeItemRoot"); 
 	       }
-	      return _UpGradeRoot;
+	      return _UpGradeItemRoot;
 	     }
 	   }
-	  private GameObject _UpStarRoot;
-	  public GameObject UpStarRoot
+	  private MyImage _Icon_Attribute;
+	  public MyImage Icon_Attribute
 	   {
 	   get{
-	      if (_UpStarRoot == null)
+	      if (_Icon_Attribute == null)
 	       {
-	         _UpStarRoot  = GetUIUnit<GameObject>("UpStarRoot"); 
+	         _Icon_Attribute  = GetUIUnit<MyImage>("Icon_Attribute"); 
 	       }
-	      return _UpStarRoot;
+	      return _Icon_Attribute;
 	     }
 	   }
-	  private Text _Text_SkillCd;
-	  public Text Text_SkillCd
+	  private RectTransform _EnergyRoot;
+	  public RectTransform EnergyRoot
 	   {
 	   get{
-	      if (_Text_SkillCd == null)
+	      if (_EnergyRoot == null)
 	       {
-	         _Text_SkillCd  = GetUIUnit<Text>("Text_SkillCd"); 
+	         _EnergyRoot  = GetUIUnit<RectTransform>("EnergyRoot"); 
 	       }
-	      return _Text_SkillCd;
+	      return _EnergyRoot;
 	     }
 	   }
 	  #endregion 自定义数据结束 

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

@@ -2,7 +2,6 @@ using Fort23.Core;
 using Fort23.UTool;
 using UnityEngine.UI;
 using UnityEngine;
-using TMPro;
 using System.Collections.Generic;
 namespace Fort23.Mono
 {
@@ -20,13 +19,13 @@ namespace Fort23.Mono
 	      return _Icon_Energy;
 	     }
 	   }
-	  private TextMeshProUGUI _Text_Count;
-	  public TextMeshProUGUI Text_Count
+	  private Text _Text_Count;
+	  public Text Text_Count
 	   {
 	   get{
 	      if (_Text_Count == null)
 	       {
-	         _Text_Count  = GetUIUnit<TextMeshProUGUI>("Text_Count"); 
+	         _Text_Count  = GetUIUnit<Text>("Text_Count"); 
 	       }
 	      return _Text_Count;
 	     }