From b7ec6b76304bd514127aa92fc75ba62489629442 Mon Sep 17 00:00:00 2001
From: Client_PangDeRong <593317293@qq.com>
Date: 星期三, 26 九月 2018 10:18:20 +0800
Subject: [PATCH] 1834 分解装备时恰好自动出售物品，分解了错误的装备
---
System/SystemSetting/SettingEffectMgr.cs | 29 +++++------------------------
1 files changed, 5 insertions(+), 24 deletions(-)
diff --git a/System/SystemSetting/SettingEffectMgr.cs b/System/SystemSetting/SettingEffectMgr.cs
index 1722176..20b6012 100644
--- a/System/SystemSetting/SettingEffectMgr.cs
+++ b/System/SystemSetting/SettingEffectMgr.cs
@@ -60,13 +60,11 @@
delayTime = 2;
HeroBehaviour.OnStartHandupAI -= OnStartHandupAI;
HeroBehaviour.OnStopHandupAI -= OnStopHandupAI;
- playerPack.ItemCntAddAct -= RefreshItemCnt;
DeadModel.playerDieEvent -= OnPlayerDie;
m_storeModel.RefreshBuyResultEvent -= RefreshBuySuccess;
DeadModel.CloseRebornWinEvent -= PlayerRebornSuccess;
HeroBehaviour.OnStartHandupAI += OnStartHandupAI;
HeroBehaviour.OnStopHandupAI += OnStopHandupAI;
- playerPack.ItemCntAddAct += RefreshItemCnt;
DeadModel.playerDieEvent += OnPlayerDie;
m_storeModel.RefreshBuyResultEvent += RefreshBuySuccess;
DeadModel.CloseRebornWinEvent += PlayerRebornSuccess;
@@ -102,19 +100,10 @@
}
}
- if (secondTimer > 1f)
+ if (secondTimer >= 1f)
{
- if(isGetNewItem)
- {
- secondTimer = 0f;
- delayTime -= 1;
- if (delayTime <= 0)
- {
- isGetNewItem = false;
- delayTime = 2f;
- DealBagItem();
- }
- }
+ secondTimer = 0f;
+ RefreshBagItem();
}
}
@@ -153,11 +142,6 @@
}
}
- private void RefreshItemCnt(PackType type, int index, int id)
- {
- RefreshBagItem();
- }
-
public void RefreshBagItem()
{
if (!_isAutoHangUp)
@@ -165,9 +149,7 @@
DebugEx.Log("璇峰紑鍚嚜鍔ㄦ寕鏈猴紝鍚﹀垯鏃犳硶鍑哄敭");
return;
}
-
DealBagItem();
- isGetNewItem = true;
}
/// <summary>
@@ -175,12 +157,11 @@
/// </summary>
private void DealBagItem()
{
- if (playerPack.GetReaminGridCount(PackType.rptItem) < 5)
+ if (playerPack.GetReaminGridCount(PackType.rptItem) < 5 && modelInterface.isPackResetOk)
{
if (HangUpSetModel.Instance.GetBool(HangUpAutoBoolType.isAutoDevour))
{
- List<ItemModel> list = playerPack.GetCanDevourModellist();
- if (list != null && list.Count > 0)
+ if(playerPack.IsReachMinDecomposeNum())
{
playerPack.SendEquipdevourQuest();
return;
--
Gitblit v1.8.0