Merge branch 'master' of http://192.168.123.2:3000/fort23/XY001

# Conflicts:
#	Assets/Res/UIAtlas/all.spriteatlasv2   resolved by origin/master(远端) version
#	UserSettings/Layouts/default-2022.dwlt   resolved by master version

Assets/Art/UIAssets/TextrueJson/heroIcon.txt

@@ -0,0 +1 @@
+{"packName":"heroIcon","isTyPack":false,"newTextureJson":[{"textrueName":"icon_tx116","filePath":"/icon/icon_tx116.png"},{"textrueName":"icon_tx105","filePath":"/icon/icon_tx105.png"},{"textrueName":"icon_tx107","filePath":"/icon/icon_tx107.png"},{"textrueName":"icon_tx113","filePath":"/icon/icon_tx113.png"}],"keyToValue":{}}

Assets/Art/UIAssets/TextrueJson/heroIcon.txt.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: CykctHykWijTND3oe43UTd12RJln4bOoRL1lenb5c0ehoiG59ytGBXU=
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/UIAssets/icon/icon_Hero1.png.meta

@@ -0,0 +1,133 @@
+fileFormatVersion: 2
+guid: CS8b43uqAHnJPyJDLvnqqhrDmd4zHzypFffc8wwURZP4LDIAXEWmmN8=
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  webStreaming: 0
+  priorityLevel: 0
+  uploadedMode: 2
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/UIAssets/icon/icon_Hero2.png.meta

@@ -0,0 +1,133 @@
+fileFormatVersion: 2
+guid: DCtJ5H7+Big1WfH9RDAvYtwTPg1sxUUv4tyuwHrsIW8L+YIY1/CZO4g=
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  webStreaming: 0
+  priorityLevel: 0
+  uploadedMode: 2
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/UIAssets/icon/icon_Hero3.png.meta

@@ -0,0 +1,133 @@
+fileFormatVersion: 2
+guid: WXsYvCmrVC0jVCT6dKpaqd4kgvkm/W4enj/ZQSLdGGIPDT+ATy6oGaU=
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  webStreaming: 0
+  priorityLevel: 0
+  uploadedMode: 2
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/UIAssets/icon/icon_Hero4.png.meta

@@ -0,0 +1,133 @@
+fileFormatVersion: 2
+guid: DSsd5yuvWyr7XRxDUQe+1Hn3O13juOBDeNiF2aWmLQ85Ccz21cme4jM=
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  webStreaming: 0
+  priorityLevel: 0
+  uploadedMode: 2
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/UIAssets/icon/icon_res_monster.png.meta

@@ -0,0 +1,133 @@
+fileFormatVersion: 2
+guid: Wn0ftH/7VXu3TGXzucUDy/XM41ZsD5ohyhwofPGwV/IXCZXu1Hr5Jao=
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  webStreaming: 0
+  priorityLevel: 0
+  uploadedMode: 2
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/UIAssets/icon/icon_res_upgrade_1.png.meta

@@ -0,0 +1,133 @@
+fileFormatVersion: 2
+guid: Wywe5n6kUHpXbqRIiwCHXVB2IBSDKWo9OkfBYYnjoUXf9kuKET+SQ+E=
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  webStreaming: 0
+  priorityLevel: 0
+  uploadedMode: 2
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/UIAssets/icon/icon_res_upgrade_2.png.meta

@@ -0,0 +1,133 @@
+fileFormatVersion: 2
+guid: WSgWtiuqUnqGO09p0yldWdAfH55KPFSPT9dGHgXHyBNMxHuxNdizoa4=
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  webStreaming: 0
+  priorityLevel: 0
+  uploadedMode: 2
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/UIAssets/icon/icon_tx105.png.meta

@@ -0,0 +1,133 @@
+fileFormatVersion: 2
+guid: WSwY4y+oUCrUX0yCkb/MXnW68JhFtFm1UvcvybV6d4wlzS1irQ+4gCc=
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  webStreaming: 0
+  priorityLevel: 0
+  uploadedMode: 2
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/UIAssets/icon/icon_tx107.png.meta

@@ -0,0 +1,133 @@
+fileFormatVersion: 2
+guid: C3pN5iyoUSp65QBF33VXv3eZ/8n3SiE6a87qzH+k8uJDDCAvJ3oz6ns=
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  webStreaming: 0
+  priorityLevel: 0
+  uploadedMode: 2
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/UIAssets/icon/icon_tx113.png.meta

@@ -0,0 +1,133 @@
+fileFormatVersion: 2
+guid: DHoYsnyuUi4WL6tlXcI+PVE20io9kv8YUpj4yKU4aDqZenfvfGIhgqc=
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  webStreaming: 0
+  priorityLevel: 0
+  uploadedMode: 2
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/UIAssets/icon/icon_tx116.png.meta

@@ -0,0 +1,133 @@
+fileFormatVersion: 2
+guid: CXIZ53mrAHk4Lq2KdTmAI2xwGAWJTF5ifeWg9jmcsdCOkJ2GMh3Suag=
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  webStreaming: 0
+  priorityLevel: 0
+  uploadedMode: 2
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/VFX/FXPrefabs/fx_down_zb_gold.prefab

@@ -107,7 +107,7 @@ ParticleSystem:
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
-  moveWithTransform: 0
+  moveWithTransform: 1
   moveWithCustomTransform: {fileID: 0}
   scalingMode: 0
   randomSeed: 0
@@ -151,7 +151,7 @@ ParticleSystem:
         m_RotationOrder: 0
     startSpeed:
       serializedVersion: 2
-      minMaxState: 0
+      minMaxState: 3
       scalar: 1
       minScalar: 0.5
       maxCurve:
@@ -188,7 +188,7 @@ ParticleSystem:
       serializedVersion: 2
       minMaxState: 0
       minColor: {r: 1, g: 1, b: 1, a: 1}
-      maxColor: {r: 1, g: 0.7631385, b: 0.31599998, a: 1}
+      maxColor: {r: 1, g: 0.7647059, b: 0.31764707, a: 1}
       maxGradient:
         serializedVersion: 2
         key0: {r: 1, g: 1, b: 1, a: 1}
@@ -252,8 +252,8 @@ ParticleSystem:
     startSize:
       serializedVersion: 2
       minMaxState: 3
-      scalar: 0.3
-      minScalar: 0.1
+      scalar: 0.12
+      minScalar: 0.06
       maxCurve:
         serializedVersion: 2
         m_Curve:
@@ -287,8 +287,8 @@ ParticleSystem:
     startSizeY:
       serializedVersion: 2
       minMaxState: 3
-      scalar: 1
-      minScalar: 1
+      scalar: 0.2
+      minScalar: 0.5
       maxCurve:
         serializedVersion: 2
         m_Curve:
@@ -340,8 +340,8 @@ ParticleSystem:
     startSizeZ:
       serializedVersion: 2
       minMaxState: 3
-      scalar: 0.2
-      minScalar: 0.2
+      scalar: 1
+      minScalar: 1
       maxCurve:
         serializedVersion: 2
         m_Curve:
@@ -553,7 +553,7 @@ ParticleSystem:
     gravitySource: 0
     maxNumParticles: 20
     customEmitterVelocity: {x: 0, y: 0, z: 0}
-    size3D: 0
+    size3D: 1
     rotation3D: 0
     gravityModifier:
       serializedVersion: 2
@@ -698,7 +698,7 @@ ParticleSystem:
     sphericalDirectionAmount: 0
     randomPositionAmount: 0
     radius:
-      value: 0.6
+      value: 0.45
       mode: 0
       spread: 0
       speed:
@@ -817,7 +817,7 @@ ParticleSystem:
     rateOverTime:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 30
+      scalar: 20
       minScalar: 10
       maxCurve:
         serializedVersion: 2
@@ -994,16 +994,25 @@ ParticleSystem:
           time: 0
           value: 1
           inSlope: -2
-          outSlope: -3.0784874
+          outSlope: -0.33484697
           tangentMode: 69
           weightedMode: 0
           inWeight: 0
           outWeight: 0
         - serializedVersion: 3
-          time: 0.23904642
-          value: 0.26409858
-          inSlope: -3.0784874
-          outSlope: -0.34706268
+          time: 0.15443644
+          value: 0.9482874
+          inSlope: -0.33484697
+          outSlope: -2.7698197
+          tangentMode: 69
+          weightedMode: 0
+          inWeight: 0.33333334
+          outWeight: 0.33333334
+        - serializedVersion: 3
+          time: 0.4202863
+          value: 0.21193123
+          inSlope: -2.7698197
+          outSlope: -0.36557913
           tangentMode: 69
           weightedMode: 0
           inWeight: 0.33333334
@@ -1011,7 +1020,7 @@ ParticleSystem:
         - serializedVersion: 3
           time: 1
           value: 0
-          inSlope: -0.34706268
+          inSlope: -0.36557913
           outSlope: 0
           tangentMode: 69
           weightedMode: 0
@@ -2590,7 +2599,7 @@ ParticleSystem:
     magnitude:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 0
+      scalar: 0.1
       minScalar: 1
       maxCurve:
         serializedVersion: 2
@@ -4796,7 +4805,7 @@ ParticleSystemRenderer:
   m_DynamicOccludee: 1
   m_StaticShadowCaster: 0
   m_MotionVectors: 1
-  m_LightProbeUsage: 1
+  m_LightProbeUsage: 0
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 0
   m_RayTraceProcedural: 0
@@ -4833,7 +4842,7 @@ ParticleSystemRenderer:
   m_MaxParticleSize: 3
   m_CameraVelocityScale: 0
   m_VelocityScale: 0
-  m_LengthScale: 2
+  m_LengthScale: 1
   m_SortingFudge: 0
   m_NormalDirection: 1
   m_ShadowBias: 0
@@ -5046,7 +5055,7 @@ ParticleSystem:
       serializedVersion: 2
       minMaxState: 0
       minColor: {r: 1, g: 1, b: 1, a: 1}
-      maxColor: {r: 0.274, g: 0.16080332, b: 0.10959999, a: 1}
+      maxColor: {r: 0.8792453, g: 0.388904, b: 0.02488415, a: 1}
       maxGradient:
         serializedVersion: 2
         key0: {r: 1, g: 1, b: 1, a: 1}
@@ -5110,7 +5119,7 @@ ParticleSystem:
     startSize:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 0.94
+      scalar: 0.85
       minScalar: 1
       maxCurve:
         serializedVersion: 2
@@ -9578,7 +9587,7 @@ ParticleSystemRenderer:
   m_DynamicOccludee: 1
   m_StaticShadowCaster: 0
   m_MotionVectors: 1
-  m_LightProbeUsage: 1
+  m_LightProbeUsage: 0
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 0
   m_RayTraceProcedural: 0
@@ -9828,7 +9837,7 @@ ParticleSystem:
       serializedVersion: 2
       minMaxState: 0
       minColor: {r: 1, g: 1, b: 1, a: 1}
-      maxColor: {r: 0.90599996, g: 0.6495489, b: 0.393204, a: 1}
+      maxColor: {r: 0.77800006, g: 0.34726185, b: 0, a: 1}
       maxGradient:
         serializedVersion: 2
         key0: {r: 1, g: 1, b: 1, a: 1}
@@ -9892,7 +9901,7 @@ ParticleSystem:
     startSize:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 2.8
+      scalar: 2.33
       minScalar: 1
       maxCurve:
         serializedVersion: 2
@@ -14360,7 +14369,7 @@ ParticleSystemRenderer:
   m_DynamicOccludee: 1
   m_StaticShadowCaster: 0
   m_MotionVectors: 1
-  m_LightProbeUsage: 1
+  m_LightProbeUsage: 0
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 0
   m_RayTraceProcedural: 0
@@ -14449,13 +14458,14 @@ Transform:
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1.3, y: 1.3, z: 1.3}
+  m_LocalScale: {x: 2, y: 2, z: 2}
   m_ConstrainProportionsScale: 1
   m_Children:
   - {fileID: 8361860962804993502}
   - {fileID: 6772503349768883480}
   - {fileID: 7091474917828892015}
   - {fileID: 596208460591004249}
+  - {fileID: 4792862966999184845}
   m_Father: {fileID: 179009596784981937}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &5700475334094143803
@@ -19320,7 +19330,7 @@ GameObject:
   - component: {fileID: 2959678846292941517}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: fx_sparkle2
+  m_Name: fx_fireball_ad
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -19349,7 +19359,7 @@ ParticleSystem:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6145112081236173271}
   serializedVersion: 8
-  lengthInSec: 0.5
+  lengthInSec: 1
   simulationSpeed: 1
   stopAction: 0
   cullingMode: 1
@@ -19424,7 +19434,7 @@ ParticleSystem:
     startLifetime:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 0.5
+      scalar: 1
       minScalar: 5
       maxCurve:
         serializedVersion: 2
@@ -19495,7 +19505,7 @@ ParticleSystem:
       serializedVersion: 2
       minMaxState: 0
       minColor: {r: 1, g: 1, b: 1, a: 1}
-      maxColor: {r: 0.99215686, g: 0.9011541, b: 0.73518825, a: 1}
+      maxColor: {r: 0.98490566, g: 0.7478031, b: 0.40697044, a: 1}
       maxGradient:
         serializedVersion: 2
         key0: {r: 1, g: 1, b: 1, a: 1}
@@ -19559,7 +19569,7 @@ ParticleSystem:
     startSize:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 1.56
+      scalar: 0.37
       minScalar: 1
       maxCurve:
         serializedVersion: 2
@@ -19813,13 +19823,22 @@ ParticleSystem:
         m_Curve:
         - serializedVersion: 3
           time: 0
+          value: 0
+          inSlope: 2
+          outSlope: 2
+          tangentMode: 0
+          weightedMode: 0
+          inWeight: 0
+          outWeight: 0
+        - serializedVersion: 3
+          time: 1
           value: 1
           inSlope: 0
           outSlope: 0
           tangentMode: 0
           weightedMode: 0
-          inWeight: 0.33333334
-          outWeight: 0.33333334
+          inWeight: 0
+          outWeight: 0
         m_PreInfinity: 2
         m_PostInfinity: 2
         m_RotationOrder: 4
@@ -20212,7 +20231,7 @@ ParticleSystem:
     m_BurstCount: 0
     m_Bursts: []
   SizeModule:
-    enabled: 1
+    enabled: 0
     curve:
       serializedVersion: 2
       minMaxState: 1
@@ -20383,10 +20402,10 @@ ParticleSystem:
         m_RotationOrder: 4
     separateAxes: 0
   RotationModule:
-    enabled: 0
+    enabled: 1
     x:
       serializedVersion: 2
-      minMaxState: 2
+      minMaxState: 0
       scalar: 1
       minScalar: 0
       maxCurve:
@@ -20439,7 +20458,7 @@ ParticleSystem:
         m_RotationOrder: 4
     y:
       serializedVersion: 2
-      minMaxState: 2
+      minMaxState: 0
       scalar: 1
       minScalar: 0
       maxCurve:
@@ -20492,8 +20511,8 @@ ParticleSystem:
         m_RotationOrder: 4
     curve:
       serializedVersion: 2
-      minMaxState: 2
-      scalar: 3.1415925
+      minMaxState: 0
+      scalar: -3.1415925
       minScalar: 0.7853982
       maxCurve:
         serializedVersion: 2
@@ -24027,7 +24046,7 @@ ParticleSystemRenderer:
   m_DynamicOccludee: 1
   m_StaticShadowCaster: 0
   m_MotionVectors: 1
-  m_LightProbeUsage: 1
+  m_LightProbeUsage: 0
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 0
   m_RayTraceProcedural: 0
@@ -24036,7 +24055,7 @@ ParticleSystemRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: ca031593676adfb438e2c84c8ea4388c, type: 2}
+  - {fileID: 2100000, guid: e1b4b3c0baa948742b3ecd973ec4692a, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -24089,6 +24108,145 @@ ParticleSystemRenderer:
   m_MeshWeighting2: 1
   m_MeshWeighting3: 1
   m_MaskInteraction: 0
+--- !u!1 &8661739283334570461
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4792862966999184845}
+  - component: {fileID: 5808080973455264728}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: fx_zb_trail
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4792862966999184845
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8661739283334570461}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0.28, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 5297932743465467758}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!96 &5808080973455264728
+TrailRenderer:
+  serializedVersion: 3
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8661739283334570461}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 0
+  m_LightProbeUsage: 0
+  m_ReflectionProbeUsage: 0
+  m_RayTracingMode: 0
+  m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 35c5e8f3c034dd54eb75703408d2ce29, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_Time: 0.3
+  m_PreviewTimeScale: 1
+  m_Parameters:
+    serializedVersion: 3
+    widthMultiplier: 1
+    widthCurve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    colorGradient:
+      serializedVersion: 2
+      key0: {r: 1, g: 0.6282376, b: 0, a: 1}
+      key1: {r: 0.96862745, g: 0.48462093, b: 0.05098037, a: 1}
+      key2: {r: 0.6075471, g: 0.12800111, b: 0, a: 0}
+      key3: {r: 0.381132, g: 0.045816887, b: 0, a: 0}
+      key4: {r: 0, g: 0, b: 0, a: 0}
+      key5: {r: 0, g: 0, b: 0, a: 0}
+      key6: {r: 0, g: 0, b: 0, a: 0}
+      key7: {r: 0, g: 0, b: 0, a: 0}
+      ctime0: 3778
+      ctime1: 11488
+      ctime2: 31997
+      ctime3: 50963
+      ctime4: 0
+      ctime5: 0
+      ctime6: 0
+      ctime7: 0
+      atime0: 0
+      atime1: 65535
+      atime2: 0
+      atime3: 0
+      atime4: 0
+      atime5: 0
+      atime6: 0
+      atime7: 0
+      m_Mode: 0
+      m_ColorSpace: 0
+      m_NumColorKeys: 4
+      m_NumAlphaKeys: 2
+    numCornerVertices: 0
+    numCapVertices: 0
+    alignment: 0
+    textureMode: 0
+    textureScale: {x: 1, y: 1}
+    shadowBias: 0.5
+    generateLightingData: 0
+  m_MinVertexDistance: 0.1
+  m_MaskInteraction: 0
+  m_Autodestruct: 0
+  m_Emitting: 1
+  m_ApplyActiveColorSpace: 1
 --- !u!1001 &8656049131696788093
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -24141,6 +24299,10 @@ PrefabInstance:
       propertyPath: m_Name
       value: fx_down_zb_gz_gold
       objectReference: {fileID: 0}
