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/PackModelInterface.cs | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/System/KnapSack/Logic/PackModelInterface.cs b/System/KnapSack/Logic/PackModelInterface.cs
index 8499e74..f0bedaf 100644
--- a/System/KnapSack/Logic/PackModelInterface.cs
+++ b/System/KnapSack/Logic/PackModelInterface.cs
@@ -545,7 +545,7 @@
if (itemModel.config.UseLV > PlayerDatas.Instance.baseData.LV) return;
- bool isOverdue = IsOverdue(itemModel.itemInfo.ItemGUID, itemModel.itemId, itemModel.useDataDict);
+ bool isOverdue = IsOverdue(itemModel.guid, itemModel.itemId, itemModel.useDataDict);
if (isOverdue)
{
return;
@@ -560,7 +560,7 @@
{
if (GetPreciousItemEvent != null)
{
- GetPreciousItemEvent(itemModel.packType, itemModel.itemInfo.ItemGUID);
+ GetPreciousItemEvent(itemModel.packType, itemModel.guid);
}
}
}
@@ -609,7 +609,7 @@
}
ulong canUseCnt = 0;
- if (playerPack.IsReachUseLimit(itemModel.itemInfo.ItemGUID, out canUseCnt))
+ if (playerPack.IsReachUseLimit(itemModel.guid, out canUseCnt))
{
isReach = false;
return isReach;
@@ -898,7 +898,7 @@
{
if (itemEffectTime[0] != 0)
{
- ItemCDCool cool = KnapsackTimeCDMgr.Instance.GetItemCoolById(model.itemInfo.ItemGUID);
+ ItemCDCool cool = KnapsackTimeCDMgr.Instance.GetItemCoolById(model.guid);
double remainTime = 0;
if (cool != null)
{
@@ -926,7 +926,7 @@
var equipItemModel = playerPack.GetItemModelByIndex(PackType.Equip, model.config.EquipPlace);
if (PlayerDatas.Instance.baseData.LV >= 200)
{
- if (model.EquipPlace > (int)RoleEquipType.Weapon2 && model.EquipPlace < (int)RoleEquipType.Neck)
+ if (model.equipPlace > (int)RoleEquipType.Weapon2 && model.equipPlace < (int)RoleEquipType.Neck)
{
if (equipItemModel != null && equipItemModel.config.ItemColor > model.config.ItemColor)
{
@@ -939,7 +939,7 @@
}
if (RefreshGetBetterEquipEvent != null)
{
- RefreshGetBetterEquipEvent(model.itemInfo.ItemGUID);
+ RefreshGetBetterEquipEvent(model.guid);
}
}
}
@@ -988,18 +988,18 @@
if (model.config.EquipPlace > 0
&& model.config.EquipPlace != (int)RoleEquipType.SpiritAnimal
&& model.config.RealmLimit <= realmLv
- && !IsOverdue(model.itemInfo.ItemGUID, model.itemId, model.useDataDict)
+ && !IsOverdue(model.guid, model.itemId, model.useDataDict)
&& IsFightUp(model.itemId, model.equipScore) == 1)
{
- if (!RealmBetterDict.ContainsKey(model.EquipPlace))
+ if (!RealmBetterDict.ContainsKey(model.equipPlace))
{
- RealmBetterDict.Add(model.EquipPlace, model);
+ RealmBetterDict.Add(model.equipPlace, model);
}
else
{
- if (model.equipScore > RealmBetterDict[model.EquipPlace].equipScore)
+ if (model.equipScore > RealmBetterDict[model.equipPlace].equipScore)
{
- RealmBetterDict[model.EquipPlace] = model;
+ RealmBetterDict[model.equipPlace] = model;
}
}
}
@@ -1423,7 +1423,7 @@
int i = 0;
for (i = 0; i < itemlist.Count; i++)
{
- bool isOverdue = IsOverdue(itemlist[i].itemInfo.ItemGUID, itemlist[i].itemId, itemlist[i].useDataDict);
+ bool isOverdue = IsOverdue(itemlist[i].guid, itemlist[i].itemId, itemlist[i].useDataDict);
bool isRealm = PlayerDatas.Instance.baseData.realmLevel >= itemlist[i].config.RealmLimit ? true : false;
if (itemlist[i].equipScore > putOnDic[key].equipScore && !isOverdue && isRealm)
{
@@ -1490,10 +1490,10 @@
{
if (item.config.EquipPlace == equipPlace)
{
- if (!IsOverdue(item.itemInfo.ItemGUID, item.itemId, item.useDataDict)
+ if (!IsOverdue(item.guid, item.itemId, item.useDataDict)
&& (item.config.JobLimit == 0 || (item.config.JobLimit / 100) == job) && item.equipScore > score)
{
- guid = item.itemInfo.ItemGUID;
+ guid = item.guid;
score = item.equipScore;
}
}
--
Gitblit v1.8.0