Merge branch 'master' into 1871天赋功能

client_linchunjie

2018-09-25 78bfe524ea4776c47f6314e56e97f39970b00fce

 System/KnapSack/Logic/ItemTipsModel.cs

@@ -742,11 +742,15 @@
               dogzModel.CheckPutOff(dogzModel.GetDogzEquipPlaceByIndex(attrData.index));

            });



            if(dogzModel.TryGetAssistDogzState(dogzModel.presentSelectDogz))

            {

            attrData.SetTipsFuncBtn(ItemWinBtnType.strength, (ItemWinBtnType, ItemAttrData) => {

                dogzModel.OpenDogzFuncEvent(1);

                    dogzModel.OpenDogzFuncEvent(1, attrData.index);

            });

        }



        }



        /// <summary>

        /// 设置仓库弹框按钮

        /// </summary>