+    - target: {fileID: 6057816521079055161, guid: 18a39122649f02f4c844c8116f7504b9, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []

Assets/Art/VFX/FXPrefabs/fx_down_zb_gz_gold.prefab

@@ -43,13 +43,13 @@ ParticleSystem:
   m_GameObject: {fileID: 2125787654212807013}
   serializedVersion: 8
   lengthInSec: 1
-  simulationSpeed: 1
+  simulationSpeed: 1.5
   stopAction: 0
   cullingMode: 0
   ringBufferMode: 0
   ringBufferLoopRange: {x: 0, y: 1}
   emitterVelocityMode: 1
-  looping: 1
+  looping: 0
   prewarm: 0
   playOnAwake: 1
   useUnscaledTime: 0
@@ -57,7 +57,7 @@ ParticleSystem:
   startDelay:
     serializedVersion: 2
     minMaxState: 0
-    scalar: 0
+    scalar: 0.2
     minScalar: 0
     maxCurve:
       serializedVersion: 2
@@ -224,7 +224,7 @@ ParticleSystem:
       serializedVersion: 2
       minMaxState: 0
       minColor: {r: 1, g: 1, b: 1, a: 1}
-      maxColor: {r: 0.75, g: 0.599211, b: 0.32925, a: 1}
+      maxColor: {r: 1, g: 0.43593612, b: 0, a: 1}
       maxGradient:
         serializedVersion: 2
         key0: {r: 1, g: 1, b: 1, a: 1}
@@ -288,7 +288,7 @@ ParticleSystem:
     startSize:
       serializedVersion: 2
       minMaxState: 3
-      scalar: 0.2
+      scalar: 0.3
       minScalar: 0.1
       maxCurve:
         serializedVersion: 2
@@ -871,7 +871,7 @@ ParticleSystem:
     rateOverTime:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 15
+      scalar: 0
       minScalar: 10
       maxCurve:
         serializedVersion: 2
@@ -981,7 +981,7 @@ ParticleSystem:
       countCurve:
         serializedVersion: 2
         minMaxState: 0
-        scalar: 0
+        scalar: 10
         minScalar: 30
         maxCurve:
           serializedVersion: 2
@@ -2671,7 +2671,7 @@ ParticleSystem:
     magnitude:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 0.1
+      scalar: 1
       minScalar: 1
       maxCurve:
         serializedVersion: 2
@@ -4927,7 +4927,7 @@ ParticleSystemRenderer:
   m_MeshWeighting2: 1
   m_MeshWeighting3: 1
   m_MaskInteraction: 0
---- !u!1 &2239942565691667133
+--- !u!1 &2282865656361108125
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -4935,24 +4935,24 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 3804745505866593262}
-  - component: {fileID: 2353742968342127536}
-  - component: {fileID: 960560165426476134}
+  - component: {fileID: 4046312939243670780}
+  - component: {fileID: 8943391774928615771}
+  - component: {fileID: 7259846137562369937}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: fx_lashen2_ad (1)
+  m_Name: fx_lashen2_ad
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &3804745505866593262
+--- !u!4 &4046312939243670780
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2239942565691667133}
+  m_GameObject: {fileID: 2282865656361108125}
   serializedVersion: 2
   m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
   m_LocalPosition: {x: 0, y: 0.35, z: 0}
@@ -4961,16 +4961,16 @@ Transform:
   m_Children: []
   m_Father: {fileID: 4406511497050874936}
   m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
---- !u!198 &2353742968342127536
+--- !u!198 &8943391774928615771
 ParticleSystem:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2239942565691667133}
+  m_GameObject: {fileID: 2282865656361108125}
   serializedVersion: 8
   lengthInSec: 1
-  simulationSpeed: 1
+  simulationSpeed: 1.5
   stopAction: 0
   cullingMode: 0
   ringBufferMode: 0
@@ -5044,7 +5044,7 @@ ParticleSystem:
     startLifetime:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 0.8
+      scalar: 1
       minScalar: 5
       maxCurve:
         serializedVersion: 2
@@ -5151,7 +5151,7 @@ ParticleSystem:
       serializedVersion: 2
       minMaxState: 0
       minColor: {r: 1, g: 1, b: 1, a: 1}
-      maxColor: {r: 0.514, g: 0.30343735, b: 0.124459065, a: 1}
+      maxColor: {r: 1, g: 0.7004476, b: 0.11400002, a: 1}
       maxGradient:
         serializedVersion: 2
         key0: {r: 1, g: 1, b: 1, a: 1}
@@ -5215,7 +5215,7 @@ ParticleSystem:
     startSize:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 0.7
+      scalar: 1.3
       minScalar: 1
       maxCurve:
         serializedVersion: 2
@@ -5268,7 +5268,7 @@ ParticleSystem:
     startSizeY:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 7.11
+      scalar: 12
       minScalar: 1
       maxCurve:
         serializedVersion: 2
@@ -5976,16 +5976,16 @@ ParticleSystem:
           value: 1
           inSlope: 0
           outSlope: 0
-          tangentMode: 34
+          tangentMode: 0
           weightedMode: 0
           inWeight: 0
           outWeight: 0
         - serializedVersion: 3
           time: 1
-          value: 1
-          inSlope: 0
-          outSlope: 0
-          tangentMode: 34
+          value: 0
+          inSlope: -2
+          outSlope: -2
+          tangentMode: 0
           weightedMode: 0
           inWeight: 0
           outWeight: 0
@@ -6028,16 +6028,16 @@ ParticleSystem:
           time: 0
           value: 0
           inSlope: -2
-          outSlope: 2.52168
+          outSlope: 2.8102229
           tangentMode: 69
           weightedMode: 0
           inWeight: 0
           outWeight: 0
         - serializedVersion: 3
-          time: 0.3211845
-          value: 0.80992454
-          inSlope: 2.52168
-          outSlope: 0.2800105
+          time: 0.17929104
+          value: 0.5038478
+          inSlope: 2.8102229
+          outSlope: 0.604541
           tangentMode: 69
           weightedMode: 0
           inWeight: 0.33333334
@@ -6045,7 +6045,7 @@ ParticleSystem:
         - serializedVersion: 3
           time: 1
           value: 1
-          inSlope: 0.2800105
+          inSlope: 0.604541
           outSlope: 0
           tangentMode: 69
           weightedMode: 0
@@ -6304,15 +6304,15 @@ ParticleSystem:
       maxGradient:
         serializedVersion: 2
         key0: {r: 1, g: 1, b: 1, a: 0}
-        key1: {r: 1, g: 1, b: 1, a: 1}
-        key2: {r: 0, g: 0, b: 0, a: 1}
+        key1: {r: 0.9843137, g: 0.50643003, b: 0, a: 1}
+        key2: {r: 0, g: 0, b: 0, a: 0}
         key3: {r: 0, g: 0, b: 0, a: 0}
         key4: {r: 0, g: 0, b: 0, a: 0}
         key5: {r: 0, g: 0, b: 0, a: 0}
         key6: {r: 0, g: 0, b: 0, a: 0}
         key7: {r: 0, g: 0, b: 0, a: 0}
         ctime0: 0
-        ctime1: 65535
+        ctime1: 53276
         ctime2: 0
         ctime3: 0
         ctime4: 0
@@ -6320,8 +6320,8 @@ ParticleSystem:
         ctime6: 0
         ctime7: 0
         atime0: 0
-        atime1: 1928
-        atime2: 26343
+        atime1: 2699
+        atime2: 65535
         atime3: 65535
         atime4: 0
         atime5: 0
@@ -6330,7 +6330,7 @@ ParticleSystem:
         m_Mode: 0
         m_ColorSpace: 0
         m_NumColorKeys: 2
-        m_NumAlphaKeys: 4
+        m_NumAlphaKeys: 3
       minGradient:
         serializedVersion: 2
         key0: {r: 1, g: 1, b: 1, a: 1}
@@ -9751,14 +9751,14 @@ ParticleSystem:
         m_PostInfinity: 2
         m_RotationOrder: 4
     vectorLabel1_3: W
---- !u!199 &960560165426476134
+--- !u!199 &7259846137562369937
 ParticleSystemRenderer:
   serializedVersion: 6
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2239942565691667133}
+  m_GameObject: {fileID: 2282865656361108125}
   m_Enabled: 1
   m_CastShadows: 0
   m_ReceiveShadows: 0
@@ -9827,7 +9827,7 @@ ParticleSystemRenderer:
   m_MeshWeighting2: 1
   m_MeshWeighting3: 1
   m_MaskInteraction: 0
---- !u!1 &2282865656361108125
+--- !u!1 &3851662061308636608
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -9835,48 +9835,48 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 4046312939243670780}
-  - component: {fileID: 8943391774928615771}
-  - component: {fileID: 7259846137562369937}
+  - component: {fileID: 2199788821360639508}
+  - component: {fileID: 367856803850933982}
+  - component: {fileID: 5682591304216390335}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: fx_lashen2_ad
+  m_Name: fx_lz1 (1)up
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &4046312939243670780
+--- !u!4 &2199788821360639508
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2282865656361108125}
+  m_GameObject: {fileID: 3851662061308636608}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
-  m_LocalPosition: {x: 0, y: 0.35, z: 0}
+  m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068}
+  m_LocalPosition: {x: 0, y: 2.11, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 4406511497050874936}
-  m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
---- !u!198 &8943391774928615771
+  m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
+--- !u!198 &367856803850933982
 ParticleSystem:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2282865656361108125}
+  m_GameObject: {fileID: 3851662061308636608}
   serializedVersion: 8
   lengthInSec: 1
-  simulationSpeed: 1
+  simulationSpeed: 1.5
   stopAction: 0
   cullingMode: 0
   ringBufferMode: 0
   ringBufferLoopRange: {x: 0, y: 1}
   emitterVelocityMode: 1
-  looping: 1
+  looping: 0
   prewarm: 0
   playOnAwake: 1
   useUnscaledTime: 0
@@ -9944,8 +9944,8 @@ ParticleSystem:
     startLifetime:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 1
-      minScalar: 5
+      scalar: 0.5
+      minScalar: 1
       maxCurve:
         serializedVersion: 2
         m_Curve:
@@ -9997,8 +9997,8 @@ ParticleSystem:
     startSpeed:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 0.1
-      minScalar: 5
+      scalar: 50
+      minScalar: 10
       maxCurve:
         serializedVersion: 2
         m_Curve:
@@ -10051,7 +10051,7 @@ ParticleSystem:
       serializedVersion: 2
       minMaxState: 0
       minColor: {r: 1, g: 1, b: 1, a: 1}
-      maxColor: {r: 0.575, g: 0.38944593, b: 0.23172499, a: 1}
+      maxColor: {r: 0.7882353, g: 0.37581554, b: 0.023529392, a: 1}
       maxGradient:
         serializedVersion: 2
         key0: {r: 1, g: 1, b: 1, a: 1}
@@ -10115,8 +10115,8 @@ ParticleSystem:
     startSize:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 0.7
-      minScalar: 1
+      scalar: 1
+      minScalar: 0.1
       maxCurve:
         serializedVersion: 2
         m_Curve:
@@ -10168,7 +10168,7 @@ ParticleSystem:
     startSizeY:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 7.11
+      scalar: 8
       minScalar: 1
       maxCurve:
         serializedVersion: 2
@@ -10492,15 +10492,15 @@ ParticleSystem:
   ShapeModule:
     serializedVersion: 6
     enabled: 0
-    type: 4
-    angle: 25
+    type: 5
+    angle: 0
     length: 5
     boxThickness: {x: 0, y: 0, z: 0}
     radiusThickness: 1
     donutRadius: 0.2
-    m_Position: {x: 0, y: 0, z: 0}
+    m_Position: {x: 0, y: 0, z: 4.18}
     m_Rotation: {x: 0, y: 0, z: 0}
-    m_Scale: {x: 1, y: 1, z: 1}
+    m_Scale: {x: 0.22, y: 0.18, z: 7.53}
     placementMode: 0
     m_MeshMaterialIndex: 0
     m_MeshNormalOffset: 0
@@ -10579,7 +10579,7 @@ ParticleSystem:
     sphericalDirectionAmount: 0
     randomPositionAmount: 0
     radius:
-      value: 1
+      value: 0.18
       mode: 0
       spread: 0
       speed:
@@ -10698,7 +10698,7 @@ ParticleSystem:
     rateOverTime:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 3
+      scalar: 0
       minScalar: 10
       maxCurve:
         serializedVersion: 2
@@ -10808,7 +10808,7 @@ ParticleSystem:
       countCurve:
         serializedVersion: 2
         minMaxState: 0
-        scalar: 0
+        scalar: 2
         minScalar: 30
         maxCurve:
           serializedVersion: 2
@@ -10862,7 +10862,7 @@ ParticleSystem:
       repeatInterval: 0.01
       probability: 1
   SizeModule:
-    enabled: 1
+    enabled: 0
     curve:
       serializedVersion: 2
       minMaxState: 1
@@ -10876,16 +10876,16 @@ ParticleSystem:
           value: 1
           inSlope: 0
           outSlope: 0
-          tangentMode: 34
+          tangentMode: 0
           weightedMode: 0
           inWeight: 0
           outWeight: 0
         - serializedVersion: 3
           time: 1
-          value: 1
-          inSlope: 0
-          outSlope: 0
-          tangentMode: 34
+          value: 0
+          inSlope: -2
+          outSlope: -2
+          tangentMode: 0
           weightedMode: 0
           inWeight: 0
           outWeight: 0
@@ -10927,21 +10927,21 @@ ParticleSystem:
         - serializedVersion: 3
           time: 0
           value: 0
-          inSlope: 2
-          outSlope: 2
+          inSlope: 0
+          outSlope: 1
           tangentMode: 0
           weightedMode: 0
-          inWeight: 0
-          outWeight: 0
+          inWeight: 0.33333334
+          outWeight: 0.33333334
         - serializedVersion: 3
           time: 1
           value: 1
-          inSlope: 0
+          inSlope: 1
           outSlope: 0
           tangentMode: 0
           weightedMode: 0
-          inWeight: 0
-          outWeight: 0
+          inWeight: 0.33333334
+          outWeight: 0.33333334
         m_PreInfinity: 2
         m_PostInfinity: 2
         m_RotationOrder: 4
@@ -10979,22 +10979,22 @@ ParticleSystem:
         m_Curve:
         - serializedVersion: 3
           time: 0
-          value: 1
+          value: 0
           inSlope: 0
-          outSlope: 0
-          tangentMode: 34
+          outSlope: 1
+          tangentMode: 0
           weightedMode: 0
-          inWeight: 0
-          outWeight: 0
+          inWeight: 0.33333334
+          outWeight: 0.33333334
         - serializedVersion: 3
           time: 1
           value: 1
-          inSlope: 0
+          inSlope: 1
           outSlope: 0
-          tangentMode: 34
+          tangentMode: 0
           weightedMode: 0
-          inWeight: 0
-          outWeight: 0
+          inWeight: 0.33333334
+          outWeight: 0.33333334
         m_PreInfinity: 2
         m_PostInfinity: 2
         m_RotationOrder: 4
@@ -11022,7 +11022,7 @@ ParticleSystem:
         m_PreInfinity: 2
         m_PostInfinity: 2
         m_RotationOrder: 4
-    separateAxes: 1
+    separateAxes: 0
   RotationModule:
     enabled: 0
     x:
@@ -11194,34 +11194,34 @@ ParticleSystem:
       maxColor: {r: 1, g: 1, b: 1, a: 1}
       maxGradient:
         serializedVersion: 2
-        key0: {r: 1, g: 1, b: 1, a: 0}
-        key1: {r: 0.9559748, g: 0.09920483, b: 0.3307766, a: 1}
-        key2: {r: 0, g: 0, b: 0, a: 1}
+        key0: {r: 0, g: 0, b: 0, a: 1}
+        key1: {r: 1, g: 1, b: 1, a: 1}
+        key2: {r: 0, g: 0, b: 0, a: 0}
         key3: {r: 0, g: 0, b: 0, a: 0}
         key4: {r: 0, g: 0, b: 0, a: 0}
         key5: {r: 0, g: 0, b: 0, a: 0}
         key6: {r: 0, g: 0, b: 0, a: 0}
         key7: {r: 0, g: 0, b: 0, a: 0}
         ctime0: 0
-        ctime1: 65150
-        ctime2: 0
+        ctime1: 32768
+        ctime2: 65535
         ctime3: 0
         ctime4: 0
         ctime5: 0
         ctime6: 0
         ctime7: 0
         atime0: 0
-        atime1: 11437
-        atime2: 22488
-        atime3: 65535
+        atime1: 65535
+        atime2: 65535
+        atime3: 0
         atime4: 0
         atime5: 0
         atime6: 0
         atime7: 0
         m_Mode: 0
         m_ColorSpace: 0
-        m_NumColorKeys: 2
-        m_NumAlphaKeys: 4
+        m_NumColorKeys: 3
+        m_NumAlphaKeys: 2
       minGradient:
         serializedVersion: 2
         key0: {r: 1, g: 1, b: 1, a: 1}
