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/Compose/New/GuardComposeConfirmWin.cs | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/System/Compose/New/GuardComposeConfirmWin.cs b/System/Compose/New/GuardComposeConfirmWin.cs
index 9b5a03f..c5cc8df 100644
--- a/System/Compose/New/GuardComposeConfirmWin.cs
+++ b/System/Compose/New/GuardComposeConfirmWin.cs
@@ -9,9 +9,9 @@
{
public class GuardComposeConfirmWin : Window
{
- [SerializeField] Button popConfirmBtn;
- [SerializeField] RichText popConfirmInfo;
- [SerializeField] Text popConfirmTitle;
+ [SerializeField] Button popConfirmBtn;
+ [SerializeField] RichText popConfirmInfo;
+ [SerializeField] Text popConfirmTitle;
[SerializeField] Button closeBtn;
SelectEquipModel _selectModel;
@@ -66,7 +66,7 @@
itemModel = modellist.Count > 0 ? modellist[0] : null;
if(itemModel != null)
{
- UpdateRemainTime(itemModel.itemInfo.ItemGUID);
+ UpdateRemainTime(itemModel.guid);
}
}
@@ -75,7 +75,7 @@
if (composeWinModel.CurComposeModel == null
|| itemModel == null) return;
- if (itemModel.itemInfo.ItemGUID == guid)
+ if (itemModel.guid == guid)
{
int remainTime = 0;
bool isRemain = TryGetRemainTime(itemModel, out remainTime);
@@ -120,13 +120,13 @@
if (model.config.EquipPlace != (int)RoleEquipType.SpiritAnimal
|| model.config.ExpireTime <= 0) return false;
- ItemCDCool cool = KnapsackTimeCDMgr.Instance.GetItemCoolById(model.itemInfo.ItemGUID);
+ ItemCDCool cool = KnapsackTimeCDMgr.Instance.GetItemCoolById(model.guid);
bool isShow = model.config.ExpireTime > 0;
if (isShow)
{
List<int> itemEffectTime = model.GetUseDataModel((int)ItemUseDataKey.createTime);
seconds = model.config.ExpireTime;
- if (itemEffectTime != null && itemEffectTime[0] != 0 && model.itemInfo.ItemGUID != "")
+ if (itemEffectTime != null && itemEffectTime[0] != 0 && model.guid != "")
{
seconds = cool == null ? 0 : (int)cool.GetRemainTime();
}
--
Gitblit v1.8.0