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

# Conflicts:
#	UserSettings/Layouts/default-2022.dwlt   resolved by master version

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

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: DHxN4yuvVnNo7qCktGZTRoMXuyTOt56oM/gJq4Wfupc93gD+0VJzvJ0=
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/UIAssets/TextrueJson/bg.txt

@@ -1 +1 @@
-{"packName":"bg","isTyPack":false,"newTextureJson":[{"textrueName":"bg_Archer","filePath":"/bg/bg_Archer.png"},{"textrueName":"bg_zairu","filePath":"/bg/bg_zairu.png"},{"textrueName":"bg_herozbtop","filePath":"/bg/bg_herozbtop.png"},{"textrueName":"bg_warrior","filePath":"/bg/bg_warrior.png"},{"textrueName":"bg_Mage","filePath":"/bg/bg_Mage.png"},{"textrueName":"bg_priest","filePath":"/bg/bg_priest.png"},{"textrueName":"bg_herobagtop","filePath":"/bg/bg_herobagtop.png"}],"keyToValue":{}}
+{"packName":"bg","isTyPack":false,"newTextureJson":[{"textrueName":"bg_appIcon","filePath":"/bg/bg_appIcon.png"},{"textrueName":"bg_Archer","filePath":"/bg/bg_Archer.png"},{"textrueName":"bg_herobagtop","filePath":"/bg/bg_herobagtop.png"},{"textrueName":"bg_herozbtop","filePath":"/bg/bg_herozbtop.png"},{"textrueName":"bg_logo","filePath":"/bg/bg_logo.png"},{"textrueName":"bg_Mage","filePath":"/bg/bg_Mage.png"},{"textrueName":"bg_priest","filePath":"/bg/bg_priest.png"},{"textrueName":"bg_warrior","filePath":"/bg/bg_warrior.png"},{"textrueName":"bg_zairu","filePath":"/bg/bg_zairu.png"}],"keyToValue":{}}

Assets/Art/UIAssets/bg/bg_appIcon.png.meta

@@ -0,0 +1,133 @@
+fileFormatVersion: 2
+guid: B3sZtn75Vn8DHCbOspgxVAw8gu93x5hzhBapr+efQOreVi49rYblys4=
+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/bg/bg_logo.png.meta

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

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

@@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: CilLtC6oWyk8yu/EulfF8w1lTq+c+VV+FaIZz6NEsXjwGS2GD0rEaH0=
+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: 2, y: 2, z: 2, w: 7}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WeixinMiniGame
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 1537655665
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

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

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

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

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Boing_Bounce/desktop.ini.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: XnNOvS2rBXlxXpr16fvCmsPHgWH8VFHvaajxnXEO0+Lb+o7fajApk9g=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Bubble/Designed/desktop.ini.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: Wn9Osn6uWy19n3dRwPVXSi8zA/NNxMGamLi6utiwD+X5DpzMgms/FuQ=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Bubble/Natural/desktop.ini.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: D3IW4HirVHp0wSS+sYuhPq4wOVtRbtACyDpCZepeaCbfGI08iv6f7nQ=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Bubble/desktop.ini.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: CHkc4CmoWyo5sfhaQFShkw8xWrnK+juSPLRnEr3llUekkRBix5ZoBfM=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Cash_Register/desktop.ini.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: By8e43v/W3qLQOMbGDHKnzQ1oVBoz5MMFUugFGg14LSYNj1Njr+MPYQ=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Chest_Open/desktop.ini.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: CnxK5HivV33OupUJ+JP+V/9teQap+ztGB11Lq2ALmJ7bla/ddbhYa04=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Chimes/desktop.ini.meta

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

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Collect/Boxy/desktop.ini.meta

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

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Collect/Bright/desktop.ini.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: XHJK4S6rBi/k6hiG+4qlvyeg8D9jbTYaSpnLNdwRKj8F6vNTRi6falo=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Collect/Coin/desktop.ini.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: XX4etS2oB371NxuZcw05IS7s+EBX/Ogp24kPquNVxP4ZZ7thmGQ150s=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Collect/Pop/desktop.ini.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: DnwbtX+qW3kUcU7gF/g5Ww8eYRAfyBUw09gomb/TK0PqVTeGcmPy6+c=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Collect/desktop.ini.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: DHsZ5yisAX7UVf3pVzwzK1HoZ/JB0X6kdTqBV+yZJOe8wTWWflACQro=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Confetti/desktop.ini.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: XSxL5yOuUnkMucF5NjiSv6mC0MomCcuCw/OcjNahb/EEKvGYmLA88bo=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Eat_Bite/desktop.ini.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: XixO5yKtBSkujT/Yo+LlHZVgWWHJlfZDrxmT87bhSGjnJVND3Stiajg=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Firework/desktop.ini.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: CyxKsC2sWypcCjPE0h7XuANJjwfU+gi9pwWnq6SzC0jS2RgVBz+xElI=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Footstep/Generic/desktop.ini.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: XnkX4yr+UH2DIh54RIzV3KC0zEu/+w8JOEJAjd+8DkooXRRnVRS8gn4=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Footstep/Huge/desktop.ini.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: DX4dtHz4Bipv7q0XRgKEar+wpEuoC5+XJQm5wBThWoKT7rD9nJ7811M=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Footstep/Squeaky/desktop.ini.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: DS4WtSytUXqUcAvvuEz6MIe6wC5++VEmCknpN9DxdlxEC/9fhamMdSY=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Footstep/Water/desktop.ini.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: D35Nt3/7V3oeeg2tECPRN5W7PXslQjV7n/sPfo4SCFc3sJPYe5J8ky8=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Footstep/desktop.ini.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: D3tNsyilB3i4xmmkmAD3BN/NbtaODW6sRIh/o2RdBJE/jqqDLbidyr4=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Match/Boxy/desktop.ini.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: Wysbt3+vVXnqMmqdutbdvYNzhJ9lOfMN3MvpbBt8w0h3jmxv5PhvZF0=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Match/Bright/desktop.ini.meta

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

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Match/Pop/desktop.ini.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: Wiwa4S+qV3NOhqCLPdnZ0OEH1LYB0bSGgD5xAnWooXHJCl1VRAiHQf8=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Match/desktop.ini.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: Bi9L4Cj+AHPuGn8LZIYTb5B2HOjwV6mjAvna2Ye/9nSE+zxpNfe5LcY=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Pop/Bottle/desktop.ini.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: CXsZvXmvVXsRGEYgSXpAoLhOATQ4iz+KOq51ccrRpyxNPfFkTWo7IJg=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Pop/Liquid/desktop.ini.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: CitKsiOsU3nwm9PqkqRsuIBPvjM/CQqmZo6H14bJDHRhyBJooAqrf38=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Pop/Mouth/desktop.ini.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: CilLsCytBi7buU3Wf6Zw+6P64zzFZXQmZ66qyUp0JNKprV5dI0muOPk=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Pop/desktop.ini.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: DyxKty2rBXn/06ZsUtf9TF7orZHiO76HLMfFgi8hUUL4ToHtSgK4yMY=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Powerup/desktop.ini.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: WX4Y43usUyorijdis2k62UjUG1/+PvFyLo6icQdiFk+P5zkhnYYV0tQ=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Rattle/Glass/desktop.ini.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: CSlJ5yKoVn9L6v/2bU+18WEkkeJMVwhHj2EXqitM3KO0Vpscl4EEDow=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Rattle/Metal/desktop.ini.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: WnoY4yqtBn/wYhJMhwat1IBCtMjJ9ma1tBGHRbYCQtN9QetRU21pdxE=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Rattle/Plastic/desktop.ini.meta

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

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Rattle/Watery/desktop.ini.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: W3MWvC2sU3kqwEOsO5qExfOMwKbalcywli/mlT3+gBhnH/DcEg4LIXY=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Rattle/Wood/desktop.ini.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: DitM4CP4Wy8kasO+J7x8PL4OCgy0MqfDYl7/WUQ55A0IbTgyDRYDckQ=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Rattle/desktop.ini.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: XHoa536qVSo1MMzWPhQGBzsVJIL+JaetQxMdeZg5pa6ogw4scREnmvY=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Spin_Wheel/desktop.ini.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: C3tOtyr/AHp/afz3Hg+9Q47UzuY2IqYHplEf4ui3zRoLkI/GLN6CujE=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Swoosh/desktop.ini.meta

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

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Appear/desktop.ini.meta

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

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Bonus/desktop.ini.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: Ci5M4XmtV3kTcEFfo31h77sRxXdBJug8JUP5av/cDJOmU91aMB3aWAs=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Click/Generic/desktop.ini.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: CHpOtiOlUCiLhXBdTUlThN/xOtLXptISi6yHthB8Gmz24rf6IL106tE=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Click/Negative/desktop.ini.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: XXMasS75BX98L9GjB44gwXorFMSrN633nseMNo6AitM4/+nv8KTFnbk=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Click/Open_Close/desktop.ini.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: CywasCz7B3jMYlg5tDSfqsXkczUoioSG65XnqOwbGBKzKSdFXt0Df+k=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Click/Select/desktop.ini.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: DX0ZsCz/VnOmWhUILaTbxboK/G7/GWAzv8HhlihSjNiR+Y4CLWGobrM=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Click/Settings/desktop.ini.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: By8X53yrU38bknJGUihaIUtOATknopJbDRlc+JSwkT64aIy5qDG7EEA=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Click/desktop.ini.meta

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

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Countdown/desktop.ini.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: WnhLti+lWyl9Kn3CNyMd2EJiT+dJT6mEOlKfEBXlesCRUFd/EeJFJS8=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Error/desktop.ini.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: CX8dtSKlB3jowDuy6mzIlk6K9S+iuvY2p4nGn2PAWSpGaTQdEzIEXoo=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Fillup/Coin/desktop.ini.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: WnpNsiikVS0cPCBiY0rPqTCAaLCqpejlGuaYCE/ygObHZK+qTG5tFiE=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Fillup/Gem/desktop.ini.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: Wi8b4SqsBntipPRSKRJiQN1SMhfD4TziuhYK9TFzunh65XqXmYg+Kp8=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Fillup/Generic_Soft/desktop.ini.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: C30W5HysAn+0f2PAjQx5oTiz0ATQjbJb5Q0VTjAlfmSRrU1sfJUP9NA=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Fillup/Star/desktop.ini.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: Wy8ftS6uUH5y5qPwQ0yu8W/oYp7ZH6MFLPwcssmhpvfuF4Hn+HwbtXo=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Fillup/desktop.ini.meta

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

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Notification/desktop.ini.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: CXxNsnv/USgeazDGmL/lIDqBQZgOfxKN6zmeUKj6dMlSXl/IVr9iYTM=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Success/desktop.ini.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: CH0ftij5VC97tNfIkeEuIHzHPrIDIqpQITPaUgF/jP7GWCmLbbmKub0=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Swipe_Swoosh/desktop.ini.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: CC4Y5i37USg4QBqGqWb0PcWqg+/JirlZgWVdlE7zYZSzFywN6HoiKOs=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/desktop.ini.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: CikWtiytBn2/7jzkHypzFxJoLGSG+NWtu4kZSOHtbfAvMTyZkCX8SD8=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/desktop.ini.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: WnIcsyv8W3JU+JtswB+d+yeRz1OsDww2KAKE4L9ZkeMrktxzi3TrJMo=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/Config/ItemConfig.json

@@ -67,7 +67,7 @@
       "ID": 1004,
       "itemName": 5,
       "itemDesc": 10041,
-      "icon": "",
+      "icon": "icon_tx105",
       "itemTyp": 5,
       "quality": 8,
       "stack": null,
@@ -84,7 +84,7 @@
       "ID": 1005,
       "itemName": 6,
       "itemDesc": 10051,
-      "icon": "",
+      "icon": "icon_tx107",
       "itemTyp": 5,
       "quality": 8,
       "stack": null,
@@ -101,7 +101,7 @@
       "ID": 1006,
       "itemName": 13,
       "itemDesc": 10061,
-      "icon": "",
+      "icon": "icon_tx113",
       "itemTyp": 5,
       "quality": 8,
       "stack": null,
@@ -118,7 +118,7 @@
       "ID": 1007,
       "itemName": 16,
       "itemDesc": 10071,
-      "icon": "",
+      "icon": "icon_tx116",
       "itemTyp": 5,
       "quality": 8,
       "stack": null,

Assets/Res/UI/DialoguePanel.prefab

@@ -413,6 +413,7 @@ MonoBehaviour:
       m_NumAlphaKeys: 2
     m_ColorMin: {r: 0, g: 0, b: 0, a: 0}
     m_ColorMax: {r: 0, g: 0, b: 0, a: 0}
+  isLoop: 0
 --- !u!1 &6329833342161083256
 GameObject:
   m_ObjectHideFlags: 0
