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/ComposeTicketWin.cs | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/System/Compose/New/ComposeTicketWin.cs b/System/Compose/New/ComposeTicketWin.cs
index d4d6502..bcccab0 100644
--- a/System/Compose/New/ComposeTicketWin.cs
+++ b/System/Compose/New/ComposeTicketWin.cs
@@ -326,15 +326,6 @@
private void UpdateThirdType(int thirdType)
{
composeWinModel.TryGetThirdTypeData((int)ComposeFuncType.Ticket, 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;
CreateTypeCell();
}
@@ -469,6 +460,13 @@
fixedItemIndexDict.Clear();
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>();
SinglePackModel singlePack = playerPack.GetSinglePackModel(PackType.rptItem);
int[] fixedIds = compoundModel.itemID;
@@ -504,6 +502,12 @@
{
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,GetPlayMatEffect(),1);
}
--
Gitblit v1.8.0