@@ -12516,7 +12516,7 @@ ParticleSystem:
     inWorldSpace: 0
     multiplyDragByParticleSize: 1
     multiplyDragByParticleVelocity: 1
-    dampen: 0
+    dampen: 0.1
     drag:
       serializedVersion: 2
       minMaxState: 0
@@ -14642,14 +14642,14 @@ ParticleSystem:
         m_PostInfinity: 2
         m_RotationOrder: 4
     vectorLabel1_3: W
---- !u!199 &7259846137562369937
+--- !u!199 &5682591304216390335
 ParticleSystemRenderer:
   serializedVersion: 6
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2282865656361108125}
+  m_GameObject: {fileID: 3851662061308636608}
   m_Enabled: 1
   m_CastShadows: 0
   m_ReceiveShadows: 0
@@ -14665,7 +14665,7 @@ ParticleSystemRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: bd84daea60a55bb459ef44fdcb84d7c9, type: 2}
+  - {fileID: 2100000, guid: 39218b0eb4480d84a842e21a4e3ecc6d, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -14685,7 +14685,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 10
+  m_SortingOrder: 20
   m_RenderMode: 1
   m_MeshDistribution: 0
   m_SortMode: 0
@@ -14698,7 +14698,7 @@ ParticleSystemRenderer:
   m_NormalDirection: 1
   m_ShadowBias: 0
   m_RenderAlignment: 0
-  m_Pivot: {x: 0, y: 0, z: 0}
+  m_Pivot: {x: 0, y: 0.5, z: 0}
   m_Flip: {x: 0, y: 0, z: 0}
   m_EnableGPUInstancing: 1
   m_ApplyActiveColorSpace: 1
@@ -14751,9 +14751,9 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 4046312939243670780}
-  - {fileID: 3804745505866593262}
   - {fileID: 4949005120989816984}
   - {fileID: 2190646561601799743}
+  - {fileID: 2199788821360639508}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!198 &8767516420849740956
@@ -19598,13 +19598,13 @@ ParticleSystem:
   m_GameObject: {fileID: 7250608676054007724}
   serializedVersion: 8
   lengthInSec: 1
-  simulationSpeed: 1
+  simulationSpeed: 1.5
   stopAction: 0
   cullingMode: 0
   ringBufferMode: 0
   ringBufferLoopRange: {x: 0, y: 1}
   emitterVelocityMode: 1
-  looping: 1
+  looping: 0
   prewarm: 0
   playOnAwake: 1
   useUnscaledTime: 0
@@ -19672,7 +19672,7 @@ ParticleSystem:
     startLifetime:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 1
+      scalar: 2
       minScalar: 5
       maxCurve:
         serializedVersion: 2
@@ -19779,7 +19779,7 @@ ParticleSystem:
       serializedVersion: 2
       minMaxState: 0
       minColor: {r: 1, g: 1, b: 1, a: 1}
-      maxColor: {r: 0.60400003, g: 0.43000826, b: 0.3032428, a: 0.23529412}
+      maxColor: {r: 0.9098039, g: 0.33442512, b: 0, a: 0.2}
       maxGradient:
         serializedVersion: 2
         key0: {r: 1, g: 1, b: 1, a: 1}
@@ -19843,7 +19843,7 @@ ParticleSystem:
     startSize:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 1.98
+      scalar: 2.61
       minScalar: 1
       maxCurve:
         serializedVersion: 2
@@ -19896,7 +19896,7 @@ ParticleSystem:
     startSizeY:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 5.71
+      scalar: 10
       minScalar: 1
       maxCurve:
         serializedVersion: 2
@@ -20426,7 +20426,7 @@ ParticleSystem:
     rateOverTime:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 6.23
+      scalar: 0
       minScalar: 10
       maxCurve:
         serializedVersion: 2
@@ -20536,7 +20536,7 @@ ParticleSystem:
       countCurve:
         serializedVersion: 2
         minMaxState: 0
-        scalar: 0
+        scalar: 3
         minScalar: 30
         maxCurve:
           serializedVersion: 2
@@ -20660,7 +20660,7 @@ ParticleSystem:
           tangentMode: 34
           weightedMode: 0
           inWeight: 0
-          outWeight: 0.33333334
+          outWeight: 0
         - serializedVersion: 3
           time: 1
           value: 1
@@ -20668,7 +20668,7 @@ ParticleSystem:
           outSlope: 0
           tangentMode: 34
           weightedMode: 0
-          inWeight: 0.33333334
+          inWeight: 0
           outWeight: 0
         m_PreInfinity: 2
         m_PostInfinity: 2
@@ -20923,7 +20923,7 @@ ParticleSystem:
       maxGradient:
         serializedVersion: 2
         key0: {r: 1, g: 1, b: 1, a: 0}
-        key1: {r: 0, g: 0.0828397, b: 0.37254903, a: 1}
+        key1: {r: 0.5698112, g: 0, b: 0.093214035, a: 1}
         key2: {r: 0, g: 0, b: 0, a: 0}
         key3: {r: 0, g: 0, b: 0, a: 0}
         key4: {r: 0, g: 0, b: 0, a: 0}
@@ -20939,7 +20939,7 @@ ParticleSystem:
         ctime6: 0
         ctime7: 0
         atime0: 0
-        atime1: 33667
+        atime1: 5628
         atime2: 65535
         atime3: 65535
         atime4: 0

Assets/Art/VFX/FXPrefabs/fx_down_zb_gz_orange.prefab

@@ -43,7 +43,7 @@ ParticleSystem:
   m_GameObject: {fileID: 687701067600336277}
   serializedVersion: 8
   lengthInSec: 1
-  simulationSpeed: 1
+  simulationSpeed: 1.5
   stopAction: 0
   cullingMode: 0
   ringBufferMode: 0
@@ -117,7 +117,7 @@ ParticleSystem:
     startLifetime:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 1.5
+      scalar: 2
       minScalar: 5
       maxCurve:
         serializedVersion: 2
@@ -4934,7 +4934,7 @@ ParticleSystem:
   m_GameObject: {fileID: 2757603476990238672}
   serializedVersion: 8
   lengthInSec: 1
-  simulationSpeed: 1
+  simulationSpeed: 1.5
   stopAction: 0
   cullingMode: 0
   ringBufferMode: 0
@@ -5115,7 +5115,7 @@ ParticleSystem:
       serializedVersion: 2
       minMaxState: 0
       minColor: {r: 1, g: 1, b: 1, a: 1}
-      maxColor: {r: 0.554717, g: 0.19150944, b: 0, a: 1}
+      maxColor: {r: 0.78867924, g: 0.3256121, b: 0.022320976, a: 1}
       maxGradient:
         serializedVersion: 2
         key0: {r: 1, g: 1, b: 1, a: 1}
@@ -9825,7 +9825,7 @@ ParticleSystem:
   m_GameObject: {fileID: 6118471057588242912}
   serializedVersion: 8
   lengthInSec: 1
-  simulationSpeed: 1
+  simulationSpeed: 1.5
   stopAction: 0
   cullingMode: 0
   ringBufferMode: 0
@@ -14725,7 +14725,7 @@ ParticleSystem:
   m_GameObject: {fileID: 7328178854161982450}
   serializedVersion: 8
   lengthInSec: 1
-  simulationSpeed: 1
+  simulationSpeed: 1.5
   stopAction: 0
   cullingMode: 0
   ringBufferMode: 0

Assets/Art/test01.scene

@@ -124,6 +124,67 @@ NavMeshSettings:
     debug:
       m_Flags: 0
   m_NavMeshData: {fileID: 0}
+--- !u!1001 &134261527
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 4406511497050874936, guid: 18a39122649f02f4c844c8116f7504b9, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -2.17
+      objectReference: {fileID: 0}
+    - target: {fileID: 4406511497050874936, guid: 18a39122649f02f4c844c8116f7504b9, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4406511497050874936, guid: 18a39122649f02f4c844c8116f7504b9, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0.91
+      objectReference: {fileID: 0}
+    - target: {fileID: 4406511497050874936, guid: 18a39122649f02f4c844c8116f7504b9, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4406511497050874936, guid: 18a39122649f02f4c844c8116f7504b9, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4406511497050874936, guid: 18a39122649f02f4c844c8116f7504b9, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4406511497050874936, guid: 18a39122649f02f4c844c8116f7504b9, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4406511497050874936, guid: 18a39122649f02f4c844c8116f7504b9, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4406511497050874936, guid: 18a39122649f02f4c844c8116f7504b9, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4406511497050874936, guid: 18a39122649f02f4c844c8116f7504b9, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6057816521079055161, guid: 18a39122649f02f4c844c8116f7504b9, type: 3}
+      propertyPath: m_Name
+      value: fx_down_zb_gz_gold (1)
+      objectReference: {fileID: 0}
+    - target: {fileID: 6057816521079055161, guid: 18a39122649f02f4c844c8116f7504b9, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 18a39122649f02f4c844c8116f7504b9, type: 3}
 --- !u!1001 &169489524
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -176,6 +237,10 @@ PrefabInstance:
       propertyPath: m_Name
       value: fx_down_zb_gz_orange (1)
       objectReference: {fileID: 0}
+    - target: {fileID: 7891069443401101934, guid: 27d45464b3f545543997798ea966175a, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
@@ -11178,6 +11243,63 @@ PrefabInstance:
     m_AddedGameObjects: []
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 4ce619fac2e810243978269a7858ab2b, type: 3}
+--- !u!1001 &1173356841
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 5459260786319904571, guid: 792d87d98e30287428bf0281beda5715, type: 3}
+      propertyPath: m_Name
+      value: fx_down_zb_orange
+      objectReference: {fileID: 0}
+    - target: {fileID: 5695971604908618676, guid: 792d87d98e30287428bf0281beda5715, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0.17
+      objectReference: {fileID: 0}
+    - target: {fileID: 5695971604908618676, guid: 792d87d98e30287428bf0281beda5715, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5695971604908618676, guid: 792d87d98e30287428bf0281beda5715, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 1.84
+      objectReference: {fileID: 0}
+    - target: {fileID: 5695971604908618676, guid: 792d87d98e30287428bf0281beda5715, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5695971604908618676, guid: 792d87d98e30287428bf0281beda5715, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5695971604908618676, guid: 792d87d98e30287428bf0281beda5715, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5695971604908618676, guid: 792d87d98e30287428bf0281beda5715, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5695971604908618676, guid: 792d87d98e30287428bf0281beda5715, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5695971604908618676, guid: 792d87d98e30287428bf0281beda5715, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5695971604908618676, guid: 792d87d98e30287428bf0281beda5715, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 792d87d98e30287428bf0281beda5715, type: 3}
 --- !u!1 &1280994379
 GameObject:
   m_ObjectHideFlags: 0
@@ -49174,67 +49296,6 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 6423079387245111234, guid: 3ffb5dd7132afe640a949d7edd62bac7, type: 3}
   m_PrefabInstance: {fileID: 411978202572281331}
   m_PrefabAsset: {fileID: 0}
---- !u!1001 &414685744282598703
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 5459260786319904571, guid: 792d87d98e30287428bf0281beda5715, type: 3}
-      propertyPath: m_Name
-      value: fx_down_zb_orange
-      objectReference: {fileID: 0}
-    - target: {fileID: 5695971604908618676, guid: 792d87d98e30287428bf0281beda5715, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: -2.24
-      objectReference: {fileID: 0}
-    - target: {fileID: 5695971604908618676, guid: 792d87d98e30287428bf0281beda5715, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 1.08
-      objectReference: {fileID: 0}
-    - target: {fileID: 5695971604908618676, guid: 792d87d98e30287428bf0281beda5715, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0.64
-      objectReference: {fileID: 0}
-    - target: {fileID: 5695971604908618676, guid: 792d87d98e30287428bf0281beda5715, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 5695971604908618676, guid: 792d87d98e30287428bf0281beda5715, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5695971604908618676, guid: 792d87d98e30287428bf0281beda5715, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5695971604908618676, guid: 792d87d98e30287428bf0281beda5715, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5695971604908618676, guid: 792d87d98e30287428bf0281beda5715, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5695971604908618676, guid: 792d87d98e30287428bf0281beda5715, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5695971604908618676, guid: 792d87d98e30287428bf0281beda5715, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6156585599002530089, guid: 792d87d98e30287428bf0281beda5715, type: 3}
-      propertyPath: m_IsActive
-      value: 1
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 792d87d98e30287428bf0281beda5715, type: 3}
 --- !u!1001 &419221563046973438
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -76244,7 +76305,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 179009596784981937, guid: b47e824e45e0d1f4d8735eaa0a578d5c, type: 3}
       propertyPath: m_LocalPosition.x
-      value: -0.26
+      value: -2.12
       objectReference: {fileID: 0}
     - target: {fileID: 179009596784981937, guid: b47e824e45e0d1f4d8735eaa0a578d5c, type: 3}
       propertyPath: m_LocalPosition.y
@@ -76252,7 +76313,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 179009596784981937, guid: b47e824e45e0d1f4d8735eaa0a578d5c, type: 3}
       propertyPath: m_LocalPosition.z
-      value: 2.46
+      value: 0.25
       objectReference: {fileID: 0}
     - target: {fileID: 179009596784981937, guid: b47e824e45e0d1f4d8735eaa0a578d5c, type: 3}
       propertyPath: m_LocalRotation.w
@@ -76286,10 +76347,6 @@ PrefabInstance:
       propertyPath: m_Name
       value: fx_down_zb_gold
       objectReference: {fileID: 0}
-    - target: {fileID: 5700475334094143803, guid: b47e824e45e0d1f4d8735eaa0a578d5c, type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
@@ -87022,63 +87079,6 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!1001 &7860063130079556053
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 6264365197983463972, guid: 27d45464b3f545543997798ea966175a, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: -1.58
-      objectReference: {fileID: 0}
-    - target: {fileID: 6264365197983463972, guid: 27d45464b3f545543997798ea966175a, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6264365197983463972, guid: 27d45464b3f545543997798ea966175a, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0.80000013
-      objectReference: {fileID: 0}
-    - target: {fileID: 6264365197983463972, guid: 27d45464b3f545543997798ea966175a, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 6264365197983463972, guid: 27d45464b3f545543997798ea966175a, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6264365197983463972, guid: 27d45464b3f545543997798ea966175a, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6264365197983463972, guid: 27d45464b3f545543997798ea966175a, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6264365197983463972, guid: 27d45464b3f545543997798ea966175a, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6264365197983463972, guid: 27d45464b3f545543997798ea966175a, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6264365197983463972, guid: 27d45464b3f545543997798ea966175a, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7891069443401101934, guid: 27d45464b3f545543997798ea966175a, type: 3}
-      propertyPath: m_Name
-      value: fx_down_zb_gz_orange
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 27d45464b3f545543997798ea966175a, type: 3}
 --- !u!1001 &7872664616134555536
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -94620,10 +94620,10 @@ SceneRoots:
   - {fileID: 3785273757677319492}
   - {fileID: 1218050757715665868}
   - {fileID: 1824215731070208448}
-  - {fileID: 414685744282598703}
-  - {fileID: 7860063130079556053}
   - {fileID: 5845400108899544317}
   - {fileID: 2433106400120231791}
   - {fileID: 6869584778561200327}
   - {fileID: 6397667416353992830}
   - {fileID: 169489524}
+  - {fileID: 134261527}
+  - {fileID: 1173356841}

Assets/Res/Config/HeroModelConfig.json

@@ -16,6 +16,7 @@
       "crit": null,
       "attack": 10,
       "shanbi": 10,
+      "expGain": 100,
       "move_speed": 8,
       "speed_atk": 1.0,
       "range_atk": 2,
@@ -40,6 +41,7 @@
       "crit": null,
       "attack": 11,
       "shanbi": 10,
+      "expGain": 100,
       "move_speed": 8,
       "speed_atk": 1.0,
       "range_atk": 3,
@@ -64,6 +66,7 @@
       "crit": null,
       "attack": 12,
       "shanbi": 10,
+      "expGain": 100,
       "move_speed": 8,
       "speed_atk": 1.0,
       "range_atk": 4,
@@ -88,6 +91,7 @@
       "crit": null,
       "attack": 10,
       "shanbi": 10,
+      "expGain": 100,
       "move_speed": 8,
       "speed_atk": 1.0,
       "range_atk": 2,
@@ -109,6 +113,7 @@
       "crit": null,
       "attack": 11,
       "shanbi": 10,
+      "expGain": 100,
       "move_speed": 8,
       "speed_atk": 1.0,
       "range_atk": 3,
@@ -130,6 +135,7 @@
       "crit": null,
       "attack": 12,
       "shanbi": 10,
+      "expGain": 100,
       "move_speed": 8,
       "speed_atk": 1.0,
       "range_atk": 4,
@@ -151,6 +157,7 @@
       "crit": null,
       "attack": 10,
       "shanbi": 10,
+      "expGain": 100,
       "move_speed": 8,
       "speed_atk": 1.0,
       "range_atk": 2,
@@ -172,6 +179,7 @@
       "crit": null,
       "attack": 11,
       "shanbi": 10,
+      "expGain": 100,
       "move_speed": 8,
       "speed_atk": 1.0,
       "range_atk": 3,
@@ -193,6 +201,7 @@
       "crit": null,
       "attack": 12,
       "shanbi": 10,
+      "expGain": 100,
       "move_speed": 8,
       "speed_atk": 1.0,
       "range_atk": 4,
@@ -214,6 +223,7 @@
       "crit": null,
       "attack": 10,
       "shanbi": 10,
+      "expGain": 100,
       "move_speed": 8,
       "speed_atk": 1.0,
       "range_atk": 2,
@@ -235,6 +245,7 @@
       "crit": null,
       "attack": 11,
       "shanbi": 10,
+      "expGain": 100,
       "move_speed": 8,
       "speed_atk": 1.0,
       "range_atk": 3,
@@ -256,6 +267,7 @@
       "crit": null,
       "attack": 12,
       "shanbi": 10,
+      "expGain": 100,
       "move_speed": 8,
       "speed_atk": 1.0,
       "range_atk": 4,
@@ -277,6 +289,7 @@
       "crit": null,
       "attack": 10,
       "shanbi": 10,
+      "expGain": 100,
       "move_speed": 8,
       "speed_atk": 1.0,
       "range_atk": 2,
@@ -298,6 +311,7 @@
       "crit": null,
       "attack": 11,
       "shanbi": 10,
+      "expGain": 100,
       "move_speed": 8,
       "speed_atk": 1.0,
       "range_atk": 3,
@@ -319,6 +333,7 @@
       "crit": null,
       "attack": 12,
       "shanbi": 10,
+      "expGain": 100,
       "move_speed": 8,
       "speed_atk": 1.0,
       "range_atk": 4,
@@ -340,6 +355,7 @@
       "crit": null,
       "attack": 10,
       "shanbi": 10,
+      "expGain": 100,
       "move_speed": 8,
       "speed_atk": 1.0,
       "range_atk": 2,
@@ -361,6 +377,7 @@
       "crit": null,
       "attack": 11,
       "shanbi": 10,
+      "expGain": 100,
       "move_speed": 8,
       "speed_atk": 1.0,
       "range_atk": 3,
@@ -382,6 +399,7 @@
       "crit": null,
       "attack": 12,
       "shanbi": 10,
+      "expGain": 100,
       "move_speed": 8,
       "speed_atk": 1.0,
       "range_atk": 4,
@@ -403,6 +421,7 @@
       "crit": null,
       "attack": 11,
       "shanbi": 10,
+      "expGain": 100,
       "move_speed": 8,
       "speed_atk": 1.0,
       "range_atk": 3,
@@ -424,6 +443,7 @@
       "crit": null,
       "attack": 12,
       "shanbi": 10,
+      "expGain": 100,
       "move_speed": 8,
       "speed_atk": 1.0,
       "range_atk": 4,
@@ -445,6 +465,7 @@
       "crit": null,
       "attack": 13,
       "shanbi": 0,
+      "expGain": null,
       "move_speed": 3,
       "speed_atk": 1.0,
       "range_atk": 3,
@@ -469,6 +490,7 @@
       "crit": null,
       "attack": 14,
       "shanbi": 0,
+      "expGain": null,
       "move_speed": 3,
       "speed_atk": 1.0,
       "range_atk": 3,
@@ -495,6 +517,7 @@
       "crit": null,
       "attack": 15,
       "shanbi": 0,
+      "expGain": null,
       "move_speed": 3,
       "speed_atk": 1.0,
       "range_atk": 3,

Assets/Res/Config/LanguageChineseConfig.json

@@ -115,6 +115,18 @@
     {
       "ID": 29,
       "txt": "吸血"
+    },
+    {
+      "ID": 30,
+      "txt": "传说"
+    },
+    {
+      "ID": 31,
+      "txt": "史诗"
+    },
+    {
+      "ID": 32,
+      "txt": "精英"
     }
   ]
 }

