From 4fbcdd1af685499a25d00b0d0bd07a77e4943e4b Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期二, 19 二月 2019 23:56:53 +0800
Subject: [PATCH] 3335 物品管理相关功能重构。

---
 System/KnapSack/Logic/PlayerPackModels.cs |   24 +++++++++++++-----------
 1 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/System/KnapSack/Logic/PlayerPackModels.cs b/System/KnapSack/Logic/PlayerPackModels.cs
index b4f309b..aa0daf3 100644
--- a/System/KnapSack/Logic/PlayerPackModels.cs
+++ b/System/KnapSack/Logic/PlayerPackModels.cs
@@ -244,6 +244,7 @@
             }
 
             ItemInfo itemInfo = new ItemInfo();
+
             itemInfo.ItemID = (int)item.ItemID;
             itemInfo.ItemPlace = item.ItemPlace;
             itemInfo.ItemCount = item.ItemCount;
@@ -254,6 +255,7 @@
             itemInfo.IsLocked = item.IsLocked;
             itemInfo.ItemGUID = item.ItemGUID;
             playerPackDict[type].SetPackModel(itemInfo);
+
             DebugEx.Log("Add:" + item.ItemGUID);
             if (RefreshItemCountAct != null)
             {
@@ -317,7 +319,7 @@
                             ItemCntAddAct(type, itemModel.itemPlace, itemModel.itemId);
                         }
                         modelInterface.GetPreciousItem(itemModel);
-                        modelInterface.RefreshPickItem(type, itemModel.itemInfo.ItemGUID);
+                        modelInterface.RefreshPickItem(type, itemModel.guid);
                     }
                     else
                     {
@@ -371,9 +373,9 @@
             if (singlePack != null)
             {
                 ItemModel itemModel = singlePack.GetItemModelByIndex(clearItem.ItemIndex);
-                guid = itemModel.itemInfo.ItemGUID;
+                guid = itemModel.guid;
                 int itemId = itemModel.itemId;
-                DeleteItemDictByGUID(type, itemModel.itemInfo.ItemGUID);
+                DeleteItemDictByGUID(type, itemModel.guid);
                 singlePack.ClearItemModelByIndex(clearItem.ItemIndex);
                 if (RefreshItemCountAct != null)
                 {
@@ -445,7 +447,7 @@
                         || modellist[i].itemId == 903
                         || modellist[i].itemId == 904)
                     {
-                        KnapsackTimeCDMgr.Instance.Register(modellist[i].itemInfo.ItemGUID, modellist[i].itemId, configCdTime);
+                        KnapsackTimeCDMgr.Instance.Register(modellist[i].guid, modellist[i].itemId, configCdTime);
                         break;
                     }
                 }
@@ -455,15 +457,15 @@
 
         public void SetItemGUIDDict(ItemModel itemModel)
         {
-            if (!itemGUIDDict.ContainsKey(itemModel.itemInfo.ItemGUID))
+            if (!itemGUIDDict.ContainsKey(itemModel.guid))
             {
-                itemGUIDDict.Add(itemModel.itemInfo.ItemGUID, itemModel);
+                itemGUIDDict.Add(itemModel.guid, itemModel);
                 GetItemEventCtrl(itemModel);
             }
             else
             {
-                PackType prePack = itemGUIDDict[itemModel.itemInfo.ItemGUID].packType;
-                itemGUIDDict[itemModel.itemInfo.ItemGUID] = itemModel;
+                PackType prePack = itemGUIDDict[itemModel.guid].packType;
+                itemGUIDDict[itemModel.guid] = itemModel;
                 if (prePack != itemModel.packType)
                 {
                     GetItemEventCtrl(itemModel);
@@ -781,7 +783,7 @@
                 bool isOverdue = false;
                 if (itemModel.config.ExpireTime > 0)
                 {
-                    ItemCDCool cool = KnapsackTimeCDMgr.Instance.GetItemCoolById(itemModel.itemInfo.ItemGUID);
+                    ItemCDCool cool = KnapsackTimeCDMgr.Instance.GetItemCoolById(itemModel.guid);
                     switch ((EquipReduceType)itemModel.config.EndureReduceType)
                     {
                         case EquipReduceType.Def_EquipReduceType_Time:
@@ -808,7 +810,7 @@
                 {
                     modelInterface.GetPreciousItem(itemModel);
                     modelInterface.OnGetEquip(itemModel);
-                    modelInterface.RefreshPickItem(itemModel.packType, itemModel.itemInfo.ItemGUID);
+                    modelInterface.RefreshPickItem(itemModel.packType, itemModel.guid);
                 }
             }
 
@@ -1334,7 +1336,7 @@
                     DebugEx.Log("Buff鏄惁瀛樺湪" + isExist);
                     if (itemUseAct != null && !isExist)
                     {
-                        itemUseAct(PackType.Item, itemModel.itemInfo.ItemGUID);
+                        itemUseAct(PackType.Item, itemModel.guid);
                     }
                 }
             }

--
Gitblit v1.8.0