From 0012445c0109fa67987800a1bac8f32e989b2d19 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期三, 15 八月 2018 15:16:01 +0800
Subject: [PATCH] Merge branch 'master' into leonard

---
 System/KnapSack/Logic/EquipDevourWin.cs |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/System/KnapSack/Logic/EquipDevourWin.cs b/System/KnapSack/Logic/EquipDevourWin.cs
index 7903b41..125eac5 100644
--- a/System/KnapSack/Logic/EquipDevourWin.cs
+++ b/System/KnapSack/Logic/EquipDevourWin.cs
@@ -336,6 +336,7 @@
             playerPack.GetSelectDevourList();
             gridCtrl.m_Scorller.RefreshActiveCellViews();
             RefreshGeMatProgress();
+            RefreshDecomPreviewAttr();
             if (playerPack.getItems != null && playerPack.getItems.Length > 0)
             {
                 WindowCenter.Instance.Open<DecomposeGetItemWin>();
@@ -533,7 +534,7 @@
                 ItemModel itemModel = realDevourlist[i];
                 if (itemModel.chinItemModel.EquipPlace == 0)
                 {
-                    curExp = playerPack.GetItemCountByID(PackType.rptItem, itemModel.itemId) * itemModel.chinItemModel.EffectValueA1;
+                    curExp = itemModel.itemInfo.ItemCount * itemModel.chinItemModel.EffectValueA1;
                 }
                 else
                 {

--
Gitblit v1.8.0