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/ComposeGirdCell.cs |   26 +++++++++++---------------
 1 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/Main/System/KnapSack/Logic/ComposeGirdCell.cs b/Main/System/KnapSack/Logic/ComposeGirdCell.cs
index 4827c80..724fea2 100644
--- a/Main/System/KnapSack/Logic/ComposeGirdCell.cs
+++ b/Main/System/KnapSack/Logic/ComposeGirdCell.cs
@@ -13,27 +13,23 @@
     [SerializeField] Image redImg;
     public void Display(int index)
     {
-        if (index >= PackManager.Instance.composeItemGuidList.Count)
+        if (index >= PackManager.Instance.composeItemIDList.Count)
         {
             return;
         }
-        var guid = PackManager.Instance.composeItemGuidList[index];
-        var item = PackManager.Instance.GetItemByGuid(guid);
-        if (item == null)
-            return;
-        itemCell.Init(item);
+        var makeID = PackManager.Instance.composeItemIDList[index];
+        itemCell.Init(new ItemCellModel(makeID, false, PackManager.Instance.GetItemCountByID(PackType.Item, makeID)));
         itemCell.button.AddListener(() =>
         {
             //鍚堟垚鐣岄潰
-            ComposeWin.guid = guid;
-            UIManager.Instance.OpenWindow<ComposeWin>();
+            UIManager.Instance.OpenWindow<ComposeWin>(makeID);
         });
         
-        var config = ItemCompoundConfig.GetItemCompoundConfig(item.itemId);
-        var targetID = config.itemID;
-        var targetCnt = config.itemCount;
-        var haveCnt = PackManager.Instance.GetItemCountByID(PackType.Item, targetID);
-        if (haveCnt >= targetCnt)
+        var config = ItemCompoundConfig.GetItemCompoundConfig(makeID);
+        var materialID = config.itemID;
+        var materialCnt = config.itemCount;
+        var haveCnt = PackManager.Instance.GetItemCountByID(PackType.Item, materialID);
+        if (haveCnt >= materialCnt)
         {
             fullImage.SetActive(true);
             fillImage.SetActive(false);
@@ -44,9 +40,9 @@
             fullImage.SetActive(false);
             fillImage.SetActive(true);
             redImg.SetActive(false);
-            fillImage.fillAmount = haveCnt / (float)targetCnt;
+            fillImage.fillAmount = haveCnt / (float)materialCnt;
         }
-        processText.text = haveCnt+ "/" + targetCnt;
+        processText.text = haveCnt + "/" + materialCnt;
 
     }
 }

--
Gitblit v1.8.0