From c9caeb44144b88cefbc0c855086cb11d986d8d70 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期三, 29 八月 2018 15:18:06 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Compose/New/SelectEquipModel.cs | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/System/Compose/New/SelectEquipModel.cs b/System/Compose/New/SelectEquipModel.cs
index 136c51c..4edb59e 100644
--- a/System/Compose/New/SelectEquipModel.cs
+++ b/System/Compose/New/SelectEquipModel.cs
@@ -57,9 +57,10 @@
public Dictionary<int, ItemModel> GetUnfixedItemModel()
{
SinglePackModel singlePack = playerPack.GetSinglePackModel(PackType.rptItem);
- if (singlePack == null)
+ if (singlePack == null || composeWinModel.CurComposeModel == null)
return null;
+ int[] unfixedIds = ItemCompoundConfig.GetDisplayArrayByType(composeWinModel.CurComposeModel.id,DisplayItemArray.UnfixedIds);
allBagItemInfo = singlePack.GetPackModelIndexDict();
_unfixedItemDict.Clear();
foreach (int key in allBagItemInfo.Keys)
@@ -67,9 +68,9 @@
if (!haveUnfixedSelectItemDic.ContainsKey(key))
{
int i = 0;
- for (i = 0; i < composeWinModel.unfixedItemIDs.Length; i++)
+ for (i = 0; i < unfixedIds.Length; i++)
{
- if (composeWinModel.unfixedItemIDs[i] == allBagItemInfo[key].itemInfo.ItemID)
+ if (unfixedIds[i] == allBagItemInfo[key].itemInfo.ItemID)
{
_unfixedItemDict.Add(key, allBagItemInfo[key]);
break;
--
Gitblit v1.8.0