@@ -658,11 +659,11 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: icon_tx105
+  _icon_name: icon_tx116
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 1a259ebae9e024f1d8fb10d831b49c24, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 3855e71da36cb4dfeb0ce0972ed08272, type: 3}
   packInfo:
-    packName: heroIcon
-    packgJsonPath: /Art/UIAssets/TextrueJson/heroIcon.txt
-    packgSpritePath: Assets/Res/UIAtlas/heroIcon.spriteatlasv2
-    lasetJsonGUID: a54d3984b6522f413325daf005732f7d
+    packName: allIcon
+    packgJsonPath: /Art/UIAssets/TextrueJson/allIcon.txt
+    packgSpritePath: Assets/Res/UIAtlas/allIcon.spriteatlasv2
+    lasetJsonGUID: 083ae4b3a7b2beffb51fed7b1b7800d3

Assets/Res/UI/HeroBagPanel.prefab

@@ -6204,10 +6204,10 @@ RectTransform:
   - {fileID: 3064146610043366561}
   m_Father: {fileID: 7939915476203004500}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: -265}
-  m_SizeDelta: {x: 750, y: 625.1}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: 0, y: -1105}
+  m_SizeDelta: {x: 750, y: 625.1001}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &2419375674157508401
 MonoBehaviour:
@@ -7036,12 +7036,12 @@ MonoBehaviour:
   m_PixelsPerUnitMultiplier: 1
   _icon_name: icon_tx105
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 1a259ebae9e024f1d8fb10d831b49c24, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 3855e71da36cb4dfeb0ce0972ed08272, type: 3}
   packInfo:
-    packName: heroIcon
-    packgJsonPath: /Art/UIAssets/TextrueJson/heroIcon.txt
-    packgSpritePath: Assets/Res/UIAtlas/heroIcon.spriteatlasv2
-    lasetJsonGUID: a59a676e2ab5c4925ab687adc8940d7b
+    packName: allIcon
+    packgJsonPath: /Art/UIAssets/TextrueJson/allIcon.txt
+    packgSpritePath: Assets/Res/UIAtlas/allIcon.spriteatlasv2
+    lasetJsonGUID: 083ae4b3a7b2beffb51fed7b1b7800d3
 --- !u!1 &4765268764217086275
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/HeroDetailPanel.prefab

@@ -597,7 +597,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &6882296595196744850
 RectTransform:
   m_ObjectHideFlags: 0
@@ -1044,7 +1044,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 176, y: -480}
+  m_AnchoredPosition: {x: 176, y: -532}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &578317878836440111
@@ -1452,7 +1452,6 @@ GameObject:
   m_Component:
   - component: {fileID: 412427599050978791}
   - component: {fileID: 1307097461962102202}
-  - component: {fileID: 8658869773225085844}
   - component: {fileID: 5495134090315458649}
   m_Layer: 0
   m_HasEditorInfo: 1
@@ -1474,12 +1473,12 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 7590355994602595722}
+  m_Father: {fileID: 7679571116687404075}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 141, y: -12}
-  m_SizeDelta: {x: 40, y: 40}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 2.1, y: 1.9}
+  m_SizeDelta: {x: 41.9324, y: 55.9098}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1307097461962102202
 CanvasRenderer:
@@ -1489,26 +1488,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 731879025552473058}
   m_CullTransparentMesh: 1
---- !u!114 &8658869773225085844
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 731879025552473058}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_IgnoreLayout: 0
-  m_MinWidth: 59
-  m_MinHeight: 54
-  m_PreferredWidth: -1
-  m_PreferredHeight: -1
-  m_FlexibleWidth: -1
-  m_FlexibleHeight: -1
-  m_LayoutPriority: 1
 --- !u!114 &5495134090315458649
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1539,14 +1518,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: icon_Friends_Invie
+  _icon_name: icon_tx116
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 3855e71da36cb4dfeb0ce0972ed08272, type: 3}
   packInfo:
-    packName: all
-    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
-    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
-    lasetJsonGUID: ace5466faa841bb7b9046587aae54d38
+    packName: allIcon
+    packgJsonPath: /Art/UIAssets/TextrueJson/allIcon.txt
+    packgSpritePath: Assets/Res/UIAtlas/allIcon.spriteatlasv2
+    lasetJsonGUID: 083ae4b3a7b2beffb51fed7b1b7800d3
 --- !u!1 &750435095842706522
 GameObject:
   m_ObjectHideFlags: 0
@@ -6150,8 +6129,6 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
-  m_virtualGeometry: 0
-  m_virtualGeometryShadow: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -6390,8 +6367,6 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
-  m_virtualGeometry: 0
-  m_virtualGeometryShadow: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -7648,6 +7623,7 @@ GameObject:
   - component: {fileID: 623255991371403637}
   - component: {fileID: 1241343374939031043}
   - component: {fileID: 1900182250154511773}
+  - component: {fileID: 2511697509442057399}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Button_Common_Equip
@@ -7723,6 +7699,50 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
     packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
     lasetJsonGUID: ace5466faa841bb7b9046587aae54d38
+--- !u!114 &2511697509442057399
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4116640840244103549}
+  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: 1900182250154511773}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &4150640207593807359
 GameObject:
   m_ObjectHideFlags: 0
@@ -8166,8 +8186,6 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
-  m_virtualGeometry: 0
-  m_virtualGeometryShadow: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -8448,7 +8466,7 @@ GameObject:
   - component: {fileID: 2875697944268458280}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: Icon
+  m_Name: zyIcon
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -8470,7 +8488,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 16}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 65, y: 70}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4473099127099111067
@@ -9106,12 +9124,12 @@ MonoBehaviour:
     isList: 0
     ListCollectorDatas: []
   - key: txtHPUpLv1
-    gameObject: {fileID: 7917650340148251251}
+    gameObject: {fileID: 5049336013183773410}
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
   - key: txtHPUpLv2
-    gameObject: {fileID: 5049336013183773410}
+    gameObject: {fileID: 7917650340148251251}
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
@@ -9737,8 +9755,6 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
-  m_virtualGeometry: 0
-  m_virtualGeometryShadow: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -10647,8 +10663,6 @@ SkinnedMeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 3
   m_RayTraceProcedural: 0
-  m_virtualGeometry: 0
-  m_virtualGeometryShadow: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -12101,6 +12115,105 @@ MonoBehaviour:
   m_hasFontAssetChanged: 0
   m_baseMaterial: {fileID: 0}
   m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!1 &6024056454653000931
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7679571116687404075}
+  - component: {fileID: 827566263712953353}
+  - component: {fileID: 2909207162732315732}
+  - component: {fileID: 6007860671520462442}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: di_mask
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7679571116687404075
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6024056454653000931}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 412427599050978791}
+  m_Father: {fileID: 7590355994602595722}
+  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: -46.1, y: 16.1}
+  m_SizeDelta: {x: 42, y: 42}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &827566263712953353
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6024056454653000931}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_ShowMaskGraphic: 1
+--- !u!222 &2909207162732315732
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6024056454653000931}
+  m_CullTransparentMesh: 1
+--- !u!114 &6007860671520462442
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6024056454653000931}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.050980393, g: 0.94509804, b: 0.33333334, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_00_04_06_Bg
+  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: fdc09952e21a713f23682168cce500b3
 --- !u!1 &6088236847350139630
 GameObject:
   m_ObjectHideFlags: 0
@@ -12389,6 +12502,7 @@ RectTransform:
   - {fileID: 7705411688387883887}
   - {fileID: 7484599139481258495}
   - {fileID: 3289702276652194812}
+  - {fileID: 4779141614631576596}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -12751,6 +12865,33 @@ MonoBehaviour:
     - gameObject: {fileID: 386705721927191908}
     - gameObject: {fileID: 3414719560540881468}
     - gameObject: {fileID: 6905440077724744462}
+  - key: skillUI
+    gameObject: {fileID: 325436920799097949}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 2431497390631250942}
+    - gameObject: {fileID: 386705721927191908}
+    - gameObject: {fileID: 3414719560540881468}
+    - gameObject: {fileID: 6905440077724744462}
+  - key: btnSpecailEquip
+    gameObject: {fileID: 8534689456493960730}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 2431497390631250942}
+    - gameObject: {fileID: 386705721927191908}
+    - gameObject: {fileID: 3414719560540881468}
+    - gameObject: {fileID: 6905440077724744462}
+  - key: btnCommonEquip
+    gameObject: {fileID: 2511697509442057399}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 2431497390631250942}
+    - gameObject: {fileID: 386705721927191908}
+    - gameObject: {fileID: 3414719560540881468}
+    - gameObject: {fileID: 6905440077724744462}
   isAssetBundle: 1
 --- !u!225 &4187952801782332659
 CanvasGroup:
@@ -12780,7 +12921,7 @@ MonoBehaviour:
   isUpdate: 0
   currTime: 1
   GrpupInfos:
-  - Foldout: 1
+  - Foldout: 0
     isActive: 1
     animName: play
     isLoop: 0
@@ -14123,8 +14264,6 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
-  m_virtualGeometry: 0
-  m_virtualGeometryShadow: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -14166,7 +14305,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &5411041259621187802
 RectTransform:
   m_ObjectHideFlags: 0
@@ -14589,8 +14728,6 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
-  m_virtualGeometry: 0
-  m_virtualGeometryShadow: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -15520,8 +15657,6 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
-  m_virtualGeometry: 0
-  m_virtualGeometryShadow: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -15732,8 +15867,6 @@ SkinnedMeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 3
   m_RayTraceProcedural: 0
-  m_virtualGeometry: 0
-  m_virtualGeometryShadow: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -17277,14 +17410,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: icon_item_Gear_Sword
+  _icon_name: 
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 84f272205829b834da33f44ad74be676, type: 3}
+  CurrSpriteAtlas: {fileID: 0}
   packInfo:
-    packName: itemIcon
-    packgJsonPath: /Art/UIAssets/TextrueJson\itemIcon.txt
-    packgSpritePath: Assets/Res/UIAtlas/itemIcon.spriteatlasv2
-    lasetJsonGUID: 8f9c5969449e5a0e15746046d5a75c9d
+    packName: 
+    packgJsonPath: 
+    packgSpritePath: 
+    lasetJsonGUID: 
 --- !u!1 &8119578585630561182
 GameObject:
   m_ObjectHideFlags: 0
@@ -17723,6 +17856,7 @@ GameObject:
   - component: {fileID: 3194259057530332381}
   - component: {fileID: 2867636092260181629}
   - component: {fileID: 5460311739122094778}
+  - component: {fileID: 8534689456493960730}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Button_Specail_Equip
@@ -17812,6 +17946,50 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
     packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
     lasetJsonGUID: ace5466faa841bb7b9046587aae54d38
+--- !u!114 &8534689456493960730
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8262466841460713280}
+  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: 5460311739122094778}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &8277847055366427664
 GameObject:
   m_ObjectHideFlags: 0
@@ -18284,7 +18462,6 @@ GameObject:
   serializedVersion: 7
   m_Component:
   - component: {fileID: 7590355994602595722}
-  - component: {fileID: 1050030769063437467}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Area
@@ -18305,7 +18482,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 412427599050978791}
+  - {fileID: 7679571116687404075}
   - {fileID: 6032640576445051180}
   m_Father: {fileID: 6450843375123603411}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -18314,32 +18491,6 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: -14}
   m_SizeDelta: {x: 370.97, y: 62.83}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &1050030769063437467
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8405527899753364590}
-  m_Enabled: 0
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Padding:
-    m_Left: 0
-    m_Right: 0
-    m_Top: 0
-    m_Bottom: 0
-  m_ChildAlignment: 4
-  m_Spacing: 17
-  m_ChildForceExpandWidth: 0
-  m_ChildForceExpandHeight: 0
-  m_ChildControlWidth: 0
-  m_ChildControlHeight: 0
-  m_ChildScaleWidth: 0
-  m_ChildScaleHeight: 0
-  m_ReverseArrangement: 0
 --- !u!1 &8504566407075160577
 GameObject:
   m_ObjectHideFlags: 0
@@ -19930,3 +20081,218 @@ RectTransform:
   m_CorrespondingSourceObject: {fileID: 5135952974914396357, guid: e99c8a9f5f283486a8d13ff33a3f6134, type: 3}
   m_PrefabInstance: {fileID: 88573252790506352}
   m_PrefabAsset: {fileID: 0}
