From ec901bfd42ee3f46f5b5269e2a838da1ef111455 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期二, 25 九月 2018 10:52:40 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Dungeon/TrialDungeonModel.cs | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/System/Dungeon/TrialDungeonModel.cs b/System/Dungeon/TrialDungeonModel.cs
index 2975386..46b97dc 100644
--- a/System/Dungeon/TrialDungeonModel.cs
+++ b/System/Dungeon/TrialDungeonModel.cs
@@ -281,7 +281,8 @@
{
if (itemModel.chinItemModel.EquipPlace == config.EquipPlace
&& (itemModel.chinItemModel.JobLimit / 100 == PlayerDatas.Instance.baseData.Job
- || itemModel.chinItemModel.JobLimit == 0))
+ || itemModel.chinItemModel.JobLimit == 0)
+ && !ModelCenter.Instance.GetModel<PackModelInterface>().IsOverdue(itemModel.itemInfo.ItemGUID, itemModel.itemId, itemModel.useDataDict))
{
var compare = EquipCompare(itemModel, config);
if (compare == -1 || compare == 0)
@@ -293,7 +294,7 @@
}
}
singlepack = packModel.GetSinglePackModel(PackType.rptEquip);
- if (singlepack != null)
+ if (singlepack == null)
{
return 1;
}
--
Gitblit v1.8.0