From 9809d7d0737e1eea547842c2e6b9d95e6868675a Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期二, 21 八月 2018 09:35:08 +0800
Subject: [PATCH] Merge branch 'master' into DogzDungeon
---
System/NewBieGuidance/NewBieCenter.cs | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/System/NewBieGuidance/NewBieCenter.cs b/System/NewBieGuidance/NewBieCenter.cs
index ae9338a..5afb27b 100644
--- a/System/NewBieGuidance/NewBieCenter.cs
+++ b/System/NewBieGuidance/NewBieCenter.cs
@@ -54,6 +54,7 @@
PlayerDeadModel playerDeadModel { get { return ModelCenter.Instance.GetModel<PlayerDeadModel>(); } }
TeamModel teamModel { get { return ModelCenter.Instance.GetModel<TeamModel>(); } }
DailyQuestModel dailyModel { get { return ModelCenter.Instance.GetModel<DailyQuestModel>(); } }
+ PlayerPackModel packModel { get { return ModelCenter.Instance.GetModel<PlayerPackModel>(); } }
public event Action guideStepChangeEvent;
public event Action guideBeginEvent;
@@ -340,7 +341,14 @@
case GuideTriggerType.RealmSitDown:
return false;
case GuideTriggerType.ItemCompound:
- return composeModel.IsComposeTicketByType(config.Condition);
+ if (DungeonSuppliesLackWin.lackType != DungeonSuppliesLackWin.LackType.FairyLand)
+ {
+ return false;
+ }
+ var itemId = composeModel.GetTicketId((int)ComposeFuncType.Ticket, config.Condition, 0);
+ var singlepack = packModel.GetSinglePackModel(PackType.rptItem);
+ var count = singlepack != null ? singlepack.GetItemCountByID(itemId) : 0;
+ return composeModel.IsComposeTicketByType(config.Condition) && itemId != 0 && count == 0;
case GuideTriggerType.HangUpResult:
return true;
case GuideTriggerType.BranchQuestCando:
--
Gitblit v1.8.0