From e005994d32105faa2cccdedfa2de4eaa8223fe0a Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期二, 26 三月 2019 11:38:55 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Equip/CandidateEquipBehaviour.cs | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/System/Equip/CandidateEquipBehaviour.cs b/System/Equip/CandidateEquipBehaviour.cs
index bb6f569..e59f812 100644
--- a/System/Equip/CandidateEquipBehaviour.cs
+++ b/System/Equip/CandidateEquipBehaviour.cs
@@ -17,6 +17,7 @@
[SerializeField] Text m_EquipName;
[SerializeField] Text m_EquipSorce;
[SerializeField] Button m_Select;
+ [SerializeField] RectTransform m_SelectedContainer;
EquipModel model { get { return ModelCenter.Instance.GetModel<EquipModel>(); } }
PackModel packModel { get { return ModelCenter.Instance.GetModel<PackModel>(); } }
@@ -51,7 +52,7 @@
m_ItemCell.button.enabled = false;
var isEquipLevelUnlocked = model.IsLevelUnLocked(equip.config.LV);
- m_BackGround.gray=!isEquipLevelUnlocked;
+ m_BackGround.gray = !isEquipLevelUnlocked;
m_UnLockLabel.gameObject.SetActive(!isEquipLevelUnlocked);
m_EquipName.text = equip.config.ItemName;
m_EquipName.color = UIHelper.GetUIColor(equip.config.ItemColor, true);
@@ -65,6 +66,7 @@
{
if (force || candidateEquip.selected.dirty)
{
+ m_SelectedContainer.gameObject.SetActive(candidateEquip.selected.Fetch());
}
}
@@ -74,6 +76,11 @@
tipModel.SetItemTipsModel(PackType.Item, equip.guid, false, true);
tipModel.SetBagTipsBtn(tipModel.curAttrData);
tipModel.ShowUICtrl();
+
+ if (this.candidateEquip.selected.value)
+ {
+ model.ClearRecommendCandidateEquip();
+ }
}
}
--
Gitblit v1.8.0