修改法宝界面

Assets/Res/UI/MainHeroPanel/555.png.meta → Assets/Art/UIAssets/icon/icon_tisheng.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: C3oY53yvVn1Bd8msNVxzzjBd20h+sv5KQXcoKOOoaCIgSvlfmJ7qnvnu7yc/
+guid: CC9K5n7/Bynth7AP8my1UvaEtIl0U+2MAdHLqf0EUd/cMIWKvRLkQd0T9Gzo
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
@@ -42,7 +42,7 @@ TextureImporter:
     mipBias: 0
     wrapU: 1
     wrapV: 1
-    wrapW: 0
+    wrapW: 1
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50

Assets/Res/UI/MainHeroPanel/6969.png.meta → Assets/Art/UIAssets/icon/icon_xiajiang.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: DHkdtCmsVSoxgFLIp1/YUfLxPblDfN5dXge6Q4t19O7u9h7FTIlZbtvSWPQD
+guid: CChLs3mkAC3gsiouFW5IkcXU7n0S2lPAKxlz45C7+xIaUgRMYVsm4Jdnakxy
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
@@ -42,7 +42,7 @@ TextureImporter:
     mipBias: 0
     wrapU: 1
     wrapV: 1
-    wrapW: 0
+    wrapW: 1
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50

Assets/Res/UI/MainHeroPanel/FaBaoAttributeWidget.prefab

@@ -34,8 +34,9 @@ RectTransform:
   m_Children:
   - {fileID: 3600672490163307244}
   - {fileID: 2124160756088033247}
-  - {fileID: 1928020948802863893}
   - {fileID: 8526466749311363744}
+  - {fileID: 1928020948802863893}
+  - {fileID: 6651778576344398413}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
@@ -122,7 +123,96 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Icon_Bj
+    gameObject: {fileID: 2045298485067890737}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
+--- !u!1 &2113013166018575664
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6651778576344398413}
+  - component: {fileID: 6171417124027095956}
+  - component: {fileID: 2045298485067890737}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Icon_Bj
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &6651778576344398413
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2113013166018575664}
+  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: 7749405585876328868}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 0.5}
+  m_AnchorMax: {x: 1, y: 0.5}
+  m_AnchoredPosition: {x: -48.5, y: -6.1}
+  m_SizeDelta: {x: 43.718002, y: 29.1454}
+  m_Pivot: {x: 1, y: 0.5}
+--- !u!222 &6171417124027095956
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2113013166018575664}
+  m_CullTransparentMesh: 1
+--- !u!114 &2045298485067890737
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2113013166018575664}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: icon_tisheng
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 48eeb3c8a9b4122a73f0a85aab21a52f
 --- !u!1 &3742609577958457981
 GameObject:
   m_ObjectHideFlags: 0
@@ -225,7 +315,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &1928020948802863893
 RectTransform:
   m_ObjectHideFlags: 0

Assets/Res/UI/MainHeroPanel/FaBaoSkillWidget.prefab

@@ -0,0 +1,324 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &933837835662493314
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8201300055221675746}
+  - component: {fileID: 7010832741655409507}
+  - component: {fileID: 6550154719423297006}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text_Level
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8201300055221675746
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 933837835662493314}
+  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: 6381789741947326869}
+  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: -157.2, y: -3.465}
+  m_SizeDelta: {x: 160, y: 36.93}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7010832741655409507
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 933837835662493314}
+  m_CullTransparentMesh: 1
+--- !u!114 &6550154719423297006
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 933837835662493314}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 0, b: 0, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 22
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 0
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u7B49\u7EA740"
+--- !u!1 &4914598392010041695
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3508839765462517074}
+  - component: {fileID: 1155897890668048683}
+  - component: {fileID: 4137042414763341607}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text_Desc
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3508839765462517074
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4914598392010041695}
+  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: 6381789741947326869}
+  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: 59.4, y: -3.465}
+  m_SizeDelta: {x: 160, y: 36.93}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1155897890668048683
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4914598392010041695}
+  m_CullTransparentMesh: 1
+--- !u!114 &4137042414763341607
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4914598392010041695}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 0, b: 0, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 22
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 0
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u6DF7\u4E71\u65F6\u95F4+2s"
+--- !u!1 &8587131535438277749
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6381789741947326869}
+  - component: {fileID: 346522243274123369}
+  - component: {fileID: 3865709182933148262}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: FaBaoSkillWidget
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6381789741947326869
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8587131535438277749}
+  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: 8932511951117402614}
+  - {fileID: 8201300055221675746}
+  - {fileID: 3508839765462517074}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 269.65, y: -21.93}
+  m_SizeDelta: {x: 539.3, y: 43.86}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &346522243274123369
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8587131535438277749}
+  m_CullTransparentMesh: 1
+--- !u!114 &3865709182933148262
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8587131535438277749}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4810a0857c909354fa00c3aafdeac753, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  data:
+  - key: Text_Level
+    gameObject: {fileID: 6550154719423297006}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Text_Desc
+    gameObject: {fileID: 4137042414763341607}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Icon_CurrentUpGrade
+    gameObject: {fileID: 8798180319087261071}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  isAssetBundle: 1
+--- !u!1 &9032091724309476061
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8932511951117402614}
+  - component: {fileID: 4094337527001214804}
+  - component: {fileID: 8798180319087261071}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Icon_CurrentUpGrade
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &8932511951117402614
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9032091724309476061}
+  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: 6381789741947326869}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4094337527001214804
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9032091724309476061}
+  m_CullTransparentMesh: 1
+--- !u!114 &8798180319087261071
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9032091724309476061}
+  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.32156864, g: 0.9215687, b: 0.56078434, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: 
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 0}
+  packInfo:
+    packName: 
+    packgJsonPath: 
+    packgSpritePath: 
+    lasetJsonGUID: 

Assets/Res/UI/MainHeroPanel/FaBaoSkillWidget.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: WX9KsC77Aim9f79qoQA7hXBYVwi3w/hJnK4d8JOZTwvMjIxBkYKj4FFcBjTv
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/UI/MainHeroPanel/FaBaoWidget.prefab

