Merge branch 'master' of http://192.168.123.2:3000/ck/XiuXianGame

Assets/Res/UI/ShopPanel/ShopItemWidgetType2.prefab

@@ -203,7 +203,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: icon_eq_4_5_1
+  _icon_name: icon_eq_3_2_2
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: 77f77eea85838ad4b8734050364b4892, type: 3}
   packInfo:
@@ -811,14 +811,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: icon_item_1001
+  _icon_name: icon_Coins_s
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 3855e71da36cb4dfeb0ce0972ed08272, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 77f77eea85838ad4b8734050364b4892, type: 3}
   packInfo:
-    packName: allIcon
-    packgJsonPath: /Art/UIAssets/TextrueJson/allIcon.txt
-    packgSpritePath: Assets/Res/UIAtlas/allIcon.spriteatlasv2
-    lasetJsonGUID: adf97c8e0626f158bc8d949989c272e6
+    packName: daoju
+    packgJsonPath: /Art/UIAssets/TextrueJson\daoju.txt
+    packgSpritePath: Assets/Res/UIAtlas/daoju.spriteatlasv2
+    lasetJsonGUID: 73bfe54518876535550be496297154c4
 --- !u!1 &5785389852042800194
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UIAtlas/daoju.spriteatlasv2.meta

@@ -20,8 +20,8 @@ SpriteAtlasImporter:
     padding: 4
     blockOffset: 1
     allowAlphaSplitting: 0
-    enableRotation: 1
-    enableTightPacking: 1
+    enableRotation: 0
+    enableTightPacking: 0
     enableAlphaDilation: 0
   secondaryTextureSettings: {}
   variantMultiplier: 1

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

@@ -111,11 +111,11 @@ namespace Fort23.Mono
 
                 int count = skillConstant.SkillPromoteNeedPieceNum[_skillInfo.skillConfig.level];
 
-                // if (!PlayerManager.Instance.BagController.DeductItem(_skillInfo.skillConfig.PieceID, count))
-                // {
-                //     TipMessagePanel.OpenTipMessagePanel("道具不足！");
-                //     return;
-                // }
+                if (!PlayerManager.Instance.BagController.DeductItem(_skillInfo.skillConfig.PieceID, count))
+                {
+                    TipMessagePanel.OpenTipMessagePanel("道具不足！");
+                    return;
+                }
 
                 _skillInfo.SkillData.star++;
                 _skillInfo.CustomInt(_skillInfo.SkillData);

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

@@ -84,8 +84,17 @@ namespace Fort23.Mono
                             TipMessagePanel.OpenTipMessagePanel("道具不足");
                             return;
                         }
-                        
                     }
+
+                    if (selectedFaBaoInfo.FabaoPowerupConfig.PromotePieceNum[0] != -1)
+                    {
+                        if (!PlayerManager.Instance.BagController.IsEnough(selectedFaBaoInfo.FabaoConfig.ItemID, selectedFaBaoInfo.FabaoPowerupConfig.PromotePieceNum[0]))
+                        {
+                            TipMessagePanel.OpenTipMessagePanel("道具不足");
+                            return;
+                        }
+                    }
+
                     selectedFaBaoInfo.UpGrade();
                     UpdateCurrentFaBaoWidget();
                     UpadaFabaoBag();
@@ -426,6 +435,14 @@ namespace Fort23.Mono
                 itemWidgetType1.CustomInit(faBaoInfo.FabaoPowerupConfig.PowerupItemIDs[i], faBaoInfo.FabaoPowerupConfig.PowerupItemCosts[i]);
                 itemWidgetType1s.Add(itemWidgetType1);
             }
+
+            //大突破需要消耗对应的法宝碎片
+            if (faBaoInfo.FabaoPowerupConfig.PromotePieceNum[0] != -1)
+            {
+                ItemWidgetType1 itemWidgetType1 = await UIManager.Instance.CreateGComponent<ItemWidgetType1>(null, ItemRoot);
+                itemWidgetType1.CustomInit(faBaoInfo.FabaoConfig.ItemID, faBaoInfo.FabaoPowerupConfig.PromotePieceNum[0]);
+                itemWidgetType1s.Add(itemWidgetType1);
+            }
         }
 
         private async CTask CreatFaBaoSkillWidget(FaBaoInfo faBaoInfo)