From 4efedb5a54922452a3d90e7074d78d19b2f5f2ce Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期四, 24 一月 2019 19:34:20 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Compose/New/ComposeWinModel.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/System/Compose/New/ComposeWinModel.cs b/System/Compose/New/ComposeWinModel.cs
index c470e4f..5f572b7 100644
--- a/System/Compose/New/ComposeWinModel.cs
+++ b/System/Compose/New/ComposeWinModel.cs
@@ -532,12 +532,12 @@
MessageWin.Inst.ShowFixedTip(Language.Get("Compose101"));
return;
}
-
+ var packType = GetPackTypeByMakerId(compoundModel.makeID);
int[] fixedIds = compoundModel.itemID;
int[] fixedCounts = compoundModel.itemCount;
for (i = 0; i < fixedCounts.Length; i++)
{
- int haveCount = playerPack.GetItemCountByID(PackType.rptItem,fixedIds[i]);
+ int haveCount = playerPack.GetItemCountByID(packType, fixedIds[i]);
if (haveCount < fixedCounts[i])
{
ItemConfig fixedConfig = Config.Instance.Get<ItemConfig>(fixedIds[i]);
@@ -580,7 +580,7 @@
{
for(i= 0; i < fixedIndexArray.Length;i++ )
{
- ItemModel itemModel = playerPack.GetItemModelByIndex(PackType.rptItem,fixedIndexArray[i]);
+ ItemModel itemModel = playerPack.GetItemModelByIndex(packType, fixedIndexArray[i]);
SetMatIsBindDict(itemModel,fixedMatIsBindDict);
}
}
@@ -598,7 +598,7 @@
{
for (i = 0; i < unfixedIndexArray.Length; i++)
{
- ItemModel itemModel = playerPack.GetItemModelByIndex(PackType.rptItem, unfixedIndexArray[i]);
+ ItemModel itemModel = playerPack.GetItemModelByIndex(packType, unfixedIndexArray[i]);
SetMatIsBindDict(itemModel,unfixedMatIsBindDict);
}
}
--
Gitblit v1.8.0