Merge branch 'Auction'

client_Zxw

2019-03-08 0febba92fa91a03fd98698fde01879a42fefb370

Merge branch 'Auction'

Conflicts:
	System/KnapSack/Logic/ItemTipsModel.cs

 System/KnapSack/Logic/ItemTipsModel.cs

@@ -775,8 +775,11 @@
        /// <param name="attrData"></param>

        public void SetBagTipsBtn(ItemAttrData attrData)

        {

            if (attrData == null) return;



            //if (attrData == null) return;

            //var auctionHelpModel = ModelCenter.Instance.GetModel<AuctionHelpModel>();

            //auctionHelpModel.AttrData = attrData;

            //WindowCenter.Instance.Open<AuctionShelfWin>();

            //return;

            var horseModel = ModelCenter.Instance.GetModel<MountModel>();

            var petmodel = ModelCenter.Instance.GetModel<PetModel>();

            bool isOverdue = ItemLogicUtility.Instance.IsOverdue(attrData.guid, attrData.itemId, attrData.useDataDict);