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/ComposeEquipWin.cs | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/System/Compose/New/ComposeEquipWin.cs b/System/Compose/New/ComposeEquipWin.cs
index 91db60d..9da7031 100644
--- a/System/Compose/New/ComposeEquipWin.cs
+++ b/System/Compose/New/ComposeEquipWin.cs
@@ -81,6 +81,7 @@
private int preThirdType = 0;
[SerializeField] int initSuccessRate = 0;
private int curComposeEquipIndex = -1;
+ public static int selectEquipPlace;
ItemCompoundConfig compoundModel = null;
bool isIncreaseRate = false;
int successRate = 0;
@@ -132,6 +133,7 @@
composeWinModel.UpdateThirdTypeEvent -= UpdateThirdType;
selectModel.UpdateSelectEvent -= UpdateSelect;
composeWinModel.UpdateEquipTypeEvent -= UpdateEquipType;
+ selectEquipPlace = -1;
}
protected override void OnAfterClose()
@@ -164,6 +166,20 @@
if(composeWinModel.CurComposeModel == null)
{
curComposeEquipIndex = -1;
+ }
+ List<ComposeWinModel.ComposeThirdTypeData> thirdTypeDatas = null;
+ composeWinModel.TryGetThirdTypeData((int)ComposeFuncType.Equip, curSecondType, curThirdType, out thirdTypeDatas);
+ if (thirdTypeDatas != null)
+ {
+ for (int i = 0; i < thirdTypeDatas.Count; i++)
+ {
+ var itemConfig = Config.Instance.Get<ItemConfig>(thirdTypeDatas[i].itemCompound.makeID[0]);
+ if (itemConfig.EquipPlace == selectEquipPlace)
+ {
+ curComposeEquipIndex = i;
+ break;
+ }
+ }
}
}
@@ -708,8 +724,11 @@
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