From ef46f0ead893591f9b4dbf9ad114da5b565f6362 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期二, 12 三月 2019 15:56:28 +0800
Subject: [PATCH] 3335 去掉部分绑定逻辑
---
System/MainInterfacePanel/FeaturesType3.cs | 42 +++++++++++++++---------------------------
1 files changed, 15 insertions(+), 27 deletions(-)
diff --git a/System/MainInterfacePanel/FeaturesType3.cs b/System/MainInterfacePanel/FeaturesType3.cs
index da5a538..48fc6ce 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,29 +151,23 @@
}
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);
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)
- {
- m_Lock1.gameObject.SetActive(true);
- }
- else
- {
- m_Lock1.gameObject.SetActive(false);
- }
+
+ m_Lock1.gameObject.SetActive(false);
if (FuncOpen.Instance.IsFuncOpen(funcID))
{
m_ItemBG1.gray = false;
@@ -204,9 +198,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,28 +213,22 @@
}
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);
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)
- {
- m_Lock2.gameObject.SetActive(true);
- }
- else
- {
- m_Lock2.gameObject.SetActive(false);
- }
+
+ m_Lock2.gameObject.SetActive(false);
if (FuncOpen.Instance.IsFuncOpen(funcID))
{
m_ItemBG2.gray = false;
--
Gitblit v1.8.0