From cbc27f8ffdf143a5610dcd3fd391ec8c0ee8661a Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期四, 31 一月 2019 16:49:44 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

---
 System/Compose/New/ComposeWinModel.cs |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/System/Compose/New/ComposeWinModel.cs b/System/Compose/New/ComposeWinModel.cs
index 5f572b7..b79086c 100644
--- a/System/Compose/New/ComposeWinModel.cs
+++ b/System/Compose/New/ComposeWinModel.cs
@@ -488,7 +488,10 @@
         int[] fixedCounts = config.itemCount;
         for ( int i = 0; i < fixedCounts.Length; i++)
         {
-            int haveCount = playerPack.GetItemCountByID(PackType.rptItem,fixedIds[i]);
+            var fixedId = fixedIds[i];
+            var itemConfig = Config.Instance.Get<ItemConfig>(fixedId);
+            var packType = GeneralDefine.GetPackTypeByItemType(itemConfig.Type);
+            int haveCount = playerPack.GetItemCountByID(packType,fixedIds[i]);
             if (haveCount < fixedCounts[i])
             {
                 return false;

--
Gitblit v1.8.0