From 384e1a4585ab8d93cbf2c2afa6a80be01a1ab4a2 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期五, 16 十一月 2018 10:38:47 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/BetterItemGet/BetterEquipGetModel.cs | 17 ++++++-----------
1 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/System/BetterItemGet/BetterEquipGetModel.cs b/System/BetterItemGet/BetterEquipGetModel.cs
index ffd1db7..7724886 100644
--- a/System/BetterItemGet/BetterEquipGetModel.cs
+++ b/System/BetterItemGet/BetterEquipGetModel.cs
@@ -71,6 +71,7 @@
bool isCoolEnd = coolData == null || coolData.GetRemainTime() <= 0 ? true : false;
if(isCoolEnd)
{
+ DebugEx.Log("UpdateCoolTime:" + _equip.itemId);
PackSendQuestMgr.Instance.SendPutOnQuest(ItemWinBtnType.putOn,guid);
ReportConfirmBetterEquip(guid);
}
@@ -167,11 +168,6 @@
{
showEquipRefreshEvent();
}
-
- if(CheckIsAutoEquip(betterModel))
- {
- KnapsackTimeCDMgr.Instance.Register(betterModel.itemInfo.ItemGUID, betterModel.itemId, autoEquipCoolTime);
- }
}
}
else
@@ -211,10 +207,6 @@
showEquipRefreshEvent();
}
var betterModel = playerPack.GetItemModelByGUID(_guid);
- if (CheckIsAutoEquip(betterModel))
- {
- KnapsackTimeCDMgr.Instance.Register(betterModel.itemInfo.ItemGUID, betterModel.itemId, autoEquipCoolTime);
- }
}
private void OnPackageRefresh(PackType _packType)
@@ -223,7 +215,6 @@
{
return;
}
-
var keys = new List<string>(betterEquipModels.Keys);
for (int i = keys.Count - 1; i >= 0; i--)
{
@@ -280,7 +271,11 @@
}
else if (_packType == PackType.rptItem)
{
- OnPackageRefresh(_packType);
+ var itemModel = playerPack.GetItemModelByIndex(PackType.rptItem,_index);
+ if(itemModel == null)
+ {
+ OnPackageRefresh(_packType);
+ }
}
}
--
Gitblit v1.8.0