修改ui

Assets/Res/UI/AppBarPanel/TitlePanel.prefab

@@ -148,6 +148,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
+  - {fileID: 3765505885316115153}
   - {fileID: 1315830646960664688}
   - {fileID: 4264355029574138168}
   - {fileID: 1054918091777185813}
@@ -686,6 +687,95 @@ MonoBehaviour:
     isList: 0
     ListCollectorDatas: []
   isAssetBundle: 1
+--- !u!1 &6774947127807301117
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3765505885316115153}
+  - component: {fileID: 39467770677666923}
+  - component: {fileID: 5275691351038218433}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3765505885316115153
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6774947127807301117}
+  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: 4251176618484867663}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 69.361}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &39467770677666923
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6774947127807301117}
+  m_CullTransparentMesh: 1
+--- !u!114 &5275691351038218433
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6774947127807301117}
+  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.31764707}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_juxing_fang
+  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: 5fca2bc7c01fdc4c9164f707ca1c9910
+  imageH: 100
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &7394536043274693495
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/MainHeroPanel/FaBaoSkillWidget.prefab

@@ -148,7 +148,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.3647059, g: 0.2509804, b: 0.18431373, a: 1}
+  m_Color: {r: 0.3921569, g: 0.3803922, b: 0.35686275, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -204,8 +204,8 @@ RectTransform:
   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_AnchoredPosition: {x: 108.6, y: 7.6086}
+  m_SizeDelta: {x: 200.03, y: -15.217}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7281893260405876919
 CanvasRenderer:
@@ -228,7 +228,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0, g: 0, b: 0, a: 0.6392157}
+  m_Color: {r: 0.5921569, g: 0.6901961, b: 0.6509804, a: 0.6313726}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -245,7 +245,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_tiaomulandiban
+  _icon_name: dec_juxing_yuanjiao16
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
@@ -367,13 +367,19 @@ MonoBehaviour:
     - Target: {fileID: 933837835662493314}
       UIStateV4Types: 80000000
       UIStateV4Datas:
-      - {x: 0.70980394, y: 0.7019608, z: 0.62352943, w: 1}
+      - {x: 0.3647059, y: 0.25490198, z: 0.18823531, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
     - Target: {fileID: 4914598392010041695}
       UIStateV4Types: 80000000
       UIStateV4Datas:
-      - {x: 0.70980394, y: 0.7019608, z: 0.62352943, w: 1}
+      - {x: 0.3647059, y: 0.25490198, z: 0.1882353, w: 1}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+    - Target: {fileID: 2523622690758838143}
+      UIStateV4Types: 04000000
+      UIStateV4Datas:
+      - {x: 1, y: 0, z: 0, w: 0}
       UIStateStrTypes: 
       UIStateStrDatas: []
   - StateInfos:
@@ -389,10 +395,17 @@ MonoBehaviour:
       - {x: 0.3921569, y: 0.3803922, z: 0.35686275, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
+    - Target: {fileID: 2523622690758838143}
+      UIStateV4Types: 04000000
+      UIStateV4Datas:
+      - {x: 0, y: 0, z: 0, w: 0}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
   AllComs:
   - {fileID: 933837835662493314}
   - {fileID: 4914598392010041695}
-  AllComsStateTypes: 8000000080000000
+  - {fileID: 2523622690758838143}
+  AllComsStateTypes: 800000008000000004000000
   CurrIndex: 1
 --- !u!1 &4914598392010041695
 GameObject:
@@ -453,7 +466,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.3647059, g: 0.25490198, b: 0.19215688, a: 1}
+  m_Color: {r: 0.3921569, g: 0.3803922, b: 0.35686275, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1

Assets/Res/UI/SkillSelectPanel/Btn_UpStar.prefab

@@ -324,7 +324,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 126.5, y: -40}
-  m_SizeDelta: {x: 0, y: 0}
+  m_SizeDelta: {x: 132, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &125408759325352028
 CanvasRenderer:

Assets/Res/UI/SkillSelectPanel/GongFaUpgradeInfoWidget.prefab

@@ -187,6 +187,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
     packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
     lasetJsonGUID: 1fc57c8d04bebfe9417e3e2522efd20c
+  imageH: 36
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -355,6 +356,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
     packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
     lasetJsonGUID: 1fc57c8d04bebfe9417e3e2522efd20c
+  imageH: 36
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -443,6 +445,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
     packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
     lasetJsonGUID: 1fc57c8d04bebfe9417e3e2522efd20c
+  imageH: 36
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -506,7 +509,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0, g: 0, b: 0, a: 0.6392157}
+  m_Color: {r: 0.64705884, g: 0.7490196, b: 0.67058825, a: 0.49019608}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -523,7 +526,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_tiaomulandiban
+  _icon_name: dec_juxing_yuanjiao16
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
@@ -531,6 +534,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: d4e5a262b3976e33870ab7190f3a5bdb
+  imageH: 84
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -619,6 +623,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
     packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
     lasetJsonGUID: 1fc57c8d04bebfe9417e3e2522efd20c
+  imageH: 36
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -658,8 +663,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 629, y: 109}
+  m_AnchoredPosition: {x: 0, y: -1.6469}
+  m_SizeDelta: {x: 611.8088, y: 87.294}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6601645833327092406
 CanvasRenderer:
