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

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

@@ -42,7 +42,7 @@ TextureImporter:
     mipBias: 0
     wrapU: 1
     wrapV: 1
-    wrapW: 1
+    wrapW: 0
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
@@ -143,5 +143,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: 
+  assetBundleName: bg_chest05
   assetBundleVariant: 

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

@@ -143,5 +143,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: 
+  assetBundleName: dec_topber_bg_top
   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/VFX/FXPrefabs/fx_gw_chuxian_smoke_gw03_big.prefab.meta

@@ -3,5 +3,5 @@ guid: DnpK4Xn4W3/qWD3LcaTcoRN8L7Fc7L1MFRp4cNtGvHUZAklc2Y8To3E=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_gw_chuxian_smoke_gw03_big
   assetBundleVariant: 

Assets/Art/VFX/FXPrefabs/fx_shouDong.prefab.meta

@@ -3,5 +3,5 @@ guid: CC5NvCmoB3ionfYxyy+fajYWpOsBICI75gboH34BPeIH8JEpBh4STXg=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_shoudong
   assetBundleVariant: 

Assets/Art/VFX/FXPrefabs/fx_skill_yunshi.prefab.meta

@@ -3,5 +3,5 @@ guid: Cn1KvSP7VHvL2vC8D+hUTODXewcp/a5p9WuFuSMyS1gREDRzKbRrmvk=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_skill_yunshi
   assetBundleVariant: 

Assets/Art/VFX/FXPrefabs/fx_skill_yunshi_hit.prefab.meta

@@ -3,5 +3,5 @@ guid: WShOsX75UHsNkymgUgg8hfyLLPW6sBNExQ3k3Dk5POSM2iKRRHHgpMM=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_skill_yunshi_hit
   assetBundleVariant: 

Assets/Art/VFX/Materials/fx_dian1.mat.meta

@@ -4,5 +4,5 @@ NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 2100000
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_dian1
   assetBundleVariant: 

Assets/Art/VFX/Materials/fx_shikuai1.mat.meta

@@ -4,5 +4,5 @@ NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 2100000
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_shikuai1
   assetBundleVariant: 

Assets/Art/VFX/Materials/fx_shikuai1_ad.mat.meta

@@ -4,5 +4,5 @@ NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 2100000
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_shikuai1_ad
   assetBundleVariant: 

Assets/Art/VFX/Materials/fx_shikuai1_al.mat.meta

@@ -4,5 +4,5 @@ NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 2100000
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_shikuai1_al
   assetBundleVariant: 

Assets/Art/VFX/Textures/Sheet/fx_explosion_sharp_flat_3x3.png.meta

@@ -112,6 +112,20 @@ TextureImporter:
     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: []
@@ -129,5 +143,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_explosion_sharp_flat_3x3
   assetBundleVariant: 

Assets/Art/VFX/Textures/Trails/lz_Trail08.png.meta

@@ -112,6 +112,20 @@ TextureImporter:
     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: []
@@ -129,5 +143,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: 
+  assetBundleName: lz_trail08
   assetBundleVariant: 

Assets/Art/VFX/Textures/fx_dilie1.png.meta

@@ -112,6 +112,20 @@ TextureImporter:
     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: []
@@ -129,5 +143,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_dilie1
   assetBundleVariant: 

Assets/Art/VFX/Textures/fx_shikuai1.png.meta

@@ -157,5 +157,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: fx_gw05_jc
+  assetBundleName: fx_shikuai1
   assetBundleVariant: 

Assets/Art/VFX/Textures/fx_shikuai2.png.meta

@@ -112,6 +112,20 @@ TextureImporter:
     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: []
@@ -129,5 +143,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_shikuai2
   assetBundleVariant: 

Assets/Art/VFX/UIFXprefab/fx_ui_click.prefab.meta

@@ -1,11 +1,7 @@
 fileFormatVersion: 2
-<<<<<<<< HEAD:Assets/Art/ArtHero/General.prefab.meta
 guid: XS5LtCKlBi6NiJbPoGnOCyeV8ULq5zWkiaN/K2CJGgI5RmbXdb8dQGs=
-========
-guid: DnkX5yirUXlj0kz6v8UOe148Nok5dfz8Aot+8cmXcFhJS9CnbufBRQI=
->>>>>>>> 5954d4ef30ea76e9037f4c7f4a5c53208a432430:Assets/Art/VFX/UIFXprefab/fx_ui_click.prefab.meta
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_ui_click
   assetBundleVariant: 

Assets/Art/VFX/UIFXprefab/fx_ui_coin.prefab.meta

@@ -3,5 +3,5 @@ guid: CisWti2tB3/yj2Fk9FI8yw0zR59G/ZdWpD/cE/Pj1wiND0StpDxE3YU=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_ui_coin
   assetBundleVariant: 

Assets/Art/VFX/UIFXprefab/fx_ui_exp.prefab.meta

@@ -3,5 +3,5 @@ guid: CCwa5CP+Wiql8NvIB6k+7J1GGtqN80RWi5GzxcecgNbOz5vgIkqz/E4=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_ui_exp
   assetBundleVariant: 

Assets/Art/VFX/UIFXprefab/fx_ui_star.prefab.meta

@@ -3,5 +3,5 @@ guid: C3sZ5yn5UHJypJ7h68TQXXfaYkFr9xL7tPojE508nb3Y17lJB3bW1uw=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_ui_star
   assetBundleVariant: 