@@ -168,6 +168,86 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 8924b78c393d2a2d8f9dd44d02a397a9
+--- !u!1 &3567611437374403494
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4359737246862995808}
+  - component: {fileID: 9076388021815500170}
+  - component: {fileID: 1186833291820616713}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text (Legacy)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4359737246862995808
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3567611437374403494}
+  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: 8982381730593164203}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &9076388021815500170
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3567611437374403494}
+  m_CullTransparentMesh: 1
+--- !u!114 &1186833291820616713
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3567611437374403494}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 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_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 16
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 64
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u5DF2\u88C5\u5907"
 --- !u!1 &6124925743970108975
 GameObject:
   m_ObjectHideFlags: 0
@@ -203,6 +283,7 @@ RectTransform:
   - {fileID: 3600548847287801475}
   - {fileID: 6715878191117609555}
   - {fileID: 1882091923597765978}
+  - {fileID: 8982381730593164203}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -279,7 +360,97 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Iocn_Active
+    gameObject: {fileID: 1734569812076479799}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
+--- !u!1 &6343252469116327960
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8982381730593164203}
+  - component: {fileID: 469252788800658108}
+  - component: {fileID: 1734569812076479799}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Iocn_Active
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8982381730593164203
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6343252469116327960}
+  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: 4359737246862995808}
+  m_Father: {fileID: 3921069648395711794}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 51.0764, y: 23.5821}
+  m_Pivot: {x: 1, y: 1}
+--- !u!222 &469252788800658108
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6343252469116327960}
+  m_CullTransparentMesh: 1
+--- !u!114 &1734569812076479799
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6343252469116327960}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 0, b: 0, a: 0.6901961}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: 
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 0}
+  packInfo:
+    packName: 
+    packgJsonPath: 
+    packgSpritePath: 
+    lasetJsonGUID: 
 --- !u!1 &7440336937034317621
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/MainHeroPanel/ItemWidgetType1.prefab

@@ -0,0 +1,295 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &3821607290282984346
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8879216144060700877}
+  - component: {fileID: 8870642595167346178}
+  - component: {fileID: 5709030067082120474}
+  - component: {fileID: 7712747720863123026}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text_Count
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8879216144060700877
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3821607290282984346}
+  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: 6132543138199057944}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 44.4249, y: -15.66925}
+  m_SizeDelta: {x: 36, y: 30}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8870642595167346178
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3821607290282984346}
+  m_CullTransparentMesh: 1
+--- !u!114 &5709030067082120474
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3821607290282984346}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 0, b: 0, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 14
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 10/10
+--- !u!114 &7712747720863123026
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3821607290282984346}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 0
+--- !u!1 &4218159833380005404
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6132543138199057944}
+  - component: {fileID: 2298274908798652005}
+  - component: {fileID: 1500050293888787654}
+  - component: {fileID: 1221661462875536546}
+  - component: {fileID: 629134795276872842}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: ItemWidgetType1
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6132543138199057944
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4218159833380005404}
+  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: 7091371511447556559}
+  - {fileID: 8879216144060700877}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 31.21245, y: -19.7055}
+  m_SizeDelta: {x: 0, y: 31.3385}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2298274908798652005
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4218159833380005404}
+  m_CullTransparentMesh: 1
+--- !u!114 &1500050293888787654
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4218159833380005404}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 4
+  m_Spacing: 0
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
+--- !u!114 &1221661462875536546
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4218159833380005404}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 0
+--- !u!114 &629134795276872842
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4218159833380005404}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4810a0857c909354fa00c3aafdeac753, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  data:
+  - key: Text_Count
+    gameObject: {fileID: 5709030067082120474}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Icon_ItemIcon
+    gameObject: {fileID: 1497465469377369551}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  isAssetBundle: 1
+--- !u!1 &8748313746680104858
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7091371511447556559}
+  - component: {fileID: 3289613503060357165}
+  - component: {fileID: 1497465469377369551}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Icon_ItemIcon
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7091371511447556559
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8748313746680104858}
+  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: 6132543138199057944}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 26.4249, y: 26.4249}
+  m_Pivot: {x: 0, y: 0.5}
+--- !u!222 &3289613503060357165
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8748313746680104858}
+  m_CullTransparentMesh: 1
+--- !u!114 &1497465469377369551
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8748313746680104858}
+  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: 21300000, guid: 1562359088a3ea94db0c2d98547494c3, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: icon_eq_3_4_3
+  isNotLoadDeftIcon: 1
+  CurrSpriteAtlas: {fileID: 0}
+  packInfo:
+    packName: allIcon
+    packgJsonPath: /Art/UIAssets/TextrueJson/allIcon.txt
+    packgSpritePath: Assets/Res/UIAtlas/allIcon.spriteatlasv2
+    lasetJsonGUID: 

Assets/Res/UI/MainHeroPanel/ItemWidgetType1.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: Bi4b4y+sAH9rg/mXMl/gMvLKkkdV5Vb047UCD9mkZz6uUTDjNrBJRpW7yzVs
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/UI/MainHeroPanel/MainHeroPanel.prefab

@@ -760,7 +760,6 @@ GameObject:
   m_Component:
   - component: {fileID: 620873362179252296}
   - component: {fileID: 658240713667546595}
-  - component: {fileID: 7848032773007859148}
   - component: {fileID: 6503900326685792333}
   - component: {fileID: 5387537333491425696}
   m_Layer: 5
@@ -798,36 +797,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8709778843362506203}
   m_CullTransparentMesh: 1
---- !u!114 &7848032773007859148
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8709778843362506203}
-  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: 0}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
 --- !u!114 &6503900326685792333
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/Res/UIAtlas/tongyong.spriteatlasv2

@@ -50,5 +50,7 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: 6a4ae9d9bf667354a8611accc71f8d50, type: 3}
     - {fileID: 2800000, guid: 2b4c4eb9c47d81945a3315fb99ac6de1, type: 3}
     - {fileID: 2800000, guid: f74c331c73e28164694465f627a72d0a, type: 3}
