From 0df01faae5e45d38cc47bce61995ca3bb4bf9891 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期一, 08 十月 2018 19:58:15 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/KnapSack/Logic/PlayerPackModels.cs | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
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;
--
Gitblit v1.8.0