From f47ea60f59e0b2b8601583351e269151237c6708 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期一, 28 一月 2019 11:20:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into SpringFestival
---
System/Compose/New/ComposeMatCell.cs | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/System/Compose/New/ComposeMatCell.cs b/System/Compose/New/ComposeMatCell.cs
index 0e4eb4f..6b62f71 100644
--- a/System/Compose/New/ComposeMatCell.cs
+++ b/System/Compose/New/ComposeMatCell.cs
@@ -36,7 +36,8 @@
public void SetDisplay(ItemCompoundConfig _itemCompound,NeedMatType _matType,bool isLock,string des = "", int _itemId = 0,int _itemIndex = -1)
{
this.itemCompound = _itemCompound;
- this.itemModel = playerPack.GetItemModelByIndex(PackType.rptItem, _itemIndex);
+ var packType = composeModel.GetPackTypeByMakerId(itemCompound.makeID);
+ this.itemModel = playerPack.GetItemModelByIndex(packType, _itemIndex);
this.matType = _matType;
this.itemId = _itemId;
matDes = des;
@@ -98,7 +99,8 @@
case NeedMatType.fixedItem:
int needCount = 0;
TryGetCountById(out needCount);
- int haveCount = playerPack.GetItemCountByID(PackType.rptItem, itemId);
+ var packType = composeModel.GetPackTypeByMakerId(itemCompound.makeID);
+ int haveCount = playerPack.GetItemCountByID(packType, itemId);
itemCell.countText.gameObject.SetActive(true);
if (haveCount >= needCount)
{
--
Gitblit v1.8.0