修改bug

Assets/Res/UI/MainHeroPanel/FaBaoAttributeWidget.prefab

@@ -34,6 +34,7 @@ RectTransform:
   m_Children:
   - {fileID: 3600672490163307244}
   - {fileID: 2124160756088033247}
+  - {fileID: 1928020948802863893}
   - {fileID: 8526466749311363744}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -116,6 +117,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Text_NextAttributeValue
+    gameObject: {fileID: 6317931857398828231}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!1 &3742609577958457981
 GameObject:
@@ -201,6 +207,86 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson/skillIcon.txt
     packgSpritePath: Assets/Res/UIAtlas/skillIcon.spriteatlasv2
     lasetJsonGUID: 151dde130cdc5228de9614f608886409
+--- !u!1 &6472549141707252077
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1928020948802863893}
+  - component: {fileID: 4400891513561527877}
+  - component: {fileID: 6317931857398828231}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text_NextAttributeValue
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1928020948802863893
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6472549141707252077}
+  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: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 47.3, y: -12.67}
+  m_SizeDelta: {x: 61.3275, y: 34.73}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4400891513561527877
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6472549141707252077}
+  m_CullTransparentMesh: 1
+--- !u!114 &6317931857398828231
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6472549141707252077}
+  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.21568629, g: 0.34509805, b: 0.5058824, 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: 30
+    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: +52
 --- !u!1 &8065451786835388400
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/MainHeroPanel/SelectFaBaoPanel.prefab

@@ -1160,6 +1160,86 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u5C1A\u672A\u9009\u4E2D\u4EFB\u4F55\u6CD5\u5B9D"
+--- !u!1 &2624033704172299529
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8981801199049723329}
+  - component: {fileID: 3428042373804842358}
+  - component: {fileID: 1102329998699257894}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text_NextLv
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &8981801199049723329
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2624033704172299529}
+  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: 6108060668469187376}
+  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: -21.9178, y: 381.58}
+  m_SizeDelta: {x: 60.1271, y: 75.668}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3428042373804842358
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2624033704172299529}
+  m_CullTransparentMesh: 1
+--- !u!114 &1102329998699257894
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2624033704172299529}
+  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.17254902, g: 0.30980393, b: 0.4784314, 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: 34
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: +1
 --- !u!1 &2732551771922988517
 GameObject:
   m_ObjectHideFlags: 0
@@ -2529,6 +2609,8 @@ RectTransform:
   m_Children:
   - {fileID: 6411118506608553955}
   - {fileID: 4599103558216846144}
+  - {fileID: 8981801199049723329}
+  - {fileID: 9149685593782168210}
   - {fileID: 4656301576404878008}
   - {fileID: 5788500819222458158}
   - {fileID: 8695863786727674304}
@@ -2875,6 +2957,86 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &6061851419420363952
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 9149685593782168210}
+  - component: {fileID: 5997908688825554679}
+  - component: {fileID: 3984821274128146455}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text_NextPower
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &9149685593782168210
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6061851419420363952}
+  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: 6108060668469187376}
+  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: 311, y: 381.58}
+  m_SizeDelta: {x: 60.1271, y: 75.668}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5997908688825554679
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6061851419420363952}
+  m_CullTransparentMesh: 1
+--- !u!114 &3984821274128146455
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6061851419420363952}
+  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.17254902, g: 0.30980393, b: 0.4784314, 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: 34
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: +52
 --- !u!1 &6376219014674938603
 GameObject:
   m_ObjectHideFlags: 0
@@ -3861,6 +4023,16 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Text_NextLv
+    gameObject: {fileID: 1102329998699257894}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Text_NextPower
+    gameObject: {fileID: 3984821274128146455}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 0
 --- !u!1 &9056821549282551153
 GameObject:

Assets/Res/UI/SkillSelectPanel/SkillSelectPanel.prefab

@@ -5745,7 +5745,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: btn_close_02
+  _icon_name: icon_Check03_l
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:

Assets/Scripts/GameLogic/Hero/FaBaoInfo.cs

@@ -47,7 +47,9 @@ namespace GameLogic.Hero
             SkillConfig = ConfigComponent.Instance.Get<SkillConfig>(FabaoConfig.SkillGroupID * 10 + FabaoPowerupConfig.SkillLevel - 1);
 
             effectValue = new float[SkillConfig.effectValue.Length];