+--- !u!1001 &3977876576809755803
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 8323024823130982353}
+    m_Modifications:
+    - target: {fileID: 3724598441491386566, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_Name
+      value: SkillUIComponent
+      objectReference: {fileID: 0}
+    - target: {fileID: 3724598441491386566, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5231644514269099707, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5231644514269099707, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5231644514269099707, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 31
+      objectReference: {fileID: 0}
+    - target: {fileID: 5231644514269099707, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 344
+      objectReference: {fileID: 0}
+    - target: {fileID: 5231644514269099707, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -82
+      objectReference: {fileID: 0}
+    - target: {fileID: 5496076525872188181, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5496076525872188181, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6985120552032159048, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6985120552032159048, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6985120552032159048, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 604.245
+      objectReference: {fileID: 0}
+    - target: {fileID: 6985120552032159048, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 315
+      objectReference: {fileID: 0}
+    - target: {fileID: 8233403908056166009, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8233403908056166009, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8233403908056166009, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 31
+      objectReference: {fileID: 0}
+    - target: {fileID: 8233403908056166009, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 344
+      objectReference: {fileID: 0}
+    - target: {fileID: 8233403908056166009, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -123
+      objectReference: {fileID: 0}
+    - target: {fileID: 8439587507723242819, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8439587507723242819, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8439587507723242819, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 31
+      objectReference: {fileID: 0}
+    - target: {fileID: 8439587507723242819, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 344
+      objectReference: {fileID: 0}
+    - target: {fileID: 8439587507723242819, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8459636219199963279, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8459636219199963279, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8459636219199963279, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8459636219199963279, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8459636219199963279, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8459636219199963279, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8459636219199963279, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 750
+      objectReference: {fileID: 0}
+    - target: {fileID: 8459636219199963279, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 1624
+      objectReference: {fileID: 0}
+    - target: {fileID: 8459636219199963279, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8459636219199963279, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8459636219199963279, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8459636219199963279, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8459636219199963279, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8459636219199963279, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8459636219199963279, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8459636219199963279, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8459636219199963279, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8459636219199963279, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8459636219199963279, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8459636219199963279, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8870045557280260565, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8870045557280260565, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8870045557280260565, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 31
+      objectReference: {fileID: 0}
+    - target: {fileID: 8870045557280260565, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 344
+      objectReference: {fileID: 0}
+    - target: {fileID: 8870045557280260565, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -41
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+--- !u!1 &325436920799097949 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 3724598441491386566, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+  m_PrefabInstance: {fileID: 3977876576809755803}
+  m_PrefabAsset: {fileID: 0}
+--- !u!224 &4779141614631576596 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 8459636219199963279, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+  m_PrefabInstance: {fileID: 3977876576809755803}
+  m_PrefabAsset: {fileID: 0}

Assets/Res/UI/ProfessionEquipmentPanel.prefab

@@ -3729,8 +3729,6 @@ SkinnedMeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 3
   m_RayTraceProcedural: 0
-  m_virtualGeometry: 0
-  m_virtualGeometryShadow: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -5038,8 +5036,6 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
-  m_virtualGeometry: 0
-  m_virtualGeometryShadow: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -5629,8 +5625,6 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
-  m_virtualGeometry: 0
-  m_virtualGeometryShadow: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -6052,8 +6046,6 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
-  m_virtualGeometry: 0
-  m_virtualGeometryShadow: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -8234,8 +8226,6 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
-  m_virtualGeometry: 0
-  m_virtualGeometryShadow: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -9015,7 +9005,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &6764302726913215062
 RectTransform:
   m_ObjectHideFlags: 0
@@ -9569,8 +9559,6 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
-  m_virtualGeometry: 0
-  m_virtualGeometryShadow: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -9767,8 +9755,6 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
-  m_virtualGeometry: 0
-  m_virtualGeometryShadow: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -10563,8 +10549,6 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
-  m_virtualGeometry: 0
-  m_virtualGeometryShadow: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -11228,8 +11212,6 @@ SkinnedMeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 3
   m_RayTraceProcedural: 0
-  m_virtualGeometry: 0
-  m_virtualGeometryShadow: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:

Assets/Res/UI/SkillUIComponent.prefab

@@ -1,5 +1,180 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &473624110943845480
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5012133587235986117}
+  - component: {fileID: 2428755547011541359}
+  - component: {fileID: 8770810331096651526}
+  - component: {fileID: 4973554695561391867}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: di
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5012133587235986117
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 473624110943845480}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 6985120552032159048}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: -67}
+  m_SizeDelta: {x: 750, y: 500}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2428755547011541359
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 473624110943845480}
+  m_CullTransparentMesh: 1
+--- !u!114 &8770810331096651526
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 473624110943845480}
+  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: 4973554695561391867}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!114 &4973554695561391867
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 473624110943845480}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.130874, g: 0.16037738, b: 0.15382107, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_BottomBtn_Bg
+  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: a6fab45fc6a5f0b09679bb4eedcdd188
+--- !u!1 &629358253661901542
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6985120552032159048}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Bottom
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6985120552032159048
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 629358253661901542}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 3716005545264761289}
+  - {fileID: 5012133587235986117}
+  - {fileID: 2386831869758086357}
+  - {fileID: 1061230050760813048}
+  - {fileID: 1011666818352242648}
+  - {fileID: 2589088228504847424}
+  - {fileID: 4388396417434440462}
+  - {fileID: 4397437230936891047}
+  - {fileID: 4105650447501009726}
+  - {fileID: 3627910858691465121}
+  m_Father: {fileID: 8459636219199963279}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: 0, y: -250}
+  m_SizeDelta: {x: 715.7, y: 604.245}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &1028820458441546150
 GameObject:
   m_ObjectHideFlags: 0
@@ -31,15 +206,11 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 7678038991277897505}
-  - {fileID: 1690804137536025959}
-  - {fileID: 5368683846553877953}
-  - {fileID: 7448757642809447720}
-  - {fileID: 4743646536950976607}
-  m_Father: {fileID: 8459636219199963279}
+  m_Father: {fileID: 6985120552032159048}
   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: -243, y: 320}
+  m_AnchoredPosition: {x: -241.15, y: 247.47754}
   m_SizeDelta: {x: 224.67001, y: 109.29004}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &3541113496881229149
@@ -68,7 +239,7 @@ MonoBehaviour:
   m_ChildScaleWidth: 0
   m_ChildScaleHeight: 0
   m_ReverseArrangement: 0
---- !u!1 &1335202512441972296
+--- !u!1 &1230225229054983255
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -76,72 +247,103 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 637797717169572563}
-  - component: {fileID: 3199744273824380900}
-  - component: {fileID: 772150921752026299}
-  - component: {fileID: 1027732467348844608}
+  - component: {fileID: 5496076525872188181}
+  - component: {fileID: 1366203269678552495}
+  - component: {fileID: 5147407071533386158}
+  - component: {fileID: 2489171200668761687}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: Bg
+  m_Name: btnDi
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
---- !u!224 &637797717169572563
+  m_IsActive: 1
+--- !u!224 &5496076525872188181
 RectTransform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1335202512441972296}
+  m_GameObject: {fileID: 1230225229054983255}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 4105650447501009726}
+  m_Father: {fileID: 8459636219199963279}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: -4, y: -4}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 559}
+  m_SizeDelta: {x: 750, y: 1800}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &3199744273824380900
+--- !u!222 &1366203269678552495
 CanvasRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1335202512441972296}
+  m_GameObject: {fileID: 1230225229054983255}
   m_CullTransparentMesh: 1
---- !u!114 &772150921752026299
+--- !u!114 &5147407071533386158
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1335202512441972296}
+  m_GameObject: {fileID: 1230225229054983255}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_ShowMaskGraphic: 1
---- !u!114 &1027732467348844608
+  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: 2489171200668761687}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!114 &2489171200668761687
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1335202512441972296}
+  m_GameObject: {fileID: 1230225229054983255}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.17254902, g: 0.1764706, b: 0.26666668, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -158,15 +360,15 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_00_04_06_Bg
+  _icon_name: dec_dim_Black
   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: 8fbc3902b8b4a448719eb520746784cf
---- !u!1 &1416342346878455576
+    lasetJsonGUID: e8ac4a11df23a3327a9a6fed106efb0a
+--- !u!1 &1335202512441972296
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -174,64 +376,162 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 4388396417434440462}
-  - component: {fileID: 6310280512319826708}
-  - component: {fileID: 6354889710214839342}
+  - component: {fileID: 637797717169572563}
+  - component: {fileID: 3199744273824380900}
+  - component: {fileID: 772150921752026299}
+  - component: {fileID: 1027732467348844608}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: dec_eft
+  m_Name: Bg
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &4388396417434440462
+  m_IsActive: 0
+--- !u!224 &637797717169572563
 RectTransform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1416342346878455576}
+  m_GameObject: {fileID: 1335202512441972296}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 8357257302712234465}
-  m_Father: {fileID: 8459636219199963279}
+  m_Children: []
+  m_Father: {fileID: 4105650447501009726}
   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: -298, y: 158}
-  m_SizeDelta: {x: 120, y: 30}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: -4, y: -4}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &6310280512319826708
+--- !u!222 &3199744273824380900
 CanvasRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1416342346878455576}
+  m_GameObject: {fileID: 1335202512441972296}
   m_CullTransparentMesh: 1
---- !u!114 &6354889710214839342
+--- !u!114 &772150921752026299
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1416342346878455576}
+  m_GameObject: {fileID: 1335202512441972296}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 0.6509434, g: 0.6509434, b: 0.6509434, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
+  m_ShowMaskGraphic: 1
+--- !u!114 &1027732467348844608
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1335202512441972296}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.17254902, g: 0.1764706, b: 0.26666668, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_00_04_06_Bg
+  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: 8fbc3902b8b4a448719eb520746784cf
+--- !u!1 &1416342346878455576
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4388396417434440462}
+  - component: {fileID: 6310280512319826708}
+  - component: {fileID: 6354889710214839342}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: dec_eft
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4388396417434440462
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1416342346878455576}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 8357257302712234465}
+  m_Father: {fileID: 6985120552032159048}
+  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: -296.15, y: 85.47754}
+  m_SizeDelta: {x: 120, y: 30}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6310280512319826708
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1416342346878455576}
+  m_CullTransparentMesh: 1
+--- !u!114 &6354889710214839342
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1416342346878455576}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.6509434, g: 0.6509434, b: 0.6509434, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
       m_Calls: []
   m_Sprite: {fileID: 0}
   m_Type: 1
@@ -287,7 +587,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: 344, y: -55}
+  m_AnchoredPosition: {x: 344, y: -82}
   m_SizeDelta: {x: 688, y: 0}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &4396069779853996381
@@ -382,7 +682,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: 344, y: -27.5}
+  m_AnchoredPosition: {x: 344, y: -41}
   m_SizeDelta: {x: 688, y: 0}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &7568156432243018947
@@ -661,7 +961,7 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2456279290738976765}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
@@ -670,11 +970,11 @@ RectTransform:
   - {fileID: 8870045557280260565}
   - {fileID: 5231644514269099707}
   - {fileID: 8233403908056166009}
-  m_Father: {fileID: 8459636219199963279}
+  m_Father: {fileID: 6985120552032159048}
   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: -304, y: 75}
+  m_AnchoredPosition: {x: -302.15, y: 2.477539}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &8772388447304254165
@@ -735,11 +1035,11 @@ RectTransform:
   - {fileID: 637797717169572563}
   - {fileID: 8089296172921106170}
   - {fileID: 8803200532895793815}
-  m_Father: {fileID: 8459636219199963279}
+  m_Father: {fileID: 6985120552032159048}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: -170}
+  m_AnchoredPosition: {x: 1.8500061, y: -242.52252}
   m_SizeDelta: {x: 606.1, y: 119.2}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &3468534719193380031
@@ -768,16 +1068,16 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3468534719193380031}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 8459636219199963279}
+  m_Father: {fileID: 6985120552032159048}
   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: -104.4, y: 205}
+  m_AnchoredPosition: {x: -102.549995, y: 132.47754}
   m_SizeDelta: {x: 52, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2127374248778295320
@@ -832,7 +1132,6 @@ GameObject:
   m_Component:
   - component: {fileID: 8459636219199963279}
   - component: {fileID: 5658093172566555573}
-  - component: {fileID: 8687561165943941247}
   - component: {fileID: 7951263076483495950}
   m_Layer: 0
   m_HasEditorInfo: 1
@@ -854,19 +1153,13 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 2386831869758086357}
-  - {fileID: 1061230050760813048}
-  - {fileID: 1011666818352242648}
-  - {fileID: 2589088228504847424}
-  - {fileID: 4388396417434440462}
-  - {fileID: 4397437230936891047}
-  - {fileID: 4105650447501009726}
-  - {fileID: 3627910858691465121}
+  - {fileID: 5496076525872188181}
+  - {fileID: 6985120552032159048}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0}
-  m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 0, y: -1.4569092}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 750, y: 500}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &5658093172566555573
@@ -877,36 +1170,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3724598441491386566}
   m_CullTransparentMesh: 1
