From 91d5703be20d6cdc24f18b720d9df8472bab51d9 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期三, 13 三月 2019 11:22:33 +0800
Subject: [PATCH] Merge branch 'master' into ItemTip
---
System/MainInterfacePanel/FeaturesType3.cs | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/System/MainInterfacePanel/FeaturesType3.cs b/System/MainInterfacePanel/FeaturesType3.cs
index da5a538..5826a53 100644
--- a/System/MainInterfacePanel/FeaturesType3.cs
+++ b/System/MainInterfacePanel/FeaturesType3.cs
@@ -118,7 +118,7 @@
private void SetRankAwardItem(int funcID)
{
ImpactRankModel.RankAwardItem rankAward = featureNoticeModel.DicAwardItem[funcID];
- List<AwardItem> List = rankAward.GetAwardItem(PlayerDatas.Instance.baseData.Job);
+ List<Item> List = rankAward.GetAwardItem(PlayerDatas.Instance.baseData.Job);
if (List.Count <= 1)
{
@@ -136,9 +136,9 @@
}
}
- private void SetItem1(List<AwardItem> List,int funcID)
+ private void SetItem1(List<Item> List,int funcID)
{
- var itemConfig = ItemConfig.Get(List[0].item.id);
+ var itemConfig = ItemConfig.Get(List[0].id);
UIHelper.SetItemBackGround(m_ItemBG1, itemConfig.ItemColor);
m_Icon1.SetSprite(itemConfig.IconKey);
m_IconBtn1.SetListener(() =>
@@ -151,22 +151,22 @@
}
else
{
- ItemAttrData attrData = new ItemAttrData(List[0].item.id, false, (ulong)List[0].item.count, -1, List[0].isBind);
+ ItemAttrData attrData = new ItemAttrData(List[0].id, false, (ulong)List[0].count, -1, List[0].bind ? 1 : 0);
itemTipsModel.SetItemTipsModel(attrData);
// DebugEx.LogError("寮规");
}
});
- if (List[0].item.count > 1)
+ if (List[0].count > 1)
{
m_Number1.gameObject.SetActive(true);
- m_Number1.text = List[0].item.count.ToString();
+ m_Number1.text = List[0].count.ToString();
}
else
{
m_Number1.gameObject.SetActive(false);
}
- if (List[0].isBind==1)
+ if (List[0].bind)
{
m_Lock1.gameObject.SetActive(true);
}
@@ -204,9 +204,9 @@
m_HasReceived1.SetActive(false);
}
}
- private void SetItem2(List<AwardItem> List, int funcID)
+ private void SetItem2(List<Item> List, int funcID)
{
- var itemConfig = ItemConfig.Get(List[1].item.id);
+ var itemConfig = ItemConfig.Get(List[1].id);
UIHelper.SetItemBackGround(m_ItemBG2, itemConfig.ItemColor);
m_Icon2.SetSprite(itemConfig.IconKey);
m_IconBtn2.SetListener(() =>
@@ -219,21 +219,21 @@
}
else
{
- ItemAttrData attrData = new ItemAttrData(List[1].item.id, false, (ulong)List[1].item.count, -1, List[1].isBind);
+ ItemAttrData attrData = new ItemAttrData(List[1].id, false, (ulong)List[1].count, -1, List[1].bind ? 1 : 0);
itemTipsModel.SetItemTipsModel(attrData);
//DebugEx.LogError("寮规");
}
});
- if (List[1].item.count > 1)
+ if (List[1].count > 1)
{
m_Number2.gameObject.SetActive(true);
- m_Number2.text = List[1].item.count.ToString();
+ m_Number2.text = List[1].count.ToString();
}
else
{
m_Number2.gameObject.SetActive(false);
}
- if (List[1].isBind==1)
+ if (List[1].bind)
{
m_Lock2.gameObject.SetActive(true);
}
--
Gitblit v1.8.0