From 21a1542f9d99466b2aedd0992a1032b37b4154a3 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期一, 20 八月 2018 20:21:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into Skill_Polymorph_BeatBackPlayer
---
System/KnapSack/Logic/EquipTip.cs | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/System/KnapSack/Logic/EquipTip.cs b/System/KnapSack/Logic/EquipTip.cs
index 7338b03..08866c9 100644
--- a/System/KnapSack/Logic/EquipTip.cs
+++ b/System/KnapSack/Logic/EquipTip.cs
@@ -179,7 +179,8 @@
yield return null;
if(itemAttrData.isCompare)
{
- if (itemAttrData.packType != PackType.rptEquip)
+ if (itemAttrData.packType != PackType.rptEquip
+ && itemAttrData.packType != PackType.rptDogzEquip)
{
itemTipsModel.SetCurTips(this.GetComponent<RectTransform>());
}
@@ -205,7 +206,8 @@
ItemCellModel cellModel = new ItemCellModel(itemAttrData.itemId,itemAttrData.isPreview, (ulong)itemAttrData.count, itemAttrData.isBind,
itemAttrData.guid,itemAttrData.packType,itemAttrData.isCompare, itemAttrData.useDataDict);
itemCell.Init(cellModel);
- if(itemAttrData.packType == PackType.rptEquip)
+ if(itemAttrData.packType == PackType.rptEquip
+ || itemAttrData.packType == PackType.rptDogzEquip)
{
putOnIcon.SetActive(true);
}
@@ -262,7 +264,8 @@
if (itemAttrData.isCompare)
{
- if(itemAttrData.packType != PackType.rptEquip)
+ if(itemAttrData.packType != PackType.rptEquip
+ && itemAttrData.packType != PackType.rptDogzEquip)
{
CreateFuncBtn();
}
--
Gitblit v1.8.0