From e4d0b73c642c19c400bedd496b9c8bce42983d54 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期三, 15 八月 2018 15:50:28 +0800
Subject: [PATCH] 2562【前端】宗门试练兑换界面优化
---
System/Dungeon/TrialExchangeBehaviour.cs | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/System/Dungeon/TrialExchangeBehaviour.cs b/System/Dungeon/TrialExchangeBehaviour.cs
index f374abb..64bdc8a 100644
--- a/System/Dungeon/TrialExchangeBehaviour.cs
+++ b/System/Dungeon/TrialExchangeBehaviour.cs
@@ -14,8 +14,12 @@
[SerializeField] ItemBehaviour m_Token;
[SerializeField] Button m_Exchange;
[SerializeField] Image m_Redpoint;
+ [SerializeField] Image m_Up;
+ [SerializeField] Image m_Down;
TrialDungeonModel model { get { return ModelCenter.Instance.GetModel<TrialDungeonModel>(); } }
DailyQuestModel dailyQuestModel { get { return ModelCenter.Instance.GetModel<DailyQuestModel>(); } }
+
+ PlayerPackModel packModel { get { return ModelCenter.Instance.GetModel<PlayerPackModel>(); } }
int trialExchangeId = 0;
private void Awake()
@@ -38,12 +42,11 @@
ModelCenter.Instance.GetModel<GetItemPathModel>().SetChinItemModel(config.tokenId);
}
}
- model.ProcessTrialError(error);
}
}
}
- public void Display(int id)
+ public void Display(int id, bool equipBetter = true)
{
trialExchangeId = id;
var config = ConfigManager.Instance.GetTemplate<TrialExchangeConfig>(id);
@@ -58,16 +61,19 @@
m_Item.Init(cellModel);
m_Item.cellBtn.AddListener(() =>
{
- ItemAttrData itemAttrData = new ItemAttrData(config.exchangeItemID, true, (ulong)config.exchangeItemCount, -1, config.exchangeItemIsBind);
+ ItemAttrData itemAttrData = new ItemAttrData(config.exchangeItemID, 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.Red, true);
+ m_Token.count.color = UIHelper.GetUIColor(count >= config.tokenCount ? TextColType.Green : TextColType.NavyBrown, true);
+ var equipCompare = model.EquipCompare(config.exchangeItemID);
+ m_Up.gameObject.SetActive(equipCompare == 1);
+ m_Down.gameObject.SetActive(equipCompare == -1);
- m_Redpoint.gameObject.SetActive(count >= config.tokenCount
- && dailyQuestModel.trialExchangeRedpoint.state == RedPointState.Simple);
+ var exchangeItemConfig = ConfigManager.Instance.GetTemplate<ItemConfig>(config.exchangeItemID);
+ m_Redpoint.gameObject.SetActive(count >= config.tokenCount && (equipBetter || exchangeItemConfig.EquipPlace == 0));
}
}
}
--
Gitblit v1.8.0