Assets/Art/VFX/UIFXprefab/fx_ui_upgrade.prefab.meta

@@ -3,5 +3,5 @@ guid: CH5MtX6oVn0XTyr8nc8F0xX+rUlk+5IiY1JjIuYPTFx3YsuAJ40W6hw=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_ui_upgrade
   assetBundleVariant: 

Assets/Res/Aduio/UI/jingbi.wav.meta

@@ -19,5 +19,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: jingbi
   assetBundleVariant: 

Assets/Res/Aduio/UI/openui.wav.meta

@@ -19,5 +19,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: openui
   assetBundleVariant: 

Assets/Res/Aduio/UI/shibai.wav.meta

@@ -19,5 +19,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: shibai
   assetBundleVariant: 

Assets/Res/Aduio/UI/zhuangbei.wav.meta

@@ -19,5 +19,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: zhuangbei
   assetBundleVariant: 

Assets/Res/Config/OpenBoxConfig.json.meta

@@ -3,5 +3,5 @@ guid: CShNs3z+Vn8HpxMS7vKOYWPAffLFKFBhBGbvRuH4fvyEh9as+tWNckA=
 TextScriptImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: openboxconfig
   assetBundleVariant: 

Assets/Res/Font/wryh.ttf.meta

@@ -9,8 +9,9 @@ TrueTypeFontImporter:
   characterPadding: 1
   includeFontData: 1
   fontNames:
-  - Arial
-  fallbackFontReferences: []
+  - BigYoungBoldGB2.0
+  fallbackFontReferences:
+  - {fileID: 12800000, guid: a61334e31cf014203a72ff5de1c54c27, type: 3}
   customCharacters: 
   fontRenderingMode: 0
   ascentCalculationMode: 1

Assets/Res/TimeLineAssets/General_TD.txt.meta

@@ -3,5 +3,5 @@ guid: DClNsXz8Wy9mmBD8eDY53UIFzl65u5bdeFT9JYf7nEjCbf2Sz8fhPKc=
 TextScriptImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: general_td
   assetBundleVariant: 

Assets/Res/UI/BoxPanel.prefab

@@ -733,9 +733,9 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: bb5b55cc5861a4951990bcc1caccc50e, type: 3}
     m_FontSize: 20
-    m_FontStyle: 1
+    m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 1
     m_MaxSize: 43
@@ -830,7 +830,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: bb5b55cc5861a4951990bcc1caccc50e, type: 3}
     m_FontSize: 35
     m_FontStyle: 1
     m_BestFit: 0
@@ -1021,7 +1021,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: bb5b55cc5861a4951990bcc1caccc50e, type: 3}
     m_FontSize: 18
     m_FontStyle: 0
     m_BestFit: 0
@@ -1102,7 +1102,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: bb5b55cc5861a4951990bcc1caccc50e, type: 3}
     m_FontSize: 35
     m_FontStyle: 1
     m_BestFit: 0
@@ -1722,7 +1722,7 @@ MonoBehaviour:
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
   _icon_name: btn_l_Green
-  isNotLoadDeftIcon: 1
+  isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
   packInfo:
     packName: all

Assets/Res/UI/BoxPanel.prefab.meta

@@ -3,5 +3,5 @@ guid: Cnoa4yj7B3mzjUPg5EJqojQZGrzhV+VUc1ZadxKxrGZz/tzW7YD1kNQ=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: boxpanel
   assetBundleVariant: 

Assets/Res/UI/CombatHeroDiePanel.prefab

@@ -466,7 +466,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: bb5b55cc5861a4951990bcc1caccc50e, type: 3}
     m_FontSize: 28
     m_FontStyle: 0
     m_BestFit: 0
@@ -548,7 +548,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: bb5b55cc5861a4951990bcc1caccc50e, type: 3}
     m_FontSize: 63
     m_FontStyle: 1
     m_BestFit: 0
@@ -863,9 +863,9 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: bb5b55cc5861a4951990bcc1caccc50e, type: 3}
     m_FontSize: 35
-    m_FontStyle: 1
+    m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 2
     m_MaxSize: 55

Assets/Res/UI/CombatHeroDiePanel.prefab.meta

@@ -3,5 +3,5 @@ guid: BnsXvH+lBi/eCcyuhrkqmZUhzkluiobzvPZIeKFxz7hONDQCa/ONZ8Q=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: combatherodiepanel
   assetBundleVariant: 

Assets/Res/UI/EqRecyclePanel.prefab.meta

@@ -3,5 +3,5 @@ guid: WX4Wtyn8V31WBe37O5/bUzojw/3NppVriSaUOfUv0H7g4yacCt8G0o0=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: eqrecyclepanel
   assetBundleVariant: 

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
@@ -6150,8 +6150,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 +6388,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 +7644,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 +7720,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 +8207,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 +8487,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 +8509,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
@@ -9737,8 +9776,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 +10684,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:
@@ -12389,6 +12424,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 +12787,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 +12843,7 @@ MonoBehaviour:
   isUpdate: 0
   currTime: 1
   GrpupInfos:
-  - Foldout: 1
+  - Foldout: 0
     isActive: 1
     animName: play
     isLoop: 0
@@ -14123,8 +14186,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 +14227,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 +14650,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 +15579,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 +15789,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:
@@ -17723,6 +17778,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 +17868,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
@@ -19930,3 +20030,194 @@ 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: 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: 500
+      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/ItemPanel.prefab.meta