Assets/Res/UI/HeroDetailPanel.prefab

@@ -455,7 +455,7 @@ GameObject:
   - component: {fileID: 3287270408546687904}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: Text (TMP)
+  m_Name: txtBasicEquipLv
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -1861,9 +1861,9 @@ RectTransform:
   - {fileID: 7381803730339431127}
   m_Father: {fileID: 7705411688387883887}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 336.49994, y: -28}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 227, y: 56}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5254878090505631399
@@ -2804,6 +2804,7 @@ GameObject:
   - component: {fileID: 6450843375123603411}
   - component: {fileID: 3309520447706144299}
   - component: {fileID: 1966616225348447026}
+  - component: {fileID: 4704716257281283673}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Button_Promote
@@ -2879,6 +2880,50 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
     packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
     lasetJsonGUID: ace5466faa841bb7b9046587aae54d38
+--- !u!114 &4704716257281283673
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2292960775602257974}
+  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: 1966616225348447026}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &2348262451627925547
 GameObject:
   m_ObjectHideFlags: 0
@@ -3200,7 +3245,7 @@ GameObject:
   - component: {fileID: 19514213694833491}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: TextGrade
+  m_Name: TextRarity
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -3711,9 +3756,9 @@ RectTransform:
   - {fileID: 1714301204429487981}
   m_Father: {fileID: 7705411688387883887}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 549.99994, y: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 175.2, y: 56}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &8592391560479041805
@@ -3767,7 +3812,7 @@ GameObject:
   - component: {fileID: 5389224752589133892}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: TextUpGrade
+  m_Name: txt
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -5128,7 +5173,7 @@ GameObject:
   - component: {fileID: 5985745952537226085}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: Text (TMP)
+  m_Name: txtPromote
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -8059,6 +8104,7 @@ GameObject:
   - component: {fileID: 5940546225354624192}
   - component: {fileID: 6920444595140807751}
   - component: {fileID: 6339542083778085456}
+  - component: {fileID: 2876329134272659471}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Button_Upgrade
@@ -8134,6 +8180,50 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
     packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
     lasetJsonGUID: ace5466faa841bb7b9046587aae54d38
+--- !u!114 &2876329134272659471
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5664409606135363520}
+  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: 6339542083778085456}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &5664635391068350170
 GameObject:
   m_ObjectHideFlags: 0
@@ -8925,7 +9015,7 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
-  - key: heroGrade
+  - key: heroRarity
     gameObject: {fileID: 19514213694833491}
     isAssetBundle: 0
     isList: 0
@@ -8955,6 +9045,156 @@ MonoBehaviour:
     - gameObject: {fileID: 2983232722897563720}
     - gameObject: {fileID: 7900421520403642917}
     - gameObject: {fileID: 1181932463234986561}
+  - key: txtHP
+    gameObject: {fileID: 598579539906994872}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 9043530873077291103}
+    - gameObject: {fileID: 7786295750093721047}
+    - gameObject: {fileID: 2983232722897563720}
+    - gameObject: {fileID: 7900421520403642917}
+    - gameObject: {fileID: 1181932463234986561}
+  - key: txtATK
+    gameObject: {fileID: 8486385519936893500}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 9043530873077291103}
+    - gameObject: {fileID: 7786295750093721047}
+    - gameObject: {fileID: 2983232722897563720}
+    - gameObject: {fileID: 7900421520403642917}
+    - gameObject: {fileID: 1181932463234986561}
+  - key: txtDEF
+    gameObject: {fileID: 7236757971243620307}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 9043530873077291103}
+    - gameObject: {fileID: 7786295750093721047}
+    - gameObject: {fileID: 2983232722897563720}
+    - gameObject: {fileID: 7900421520403642917}
+    - gameObject: {fileID: 1181932463234986561}
+  - key: txtSHANBI
+    gameObject: {fileID: 1803937540883082637}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 9043530873077291103}
+    - gameObject: {fileID: 7786295750093721047}
+    - gameObject: {fileID: 2983232722897563720}
+    - gameObject: {fileID: 7900421520403642917}
+    - gameObject: {fileID: 1181932463234986561}
+  - key: txtLv
+    gameObject: {fileID: 1188882091358369341}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 9043530873077291103}
+    - gameObject: {fileID: 7786295750093721047}
+    - gameObject: {fileID: 2983232722897563720}
+    - gameObject: {fileID: 7900421520403642917}
+    - gameObject: {fileID: 1181932463234986561}
+  - key: txtExpGain
+    gameObject: {fileID: 4958296180853232177}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 9043530873077291103}
+    - gameObject: {fileID: 7786295750093721047}
+    - gameObject: {fileID: 2983232722897563720}
+    - gameObject: {fileID: 7900421520403642917}
+    - gameObject: {fileID: 1181932463234986561}
+  - key: txtUpgrade
+    gameObject: {fileID: 6108899882536864750}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 9043530873077291103}
+    - gameObject: {fileID: 7786295750093721047}
+    - gameObject: {fileID: 2983232722897563720}
+    - gameObject: {fileID: 7900421520403642917}
+    - gameObject: {fileID: 1181932463234986561}
+  - key: txtPromote
+    gameObject: {fileID: 5985745952537226085}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 9043530873077291103}
+    - gameObject: {fileID: 7786295750093721047}
+    - gameObject: {fileID: 2983232722897563720}
+    - gameObject: {fileID: 7900421520403642917}
+    - gameObject: {fileID: 1181932463234986561}
+  - key: heroShards
+    gameObject: {fileID: 5495134090315458649}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 9043530873077291103}
+    - gameObject: {fileID: 7786295750093721047}
+    - gameObject: {fileID: 2983232722897563720}
+    - gameObject: {fileID: 7900421520403642917}
+    - gameObject: {fileID: 1181932463234986561}
+  - key: txtBasicEquipLv
+    gameObject: {fileID: 3287270408546687904}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 9043530873077291103}
+    - gameObject: {fileID: 7786295750093721047}
+    - gameObject: {fileID: 2983232722897563720}
+    - gameObject: {fileID: 7900421520403642917}
+    - gameObject: {fileID: 1181932463234986561}
+  - key: iconCommonEquip
+    gameObject: {fileID: 2875697944268458280}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 9043530873077291103}
+    - gameObject: {fileID: 7786295750093721047}
+    - gameObject: {fileID: 2983232722897563720}
+    - gameObject: {fileID: 7900421520403642917}
+    - gameObject: {fileID: 1181932463234986561}
+  - key: iconSpecailEquip
+    gameObject: {fileID: 1302489430543971595}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 9043530873077291103}
+    - gameObject: {fileID: 7786295750093721047}
+    - gameObject: {fileID: 2983232722897563720}
+    - gameObject: {fileID: 7900421520403642917}
+    - gameObject: {fileID: 1181932463234986561}
+  - key: lockObj
+    gameObject: {fileID: 3004711444938965894}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 9043530873077291103}
+    - gameObject: {fileID: 7786295750093721047}
+    - gameObject: {fileID: 2983232722897563720}
+    - gameObject: {fileID: 7900421520403642917}
+    - gameObject: {fileID: 1181932463234986561}
+  - key: btnUpgrade
+    gameObject: {fileID: 2876329134272659471}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 9043530873077291103}
+    - gameObject: {fileID: 7786295750093721047}
+    - gameObject: {fileID: 2983232722897563720}
+    - gameObject: {fileID: 7900421520403642917}
+    - gameObject: {fileID: 1181932463234986561}
+  - key: btnPromote
+    gameObject: {fileID: 4704716257281283673}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 9043530873077291103}
+    - gameObject: {fileID: 7786295750093721047}
+    - gameObject: {fileID: 2983232722897563720}
+    - gameObject: {fileID: 7900421520403642917}
+    - gameObject: {fileID: 1181932463234986561}
   isAssetBundle: 1
 --- !u!1 &6353668298983276286
 GameObject:
@@ -8969,7 +9209,7 @@ GameObject:
   - component: {fileID: 3838246812056708320}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: TextLv
+  m_Name: Text
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -9333,7 +9573,7 @@ GameObject:
   - component: {fileID: 2298052617001389203}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: TextLv
+  m_Name: Text
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -9477,7 +9717,7 @@ GameObject:
   - component: {fileID: 6108899882536864750}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: Text (TMP)
+  m_Name: txtUpgrade
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -12345,7 +12585,7 @@ GameObject:
   - component: {fileID: 5100336500503189401}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: TextPromote
+  m_Name: txt
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0

Assets/Res/UI/MainUIPanel.prefab

@@ -145,7 +145,7 @@ GameObject:
   m_Component:
   - component: {fileID: 7295285484143575252}
   - component: {fileID: 5110367857571788923}
-  - component: {fileID: 284659430331877172}
+  - component: {fileID: 3173585067917471387}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Icon_Gem
@@ -181,7 +181,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 276298489757744287}
   m_CullTransparentMesh: 1
---- !u!114 &284659430331877172
+--- !u!114 &3173585067917471387
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -190,7 +190,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 276298489757744287}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
@@ -201,7 +201,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 047acbbc02e094090ab6852579e7e7b7, type: 3}
+  m_Sprite: {fileID: 0}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -211,6 +211,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+  _icon_name: icon_res_Gem
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
+  packInfo:
+    packName: all
+    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
+    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
+    lasetJsonGUID: e90cdb0036b7598e8196c482eccd4329
 --- !u!1 &501653731502256918
 GameObject:
   m_ObjectHideFlags: 0
@@ -569,7 +577,7 @@ GameObject:
   m_Component:
   - component: {fileID: 5433286787357854352}
   - component: {fileID: 5309631651483224709}
-  - component: {fileID: 433065630854994431}
+  - component: {fileID: 6524193313608138032}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Icon_Coin
@@ -605,7 +613,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1211543753200599720}
   m_CullTransparentMesh: 1
---- !u!114 &433065630854994431
+--- !u!114 &6524193313608138032
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -614,7 +622,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 1211543753200599720}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
@@ -625,7 +633,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: e3a3f6e5da08f46c895f632eccceb676, type: 3}
+  m_Sprite: {fileID: 0}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -635,6 +643,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+  _icon_name: icon_Coin
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
+  packInfo:
+    packName: all
+    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
+    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
+    lasetJsonGUID: e90cdb0036b7598e8196c482eccd4329
 --- !u!1 &1222237385420729871
 GameObject:
   m_ObjectHideFlags: 0
@@ -2193,7 +2209,6 @@ RectTransform:
   - {fileID: 8106735504455601440}
   - {fileID: 8968252359368126328}
   - {fileID: 874346651065516408}
-  - {fileID: 8879947183720841500}
   m_Father: {fileID: 6466028004710776003}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -4210,8 +4225,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: -75.2, y: -4}
-  m_SizeDelta: {x: 51.5, y: 71.7}
+  m_AnchoredPosition: {x: -60.5, y: 1.0374}
+  m_SizeDelta: {x: 42.7, y: 55.953}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2473317446412967829
 CanvasRenderer:
@@ -4251,7 +4266,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: btn_l_Green
+  _icon_name: icon_res_upgrade_1
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
   packInfo:
@@ -4859,185 +4874,3 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
---- !u!1001 &4460092474410663005
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 9073062006211861286}
-    m_Modifications:
-    - target: {fileID: 2192921615180975605, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2192921615180975605, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2192921615180975605, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2192921615180975605, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2248459876073487429, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2248459876073487429, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2248459876073487429, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2248459876073487429, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5106666997551906113, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
-      propertyPath: m_Pivot.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 5106666997551906113, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
-      propertyPath: m_Pivot.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 5106666997551906113, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 5106666997551906113, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 5106666997551906113, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
-      propertyPath: m_AnchorMin.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 5106666997551906113, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 5106666997551906113, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 150
-      objectReference: {fileID: 0}
-    - target: {fileID: 5106666997551906113, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 200
-      objectReference: {fileID: 0}
-    - target: {fileID: 5106666997551906113, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5106666997551906113, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5106666997551906113, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5106666997551906113, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 5106666997551906113, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5106666997551906113, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5106666997551906113, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5106666997551906113, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5106666997551906113, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5106666997551906113, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5106666997551906113, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5106666997551906113, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5424729500125663363, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
-      propertyPath: m_Name
-      value: WidgetHero
-      objectReference: {fileID: 0}
-    - target: {fileID: 7229761929894092049, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7229761929894092049, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7229761929894092049, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7229761929894092049, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7878371381901126332, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7878371381901126332, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7878371381901126332, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7878371381901126332, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8498367243636987744, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8498367243636987744, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8498367243636987744, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8498367243636987744, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
---- !u!224 &8879947183720841500 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 5106666997551906113, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
-  m_PrefabInstance: {fileID: 4460092474410663005}
-  m_PrefabAsset: {fileID: 0}

Assets/Res/UI/WidgetHero.prefab

@@ -36,7 +36,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 25.5, y: -27}
+  m_AnchoredPosition: {x: 28.5, y: -33}
   m_SizeDelta: {x: 35, y: 36}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7961417994247046798
@@ -164,7 +164,7 @@ GameObject:
   m_Component:
   - component: {fileID: 7878371381901126332}
   - component: {fileID: 8144389359825814294}
-  - component: {fileID: 1242894183903934781}
+  - component: {fileID: 2160483089439526009}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Grade_Star (4)
@@ -200,7 +200,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1235474140743937961}
   m_CullTransparentMesh: 1
---- !u!114 &1242894183903934781
+--- !u!114 &2160483089439526009
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -209,7 +209,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 1235474140743937961}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
@@ -220,7 +220,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 39afaf3c0b490422ea5f07aac1dcfbe1, type: 3}
+  m_Sprite: {fileID: 0}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -230,6 +230,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_star
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
+  packInfo:
+    packName: all
+    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
+    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
+    lasetJsonGUID: 03b3872585b24d54f63b884a410da2bc
 --- !u!1 &1362261821966092627
 GameObject:
   m_ObjectHideFlags: 0
@@ -451,7 +459,7 @@ GameObject:
   m_Component:
   - component: {fileID: 2248459876073487429}
   - component: {fileID: 2739737631316204749}
-  - component: {fileID: 1893654776998886885}
+  - component: {fileID: 3810554628740734183}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Grade_Star
@@ -487,7 +495,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2054454074167662785}
   m_CullTransparentMesh: 1
