3335 拍卖行修改

client_linchunjie

2019-04-01 9eccde6c9bbaba797001b582da744ed2a1e1d9a3

3335 拍卖行修改

 System/Auction/AuctionHelpModel.cs

@@ -174,25 +174,6 @@
            }

            return 1;

        }



        public int GetEquipScore(int equipLevel, int equipPlace)//获取部位的装备评分

        {

            int score = -1;

            string equipGuid = string.Empty;

            var equipSet = equipModel.GetEquipSet(equipLevel);

            if (equipSet == null)

            {

                return -1;

            }

            equipGuid = equipSet.GetEquip(equipPlace);

            var equiped = !string.IsNullOrEmpty(equipGuid);

            if (equiped)

            {

                var item = packModel.GetItemByGuid(equipGuid);

                score = item.score;

            }

            return score;

        }

    }
}


 System/Auction/AuctionLogicUtil.cs

@@ -9,6 +9,7 @@
        static int extraAuctionSecond = 0;



        static EquipModel equipModel { get { return ModelCenter.Instance.GetModel<EquipModel>(); } }

        static PackModel packModel { get { return ModelCenter.Instance.GetModel<PackModel>(); } }



        static public void Initialize()

        {

@@ -152,40 +153,31 @@
                return false;

            }



            var isMyJobItem = itemConfig.JobLimit == PlayerDatas.Instance.baseData.Job;



            var equiped = !equipModel.GetEquip(new Int2(itemConfig.LV, itemConfig.EquipPlace)).Equals(string.Empty);

            var equipSet = equipModel.GetEquipSet(itemConfig.LV);

            var equipPositionUnlock = equipSet.IsSlotUnLocked(itemConfig.EquipPlace);



            return isMyJobItem && equipPositionUnlock && !equiped;

        }



        static public void SendBiddingItem(AuctionItem item, bool immediatly)

        {

            if (item == null)

            if (itemConfig.JobLimit != 0 && itemConfig.JobLimit != PlayerDatas.Instance.baseData.Job)

            {

                return;

                return false;

            }

            var config = AuctionItemConfig.Get(item.itemId);

            var cost = immediatly ? config.BuyoutPrice * item.itemCount : GetBiddingRequireMoney(item);

            var label = Language.Get(immediatly ? "PMH_02" : "PMH_01", cost);

            ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"), label, (bool isOk) =>



            var equipSet = equipModel.GetEquipSet(itemConfig.LV);

            if (!equipSet.IsSlotUnLocked(itemConfig.EquipPlace))

            {

                if (isOk)

                {

                    var money = PlayerDatas.Instance.baseData.diamond;

                    if (money >= cost)

                    {

                        AuctionInquiry.Instance.SendSellAuctionItem(item.itemGuid, cost);

                    }

                    else

                    {

                        WindowCenter.Instance.Open<RechargeTipWin>();

                    }

                }

            });

        } 
                return false;

            }



            var equipGuid = equipModel.GetEquip(new Int2(itemConfig.LV, itemConfig.EquipPlace));

            if (string.IsNullOrEmpty(equipGuid))

            {

                return true;

            }



            var itemModel = packModel.GetItemByGuid(equipGuid);

            if (itemModel == null)

            {

                return true;

            }



            return itemModel.config.SuiteiD == 0 && itemConfig.SuiteiD != 0;

        }

    }

}


 System/Auction/AuctionModel.cs

@@ -695,6 +695,32 @@
            }

        }



        public void SendBiddingItem(AuctionItem item, bool immediatly)

        {

            if (item == null)

            {

                return;

            }

            var config = AuctionItemConfig.Get(item.itemId);

            var cost = immediatly ? config.BuyoutPrice * item.itemCount : AuctionLogicUtil.GetBiddingRequireMoney(item);

            var label = Language.Get(immediatly ? "PMH_02" : "PMH_01", cost);

            ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"), label, (bool isOk) =>

            {

                if (isOk)

                {

                    var money = PlayerDatas.Instance.baseData.diamond;

                    if (money >= cost)

                    {

                        AuctionInquiry.Instance.SendSellAuctionItem(item.itemGuid, cost);

                    }

                    else

                    {

                        WindowCenter.Instance.Open<RechargeTipWin>();

                    }

                }

            });

        }



        #region 定位查询

        public void SendInquiryServerAcution(int inquiryIndex, string guid, int inquiryDir, int inquiryCount = 10)

        {


 System/Auction/FamilyAuctioncell.cs

@@ -108,14 +108,14 @@


            m_PriceButton.SetListener(() => //一口价

            {

                AuctionLogicUtil.SendBiddingItem(auctionItem, true);

                model.SendBiddingItem(auctionItem, true);

            });



            m_JadeNumber2.text = requireMoney.ToString();



            m_BiddingButton.SetListener(() => //竞价

            {

                AuctionLogicUtil.SendBiddingItem(auctionItem, false);

                model.SendBiddingItem(auctionItem, false);

            });



            Display(auctionItem);


 System/Auction/FullServiceAuctioncell.cs

@@ -129,14 +129,14 @@


            m_PriceButton.SetListener(() => //一口价

            {

                AuctionLogicUtil.SendBiddingItem(auctionItem, true);

                model.SendBiddingItem(auctionItem, true);

            });



            m_JadeNumber2.text = requireMoney.ToString();



            m_BiddingButton.SetListener(() => //竞价

            {

                AuctionLogicUtil.SendBiddingItem(auctionItem, false);

                model.SendBiddingItem(auctionItem, false);

            });



            Display(auctionItem);


 System/Auction/MyFocusCell.cs

@@ -108,14 +108,14 @@


            m_PriceButton.SetListener(() => //一口价

            {

                AuctionLogicUtil.SendBiddingItem(auctionItem, true);

                model.SendBiddingItem(auctionItem, true);

            });



            m_JadeNumber2.text = requireMoney.ToString();



            m_BiddingButton.SetListener(() => //竞价

            {

                AuctionLogicUtil.SendBiddingItem(auctionItem, false);

                model.SendBiddingItem(auctionItem, false);

            });



            Display(auctionItem);