@@ -3,5 +3,5 @@ guid: B3lJt3ypU3PViYXshGzrEJCLHc0jxZNzbY1YmePeKrw0Xe3ied+P68w=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: itempanel
   assetBundleVariant: 

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/RewardsPanel.prefab

@@ -618,8 +618,8 @@ GameObject:
   m_Component:
   - component: {fileID: 8150427964580176949}
   - component: {fileID: 4022983029914649038}
-  - component: {fileID: 6046230828290279203}
   - component: {fileID: 9010385271561948532}
+  - component: {fileID: 8517797206717286252}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Dimed
@@ -655,36 +655,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3724772720786795118}
   m_CullTransparentMesh: 1
---- !u!114 &6046230828290279203
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3724772720786795118}
-  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: 55efdebed769a4f2fb81998fb87a2df5, 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 &9010385271561948532
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -725,10 +695,48 @@ MonoBehaviour:
     m_SelectedTrigger: Selected
     m_DisabledTrigger: Disabled
   m_Interactable: 1
-  m_TargetGraphic: {fileID: 6046230828290279203}
+  m_TargetGraphic: {fileID: 0}
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &8517797206717286252
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3724772720786795118}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: 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: e8ac4a11df23a3327a9a6fed106efb0a
 --- !u!1 &4226868228391283850
 GameObject:
   m_ObjectHideFlags: 0
@@ -1619,10 +1627,10 @@ RectTransform:
   - {fileID: 3011679360858695175}
   m_Father: {fileID: 410575005933691755}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 330, y: -60}
-  m_SizeDelta: {x: 80, y: 80}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &8571562622299407104
 MonoBehaviour:

Assets/Res/UI/RewardsPanel.prefab.meta

@@ -3,5 +3,5 @@ guid: Dnkcty/8BXJf2gohrhgRljXW95MNP9EZrpSpI8nCOUWhYIpX062ebWo=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: rewardspanel
   assetBundleVariant: 

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/TipMessagePanel.prefab

@@ -384,7 +384,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: bb5b55cc5861a4951990bcc1caccc50e, type: 3}
     m_FontSize: 18
     m_FontStyle: 0
     m_BestFit: 0

Assets/Res/UI/TipMessagePanel.prefab.meta

@@ -3,5 +3,5 @@ guid: DitK5iv7AC9NczJs0wLiXBWvQKlvGK6hp9wJEmDbxF8TtJLf4xkbDEE=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: tipmessagepanel
   assetBundleVariant: 

Assets/Res/UIAnimRes/TweenAssetInfoButton_huiQiu.asset.meta

@@ -4,5 +4,5 @@ NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 11400000
   userData: 
-  assetBundleName: 
+  assetBundleName: tweenassetinfobutton_huiqiu
   assetBundleVariant: 

Assets/Res/UIAnimRes/TweenAssetInfoTop.asset.meta

@@ -4,5 +4,5 @@ NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 11400000
   userData: 
-  assetBundleName: 
+  assetBundleName: tweenassetinfotop
   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/bg.spriteatlasv2.meta

@@ -27,5 +27,5 @@ SpriteAtlasImporter:
   variantMultiplier: 1
   bindAsDefault: 1
   userData: 
-  assetBundleName: moban
+  assetBundleName: bg
   assetBundleVariant: 

Assets/Res/UIAtlas/box.spriteatlasv2.meta

@@ -27,5 +27,5 @@ SpriteAtlasImporter:
   variantMultiplier: 1
   bindAsDefault: 1
   userData: 
-  assetBundleName: moban
+  assetBundleName: box
   assetBundleVariant: 

Assets/Scenes/testCombat.scene

@@ -1201,67 +1201,6 @@ MonoBehaviour:
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
---- !u!1001 &5342889083889272969
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 3357280071999411125, guid: 7db935d3dff91684fbbc2dec04e408b0, type: 3}
-      propertyPath: m_Name
-      value: fx_shouDong
-      objectReference: {fileID: 0}
-    - target: {fileID: 3357280071999411125, guid: 7db935d3dff91684fbbc2dec04e408b0, type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8344817462337826228, guid: 7db935d3dff91684fbbc2dec04e408b0, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: -4.3
-      objectReference: {fileID: 0}
-    - target: {fileID: 8344817462337826228, guid: 7db935d3dff91684fbbc2dec04e408b0, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: -21.1
-      objectReference: {fileID: 0}
-    - target: {fileID: 8344817462337826228, guid: 7db935d3dff91684fbbc2dec04e408b0, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 1.48
-      objectReference: {fileID: 0}
-    - target: {fileID: 8344817462337826228, guid: 7db935d3dff91684fbbc2dec04e408b0, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 8344817462337826228, guid: 7db935d3dff91684fbbc2dec04e408b0, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8344817462337826228, guid: 7db935d3dff91684fbbc2dec04e408b0, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8344817462337826228, guid: 7db935d3dff91684fbbc2dec04e408b0, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8344817462337826228, guid: 7db935d3dff91684fbbc2dec04e408b0, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8344817462337826228, guid: 7db935d3dff91684fbbc2dec04e408b0, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8344817462337826228, guid: 7db935d3dff91684fbbc2dec04e408b0, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 7db935d3dff91684fbbc2dec04e408b0, type: 3}
 --- !u!1660057539 &9223372036854775807
 SceneRoots:
   m_ObjectHideFlags: 0
@@ -1270,4 +1209,3 @@ SceneRoots:
   - {fileID: 111679908}
   - {fileID: 235899921}
   - {fileID: 123020045}
-  - {fileID: 5342889083889272969}

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

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

Assets/Scripts/GameLogic/Bag/BagController.cs

@@ -134,26 +134,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 +204,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 +249,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 +306,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))
@@ -294,6 +323,8 @@ namespace GameLogic.Bag
             return newItem;
         }
         
