From aae0d35a7993f4c3b2e4e46417248ea97bd518b4 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期四, 15 十一月 2018 10:44:06 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Compose/New/ComposeEquipWin.cs | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/System/Compose/New/ComposeEquipWin.cs b/System/Compose/New/ComposeEquipWin.cs
index d4b0585..3fc2078 100644
--- a/System/Compose/New/ComposeEquipWin.cs
+++ b/System/Compose/New/ComposeEquipWin.cs
@@ -333,15 +333,6 @@
private void UpdateThirdType(int thirdType)
{
composeWinModel.TryGetThirdTypeData((int)ComposeFuncType.Equip, 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();
@@ -641,6 +632,15 @@
private void OnClickComposeBtn()
{
+ if (compoundModel != null)
+ {
+ bool isTrailer = composeWinModel.IsTrailerByLevel(compoundModel);
+ if (isTrailer)
+ {
+ MessageWin.Inst.ShowFixedTip(Language.Get("FuncOpenLv", compoundModel.levelNeed));
+ return;
+ }
+ }
composeWinModel.SendComposeRequest(compoundModel,fixedItemIndexDict,composeEffect,1,10000,isIncreaseRate);
}
--
Gitblit v1.8.0