---- !u!114 &8687561165943941247
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3724598441491386566}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 0.130874, g: 0.16037738, b: 0.15382107, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 03cc62a06f5fc44639b0a7ec241ee65f, type: 3}
-  m_Type: 1
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
 --- !u!114 &7951263076483495950
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -992,6 +1255,24 @@ MonoBehaviour:
     - gameObject: {fileID: 1829847571812348693}
     - gameObject: {fileID: 1806108059677379203}
     - gameObject: {fileID: 7033063365279083689}
+  - key: widgetSkill
+    gameObject: {fileID: 1088164473376649017}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 1903911127976497113}
+    - gameObject: {fileID: 1829847571812348693}
+    - gameObject: {fileID: 1806108059677379203}
+    - gameObject: {fileID: 7033063365279083689}
+  - key: btnDi
+    gameObject: {fileID: 5147407071533386158}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 1903911127976497113}
+    - gameObject: {fileID: 1829847571812348693}
+    - gameObject: {fileID: 1806108059677379203}
+    - gameObject: {fileID: 7033063365279083689}
   isAssetBundle: 1
 --- !u!1 &3883852036818116843
 GameObject:
@@ -1073,6 +1354,90 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u6280\u80FD\u5DF2\u8FBE\u6700\u9AD8\u7B49\u7EA7"
+--- !u!1 &4199935220685144262
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3716005545264761289}
+  - component: {fileID: 2238219793278329628}
+  - component: {fileID: 2814182431208657963}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: skillDi
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3716005545264761289
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4199935220685144262}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 6985120552032159048}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 248}
+  m_SizeDelta: {x: 815.4, y: 120}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2238219793278329628
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4199935220685144262}
+  m_CullTransparentMesh: 1
+--- !u!114 &2814182431208657963
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4199935220685144262}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.4433962, g: 0.4433962, b: 0.4433962, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_00_04_06_Bg
+  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: a6fab45fc6a5f0b09679bb4eedcdd188
 --- !u!1 &4356462366393647132
 GameObject:
   m_ObjectHideFlags: 0
@@ -1099,16 +1464,16 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4356462366393647132}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 8459636219199963279}
+  m_Father: {fileID: 6985120552032159048}
   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: -158, y: 205}
+  m_AnchoredPosition: {x: -156.15, y: 132.47754}
   m_SizeDelta: {x: 52, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7788972489946103816
@@ -1453,7 +1818,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: 344, y: -82.5}
+  m_AnchoredPosition: {x: 344, y: -123}
   m_SizeDelta: {x: 688, y: 0}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &5946602135712632191
@@ -1543,11 +1908,11 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 8459636219199963279}
+  m_Father: {fileID: 6985120552032159048}
   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: -273, y: 205}
+  m_AnchoredPosition: {x: -271.15, y: 132.47754}
   m_SizeDelta: {x: 173.4, y: 40}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8720316360143550269
@@ -1626,11 +1991,11 @@ RectTransform:
   m_Children:
   - {fileID: 1363224240556191930}
   - {fileID: 2937261174254495495}
-  m_Father: {fileID: 8459636219199963279}
+  m_Father: {fileID: 6985120552032159048}
   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: 316, y: 200}
+  m_AnchoredPosition: {x: 317.84998, y: 127.47754}
   m_SizeDelta: {x: 80, y: 80}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3044300648206569428
@@ -1723,7 +2088,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
     packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
     lasetJsonGUID: ace5466faa841bb7b9046587aae54d38
---- !u!1001 &1361594306138628991
+--- !u!1001 &2249487104835043702
 PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
@@ -1733,7 +2098,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 1165912544772320847, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
       propertyPath: m_Name
-      value: WidgetIconSkill (3)
+      value: WidgetIconSkill
       objectReference: {fileID: 0}
     - target: {fileID: 1165912544772320847, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
       propertyPath: m_IsActive
@@ -1801,7 +2166,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 498.89496
+      value: 52.884995
       objectReference: {fileID: 0}
     - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
       propertyPath: m_AnchoredPosition.y
@@ -1824,432 +2189,13 @@ PrefabInstance:
     m_AddedGameObjects: []
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
---- !u!224 &7448757642809447720 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-  m_PrefabInstance: {fileID: 1361594306138628991}
-  m_PrefabAsset: {fileID: 0}
---- !u!1001 &2249487104835043702
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 2386831869758086357}
-    m_Modifications:
-    - target: {fileID: 1165912544772320847, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_Name
-      value: WidgetIconSkill
-      objectReference: {fileID: 0}
-    - target: {fileID: 1165912544772320847, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_Pivot.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_Pivot.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_AnchorMin.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 105.76999
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 104.85
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 52.884995
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -52.425
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
---- !u!224 &7678038991277897505 stripped
+--- !u!1 &1088164473376649017 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 1165912544772320847, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
+  m_PrefabInstance: {fileID: 2249487104835043702}
+  m_PrefabAsset: {fileID: 0}
+--- !u!224 &7678038991277897505 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
   m_PrefabInstance: {fileID: 2249487104835043702}
   m_PrefabAsset: {fileID: 0}
---- !u!1001 &3778175075372361224
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 2386831869758086357}
-    m_Modifications:
-    - target: {fileID: 1165912544772320847, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_Name
-      value: WidgetIconSkill (4)
-      objectReference: {fileID: 0}
-    - target: {fileID: 1165912544772320847, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_Pivot.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_Pivot.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_AnchorMin.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 105.76999
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 104.85
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 647.56494
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -52.425
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
---- !u!224 &4743646536950976607 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-  m_PrefabInstance: {fileID: 3778175075372361224}
-  m_PrefabAsset: {fileID: 0}
---- !u!1001 &4556361691147586454
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 2386831869758086357}
-    m_Modifications:
-    - target: {fileID: 1165912544772320847, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_Name
-      value: WidgetIconSkill (2)
-      objectReference: {fileID: 0}
-    - target: {fileID: 1165912544772320847, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_Pivot.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_Pivot.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_AnchorMin.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 105.76999
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 104.85
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 350.22498
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -52.425
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
---- !u!224 &5368683846553877953 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-  m_PrefabInstance: {fileID: 4556361691147586454}
-  m_PrefabAsset: {fileID: 0}
---- !u!1001 &7119318228264551216
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 2386831869758086357}
-    m_Modifications:
-    - target: {fileID: 1165912544772320847, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_Name
-      value: WidgetIconSkill (1)
-      objectReference: {fileID: 0}
-    - target: {fileID: 1165912544772320847, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_Pivot.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_Pivot.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_AnchorMin.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 105.76999
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 104.85
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 201.55498
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -52.425
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
---- !u!224 &1690804137536025959 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-  m_PrefabInstance: {fileID: 7119318228264551216}
-  m_PrefabAsset: {fileID: 0}

Assets/Res/UI/SpecificProfessionEquipmentPanel.prefab

@@ -730,7 +730,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &3123478514941861925
 RectTransform:
   m_ObjectHideFlags: 0
@@ -1160,7 +1160,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &833831717708301688
 RectTransform:
   m_ObjectHideFlags: 0
@@ -2383,7 +2383,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &3870529561131869925
 RectTransform:
   m_ObjectHideFlags: 0
@@ -3586,7 +3586,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &267772551406663904
 RectTransform:
   m_ObjectHideFlags: 0

Assets/Res/UI/WidgetHero.prefab

@@ -2319,12 +2319,12 @@ MonoBehaviour:
   m_PixelsPerUnitMultiplier: 1
   _icon_name: icon_tx105
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 1a259ebae9e024f1d8fb10d831b49c24, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 3855e71da36cb4dfeb0ce0972ed08272, type: 3}
   packInfo:
-    packName: heroIcon
-    packgJsonPath: /Art/UIAssets/TextrueJson/heroIcon.txt
-    packgSpritePath: Assets/Res/UIAtlas/heroIcon.spriteatlasv2
-    lasetJsonGUID: a54d3984b6522f413325daf005732f7d
+    packName: allIcon
+    packgJsonPath: /Art/UIAssets/TextrueJson/allIcon.txt
+    packgSpritePath: Assets/Res/UIAtlas/allIcon.spriteatlasv2
+    lasetJsonGUID: 083ae4b3a7b2beffb51fed7b1b7800d3
 --- !u!1 &7991572580298050915
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/WidgetItem.prefab

@@ -122,7 +122,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 90, y: 90}
+  m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4404666695256229840
 CanvasRenderer:
@@ -162,7 +162,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_Round12
+  _icon_name: btn_Round09
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
   packInfo:
@@ -224,7 +224,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1916043416167554874}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
   m_Name: 
@@ -330,7 +330,7 @@ MonoBehaviour:
   m_fontMaterials: []
   m_fontColor32:
     serializedVersion: 2
-    rgba: 4294967295
+    rgba: 4286611612
   m_fontColor: {r: 0.6132076, g: 0.50040054, b: 0.50040054, a: 1}
   m_enableVertexGradient: 0
   m_colorMode: 3
@@ -466,14 +466,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: icon_eq_4_3_2
+  _icon_name: icon_eq_1_3_3
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 32b47635c42d8454b9f3385841ed0ede, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 3855e71da36cb4dfeb0ce0972ed08272, type: 3}
   packInfo:
-    packName: EquipmentIcon
-    packgJsonPath: /Art/UIAssets/TextrueJson\EquipmentIcon.txt
-    packgSpritePath: Assets/Res/UIAtlas/EquipmentIcon.spriteatlasv2
-    lasetJsonGUID: 3f341819198f0a90aee7b2673a546c13
+    packName: allIcon
+    packgJsonPath: /Art/UIAssets/TextrueJson/allIcon.txt
+    packgSpritePath: Assets/Res/UIAtlas/allIcon.spriteatlasv2
+    lasetJsonGUID: 083ae4b3a7b2beffb51fed7b1b7800d3
 --- !u!1 &2142678362332709341
 GameObject:
   m_ObjectHideFlags: 0
@@ -558,6 +558,44 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
     packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
     lasetJsonGUID: 7c5e93e3331cd67b15983d0d2161d334
+--- !u!1 &2654032404493663270
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1230383290210271096}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: HeroShards
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1230383290210271096
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2654032404493663270}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 2731455764362398641}
+  - {fileID: 8769390152937081920}
+  m_Father: {fileID: 1515036893769208877}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &3646136775730434938
 GameObject:
   m_ObjectHideFlags: 0
@@ -576,7 +614,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &4688880321879378313
 RectTransform:
   m_ObjectHideFlags: 0
@@ -727,6 +765,105 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
     packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
     lasetJsonGUID: 8e0fed06f6e134745d1fa1d786d61cbc
+--- !u!1 &6068697863213743772
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8769390152937081920}
+  - component: {fileID: 6121896776075230898}
+  - component: {fileID: 2399912038442555053}
+  - component: {fileID: 7008548636899416174}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: di_mask
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8769390152937081920
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6068697863213743772}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 7741548700730218477}
+  m_Father: {fileID: 1230383290210271096}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 72, y: 72}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &6121896776075230898
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6068697863213743772}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_ShowMaskGraphic: 1
+--- !u!222 &2399912038442555053
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6068697863213743772}
+  m_CullTransparentMesh: 1
+--- !u!114 &7008548636899416174
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6068697863213743772}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.26830178, g: 0.7945862, b: 0.89433956, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_00_04_06_Bg
+  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: fdc09952e21a713f23682168cce500b3
 --- !u!1 &6624212208645409916
 GameObject:
   m_ObjectHideFlags: 0
@@ -762,7 +899,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchoredPosition: {x: -34.7, y: 0}
   m_SizeDelta: {x: 72, y: 87}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3511437002229949790
@@ -827,7 +964,7 @@ MonoBehaviour:
   m_fontSizeMin: 18
   m_fontSizeMax: 42
   m_fontStyle: 0
-  m_HorizontalAlignment: 2
+  m_HorizontalAlignment: 4
   m_VerticalAlignment: 512
   m_textAlignment: 65535
   m_characterSpacing: 0
@@ -862,6 +999,90 @@ MonoBehaviour:
   m_hasFontAssetChanged: 0
   m_baseMaterial: {fileID: 0}
   m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!1 &7310672583097689030
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7741548700730218477}
+  - component: {fileID: 2202988894485000509}
+  - component: {fileID: 6096866157633898550}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: hero_icon
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7741548700730218477
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7310672583097689030}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8769390152937081920}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 53.0884, y: 70.785}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2202988894485000509
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7310672583097689030}
+  m_CullTransparentMesh: 1
+--- !u!114 &6096866157633898550
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7310672583097689030}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: icon_tx116
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 3855e71da36cb4dfeb0ce0972ed08272, type: 3}
+  packInfo:
+    packName: allIcon
+    packgJsonPath: /Art/UIAssets/TextrueJson/allIcon.txt
+    packgSpritePath: Assets/Res/UIAtlas/allIcon.spriteatlasv2
+    lasetJsonGUID: 083ae4b3a7b2beffb51fed7b1b7800d3
 --- !u!1 &7543347028993922308
 GameObject:
   m_ObjectHideFlags: 0