+       
+        
 
         /// <summary>
         /// 扣除道具,最后都这里

Assets/Scripts/GameLogic/Bag/ItemInfo.cs

@@ -55,7 +55,7 @@ namespace GameLogic.Bag
         }
 
         /// <summary>
-        /// 是否是装备的Item
+        /// 是一个装备吗
         /// </summary>
         /// <returns></returns>
         public bool IsEquipItem()

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

@@ -0,0 +1,12 @@
+using Core.Utility.Event;
+
+namespace Common.Utility.CombatEvent
+{
+    public class HeroEquipEventData : EventDataBasic<HeroEquipEventData>
+    {
+        /// <summary>
+        /// 哪个职业的英雄装备有变化
+        /// </summary>
+        public int zy;
+    }
+}

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

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 937830a97524410fa9ed03b483830b88
+timeCreated: 1735469456

Assets/Scripts/GameLogic/Combat/CombatType/LevelBattleCombatType.cs

@@ -154,11 +154,14 @@ namespace GameLogic.Combat.CombatType
             HarmReturnInfo newharm = new HarmReturnInfo();
             newharm.harmType = HarmType.SystemKo;
             CombatHeroEntity[] allHero = combatController.CombatHeroController.GetHero(true);
-            List<CombatHeroEntity> heroEntities = new List<CombatHeroEntity>();
-            heroEntities.AddRange(allHero);
-            for (int i = 0; i < heroEntities.Count; i++)
+            if (allHero != null)
             {
-                heroEntities[i].CombatAIBasic.ChangeState(CombatHeroStateType.Disappear);
+                List<CombatHeroEntity> heroEntities = new List<CombatHeroEntity>();
+                heroEntities.AddRange(allHero);
+                for (int i = 0; i < heroEntities.Count; i++)
+                {
+                    heroEntities[i].CombatAIBasic.ChangeState(CombatHeroStateType.Disappear);
+                }
             }
 
             Debug.Log("英雄死完了，等待全部英雄复活,这个版本等待2秒全体复活");

Assets/Scripts/GameLogic/Hero/HeroInfo.cs

@@ -48,15 +48,20 @@ namespace GameLogic.Hero
 
         public HeroInfo()
         {
-            EventManager.Instance.AddEventListener(CustomEventType.HeroPowerUp, OnHeroPowerUp);
+            EventManager.Instance.AddEventListener(CustomEventType.HeroEquip, OnHeroEquip);
         }
 
-        private void OnHeroPowerUp(IEventData e)
+        private void OnHeroEquip(IEventData e)
         {
-            HeroPowerUpEventData data = e as HeroPowerUpEventData;
-            if (data.upType == HeroUpType.BasicEquip)
+            HeroEquipEventData data = e as HeroEquipEventData;
+            if (data.zy == modelConfig.profession)
             {
                 CalAttribute();
+                HeroPowerUpEventData eventData = HeroPowerUpEventData.Create();
+                eventData.heroModelID = modelID;
+                eventData.isSkillUp = false;
+                eventData.upType = HeroUpType.BasicEquip;
+                EventManager.Instance.Dispatch(CustomEventType.HeroPowerUp, eventData);
             }
         }
 

Assets/Scripts/GameLogic/Player/DropManager.cs

@@ -52,9 +52,6 @@ namespace GameLogic.Player
                 int.Parse(eqDropData[1]),
                 int.Parse(eqDropData[2]));
 
-            if (eqItemInfo != null)
-                BagController.Instance.AddEquipmentItem(eqItemInfo);
-
             return eqItemInfo;
         }
 
@@ -96,7 +93,8 @@ namespace GameLogic.Player
             {
                 equipmentList.Add(itemInfo);
             }
-
+            
+            BagController.Instance.AddItem(equipmentList);
             return equipmentList;
         }
 

Assets/Scripts/GameUI/UI/Combat/CombatHeroDiePanel.cs