-            Array.Copy(SkillConfig.effectValue, effectValue, SkillConfig.effectValue.Length);
+           
+            
+            
 
             attriButedIC.Clear();
 

Assets/Scripts/GameUI/UI/CombatPanel/SkillKongWidget.cs

@@ -1,4 +1,3 @@
-
 using Core.Language;
 using Excel2Json;
 using Fort23.UTool;
@@ -44,7 +43,7 @@ namespace Fort23.Mono
             //     SkillConfig skillConfig= SkillInfo.skillConfig;
             //     SkillMassgePanel.OpenSkillSelectPanel(LanguageManager.Instance.Text(skillConfig.name) , LanguageManager.Instance.Text(skillConfig.dec));
             // };
-            
+
             base.AddButtonEvent();
         }
 
@@ -72,7 +71,8 @@ namespace Fort23.Mono
             {
                 return;
             }
-            skillId.index= index;
+
+            skillId.index = index;
             this.SkillInfo = skillId;
             icon.gameObject.SetActive(true);
             SkillConfig skillConfig = SkillInfo.skillConfig;
@@ -84,6 +84,9 @@ namespace Fort23.Mono
             this.skillSelectPanel = skillSelectPanel;
             this.index = index;
             icon.gameObject.SetActive(false);
+            SkillInfo = null;
         }
+        
+      
     }
 }

Assets/Scripts/GameUI/UI/CombatPanel/SkillSelectPanel.cs

@@ -26,7 +26,7 @@ namespace Fort23.Mono
 
         public SkillInfo[] allUseSkill;
 
-        private int currenRoadSkilId ;
+        private int currenRoadSkilId;
 
         /// <summary>
         /// 1.执行升级逻辑 2.执行更换逻辑
@@ -496,6 +496,7 @@ namespace Fort23.Mono
                     CloseSelect();
                     return;
                 }
+
                 isAlter = true;
 
                 skillKongWidget.SetSKill(selectSkillConfig);
@@ -527,7 +528,7 @@ namespace Fort23.Mono
                     dianjiSkillKongWidget = skillKongWidget;
                     Btn_RemoveGongFa.transform.position = dianjiSkillKongWidget.RemovePos.position;
                     Btn_RemoveGongFa.gameObject.SetActive(true);
-                    SelectSkill(skillKongWidget.SkillInfo);
+                    SelectSkill(skillKongWidget.SkillInfo,false);
                 }
                 else
                 {
@@ -554,13 +555,31 @@ namespace Fort23.Mono
         }
 
 
-        public void SelectSkill(SkillInfo skillConfig)
+        public void SelectSkill(SkillInfo skillConfig, bool max)
         {
             selectSkillConfig = skillConfig;
             _isSelectSkill = true;
             for (int i = 0; i < allKongSkill.Count; i++)
             {
-                allKongSkill[i].SelectState(true);
+                allKongSkill[i].SelectState(false);
+            }
+
+            if (!max)
+            {
+                for (int i = 0; i < allKongSkill.Count; i++)
+                {
+                    allKongSkill[i].SelectState(true);
+                }
+            }
+            else
+            {
+                for (int i = 0; i < allKongSkill.Count; i++)
+                {
+                    if (allKongSkill[i].SkillInfo != null)
+                    {
+                        allKongSkill[i].SelectState(true);
+                    }
+                }
             }
         }
 
@@ -658,8 +677,24 @@ namespace Fort23.Mono
                     return;
                 }
 
+                int count = 0;
+                for (var i = 0; i < allUseSkill.Length; i++)
+                {
+                    if (allUseSkill[i] != null)
+                    {
+                        count++;
+                    }
+                }
+
                 Btn_RemoveGongFa.gameObject.SetActive(false);
-                SelectSkill(skillWidget.skillConfigId);
+                if (count >= 4)
+                {
+                    SelectSkill(skillWidget.skillConfigId,true);
+                }
+                else
+                {
+                    SelectSkill(skillWidget.skillConfigId,false);
+                }
             }
         }
 

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

