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/ComposeTicketWin.cs | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/System/Compose/New/ComposeTicketWin.cs b/System/Compose/New/ComposeTicketWin.cs
index 44eaad0..355da44 100644
--- a/System/Compose/New/ComposeTicketWin.cs
+++ b/System/Compose/New/ComposeTicketWin.cs
@@ -468,12 +468,13 @@
}
List<int> composeCountlist = new List<int>();
- SinglePackModel singlePack = playerPack.GetSinglePackModel(PackType.rptItem);
+ var packType = composeWinModel.GetPackTypeByMakerId(compoundModel.makeID);
+ SinglePackModel singlePack = playerPack.GetSinglePackModel(packType);
int[] fixedIds = compoundModel.itemID;
int[] fixedCounts = compoundModel.itemCount;
for (int i = 0; i < fixedIds.Length; i++)
{
- int haveCount = playerPack.GetItemCountByID(PackType.rptItem, fixedIds[i]);
+ int haveCount = playerPack.GetItemCountByID(packType, fixedIds[i]);
int canComposeCount = haveCount / fixedCounts[i];
composeCountlist.Add(canComposeCount);
List<int> itemIndexlist = null;
@@ -515,8 +516,10 @@
private void SetFixedItemIndexDic()
{
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 minBindCnt = 0;
int minNoBindCnt = 0;
--
Gitblit v1.8.0