From 56091a5a2b3df0681996731982f812003daf85e9 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期四, 20 九月 2018 15:52:47 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Dogz/DogzCell.cs | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/System/Dogz/DogzCell.cs b/System/Dogz/DogzCell.cs
index 4a37cfe..734b370 100644
--- a/System/Dogz/DogzCell.cs
+++ b/System/Dogz/DogzCell.cs
@@ -9,6 +9,7 @@
public class DogzCell : ScrollerUI
{
[SerializeField] Image m_DogzIcon;
+ [SerializeField] RectTransform m_DogzIconRect;
[SerializeField] Image m_DogzAssist;
[SerializeField] Text m_DogzName;
[SerializeField] Text m_DogzGrade;
@@ -22,11 +23,13 @@
return m_Model ?? (m_Model = ModelCenter.Instance.GetModel<DogzModel>());
}
}
+
public override void Refresh(CellView cell)
{
var _dogzCfg = Config.Instance.Get<DogzConfig>(cell.index);
m_DogzIcon.SetSprite(_dogzCfg.HeadIcon);
m_DogzIcon.SetNativeSize();
+ m_DogzIconRect.sizeDelta = new Vector2(m_DogzIconRect.sizeDelta.x/2,m_DogzIconRect.sizeDelta.y/2);
var _dogzEquips = model.GetDogzEquips(_dogzCfg.ID);
bool isActive = (_dogzEquips == null || _dogzEquips.Count < 5) ? false : true;
m_DogzName.text = _dogzCfg.Name;
@@ -34,16 +37,16 @@
if (isActive)
{
m_DogzIcon.material = MaterialUtility.GetUIDefaultGraphicMaterial();
- m_DogzName.material = MaterialUtility.GetUIDefaultGraphicMaterial();
- m_DogzGrade.material = MaterialUtility.GetUIDefaultGraphicMaterial();
+ m_DogzName.color = UIHelper.s_NavyBrown;
+ m_DogzGrade.color = UIHelper.s_BrightOrangeColor;
}
else
{
m_DogzIcon.material = MaterialUtility.GetDefaultSpriteGrayMaterial();
- m_DogzName.material = MaterialUtility.GetDefaultSpriteGrayMaterial();
- m_DogzGrade.material = MaterialUtility.GetDefaultSpriteGrayMaterial();
+ m_DogzName.color = UIHelper.s_BrightWhiteColor;
+ m_DogzGrade.color = UIHelper.s_BrightWhiteColor;
}
- m_DogzBtn.image.color = model.presentSelectDogz == _dogzCfg.ID ? Color.blue : Color.white;
+ m_DogzBtn.image.SetSprite(model.presentSelectDogz == _dogzCfg.ID ? "Title_RightWindow" : "Title_PopupWindow");
m_DogzAssist.gameObject.SetActive(model.TryGetAssistDogzState(_dogzCfg.ID));
m_DogzBtn.onClick.RemoveAllListeners();
m_DogzBtn.onClick.AddListener(() =>
--
Gitblit v1.8.0