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/OpenServerActivity/InSevenDayBehavior.cs | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/System/OpenServerActivity/InSevenDayBehavior.cs b/System/OpenServerActivity/InSevenDayBehavior.cs
index a76e63a..be828bc 100644
--- a/System/OpenServerActivity/InSevenDayBehavior.cs
+++ b/System/OpenServerActivity/InSevenDayBehavior.cs
@@ -57,16 +57,16 @@
}
ImpactRankModel.RankAwardItem RankAwardItem = inSevenDayModel.InSevenDayDic[inDay].RankAwardItem;
int Job = PlayerDatas.Instance.baseData.Job;
- List<AwardItem> list = RankAwardItem.GetAwardItem(Job);
+ List<Item> list = RankAwardItem.GetAwardItem(Job);
if (list.Count > 0)
{
- AwardItem item = list[0];
- ItemCellModel cellModel = new ItemCellModel(item.item.id, true, (ulong)item.item.count, item.isBind);
+ Item item = list[0];
+ ItemCellModel cellModel = new ItemCellModel(item.id, true, (ulong)item.count, item.bind ? 1 : 0);
m_ItemCell.Init(cellModel);
m_ItemCell.cellBtn.RemoveAllListeners();
- m_ItemCell.cellBtn.AddListener(()=>
+ m_ItemCell.cellBtn.AddListener(() =>
{
- ItemAttrData attrData = new ItemAttrData(item.item.id, false, (ulong)item.item.count, -1, item.isBind);
+ ItemAttrData attrData = new ItemAttrData(item.id, false, (ulong)item.count, -1, item.bind ? 1 : 0);
itemTipsModel.SetItemTipsModel(attrData);
});
}
--
Gitblit v1.8.0