From 78bfe524ea4776c47f6314e56e97f39970b00fce Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期二, 25 九月 2018 15:07:07 +0800
Subject: [PATCH] Merge branch 'master' into 1871天赋功能

---
 System/Dogz/DogzCell.cs |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/System/Dogz/DogzCell.cs b/System/Dogz/DogzCell.cs
index 734b370..ec1bf90 100644
--- a/System/Dogz/DogzCell.cs
+++ b/System/Dogz/DogzCell.cs
@@ -14,6 +14,7 @@
         [SerializeField] Text m_DogzName;
         [SerializeField] Text m_DogzGrade;
         [SerializeField] Button m_DogzBtn;
+        [SerializeField] RedpointBehaviour redpointBehav;
 
         DogzModel m_Model;
         DogzModel model
@@ -34,6 +35,7 @@
             bool isActive = (_dogzEquips == null || _dogzEquips.Count < 5) ? false : true;
             m_DogzName.text = _dogzCfg.Name;
             m_DogzGrade.text = StringUtility.Contact("璇勫垎锛�", 100);
+            redpointBehav.redpointId = model.GetSingleDogzRedpointById(_dogzCfg.ID).id;
             if (isActive)
             {
                 m_DogzIcon.material = MaterialUtility.GetUIDefaultGraphicMaterial();

--
Gitblit v1.8.0