---- !u!114 &1893654776998886885
+--- !u!114 &3810554628740734183
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -496,7 +504,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 2054454074167662785}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
@@ -507,7 +515,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 39afaf3c0b490422ea5f07aac1dcfbe1, type: 3}
+  m_Sprite: {fileID: 0}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -517,6 +525,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_star
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
+  packInfo:
+    packName: all
+    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
+    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
+    lasetJsonGUID: 03b3872585b24d54f63b884a410da2bc
 --- !u!1 &2068292004882907889
 GameObject:
   m_ObjectHideFlags: 0
@@ -527,7 +543,7 @@ GameObject:
   m_Component:
   - component: {fileID: 7229761929894092049}
   - component: {fileID: 2708601044019718149}
-  - component: {fileID: 3829851137653808305}
+  - component: {fileID: 6873922282167129999}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Grade_Star (1)
@@ -563,7 +579,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2068292004882907889}
   m_CullTransparentMesh: 1
---- !u!114 &3829851137653808305
+--- !u!114 &6873922282167129999
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -572,7 +588,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 2068292004882907889}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
@@ -583,7 +599,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 39afaf3c0b490422ea5f07aac1dcfbe1, type: 3}
+  m_Sprite: {fileID: 0}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -593,6 +609,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_star
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
+  packInfo:
+    packName: all
+    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
+    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
+    lasetJsonGUID: 03b3872585b24d54f63b884a410da2bc
 --- !u!1 &3035075031006461083
 GameObject:
   m_ObjectHideFlags: 0
@@ -603,7 +627,7 @@ GameObject:
   m_Component:
   - component: {fileID: 2192921615180975605}
   - component: {fileID: 8783385350428690739}
-  - component: {fileID: 8196141183824375260}
+  - component: {fileID: 3615513861017489878}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Grade_Star (3)
@@ -639,7 +663,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3035075031006461083}
   m_CullTransparentMesh: 1
---- !u!114 &8196141183824375260
+--- !u!114 &3615513861017489878
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -648,7 +672,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 3035075031006461083}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
@@ -659,7 +683,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 39afaf3c0b490422ea5f07aac1dcfbe1, type: 3}
+  m_Sprite: {fileID: 0}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -669,6 +693,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_star
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
+  packInfo:
+    packName: all
+    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
+    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
+    lasetJsonGUID: 03b3872585b24d54f63b884a410da2bc
 --- !u!1 &3216529491418307855
 GameObject:
   m_ObjectHideFlags: 0
@@ -823,7 +855,7 @@ GameObject:
   m_Component:
   - component: {fileID: 143105881846625558}
   - component: {fileID: 7686669919121143803}
-  - component: {fileID: 3507173361900776593}
+  - component: {fileID: 5183410127581163152}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Icon
@@ -859,7 +891,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4370823504067617340}
   m_CullTransparentMesh: 1
---- !u!114 &3507173361900776593
+--- !u!114 &5183410127581163152
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -868,7 +900,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 4370823504067617340}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
@@ -879,7 +911,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: cbd10e67e1e8343aebe8498f30c54e2a, type: 3}
+  m_Sprite: {fileID: 0}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -889,6 +921,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+  _icon_name: icon_zy_Hat
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
+  packInfo:
+    packName: all
+    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
+    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
+    lasetJsonGUID: 03b3872585b24d54f63b884a410da2bc
 --- !u!1 &5424729500125663363
 GameObject:
   m_ObjectHideFlags: 0
@@ -900,7 +940,6 @@ GameObject:
   - component: {fileID: 5106666997551906113}
   - component: {fileID: 8653829958343529847}
   - component: {fileID: 8641256824108606021}
-  - component: {fileID: 1237577693768947228}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: WidgetHero
@@ -951,8 +990,8 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
-  - key: headIcon
-    gameObject: {fileID: 4520237584939250927}
+  - key: iconHero
+    gameObject: {fileID: 2063880575880762248}
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
@@ -971,31 +1010,31 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas:
-    - gameObject: {fileID: 1893654776998886885}
-    - gameObject: {fileID: 3829851137653808305}
-    - gameObject: {fileID: 586281481670808277}
-    - gameObject: {fileID: 8196141183824375260}
-    - gameObject: {fileID: 1242894183903934781}
-  - key: zhiyeIcon
-    gameObject: {fileID: 3507173361900776593}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+  - key: iconZhiYe
+    gameObject: {fileID: 5183410127581163152}
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas:
-    - gameObject: {fileID: 1893654776998886885}
-    - gameObject: {fileID: 3829851137653808305}
-    - gameObject: {fileID: 586281481670808277}
-    - gameObject: {fileID: 8196141183824375260}
-    - gameObject: {fileID: 1242894183903934781}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
   - key: btnHero
     gameObject: {fileID: 8641256824108606021}
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas:
-    - gameObject: {fileID: 1893654776998886885}
-    - gameObject: {fileID: 3829851137653808305}
-    - gameObject: {fileID: 586281481670808277}
-    - gameObject: {fileID: 8196141183824375260}
-    - gameObject: {fileID: 1242894183903934781}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
   isAssetBundle: 1
 --- !u!114 &8641256824108606021
 MonoBehaviour:
@@ -1041,51 +1080,6 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
---- !u!61 &1237577693768947228
-BoxCollider2D:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5424729500125663363}
-  m_Enabled: 0
-  m_Density: 1
-  m_Material: {fileID: 0}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
-  m_ForceSendLayers:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  m_ForceReceiveLayers:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  m_ContactCaptureLayers:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  m_CallbackLayers:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  m_IsTrigger: 0
-  m_UsedByEffector: 0
-  m_UsedByComposite: 0
-  m_Offset: {x: 0, y: 0}
-  m_SpriteTilingProperty:
-    border: {x: 0, y: 0, z: 0, w: 0}
-    pivot: {x: 0, y: 0}
-    oldSize: {x: 0, y: 0}
-    newSize: {x: 0, y: 0}
-    adaptiveTilingThreshold: 0
-    drawMode: 0
-    adaptiveTiling: 0
-  m_AutoTiling: 0
-  serializedVersion: 2
-  m_Size: {x: 150, y: 200}
-  m_EdgeRadius: 0
 --- !u!1 &5677483184485922613
 GameObject:
   m_ObjectHideFlags: 0
@@ -1248,7 +1242,7 @@ GameObject:
   m_Component:
   - component: {fileID: 7602731387458885778}
   - component: {fileID: 8224281712761051760}
-  - component: {fileID: 4520237584939250927}
+  - component: {fileID: 2063880575880762248}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Icon
@@ -1266,15 +1260,15 @@ RectTransform:
   m_GameObject: {fileID: 6690880340389431512}
   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_LocalScale: {x: 0.4, y: 0.4, z: 0.4}
+  m_ConstrainProportionsScale: 1
   m_Children: []
   m_Father: {fileID: 5106666997551906113}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 1.6, y: 8.7}
-  m_SizeDelta: {x: 124.61, y: 112.15}
+  m_SizeDelta: {x: 410, y: 262}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8224281712761051760
 CanvasRenderer:
@@ -1284,7 +1278,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6690880340389431512}
   m_CullTransparentMesh: 1
---- !u!114 &4520237584939250927
+--- !u!114 &2063880575880762248
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1293,7 +1287,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 6690880340389431512}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
@@ -1304,7 +1298,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 55423cb896009490a8dd8fe1a31aa5b1, type: 3}
+  m_Sprite: {fileID: 0}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -1314,6 +1308,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+  _icon_name: icon_tx105
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 1a259ebae9e024f1d8fb10d831b49c24, type: 3}
+  packInfo:
+    packName: heroIcon
+    packgJsonPath: /Art/UIAssets/TextrueJson/heroIcon.txt
+    packgSpritePath: Assets/Res/UIAtlas/heroIcon.spriteatlasv2
+    lasetJsonGUID: a59a676e2ab5c4925ab687adc8940d7b
 --- !u!1 &7524693852372550712
 GameObject:
   m_ObjectHideFlags: 0
@@ -1324,7 +1326,7 @@ GameObject:
   m_Component:
   - component: {fileID: 8498367243636987744}
   - component: {fileID: 6307304734260365425}
-  - component: {fileID: 586281481670808277}
+  - component: {fileID: 6382863773641817049}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Grade_Star (2)
@@ -1360,7 +1362,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7524693852372550712}
   m_CullTransparentMesh: 1
---- !u!114 &586281481670808277
+--- !u!114 &6382863773641817049
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1369,7 +1371,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 7524693852372550712}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
@@ -1380,7 +1382,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 39afaf3c0b490422ea5f07aac1dcfbe1, type: 3}
+  m_Sprite: {fileID: 0}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -1390,6 +1392,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_star
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
+  packInfo:
+    packName: all
+    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
+    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
+    lasetJsonGUID: 03b3872585b24d54f63b884a410da2bc
 --- !u!1 &7597079903001610012
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UIAtlas/all.spriteatlasv2

@@ -11,6 +11,240 @@ SpriteAtlasAsset:
   m_MasterAtlas: {fileID: 0}
   m_ImporterData:
     packables:
