From a08989bee578f43a2a9b1724366fdea969e9405e Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期四, 15 十一月 2018 09:50:18 +0800
Subject: [PATCH] Merge branch 'master' into builtinmove
---
System/Compose/New/ComposeToolsWin.cs | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/System/Compose/New/ComposeToolsWin.cs b/System/Compose/New/ComposeToolsWin.cs
index 08b9d8d..0903aab 100644
--- a/System/Compose/New/ComposeToolsWin.cs
+++ b/System/Compose/New/ComposeToolsWin.cs
@@ -343,15 +343,6 @@
private void UpdateThirdType(int thirdType)
{
composeWinModel.TryGetThirdTypeData((int)ComposeFuncType.Item, curSecondType, thirdType, out thirdTypeData);
- if (thirdTypeData != null)
- {
- bool isTrailer = composeWinModel.IsTrailerByLevel(thirdTypeData.itemCompound);
- if (isTrailer)
- {
- MessageWin.Inst.ShowFixedTip(Language.Get("FuncOpenLv", thirdTypeData.itemCompound.levelNeed));
- return;
- }
- }
curThirdType = thirdType;
OnClickThirdType();
CreateTypeCell();
@@ -443,6 +434,13 @@
{
if (compoundModel == null) return;
+ bool isTrailer = composeWinModel.IsTrailerByLevel(compoundModel);
+ if (isTrailer)
+ {
+ MessageWin.Inst.ShowFixedTip(Language.Get("FuncOpenLv", compoundModel.levelNeed));
+ return;
+ }
+
SetFixedItemIndexDic();
composeWinModel.SendComposeRequest(compoundModel, fixedItemIndexDict,composeEffect,1);
}
@@ -486,6 +484,13 @@
{
if (compoundModel == null) return;
+ bool isTrailer = composeWinModel.IsTrailerByLevel(compoundModel);
+ if (isTrailer)
+ {
+ MessageWin.Inst.ShowFixedTip(Language.Get("FuncOpenLv", compoundModel.levelNeed));
+ return;
+ }
+
List<int> composeCountlist = new List<int>();
fixedItemIndexDict.Clear();
SinglePackModel singlePack = playerPack.GetSinglePackModel(PackType.rptItem);
--
Gitblit v1.8.0