From f11a7aae6f821913aa4bc415961db4cb18f3e3b6 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期一, 20 八月 2018 21:27:32 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Dogz/DogzCell.cs | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/System/Dogz/DogzCell.cs b/System/Dogz/DogzCell.cs
index 4bd7933..2b300ec 100644
--- a/System/Dogz/DogzCell.cs
+++ b/System/Dogz/DogzCell.cs
@@ -28,10 +28,21 @@
m_DogzIcon.SetSprite(_dogzCfg.HeadIcon);
m_DogzIcon.SetNativeSize();
var _dogzEquips = model.GetDogzEquips(_dogzCfg.ID);
- m_DogzIcon.material = (_dogzEquips == null || _dogzEquips.Count < 5) ? MaterialUtility.GetDefaultSpriteGrayMaterial() :
- MaterialUtility.GetUIDefaultGraphicMaterial();
+ bool isActive = (_dogzEquips == null || _dogzEquips.Count < 5) ? false : true;
m_DogzName.text = _dogzCfg.Name;
- //m_DogzGrade.text = StringUtility.Contact("璇勫垎锛�", 100);
+ m_DogzGrade.text = StringUtility.Contact("璇勫垎锛�", 100);
+ if (isActive)
+ {
+ m_DogzIcon.material = MaterialUtility.GetUIDefaultGraphicMaterial();
+ m_DogzName.material = MaterialUtility.GetUIDefaultGraphicMaterial();
+ m_DogzGrade.material = MaterialUtility.GetUIDefaultGraphicMaterial();
+ }
+ else
+ {
+ m_DogzIcon.material = MaterialUtility.GetDefaultSpriteGrayMaterial();
+ m_DogzName.material = MaterialUtility.GetDefaultSpriteGrayMaterial();
+ m_DogzGrade.material = MaterialUtility.GetDefaultSpriteGrayMaterial();
+ }
m_DogzBtn.image.color = model.presentSelectDogz == _dogzCfg.ID ? Color.blue : Color.white;
m_DogzAssist.gameObject.SetActive(model.TryGetAssistDogzState(_dogzCfg.ID));
m_DogzBtn.onClick.RemoveAllListeners();
--
Gitblit v1.8.0