Merge branch 'master' into 3687天赋功能

client_linchunjie

2018-09-26 9ee6fe853c33f10db9cd17312618d454609dc024

 System/Dogz/SelectCell.cs

@@ -1,4 +1,5 @@
using EnhancedUI.EnhancedScroller;

using System.Collections.Generic;

using UnityEngine;

using UnityEngine.UI;



@@ -21,6 +22,7 @@
            nameTex.text = model.chinItemModel.ItemName;

            nameTex.color = UIHelper.GetUIColor(model.chinItemModel.ItemColor,true);

            itemBaisc.Init(model);

            itemBaisc.bindIcon.gameObject.SetActive(false);

            int strenLv = 0;

            if (model.GetUseDataModel((int)ItemUseDataKey.Def_IudetDogzEquipPlus) != null)

            {

@@ -39,7 +41,9 @@
            selectBtn.RemoveAllListeners();

            selectBtn.AddListener(()=>

            {

                dogzModel.SendPutOnEquip(model.itemInfo.ItemPlace);

                List<int> indexlist = new List<int>();

                indexlist.Add(model.itemInfo.ItemPlace);

                dogzModel.SendPutOnEquip(indexlist);

                WindowCenter.Instance.CloseImmediately<SelectDogzItemWin>();

            });

        }