+    - {fileID: 2800000, guid: 7eecdbdbe51dce346a2539a356f68ee0, type: 3}
+    - {fileID: 2800000, guid: 7bd6c9cff6a01e140b3d35d9421b2d23, type: 3}
   m_IsVariant: 0
   m_IsPlaceholder: 0

Assets/Scripts/Core/Editor/FortRectTransformInspector.cs

@@ -268,8 +268,10 @@ public class FortRectTransformInspector : UnityEditor.Editor
 
             code.Append("\t");
             code.Append("\tpublic override void DelEvent()\n");
+            code.Append("\t");
             code.Append("\t{\n");
             code.Append("\n");
+            code.Append("\t");
             code.Append("\t}\n");
         }
 

Assets/Scripts/GameLogic/Player/FaBaoControl.cs

@@ -31,6 +31,11 @@ namespace GameLogic.Player
                 return;
             }
 
+            if (FightFaBao[index] != null)
+            {
+                FightFaBao[index].FaBaoData.useIndex = -1;
+            }
+
             if (faBaoInfo.FaBaoData.useIndex != -1)
             {
                 FightFaBao[faBaoInfo.FaBaoData.useIndex] = null;
@@ -40,6 +45,15 @@ namespace GameLogic.Player
             faBaoInfo.FaBaoData.useIndex = index;
 
             AccountFileInfo.Instance.SavePlayerData();
+
+            PlayerManager.Instance.myHero.MagicWeaponID.Clear();
+            foreach (var baoInfo in FightFaBao)
+            {
+                if (baoInfo != null)
+                {
+                    PlayerManager.Instance.myHero.MagicWeaponID.Add(baoInfo);
+                }
+            }
         }
     }
 }

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

@@ -246,7 +246,7 @@ namespace Fort23.Mono
                     }
                 }
             }
-            
+         
 
             List<SkillConfig> allSkillConfigs = ConfigComponent.Instance.GetAll<SkillConfig>().ToList();
             configs = allSkillConfigs.Where(s => s.IDGroup == skillConfig.IDGroup).ToList();

Assets/Scripts/GameUI/UI/MainHeroPnael/BtnFaBaoWidget.cs

@@ -7,6 +7,7 @@ namespace Fort23.Mono
     {
         public int index;
         private FaBaoWidget faBaoWidget;
+
         private void Init()
         {
         }
@@ -32,7 +33,7 @@ namespace Fort23.Mono
             if (faBaoInfo != null)
             {
                 faBaoWidget = await UIManager.Instance.CreateGComponent<FaBaoWidget>(null, FaBaoRoot);
-                faBaoWidget.CustomInit(faBaoInfo);
+                faBaoWidget.CustomInit(faBaoInfo, false);
             }
             else
             {

Assets/Scripts/GameUI/UI/MainHeroPnael/FaBaoAttributeWidget.cs

@@ -33,9 +33,8 @@ namespace Fort23.Mono
             Text_NextAttributeValue.gameObject.SetActive(false);
         }
 
-        public void StartUpGrad(FaBaoInfo nextFabaoInfo )
+        public void StartUpGrad(FaBaoInfo nextFabaoInfo)
         {
-           
             Text_NextAttributeValue.text = $"+{nextFabaoInfo.attriButedIC[key] - faBaoInfo.attriButedIC[key]}";
             Text_NextAttributeValue.gameObject.SetActive(true);
         }
@@ -45,6 +44,29 @@ namespace Fort23.Mono
             Text_NextAttributeValue.gameObject.SetActive(false);
         }
 
