From 94dbe7ffd266608ffcdf5bdfcabd0a393aa6881d Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期一, 20 八月 2018 14:24:08 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Dungeon/TrialExchangeBehaviour.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/System/Dungeon/TrialExchangeBehaviour.cs b/System/Dungeon/TrialExchangeBehaviour.cs
index 098e80f..a40aa2a 100644
--- a/System/Dungeon/TrialExchangeBehaviour.cs
+++ b/System/Dungeon/TrialExchangeBehaviour.cs
@@ -59,22 +59,22 @@
}
m_Item.cellBtn.RemoveAllListeners();
m_Item.gameObject.SetActive(true);
- ItemCellModel cellModel = new ItemCellModel(config.exchangeItemID, true, (ulong)config.exchangeItemCount, config.exchangeItemIsBind);
+ ItemCellModel cellModel = new ItemCellModel(model.GetExchangeItemByJob(config), true, (ulong)config.exchangeItemCount, config.exchangeItemIsBind);
m_Item.Init(cellModel);
m_Item.cellBtn.AddListener(() =>
{
- ItemAttrData itemAttrData = new ItemAttrData(config.exchangeItemID, true, (ulong)config.exchangeItemCount, -1, config.exchangeItemIsBind, true);
+ ItemAttrData itemAttrData = new ItemAttrData(model.GetExchangeItemByJob(config), true, (ulong)config.exchangeItemCount, -1, config.exchangeItemIsBind, true);
ModelCenter.Instance.GetModel<ItemTipsModel>().SetItemTipsModel(itemAttrData);
});
m_Description.text = config.description;
m_Token.SetItem(config.tokenId, config.tokenCount);
var count = model.GetTrialTokenCount(config.tokenId);
m_Token.count.color = UIHelper.GetUIColor(count >= config.tokenCount ? TextColType.Green : TextColType.NavyBrown, true);
- var equipCompare = model.EquipCompare(config.exchangeItemID);
+ var equipCompare = model.EquipCompare(model.GetExchangeItemByJob(config));
m_Up.gameObject.SetActive(equipCompare == 1);
m_Down.gameObject.SetActive(equipCompare == -1);
- var exchangeItemConfig = ConfigManager.Instance.GetTemplate<ItemConfig>(config.exchangeItemID);
+ var exchangeItemConfig = ConfigManager.Instance.GetTemplate<ItemConfig>(model.GetExchangeItemByJob(config));
m_Redpoint.gameObject.SetActive(count >= config.tokenCount && (equipBetter || exchangeItemConfig.EquipPlace == 0));
}
}
--
Gitblit v1.8.0