From ea5047536efd6373ebbd6930dff7a744ee271c8a Mon Sep 17 00:00:00 2001
From: Client_PangDeRong <593317293@qq.com>
Date: 星期一, 08 十月 2018 19:10:12 +0800
Subject: [PATCH] 1834 分解装备时分解了错误的装备
---
System/KnapSack/New/KnapSackWin.cs | 3 +++
System/KnapSack/Logic/EquipDevourWin.cs | 3 +++
System/KnapSack/New/RoleEquipWin.cs | 1 +
System/KnapSack/Logic/PlayerPackModels.cs | 5 ++++-
4 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/System/KnapSack/Logic/EquipDevourWin.cs b/System/KnapSack/Logic/EquipDevourWin.cs
index 0319510..dbc6b37 100644
--- a/System/KnapSack/Logic/EquipDevourWin.cs
+++ b/System/KnapSack/Logic/EquipDevourWin.cs
@@ -50,6 +50,7 @@
PlayerPackModel playerPack { get { return ModelCenter.Instance.GetModel<PlayerPackModel>(); } }
ItemTipsModel tipsModel { get { return ModelCenter.Instance.GetModel<ItemTipsModel>(); } }
+ PackModelInterface modelInterface { get { return ModelCenter.Instance.GetModel<PackModelInterface>(); } }
List<ItemModel> devourModellist;
bool isOpen = true;
@@ -587,6 +588,8 @@
public void SendEquipdevourQuest()
{
+ if (!modelInterface.isPackResetOk) return;
+
playerPack.isAutoDecompose = false;
CA32C_tagCMEquipDecompose _petEat = new CA32C_tagCMEquipDecompose();
diff --git a/System/KnapSack/Logic/PlayerPackModels.cs b/System/KnapSack/Logic/PlayerPackModels.cs
index 3d6bc66..8a42104 100644
--- a/System/KnapSack/Logic/PlayerPackModels.cs
+++ b/System/KnapSack/Logic/PlayerPackModels.cs
@@ -1276,6 +1276,9 @@
{
if (model.chinItemModel.ItemColor >= (int)E_ItemColor.Purple)
{
+ PetEatEquipConfig eatEquipConfig = PetEatEquipConfig.GetEquipColorAndEquipClass(model.chinItemModel.ItemColor,model.chinItemModel.LV);
+ if (eatEquipConfig == null) return false;
+
if (modelInterface.IsFightUp(model.itemId, model.equipScore) != 1)
{
if (model.chinItemModel.ItemColor <= (int)colorType
@@ -1395,7 +1398,7 @@
public void SendEquipdevourQuest()
{
List<ItemModel> itemModels = GetCanDevourModellist();
- if (itemModels == null || itemModels.Count < minDecomposeNum) return;
+ if (itemModels == null || itemModels.Count < minDecomposeNum || !modelInterface.isPackResetOk) return;
isAutoDecompose = true;
recordAutoDecomNum = itemModels.Count;
diff --git a/System/KnapSack/New/KnapSackWin.cs b/System/KnapSack/New/KnapSackWin.cs
index e935de3..ac17c99 100644
--- a/System/KnapSack/New/KnapSackWin.cs
+++ b/System/KnapSack/New/KnapSackWin.cs
@@ -53,6 +53,7 @@
{
get { return _playerPack ?? (_playerPack = ModelCenter.Instance.GetModel<PlayerPackModel>()); }
}
+ PackModelInterface modelInterface { get { return ModelCenter.Instance.GetModel<PackModelInterface>(); } }
public static KnapsackFuncTitle titleType = KnapsackFuncTitle.bag;
@@ -201,6 +202,8 @@
private void OnClickDevourTitle()
{
+ if (!modelInterface.isPackResetOk) return;
+
CloseSubWindows();
titleType = KnapsackFuncTitle.devour;
diff --git a/System/KnapSack/New/RoleEquipWin.cs b/System/KnapSack/New/RoleEquipWin.cs
index d25b025..56a73ed 100644
--- a/System/KnapSack/New/RoleEquipWin.cs
+++ b/System/KnapSack/New/RoleEquipWin.cs
@@ -353,6 +353,7 @@
private void OnClickOneKeySell()
{
+ if (!modelInterface.isPackResetOk) return;
if (modelInterface.GetSellItemList().Count > 0)
{
--
Gitblit v1.8.0