+    - {fileID: 2800000, guid: f135276cb2d8f43339f0cbe999537c48, type: 3}
+    - {fileID: 2800000, guid: 4f5b4c2303ae14f8aa8d2daf5803f417, type: 3}
+    - {fileID: 2800000, guid: 0b7cc907f403f4a67ad658df2c8b8bd6, type: 3}
+    - {fileID: 2800000, guid: fac2f1f21015b4387ba948c68d69b20a, type: 3}
+    - {fileID: 2800000, guid: 6db8a26aaf376472cb3da4b0174c3640, type: 3}
+    - {fileID: 2800000, guid: 1944ddda93ef84249abc2c330ccc1671, type: 3}
+    - {fileID: 2800000, guid: a30bf5a5fe0484028b110056f3f4bfb7, type: 3}
+    - {fileID: 2800000, guid: 7a8716b2f7dea49e2a0a4b04902a7b29, type: 3}
+    - {fileID: 2800000, guid: 137d66878d81240e08b1f9e634dd03e5, type: 3}
+    - {fileID: 2800000, guid: c9076402f3d8e4f14b590c121f9c99d0, type: 3}
+    - {fileID: 2800000, guid: 620836cccebfa47d69f3604400cda9d1, type: 3}
+    - {fileID: 2800000, guid: 036dc8ba1666442588bd4900d7967f74, type: 3}
+    - {fileID: 2800000, guid: 82fb7f520a3d042f68f126f07425081c, type: 3}
+    - {fileID: 2800000, guid: 4e7efc4278c98434aa518be230a9a6e2, type: 3}
+    - {fileID: 2800000, guid: 458074caa850a4ebe9902dadcebd5519, type: 3}
+    - {fileID: 2800000, guid: 92753e7463d6c4451bcfaa1be32e5834, type: 3}
+    - {fileID: 2800000, guid: 084d642e01f7849d0a49230ab9cc18b9, type: 3}
+    - {fileID: 2800000, guid: ce1ea5fcdbd674590ac8eae01e003bad, type: 3}
+    - {fileID: 2800000, guid: 7298f85c9be3e480ca29a540b881acc7, type: 3}
+    - {fileID: 2800000, guid: acf622f4b8b10451f864e6bbe0f2d18c, type: 3}
+    - {fileID: 2800000, guid: 69c249842084043e0b2152a611527273, type: 3}
+    - {fileID: 2800000, guid: 9369285ebc9f1452cb96bdd4c71dc580, type: 3}
+    - {fileID: 2800000, guid: 18bdd168063b3419c93ff0ad3d928768, type: 3}
+    - {fileID: 2800000, guid: a909a2534241641bfa4fd6d3aa0997fa, type: 3}
+    - {fileID: 2800000, guid: 1cedae3cd8e1c4e8b8351163cb83d3c3, type: 3}
+    - {fileID: 2800000, guid: 40b46970b24114095ae4592b09cd788b, type: 3}
+    - {fileID: 2800000, guid: 12f59c252111d4ddaa1efdbe970c9338, type: 3}
+    - {fileID: 2800000, guid: 88f8d005a66c74c8e8516498671a5363, type: 3}
+    - {fileID: 2800000, guid: 644d6a9935ab8468f91bccdf0e81217e, type: 3}
+    - {fileID: 2800000, guid: 0107877e5f4474feeb6c3a48ddbd0181, type: 3}
+    - {fileID: 2800000, guid: e6614d7880f624bebb9eb042438465e7, type: 3}
+    - {fileID: 2800000, guid: 11f8939ed19d74afd9f1ec5c2cd1ed40, type: 3}
+    - {fileID: 2800000, guid: 58233a1daedbb4a24b2ddca6bcb864fd, type: 3}
+    - {fileID: 2800000, guid: 03108c847a5054b63971245729018c27, type: 3}
+    - {fileID: 2800000, guid: e4a00da9d5759447c948b8fa241afc3e, type: 3}
+    - {fileID: 2800000, guid: dd87b4353a45646fbbeaafe8c13a4632, type: 3}
+    - {fileID: 2800000, guid: 7c661cddbbc49467d8441a35766809e1, type: 3}
+    - {fileID: 2800000, guid: 0e2733676e1be451a8519a89c49798c1, type: 3}
+    - {fileID: 2800000, guid: 7529bbf4240db4e31a7b6f4df456a36a, type: 3}
+    - {fileID: 2800000, guid: 082c2d0dec6374c548992e3de4c3cc17, type: 3}
+    - {fileID: 2800000, guid: ab7ed8048d1084deca39266a82de2fbc, type: 3}
+    - {fileID: 2800000, guid: 044267119b30c460785747c947493225, type: 3}
+    - {fileID: 2800000, guid: ebc537e5817db4407935a71d199232e9, type: 3}
+    - {fileID: 2800000, guid: 687226eea50e240aeb387bc0204de028, type: 3}
+    - {fileID: 2800000, guid: d320d0b7f786e44768dbf452a215d9f4, type: 3}
+    - {fileID: 2800000, guid: c5d88737534914e22a2b08bf691052c3, type: 3}
+    - {fileID: 2800000, guid: 9e984408ac7ba4153bace3927806efeb, type: 3}
+    - {fileID: 2800000, guid: f135276cb2d8f43339f0cbe999537c48, type: 3}
+    - {fileID: 2800000, guid: 4f5b4c2303ae14f8aa8d2daf5803f417, type: 3}
+    - {fileID: 2800000, guid: 0b7cc907f403f4a67ad658df2c8b8bd6, type: 3}
+    - {fileID: 2800000, guid: fac2f1f21015b4387ba948c68d69b20a, type: 3}
+    - {fileID: 2800000, guid: 6db8a26aaf376472cb3da4b0174c3640, type: 3}
+    - {fileID: 2800000, guid: 1944ddda93ef84249abc2c330ccc1671, type: 3}
+    - {fileID: 2800000, guid: a30bf5a5fe0484028b110056f3f4bfb7, type: 3}
+    - {fileID: 2800000, guid: 7a8716b2f7dea49e2a0a4b04902a7b29, type: 3}
+    - {fileID: 2800000, guid: 137d66878d81240e08b1f9e634dd03e5, type: 3}
+    - {fileID: 2800000, guid: c9076402f3d8e4f14b590c121f9c99d0, type: 3}
+    - {fileID: 2800000, guid: 620836cccebfa47d69f3604400cda9d1, type: 3}
+    - {fileID: 2800000, guid: 036dc8ba1666442588bd4900d7967f74, type: 3}
+    - {fileID: 2800000, guid: 82fb7f520a3d042f68f126f07425081c, type: 3}
+    - {fileID: 2800000, guid: 4e7efc4278c98434aa518be230a9a6e2, type: 3}
+    - {fileID: 2800000, guid: 458074caa850a4ebe9902dadcebd5519, type: 3}
+    - {fileID: 2800000, guid: 92753e7463d6c4451bcfaa1be32e5834, type: 3}
+    - {fileID: 2800000, guid: 084d642e01f7849d0a49230ab9cc18b9, type: 3}
+    - {fileID: 2800000, guid: ce1ea5fcdbd674590ac8eae01e003bad, type: 3}
+    - {fileID: 2800000, guid: 7298f85c9be3e480ca29a540b881acc7, type: 3}
+    - {fileID: 2800000, guid: acf622f4b8b10451f864e6bbe0f2d18c, type: 3}
+    - {fileID: 2800000, guid: 69c249842084043e0b2152a611527273, type: 3}
+    - {fileID: 2800000, guid: 9369285ebc9f1452cb96bdd4c71dc580, type: 3}
+    - {fileID: 2800000, guid: 18bdd168063b3419c93ff0ad3d928768, type: 3}
+    - {fileID: 2800000, guid: a909a2534241641bfa4fd6d3aa0997fa, type: 3}
+    - {fileID: 2800000, guid: 1cedae3cd8e1c4e8b8351163cb83d3c3, type: 3}
+    - {fileID: 2800000, guid: 40b46970b24114095ae4592b09cd788b, type: 3}
+    - {fileID: 2800000, guid: 12f59c252111d4ddaa1efdbe970c9338, type: 3}
+    - {fileID: 2800000, guid: 88f8d005a66c74c8e8516498671a5363, type: 3}
+    - {fileID: 2800000, guid: 644d6a9935ab8468f91bccdf0e81217e, type: 3}
+    - {fileID: 2800000, guid: 0107877e5f4474feeb6c3a48ddbd0181, type: 3}
+    - {fileID: 2800000, guid: e6614d7880f624bebb9eb042438465e7, type: 3}
+    - {fileID: 2800000, guid: 11f8939ed19d74afd9f1ec5c2cd1ed40, type: 3}
+    - {fileID: 2800000, guid: 58233a1daedbb4a24b2ddca6bcb864fd, type: 3}
+    - {fileID: 2800000, guid: 03108c847a5054b63971245729018c27, type: 3}
+    - {fileID: 2800000, guid: e4a00da9d5759447c948b8fa241afc3e, type: 3}
+    - {fileID: 2800000, guid: dd87b4353a45646fbbeaafe8c13a4632, type: 3}
+    - {fileID: 2800000, guid: 7c661cddbbc49467d8441a35766809e1, type: 3}
+    - {fileID: 2800000, guid: 0e2733676e1be451a8519a89c49798c1, type: 3}
+    - {fileID: 2800000, guid: 7529bbf4240db4e31a7b6f4df456a36a, type: 3}
+    - {fileID: 2800000, guid: 082c2d0dec6374c548992e3de4c3cc17, type: 3}
+    - {fileID: 2800000, guid: ab7ed8048d1084deca39266a82de2fbc, type: 3}
+    - {fileID: 2800000, guid: 044267119b30c460785747c947493225, type: 3}
+    - {fileID: 2800000, guid: ebc537e5817db4407935a71d199232e9, type: 3}
+    - {fileID: 2800000, guid: 687226eea50e240aeb387bc0204de028, type: 3}
+    - {fileID: 2800000, guid: d320d0b7f786e44768dbf452a215d9f4, type: 3}
+    - {fileID: 2800000, guid: c5d88737534914e22a2b08bf691052c3, type: 3}
+    - {fileID: 2800000, guid: 9e984408ac7ba4153bace3927806efeb, type: 3}
+    - {fileID: 2800000, guid: f135276cb2d8f43339f0cbe999537c48, type: 3}
+    - {fileID: 2800000, guid: 4f5b4c2303ae14f8aa8d2daf5803f417, type: 3}
+    - {fileID: 2800000, guid: 0b7cc907f403f4a67ad658df2c8b8bd6, type: 3}
+    - {fileID: 2800000, guid: fac2f1f21015b4387ba948c68d69b20a, type: 3}
+    - {fileID: 2800000, guid: 6db8a26aaf376472cb3da4b0174c3640, type: 3}
+    - {fileID: 2800000, guid: 1944ddda93ef84249abc2c330ccc1671, type: 3}
+    - {fileID: 2800000, guid: a30bf5a5fe0484028b110056f3f4bfb7, type: 3}
+    - {fileID: 2800000, guid: 7a8716b2f7dea49e2a0a4b04902a7b29, type: 3}
+    - {fileID: 2800000, guid: 137d66878d81240e08b1f9e634dd03e5, type: 3}
+    - {fileID: 2800000, guid: c9076402f3d8e4f14b590c121f9c99d0, type: 3}
+    - {fileID: 2800000, guid: 620836cccebfa47d69f3604400cda9d1, type: 3}
+    - {fileID: 2800000, guid: 036dc8ba1666442588bd4900d7967f74, type: 3}
+    - {fileID: 2800000, guid: 82fb7f520a3d042f68f126f07425081c, type: 3}
+    - {fileID: 2800000, guid: 4e7efc4278c98434aa518be230a9a6e2, type: 3}
+    - {fileID: 2800000, guid: 458074caa850a4ebe9902dadcebd5519, type: 3}
+    - {fileID: 2800000, guid: 92753e7463d6c4451bcfaa1be32e5834, type: 3}
+    - {fileID: 2800000, guid: 084d642e01f7849d0a49230ab9cc18b9, type: 3}
+    - {fileID: 2800000, guid: ce1ea5fcdbd674590ac8eae01e003bad, type: 3}
+    - {fileID: 2800000, guid: 7298f85c9be3e480ca29a540b881acc7, type: 3}
+    - {fileID: 2800000, guid: acf622f4b8b10451f864e6bbe0f2d18c, type: 3}
+    - {fileID: 2800000, guid: 69c249842084043e0b2152a611527273, type: 3}
+    - {fileID: 2800000, guid: 9369285ebc9f1452cb96bdd4c71dc580, type: 3}
+    - {fileID: 2800000, guid: 18bdd168063b3419c93ff0ad3d928768, type: 3}
+    - {fileID: 2800000, guid: a909a2534241641bfa4fd6d3aa0997fa, type: 3}
+    - {fileID: 2800000, guid: 1cedae3cd8e1c4e8b8351163cb83d3c3, type: 3}
+    - {fileID: 2800000, guid: 40b46970b24114095ae4592b09cd788b, type: 3}
+    - {fileID: 2800000, guid: 12f59c252111d4ddaa1efdbe970c9338, type: 3}
+    - {fileID: 2800000, guid: 88f8d005a66c74c8e8516498671a5363, type: 3}
+    - {fileID: 2800000, guid: 644d6a9935ab8468f91bccdf0e81217e, type: 3}
+    - {fileID: 2800000, guid: 0107877e5f4474feeb6c3a48ddbd0181, type: 3}
+    - {fileID: 2800000, guid: e6614d7880f624bebb9eb042438465e7, type: 3}
+    - {fileID: 2800000, guid: 11f8939ed19d74afd9f1ec5c2cd1ed40, type: 3}
+    - {fileID: 2800000, guid: 58233a1daedbb4a24b2ddca6bcb864fd, type: 3}
+    - {fileID: 2800000, guid: 03108c847a5054b63971245729018c27, type: 3}
+    - {fileID: 2800000, guid: e4a00da9d5759447c948b8fa241afc3e, type: 3}
+    - {fileID: 2800000, guid: dd87b4353a45646fbbeaafe8c13a4632, type: 3}
+    - {fileID: 2800000, guid: 7c661cddbbc49467d8441a35766809e1, type: 3}
+    - {fileID: 2800000, guid: 0e2733676e1be451a8519a89c49798c1, type: 3}
+    - {fileID: 2800000, guid: 7529bbf4240db4e31a7b6f4df456a36a, type: 3}
+    - {fileID: 2800000, guid: 082c2d0dec6374c548992e3de4c3cc17, type: 3}
+    - {fileID: 2800000, guid: ab7ed8048d1084deca39266a82de2fbc, type: 3}
+    - {fileID: 2800000, guid: 044267119b30c460785747c947493225, type: 3}
+    - {fileID: 2800000, guid: ebc537e5817db4407935a71d199232e9, type: 3}
+    - {fileID: 2800000, guid: 687226eea50e240aeb387bc0204de028, type: 3}
+    - {fileID: 2800000, guid: d320d0b7f786e44768dbf452a215d9f4, type: 3}
+    - {fileID: 2800000, guid: c5d88737534914e22a2b08bf691052c3, type: 3}
+    - {fileID: 2800000, guid: f135276cb2d8f43339f0cbe999537c48, type: 3}
+    - {fileID: 2800000, guid: 4f5b4c2303ae14f8aa8d2daf5803f417, type: 3}
+    - {fileID: 2800000, guid: 0b7cc907f403f4a67ad658df2c8b8bd6, type: 3}
+    - {fileID: 2800000, guid: fac2f1f21015b4387ba948c68d69b20a, type: 3}
+    - {fileID: 2800000, guid: 6db8a26aaf376472cb3da4b0174c3640, type: 3}
+    - {fileID: 2800000, guid: 1944ddda93ef84249abc2c330ccc1671, type: 3}
+    - {fileID: 2800000, guid: a30bf5a5fe0484028b110056f3f4bfb7, type: 3}
+    - {fileID: 2800000, guid: 7a8716b2f7dea49e2a0a4b04902a7b29, type: 3}
+    - {fileID: 2800000, guid: 137d66878d81240e08b1f9e634dd03e5, type: 3}
+    - {fileID: 2800000, guid: c9076402f3d8e4f14b590c121f9c99d0, type: 3}
+    - {fileID: 2800000, guid: 620836cccebfa47d69f3604400cda9d1, type: 3}
+    - {fileID: 2800000, guid: 036dc8ba1666442588bd4900d7967f74, type: 3}
+    - {fileID: 2800000, guid: 82fb7f520a3d042f68f126f07425081c, type: 3}
+    - {fileID: 2800000, guid: 4e7efc4278c98434aa518be230a9a6e2, type: 3}
+    - {fileID: 2800000, guid: 458074caa850a4ebe9902dadcebd5519, type: 3}
+    - {fileID: 2800000, guid: 92753e7463d6c4451bcfaa1be32e5834, type: 3}
+    - {fileID: 2800000, guid: 084d642e01f7849d0a49230ab9cc18b9, type: 3}
+    - {fileID: 2800000, guid: ce1ea5fcdbd674590ac8eae01e003bad, type: 3}
+    - {fileID: 2800000, guid: 7298f85c9be3e480ca29a540b881acc7, type: 3}
+    - {fileID: 2800000, guid: acf622f4b8b10451f864e6bbe0f2d18c, type: 3}
+    - {fileID: 2800000, guid: 69c249842084043e0b2152a611527273, type: 3}
+    - {fileID: 2800000, guid: 9369285ebc9f1452cb96bdd4c71dc580, type: 3}
+    - {fileID: 2800000, guid: 18bdd168063b3419c93ff0ad3d928768, type: 3}
+    - {fileID: 2800000, guid: a909a2534241641bfa4fd6d3aa0997fa, type: 3}
+    - {fileID: 2800000, guid: 1cedae3cd8e1c4e8b8351163cb83d3c3, type: 3}
+    - {fileID: 2800000, guid: 40b46970b24114095ae4592b09cd788b, type: 3}
+    - {fileID: 2800000, guid: 12f59c252111d4ddaa1efdbe970c9338, type: 3}
+    - {fileID: 2800000, guid: 88f8d005a66c74c8e8516498671a5363, type: 3}
+    - {fileID: 2800000, guid: 644d6a9935ab8468f91bccdf0e81217e, type: 3}
+    - {fileID: 2800000, guid: 0107877e5f4474feeb6c3a48ddbd0181, type: 3}
+    - {fileID: 2800000, guid: e6614d7880f624bebb9eb042438465e7, type: 3}
+    - {fileID: 2800000, guid: 11f8939ed19d74afd9f1ec5c2cd1ed40, type: 3}
+    - {fileID: 2800000, guid: 58233a1daedbb4a24b2ddca6bcb864fd, type: 3}
+    - {fileID: 2800000, guid: 03108c847a5054b63971245729018c27, type: 3}
+    - {fileID: 2800000, guid: e4a00da9d5759447c948b8fa241afc3e, type: 3}
+    - {fileID: 2800000, guid: dd87b4353a45646fbbeaafe8c13a4632, type: 3}
+    - {fileID: 2800000, guid: 7c661cddbbc49467d8441a35766809e1, type: 3}
+    - {fileID: 2800000, guid: 0e2733676e1be451a8519a89c49798c1, type: 3}
+    - {fileID: 2800000, guid: 7529bbf4240db4e31a7b6f4df456a36a, type: 3}
+    - {fileID: 2800000, guid: 082c2d0dec6374c548992e3de4c3cc17, type: 3}
+    - {fileID: 2800000, guid: ab7ed8048d1084deca39266a82de2fbc, type: 3}
+    - {fileID: 2800000, guid: 044267119b30c460785747c947493225, type: 3}
+    - {fileID: 2800000, guid: ebc537e5817db4407935a71d199232e9, type: 3}
+    - {fileID: 2800000, guid: 687226eea50e240aeb387bc0204de028, type: 3}
+    - {fileID: 2800000, guid: d320d0b7f786e44768dbf452a215d9f4, type: 3}
+    - {fileID: 2800000, guid: c5d88737534914e22a2b08bf691052c3, type: 3}
+    - {fileID: 2800000, guid: 9e984408ac7ba4153bace3927806efeb, type: 3}
+    - {fileID: 2800000, guid: f135276cb2d8f43339f0cbe999537c48, type: 3}
+    - {fileID: 2800000, guid: 4f5b4c2303ae14f8aa8d2daf5803f417, type: 3}
+    - {fileID: 2800000, guid: 0b7cc907f403f4a67ad658df2c8b8bd6, type: 3}
+    - {fileID: 2800000, guid: fac2f1f21015b4387ba948c68d69b20a, type: 3}
+    - {fileID: 2800000, guid: 6db8a26aaf376472cb3da4b0174c3640, type: 3}
+    - {fileID: 2800000, guid: 1944ddda93ef84249abc2c330ccc1671, type: 3}
+    - {fileID: 2800000, guid: a30bf5a5fe0484028b110056f3f4bfb7, type: 3}
+    - {fileID: 2800000, guid: 7a8716b2f7dea49e2a0a4b04902a7b29, type: 3}
+    - {fileID: 2800000, guid: 137d66878d81240e08b1f9e634dd03e5, type: 3}
+    - {fileID: 2800000, guid: c9076402f3d8e4f14b590c121f9c99d0, type: 3}
+    - {fileID: 2800000, guid: 620836cccebfa47d69f3604400cda9d1, type: 3}
+    - {fileID: 2800000, guid: 036dc8ba1666442588bd4900d7967f74, type: 3}
+    - {fileID: 2800000, guid: 82fb7f520a3d042f68f126f07425081c, type: 3}
+    - {fileID: 2800000, guid: 4e7efc4278c98434aa518be230a9a6e2, type: 3}
+    - {fileID: 2800000, guid: 458074caa850a4ebe9902dadcebd5519, type: 3}
+    - {fileID: 2800000, guid: 92753e7463d6c4451bcfaa1be32e5834, type: 3}
+    - {fileID: 2800000, guid: 084d642e01f7849d0a49230ab9cc18b9, type: 3}
+    - {fileID: 2800000, guid: ce1ea5fcdbd674590ac8eae01e003bad, type: 3}
+    - {fileID: 2800000, guid: 7298f85c9be3e480ca29a540b881acc7, type: 3}
+    - {fileID: 2800000, guid: acf622f4b8b10451f864e6bbe0f2d18c, type: 3}
+    - {fileID: 2800000, guid: 69c249842084043e0b2152a611527273, type: 3}
+    - {fileID: 2800000, guid: 9369285ebc9f1452cb96bdd4c71dc580, type: 3}
+    - {fileID: 2800000, guid: 18bdd168063b3419c93ff0ad3d928768, type: 3}
+    - {fileID: 2800000, guid: a909a2534241641bfa4fd6d3aa0997fa, type: 3}
+    - {fileID: 2800000, guid: 1cedae3cd8e1c4e8b8351163cb83d3c3, type: 3}
+    - {fileID: 2800000, guid: 40b46970b24114095ae4592b09cd788b, type: 3}
+    - {fileID: 2800000, guid: 12f59c252111d4ddaa1efdbe970c9338, type: 3}
+    - {fileID: 2800000, guid: 88f8d005a66c74c8e8516498671a5363, type: 3}
+    - {fileID: 2800000, guid: 644d6a9935ab8468f91bccdf0e81217e, type: 3}
+    - {fileID: 2800000, guid: 0107877e5f4474feeb6c3a48ddbd0181, type: 3}
+    - {fileID: 2800000, guid: e6614d7880f624bebb9eb042438465e7, type: 3}
+    - {fileID: 2800000, guid: 11f8939ed19d74afd9f1ec5c2cd1ed40, type: 3}
+    - {fileID: 2800000, guid: 58233a1daedbb4a24b2ddca6bcb864fd, type: 3}
+    - {fileID: 2800000, guid: 03108c847a5054b63971245729018c27, type: 3}
+    - {fileID: 2800000, guid: e4a00da9d5759447c948b8fa241afc3e, type: 3}
+    - {fileID: 2800000, guid: dd87b4353a45646fbbeaafe8c13a4632, type: 3}
+    - {fileID: 2800000, guid: 7c661cddbbc49467d8441a35766809e1, type: 3}
+    - {fileID: 2800000, guid: 0e2733676e1be451a8519a89c49798c1, type: 3}
+    - {fileID: 2800000, guid: 7529bbf4240db4e31a7b6f4df456a36a, type: 3}
+    - {fileID: 2800000, guid: 082c2d0dec6374c548992e3de4c3cc17, type: 3}
+    - {fileID: 2800000, guid: ab7ed8048d1084deca39266a82de2fbc, type: 3}
+    - {fileID: 2800000, guid: 044267119b30c460785747c947493225, type: 3}
+    - {fileID: 2800000, guid: ebc537e5817db4407935a71d199232e9, type: 3}
+    - {fileID: 2800000, guid: 687226eea50e240aeb387bc0204de028, type: 3}
+    - {fileID: 2800000, guid: d320d0b7f786e44768dbf452a215d9f4, type: 3}
+    - {fileID: 2800000, guid: c5d88737534914e22a2b08bf691052c3, type: 3}
+    - {fileID: 2800000, guid: 9e984408ac7ba4153bace3927806efeb, type: 3}
     - {fileID: 2800000, guid: 92753e7463d6c4451bcfaa1be32e5834, type: 3}
     - {fileID: 2800000, guid: 69c249842084043e0b2152a611527273, type: 3}
     - {fileID: 2800000, guid: 620836cccebfa47d69f3604400cda9d1, type: 3}
@@ -61,5 +295,58 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: 7c661cddbbc49467d8441a35766809e1, type: 3}
     - {fileID: 2800000, guid: 7a8716b2f7dea49e2a0a4b04902a7b29, type: 3}
     - {fileID: 2800000, guid: 7529bbf4240db4e31a7b6f4df456a36a, type: 3}