@@ -880,7 +1101,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &6033858037849463588
 RectTransform:
   m_ObjectHideFlags: 0
@@ -897,7 +1118,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 23.7}
+  m_AnchoredPosition: {x: 0, y: 26.6}
   m_SizeDelta: {x: 90, y: 40.4}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4164539319831174714
@@ -964,7 +1185,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &5410523429226151182
 RectTransform:
   m_ObjectHideFlags: 0
@@ -982,7 +1203,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 100, y: 100}
+  m_SizeDelta: {x: 95.5, y: 97.3}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4212259591542464616
 CanvasRenderer:
@@ -1030,6 +1251,90 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
     packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
     lasetJsonGUID: 7c5e93e3331cd67b15983d0d2161d334
+--- !u!1 &7671188777593409960
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2731455764362398641}
+  - component: {fileID: 8970128689940395250}
+  - component: {fileID: 7838204096128365874}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: border
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2731455764362398641
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7671188777593409960}
+  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: 1
+  m_Children: []
+  m_Father: {fileID: 1230383290210271096}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 68, y: 70}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8970128689940395250
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7671188777593409960}
+  m_CullTransparentMesh: 1
+--- !u!114 &7838204096128365874
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7671188777593409960}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 0.3590937, b: 0.5773585, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_00_04_06_Border
+  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: fdc09952e21a713f23682168cce500b3
 --- !u!1 &7948008364224510343
 GameObject:
   m_ObjectHideFlags: 0
@@ -1143,19 +1448,20 @@ RectTransform:
   m_GameObject: {fileID: 8408847998961895963}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1.4, y: 1.4, z: 1.4}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 1
   m_Children:
+  - {fileID: 5410523429226151182}
   - {fileID: 1835098571422434311}
   - {fileID: 1614591406946658395}
   - {fileID: 6033858037849463588}
-  - {fileID: 5410523429226151182}
   - {fileID: 964352678154303035}
   - {fileID: 3545244106223690488}
   - {fileID: 4688880321879378313}
   - {fileID: 4888607739940384859}
   - {fileID: 3551382341916395911}
   - {fileID: 4607032735910672874}
+  - {fileID: 1230383290210271096}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
@@ -1236,6 +1542,16 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: heroShards
+    gameObject: {fileID: 2654032404493663270}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: heroShardsIcon
+    gameObject: {fileID: 6096866157633898550}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!114 &1991110530740727775
 MonoBehaviour:

Assets/Res/UI/WidgetItem_空.prefab

@@ -719,12 +719,12 @@ MonoBehaviour:
   m_PixelsPerUnitMultiplier: 1
   _icon_name: icon_eq_4_3_2
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 32b47635c42d8454b9f3385841ed0ede, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 3855e71da36cb4dfeb0ce0972ed08272, type: 3}
   packInfo:
-    packName: EquipmentIcon
-    packgJsonPath: /Art/UIAssets/TextrueJson\EquipmentIcon.txt
-    packgSpritePath: Assets/Res/UIAtlas/EquipmentIcon.spriteatlasv2
-    lasetJsonGUID: 3f341819198f0a90aee7b2673a546c13
+    packName: allIcon
+    packgJsonPath: /Art/UIAssets/TextrueJson/allIcon.txt
+    packgSpritePath: Assets/Res/UIAtlas/allIcon.spriteatlasv2
+    lasetJsonGUID: 083ae4b3a7b2beffb51fed7b1b7800d3
 --- !u!1 &6133001126499716445
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/WidgetItem_紫装.prefab

@@ -414,12 +414,12 @@ MonoBehaviour:
   m_PixelsPerUnitMultiplier: 1
   _icon_name: icon_eq_1_3_3
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 32b47635c42d8454b9f3385841ed0ede, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 3855e71da36cb4dfeb0ce0972ed08272, type: 3}
   packInfo:
-    packName: EquipmentIcon
-    packgJsonPath: /Art/UIAssets/TextrueJson\EquipmentIcon.txt
-    packgSpritePath: Assets/Res/UIAtlas/EquipmentIcon.spriteatlasv2
-    lasetJsonGUID: 3f341819198f0a90aee7b2673a546c13
+    packName: allIcon
+    packgJsonPath: /Art/UIAssets/TextrueJson/allIcon.txt
+    packgSpritePath: Assets/Res/UIAtlas/allIcon.spriteatlasv2
+    lasetJsonGUID: 083ae4b3a7b2beffb51fed7b1b7800d3
 --- !u!1 &6530925603937626076
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/WidgetItem_红装.prefab

@@ -1021,12 +1021,12 @@ MonoBehaviour:
   m_PixelsPerUnitMultiplier: 1
   _icon_name: icon_eq_1_5_3
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 32b47635c42d8454b9f3385841ed0ede, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 3855e71da36cb4dfeb0ce0972ed08272, type: 3}
   packInfo:
-    packName: EquipmentIcon
-    packgJsonPath: /Art/UIAssets/TextrueJson\EquipmentIcon.txt
-    packgSpritePath: Assets/Res/UIAtlas/EquipmentIcon.spriteatlasv2
-    lasetJsonGUID: 3f341819198f0a90aee7b2673a546c13
+    packName: allIcon
+    packgJsonPath: /Art/UIAssets/TextrueJson/allIcon.txt
+    packgSpritePath: Assets/Res/UIAtlas/allIcon.spriteatlasv2
+    lasetJsonGUID: 083ae4b3a7b2beffb51fed7b1b7800d3
 --- !u!1 &6974233485650447944
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/WidgetItem_绿装.prefab

@@ -78,12 +78,12 @@ MonoBehaviour:
   m_PixelsPerUnitMultiplier: 1
   _icon_name: icon_eq_4_3_2
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 32b47635c42d8454b9f3385841ed0ede, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 3855e71da36cb4dfeb0ce0972ed08272, type: 3}
   packInfo:
-    packName: EquipmentIcon
-    packgJsonPath: /Art/UIAssets/TextrueJson\EquipmentIcon.txt
-    packgSpritePath: Assets/Res/UIAtlas/EquipmentIcon.spriteatlasv2
-    lasetJsonGUID: 3f341819198f0a90aee7b2673a546c13
+    packName: allIcon
+    packgJsonPath: /Art/UIAssets/TextrueJson/allIcon.txt
+    packgSpritePath: Assets/Res/UIAtlas/allIcon.spriteatlasv2
+    lasetJsonGUID: 083ae4b3a7b2beffb51fed7b1b7800d3
 --- !u!1 &2194073403744203526
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/WidgetItem_黄装.prefab

@@ -465,12 +465,12 @@ MonoBehaviour:
   m_PixelsPerUnitMultiplier: 1
   _icon_name: icon_eq_1_2_3
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 32b47635c42d8454b9f3385841ed0ede, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 3855e71da36cb4dfeb0ce0972ed08272, type: 3}
   packInfo:
-    packName: EquipmentIcon
-    packgJsonPath: /Art/UIAssets/TextrueJson\EquipmentIcon.txt
-    packgSpritePath: Assets/Res/UIAtlas/EquipmentIcon.spriteatlasv2
-    lasetJsonGUID: 3f341819198f0a90aee7b2673a546c13
+    packName: allIcon
+    packgJsonPath: /Art/UIAssets/TextrueJson/allIcon.txt
+    packgSpritePath: Assets/Res/UIAtlas/allIcon.spriteatlasv2
+    lasetJsonGUID: 083ae4b3a7b2beffb51fed7b1b7800d3
 --- !u!1 &3178120875985470737
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UIAtlas/EquipmentIcon.spriteatlasv2.meta

@@ -1,31 +0,0 @@
-fileFormatVersion: 2
-guid: DHhNsS2rUH4EytYpUHkvIRfWRH+46qVxv+dhvZl9+PQORcYBKo5DtsU=
-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: 1
-    enableTightPacking: 1
-    enableAlphaDilation: 0
-  secondaryTextureSettings: {}
-  variantMultiplier: 1
-  bindAsDefault: 1
-  userData: 
-  assetBundleName: equipmenticon
-  assetBundleVariant: 

Assets/Res/UIAtlas/all.spriteatlasv2

@@ -11,96 +11,97 @@ SpriteAtlasAsset:
   m_MasterAtlas: {fileID: 0}
   m_ImporterData:
     packables:
-    - {fileID: 2800000, guid: 7f40c4693834f4b79813864b3b216f22, type: 3}
-    - {fileID: 2800000, guid: 92753e7463d6c4451bcfaa1be32e5834, type: 3}
-    - {fileID: 2800000, guid: 69c249842084043e0b2152a611527273, type: 3}
-    - {fileID: 2800000, guid: 620836cccebfa47d69f3604400cda9d1, type: 3}
-    - {fileID: 2800000, guid: c9076402f3d8e4f14b590c121f9c99d0, type: 3}
-    - {fileID: 2800000, guid: e4a00da9d5759447c948b8fa241afc3e, type: 3}
-    - {fileID: 2800000, guid: 11b26917032164d598602af49f7fe468, type: 3}
-    - {fileID: 2800000, guid: 2b82d333ed81d430a84d2124a819c288, type: 3}
-    - {fileID: 2800000, guid: ce1ea5fcdbd674590ac8eae01e003bad, type: 3}
-    - {fileID: 2800000, guid: 5c287376e64d24bc1a85b53628621857, type: 3}
-    - {fileID: 2800000, guid: 265dc7048cc994225bb9669326ab9ed6, type: 3}
-    - {fileID: 2800000, guid: 8beb887d62a704827986ead27b5a4935, type: 3}
-    - {fileID: 2800000, guid: 92cd22df52f4e473a89701d0395c71ac, type: 3}
-    - {fileID: 2800000, guid: 513aeb74bd03e47a89e20193a6ed1b19, type: 3}
-    - {fileID: 2800000, guid: e1b6b9fd78e034d5da9c741d07ed1146, type: 3}
-    - {fileID: 2800000, guid: 7802bfdd398ef4cf8a545b3d8362f081, type: 3}
-    - {fileID: 2800000, guid: dd5f2c8c6196c4f2da80fb80e8d302c1, type: 3}
-    - {fileID: 2800000, guid: 7a1aa398466652b4aae1bf35dd9f03e8, type: 3}
-    - {fileID: 2800000, guid: c5d88737534914e22a2b08bf691052c3, type: 3}
-    - {fileID: 2800000, guid: 03108c847a5054b63971245729018c27, type: 3}
-    - {fileID: 2800000, guid: 036dc8ba1666442588bd4900d7967f74, type: 3}
-    - {fileID: 2800000, guid: cb6357c4501c7f940be9613426020ba9, type: 3}
-    - {fileID: 2800000, guid: 5c40ba2427908a24d9352a4296d00504, type: 3}
+    - {fileID: 2800000, guid: 1d87a1a810baddc4d82d37c6d78eb3c4, type: 3}
+    - {fileID: 2800000, guid: 81855acce71634bc8aa205d1313e2dd8, type: 3}
+    - {fileID: 2800000, guid: f135276cb2d8f43339f0cbe999537c48, type: 3}
     - {fileID: 2800000, guid: 1e57f4f2deb7646f38356896a394b27c, type: 3}
-    - {fileID: 2800000, guid: 50db720a997df0f4bb76d75ca3128dc6, type: 3}
-    - {fileID: 2800000, guid: e939c98a051bd9340aa91d8314666dab, type: 3}
+    - {fileID: 2800000, guid: d05f208cad7f39c488a07bc21a1938e9, type: 3}
+    - {fileID: 2800000, guid: 4f5b4c2303ae14f8aa8d2daf5803f417, type: 3}
+    - {fileID: 2800000, guid: 05f27d75986d94b2a876e7c5984f42b6, type: 3}
+    - {fileID: 2800000, guid: a87149123ae00504d802648411192f19, type: 3}
+    - {fileID: 2800000, guid: 9c4fd4838fb139248bd31b4595d3d3e0, type: 3}
+    - {fileID: 2800000, guid: 0b7cc907f403f4a67ad658df2c8b8bd6, type: 3}
+    - {fileID: 2800000, guid: 5fc69a4cdcb513349b62aadcb6ea64ae, type: 3}
+    - {fileID: 2800000, guid: 104a340bfa7bdc842a914e4855a3f023, type: 3}
+    - {fileID: 2800000, guid: 99451d3c99bda4547aea27878c0936fa, type: 3}
+    - {fileID: 2800000, guid: 8beb887d62a704827986ead27b5a4935, type: 3}
+    - {fileID: 2800000, guid: 6db8a26aaf376472cb3da4b0174c3640, type: 3}
+    - {fileID: 2800000, guid: 1944ddda93ef84249abc2c330ccc1671, type: 3}
     - {fileID: 2800000, guid: a30bf5a5fe0484028b110056f3f4bfb7, type: 3}
