From b8f9f7e78313ab7b3232686c72a3ed74d423c7d3 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期五, 31 十月 2025 15:09:36 +0800
Subject: [PATCH] 0312 武将培养增加全屏避免引导问题,引导默认隐藏资源避免第一次加载闪烁; 合成修改

---
 Main/System/KnapSack/Logic/ComposeWin.cs |   51 +++++++++++++++++++++++++++++----------------------
 1 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/Main/System/KnapSack/Logic/ComposeWin.cs b/Main/System/KnapSack/Logic/ComposeWin.cs
index 52f8344..3ad61d8 100644
--- a/Main/System/KnapSack/Logic/ComposeWin.cs
+++ b/Main/System/KnapSack/Logic/ComposeWin.cs
@@ -17,16 +17,15 @@
     [SerializeField] Button composeButton;
 
 
-    public static string guid;
     int useCnt;
-    int targetCnt;
-    int targetID;
-    int itemID;
+    int materialCnt;
+    int materialID;
+    int makeID;
     protected override void InitComponent()
     {
         composeButton.AddListener(() =>
         {
-            if (!ItemLogicUtility.CheckItemCount(PackType.Item, targetID, useCnt * targetCnt, 2))
+            if (!ItemLogicUtility.CheckItemCount(PackType.Item, materialID, useCnt * materialCnt, 2))
             {
                 return;
             }
@@ -34,8 +33,16 @@
             CloseWindow();
 
             var pack = new CA303_tagCMItemCompound();
-            pack.ID = (uint)ItemCompoundConfig.GetItemCompoundConfig(itemID).id;
+            pack.ID = (uint)ItemCompoundConfig.GetItemCompoundConfig(makeID).id;
             pack.CompoundCnt = (ushort)useCnt;
+
+            var items = PackManager.Instance.GetItemsById(PackType.Item, materialID);
+            pack.FixedItemIndexCnt = (byte)items.Count;
+            pack.FixedItemIndex = new byte[items.Count];
+            for (int i = 0; i < items.Count; i++)
+            {
+                pack.FixedItemIndex[i] = (byte)items[i].gridIndex;
+            }
             GameNetSystem.Instance.SendInfo(pack);
 
         });
@@ -44,33 +51,33 @@
 
     protected override void OnPreOpen()
     {
-        var item = PackManager.Instance.GetItemByGuid(guid);
-        itemID = item.itemId;
-        var config = ItemCompoundConfig.GetItemCompoundConfig(itemID);
-        targetID = config.itemID;
-        targetCnt = config.itemCount;
+        makeID = functionOrder;
+        var makeItem = ItemConfig.Get(makeID);
+        var config = ItemCompoundConfig.GetItemCompoundConfig(makeID);
+        materialID = config.itemID;
+        materialCnt = config.itemCount;
 
-        itemCell.Init(new ItemCellModel(itemID, false, item.count));
-        nameText.text = item.config.ItemName;
-        descText.text = item.config.Description;
+        itemCell.Init(new ItemCellModel(makeID, false, PackManager.Instance.GetItemCountByID(PackType.Item, makeID)));
+        nameText.text = makeItem.ItemName;
+        descText.text = makeItem.Description;
 
-        needItemCell.Init(new ItemCellModel(targetID, false, 0));
+        needItemCell.Init(new ItemCellModel(materialID, false, 0));
         needItemCell.button.AddListener(() =>
         {
-            ItemTipUtility.Show(targetID);
+            ItemTipUtility.Show(materialID);
         });
         
-        var haveCnt = PackManager.Instance.GetItemCountByID(PackType.Item, targetID);
-        var haveStr = Language.Get("storename12", haveCnt + "/" + targetCnt);
-        haveCntText.text = haveCnt < targetCnt ? UIHelper.AppendColor(TextColType.Red, haveStr) : haveStr;
+        var haveCnt = PackManager.Instance.GetItemCountByID(PackType.Item, materialID);
+        var haveStr = Language.Get("storename12", haveCnt + "/" + materialCnt);
+        haveCntText.text = haveCnt < materialCnt ? UIHelper.AppendColor(TextColType.Red, haveStr) : haveStr;
 
         useCnt = 1;
         sliderPanel.Init((value) => {
             useCnt = value;
-            var haveStr = Language.Get("storename12", haveCnt + "/" + targetCnt * value);
-            haveCntText.text = haveCnt < targetCnt * value ? UIHelper.AppendColor(TextColType.Red, haveStr) : haveStr;
+            var haveStr = Language.Get("storename12", haveCnt + "/" + materialCnt * value);
+            haveCntText.text = haveCnt < materialCnt * value ? UIHelper.AppendColor(TextColType.Red, haveStr) : haveStr;
 
-        }, Math.Max(1, (int)haveCnt/targetCnt));
+        }, Math.Max(1, (int)haveCnt/materialCnt));
 
 
     }

--
Gitblit v1.8.0