+    - {fileID: 2800000, guid: f135276cb2d8f43339f0cbe999537c48, type: 3}
+    - {fileID: 2800000, guid: 4f5b4c2303ae14f8aa8d2daf5803f417, type: 3}
+    - {fileID: 2800000, guid: a87149123ae00504d802648411192f19, type: 3}
+    - {fileID: 2800000, guid: 9c4fd4838fb139248bd31b4595d3d3e0, type: 3}
+    - {fileID: 2800000, guid: 0b7cc907f403f4a67ad658df2c8b8bd6, type: 3}
+    - {fileID: 2800000, guid: 104a340bfa7bdc842a914e4855a3f023, type: 3}
+    - {fileID: 2800000, guid: fac2f1f21015b4387ba948c68d69b20a, type: 3}
+    - {fileID: 2800000, guid: 6db8a26aaf376472cb3da4b0174c3640, type: 3}
+    - {fileID: 2800000, guid: 1944ddda93ef84249abc2c330ccc1671, type: 3}
+    - {fileID: 2800000, guid: a30bf5a5fe0484028b110056f3f4bfb7, type: 3}
+    - {fileID: 2800000, guid: 7a8716b2f7dea49e2a0a4b04902a7b29, type: 3}
+    - {fileID: 2800000, guid: fb9317113944240948cfe4a213422ff8, type: 3}
+    - {fileID: 2800000, guid: 137d66878d81240e08b1f9e634dd03e5, type: 3}
+    - {fileID: 2800000, guid: c9076402f3d8e4f14b590c121f9c99d0, type: 3}
+    - {fileID: 2800000, guid: 620836cccebfa47d69f3604400cda9d1, type: 3}
+    - {fileID: 2800000, guid: 036dc8ba1666442588bd4900d7967f74, type: 3}
+    - {fileID: 2800000, guid: df1cd931072aa4a118088d9e27a0a603, type: 3}
+    - {fileID: 2800000, guid: 82fb7f520a3d042f68f126f07425081c, type: 3}
+    - {fileID: 2800000, guid: 4e7efc4278c98434aa518be230a9a6e2, type: 3}
+    - {fileID: 2800000, guid: e701ef601bf944f31a3d97f606f78430, type: 3}
+    - {fileID: 2800000, guid: 458074caa850a4ebe9902dadcebd5519, type: 3}
+    - {fileID: 2800000, guid: 92753e7463d6c4451bcfaa1be32e5834, type: 3}
+    - {fileID: 2800000, guid: 084d642e01f7849d0a49230ab9cc18b9, type: 3}
+    - {fileID: 2800000, guid: ce1ea5fcdbd674590ac8eae01e003bad, type: 3}
+    - {fileID: 2800000, guid: 7298f85c9be3e480ca29a540b881acc7, type: 3}
+    - {fileID: 2800000, guid: acf622f4b8b10451f864e6bbe0f2d18c, type: 3}
+    - {fileID: 2800000, guid: 69c249842084043e0b2152a611527273, type: 3}
+    - {fileID: 2800000, guid: 9369285ebc9f1452cb96bdd4c71dc580, type: 3}
+    - {fileID: 2800000, guid: 18bdd168063b3419c93ff0ad3d928768, type: 3}
+    - {fileID: 2800000, guid: a909a2534241641bfa4fd6d3aa0997fa, type: 3}
+    - {fileID: 2800000, guid: 1cedae3cd8e1c4e8b8351163cb83d3c3, type: 3}
+    - {fileID: 2800000, guid: 40b46970b24114095ae4592b09cd788b, type: 3}
+    - {fileID: 2800000, guid: 12f59c252111d4ddaa1efdbe970c9338, type: 3}
+    - {fileID: 2800000, guid: 88f8d005a66c74c8e8516498671a5363, type: 3}
+    - {fileID: 2800000, guid: 644d6a9935ab8468f91bccdf0e81217e, type: 3}
+    - {fileID: 2800000, guid: 0107877e5f4474feeb6c3a48ddbd0181, type: 3}
+    - {fileID: 2800000, guid: e6614d7880f624bebb9eb042438465e7, type: 3}
+    - {fileID: 2800000, guid: 11f8939ed19d74afd9f1ec5c2cd1ed40, type: 3}
+    - {fileID: 2800000, guid: 58233a1daedbb4a24b2ddca6bcb864fd, type: 3}
+    - {fileID: 2800000, guid: 03108c847a5054b63971245729018c27, type: 3}
+    - {fileID: 2800000, guid: e4a00da9d5759447c948b8fa241afc3e, type: 3}
+    - {fileID: 2800000, guid: dd87b4353a45646fbbeaafe8c13a4632, type: 3}
+    - {fileID: 2800000, guid: 7c661cddbbc49467d8441a35766809e1, type: 3}
+    - {fileID: 2800000, guid: 0e2733676e1be451a8519a89c49798c1, type: 3}
+    - {fileID: 2800000, guid: 7529bbf4240db4e31a7b6f4df456a36a, type: 3}
+    - {fileID: 2800000, guid: 082c2d0dec6374c548992e3de4c3cc17, type: 3}
+    - {fileID: 2800000, guid: ab7ed8048d1084deca39266a82de2fbc, type: 3}
+    - {fileID: 2800000, guid: 044267119b30c460785747c947493225, type: 3}
+    - {fileID: 2800000, guid: ebc537e5817db4407935a71d199232e9, type: 3}
+    - {fileID: 2800000, guid: 687226eea50e240aeb387bc0204de028, type: 3}
+    - {fileID: 2800000, guid: d320d0b7f786e44768dbf452a215d9f4, type: 3}
+    - {fileID: 2800000, guid: c5d88737534914e22a2b08bf691052c3, type: 3}
+    - {fileID: 2800000, guid: 9e984408ac7ba4153bace3927806efeb, type: 3}
   m_IsVariant: 0
   m_IsPlaceholder: 0

Assets/Res/UIAtlas/heroIcon.spriteatlasv2

@@ -0,0 +1,19 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!612988286 &1
+SpriteAtlasAsset:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  serializedVersion: 3
+  m_MasterAtlas: {fileID: 0}
+  m_ImporterData:
+    packables:
+    - {fileID: 2800000, guid: 686bc6c27b77549b0a4309b808e6620b, type: 3}
+    - {fileID: 2800000, guid: ff7f553a76e6f4322a64fbb61d20f9ba, type: 3}
+    - {fileID: 2800000, guid: 40bc652a2f80c4500b10133dd8ca5e43, type: 3}
+    - {fileID: 2800000, guid: 3077f31e475de4831b14989f053d238f, type: 3}
+  m_IsVariant: 0
+  m_IsPlaceholder: 0

Assets/Res/UIAtlas/heroIcon.spriteatlasv2.meta

@@ -0,0 +1,31 @@
+fileFormatVersion: 2
+guid: DisdsCP4ASpJWW+yv3WvThwzL8/T0WZJOugmuodBPeyqpmMFuc7HiE0=
+SpriteAtlasImporter:
+  externalObjects: {}
+  textureSettings:
+    serializedVersion: 3
+    anisoLevel: 1
+    compressionQuality: 50
+    maxTextureSize: 2048
+    textureCompression: 0
+    filterMode: 1
+    generateMipMaps: 0
+    readable: 0
+    crunchedCompression: 0
+    webStreaming: 0
+    sRGB: 1
+  platformSettings: []
+  packingSettings:
+    serializedVersion: 2
+    padding: 4
+    blockOffset: 1
+    allowAlphaSplitting: 0
+    enableRotation: 0
+    enableTightPacking: 0
+    enableAlphaDilation: 0
+  secondaryTextureSettings: {}
+  variantMultiplier: 1
+  bindAsDefault: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Core/Event/Event/CustomEventType.cs

@@ -12,5 +12,13 @@ namespace Fort23.Core
       /// 战斗道具飞行
       /// </summary>
       Combat_EquipFall,
+      /// <summary>
+      /// 英雄升级
+      /// </summary>
+      HeroUpgrade,
+      /// <summary>
+      /// 英雄升星
+      /// </summary>
+      HeroPromote,
     }
 }

Assets/Scripts/GameData/ExcelConfig/HeroModelConfig.cs

@@ -104,6 +104,12 @@ public int attack;
 public int shanbi;
 
 
+		/// <summary>
+		///经验产出
+		/// </summary>
+public long expGain;
+
+
 		/// <summary>
 		///移动速度
 		/// </summary>

Assets/Scripts/GameData/ExcelConfig/HeroPowerUpConfig.cs

@@ -50,6 +50,12 @@ public float DEFFactor;
 public float SHANBIFactor;
 
 
+		/// <summary>
+		///经验产出倍率
+		/// </summary>
+public float EXPFactor;
+
+
 		/// <summary>
 		///升级所需经验值 （0代表最大等级)
 		/// </summary>

Assets/Scripts/GameLogic/Combat/CombatEvent/HeroLvUpgradeEventData.cs

@@ -0,0 +1,9 @@
+using Core.Utility.Event;
+
+namespace Common.Utility.CombatEvent
+{
+    public class HeroLvUpgradeEventData : EventDataBasic<HeroLvUpgradeEventData>
+    {
+        public int heroModelID;
+    }
+}

Assets/Scripts/GameLogic/Combat/CombatEvent/HeroLvUpgradeEventData.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 0402f8e7dca441fdace61cb0c172ffcf
+timeCreated: 1732699300

Assets/Scripts/GameLogic/Combat/Hero/CombatHeroInfo.cs

@@ -18,13 +18,18 @@ public class CombatHeroInfo
     /// </summary>
     public EncryptionInt shanbi = new EncryptionInt(); 
     
+    /// <summary>
+    /// 经验产出
+    /// </summary>
+    public EncryptionLong expGain = new EncryptionLong();
+    
     public EncryptionFloat attSpeed = new EncryptionFloat();
     public EncryptionFloat crit =new EncryptionFloat();
     public EncryptionFloat critDamage =new EncryptionFloat();
-    public EncryptionFloat dodge = new EncryptionFloat();
+    // public EncryptionFloat dodge = new EncryptionFloat();
 
-    public int level;
-    public int star;
+    public EncryptionInt level;
+    public EncryptionInt star;
     
     public HeroModelConfig modelConfig;
 
@@ -76,13 +81,19 @@ public class CombatHeroInfo
         factor = rarityFactor * starFactor;
     }
 
-    protected void CalAttribute()
+
+    protected void CalBasicAttribute()
     {
         hp = (EncryptionLong)(modelConfig.hp * powerUpConfig.HPFactor * factor);
         defense = (EncryptionLong)(modelConfig.def * powerUpConfig.DEFFactor * factor);
         attack = (EncryptionLong)(modelConfig.attack * powerUpConfig.ATKFactor * factor);
-        
-        shanbi = (EncryptionInt)(modelConfig.shanbi * powerUpConfig.SHANBIFactor);
+        shanbi = (EncryptionInt)(modelConfig.shanbi * powerUpConfig.SHANBIFactor * factor);
+        expGain = (EncryptionLong)(modelConfig.expGain * powerUpConfig.EXPFactor * factor);
+    }
+    
+    protected void CalAttribute()
+    {
+        CalBasicAttribute();
 
         attSpeed = (EncryptionFloat)modelConfig.speed_atk;
         crit = (EncryptionFloat)modelConfig.crit;
@@ -94,11 +105,13 @@ public class CombatHeroInfo
         heroType = modelConfig.heroType;
     }
 
-    protected void SetDataConfig(int id,int level, int star)
+    protected void SetDataConfig(int modelID,int level, int star)
     {
-        modelConfig = ConfigComponent.Instance.Get<HeroModelConfig>(id);
+        modelConfig = ConfigComponent.Instance.Get<HeroModelConfig>(modelID);
         powerUpConfig = ConfigComponent.Instance.Get<HeroPowerUpConfig>(level);
         promoteConfig = ConfigComponent.Instance.Get<HeroPromoteConfig>(star);
+        this.level = (EncryptionInt)level;
+        this.star = (EncryptionInt)star;
     }
     
     public void InitMonster(int modelID,int level, int star = 1)

Assets/Scripts/GameLogic/CombatScenesTool/TestCombatHeroConfig.cs

@@ -24,7 +24,7 @@ namespace GameLogic.CombatScenesTool
                 combatHeroInfo.attack.Value = (att);
                 combatHeroInfo.crit.Value = (0);
                 combatHeroInfo.critDamage.Value = (0);
-                combatHeroInfo.dodge.Value = (0);
+                combatHeroInfo.shanbi.Value = (0);
                 combatHeroInfo.maxDis = attDis;
                 combatHeroInfo.maxDisTo = attDis * attDis;
                 combatHeroInfo.skillId = skillId;

Assets/Scripts/GameLogic/Hero/HeroInfo.cs

@@ -32,31 +32,53 @@ namespace GameLogic.Hero
                 return _iconZhiYe;
             }
         }
-        
-        //
-        // public int level;
-        // public int star;
-        
-        
+
+        public int modelID;
+
+        /// <summary>
+        /// 是否为上阵英雄
+        /// </summary>
+        public bool isLead;
+
         public void InitHero(AccountFileInfo.HeroData heroData)
         {
+            modelID = heroData.heroModelId;
             SetDataConfig(heroData.heroModelId, 
                 heroData.heroPowerId, 
                 heroData.heroPromoteId);
             CalFactor();
             CalAttribute();
         }
-        
-        // public HeroInfo(AccountFileInfo.HeroData heroData)
-        // {
-        //     modelConfig = ConfigComponent.Instance.Get<HeroModelConfig>(heroData.heroModelId);
-        //     promoteConfig = ConfigComponent.Instance.Get<HeroPromoteConfig>(heroData.heroPromoteId);
-        //     powerConfig = ConfigComponent.Instance.Get<HeroPowerConfig>(heroData.heroPowerId);
-        //     
-        //     lv = powerConfig.heroLevel;
-        //     star = promoteConfig.starGrade;
-        // }
 
-        
+        public HeroInfo Upgrade()
+        {
+            level.Value++;
+            powerUpConfig = ConfigComponent.Instance.Get<HeroPowerUpConfig>(level.Value);
+            CalFactor();
+            CalBasicAttribute();
+            PlayerManager.Instance.SaveHeroData(this);
+
+            return this;
+        }
+
+        public void Promote()
+        {
+            star.Value++;
+            promoteConfig = ConfigComponent.Instance.Get<HeroPromoteConfig>(star.Value);
+            CalFactor();
+            CalBasicAttribute();
+            PlayerManager.Instance.SaveHeroData(this);
+        }
+
+        public AccountFileInfo.HeroData ToHeroData()
+        {
+            AccountFileInfo.HeroData heroData = new AccountFileInfo.HeroData
+            {
+                heroModelId = modelConfig.ID,
+                heroPowerId = powerUpConfig.ID,
+                heroPromoteId = promoteConfig.ID
+            };
+            return heroData;
+        }
     }
 }

Assets/Scripts/GameLogic/Player/PlayerManager.cs

@@ -1,6 +1,5 @@
 using System.Collections;
 using System.Collections.Generic;
-using Common.Utility.CombatEvent;
 using Excel2Json;
 using Fort23.UTool;
 using GameLogic.Hero;
@@ -10,7 +9,6 @@ using Utility;
 public class PlayerManager : Singleton<PlayerManager>
 {
     public List<HeroInfo> heroList = new List<HeroInfo>();
-
     /// <summary>
     /// 上阵的英雄，也可以叫主力，替补英雄等级=主力英雄的最低等级（和afk一样的）
     /// </summary>
@@ -18,8 +16,6 @@ public class PlayerManager : Singleton<PlayerManager>
 
     public GameConstantConfig gameConstantConfig;
 
-    
-
     public void Init()
     {
         gameConstantConfig = ConfigComponent.Instance.Get<GameConstantConfig>(1);
@@ -37,4 +33,62 @@ public class PlayerManager : Singleton<PlayerManager>
             heroListInLead.Add(heroInfo);
         }
     }
-}
+
+    public HeroInfo GetHeroInfo(int modelID)
+    {
+        for (int i = 0; i < heroListInLead.Count; i++)
+        {
+            HeroInfo info = heroListInLead[i];
+            if (info.modelID == modelID)
+            {
+                return info;
+            }
+        }
+
+        return null;
+    }
+
+    private int leadHeroIdx = 0;
+
+    /// <summary>
+    /// 快速保存英雄数据
+    /// 反复升级统一英雄时，就不用反复遍历列表了
+    /// </summary>
+    /// <param name="heroInfo"></param>
+    /// <returns>ture=升级的是同一个英雄</returns>
+    private bool QuickSaveHeroData(HeroInfo heroInfo)
+    {
+        var lastHeroData= AccountFileInfo.Instance.playerData.HeroListInLeadDatas[leadHeroIdx];
+        
+        if (heroInfo.modelID == lastHeroData.heroModelId)
+        {
+            AccountFileInfo.Instance.playerData.HeroListInLeadDatas[leadHeroIdx] = heroInfo.ToHeroData();
+            AccountFileInfo.Instance.SavePlayerData();
+            return true;
+        }
+
+        return false;
+    }
+    
+    /// <summary>
+    /// 保存英雄数据
+    /// </summary>
+    /// <param name="heroInfo"></param>
+    public void SaveHeroData(HeroInfo heroInfo)
+    {
+        if (!QuickSaveHeroData(heroInfo))
+        {
+            for (int i = 0; i < AccountFileInfo.Instance.playerData.HeroListInLeadDatas.Count; i++)
+            {
+                AccountFileInfo.HeroData heroData = AccountFileInfo.Instance.playerData.HeroListInLeadDatas[i];
+                if (heroData.heroModelId == heroInfo.modelID)
+                {
+                    AccountFileInfo.Instance.playerData.HeroListInLeadDatas[i] = heroInfo.ToHeroData();
+                    //存下来，用于快速查找
+                    leadHeroIdx = i;
+                    return;
+                }
+            }
+        }
+    }
+}

Assets/Scripts/GameUI/UI/Hero/HeroDetailPanel.cs

@@ -1,4 +1,7 @@
+using Common.Utility.CombatEvent;
+using Core.Language;
 using Excel2Json;
+using Fort23.Core;
 using Fort23.UTool;
 using GameLogic.Hero;
 using UnityEngine.UI;
