From fc5d4318db0dbe68eb5e8d3e7bb7dacbf05bc3a7 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期二, 06 十一月 2018 17:26:29 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Dogz/DogzCell.cs | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/System/Dogz/DogzCell.cs b/System/Dogz/DogzCell.cs
index b408f12..0411bf5 100644
--- a/System/Dogz/DogzCell.cs
+++ b/System/Dogz/DogzCell.cs
@@ -15,7 +15,8 @@
[SerializeField] Text m_DogzGrade;
[SerializeField] Button m_DogzBtn;
[SerializeField] RedpointBehaviour redpointBehav;
-
+ [SerializeField] GameObject containDivideObj;
+ [SerializeField] List<Image> divideDogzIcons = new List<Image>();
DogzModel m_Model;
DogzModel model
{
@@ -38,15 +39,27 @@
redpointBehav.redpointId = model.GetSingleDogzRedpointById(_dogzCfg.ID).id;
if (isActive)
{
+ containDivideObj.SetActive(false);
m_DogzIcon.material = MaterialUtility.GetUIDefaultGraphicMaterial();
m_DogzName.color = UIHelper.s_NavyBrown;
m_DogzGrade.color = UIHelper.s_BrightOrangeColor;
}
else
{
+ containDivideObj.SetActive(true);
m_DogzIcon.material = MaterialUtility.GetDefaultSpriteGrayMaterial();
m_DogzName.color = UIHelper.s_BrightWhiteColor;
m_DogzGrade.color = UIHelper.s_BrightWhiteColor;
+ for(int i = 0; i < 5; i++)
+ {
+ var divideImg = divideDogzIcons[i];
+ divideImg.SetSprite(_dogzCfg.HeadIcon);
+ divideImg.SetNativeSize();
+ divideImg.rectTransform.sizeDelta = new Vector2(divideImg.rectTransform.sizeDelta.x / 2, divideImg.rectTransform.sizeDelta.y / 2);
+ ItemModel _equipData = null;
+ bool isEquip = model.TryGetDogzEquip(cell.index,i+101,out _equipData);
+ divideImg.gameObject.SetActive(isEquip);
+ }
}
m_DogzBtn.image.SetSprite(model.presentSelectDogz == _dogzCfg.ID ? "Title_RightWindow" : "Title_PopupWindow");
m_DogzAssist.gameObject.SetActive(model.TryGetAssistDogzState(_dogzCfg.ID));
--
Gitblit v1.8.0