From 0bb7ef62509e01721117f7beaf63a937a68050b2 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期六, 18 八月 2018 14:34:41 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Dogz/DogzEquip.cs | 73 +++++++++---------------------------
1 files changed, 19 insertions(+), 54 deletions(-)
diff --git a/System/Dogz/DogzEquip.cs b/System/Dogz/DogzEquip.cs
index d4ae845..f35fcb0 100644
--- a/System/Dogz/DogzEquip.cs
+++ b/System/Dogz/DogzEquip.cs
@@ -9,68 +9,33 @@
{
public class DogzEquip : MonoBehaviour
{
- [SerializeField] Image m_EquipBG;
- [SerializeField] Image m_EquipIcon;
- [SerializeField] List<Image> m_EquipStars;
-
- [SerializeField] Button m_ViewDetial;
-
- DogzModel model { get { return ModelCenter.Instance.GetModel<DogzModel>(); } }
-
- public int ItemId { get; private set; }
- public DogzEquipData equipData { get; private set; }
-
- private void Awake()
+ [SerializeField] CommonItemBaisc itemBaisc;
+ [SerializeField] Text strengLvTxt;
+ ItemTipsModel tipsModel { get { return ModelCenter.Instance.GetModel<ItemTipsModel>(); } }
+ public void Display(ItemModel model)
{
- if (m_ViewDetial != null)
+ itemBaisc.Init(model);
+ int strenLv = 0;
+ if(model.GetUseDataModel((int)ItemUseDataKey.Def_IudetDogzEquipPlus) != null)
{
- m_ViewDetial.onClick.AddListener(ViewDetail);
+ strenLv = model.GetUseDataModel((int)ItemUseDataKey.Def_IudetDogzEquipPlus)[0];
}
- }
-
- public void Display(int _itemId)
- {
- this.ItemId = _itemId;
- var _itemCfg = ConfigManager.Instance.GetTemplate<ItemConfig>(_itemId);
- if (_itemCfg != null)
+ if (strenLv > 0)
{
- DisplayEquipBG(_itemCfg.ItemColor);
- DisplayIcon(_itemId);
- DisplayStar(_itemCfg.StarLevel);
+ strengLvTxt.gameObject.SetActive(true);
+ strengLvTxt.text = StringUtility.Contact("+", strenLv);
}
- }
-
- void DisplayEquipBG(int _itemColor)
- {
- if (m_EquipBG != null)
+ else
{
- m_EquipBG.SetItemBackGround(_itemColor);
+ strengLvTxt.gameObject.SetActive(false);
}
- }
-
- void DisplayIcon(int _itemId)
- {
- var config = ConfigManager.Instance.GetTemplate<ItemConfig>(_itemId);
- if (config != null && m_EquipIcon != null)
+ itemBaisc.cellBtn.RemoveAllListeners();
+ itemBaisc.cellBtn.AddListener(()=>
{
- m_EquipIcon.SetSprite(config.IconKey);
- }
- }
-
- void DisplayStar(int _star)
- {
- if (m_EquipStars != null)
- {
- for (int i = 0; i < m_EquipStars.Count; i++)
- {
- m_EquipStars[i].gameObject.SetActive(i < _star);
- }
- }
- }
-
- private void ViewDetail()
- {
- model.ViewDetail(ItemId);
+ ItemAttrData attrData = new ItemAttrData(model.itemId,false,(ulong)model.itemInfo.ItemCount,model.itemInfo.ItemPlace,
+ model.itemInfo.IsBind,false,PackType.rptDogzEquip,model.itemInfo.ItemGUID);
+ tipsModel.SetItemTipsModel(attrData);
+ });
}
}
}
--
Gitblit v1.8.0