@@ -9,9 +9,12 @@ namespace Fort23.Mono
     public partial class CombatHeroDiePanel : UIPanel
     {
         private int time;
+        private TimerEntity _timerEntity;
+
         public static async void OpenCombatHeroDiePanel()
         {
-            CombatHeroDiePanel combatHeroDiePanel= await     UIManager.Instance.LoadAndOpenPanel<CombatHeroDiePanel>(null, layer: UILayer.Top);
+            CombatHeroDiePanel combatHeroDiePanel =
+                await UIManager.Instance.LoadAndOpenPanel<CombatHeroDiePanel>(null, layer: UILayer.Top);
             combatHeroDiePanel.ShowCombatHeroDiePanel();
         }
 
@@ -34,10 +37,12 @@ namespace Fort23.Mono
 
         private void Button_ok_onClick()
         {
-            LevelBattleCombatType levelBattleCombatType=    CombatController.currActiveCombat.CombatTypeBasic as LevelBattleCombatType;
+            LevelBattleCombatType levelBattleCombatType =
+                CombatController.currActiveCombat.CombatTypeBasic as LevelBattleCombatType;
             levelBattleCombatType.Resume();
+            TimerComponent.Instance.Remove(_timerEntity);
+            _timerEntity = null;
             UIManager.Instance.HideUIUIPanel(this);
-            
         }
 
         public void ShowCombatHeroDiePanel()
@@ -46,17 +51,23 @@ namespace Fort23.Mono
             AudioManager.Instance.PlayAudio("shibai.wav");
             time = 30;
             clickTime.text = time.ToString();
-            TimerComponent.Instance.AddTimer(1000, delegate { }, 10000, delegate
+            _timerEntity = TimerComponent.Instance.AddTimer(1000, delegate { }, 10000, delegate
             {
+                if (_timerEntity == null)
+                {
+                    return;
+                }
+
                 time--;
                 clickTime.text = time.ToString();
                 if (time <= 0)
                 {
                     Button_ok_onClick();
                 }
+
+                TimerComponent.Instance.Remove(_timerEntity);
+                _timerEntity = null;
             });
         }
-        
-
     }
 }

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

@@ -41,6 +41,25 @@ namespace Fort23.Mono
             btnSkill.onClick.AddListener(OnClickSkill);
             btnPrev.onClick.AddListener(OnclickPrevHero);
             btnNext.onClick.AddListener(OnclickNextHero);
+            
+            btnSpecailEquip.onClick.AddListener(delegate
+            {
+                TipMessagePanel.OpenTipMessagePanel("专属装备（敬请期待）",
+                    new Vector2(btnSpecailEquip.transform.position.x, btnSpecailEquip.transform.position.y + 0.5f));
+            });
+            
+            btnCommonEquip.onClick.AddListener(OnclickCommonEquip);
+        }
+
+        private void OnclickCommonEquip()
+        {
+            // throw new System.NotImplementedException();
+            ModelPos.gameObject.SetActive(false);
+            HeroUITools.OpenSpecificProfessionEquipmentPanel(heroInfo.modelConfig.profession, delegate
+            {
+                ModelPos.gameObject.SetActive(true);
+                modelAnimComponent.Play(modelIdleClip);
+            });
         }
 
         private void OnclickPrevHero()
@@ -116,8 +135,13 @@ namespace Fort23.Mono
         public SkillUIComponent skillUIComponent;
         private async void OnClickSkill()
         {
-            skillUIComponent = await UIManager.Instance.CreateGComponent<SkillUIComponent>(null, poolName:"SkillUIComponent",
-                root:transform);
+            // skillUIComponent = await UIManager.Instance.CreateGComponent<SkillUIComponent>(null, poolName:"SkillUIComponent",
+            //     root:transform);
+            
+            
+            skillUIComponent = await UIManager.Instance.
+                CreateGComponentForObject<SkillUIComponent>(skillUI, null, isInstance : false, root:transform);
+            
             skillUIComponent.InitUI(heroInfo);
         }
 
@@ -349,6 +373,8 @@ namespace Fort23.Mono
         public UIPanelName sourcePanel;
         
         private GameObjectPool modelObj;