+        public void StartBj(FaBaoInfo nextFabaoInfo)
+        {
+            if (nextFabaoInfo == null || !nextFabaoInfo.attriButedIC.ContainsKey(key) || nextFabaoInfo.attriButedIC[key] < faBaoInfo.attriButedIC[key])
+            {
+                Icon_Bj.gameObject.SetActive(true);
+                Icon_Bj.icon_name = "icon_tisheng";
+            }
+            else if (nextFabaoInfo.attriButedIC[key] >faBaoInfo.attriButedIC[key])
+            {
+                Icon_Bj.gameObject.SetActive(true);
+                Icon_Bj.icon_name = "icon_xiajiang";
+            }
+            else
+            {
+                Icon_Bj.gameObject.SetActive(false);
+            }
+        }
+
+        public void EndBj()
+        {
+            Icon_Bj.gameObject.SetActive(false);
+        }
+
         private string GetAttributeName(int type)
         {
             switch (type)

Assets/Scripts/GameUI/UI/MainHeroPnael/FaBaoAttributeWidgetData.cs

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

Assets/Scripts/GameUI/UI/MainHeroPnael/FaBaoSkillWidget.cs

@@ -0,0 +1,53 @@
+using Core.Language;
+using Excel2Json;
+using GameLogic.Hero;
+using Utility;
+
+namespace Fort23.Mono
+{
+    [UIBinding(prefab = "FaBaoSkillWidget")]
+    public partial class FaBaoSkillWidget : UIComponent
+    {
+        private void Init()
+        {
+        }
+
+        public override void AddEvent()
+        {
+        }
+
+        public override void DelEvent()
+        {
+        }
+
+        public override void AddButtonEvent()
+        {
+        }
+
+        public void CustomInit(FaBaoInfo currentFabaoInfo, FaBaoInfo fabaoInfo)
+        {
+            Text_Level.text = fabaoInfo.FabaoPowerupConfig.ID + "级";
+            Text_Desc.text = UtilTools.GetString(LanguageManager.Instance.Text(fabaoInfo.SkillConfig.PromoteLan), fabaoInfo.SkillConfig.PromoteLanPara);
+
+            if (currentFabaoInfo.FabaoPowerupConfig.ID + 1 == fabaoInfo.FabaoPowerupConfig.ID)
+            {
+                Icon_CurrentUpGrade.gameObject.SetActive(true);
+            }
+            else
+            {
+                Icon_CurrentUpGrade.gameObject.SetActive(false);
+            }
+            
+            if (currentFabaoInfo.FabaoPowerupConfig.ID >= fabaoInfo.FabaoPowerupConfig.ID)
+            {
+                Text_Desc.transform.RecoverColor();
+                Text_Level.transform.RecoverColor();
+            }
+            else
+            {
+                Text_Level.transform.Gray();
+                Text_Desc.transform.Gray();
+            }
+        }
+    }
+}

Assets/Scripts/GameUI/UI/MainHeroPnael/FaBaoSkillWidget.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: WiwY5Hn8Un+ZH7X3AdbjSRcydXAF+NMnmmmjqjDGcVg7+cGi0EiWewPv48/y
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/GameUI/UI/MainHeroPnael/FaBaoSkillWidgetData.cs

@@ -0,0 +1,51 @@
+using Fort23.Core;
+using Fort23.UTool;
+using UnityEngine.UI;
+using UnityEngine;
+using System.Collections.Generic;
+namespace Fort23.Mono
+{
+	public partial class FaBaoSkillWidget 
+	{
+	  #region 自定义数据 
+	  private Text _Text_Level;
+	  public Text Text_Level
+	   {
+	   get{
+	      if (_Text_Level == null)
+	       {
+	         _Text_Level  = GetUIUnit<Text>("Text_Level"); 
+	       }
+	      return _Text_Level;
+	     }
+	   }
+	  private Text _Text_Desc;
+	  public Text Text_Desc
+	   {
+	   get{
+	      if (_Text_Desc == null)
+	       {
+	         _Text_Desc  = GetUIUnit<Text>("Text_Desc"); 
+	       }
+	      return _Text_Desc;
+	     }
+	   }
+	  private MyImage _Icon_CurrentUpGrade;
+	  public MyImage Icon_CurrentUpGrade
+	   {
+	   get{
+	      if (_Icon_CurrentUpGrade == null)
+	       {
+	         _Icon_CurrentUpGrade  = GetUIUnit<MyImage>("Icon_CurrentUpGrade"); 
+	       }
+	      return _Icon_CurrentUpGrade;
+	     }
+	   }
+	  #endregion 自定义数据结束 
+	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
+	{
+	 await base.SetUIGameObject(gObjectPoolInterface);
+	 Init();
+	}
+	}
+}

Assets/Scripts/GameUI/UI/MainHeroPnael/FaBaoSkillWidgetData.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: C3MavS2lAXJjHa7NEU+xM5dqNEX25o8hrUheCWN4IWiCOkoVyPO32NnjTO2l
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/GameUI/UI/MainHeroPnael/FaBaoWidget.cs

@@ -24,11 +24,27 @@ namespace Fort23.Mono
             base.AddButtonEvent();
         }
 
-        public void CustomInit(FaBaoInfo faoInfo)
+        public void CustomInit(FaBaoInfo faoInfo,bool isShowActive)
         {
             this.faoInfo = faoInfo;
             Text_Level.text = faoInfo.FaBaoData.level.ToString() + "级";
             Icon_FaBaoIcon.icon_name = faoInfo.SkillConfig.icon;
+            if (isShowActive)
+            {
+                if (faoInfo.FaBaoData.useIndex != -1)
+                {
+                    Iocn_Active.gameObject.SetActive(true);
+                }
+                else
+                {
+                    Iocn_Active.gameObject.SetActive(false);
+                }
+            }
+            else
+            {
+                Iocn_Active.gameObject.SetActive(false);
+            }
+           
         }
     }
 }

Assets/Scripts/GameUI/UI/MainHeroPnael/FaBaoWidgetData.cs

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

Assets/Scripts/GameUI/UI/MainHeroPnael/ItemWidgetType1.cs

@@ -0,0 +1,38 @@
+using Excel2Json;
+using Fort23.UTool;
+using UnityEngine;
+using UnityEngine.UI;
+
+namespace Fort23.Mono
+{
+	[UIBinding(prefab = "ItemWidgetType1"  )]
+	public partial class ItemWidgetType1 : UIComponent
+	{
+		private void Init()
+		{
+
+		}
+		public override void AddEvent()
+		{
+
+		}
+		public override void DelEvent()
+		{
+
+		}
+		public override void AddButtonEvent()
+		{
+
+		}
+
+		public void CustomInit(int id,int count)
+		{
+			ItemConfig itemConfig = ConfigComponent.Instance.Get<ItemConfig>(id);
+			Icon_ItemIcon.icon_name = itemConfig.icon;
+			Text_Count.text = $"{count}/{PlayerManager.Instance.BagController.GetItemCount(id)}";
+			LayoutRebuilder.ForceRebuildLayoutImmediate(Text_Count.GetComponent<RectTransform>());
+			LayoutRebuilder.ForceRebuildLayoutImmediate(transform);
+		}
+
+	}
+}

Assets/Scripts/GameUI/UI/MainHeroPnael/ItemWidgetType1.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: Cn0Y4CL/V38jXF1+Lr5SoKyUDk+KUoWDgubh4CFHXrL/W6G3190sDWHDC6s0
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/GameUI/UI/MainHeroPnael/ItemWidgetType1Data.cs

@@ -0,0 +1,40 @@
+using Fort23.Core;
+using Fort23.UTool;
+using UnityEngine.UI;
+using UnityEngine;
+using System.Collections.Generic;
+namespace Fort23.Mono
+{
+	public partial class ItemWidgetType1 
+	{
+	  #region 自定义数据 
+	  private Text _Text_Count;
+	  public Text Text_Count
+	   {
+	   get{
+	      if (_Text_Count == null)
+	       {
+	         _Text_Count  = GetUIUnit<Text>("Text_Count"); 
+	       }
+	      return _Text_Count;
+	     }
+	   }
+	  private MyImage _Icon_ItemIcon;
+	  public MyImage Icon_ItemIcon
+	   {
+	   get{
+	      if (_Icon_ItemIcon == null)
+	       {
+	         _Icon_ItemIcon  = GetUIUnit<MyImage>("Icon_ItemIcon"); 
+	       }
+	      return _Icon_ItemIcon;
+	     }
+	   }
+	  #endregion 自定义数据结束 
+	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
+	{
+	 await base.SetUIGameObject(gObjectPoolInterface);
+	 Init();
+	}
+	}
+}