@@ -8,6 +11,9 @@ namespace Fort23.Mono
     [UIBinding(prefab = "HeroDetailPanel"  )]
     public partial class HeroDetailPanel : UIPanel
     {
+        
+        private HeroInfo heroInfo;
+        
         private void Init()
         {
             // InitHeroDetailPanel();
@@ -21,8 +27,24 @@ namespace Fort23.Mono
         public override void AddButtonEvent()
         {
             btnBack.onClick.AddListener(OnClickClose);
+            btnUpgrade.onClick.AddListener(OnClickUpgrade);
+            btnPromote.onClick.AddListener(OnClickPromote);
         }
 
+
+        private void OnClickPromote()
+        {
+            
+        }
+        
+        private void OnClickUpgrade()
+        {
+            heroInfo = heroInfo.Upgrade();
+            UpdateAttributeUI();
+            HeroLvUpgradeEventData data = new HeroLvUpgradeEventData();
+            data.heroModelID = heroInfo.modelID;
+            EventManager.Instance.Dispatch(CustomEventType.HeroUpgrade, data);
+        }
         private void OnClickClose()
         {
             UIManager.Instance.HideUIUIPanel(this);
@@ -30,9 +52,38 @@ namespace Fort23.Mono
 
         public void InitHeroDetailPanel(HeroInfo heroInfo)
         {
+            this.heroInfo = heroInfo;
             iconZhiYe.icon_name = heroInfo.iconZhiYe;
-            
-            LogTool.Log(heroInfo);
+            heroName.text = LanguageManager.Instance.Text(heroInfo.modelConfig.name);
+            HeroUITools.SetStarShow(stars, heroInfo.star.Value);
+
+            switch (heroInfo.modelConfig.rarity)
+            {
+                case 1:
+                    heroRarity.text = LanguageManager.Instance.Text(32);
+                    break;
+                case 2:
+                    heroRarity.text = LanguageManager.Instance.Text(31);
+                    break;
+                case 3:
+                    heroRarity.text = LanguageManager.Instance.Text(30);
+                    break;
+                default:
+                    LogTool.Error("找不到hero的稀有度:" + heroInfo.modelConfig.ID);
+                    break;
+            }
+
+            UpdateAttributeUI();
+        }
+
+        public void UpdateAttributeUI()
+        {
+            txtHP.text = heroInfo.hp.Value.ToString();
+            txtATK.text = heroInfo.attack.Value.ToString();
+            txtDEF.text = heroInfo.defense.Value.ToString();
+            txtSHANBI.text = heroInfo.shanbi.Value.ToString();
+            txtLv.text = heroInfo.level.Value.ToString();
+            txtExpGain.text = heroInfo.expGain.Value.ToString();
         }
 
     }

Assets/Scripts/GameUI/UI/Hero/HeroDetailPanelData.cs

@@ -3,6 +3,8 @@ using Fort23.UTool;
 using UnityEngine.UI;
 using UnityEngine;
 using System.Collections.Generic;
+using TMPro;
+
 namespace Fort23.Mono
 {
 	public partial class HeroDetailPanel 
@@ -19,15 +21,15 @@ namespace Fort23.Mono
 	      return _btnBack;
 	     }
 	   }
-	  private Text _heroGrade;
-	  public Text heroGrade
+	  private Text _heroRarity;
+	  public Text heroRarity
 	   {
 	   get{
-	      if (_heroGrade == null)
+	      if (_heroRarity == null)
 	       {
-	         _heroGrade  = GetUIUnit<Text>("heroGrade"); 
+	         _heroRarity  = GetUIUnit<Text>("heroRarity"); 
 	       }
-	      return _heroGrade;
+	      return _heroRarity;
 	     }
 	   }
 	  private Text _heroName;
@@ -63,6 +65,171 @@ namespace Fort23.Mono
 	      return _iconZhiYe;
 	     }
 	   }
+	  private TextMeshProUGUI _txtHP;
+	  public TextMeshProUGUI txtHP
+	   {
+	   get{
+	      if (_txtHP == null)
+	       {
+	         _txtHP  = GetUIUnit<TextMeshProUGUI>("txtHP"); 
+	       }
+	      return _txtHP;
+	     }
+	   }
+	  private TextMeshProUGUI _txtATK;
+	  public TextMeshProUGUI txtATK
+	   {
+	   get{
+	      if (_txtATK == null)
+	       {
+	         _txtATK  = GetUIUnit<TextMeshProUGUI>("txtATK"); 
+	       }
+	      return _txtATK;
+	     }
+	   }
+	  private TextMeshProUGUI _txtDEF;
+	  public TextMeshProUGUI txtDEF
+	   {
+	   get{
+	      if (_txtDEF == null)
+	       {
+	         _txtDEF  = GetUIUnit<TextMeshProUGUI>("txtDEF"); 
+	       }
+	      return _txtDEF;
+	     }
+	   }
+	  private TextMeshProUGUI _txtSHANBI;
+	  public TextMeshProUGUI txtSHANBI
+	   {
+	   get{
+	      if (_txtSHANBI == null)
+	       {
+	         _txtSHANBI  = GetUIUnit<TextMeshProUGUI>("txtSHANBI"); 
+	       }
+	      return _txtSHANBI;
+	     }
+	   }
+	  private TextMeshProUGUI _txtLv;
+	  public TextMeshProUGUI txtLv
+	   {
+	   get{
+	      if (_txtLv == null)
+	       {
+	         _txtLv  = GetUIUnit<TextMeshProUGUI>("txtLv"); 
+	       }
+	      return _txtLv;
+	     }
+	   }
+	  private TextMeshProUGUI _txtExpGain;
+	  public TextMeshProUGUI txtExpGain
+	   {
+	   get{
+	      if (_txtExpGain == null)
+	       {
+	         _txtExpGain  = GetUIUnit<TextMeshProUGUI>("txtExpGain"); 
+	       }
+	      return _txtExpGain;
+	     }
+	   }
+	  private TextMeshProUGUI _txtUpgrade;
+	  public TextMeshProUGUI txtUpgrade
+	   {
+	   get{
+	      if (_txtUpgrade == null)
+	       {
+	         _txtUpgrade  = GetUIUnit<TextMeshProUGUI>("txtUpgrade"); 
+	       }
+	      return _txtUpgrade;
+	     }
+	   }
+	  private TextMeshProUGUI _txtPromote;
+	  public TextMeshProUGUI txtPromote
+	   {
+	   get{
+	      if (_txtPromote == null)
+	       {
+	         _txtPromote  = GetUIUnit<TextMeshProUGUI>("txtPromote"); 
+	       }
+	      return _txtPromote;
+	     }
+	   }
+	  private MyImage _heroShards;
+	  public MyImage heroShards
+	   {
+	   get{
+	      if (_heroShards == null)
+	       {
+	         _heroShards  = GetUIUnit<MyImage>("heroShards"); 
+	       }
+	      return _heroShards;
+	     }
+	   }
+	  private TextMeshProUGUI _txtBasicEquipLv;
+	  public TextMeshProUGUI txtBasicEquipLv
+	   {
+	   get{
+	      if (_txtBasicEquipLv == null)
+	       {
+	         _txtBasicEquipLv  = GetUIUnit<TextMeshProUGUI>("txtBasicEquipLv"); 
+	       }
+	      return _txtBasicEquipLv;
+	     }
+	   }
+	  private MyImage _iconCommonEquip;
+	  public MyImage iconCommonEquip
+	   {
+	   get{
+	      if (_iconCommonEquip == null)
+	       {
+	         _iconCommonEquip  = GetUIUnit<MyImage>("iconCommonEquip"); 
+	       }
+	      return _iconCommonEquip;
+	     }
+	   }
+	  private MyImage _iconSpecailEquip;
+	  public MyImage iconSpecailEquip
+	   {
+	   get{
+	      if (_iconSpecailEquip == null)
+	       {
+	         _iconSpecailEquip  = GetUIUnit<MyImage>("iconSpecailEquip"); 
+	       }
+	      return _iconSpecailEquip;
+	     }
+	   }
+	  private GameObject _lockObj;
+	  public GameObject lockObj
+	   {
+	   get{
+	      if (_lockObj == null)
+	       {
+	         _lockObj  = GetUIUnit<GameObject>("lockObj"); 
+	       }
+	      return _lockObj;
+	     }
+	   }
+	  private Button _btnUpgrade;
+	  public Button btnUpgrade
+	   {
+	   get{
+	      if (_btnUpgrade == null)
+	       {
+	         _btnUpgrade  = GetUIUnit<Button>("btnUpgrade"); 
+	       }
+	      return _btnUpgrade;
+	     }
+	   }
+	  private Button _btnPromote;
+	  public Button btnPromote
+	   {
+	   get{
+	      if (_btnPromote == null)
+	       {
+	         _btnPromote  = GetUIUnit<Button>("btnPromote"); 
+	       }
+	      return _btnPromote;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

Assets/Scripts/GameUI/UI/Hero/HeroUITools.cs

@@ -0,0 +1,58 @@
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+namespace Fort23.Mono
+{
+    public static class HeroUITools
+    {
+        /// <summary>
+        /// 根据星级，显示不同的数量的星星和样子
+        /// </summary>
+        /// <param name="stars"></param>
+        /// <param name="starGrade"></param>
+        public static void SetStarShow(List<object> stars, int starGrade)
+        {
+            // 最大星级展示个数（6星，只显示一颗星星，换颜色）
+            int maxShowStar = 5;
+
+            // 计算 当前星级 应该用什么星星的表现
+            int group = (starGrade - 1) / maxShowStar;
+            
+            int i = 1;
+            foreach (GameObject star in stars)
+            {
+                SetStarImg(group, star);
+                // 根据星级显示星星
+                if (starGrade >= i)
+                {
+                    star.SetActive(true);
+                }
+                else
+                {
+                    star.SetActive(false);
+                }
+                i++;
+            }
+        }
+        
+        private static void SetStarImg(int group, GameObject starObj)
+        {
+            MyImage image = starObj.GetComponent<MyImage>();
+            // 执行对应的逻辑  （0）GradeIcon_Star_s_Yellow  （1）GradeIcon_Star_s_Premium
+            switch (group)
+            {
+                case 0: // n = 1~5
+                    image.icon_name = "dec_star";
+                    break;
+                case 1: // n = 6~10
+                    image.icon_name = "dec_star";    
+                    break;
+                default: // 其他情况
+                    image.icon_name = "dec_star";
+                    break;
+            }
+        }
+        
+    }
+}

Assets/Scripts/GameUI/UI/Hero/HeroUITools.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 5540bab530cf4f1cbd86c91d8c0c2d02
+timeCreated: 1732690520

Assets/Scripts/GameUI/UI/Hero/WidgetHero.cs

@@ -55,55 +55,16 @@ namespace Fort23.Mono
         /// <param name="heroInfo"></param>
         public void InitHero(HeroInfo heroInfo)
         {
-            // GetComponent<RectTransform>().anchorMin = new Vector2(0.5f, 0.5f);
-            // GetComponent<RectTransform>().anchorMax = new Vector2(0.5f, 0.5f);
             this.heroInfo = heroInfo;
-            lv.text = heroInfo.level.ToString();
+            lv.text = heroInfo.level.Value.ToString();
+            iconHero.icon_name = heroInfo.modelConfig.headicon;
+            iconHero.SetNativeSize();
+            iconZhiYe.icon_name = heroInfo.iconZhiYe;
+            
+            HeroUITools.SetStarShow(stars, heroInfo.star.Value);
+            
             
-            // 最大星级展示个数（6星，只显示一颗星星，换颜色）
-            int maxShowStar = 5;
-
-            // 计算 当前星级 应该用什么星星的表现
-            int group = (heroInfo.star - 1) / maxShowStar;
-
-
-
-            int i = 1;
-            foreach (GameObject star in stars)
-            {
-                // Image image = star.GetComponent<Image>();
-
-                SetStarImg(group, star);
-                
-                if (heroInfo.star >= i)
-                {
-                    star.SetActive(true);
-                }
-                else
-                {
-                    star.SetActive(false);
-                }
-                i++;
-            }
-        }
-
-        private void SetStarImg(int group, GameObject starObj)
-        {
-            Image image = starObj.GetComponent<Image>();
-            // 执行对应的逻辑  （0）GradeIcon_Star_s_Yellow  （1）GradeIcon_Star_s_Premium
-            switch (group)
-            {
-                case 0: // n = 1~5
-                    image.name = "GradeIcon_Star_s_Yellow";
-                    break;
-                case 1: // n = 6~10
-                    image.name = "GradeIcon_Star_s_Premium";    
-                    break;
-                default: // 其他情况
-                    image.name = "GradeIcon_Star_s_Yellow";
-                    break;
-            }
         }
-
+        
     }
 }

Assets/Scripts/GameUI/UI/Hero/WidgetHeroData.cs

@@ -21,15 +21,15 @@ namespace Fort23.Mono
 	      return _bgImg;
 	     }
 	   }
-	  private Image _headIcon;
-	  public Image headIcon
+	  private MyImage _iconHero;
+	  public MyImage iconHero
 	   {
 	   get{
-	      if (_headIcon == null)
+	      if (_iconHero == null)
 	       {
-	         _headIcon  = GetUIUnit<Image>("headIcon"); 
+	         _iconHero  = GetUIUnit<MyImage>("iconHero"); 
 	       }
-	      return _headIcon;
+	      return _iconHero;
 	     }
 	   }
 	  private List<object> _stars;
@@ -54,15 +54,15 @@ namespace Fort23.Mono
 	      return _lv;
 	     }
 	   }
-	  private Image _zhiyeIcon;
-	  public Image zhiyeIcon
+	  private MyImage _iconZhiYe;
+	  public MyImage iconZhiYe
 	   {
 	   get{
-	      if (_zhiyeIcon == null)
+	      if (_iconZhiYe == null)
 	       {
-	         _zhiyeIcon  = GetUIUnit<Image>("zhiyeIcon"); 
+	         _iconZhiYe  = GetUIUnit<MyImage>("iconZhiYe"); 
 	       }
-	      return _zhiyeIcon;
+	      return _iconZhiYe;
 	     }
 	   }
 	  private Button _btnHero;

UGUIPack/uguiconfig.db

@@ -1 +1 @@
-{"allPackgInfos":[{"packName":"all","packgJsonPath":"/Art/UIAssets/TextrueJson/all.txt","packgSpritePath":"Assets/Res/UIAtlas/all.spriteatlasv2","lasetJsonGUID":"03b3872585b24d54f63b884a410da2bc"}],"isJiaoYan":true}
+{"allPackgInfos":[{"packName":"all","packgJsonPath":"/Art/UIAssets/TextrueJson/all.txt","packgSpritePath":"Assets/Res/UIAtlas/all.spriteatlasv2","lasetJsonGUID":"e90cdb0036b7598e8196c482eccd4329"},{"packName":"heroIcon","packgJsonPath":"/Art/UIAssets/TextrueJson/heroIcon.txt","packgSpritePath":"Assets/Res/UIAtlas/heroIcon.spriteatlasv2","lasetJsonGUID":"e21daa5d31e00b95876c58a9ce604a30"}],"isJiaoYan":true}

UserSettings/EditorUserSettings.asset

@@ -33,10 +33,10 @@ EditorUserSettings:
       value: 5a50500553530b595d0f597343770941474e4c722e2a20367e794861e1b86c68
       flags: 0
     RecentlyUsedSceneGuid-4:
-      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
+      value: 5a500c0357030b0f0858097a44770f40154f4f2e2a2c743229794b64e0b56c6a
       flags: 0
     RecentlyUsedSceneGuid-5:
-      value: 5a500c0357030b0f0858097a44770f40154f4f2e2a2c743229794b64e0b56c6a
+      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
       flags: 0
     Systems Window:
       value: 183b144645154b7802000a2b17364d11021e17246e72662b47695d73a2a07478a2a505e1e82d6f2f100cca3210371526d1051c05e22a040f2507f00b32f01c061ccb5a9f5ace1e10d81c50a48d5d91a3959694aa9ad8efd7c9f2afe0f1c0fcfdf6f8b6f2a5a6dacfb89debbfa1cbc9c3f5c3bac18e9c89c1bbdec2d6f2b992939996c59699c79ae8d182b7baad82aba0b0aea88398abdbf1dd8a8ea765ffc520262728fafcf8f6c28eb162945c71898d6167877a72a980809c9f71cecece859d579fd5f106dbdadb21de0dde237c686c76706641634c764f547c624a7e622d6628286620686f653d2b635a0204003e0805017509093043470e3643041c5d5b415c54450e1c424b420f6e4b634e636263696655641a1f273c0f083c1102ec362de62318e9ea25ab61ade8ed0ee30655b0b6b7b8176615

美术/unity_use_ui/TextrueJson/heroIcon.txt

@@ -0,0 +1 @@
+{"packName":"heroIcon","isTyPack":false,"newTextureJson":[{"textrueName":"icon_tx116","filePath":"/icon/icon_tx116.png"},{"textrueName":"icon_tx105","filePath":"/icon/icon_tx105.png"},{"textrueName":"icon_tx107","filePath":"/icon/icon_tx107.png"},{"textrueName":"icon_tx113","filePath":"/icon/icon_tx113.png"}],"keyToValue":{}}

美术/工具/imgui.ini

@@ -10,27 +10,27 @@ Collapsed=0
 
 [Window][Tool]
 Pos=400,0
-Size=666,100
+Size=900,100
 Collapsed=0
 
 [Window][unity_art]
-Pos=1066,0
+Pos=1300,0
 Size=400,720
 Collapsed=0
 
 [Window][console]
 Pos=400,520
-Size=666,70
+Size=900,70
 Collapsed=0
 
 [Window][控制台]
 Pos=400,590
-Size=666,130
+Size=900,130
 Collapsed=0
 
 [Window][scence]
 Pos=400,100
-Size=666,420
+Size=900,420
 Collapsed=0
 
 [Docking][Data]