From 11570739f312a31a3c437e0f635eb7aec2f3249a Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期四, 24 一月 2019 14:45:03 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Compose/New/SelectEquipModel.cs | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/System/Compose/New/SelectEquipModel.cs b/System/Compose/New/SelectEquipModel.cs
index ed9c02a..271b420 100644
--- a/System/Compose/New/SelectEquipModel.cs
+++ b/System/Compose/New/SelectEquipModel.cs
@@ -56,9 +56,11 @@
public Dictionary<int, ItemModel> GetUnfixedItemModel()
{
- SinglePackModel singlePack = playerPack.GetSinglePackModel(PackType.rptItem);
- if (singlePack == null || composeWinModel.CurComposeModel == null)
- return null;
+ if (composeWinModel.CurComposeModel == null) return null;
+
+ var packType = composeWinModel.GetPackTypeByMakerId(composeWinModel.CurComposeModel.makeID);
+ SinglePackModel singlePack = playerPack.GetSinglePackModel(packType);
+ if (singlePack == null) return null;
int[] unfixedIds = composeWinModel.CurComposeModel.unfixedItemID;
allBagItemInfo = singlePack.GetPackModelIndexDict();
@@ -96,9 +98,10 @@
public Dictionary<int, ItemModel> GetAddItemModel()
{
- SinglePackModel singlePack = playerPack.GetSinglePackModel(PackType.rptItem);
- if (singlePack == null)
- return null;
+ if (composeWinModel.CurComposeModel == null) return null;
+ var packType = composeWinModel.GetPackTypeByMakerId(composeWinModel.CurComposeModel.makeID);
+ SinglePackModel singlePack = playerPack.GetSinglePackModel(packType);
+ if (singlePack == null) return null;
allBagItemInfo = singlePack.GetPackModelIndexDict();
List<ItemModel> modellist = allBagItemInfo.Values.ToList();
@@ -215,7 +218,10 @@
public void AddHaveUnfixedSelectItem(int itemPlace)
{
- ItemModel itemModel = playerPack.GetItemModelByIndex(PackType.rptItem, itemPlace);
+ if (composeWinModel.CurComposeModel == null) return;
+ var packType = composeWinModel.GetPackTypeByMakerId(composeWinModel.CurComposeModel.makeID);
+
+ ItemModel itemModel = playerPack.GetItemModelByIndex(packType, itemPlace);
if (!haveUnfixedSelectItemDic.ContainsKey(itemPlace))
{
haveUnfixedSelectItemDic.Add(itemPlace, itemModel);
@@ -232,7 +238,9 @@
public void AddHaveAddSelectItem(int itemPlace)
{
- ItemModel itemModel = playerPack.GetItemModelByIndex(PackType.rptItem, itemPlace);
+ if (composeWinModel.CurComposeModel == null) return;
+ var packType = composeWinModel.GetPackTypeByMakerId(composeWinModel.CurComposeModel.makeID);
+ ItemModel itemModel = playerPack.GetItemModelByIndex(packType, itemPlace);
if (!haveAddSelectItemDic.ContainsKey(itemPlace))
{
haveAddSelectItemDic.Add(itemPlace, itemModel);
--
Gitblit v1.8.0