-    - {fileID: 2800000, guid: 18bdd168063b3419c93ff0ad3d928768, type: 3}
-    - {fileID: 2800000, guid: b2e467ec8826146c494188b3c7fbdef7, type: 3}
-    - {fileID: 2800000, guid: 7c8926e9485cb44518cbd710f654f4c3, type: 3}
-    - {fileID: 2800000, guid: eb5a004d027914b13abea711a54675e5, type: 3}
+    - {fileID: 2800000, guid: 7a8716b2f7dea49e2a0a4b04902a7b29, type: 3}
+    - {fileID: 2800000, guid: 5cd1458b0dea24e43baf2431893ace5c, type: 3}
+    - {fileID: 2800000, guid: 9cc56dbf2574943bfac47268b7bbc584, type: 3}
+    - {fileID: 2800000, guid: fb9317113944240948cfe4a213422ff8, type: 3}
+    - {fileID: 2800000, guid: e66ca3a4c42e3764c9dd960f3e696fea, type: 3}
+    - {fileID: 2800000, guid: b585079c6bd658f4e937b4f0468e8091, type: 3}
     - {fileID: 2800000, guid: 066cdce1ecfa6a14dbec09075860d79a, type: 3}
+    - {fileID: 2800000, guid: c9076402f3d8e4f14b590c121f9c99d0, type: 3}
+    - {fileID: 2800000, guid: 620836cccebfa47d69f3604400cda9d1, type: 3}
+    - {fileID: 2800000, guid: 7c8926e9485cb44518cbd710f654f4c3, type: 3}
+    - {fileID: 2800000, guid: dd5f2c8c6196c4f2da80fb80e8d302c1, type: 3}
+    - {fileID: 2800000, guid: 5c40ba2427908a24d9352a4296d00504, 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: ce32dcb975473404e93ec07abe82cf10, type: 3}
+    - {fileID: 2800000, guid: 458074caa850a4ebe9902dadcebd5519, type: 3}
+    - {fileID: 2800000, guid: 7dcf2d1065fa80640890e6fc7a8b1d8e, type: 3}
+    - {fileID: 2800000, guid: 92753e7463d6c4451bcfaa1be32e5834, type: 3}
+    - {fileID: 2800000, guid: 084d642e01f7849d0a49230ab9cc18b9, type: 3}
+    - {fileID: 2800000, guid: ce1ea5fcdbd674590ac8eae01e003bad, type: 3}
+    - {fileID: 2800000, guid: 014bfa77b5b6abb468599df19cab8b08, type: 3}
     - {fileID: 2800000, guid: 7298f85c9be3e480ca29a540b881acc7, type: 3}
-    - {fileID: 2800000, guid: 05f27d75986d94b2a876e7c5984f42b6, type: 3}
+    - {fileID: 2800000, guid: e939c98a051bd9340aa91d8314666dab, type: 3}
+    - {fileID: 2800000, guid: acf622f4b8b10451f864e6bbe0f2d18c, type: 3}
+    - {fileID: 2800000, guid: 92cd22df52f4e473a89701d0395c71ac, type: 3}
+    - {fileID: 2800000, guid: 69c249842084043e0b2152a611527273, type: 3}
     - {fileID: 2800000, guid: c4a220291754e4cdcb56015d594b6049, type: 3}
-    - {fileID: 2800000, guid: 54f226abc196547a9b4749d64512ffcb, type: 3}
-    - {fileID: 2800000, guid: d05f208cad7f39c488a07bc21a1938e9, type: 3}
-    - {fileID: 2800000, guid: 99451d3c99bda4547aea27878c0936fa, type: 3}
-    - {fileID: 2800000, guid: 1d87a1a810baddc4d82d37c6d78eb3c4, type: 3}
-    - {fileID: 2800000, guid: f135276cb2d8f43339f0cbe999537c48, type: 3}
-    - {fileID: 2800000, guid: 0107877e5f4474feeb6c3a48ddbd0181, type: 3}
-    - {fileID: 2800000, guid: 9cc56dbf2574943bfac47268b7bbc584, type: 3}
-    - {fileID: 2800000, guid: c9543603422a7467da7d308507e9b575, type: 3}
-    - {fileID: 2800000, guid: 5fc69a4cdcb513349b62aadcb6ea64ae, type: 3}
+    - {fileID: 2800000, guid: 9369285ebc9f1452cb96bdd4c71dc580, type: 3}
+    - {fileID: 2800000, guid: 18bdd168063b3419c93ff0ad3d928768, type: 3}
     - {fileID: 2800000, guid: 8433511397436d04bb18893929b38c14, type: 3}
+    - {fileID: 2800000, guid: 2b82d333ed81d430a84d2124a819c288, type: 3}
+    - {fileID: 2800000, guid: a909a2534241641bfa4fd6d3aa0997fa, type: 3}
+    - {fileID: 2800000, guid: 1cedae3cd8e1c4e8b8351163cb83d3c3, type: 3}
+    - {fileID: 2800000, guid: 54f226abc196547a9b4749d64512ffcb, type: 3}
     - {fileID: 2800000, guid: 40b46970b24114095ae4592b09cd788b, type: 3}
+    - {fileID: 2800000, guid: 5d0910d5da5bc9a43a3cdad4e94e053d, type: 3}
+    - {fileID: 2800000, guid: 88f8d005a66c74c8e8516498671a5363, type: 3}
+    - {fileID: 2800000, guid: e1b6b9fd78e034d5da9c741d07ed1146, type: 3}
+    - {fileID: 2800000, guid: 7802bfdd398ef4cf8a545b3d8362f081, type: 3}
     - {fileID: 2800000, guid: 644d6a9935ab8468f91bccdf0e81217e, type: 3}
+    - {fileID: 2800000, guid: 0107877e5f4474feeb6c3a48ddbd0181, type: 3}
+    - {fileID: 2800000, guid: 513aeb74bd03e47a89e20193a6ed1b19, type: 3}
     - {fileID: 2800000, guid: 694e03b969504324081225f1921465de, type: 3}
-    - {fileID: 2800000, guid: ce32dcb975473404e93ec07abe82cf10, type: 3}
-    - {fileID: 2800000, guid: 014bfa77b5b6abb468599df19cab8b08, type: 3}
-    - {fileID: 2800000, guid: 1cedae3cd8e1c4e8b8351163cb83d3c3, type: 3}
-    - {fileID: 2800000, guid: f4492d7c6449e4ea7bcfb41d86964417, type: 3}
-    - {fileID: 2800000, guid: 143cd712a8bc04e1c9218c3c504b7abf, type: 3}
-    - {fileID: 2800000, guid: 5555f9ec76d49734ea1437158ef8e663, type: 3}
-    - {fileID: 2800000, guid: 81855acce71634bc8aa205d1313e2dd8, type: 3}
-    - {fileID: 2800000, guid: 7dcf2d1065fa80640890e6fc7a8b1d8e, type: 3}
-    - {fileID: 2800000, guid: 88f8d005a66c74c8e8516498671a5363, type: 3}
-    - {fileID: 2800000, guid: 82fb7f520a3d042f68f126f07425081c, type: 3}
-    - {fileID: 2800000, guid: 458074caa850a4ebe9902dadcebd5519, type: 3}
-    - {fileID: 2800000, guid: 0b7cc907f403f4a67ad658df2c8b8bd6, type: 3}
+    - {fileID: 2800000, guid: 58233a1daedbb4a24b2ddca6bcb864fd, type: 3}
+    - {fileID: 2800000, guid: 03108c847a5054b63971245729018c27, type: 3}
+    - {fileID: 2800000, guid: eb5a004d027914b13abea711a54675e5, type: 3}
+    - {fileID: 2800000, guid: e4a00da9d5759447c948b8fa241afc3e, type: 3}
     - {fileID: 2800000, guid: 793dd477683f1b743acb6e68d204d465, type: 3}
-    - {fileID: 2800000, guid: 104a340bfa7bdc842a914e4855a3f023, type: 3}
-    - {fileID: 2800000, guid: 9c4fd4838fb139248bd31b4595d3d3e0, type: 3}
-    - {fileID: 2800000, guid: 687226eea50e240aeb387bc0204de028, type: 3}
-    - {fileID: 2800000, guid: a909a2534241641bfa4fd6d3aa0997fa, type: 3}
-    - {fileID: 2800000, guid: 084d642e01f7849d0a49230ab9cc18b9, type: 3}
+    - {fileID: 2800000, guid: dd87b4353a45646fbbeaafe8c13a4632, type: 3}
+    - {fileID: 2800000, guid: 7c661cddbbc49467d8441a35766809e1, type: 3}
     - {fileID: 2800000, guid: 0e2733676e1be451a8519a89c49798c1, type: 3}
-    - {fileID: 2800000, guid: 044267119b30c460785747c947493225, type: 3}
-    - {fileID: 2800000, guid: 4f5b4c2303ae14f8aa8d2daf5803f417, type: 3}
-    - {fileID: 2800000, guid: acf622f4b8b10451f864e6bbe0f2d18c, type: 3}
-    - {fileID: 2800000, guid: a87149123ae00504d802648411192f19, type: 3}
+    - {fileID: 2800000, guid: b2e467ec8826146c494188b3c7fbdef7, type: 3}
+    - {fileID: 2800000, guid: 7529bbf4240db4e31a7b6f4df456a36a, type: 3}
+    - {fileID: 2800000, guid: 5555f9ec76d49734ea1437158ef8e663, type: 3}
+    - {fileID: 2800000, guid: ab7ed8048d1084deca39266a82de2fbc, type: 3}
+    - {fileID: 2800000, guid: c9543603422a7467da7d308507e9b575, type: 3}
+    - {fileID: 2800000, guid: 7a1aa398466652b4aae1bf35dd9f03e8, type: 3}
     - {fileID: 2800000, guid: 20a0259ff08564d3193d072c03463665, type: 3}
-    - {fileID: 2800000, guid: 5d0910d5da5bc9a43a3cdad4e94e053d, type: 3}
-    - {fileID: 2800000, guid: d320d0b7f786e44768dbf452a215d9f4, type: 3}
-    - {fileID: 2800000, guid: b585079c6bd658f4e937b4f0468e8091, type: 3}
-    - {fileID: 2800000, guid: 9369285ebc9f1452cb96bdd4c71dc580, type: 3}
-    - {fileID: 2800000, guid: e701ef601bf944f31a3d97f606f78430, type: 3}
-    - {fileID: 2800000, guid: df1cd931072aa4a118088d9e27a0a603, type: 3}
-    - {fileID: 2800000, guid: fb9317113944240948cfe4a213422ff8, type: 3}
-    - {fileID: 2800000, guid: e66ca3a4c42e3764c9dd960f3e696fea, type: 3}
-    - {fileID: 2800000, guid: 6db8a26aaf376472cb3da4b0174c3640, type: 3}
-    - {fileID: 2800000, guid: 4e7efc4278c98434aa518be230a9a6e2, type: 3}
+    - {fileID: 2800000, guid: 044267119b30c460785747c947493225, type: 3}
     - {fileID: 2800000, guid: ebc537e5817db4407935a71d199232e9, type: 3}
+    - {fileID: 2800000, guid: 50db720a997df0f4bb76d75ca3128dc6, type: 3}
+    - {fileID: 2800000, guid: cb6357c4501c7f940be9613426020ba9, type: 3}
+    - {fileID: 2800000, guid: 687226eea50e240aeb387bc0204de028, type: 3}
+    - {fileID: 2800000, guid: 143cd712a8bc04e1c9218c3c504b7abf, type: 3}
+    - {fileID: 2800000, guid: d320d0b7f786e44768dbf452a215d9f4, type: 3}
+    - {fileID: 2800000, guid: 265dc7048cc994225bb9669326ab9ed6, type: 3}
+    - {fileID: 2800000, guid: 11b26917032164d598602af49f7fe468, type: 3}
+    - {fileID: 2800000, guid: 5c287376e64d24bc1a85b53628621857, type: 3}
+    - {fileID: 2800000, guid: f4492d7c6449e4ea7bcfb41d86964417, type: 3}
+    - {fileID: 2800000, guid: c5d88737534914e22a2b08bf691052c3, type: 3}
+    - {fileID: 2800000, guid: 7f40c4693834f4b79813864b3b216f22, type: 3}
     - {fileID: 2800000, guid: 9e984408ac7ba4153bace3927806efeb, type: 3}