+        private AnimancerComponent modelAnimComponent;
+        private TransitionAsset modelIdleClip;
         HeroPowerUpPre upPre;
         public async void InitHeroDetailPanel(WidgetHero heroWidget, UIPanelName sourcePanel = UIPanelName.None)
         {
@@ -356,6 +382,8 @@ namespace Fort23.Mono
             this.heroWidget = heroWidget;
             this.sourcePanel = sourcePanel;
             
+            skillUI.SetActive(false);
+            
             btns1.SetActive(true);
             objHeroPowerUpPre.SetActive(false);
             
@@ -364,6 +392,7 @@ namespace Fort23.Mono
             btnPrev.gameObject.SetActive(IsShowArrow(false));
 
             iconZhiYe.icon_name = heroInfo.GetZyIconName();
+            iconCommonEquip.icon_name = heroInfo.GetZyIconName();
             heroName.text = LanguageManager.Instance.Text(heroInfo.modelConfig.name);
             // LayoutRebuilder.MarkLayoutForRebuild(StarsLayout.transform.GetComponent<RectTransform>());
             // StarsLayout.gameObject.SetActive(true);
@@ -391,18 +420,18 @@ namespace Fort23.Mono
                     pool.own.transform.localPosition = new Vector3(0, 0.2f, 0);
                     pool.own.transform.localScale = Vector3.one;
 
-                    AnimancerComponent animancerComponent = pool.own.GetComponent<AnimancerComponent>();
+                    modelAnimComponent = pool.own.GetComponent<AnimancerComponent>();
                     
-                    int max = animancerComponent.Transitions.Library.Count;
+                    int max = modelAnimComponent.Transitions.Library.Count;
                     for (int i = 0; i < max; i++)
                     {
-                        if (animancerComponent.Transitions.Library.TryGetTransition(i,
+                        if (modelAnimComponent.Transitions.Library.TryGetTransition(i,
                                 out TransitionModifierGroup transition))
                         {
-                            TransitionAsset clipTransition2 = transition.Transition as TransitionAsset;
-                            if (clipTransition2 != null && clipTransition2.name == "idle")
+                            modelIdleClip = transition.Transition as TransitionAsset;
+                            if (modelIdleClip != null && modelIdleClip.name == "idle")
                             {
-                                animancerComponent.Play(clipTransition2);
+                                modelAnimComponent.Play(modelIdleClip);
                                 break;
                             }
                         }

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

@@ -351,6 +351,39 @@ namespace Fort23.Mono
 	      return _btnNext;
 	     }
 	   }
+	  private GameObject _skillUI;
+	  public GameObject skillUI
+	   {
+	   get{
+	      if (_skillUI == null)
+	       {
+	         _skillUI  = GetUIUnit<GameObject>("skillUI"); 
+	       }
+	      return _skillUI;
+	     }
+	   }
+	  private Button _btnSpecailEquip;
+	  public Button btnSpecailEquip
+	   {
+	   get{
+	      if (_btnSpecailEquip == null)
+	       {
+	         _btnSpecailEquip  = GetUIUnit<Button>("btnSpecailEquip"); 
+	       }
+	      return _btnSpecailEquip;
+	     }
+	   }
+	  private Button _btnCommonEquip;
+	  public Button btnCommonEquip
+	   {
+	   get{
+	      if (_btnCommonEquip == null)
+	       {
+	         _btnCommonEquip  = GetUIUnit<Button>("btnCommonEquip"); 
+	       }
+	      return _btnCommonEquip;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

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

@@ -178,6 +178,17 @@ namespace Fort23.Mono
             }
         }
         
+        /// <summary>
+        /// 打开对应职业的装备面板
+        /// </summary>
+        /// <param name="zy">1战士；2法师；3牧师；4游侠</param>
+        public static async void OpenSpecificProfessionEquipmentPanel(int zy, Action action = null)
+        {
+            SpecificProfessionEquipmentPanel specificProfessionEquipmentPanel 
+                = await UIManager.Instance.LoadAndOpenPanel<SpecificProfessionEquipmentPanel>(null);
+            specificProfessionEquipmentPanel.InitPanel(zy, action);
+        }
+        
         /// <summary>
         /// 修改指定 GameObject 和其所有子对象的 Layer
         /// </summary>

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

@@ -1,4 +1,6 @@
 using System.Collections.Generic;
+using Common.Utility.CombatEvent;
+using Fort23.Core;
 using Fort23.UTool;
 using GameLogic.Bag;
 using UnityEngine;
@@ -13,7 +15,20 @@ namespace Fort23.Mono
         }
         protected override void AddEvent()
         {
+            EventManager.Instance.AddEventListener(CustomEventType.HeroEquip, OnHeroEquip);
         }
+
+        private void OnHeroEquip(IEventData e)
+        {
+            // ProfessionEquipmentPanel professionEquipmentPanel = UIManager.Instance.GetComponent<ProfessionEquipmentPanel>();
+            
+            //现在是全更新的，后面可以优化成只更新对应职业的装备栏，现在无法这样做的原因是，池子回收了全部装备
+            HeroEquipEventData data = e as HeroEquipEventData;
+            
+                
+            UpdateAllEq();
+        }
+
         protected override void DelEvent()
         {
         }
@@ -35,34 +50,35 @@ namespace Fort23.Mono
 
         private async void OnclickZS()
         {
-            OpenSpecificProfessionEquipmentPanel(1);
+            HeroUITools.OpenSpecificProfessionEquipmentPanel(1);
+            
         }
         
         private async void OnclickFS()
         {
-            OpenSpecificProfessionEquipmentPanel(2);
+            HeroUITools.OpenSpecificProfessionEquipmentPanel(2);
         }
         
         private async void OnclickMS()
         {
-            OpenSpecificProfessionEquipmentPanel(3);
+            HeroUITools.OpenSpecificProfessionEquipmentPanel(3);
         }
         
         private async void OnclickYX()
         {
-            OpenSpecificProfessionEquipmentPanel(4);
+            HeroUITools.OpenSpecificProfessionEquipmentPanel(4);
         }
 
         /// <summary>
         /// 打开对应职业的装备面板
         /// </summary>
         /// <param name="zy">1战士；2法师；3牧师；4游侠</param>
-        private async void OpenSpecificProfessionEquipmentPanel(int zy)
-        {
-            SpecificProfessionEquipmentPanel specificProfessionEquipmentPanel 
-                = await UIManager.Instance.LoadAndOpenPanel<SpecificProfessionEquipmentPanel>(null);
-            specificProfessionEquipmentPanel.InitPanel(zy);
-        }
+        // private async void OpenSpecificProfessionEquipmentPanel(int zy)
+        // {
+        //     SpecificProfessionEquipmentPanel specificProfessionEquipmentPanel 
+        //         = await UIManager.Instance.LoadAndOpenPanel<SpecificProfessionEquipmentPanel>(null);
+        //     specificProfessionEquipmentPanel.InitPanel(zy);
+        // }
 
         private void OnclickBack()
         {

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

@@ -24,15 +24,19 @@ namespace Fort23.Mono
         public override void AddButtonEvent()
         {
             btnBack.onClick.AddListener(OnClickBack);
+            btnDi.onClick.AddListener(OnClickBack);
         }
 
         private void OnClickBack()
         {
-            UIManager.Instance.DormancyGComponent(this);
-            UIManager.Instance.DormancyAllGComponent<WidgetIconSkill>("WidgetIconSkill");
+            // UIManager.Instance.DormancyGComponent(this);
+            own.SetActive(false);
+            UIManager.Instance.DormancyAllGComponent<WidgetIconSkill>(poolName);
         }
 
         private HeroInfo heroInfo;
+
+        private string poolName = "widgetSkillIconPool";
         
         public List<WidgetIconSkill> allSkillIcon = new List<WidgetIconSkill>();
 
@@ -51,8 +55,16 @@ namespace Fort23.Mono
 
                 SkillInfo skillInfo = heroInfo.SkillData.GetHighestLevelOr1(keyValuePair.Key);
                 
-                WidgetIconSkill widgetIconSkill = await UIManager.Instance.CreateGComponent<WidgetIconSkill>(null,
-                    poolName: "WidgetIconSkill", root: skillRoot);
+                // WidgetIconSkill widgetIconSkill = await UIManager.Instance.CreateGComponent<WidgetIconSkill>(null,
+                //     poolName: "WidgetIconSkill", root: skillRoot);
+                
+                
+                WidgetIconSkill widgetIconSkill = await UIManager.Instance.
+                    CreateGComponentForObject<WidgetIconSkill>(widgetSkill, null, isInstance : true, 
+                        poolName:poolName, root:skillRoot);
+                
+                //WidgetIconSkill widgetIconSkill = await UIManager.Instance.CreateGComponentForObject()<WidgetIconSkill>(null,  widgetIkill, root: skillRoot);
+                
                 widgetIconSkill.InitWidget(skillInfo);
                 
                 allSkillIcon.Add(widgetIconSkill);
@@ -61,6 +73,11 @@ namespace Fort23.Mono
                 if (idx == 0)
                 {
                     ShowSkillDetail(keyValuePair.Key);
+                    widgetIconSkill.Highlight();
+                }
+                else
+                {
+                    widgetIconSkill.UnHighlight();
                 }
                 idx++;
             }
@@ -72,7 +89,7 @@ namespace Fort23.Mono
             {
                 if (widgetIconSkill != iconSkill)
                 {
-                    widgetIconSkill.imgBorder.color = Color.black;
+                    widgetIconSkill.UnHighlight();
                 }            
             }
         }

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

