From d5cfc06a1ad77780805b27c48f92ee66912c4f13 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期五, 17 八月 2018 16:25:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Dogz/DogzCell.cs | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/System/Dogz/DogzCell.cs b/System/Dogz/DogzCell.cs
index c202e92..d2bc0ce 100644
--- a/System/Dogz/DogzCell.cs
+++ b/System/Dogz/DogzCell.cs
@@ -27,17 +27,17 @@
var _dogzCfg = ConfigManager.Instance.GetTemplate<DogzConfig>(cell.index);
m_DogzIcon.SetSprite(_dogzCfg.HeadIcon);
m_DogzIcon.SetNativeSize();
- var _dogzEquips = model.GetDogzEquips(_dogzCfg.id);
+ var _dogzEquips = model.GetDogzEquips(_dogzCfg.ID);
m_DogzIcon.material = (_dogzEquips == null || _dogzEquips.Count < 5) ? MaterialUtility.GetDefaultSpriteGrayMaterial() :
MaterialUtility.GetUIDefaultGraphicMaterial();
- m_DogzName.text = _dogzCfg.name;
+ m_DogzName.text = _dogzCfg.Name;
//m_DogzGrade.text = StringUtility.Contact("璇勫垎锛�", 100);
- m_DogzBtn.image.color = model.presentSelectDogz == _dogzCfg.id ? Color.blue : Color.white;
- m_DogzAssist.gameObject.SetActive(model.dogzAssists.Contains(_dogzCfg.id));
+ m_DogzBtn.image.color = model.presentSelectDogz == _dogzCfg.ID ? Color.blue : Color.white;
+ m_DogzAssist.gameObject.SetActive(model.dogzAssists.Contains(_dogzCfg.ID));
m_DogzBtn.onClick.RemoveAllListeners();
m_DogzBtn.onClick.AddListener(() =>
{
- model.SetSelectDogz(_dogzCfg.id);
+ model.SetSelectDogz(_dogzCfg.ID);
});
}
}
--
Gitblit v1.8.0