@@ -707,6 +712,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
     packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
     lasetJsonGUID: 1fc57c8d04bebfe9417e3e2522efd20c
+  imageH: 109
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -772,7 +778,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0.90196085, g: 0.8980393, b: 0.80392164, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -789,7 +795,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_tiaomulandiban
+  _icon_name: dec_juxing_yuanjiao16
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
@@ -797,6 +803,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: d4e5a262b3976e33870ab7190f3a5bdb
+  imageH: 84
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -842,7 +849,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 42.13504, y: 6}
+  m_AnchoredPosition: {x: 42.13504, y: 0}
   m_SizeDelta: {x: 0, y: 30.6108}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &4119734836969264571
@@ -977,6 +984,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
     packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
     lasetJsonGUID: 1fc57c8d04bebfe9417e3e2522efd20c
+  imageH: 36
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}

Assets/Res/UI/SkillSelectPanel/SkillSelectPanel.prefab

@@ -538,7 +538,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 750, y: 741}
+  m_SizeDelta: {x: 750, y: 794}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &5388579598620886646
 CanvasRenderer:
@@ -561,14 +561,14 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.82745105, g: 0.82745105, b: 0.7490196, 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
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: b70e2b27a4af6b6488a5ef29c0b8e8a6, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 626239b7f16658943bad2556fe45724f, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -578,7 +578,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: bg_gf_xingchendao
+  _icon_name: bg_gongfa_xingchendao
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 0}
   packInfo:
@@ -2571,7 +2571,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.82745105, g: 0.82745105, b: 0.7490196, a: 1}
+  m_Color: {r: 0.69411767, g: 0.76470596, b: 0.7176471, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -4663,7 +4663,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &5473342035507285947
 RectTransform:
   m_ObjectHideFlags: 0
@@ -5086,7 +5086,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &2580771289959082303
 RectTransform:
   m_ObjectHideFlags: 0

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

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

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

@@ -74,8 +74,8 @@ namespace Fort23.Mono
                 CustomInit(selectIndex);
                 UpdateBjUI(false);
                 AudioManager.Instance.PlayAudio("ui_zbfbcg.wav");
-          
-                
+
+
                 SetSelectIcon(currentFaBaoWidget.SelectRoot);
             });
 