@@ -140,6 +140,28 @@ namespace Fort23.Mono
 	      return _btnBack;
 	     }
 	   }
+	  private GameObject _widgetSkill;
+	  public GameObject widgetSkill
+	   {
+	   get{
+	      if (_widgetSkill == null)
+	       {
+	         _widgetSkill  = GetUIUnit<GameObject>("widgetSkill"); 
+	       }
+	      return _widgetSkill;
+	     }
+	   }
+	  private Button _btnDi;
+	  public Button btnDi
+	   {
+	   get{
+	      if (_btnDi == null)
+	       {
+	         _btnDi  = GetUIUnit<Button>("btnDi"); 
+	       }
+	      return _btnDi;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

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

@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using Common.Utility.CombatEvent;
 using Core.Language;
@@ -24,6 +25,51 @@ namespace Fort23.Mono
         {
             btnBack.onClick.AddListener(OnclickClose);
             btnOnce.onClick.AddListener(OnclickOnce);
+            
+            btnZs.onClick.AddListener(OnclickZS);
+            btnFs.onClick.AddListener(OnclickFS);
+            btnMs.onClick.AddListener(OnclickMS);
+            btnYx.onClick.AddListener(OnclickYX);
+            
+        }
+
+        private void OnclickZS()
+        {
+            if (curZy == 1)
+            {
+                return;
+            }
+            
+            HeroUITools.OpenSpecificProfessionEquipmentPanel(1);
+        }
+
+        private void OnclickFS()
+        {
+            if (curZy == 2)
+            {
+                return;
+            }
+            HeroUITools.OpenSpecificProfessionEquipmentPanel(2);
+        }
+
+        private void OnclickMS()
+        {
+            if (curZy == 3)
+            {
+                return;
+            }
+            
+            HeroUITools.OpenSpecificProfessionEquipmentPanel(3);
+        }
+
+        private void OnclickYX()
+        {
+            if (curZy == 4)
+            {
+                return;
+            }
+            
+            HeroUITools.OpenSpecificProfessionEquipmentPanel(4);
         }
 
         private bool isClickOnce = false;
@@ -36,38 +82,50 @@ namespace Fort23.Mono
             isClickOnce = PlayerManager.Instance.eqController.QuickEquip(curZy);
             if (isClickOnce)
             {
+                
+                SendWearEvent();
+                
                 UIManager.Instance.DormancyAllGComponent<WidgetItem>("eq2");
                 HeroUITools.UpdateZyEqIcon(curZy, eqs);
             }
         }
 
+        private void SendWearEvent()
+        {
+            // ProfessionEquipmentPanel professionEquipmentPanel = UIManager.Instance.GetComponent<ProfessionEquipmentPanel>();
+            //     
+            // professionEquipmentPanel.UpdateAllEq();
+                
+            HeroEquipEventData data = new HeroEquipEventData();
+
+            data.zy = curZy;
+                
+            // EventManager.Instance.Dispatch(CustomEventType.HeroPowerUp, data);
+            EventManager.Instance.Dispatch(CustomEventType.HeroEquip, data);
+        }
+
         private async void OnclickClose()
         {
             UIManager.Instance.HideUIUIPanel(this);
-            UIManager.Instance.DormancyAllGComponent<WidgetItem>("eq2");
+            closeAction?.Invoke();
+            UIManager.Instance.DormancyAllGComponent<WidgetItem>(spoolName);
             if (isClickOnce)
             {
                 UIManager.Instance.DormancyAllGComponent<WidgetItem>("eq");
-                ProfessionEquipmentPanel professionEquipmentPanel = UIManager.Instance.GetComponent<ProfessionEquipmentPanel>();
-                
-                // ProfessionEquipmentPanel professionEquipmentPanel = await UIManager.Instance.LoadAndOpenPanel<ProfessionEquipmentPanel>(null);
-                // professionEquipmentPanel.UpdateZyEqs(curZy);
-                professionEquipmentPanel.UpdateAllEq();
-                
-                HeroPowerUpEventData data = new HeroPowerUpEventData();
-
-                data.upType = HeroUpType.BasicEquip;
-                
-                EventManager.Instance.Dispatch(CustomEventType.HeroPowerUp, data);
             }
         }
 
-        public void InitPanel(int zy)
+        private string spoolName = "eq2";
+        private Action closeAction;
+        
+        public void InitPanel(int zy, Action action = null)
         {
             isClickOnce = false;
             curZy = zy;
+            closeAction = action;
             SetZyInfo();
-            HeroUITools.UpdateZyEqIcon(zy, eqs, poolName:"eq2");
+            UIManager.Instance.DormancyAllGComponent<WidgetItem>(spoolName);
+            HeroUITools.UpdateZyEqIcon(zy, eqs, poolName : spoolName);
         }
 
         private void SetZyInfo()

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

@@ -30,9 +30,19 @@ namespace Fort23.Mono
             
             // SkillUIComponent skillUIComponent = await UIManager.Instance.CreateGComponent<SkillUIComponent>(Callback);
             heroDetailPanel.skillUIComponent.SetOtherBorder(this);
-            imgBorder.color = new Color(0, 1, 0.65f);
+            Highlight();
             heroDetailPanel.skillUIComponent.ShowSkillDetail(skillInfo.skillConfig.IDGroup);
         }