@@ -1,8 +1,13 @@
+using GameLogic.Hero;
+
 namespace Fort23.Mono
 {
     [UIBinding(prefab = "FaBaoAttributeWidget")]
     public partial class FaBaoAttributeWidget : UIComponent
     {
+        public FaBaoInfo faBaoInfo;
+        public int key;
+
         private void Init()
         {
         }
@@ -19,20 +24,34 @@ namespace Fort23.Mono
         {
         }
 
-        public void CusomtInit(int type,long value)
+        public void CusomtInit(FaBaoInfo faBaoInfo, int key)
         {
-            Text_AttributeName.text = GetAttributeName(type);
-            Text_AttributeValue.text = value.ToString();
+            this.faBaoInfo = faBaoInfo;
+            this.key = key;
+            Text_AttributeName.text = GetAttributeName(key);
+            Text_AttributeValue.text = faBaoInfo.attriButedIC[key].ToString();
+            Text_NextAttributeValue.gameObject.SetActive(false);
         }
 
-        private string GetAttributeName(int type)
+        public void StartUpGrad(FaBaoInfo nextFabaoInfo )
+        {
+           
+            Text_NextAttributeValue.text = $"+{nextFabaoInfo.attriButedIC[key] - faBaoInfo.attriButedIC[key]}";
+            Text_NextAttributeValue.gameObject.SetActive(true);
+        }
+
+        public void EndUpGrade()
         {
+            Text_NextAttributeValue.gameObject.SetActive(false);
+        }
 
+        private string GetAttributeName(int type)
+        {
             switch (type)
             {
                 case 1:
                     return "生命";
-                
+
                 case 2:
                     return "防御";
                 case 3:

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

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

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

@@ -7,7 +7,6 @@ using Utility;
 
 namespace Fort23.Mono
 {
-    
     [UIBinding(prefab = "SelectFaBaoPanel")]
     public partial class SelectFaBaoPanel : UIPanel
     {
@@ -42,6 +41,7 @@ namespace Fort23.Mono
                     selectedFaBaoInfo.UpGrade();
                     UpadaFabaoBag();
                     UpdateUI(selectedFaBaoInfo);
+                    UpdataGradeUI(true);
                 }
             });
 
@@ -49,11 +49,13 @@ namespace Fort23.Mono
             {
                 BtnUpGradeRoot.SetActive(true);
                 BtnChangeRoot.SetActive(false);
+                UpdataGradeUI(true);
             });
             Btn_Cancel.onClick.AddListener(() =>
             {
                 BtnUpGradeRoot.SetActive(false);
                 BtnChangeRoot.SetActive(true);
+                UpdataGradeUI(false);
             });
         }
 
@@ -72,6 +74,36 @@ namespace Fort23.Mono
             return await base.AsyncInit(uiData);
         }
 
+        private void UpdataGradeUI(bool isStartUpGrade)
+        {
+            if (isStartUpGrade)
+            {
+                AccountFileInfo.FaBaoData faBaoData = new AccountFileInfo.FaBaoData();
+                faBaoData.id = selectedFaBaoInfo.FaBaoData.id;
+                faBaoData.level = selectedFaBaoInfo.FaBaoData.level + 1;
+                FaBaoInfo nextFabaoInfo = new FaBaoInfo(faBaoData);
+                foreach (var faBaoAttributeWidget in faBaoAttributeWidgets)
+                {
+                    faBaoAttributeWidget.StartUpGrad(nextFabaoInfo);
+                }
+
+                Text_NextLv.text = "+1";
+                Text_NextPower.text = "+" + (nextFabaoInfo.qiangDu - selectedFaBaoInfo.qiangDu);
+                Text_NextLv.gameObject.SetActive(true);
+                Text_NextPower.gameObject.SetActive(true);
+            }
+            else
+            {
+                foreach (var faBaoAttributeWidget in faBaoAttributeWidgets)
+                {
+                    faBaoAttributeWidget.EndUpGrade();
+                }
+
+                Text_NextLv.gameObject.SetActive(false);
+                Text_NextPower.gameObject.SetActive(false);
+            }
+        }
+
         private async CTask UpadaFabaoBag()
         {
             foreach (var faBaoAttributeWidget in faBaoWidgets)
@@ -80,17 +112,27 @@ namespace Fort23.Mono
             }
 
             faBaoWidgets.Clear();