-    - {fileID: 2800000, guid: ab7ed8048d1084deca39266a82de2fbc, type: 3}
-    - {fileID: 2800000, guid: 58233a1daedbb4a24b2ddca6bcb864fd, type: 3}
-    - {fileID: 2800000, guid: dd87b4353a45646fbbeaafe8c13a4632, type: 3}
-    - {fileID: 2800000, guid: 1944ddda93ef84249abc2c330ccc1671, type: 3}
-    - {fileID: 2800000, guid: 7c661cddbbc49467d8441a35766809e1, type: 3}
-    - {fileID: 2800000, guid: 7a8716b2f7dea49e2a0a4b04902a7b29, type: 3}
-    - {fileID: 2800000, guid: 7529bbf4240db4e31a7b6f4df456a36a, type: 3}
   m_IsVariant: 0
   m_IsPlaceholder: 0

Assets/Res/UIAtlas/EquipmentIcon.spriteatlasv2 → Assets/Res/UIAtlas/allIcon.spriteatlasv2

@@ -11,65 +11,70 @@ SpriteAtlasAsset:
   m_MasterAtlas: {fileID: 0}
   m_ImporterData:
     packables:
-    - {fileID: 2800000, guid: 56e48d33460398d4da7ba0faafd0357f, type: 3}
+    - {fileID: 2800000, guid: 686bc6c27b77549b0a4309b808e6620b, type: 3}
+    - {fileID: 2800000, guid: a4f6d78a36655554e89a5c8fb7b9b66f, type: 3}
+    - {fileID: 2800000, guid: 5dbe6cbfcf5194c28bfb3570894f5718, type: 3}
+    - {fileID: 2800000, guid: ad3e276b2c4977b4ca8c556f0705577c, type: 3}
+    - {fileID: 2800000, guid: 3be19fb50648f6541aca133c33f43ea2, type: 3}
+    - {fileID: 2800000, guid: 84f0f4450b0e3644eb1e97be34b42463, type: 3}
+    - {fileID: 2800000, guid: ff7f553a76e6f4322a64fbb61d20f9ba, type: 3}
+    - {fileID: 2800000, guid: 40bc652a2f80c4500b10133dd8ca5e43, type: 3}
+    - {fileID: 2800000, guid: 3077f31e475de4831b14989f053d238f, type: 3}
+    - {fileID: 2800000, guid: 2dd1f5812874a7a4e879b5442c5a626e, type: 3}
+    - {fileID: 2800000, guid: 2be57e96e307a0b40bde03fdf7062255, type: 3}
+    - {fileID: 2800000, guid: bca5684a740353f4ca56daeb1e3e01e0, type: 3}
+    - {fileID: 2800000, guid: 07ebcf2547298f74bbf96ce766dd0f1c, type: 3}
+    - {fileID: 2800000, guid: 8f888901a271ee24ebafaaf1d5323c2e, type: 3}
+    - {fileID: 2800000, guid: 5e34a8f97c6846f45b3be0b2e29e62a9, type: 3}
+    - {fileID: 2800000, guid: 6c69b5e0c5f1808449f3cb328d104105, type: 3}
+    - {fileID: 2800000, guid: aede80725d7ea9847aba7ca1664aa3c8, type: 3}
+    - {fileID: 2800000, guid: a68f300e9414b724b9ec189e3c9c061d, type: 3}
+    - {fileID: 2800000, guid: e8e109ce4146fa84d97c912786b7686b, type: 3}
+    - {fileID: 2800000, guid: 2ce3304b383ea0340b452a3f9740720b, type: 3}
     - {fileID: 2800000, guid: 3c6a10c5b63d5784c8176b5883fdddfb, type: 3}
+    - {fileID: 2800000, guid: 1562359088a3ea94db0c2d98547494c3, type: 3}
+    - {fileID: 2800000, guid: d900d9dbc91df1e4e982b19a93fe6129, type: 3}
     - {fileID: 2800000, guid: 0de81f9e73c92c143b567089238db6bc, type: 3}
-    - {fileID: 2800000, guid: 4c410bd35ddeaa14e9c08fab39106384, type: 3}
-    - {fileID: 2800000, guid: 800f0cd5cf2a4da4a9b9279e96c92058, type: 3}
-    - {fileID: 2800000, guid: fd304205ac1a3a54097142a16e2d02b7, type: 3}
+    - {fileID: 2800000, guid: ab0f19aa367e5594ab23e9ba0270758b, type: 3}
     - {fileID: 2800000, guid: 19fdc1ed0ba407a428405934273e9783, type: 3}
-    - {fileID: 2800000, guid: 529b8d6840900144997f8b215e7781fb, type: 3}
     - {fileID: 2800000, guid: 455398dd98c0e0a4a830340673d3a652, type: 3}
-    - {fileID: 2800000, guid: 63278b50eee97884ca777f2239a76395, type: 3}
-    - {fileID: 2800000, guid: 9edcab6923da7cc4fb216a757a563dcd, type: 3}
-    - {fileID: 2800000, guid: 124a7b77303cf3e438c311aa4813efe4, type: 3}
+    - {fileID: 2800000, guid: f6252dadc46c09047a7e871760b009e5, type: 3}
+    - {fileID: 2800000, guid: 56e48d33460398d4da7ba0faafd0357f, type: 3}
+    - {fileID: 2800000, guid: c3ab828aa5cca194dbd8039138e66ab9, type: 3}
+    - {fileID: 2800000, guid: 149caaeb89afb654c8aaefe596ec7a31, type: 3}
+    - {fileID: 2800000, guid: 529b8d6840900144997f8b215e7781fb, type: 3}
+    - {fileID: 2800000, guid: 810ca615fc5791b438d8c4a06be05d44, type: 3}
+    - {fileID: 2800000, guid: 6454f35e79665984b80b290d89b4b866, type: 3}
     - {fileID: 2800000, guid: f44f09796a3b9d24b8842753f6c0376a, type: 3}
-    - {fileID: 2800000, guid: b332aa81d67cde04dbc9aa081dd30465, type: 3}
+    - {fileID: 2800000, guid: 5aae54de2b5a59148badb51b0ce0bc50, type: 3}
     - {fileID: 2800000, guid: 509cdc5238ea76a45bd9d3c1e2092bb4, type: 3}
+    - {fileID: 2800000, guid: 27fe6e7753734e644b2e7c2a9c19311c, type: 3}
+    - {fileID: 2800000, guid: 915ae050bd2bd9640b9859a14484c9fa, type: 3}
+    - {fileID: 2800000, guid: b332aa81d67cde04dbc9aa081dd30465, type: 3}
+    - {fileID: 2800000, guid: d55a4612f02d1ac4b8202346a0af938b, type: 3}
     - {fileID: 2800000, guid: 39ec33eac844d7946a825367eba97c32, type: 3}
+    - {fileID: 2800000, guid: fd304205ac1a3a54097142a16e2d02b7, type: 3}
+    - {fileID: 2800000, guid: 1c10bacdf9416ba499add4b765665727, type: 3}
+    - {fileID: 2800000, guid: 374135817649a76498d5b0403ed26342, type: 3}
+    - {fileID: 2800000, guid: 800f0cd5cf2a4da4a9b9279e96c92058, type: 3}
+    - {fileID: 2800000, guid: b42a9d725050c7c4da305cc35c0c745c, type: 3}
+    - {fileID: 2800000, guid: 042be304ac7dec4419b8b1242dc93af5, type: 3}
     - {fileID: 2800000, guid: 2b097d2a6dc97f2479266354c07def3c, type: 3}
-    - {fileID: 2800000, guid: afbdef33193d38a4a97261a4db82d6f6, type: 3}
-    - {fileID: 2800000, guid: ab0f19aa367e5594ab23e9ba0270758b, type: 3}
-    - {fileID: 2800000, guid: 149caaeb89afb654c8aaefe596ec7a31, type: 3}
-    - {fileID: 2800000, guid: f6252dadc46c09047a7e871760b009e5, type: 3}
     - {fileID: 2800000, guid: 04a8795bf75dd9a4f9063ec46f0380ee, type: 3}
-    - {fileID: 2800000, guid: 374135817649a76498d5b0403ed26342, type: 3}
-    - {fileID: 2800000, guid: 1c10bacdf9416ba499add4b765665727, type: 3}
-    - {fileID: 2800000, guid: 6454f35e79665984b80b290d89b4b866, type: 3}
-    - {fileID: 2800000, guid: 915ae050bd2bd9640b9859a14484c9fa, type: 3}
-    - {fileID: 2800000, guid: 27fe6e7753734e644b2e7c2a9c19311c, type: 3}
-    - {fileID: 2800000, guid: 56c7f4ee6e4310b4f85e27fa852e82f7, type: 3}
-    - {fileID: 2800000, guid: ae6754e419e63974198aaa037725d52a, type: 3}
+    - {fileID: 2800000, guid: 4c410bd35ddeaa14e9c08fab39106384, type: 3}
+    - {fileID: 2800000, guid: afbdef33193d38a4a97261a4db82d6f6, type: 3}
+    - {fileID: 2800000, guid: e4ca514f0a198e346be6b65849c3f24c, type: 3}
+    - {fileID: 2800000, guid: 124a7b77303cf3e438c311aa4813efe4, type: 3}
     - {fileID: 2800000, guid: b66ea5da704032342b737b452fd7a57a, type: 3}
-    - {fileID: 2800000, guid: c471c9bbeed2cac429f5a6c5f788a945, type: 3}
     - {fileID: 2800000, guid: 4a19e711e1db604489d67606a5cbef56, type: 3}
     - {fileID: 2800000, guid: d95ac881cad818844937dbd19089a3d3, type: 3}
-    - {fileID: 2800000, guid: d55a4612f02d1ac4b8202346a0af938b, type: 3}
-    - {fileID: 2800000, guid: 5aae54de2b5a59148badb51b0ce0bc50, type: 3}
-    - {fileID: 2800000, guid: 810ca615fc5791b438d8c4a06be05d44, type: 3}
     - {fileID: 2800000, guid: 0bceabacbce118347b978b68355806ec, type: 3}
-    - {fileID: 2800000, guid: 8cf848f98413c1b4291bd86090ab5983, type: 3}
+    - {fileID: 2800000, guid: ae6754e419e63974198aaa037725d52a, type: 3}
+    - {fileID: 2800000, guid: 9edcab6923da7cc4fb216a757a563dcd, type: 3}
     - {fileID: 2800000, guid: f9f06d5ece2bb144a9e00add498e5e25, type: 3}
-    - {fileID: 2800000, guid: c3ab828aa5cca194dbd8039138e66ab9, type: 3}
-    - {fileID: 2800000, guid: d900d9dbc91df1e4e982b19a93fe6129, type: 3}
-    - {fileID: 2800000, guid: 1562359088a3ea94db0c2d98547494c3, type: 3}
-    - {fileID: 2800000, guid: b42a9d725050c7c4da305cc35c0c745c, type: 3}
-    - {fileID: 2800000, guid: e4ca514f0a198e346be6b65849c3f24c, type: 3}
-    - {fileID: 2800000, guid: 042be304ac7dec4419b8b1242dc93af5, type: 3}
-    - {fileID: 2800000, guid: aede80725d7ea9847aba7ca1664aa3c8, type: 3}
-    - {fileID: 2800000, guid: 2ce3304b383ea0340b452a3f9740720b, type: 3}
-    - {fileID: 2800000, guid: a68f300e9414b724b9ec189e3c9c061d, type: 3}
-    - {fileID: 2800000, guid: 84f0f4450b0e3644eb1e97be34b42463, type: 3}
-    - {fileID: 2800000, guid: 2dd1f5812874a7a4e879b5442c5a626e, type: 3}
-    - {fileID: 2800000, guid: 2be57e96e307a0b40bde03fdf7062255, type: 3}
-    - {fileID: 2800000, guid: e8e109ce4146fa84d97c912786b7686b, type: 3}
-    - {fileID: 2800000, guid: 5e34a8f97c6846f45b3be0b2e29e62a9, type: 3}
-    - {fileID: 2800000, guid: 6c69b5e0c5f1808449f3cb328d104105, type: 3}
-    - {fileID: 2800000, guid: a4f6d78a36655554e89a5c8fb7b9b66f, type: 3}
-    - {fileID: 2800000, guid: ad3e276b2c4977b4ca8c556f0705577c, type: 3}
-    - {fileID: 2800000, guid: 3be19fb50648f6541aca133c33f43ea2, type: 3}
-    - {fileID: 2800000, guid: 8f888901a271ee24ebafaaf1d5323c2e, type: 3}
-    - {fileID: 2800000, guid: bca5684a740353f4ca56daeb1e3e01e0, type: 3}
-    - {fileID: 2800000, guid: 07ebcf2547298f74bbf96ce766dd0f1c, type: 3}
+    - {fileID: 2800000, guid: c471c9bbeed2cac429f5a6c5f788a945, type: 3}
+    - {fileID: 2800000, guid: 8cf848f98413c1b4291bd86090ab5983, type: 3}
+    - {fileID: 2800000, guid: 56c7f4ee6e4310b4f85e27fa852e82f7, type: 3}
+    - {fileID: 2800000, guid: 63278b50eee97884ca777f2239a76395, type: 3}
   m_IsVariant: 0
   m_IsPlaceholder: 0

