Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_Hale

2018-09-10 b60111b92c567064fc71cd3379a64a404e4eb5c5

Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

 System/Dogz/SelectCell.cs

@@ -9,6 +9,8 @@
        [SerializeField] Text nameTex;

        [SerializeField] CommonItemBaisc itemBaisc;

        [SerializeField] Button selectBtn;

        [SerializeField] Text strenLvText;



        DogzModel dogzModel { get { return ModelCenter.Instance.GetModel<DogzModel>(); } }



        public override void Refresh(CellView cell)

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

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

            itemBaisc.Init(model);

            int strenLv = 0;

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

            {

                strenLv = model.GetUseDataModel((int)ItemUseDataKey.Def_IudetDogzEquipPlus)[0];

            }

            if (strenLv > 0)

            {

                strenLvText.gameObject.SetActive(true);

                strenLvText.text = StringUtility.Contact("+", strenLv);

            }

            else

            {

                strenLvText.gameObject.SetActive(false);

            }



            selectBtn.RemoveAllListeners();

            selectBtn.AddListener(()=>

            {


 System/KnapSack/Logic/ItemTipsModel.cs

@@ -1841,6 +1841,14 @@
                SetExtraInfos(extraInfos.ToArray());

            }



            if(type == PackType.rptDogzEquip || type == PackType.rptDogzItem)

            {

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

                {

                    StrengthLV = GetUseDataModel((int)ItemUseDataKey.Def_IudetDogzEquipPlus)[0];

                }

            }



            SetWinType();

        }