From 78bfe524ea4776c47f6314e56e97f39970b00fce Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期二, 25 九月 2018 15:07:07 +0800
Subject: [PATCH] Merge branch 'master' into 1871天赋功能
---
System/Dungeon/TrialDungeonModel.cs | 43 +++++++++++++++++++++++++++++++++++++++----
1 files changed, 39 insertions(+), 4 deletions(-)
diff --git a/System/Dungeon/TrialDungeonModel.cs b/System/Dungeon/TrialDungeonModel.cs
index f477264..46b97dc 100644
--- a/System/Dungeon/TrialDungeonModel.cs
+++ b/System/Dungeon/TrialDungeonModel.cs
@@ -113,9 +113,17 @@
private void RefreshItemCountAct(PackType packType, int arg2, int itemId)
{
- if (packType == PackType.rptItem && trialTokens.Contains(itemId))
+ var config = Config.Instance.Get<ItemConfig>(itemId);
+ if (config == null)
{
- UpdateRedpoint();
+ return;
+ }
+ if (packType == PackType.rptItem)
+ {
+ if (trialTokens.Contains(itemId) || config.EquipPlace > 0)
+ {
+ UpdateRedpoint();
+ }
}
else if (packType == PackType.rptEquip)
{
@@ -263,7 +271,29 @@
{
return 0;
}
- var singlepack = packModel.GetSinglePackModel(PackType.rptEquip);
+ var singlepack = packModel.GetSinglePackModel(PackType.rptItem);
+ if (singlepack != null)
+ {
+ var dict = singlepack.GetPackModelIndexDict();
+ if (dict != null)
+ {
+ foreach (var itemModel in dict.Values)
+ {
+ if (itemModel.chinItemModel.EquipPlace == config.EquipPlace
+ && (itemModel.chinItemModel.JobLimit / 100 == PlayerDatas.Instance.baseData.Job
+ || 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)
+ {
+ return compare;
+ }
+ }
+ }
+ }
+ }
+ singlepack = packModel.GetSinglePackModel(PackType.rptEquip);
if (singlepack == null)
{
return 1;
@@ -273,7 +303,12 @@
{
return 1;
}
- var compareConfig = Config.Instance.Get<ItemConfig>(equipItem.itemId);
+ return EquipCompare(equipItem, config);
+ }
+
+ int EquipCompare(ItemModel compareItem, ItemConfig config)
+ {
+ var compareConfig = Config.Instance.Get<ItemConfig>(compareItem.itemId);
if (compareConfig == null)
{
return 1;
--
Gitblit v1.8.0