Assets/Res/UIAtlas/itemIcon.spriteatlasv2.meta → Assets/Res/UIAtlas/allIcon.spriteatlasv2.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: B35Jty2vUXt2gtCwCGc8Cx+oMrfts7maenYW66/ONtNWrCgau1A2jLw=
+guid: DHIasH+qUi9DTkdDwWjXnUPqJ09SCKN+sgN7nwN/uBmAk/NBmE0EaM0=
 SpriteAtlasImporter:
   externalObjects: {}
   textureSettings:
@@ -27,5 +27,5 @@ SpriteAtlasImporter:
   variantMultiplier: 1
   bindAsDefault: 1
   userData: 
-  assetBundleName: itemicon
+  assetBundleName: moban
   assetBundleVariant: 

Assets/Res/UIAtlas/heroIcon.spriteatlasv2

@@ -1,19 +0,0 @@
-%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: ff7f553a76e6f4322a64fbb61d20f9ba, type: 3}
-    - {fileID: 2800000, guid: 40bc652a2f80c4500b10133dd8ca5e43, type: 3}
-    - {fileID: 2800000, guid: 3077f31e475de4831b14989f053d238f, type: 3}
-    - {fileID: 2800000, guid: 686bc6c27b77549b0a4309b808e6620b, type: 3}
-  m_IsVariant: 0
-  m_IsPlaceholder: 0

Assets/Res/UIAtlas/heroIcon.spriteatlasv2.meta

@@ -1,31 +0,0 @@
-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: heroicon
-  assetBundleVariant: 

Assets/Res/UIAtlas/itemIcon.spriteatlasv2

@@ -1,23 +0,0 @@
-%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: d84b79a30f6baa04aad2377702a6fff8, type: 3}
-    - {fileID: 2800000, guid: 3dbad1a5a76c126439669e6a3fd22f96, type: 3}
-    - {fileID: 2800000, guid: e6614d7880f624bebb9eb042438465e7, type: 3}
-    - {fileID: 2800000, guid: fac2f1f21015b4387ba948c68d69b20a, type: 3}
-    - {fileID: 2800000, guid: 082c2d0dec6374c548992e3de4c3cc17, type: 3}
-    - {fileID: 2800000, guid: 12f59c252111d4ddaa1efdbe970c9338, type: 3}
-    - {fileID: 2800000, guid: 11f8939ed19d74afd9f1ec5c2cd1ed40, type: 3}
-    - {fileID: 2800000, guid: 137d66878d81240e08b1f9e634dd03e5, type: 3}
-  m_IsVariant: 0
-  m_IsPlaceholder: 0

Assets/Res/UIAtlas/skillIcon.spriteatlasv2

@@ -11,22 +11,22 @@ SpriteAtlasAsset:
   m_MasterAtlas: {fileID: 0}
   m_ImporterData:
     packables:
+    - {fileID: 2800000, guid: cd17866a0bfb911429fe498a0431277c, type: 3}
+    - {fileID: 2800000, guid: 3b5496225424c894180fe06fe939122a, type: 3}
     - {fileID: 2800000, guid: 26e0f7c71e95f4b67b429f478069bc93, type: 3}
     - {fileID: 2800000, guid: 9a8da91ac8b0b3042b18b5f66a65c614, type: 3}
     - {fileID: 2800000, guid: 49a56cefdb25e1d4781964df6ef99cee, type: 3}
-    - {fileID: 2800000, guid: cd17866a0bfb911429fe498a0431277c, type: 3}
-    - {fileID: 2800000, guid: 3b5496225424c894180fe06fe939122a, type: 3}
-    - {fileID: 2800000, guid: a878d3156a1104bb5a021cc9db275ec9, type: 3}
-    - {fileID: 2800000, guid: 4805970872efad343a8559b5ddf6160a, type: 3}
+    - {fileID: 2800000, guid: 2d02827d80f314b27ad033444533c025, type: 3}
     - {fileID: 2800000, guid: 9e6ea24bb7a75d649a177f0c404c14ce, type: 3}
     - {fileID: 2800000, guid: 377bbbee9636d8749b06a6ff1eff1b68, type: 3}
-    - {fileID: 2800000, guid: 2d02827d80f314b27ad033444533c025, type: 3}
     - {fileID: 2800000, guid: 44e771c4fac834747917264ec667b36d, type: 3}
+    - {fileID: 2800000, guid: 4805970872efad343a8559b5ddf6160a, type: 3}
     - {fileID: 2800000, guid: 420e401ffc649de45b6789ff546e7b69, type: 3}
+    - {fileID: 2800000, guid: a878d3156a1104bb5a021cc9db275ec9, type: 3}
     - {fileID: 2800000, guid: 91b32d7475b6ca44e932bb93a5b5b040, type: 3}
-    - {fileID: 2800000, guid: 3fb1e3f2ace104b39a8b5a61d145264f, type: 3}
     - {fileID: 2800000, guid: bd02d94a9e7e5b2488e9bf34e210e4e9, type: 3}
-    - {fileID: 2800000, guid: 28e6a1e003583174188048aadd974b70, type: 3}
+    - {fileID: 2800000, guid: 3fb1e3f2ace104b39a8b5a61d145264f, type: 3}
     - {fileID: 2800000, guid: 400a70f93890a604fb5dba2d1d0de503, type: 3}
+    - {fileID: 2800000, guid: 28e6a1e003583174188048aadd974b70, type: 3}
   m_IsVariant: 0
   m_IsPlaceholder: 0

Assets/Scenes/testCombat.scene

@@ -903,6 +903,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 164319093}
+  - {fileID: 846380790}
   - {fileID: 1324294697}
   - {fileID: 773560729}
   m_Father: {fileID: 123020045}
@@ -1071,6 +1072,82 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 773560728}
   m_CullTransparentMesh: 1
+--- !u!1 &846380789
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 846380790}
+  - component: {fileID: 846380792}
+  - component: {fileID: 846380791}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: logo
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &846380790
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 846380789}
+  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: 1
+  m_Children: []
+  m_Father: {fileID: 753442136}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 380, y: 1379}
+  m_SizeDelta: {x: 548, y: 490}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &846380791
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 846380789}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: c445c0199876d6c4f954649a5f0863a3, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!222 &846380792
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 846380789}
+  m_CullTransparentMesh: 1
 --- !u!1 &1080868191
 GameObject:
   m_ObjectHideFlags: 0

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

@@ -71,5 +71,6 @@ namespace Fort23.Core
       /// 玩家使用技能
       /// </summary>
       PlayerUseSkill,
+      
     }
 }

Assets/Scripts/GameLogic/Bag/BagController.cs

@@ -30,6 +30,7 @@ namespace GameLogic.Bag
             {
                 ItemInfo itemInfo = new ItemInfo(itemData);
                 // m_bagList.Add(itemInfo);
+                LogTool.Log(itemInfo.guid);
                 m_allBagDic.Add(itemInfo.guid, itemInfo);
                 PlayerManager.Instance.eqController.Init(itemInfo);
             }
@@ -134,26 +135,42 @@ namespace GameLogic.Bag
             string guidStr = string.IsNullOrEmpty(guid) ? itemId.ToString() : guid;
             
             ItemInfo item = GetItemInfo(itemId, guidStr);
-            return AddItem(item, count);
+            return AddItemCount(item, count);
         }
 
+        /// <summary>
+        /// 添加道具，装备和普通道具都可以
+        /// </summary>
+        /// <param name="itemInfos"></param>
         public void AddItem(List<ItemInfo> itemInfos)
         {
             for (int i = 0; i < itemInfos.Count; i++)
             {
-                ItemInfo itemInfo = itemInfos[i];
-                LogTool.Log("获得了道具"+itemInfo.itemID);
-                AddItem(itemInfo, itemInfo.count.Value);
+                
+                ItemInfo item = itemInfos[i];
+                LogTool.Log("获得了道具"+item.itemID);
+                AddItem(item);
+                // //掉落的数量
+                // long count = itemInfo.count.Value;
+                // ItemInfo item = GetItemInfo(itemInfo);
+                //
+                // if (item.IsEquipItem())
+                // {
+                //     PlayerManager.Instance.eqController.AddEquipment(item);
+                // }
+                //
+                
+                // AddItemCount(item, count);
             }
         }
 
         /// <summary>
-        /// 添加道具，最后都走这里
+        /// 添加道具数量，最后都走这里
         /// </summary>
         /// <param name="item"></param>
         /// <param name="count"></param>
         /// <returns></returns>
-        private bool AddItem(ItemInfo item, long count)
+        private bool AddItemCount(ItemInfo item, long count)
         {
             if (item.config.ID <= 0 && string.IsNullOrEmpty(item.guid))
             {
@@ -188,20 +205,21 @@ namespace GameLogic.Bag
         // }
 
         /// <summary>
-        /// 添加装备道具
+        /// 添加道具，装备和普通道具都可以
         /// </summary>
         /// <param name="item"></param>
-        public void AddEquipmentItem(ItemInfo item)
+        public void AddItem(ItemInfo item)
         {
             //掉落的数量
             long count = item.count.Value;
-// LogTool.Log("掉落装备的GUID=" + item.guid);
-            // AddEqToDic(eqItemInfo);
-            ItemInfo eqItemInfo = GetItemInfo(item);
-            PlayerManager.Instance.eqController.AddEquipment(eqItemInfo);
+            ItemInfo itemInfo = GetItemInfo(item);
+            
+            if (itemInfo.IsEquipItem())
+            {
+                PlayerManager.Instance.eqController.AddEquipment(itemInfo);    
+            }
 
-            // m_bagEqList.Add(eqItemInfo);
-            AddItem(eqItemInfo, count);
+            AddItemCount(itemInfo, count);
         }
 
         /// <summary>
@@ -232,12 +250,33 @@ namespace GameLogic.Bag
             itemInfo.count.Value -= itemInfo.count.Value;
             AccountFileInfo.Instance.SaveItemData(itemInfo, saveNow);
         }
+        
+        /// <summary>
+        /// 获取道具信息
+        /// 不传guid，默认itemId就是guid
+        /// </summary>
+        /// <param name="itemId"></param>
+        /// <param name="guid"></param>
+        /// <returns></returns>
+        // public ItemInfo GetItemInfo(ItemInfo itemInfo)
+        // {
+        //     string guidStr = string.IsNullOrEmpty(itemInfo.guid) ? itemInfo.itemID.ToString() : itemInfo.guid;
+        //
+        //     if (m_allBagDic.TryGetValue(guidStr, out ItemInfo item))
+        //     {
+        //         return item;
+        //     }
+        //
+        //     m_allBagDic.Add(itemInfo.guid, itemInfo);
+        //
+        //     return itemInfo;
+        // }
 
         /// <summary>
         /// 一般是掉了（随机）一个东西（ItemInfo），然后来背包找，是否之前掉过一样的
-        /// 一般用于有guid的item
-        /// 比如掉了一个装备，装备有guid（组装的）
-        /// 后续有其他类似装备这种，动态组织出来的有guid的物品，也可以走这里。宝石，词条等。
+        /// 之前有，就把有的返回回去，加数量
+        /// 之前无，就返回这个新东西
+        /// /// 重要：加入背包管理都是通过这个方法（后续看是否优）
         /// </summary>
         /// <param name="itemInfo"></param>
         /// <returns></returns>
@@ -268,15 +307,6 @@ namespace GameLogic.Bag
         /// <returns></returns>
         public ItemInfo GetItemInfo(int itemId, string guid = "")
         {
-            // for (int i = 0; i < m_bagList.Count; i++)
-            // {
-            //     ItemInfo item = m_bagList[i];
-            //     if (item.itemID == itemId)
-            //     {
-            //         return item;
-            //     }
-            // }
-
             string guidStr = string.IsNullOrEmpty(guid) ? itemId.ToString() : guid;
 
             if (m_allBagDic.TryGetValue(guidStr, out ItemInfo item))
@@ -287,13 +317,19 @@ namespace GameLogic.Bag
             ItemInfo newItem = new ItemInfo(itemId);
             if (newItem.config.ID > 0)
             {
-                // m_bagList.Add(newItem);
                 m_allBagDic.Add(newItem.guid, newItem);
             }
+            else
+            {
+                LogTool.Error("没有找到这个道具：" + itemId);
+                return null;
+            }
 
             return newItem;
         }
         
+       
+        
 
         /// <summary>
         /// 扣除道具,最后都这里