+
+        public void Highlight()
+        {
+            imgBorder.color = new Color(0, 1, 0.65f);
+        }
+
+        public void UnHighlight()
+        {
+            imgBorder.color = Color.black;
+        }
         
         private void Callback(SkillUIComponent obj)
         {

Assets/Settings/rpAsset.asset

@@ -84,7 +84,7 @@ MonoBehaviour:
     bayerMatrixTex: {fileID: 2800000, guid: f9ee4ed84c1d10c49aabb9b210b0fc44, type: 3}
   m_PrefilteringModeMainLightShadows: 3
   m_PrefilteringModeAdditionalLight: 3
-  m_PrefilteringModeAdditionalLightShadows: 0
+  m_PrefilteringModeAdditionalLightShadows: 2
   m_PrefilterXRKeywords: 1
   m_PrefilteringModeForwardPlus: 0
   m_PrefilteringModeDeferredRendering: 0

Assets/StreamingAssets/Bundle/01lz_0ad29b4898d10b0991fe6eded5a56db5.meta

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

Assets/StreamingAssets/Bundle/01lz_71f0ce79b3ee33efd8bb9e4297c55b64.meta

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

Assets/StreamingAssets/Bundle/01np_dg2_0b3e2d5668aecc74b2f6100efb52bf77.meta

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

Assets/StreamingAssets/Bundle/01np_dg2_f452b9178c4536327ea8ca6647dfcc04.meta

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

Assets/StreamingAssets/Bundle/01np_dg3_ad81a93067643f49c016e2f84ee7ca42.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: CnlKtCL/B37IV1+yE26Ngch0K5+H1EoNgIqgUwzN0GPf9azgM7iB5Bs=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/StreamingAssets/Bundle/01np_dg3_be9b9eb6431cc8e2284e36ff4bbadc76.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: DS5MvC+vUXqqu5+euZQgSVEypQpx4fDE9KzCU3+lUZepaIXJKPfNLM8=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/StreamingAssets/Bundle/01np_sk3_dg_l_3bae5e586c014355dca7e35f75311fb2.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: XXMa5H6rVHiX7EmBQxjSR8mpljYpcjz+kv/11NEVhlR3CwbmYbcj1EA=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/StreamingAssets/Bundle/01np_sk3_dg_l_ba1a423bffb934784e96b6c0f964d87d.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: XChOsCL/An5/JH90PivXP9EElIAZO+fozGMTZtBBqUTDlYFgQIiOtzo=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/StreamingAssets/Bundle/403_banyuan_glow_2559b52d037c2923d788d278dacf97a7.meta

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

Assets/StreamingAssets/Bundle/403_banyuan_glow_51eaf96e4f246ba17184759d49f9ac19.meta

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

Assets/StreamingAssets/Bundle/603_ice_zd_441cf9da0e3ce9663a22c232fc9f5c69.meta

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

Assets/StreamingAssets/Bundle/603_ice_zd_d39237c4a8dd53eb744db58fff59e3c2.meta

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

Assets/StreamingAssets/Bundle/afx_ramp_hl_1_5dc024a06b595f262bc81ab8873b9d4b.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: WXtNsyL8UCns9En/w+14X2HU9n3S6PRaETORR6La2k8ZEdWtw//MeN8=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/StreamingAssets/Bundle/afx_ramp_hl_1_f85664717d50d121aedbc2f2ec558dbb.meta

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