Assets/Scripts/GameUI/UI/MainHeroPnael/ItemWidgetType1Data.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: ByhJ5Cv+VXJUSU+AU/IaYDQGmpBWMjI2aqrdHDkq8MM4G6fUfMfjI7hVLvkA
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/GameUI/UI/MainHeroPnael/MainHeroPanel.cs

@@ -22,8 +22,6 @@ namespace Fort23.Mono
 
         public override void AddButtonEvent()
         {
-           
-
             Btn_Close.onClick.AddListener(() => { UIManager.Instance.HideUIUIPanel(this); });
         }
 

Assets/Scripts/GameUI/UI/MainHeroPnael/SelectFaBaoPanel.cs

@@ -1,6 +1,9 @@
 using System.Collections.Generic;
+using System.Linq;
 using Core.Language;
+using Excel2Json;
 using Fort23.Core;
+using Fort23.UTool;
 using GameLogic.Hero;
 using OfficeOpenXml.FormulaParsing.Excel.Functions.Logical;
 using Utility;
@@ -10,6 +13,21 @@ namespace Fort23.Mono
     [UIBinding(prefab = "SelectFaBaoPanel")]
     public partial class SelectFaBaoPanel : UIPanel
     {
+        List<FaBaoSkillWidget> faBaoSkillWidgets = new List<FaBaoSkillWidget>();
+        List<FaBaoAttributeWidget> faBaoAttributeWidgets = new List<FaBaoAttributeWidget>();
+        List<ItemWidgetType1> itemWidgetType1s = new List<ItemWidgetType1>();
+
+        List<FaBaoWidget> faBaoWidgets = new List<FaBaoWidget>();
+
+        FaBaoWidget currentFaBaoWidget = null;
+        FaBaoInfo currentFaBaoInfo;
+        FaBaoInfo selectedFaBaoInfo;
+        int selectIndex;
+        private bool isUpGrade = false;
+
+        private List<FaBaoInfo> shownFaBaoInfos;
+
+
         private void Init()
         {
         }
@@ -28,17 +46,40 @@ namespace Fort23.Mono
 
             Btn_Change.onClick.AddListener(() =>
             {
+                if (selectedFaBaoInfo.FaBaoData.useIndex != -1)
+                {
+                    TipMessagePanel.OpenTipMessagePanel("当前法宝已经被装备");
+                    return;
+                }
+
                 PlayerManager.Instance.FaBaoControl.ChangeUseFaBao(selectIndex, selectedFaBaoInfo);
                 currentFaBaoInfo = selectedFaBaoInfo;
                 selectedFaBaoInfo = null;
                 CustomInit(selectIndex);
+                UpdateBjUI(false);
             });
 
             Btn_UpGrade.onClick.AddListener(() =>
             {
                 if (selectedFaBaoInfo != null)
                 {
+                    if (selectedFaBaoInfo.FabaoPowerupConfig.ID >= ConfigComponent.Instance.GetAll<FabaoPowerupConfig>().Length)
+                    {
+                        TipMessagePanel.OpenTipMessagePanel("已经满级");
+                        return;
+                    }
+
+                    // for (var i = 0; i < selectedFaBaoInfo.FabaoPowerupConfig.PowerupItemIDs.Length; i++)
+                    // {
+                    //     if (!PlayerManager.Instance.BagController.IsEnough(selectedFaBaoInfo.FabaoPowerupConfig.PowerupItemIDs[i], selectedFaBaoInfo.FabaoPowerupConfig.PowerupItemCosts[i]))
+                    //     {
+                    //         TipMessagePanel.OpenTipMessagePanel("道具不足");
+                    //         return;
+                    //     }
+                    //     
+                    // }
                     selectedFaBaoInfo.UpGrade();
+                    UpdateCurrentFaBaoWidget();
                     UpadaFabaoBag();
                     UpdateUI(selectedFaBaoInfo);
                     UpdataGradeUI(true);
@@ -47,26 +88,22 @@ namespace Fort23.Mono
 
             Btn_PeiYang.onClick.AddListener(() =>
             {
+                isUpGrade = true;
                 BtnUpGradeRoot.SetActive(true);
                 BtnChangeRoot.SetActive(false);
                 UpdataGradeUI(true);
+                UpdateBjUI(false);
             });
             Btn_Cancel.onClick.AddListener(() =>
             {
+                isUpGrade = false;
                 BtnUpGradeRoot.SetActive(false);
                 BtnChangeRoot.SetActive(true);
                 UpdataGradeUI(false);
+                UpdateBjUI(true);
             });
         }
 
-        List<FaBaoAttributeWidget> faBaoAttributeWidgets = new List<FaBaoAttributeWidget>();
-
-        List<FaBaoWidget> faBaoWidgets = new List<FaBaoWidget>();
-
-        FaBaoWidget currentFaBaoWidget = null;
-        FaBaoInfo currentFaBaoInfo;
-        FaBaoInfo selectedFaBaoInfo;
-        int selectIndex;
 
         public async override CTask<bool> AsyncInit(object[] uiData)
         {
@@ -104,6 +141,68 @@ namespace Fort23.Mono
             }
         }
 
+        private void UpdateBjUI(bool isBj)
+        {
+            if (isBj)
+            {
+                if (currentFaBaoInfo != selectedFaBaoInfo && selectedFaBaoInfo != null)
+                {
+                    if (currentFaBaoInfo == null || selectedFaBaoInfo.FabaoPowerupConfig.ID > currentFaBaoInfo.FabaoPowerupConfig.ID)
+                    {
+                        Icon_LvBj.gameObject.SetActive(true);
+                        Icon_LvBj.icon_name = "icon_tisheng";
+                    }
+                    else if (selectedFaBaoInfo.FabaoPowerupConfig.ID < currentFaBaoInfo.FabaoPowerupConfig.ID)
+                    {
+                        Icon_LvBj.gameObject.SetActive(true);
+                        Icon_LvBj.icon_name = "icon_xiajiang";
+                    }
+                    else
+                    {
+                        Icon_LvBj.gameObject.SetActive(false);
+                    }
+
+                    if (currentFaBaoInfo == null || selectedFaBaoInfo.qiangDu > currentFaBaoInfo.qiangDu)
+                    {
+                        Icon_PowrBj.gameObject.SetActive(true);
+                        Icon_PowrBj.icon_name = "icon_tisheng";
+                    }
+                    else if (selectedFaBaoInfo.qiangDu < currentFaBaoInfo.qiangDu)
+                    {
+                        Icon_PowrBj.gameObject.SetActive(true);
+                        Icon_PowrBj.icon_name = "icon_xiajiang";
+                    }
+                    else
+                    {
+                        Icon_PowrBj.gameObject.SetActive(false);
+                    }
+
+                    foreach (var faBaoAttributeWidget in faBaoAttributeWidgets)
+                    {
+                        faBaoAttributeWidget.StartBj(currentFaBaoInfo);
+                    }
+                }
+                else
+                {
+                    Icon_LvBj.gameObject.SetActive(false);
+                    Icon_PowrBj.gameObject.SetActive(false);
+                    foreach (var faBaoAttributeWidget in faBaoAttributeWidgets)
+                    {
+                        faBaoAttributeWidget.EndBj();
+                    }
+                }
+            }
+            else
+            {
+                Icon_LvBj.gameObject.SetActive(false);
+                Icon_PowrBj.gameObject.SetActive(false);
+                foreach (var faBaoAttributeWidget in faBaoAttributeWidgets)
+                {
+                    faBaoAttributeWidget.EndBj();
+                }
+            }
+        }
+
         private async CTask UpadaFabaoBag()
         {
             foreach (var faBaoAttributeWidget in faBaoWidgets)
@@ -113,17 +212,34 @@ namespace Fort23.Mono
 
             faBaoWidgets.Clear();
 
-            if (PlayerManager.Instance.FaBaoControl.myAllFaBao.Count > 0)
+            shownFaBaoInfos = PlayerManager.Instance.FaBaoControl.myAllFaBao.ToList();
+
+            shownFaBaoInfos.Sort((l, r) =>
             {
-                for (var i = 0; i < PlayerManager.Instance.FaBaoControl.myAllFaBao.Count; i++)
+                if (l.FaBaoData.useIndex == -1 && r.FaBaoData.useIndex > -1)
+                {
+                    return -1;
+                }
+
+                if (l.FaBaoData.useIndex > -1 && r.FaBaoData.useIndex == 1)
                 {
-                    if (PlayerManager.Instance.FaBaoControl.myAllFaBao[i] == currentFaBaoInfo)
+                    return 1;
+                }
+
+                return r.FabaoPowerupConfig.ID.CompareTo(l.FabaoPowerupConfig.ID);
+            });
+
+            if (shownFaBaoInfos.Count > 0)
+            {
+                for (var i = 0; i < shownFaBaoInfos.Count; i++)
+                {
+                    if (shownFaBaoInfos[i] == currentFaBaoInfo)
                     {
                         continue;
                     }
 
                     FaBaoWidget faBaoWidget = await UIManager.Instance.CreateGComponent<FaBaoWidget>(null, Content);
-                    faBaoWidget.CustomInit(PlayerManager.Instance.FaBaoControl.myAllFaBao[i]);
+                    faBaoWidget.CustomInit(shownFaBaoInfos[i], true);
                     faBaoWidget.onClick = OnClick;
                     faBaoWidgets.Add(faBaoWidget);
                 }
@@ -136,14 +252,19 @@ namespace Fort23.Mono
             }
         }
 
-        private void OnClick(ItemWidgetBasic obj)
+        private async void OnClick(ItemWidgetBasic obj)
         {
             FaBaoWidget faBao = obj as FaBaoWidget;
             selectedFaBaoInfo = faBao.faoInfo;
             Btn_Change.gameObject.SetActive(true);
-            UpdateFaBaoUI(selectedFaBaoInfo);
+            Btn_PeiYang.gameObject.SetActive(true);
+            await UpdateUI(selectedFaBaoInfo);
             FaBaoInfoRoot.SetActive(true);
             Text_NoFabaoTips.gameObject.gameObject.SetActive(false);
+            if (!isUpGrade)
+            {
+                UpdateBjUI(true);
+            }
         }
 
         public async void CustomInit(int selectIndex)
@@ -154,77 +275,185 @@ namespace Fort23.Mono
             BtnChangeRoot.SetActive(true);
             currentFaBaoInfo = PlayerManager.Instance.FaBaoControl.FightFaBao[selectIndex];
             selectedFaBaoInfo = currentFaBaoInfo;
+            UpdateCurrentFaBaoWidget();
             UpdateUI(selectedFaBaoInfo);
             UpadaFabaoBag();
         }
 
-        private async void UpdateUI(FaBaoInfo faBaoInfo)
+        private async CTask UpdateCurrentFaBaoWidget()
         {
-            if (faBaoInfo != null)
+            if (currentFaBaoInfo != null)
             {
                 if (currentFaBaoWidget == null)
                     currentFaBaoWidget = await UIManager.Instance.CreateGComponent<FaBaoWidget>(null, CurrentFaBaoRoot);
 
                 currentFaBaoWidget.onClick = OnClick;
-                currentFaBaoWidget.CustomInit(faBaoInfo);
-                UpdateFaBaoUI(faBaoInfo);
+                currentFaBaoWidget.CustomInit(currentFaBaoInfo, false);
+                equipTipsRoot.gameObject.SetActive(true);
+            }
+            else
+            {
+                UIManager.Instance.DormancyGComponent(currentFaBaoWidget);
+                equipTipsRoot.gameObject.SetActive(false);
+            }
+        }
+
+        private async CTask UpdateUI(FaBaoInfo faBaoInfo)
+        {
+            if (faBaoInfo != null)
+            {
                 FaBaoInfoRoot.SetActive(true);
                 Text_NoFabaoTips.gameObject.gameObject.SetActive(false);
-            
-                equipTipsRoot.gameObject.SetActive(true);
+
+                if (faBaoInfo.FaBaoData.useIndex != -1)
+                {
+                    Btn_Change.transform.Gray(true);
+                }
+                else
+                {
+                    Btn_Change.transform.RecoverColor();
+                }
+
+
                 Btn_PeiYang.gameObject.SetActive(true);
                 Btn_Change.gameObject.SetActive(true);
+                await UpdateFaBaoUI(faBaoInfo);
             }
             else
             {
                 FaBaoInfoRoot.SetActive(false);
                 Text_NoFabaoTips.gameObject.gameObject.SetActive(true);
-                Btn_PeiYang.gameObject.SetActive(false);
-                equipTipsRoot.gameObject.SetActive(false);
+
                 Btn_Change.gameObject.SetActive(false);
+                Btn_PeiYang.gameObject.SetActive(false);
             }
         }
 
-        private async void UpdateFaBaoUI(FaBaoInfo faBaoInfo)
+        private async CTask UpdateFaBaoUI(FaBaoInfo faBaoInfo)
         {
-            foreach (var faBaoAttributeWidget in faBaoAttributeWidgets)
+            using (CTaskAwaitBuffer cts = new CTaskAwaitBuffer())
             {
-                UIManager.Instance.DormancyGComponent(faBaoAttributeWidget);
+                Text_FaBaoName.text = LanguageManager.Instance.Text(faBaoInfo.FabaoConfig.name) + " Lv." +
+                                      faBaoInfo.FabaoPowerupConfig.ID;
+                Text_Power.text = $"强度：{faBaoInfo.qiangDu}";
+                Text_Desc.text = UtilTools.GetString(LanguageManager.Instance.Text(faBaoInfo.SkillConfig.dec),
+                    faBaoInfo.effectValue);
+
+
+                if (faBaoInfo.FabaoPowerupConfig.ID >= ConfigComponent.Instance.GetAll<FabaoPowerupConfig>().Length)
+                {
+                    Text_UpGrade.gameObject.SetActive(false);
+                    ItemRoot.gameObject.SetActive(false);
+                    Text_ManTips.gameObject.SetActive(true);
+                }
+                else
+                {
+                    AccountFileInfo.FaBaoData _faBaoData = new AccountFileInfo.FaBaoData();
+                    _faBaoData.id = faBaoInfo.FaBaoData.id;
+                    _faBaoData.level = faBaoInfo.FabaoPowerupConfig.ID + 1;
+                    FaBaoInfo _nextFaBaoInfo = new FaBaoInfo(_faBaoData);
+
+                    cts.AddTask(CreatItemWidgetType1(faBaoInfo));
+
+
+                    //tupo
+                    if (_nextFaBaoInfo.FabaoPowerupConfig.SkillLevel != selectedFaBaoInfo.FabaoPowerupConfig.SkillLevel)
+                    {
+                        Text_UpGrade.text = "突破";
+                    }
+                    else
+                    {
+                        Text_UpGrade.text = "升级";
+                    }
+
+                    Text_UpGrade.gameObject.SetActive(true);
+                    ItemRoot.gameObject.SetActive(true);
+                    Text_ManTips.gameObject.SetActive(false);
+                }
+
+
+                Icon_FaBaoIcon.icon_name = faBaoInfo.SkillConfig.icon;
+
+                switch (faBaoInfo.FabaoConfig.magicAttribute)
+                {
+                    case 1:
+                        Icon_Attribute.GetComponent<CustomStateController>().ChangeState(0);
+                        Text_Attribute.text = "金";
+                        break;
+                    case 2:
+                        Icon_Attribute.GetComponent<CustomStateController>().ChangeState(1);
+                        Text_Attribute.text = "木";
+                        break;
+                    case 4:
+                        Icon_Attribute.GetComponent<CustomStateController>().ChangeState(2);
+                        Text_Attribute.text = "水";
+                        break;
+                    case 8:
+                        Icon_Attribute.GetComponent<CustomStateController>().ChangeState(3);
+                        Text_Attribute.text = "火";
+                        break;
+                    case 16:
+                        Icon_Attribute.GetComponent<CustomStateController>().ChangeState(4);
+                        Text_Attribute.text = "土";
+                        break;
+                }
+
+                cts.AddTask(CreatFaBaoSkillWidget(faBaoInfo));
+                cts.AddTask(CreatFaBaoAttributeWidget(faBaoInfo));
+                await cts.WaitAll();
             }
+        }
 
-            faBaoAttributeWidgets.Clear();
+        private async CTask CreatItemWidgetType1(FaBaoInfo faBaoInfo)
+        {
+            foreach (var itemWidgetType1 in itemWidgetType1s)
+            {
+                UIManager.Instance.DormancyGComponent(itemWidgetType1);
+            }
 
+            itemWidgetType1s.Clear();
+            for (var i = 0; i < faBaoInfo.FabaoPowerupConfig.PowerupItemIDs.Length; i++)
+            {
+                ItemWidgetType1 itemWidgetType1 = await UIManager.Instance.CreateGComponent<ItemWidgetType1>(null, ItemRoot);
+                itemWidgetType1.CustomInit(faBaoInfo.FabaoPowerupConfig.PowerupItemIDs[i], faBaoInfo.FabaoPowerupConfig.PowerupItemCosts[i]);
+                itemWidgetType1s.Add(itemWidgetType1);
+            }
+        }
 
-            Text_FaBaoName.text = LanguageManager.Instance.Text(faBaoInfo.FabaoConfig.name) + " Lv." +
-                                  faBaoInfo.FabaoPowerupConfig.ID;
-            Text_Power.text = $"强度：{faBaoInfo.qiangDu}";
-            Text_Desc.text = UtilTools.GetString(LanguageManager.Instance.Text(faBaoInfo.SkillConfig.dec),
-                faBaoInfo.effectValue);
+        private async CTask CreatFaBaoSkillWidget(FaBaoInfo faBaoInfo)
+        {
+            foreach (var faBaoSkillWidget in faBaoSkillWidgets)
+            {
+                UIManager.Instance.DormancyGComponent(faBaoSkillWidget);
+            }
+
+            faBaoSkillWidgets.Clear();
+
+            List<FabaoPowerupConfig> fabaoPowerupConfigs = ConfigComponent.Instance.GetAll<FabaoPowerupConfig>().ToList();
+
+            var fanappower = fabaoPowerupConfigs.GroupBy(f => f.SkillLevel).Select(g => new { config = g.OrderBy(f => f.ID).FirstOrDefault() }).ToList();
+
+            foreach (var powerupConfigse in fanappower)
+            {
+                AccountFileInfo.FaBaoData faBaoData = new AccountFileInfo.FaBaoData();
+                faBaoData.id = selectedFaBaoInfo.FaBaoData.id;
+                faBaoData.level = powerupConfigse.config.ID;
+                FaBaoInfo _faBaoInfo = new FaBaoInfo(faBaoData);
+                FaBaoSkillWidget faBaoSkillWidget = await UIManager.Instance.CreateGComponent<FaBaoSkillWidget>(null, SkillContent);
+                faBaoSkillWidget.CustomInit(selectedFaBaoInfo, _faBaoInfo);
+                faBaoSkillWidgets.Add(faBaoSkillWidget);
+            }
+        }
 
-            switch (faBaoInfo.FabaoConfig.magicAttribute)
+        private async CTask CreatFaBaoAttributeWidget(FaBaoInfo faBaoInfo)
+        {
+            foreach (var faBaoAttributeWidget in faBaoAttributeWidgets)
             {
-                case 1:
-                    Icon_Attribute.GetComponent<CustomStateController>().ChangeState(0);
-                    Text_Attribute.text = "金";
-                    break;
-                case 2:
-                    Icon_Attribute.GetComponent<CustomStateController>().ChangeState(1);
-                    Text_Attribute.text = "木";
-                    break;
-                case 4:
-                    Icon_Attribute.GetComponent<CustomStateController>().ChangeState(2);
-                    Text_Attribute.text = "水";
-                    break;
-                case 8:
-                    Icon_Attribute.GetComponent<CustomStateController>().ChangeState(3);
-                    Text_Attribute.text = "火";
-                    break;
-                case 16:
-                    Icon_Attribute.GetComponent<CustomStateController>().ChangeState(4);
-                    Text_Attribute.text = "土";
-                    break;
+                UIManager.Instance.DormancyGComponent(faBaoAttributeWidget);
             }
 
+            faBaoAttributeWidgets.Clear();
+
             foreach (var keyValuePair in faBaoInfo.attriButedIC)
             {
                 FaBaoAttributeWidget faBaoAttributeWidget =
@@ -258,14 +487,31 @@ namespace Fort23.Mono
 
             faBaoWidgets.Clear();
 
+            foreach (var faBaoSkillWidget in faBaoSkillWidgets)
+            {
+                UIManager.Instance.DormancyGComponent(faBaoSkillWidget);
+            }
+
+            faBaoSkillWidgets.Clear();
+
+            foreach (var itemWidgetType1 in itemWidgetType1s)
+            {
+                UIManager.Instance.DormancyGComponent(itemWidgetType1);
+            }
+
+            itemWidgetType1s.Clear();
+
             UIManager.Instance.DormancyGComponent(currentFaBaoWidget);
-            currentFaBaoWidget = null;
+            UpdataGradeUI(false);
+            UpdateBjUI(false);
 
+            currentFaBaoWidget = null;
             BtnUpGradeRoot.SetActive(false);
             BtnChangeRoot.SetActive(true);
             currentFaBaoInfo = null;
             selectedFaBaoInfo = null;
 
+
             base.Close();
         }
     }

Assets/Scripts/GameUI/UI/MainHeroPnael/SelectFaBaoPanelData.cs

@@ -250,6 +250,72 @@ namespace Fort23.Mono
 	      return _Text_NextPower;
 	     }
 	   }