-            for (var i = 0; i < PlayerManager.Instance.FaBaoControl.myAllFaBao.Count; i++)
+
+            if (PlayerManager.Instance.FaBaoControl.myAllFaBao.Count > 0)
             {
-                if (PlayerManager.Instance.FaBaoControl.myAllFaBao[i] == currentFaBaoInfo)
+                for (var i = 0; i < PlayerManager.Instance.FaBaoControl.myAllFaBao.Count; i++)
                 {
-                    continue;
+                    if (PlayerManager.Instance.FaBaoControl.myAllFaBao[i] == currentFaBaoInfo)
+                    {
+                        continue;
+                    }
+
+                    FaBaoWidget faBaoWidget = await UIManager.Instance.CreateGComponent<FaBaoWidget>(null, Content);
+                    faBaoWidget.CustomInit(PlayerManager.Instance.FaBaoControl.myAllFaBao[i]);
+                    faBaoWidget.onClick = OnClick;
+                    faBaoWidgets.Add(faBaoWidget);
                 }
 
-                FaBaoWidget faBaoWidget = await UIManager.Instance.CreateGComponent<FaBaoWidget>(null, Content);
-                faBaoWidget.CustomInit(PlayerManager.Instance.FaBaoControl.myAllFaBao[i]);
-                faBaoWidget.onClick = OnClick;
-                faBaoWidgets.Add(faBaoWidget);
+                NoFaBagRoot.gameObject.SetActive(false);
+            }
+            else
+            {
+                NoFaBagRoot.gameObject.SetActive(true);
             }
         }
 
@@ -98,6 +140,7 @@ namespace Fort23.Mono
         {
             FaBaoWidget faBao = obj as FaBaoWidget;
             selectedFaBaoInfo = faBao.faoInfo;
+            Btn_Change.gameObject.SetActive(true);
             UpdateFaBaoUI(selectedFaBaoInfo);
             FaBaoInfoRoot.SetActive(true);
             Text_NoFabaoTips.gameObject.gameObject.SetActive(false);
@@ -121,12 +164,16 @@ namespace Fort23.Mono
             {
                 if (currentFaBaoWidget == null)
                     currentFaBaoWidget = await UIManager.Instance.CreateGComponent<FaBaoWidget>(null, CurrentFaBaoRoot);
+
+                currentFaBaoWidget.onClick = OnClick;
                 currentFaBaoWidget.CustomInit(faBaoInfo);
                 UpdateFaBaoUI(faBaoInfo);
                 FaBaoInfoRoot.SetActive(true);
                 Text_NoFabaoTips.gameObject.gameObject.SetActive(false);
-                Btn_PeiYang.gameObject.SetActive(true);
+            
                 equipTipsRoot.gameObject.SetActive(true);
+                Btn_PeiYang.gameObject.SetActive(true);
+                Btn_Change.gameObject.SetActive(true);
             }
             else
             {
@@ -134,6 +181,7 @@ namespace Fort23.Mono
                 Text_NoFabaoTips.gameObject.gameObject.SetActive(true);
                 Btn_PeiYang.gameObject.SetActive(false);
                 equipTipsRoot.gameObject.SetActive(false);
+                Btn_Change.gameObject.SetActive(false);
             }
         }
 
@@ -181,7 +229,7 @@ namespace Fort23.Mono
             {
                 FaBaoAttributeWidget faBaoAttributeWidget =
                     await UIManager.Instance.CreateGComponent<FaBaoAttributeWidget>(null, FaBaoAttributeWidgetRoot);
-                faBaoAttributeWidget.CusomtInit(keyValuePair.Key, keyValuePair.Value);
+                faBaoAttributeWidget.CusomtInit(selectedFaBaoInfo, keyValuePair.Key);
                 faBaoAttributeWidgets.Add(faBaoAttributeWidget);
             }
         }

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

@@ -217,6 +217,39 @@ namespace Fort23.Mono
 	      return _BtnChangeRoot;
 	     }
 	   }
+	  private RectTransform _NoFaBagRoot;
+	  public RectTransform NoFaBagRoot
+	   {
+	   get{
+	      if (_NoFaBagRoot == null)
+	       {
+	         _NoFaBagRoot  = GetUIUnit<RectTransform>("NoFaBagRoot"); 
+	       }
+	      return _NoFaBagRoot;
+	     }
+	   }
+	  private Text _Text_NextLv;
+	  public Text Text_NextLv
+	   {
+	   get{
+	      if (_Text_NextLv == null)
+	       {
+	         _Text_NextLv  = GetUIUnit<Text>("Text_NextLv"); 
+	       }
+	      return _Text_NextLv;
+	     }
+	   }
+	  private Text _Text_NextPower;
+	  public Text Text_NextPower
+	   {
+	   get{
+	      if (_Text_NextPower == null)
+	       {
+	         _Text_NextPower  = GetUIUnit<Text>("Text_NextPower"); 
+	       }
+	      return _Text_NextPower;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{