@@ -83,7 +83,8 @@ namespace Fort23.Mono
             {
                 if (selectedFaBaoInfo != null)
                 {
-                    if (selectedFaBaoInfo.FabaoPowerupConfig.ID >= ConfigComponent.Instance.GetAll<FabaoPowerupConfig>().Length)
+                    if (selectedFaBaoInfo.FabaoPowerupConfig.ID >=
+                        ConfigComponent.Instance.GetAll<FabaoPowerupConfig>().Length)
                     {
                         TipMessagePanel.OpenTipMessagePanel("已经满级");
                         return;
@@ -91,7 +92,9 @@ namespace Fort23.Mono
 
                     for (var i = 0; i < selectedFaBaoInfo.FabaoPowerupConfig.PowerupItemIDs.Length; i++)
                     {
-                        if (!PlayerManager.Instance.BagController.IsEnough(selectedFaBaoInfo.FabaoPowerupConfig.PowerupItemIDs[i], selectedFaBaoInfo.FabaoPowerupConfig.PowerupItemCosts[i]))
+                        if (!PlayerManager.Instance.BagController.IsEnough(
+                                selectedFaBaoInfo.FabaoPowerupConfig.PowerupItemIDs[i],
+                                selectedFaBaoInfo.FabaoPowerupConfig.PowerupItemCosts[i]))
                         {
                             ItemSourcePanel.OpenPanel(selectedFaBaoInfo.FabaoPowerupConfig.PowerupItemIDs[i]);
                             TipMessagePanel.OpenTipMessagePanel("道具不足");
@@ -102,10 +105,11 @@ namespace Fort23.Mono
                     ItemConfig itemConfig =
                         ConfigComponent.Instance.Get<ItemConfig>(selectedFaBaoInfo.FabaoConfig.ItemID);
                     ItemConfig itemConfig2 = ConfigComponent.Instance.Get<ItemConfig>(itemConfig.associateVlaue[0]);
-                    if (selectedFaBaoInfo.FabaoPowerupConfig.PromotePieceNum != null && selectedFaBaoInfo.FabaoPowerupConfig.PromotePieceNum[itemConfig2.quality-1] != -1)
+                    if (selectedFaBaoInfo.FabaoPowerupConfig.PromotePieceNum != null &&
+                        selectedFaBaoInfo.FabaoPowerupConfig.PromotePieceNum[itemConfig2.quality - 1] != -1)
                     {
-                        
-                        if (!PlayerManager.Instance.BagController.IsEnough(itemConfig.associateVlaue[0], selectedFaBaoInfo.FabaoPowerupConfig.PromotePieceNum[itemConfig2.quality-1]))
+                        if (!PlayerManager.Instance.BagController.IsEnough(itemConfig.associateVlaue[0],
+                                selectedFaBaoInfo.FabaoPowerupConfig.PromotePieceNum[itemConfig2.quality - 1]))
                         {
                             ItemSourcePanel.OpenPanel(itemConfig.associateVlaue[0]);
                             TipMessagePanel.OpenTipMessagePanel("道具不足");
@@ -162,8 +166,8 @@ namespace Fort23.Mono
 
                 Text_NextLv.text = "+1";
                 Text_NextPower.text = "+" + (nextFabaoInfo.qiangDu - selectedFaBaoInfo.qiangDu);
-                Text_NextLv.color = new Color32(15,241,150,255);
-                Text_NextPower.color = new Color32(15,241,150,255);
+                Text_NextLv.color = new Color32(15, 241, 150, 255);
+                Text_NextPower.color = new Color32(15, 241, 150, 255);
                 Text_NextLv.gameObject.SetActive(true);
                 Text_NextPower.gameObject.SetActive(true);
             }
@@ -185,20 +189,21 @@ namespace Fort23.Mono
             {
                 if (currentFaBaoInfo != selectedFaBaoInfo && selectedFaBaoInfo != null)
                 {
-                    if (currentFaBaoInfo == null || selectedFaBaoInfo.FabaoPowerupConfig.ID > currentFaBaoInfo.FabaoPowerupConfig.ID)
+                    if (currentFaBaoInfo == null ||
+                        selectedFaBaoInfo.FabaoPowerupConfig.ID > currentFaBaoInfo.FabaoPowerupConfig.ID)
                     {
                         Text_NextLv.gameObject.SetActive(true);
                         Text_NextLv.text =
                             $"+{selectedFaBaoInfo.FabaoPowerupConfig.ID - currentFaBaoInfo.FabaoPowerupConfig.ID}";
-                        Text_NextLv.color = new Color32(15,241,150,255);
-                       
+                        Text_NextLv.color = new Color32(15, 241, 150, 255);
+
                         // Icon_LvBj.icon_name = "dec_fbjia";
                     }
                     else if (selectedFaBaoInfo.FabaoPowerupConfig.ID < currentFaBaoInfo.FabaoPowerupConfig.ID)
                     {
                         Text_NextLv.text =
                             $"{selectedFaBaoInfo.FabaoPowerupConfig.ID - currentFaBaoInfo.FabaoPowerupConfig.ID}";
-                        Text_NextLv.color = new Color32(235,110,109,255);
+                        Text_NextLv.color = new Color32(235, 110, 109, 255);
                         Text_NextLv.gameObject.SetActive(true);
                         // Icon_LvBj.icon_name = "dec_fbjian";
                     }
@@ -210,14 +215,14 @@ namespace Fort23.Mono
                     if (currentFaBaoInfo == null || selectedFaBaoInfo.qiangDu > currentFaBaoInfo.qiangDu)
                     {
                         Text_NextPower.text = $"+{selectedFaBaoInfo.qiangDu - currentFaBaoInfo.qiangDu}";
-                        Text_NextPower.color = new Color32(15,241,150,255);
+                        Text_NextPower.color = new Color32(15, 241, 150, 255);
                         Text_NextPower.gameObject.SetActive(true);
                         // Icon_PowrBj.icon_name = "dec_bjia";
                     }
                     else if (selectedFaBaoInfo.qiangDu < currentFaBaoInfo.qiangDu)
                     {
-                        Text_NextPower.text = $"{ selectedFaBaoInfo.qiangDu - currentFaBaoInfo.qiangDu}";
-                        Text_NextPower.color = new Color32(235,110,109,255);
+                        Text_NextPower.text = $"{selectedFaBaoInfo.qiangDu - currentFaBaoInfo.qiangDu}";
+                        Text_NextPower.color = new Color32(235, 110, 109, 255);
                         Text_NextPower.gameObject.SetActive(true);
                         // Icon_PowrBj.icon_name = "dec_fbjian";
                     }
@@ -341,12 +346,12 @@ namespace Fort23.Mono
             BtnChangeRoot.SetActive(true);
             currentFaBaoInfo = PlayerManager.Instance.FaBaoControl.FightFaBao[selectIndex];
             selectedFaBaoInfo = currentFaBaoInfo;
-           
+
             UpdateUI(selectedFaBaoInfo);
             UpadaFabaoBag();
             await UpdateCurrentFaBaoWidget();
-            
-            if(currentFaBaoWidget != null)
+
+            if (currentFaBaoWidget != null)
                 SetSelectIcon(currentFaBaoWidget.SelectRoot);
         }
 
@@ -481,8 +486,11 @@ namespace Fort23.Mono
             itemWidgetType1s.Clear();
             for (var i = 0; i < faBaoInfo.FabaoPowerupConfig.PowerupItemIDs.Length; i++)
             {
-                ItemWidgetType1 itemWidgetType1 = await UIManager.Instance.CreateGComponentForObject<ItemWidgetType1>(ItemWidgetType1Game,null, ItemRoot);
-                itemWidgetType1.CustomInit(faBaoInfo.FabaoPowerupConfig.PowerupItemIDs[i], faBaoInfo.FabaoPowerupConfig.PowerupItemCosts[i]);
+                ItemWidgetType1 itemWidgetType1 =
+                    await UIManager.Instance.CreateGComponentForObject<ItemWidgetType1>(ItemWidgetType1Game, null,
+                        ItemRoot);
+                itemWidgetType1.CustomInit(faBaoInfo.FabaoPowerupConfig.PowerupItemIDs[i],
+                    faBaoInfo.FabaoPowerupConfig.PowerupItemCosts[i]);
                 itemWidgetType1s.Add(itemWidgetType1);
             }
 
@@ -490,10 +498,14 @@ namespace Fort23.Mono
                 ConfigComponent.Instance.Get<ItemConfig>(selectedFaBaoInfo.FabaoConfig.ItemID);
             ItemConfig itemConfig2 = ConfigComponent.Instance.Get<ItemConfig>(itemConfig.associateVlaue[0]);
             //大突破需要消耗对应的法宝碎片
-            if (faBaoInfo.FabaoPowerupConfig.PromotePieceNum != null && faBaoInfo.FabaoPowerupConfig.PromotePieceNum[itemConfig2.quality - 1] != -1)
-            {
-                ItemWidgetType1 itemWidgetType1 = await UIManager.Instance.CreateGComponentForObject<ItemWidgetType1>(ItemWidgetType1Game,null, ItemRoot);
-                itemWidgetType1.CustomInit(itemConfig.associateVlaue[0], faBaoInfo.FabaoPowerupConfig.PromotePieceNum[itemConfig2.quality - 1]);
+            if (faBaoInfo.FabaoPowerupConfig.PromotePieceNum != null &&
+                faBaoInfo.FabaoPowerupConfig.PromotePieceNum[itemConfig2.quality - 1] != -1)
+            {
+                ItemWidgetType1 itemWidgetType1 =
+                    await UIManager.Instance.CreateGComponentForObject<ItemWidgetType1>(ItemWidgetType1Game, null,
+                        ItemRoot);
+                itemWidgetType1.CustomInit(itemConfig.associateVlaue[0],
+                    faBaoInfo.FabaoPowerupConfig.PromotePieceNum[itemConfig2.quality - 1]);
                 itemWidgetType1s.Add(itemWidgetType1);
             }
         }
@@ -507,17 +519,25 @@ namespace Fort23.Mono
 
             faBaoSkillWidgets.Clear();
 
-            List<FabaoPowerupConfig> fabaoPowerupConfigs = ConfigComponent.Instance.GetAll<FabaoPowerupConfig>().ToList();
+            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();
+            var fanappower = fabaoPowerupConfigs.GroupBy(f => f.SkillLevel)
+                .Select(g => new { config = g.OrderBy(f => f.ID).FirstOrDefault() }).ToList();
 
             foreach (var powerupConfigse in fanappower)
             {
+                if (powerupConfigse.config.ID == 1)
+                {
+                    continue;
+                }
+
                 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 faBaoSkillWidget =
+                    await UIManager.Instance.CreateGComponent<FaBaoSkillWidget>(null, SkillContent);
                 faBaoSkillWidget.CustomInit(selectedFaBaoInfo, _faBaoInfo);
                 faBaoSkillWidgets.Add(faBaoSkillWidget);
             }