+	  private MyImage _Icon_LvBj;
+	  public MyImage Icon_LvBj
+	   {
+	   get{
+	      if (_Icon_LvBj == null)
+	       {
+	         _Icon_LvBj  = GetUIUnit<MyImage>("Icon_LvBj"); 
+	       }
+	      return _Icon_LvBj;
+	     }
+	   }
+	  private MyImage _Icon_PowrBj;
+	  public MyImage Icon_PowrBj
+	   {
+	   get{
+	      if (_Icon_PowrBj == null)
+	       {
+	         _Icon_PowrBj  = GetUIUnit<MyImage>("Icon_PowrBj"); 
+	       }
+	      return _Icon_PowrBj;
+	     }
+	   }
+	  private RectTransform _SkillContent;
+	  public RectTransform SkillContent
+	   {
+	   get{
+	      if (_SkillContent == null)
+	       {
+	         _SkillContent  = GetUIUnit<RectTransform>("SkillContent"); 
+	       }
+	      return _SkillContent;
+	     }
+	   }
+	  private RectTransform _ItemRoot;
+	  public RectTransform ItemRoot
+	   {
+	   get{
+	      if (_ItemRoot == null)
+	       {
+	         _ItemRoot  = GetUIUnit<RectTransform>("ItemRoot"); 
+	       }
+	      return _ItemRoot;
+	     }
+	   }
+	  private Text _Text_UpGrade;
+	  public Text Text_UpGrade
+	   {
+	   get{
+	      if (_Text_UpGrade == null)
+	       {
+	         _Text_UpGrade  = GetUIUnit<Text>("Text_UpGrade"); 
+	       }
+	      return _Text_UpGrade;
+	     }
+	   }
+	  private Text _Text_ManTips;
+	  public Text Text_ManTips
+	   {
+	   get{
+	      if (_Text_ManTips == null)
+	       {
+	         _Text_ManTips  = GetUIUnit<Text>("Text_ManTips"); 
+	       }
+	      return _Text_ManTips;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{