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/ComposeWingsWin.cs | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/System/Compose/New/ComposeWingsWin.cs b/System/Compose/New/ComposeWingsWin.cs
index fa1705a..b0fdbe2 100644
--- a/System/Compose/New/ComposeWingsWin.cs
+++ b/System/Compose/New/ComposeWingsWin.cs
@@ -478,8 +478,10 @@
private bool ChangeFixedMatUI()
{
- SinglePackModel singlePack = playerPack.GetSinglePackModel(PackType.rptItem);
- if (singlePack == null || compoundModel == null) return false;
+ if (compoundModel == null) return false;
+ var packType = composeWinModel.GetPackTypeByMakerId(compoundModel.makeID);
+ SinglePackModel singlePack = playerPack.GetSinglePackModel(packType);
+ if (singlePack == null) return false;
bool isBind = false;
Dictionary<int,ItemModel> unfixedMatDict = selectModel.GetHaveUnfixedSelectItem();
@@ -605,8 +607,10 @@
private void SetFixedMatIndex()
{
fixedItemIndexDict.Clear();
- SinglePackModel singlePack = playerPack.GetSinglePackModel(PackType.rptItem);
- if (singlePack == null || compoundModel == null) return;
+ if (compoundModel == null) return;
+ var packType = composeWinModel.GetPackTypeByMakerId(compoundModel.makeID);
+ SinglePackModel singlePack = playerPack.GetSinglePackModel(packType);
+ if (singlePack == null) return;
int isBind = 0;
if(IsComposeBind)
--
Gitblit v1.8.0