分解

FGUIProject/assets/ClothingDecompose/ClothingDecomposeUI.xml

@@ -27,8 +27,8 @@
     </list>
     <text id="n21_qyr6" name="txtNone" xy="380,736" size="256,49" fontSize="36" color="#cfbf9c" vars="true" text="暂无物品可分解"/>
     <text id="n11_wlc2" name="txtShow" xy="301,1150" size="478,44" fontSize="32" color="#917960" align="center" ubb="true" autoSize="none" text="分解0件凡品可获得"/>
-    <text id="n30_lrpa" name="txtTips" xy="299,1184" size="478,44" fontSize="32" color="#917960" align="center" ubb="true" autoSize="none" text="分解0件凡品可获得"/>
-    <list id="n12_wlc2" name="listReward" xy="36,1225" size="1008,255" layout="row" colGap="70" defaultItem="ui://h9mv1l71wlc24" align="center" autoClearItems="true">
+    <text id="n30_lrpa" name="n30" xy="300,1190" size="480,39" fontSize="28" color="#da826e" align="center" ubb="true" text="（未合成的套装材料不会被分解哦！）"/>
+    <list id="n12_wlc2" name="listReward" xy="36,1238" size="1008,242" layout="row" colGap="70" defaultItem="ui://h9mv1l71wlc24" align="center" autoClearItems="true">
       <item/>
       <item/>
       <item/>

FGUIProject/assets/ClothingDecompose/components/ListRewardItem.xml

@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="254,254">
+<component size="247,240">
   <displayList>
-    <image id="n16_qyr6" name="n16" src="qyr6m" fileName="images/fzfj_fjkuang.png" xy="0,0"/>
-    <text id="n13_wlc2" name="txtName" xy="0,0" size="10,44" fontSize="32" align="center" text=""/>
-    <loader id="n14_wlc2" name="loaIcon" xy="126,53" pivot="0.5,0.05" anchor="true" size="163,163" aspect="true" fill="scale"/>
-    <text id="n15_wlc2" name="txtCount" xy="82,168" size="100,44" fontSize="30" color="#fff8ea" align="right" vAlign="bottom" autoSize="none" strokeColor="#907240" strokeSize="2" autoClearText="true" text="666"/>
+    <image id="n16_qyr6" name="n16" src="qyr6m" fileName="images/fzfj_fjkuang.png" xy="7,0" size="240,240" group="n17_lrpa" aspect="true"/>
+    <text id="n13_wlc2" name="txtName" xy="0,3" size="10,44" group="n17_lrpa" fontSize="32" align="center" text=""/>
+    <loader id="n14_wlc2" name="loaIcon" xy="126,46" pivot="0.5,0.05" anchor="true" size="163,163" group="n17_lrpa" aspect="true" fill="scale"/>
+    <text id="n15_wlc2" name="txtCount" xy="82,161" size="100,44" group="n17_lrpa" fontSize="30" color="#fff8ea" align="right" vAlign="bottom" autoSize="none" strokeColor="#907240" strokeSize="2" autoClearText="true" text="666"/>
+    <group id="n17_lrpa" name="n17" xy="0,0" size="247,240"/>
   </displayList>
 </component>

FGUIProject/assets/League/LeagueCreatUI.xml

@@ -14,7 +14,6 @@
       <item/>
       <item/>
       <item/>
-      <item/>
     </list>
     <component id="n3_rv09" name="btnCreat" src="rv091g" fileName="components/BtnBig.xml" pkg="mk0fwx0x" xy="410,830">
       <Button title="创建雅集"/>

GameClient/Assets/Game/HotUpdate/Data/DecomposeDataManager.cs

@@ -5,6 +5,7 @@ namespace GFGGame
     public class DecomposeDataManager : SingletonBase<DecomposeDataManager>
     {
         Dictionary<int, List<int>> _decomposeData = new Dictionary<int, List<int>>();//所有数量大于1的换装部件数据
+        Dictionary<int, List<int>> _suitSyntheticMaterias = new Dictionary<int, List<int>>();//suitId,materiasId
         List<int> _rewardList = new List<int>();
 
         public const int MaxCount = 999;
@@ -67,5 +68,21 @@ namespace GFGGame
         {
             return ItemDataManager.GetItemNum(itemId) - 1;
         }
+        public void InitSuitSyntheticMaterias()
+        {
+            List<SuitCfg> suitCfgs = new List<SuitCfg>();
+            suitCfgs.AddRange(new List<SuitCfg>(SuitCfgArray.Instance.GetCfgsBysyntheticType(1)));
+            suitCfgs.AddRange(new List<SuitCfg>(SuitCfgArray.Instance.GetCfgsBysyntheticType(2)));
+            suitCfgs.AddRange(new List<SuitCfg>(SuitCfgArray.Instance.GetCfgsBysyntheticType(3)));
+            for (int i = 0; i < suitCfgs.Count; i++)
+            {
+
+            }
+        }
+        public bool CheckIsSyntheticMaterias()
+        {
+
+            return false;
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/ClothingDecompose/ClothingDecomposeView.cs

@@ -147,6 +147,11 @@ namespace GFGGame
                 PromptController.Instance.ShowFloatTextPrompt("已达到单次可分解上限，请分批操作");
                 return;
             }
+            // if ()
+            // {
+            //     PromptController.Instance.ShowFloatTextPrompt("这是套装合成材料，先别分解了吧！");
+            //     return;
+            // }
 
             UI_ListItem item = UI_ListItem.Proxy(com);
             item.m_btnMinus.visible = true;