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

client_linchunjie

2019-03-28 4a6a8e5f67d5ca0e1bc5355d9515c75284e50ef8

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

 System/Auction/AuctionInquiry.cs

@@ -36,7 +36,7 @@
                return sendNumber;

            }

            var fullServiceAuction = auctionHelpModel.FullServiceAuctionDic[index];

           


            sendNumber += fullServiceAuction.Config.TypeId;

            if (fullServiceAuction.JobTipBool)

            {

@@ -46,15 +46,15 @@
            {

                sendNumber += fullServiceAuction.Config.ChooseItem2[fullServiceAuction.TypeEntry];

            }

           // DebugEx.Log(sendNumber + "查询类型");

            // DebugEx.Log(sendNumber + "查询类型");

            return sendNumber;

        }
        public void SendQueryAuction(string itemGUID,int indexId,int queryDir, int queryCount=10)//拍卖行查询拍卖中的物品(物品GUID，查询方向，查询个数)

        public void SendQueryAuction(string itemGUID, int indexId, int queryDir, int queryCount = 10)//拍卖行查询拍卖中的物品(物品GUID，查询方向，查询个数)

        {

            var auctionIndex = AuctionIndexConfig.Get(indexId);

            if (auctionIndex == null)

            {

                DebugEx.LogError("拍卖索引表没有查到对应的ID"+ indexId);

                DebugEx.LogError("拍卖索引表没有查到对应的ID" + indexId);

                return;

            }

            QueryAuctionItem queryAuctionItem = new QueryAuctionItem();

@@ -80,8 +80,21 @@
            queryAuctionItem.QueryDir = queryDir;

            queryAuctionItem.QueryCount = queryCount;

            SendQueryAuctionItem(queryAuctionItem);

        }
        public void SendLocationQuery(string itemGUID)//定位查询

        }



        public void JumpAuctionWin(string itemGUID)//邮件超链接跳转

        {

            if (model.FamilyAuctionItemDic.ContainsKey(itemGUID))

            {

                WindowCenter.Instance.Open<AuctionHouseWin>(true, 1);

            }

            else

            {

                SendLocationQuery(itemGUID);

            }

        }



        private void SendLocationQuery(string itemGUID)//定位查询

        {

            if (auctionHelpModel.SelectedGenreNow != 0)

            {

@@ -179,7 +192,7 @@
            GameNetSystem.Instance.SendInfo(cb514);

        }

        public void SendAttentionAuctionItemChange(int itemID,int isAttention)//拍卖行修改关注物品(取消关注发0)

        public void SendAttentionAuctionItemChange(int itemID, int isAttention)//拍卖行修改关注物品(取消关注发0)

        {

            CB518_tagCGAttentionAuctionItemChange cb518 = new CB518_tagCGAttentionAuctionItemChange();

            cb518.ItemID = (uint)itemID;


 System/Auction/AuctionInquiryModel.cs

@@ -438,6 +438,15 @@
                    biddingItemInfo.BidderPrice = (int)RefreshAuctionItem.BidderPrice;

                    BiddingItemInfoDic[RefreshAuctionItem.ItemGUID] = biddingItemInfo;

                }

                if (AttentionAuctionItemDic.ContainsKey(RefreshAuctionItem.ItemGUID))//我关注中的拍品

                {

                    var attentionAuctionItem = AttentionAuctionItemDic[RefreshAuctionItem.ItemGUID];

                    attentionAuctionItem.TimeStr = RefreshAuctionItem.AddTime;

                    attentionAuctionItem.Time = DateTime.Parse(RefreshAuctionItem.AddTime);

                    attentionAuctionItem.BidderID = (int)RefreshAuctionItem.BidderID;

                    attentionAuctionItem.BidderPrice = (int)RefreshAuctionItem.BidderPrice;

                    AttentionAuctionItemDic[RefreshAuctionItem.ItemGUID] = attentionAuctionItem;

                }

                if (RefreshAuctionItemUpdate != null)

                {

                    RefreshAuctionItemUpdate();


 System/Auction/MyFocusCell.cs

@@ -82,10 +82,8 @@
            {

                m_NeedImage.SetActive(true);

            }

            AuctionItemClass _biddingItemInfo = null;

            if (model.BiddingItemInfoDic.ContainsKey(GUIID))//参与了竞价的物品

            {

                _biddingItemInfo = model.BiddingItemInfoDic[GUIID];

                var biddingItemInfo = model.BiddingItemInfoDic[GUIID];

                m_ParticipateImage.SetActive(true);

                if (biddingItemInfo.BidderID == playerId)//判断是否最高竞价

@@ -137,29 +135,13 @@
            }

            else

            {

                if (_biddingItemInfo == null)

                {

                    needJade = myAuction.BidderPrice + auctionItem.BiddingAdd * myAuction.ItemCount;

                }

                else

                {

                    needJade = _biddingItemInfo.BidderPrice + auctionItem.BiddingAdd * myAuction.ItemCount;

                }

               
                needJade = myAuction.BidderPrice + auctionItem.BiddingAdd * myAuction.ItemCount;               
            }

            if (auctionItem.BuyoutPrice != 0 && needJade > priceMax)//竞价价格永远不能大于最高价

            {

                needJade = priceMax;

            }



            if (_biddingItemInfo == null)

            {

                m_JadeNumber.text = myAuction.BidderPrice.ToString();

            }

            else

            {

                m_JadeNumber.text = _biddingItemInfo.BidderPrice.ToString();

            }

            m_JadeNumber.text = myAuction.BidderPrice.ToString();

            m_JadeNumber1.text = priceMax.ToString();

            if (auctionItem.BuyoutPrice == 0)

            {


 System/Auction/MyFocusWin.cs

@@ -42,7 +42,7 @@
        {
            model.AttentionAuctionItemUdate += ResetUpdate;
            model.ClearAuctionUpdate += ResetUpdate;

            model.RefreshAuctionItemUpdate -= AuctionItemUpdate;//刷新
            model.RefreshAuctionItemUpdate += AuctionItemUpdate;//刷新
            model.FamilyAuctionItemUpdate += ResetUpdate;
            model.AddAuctionItemInfoUpdate += AddAuctionItemInfoUpdate;
            model.BiddingItemInfoUpdate += ResetUpdate;

 System/Message/RichNormalEvent.cs

@@ -114,7 +114,7 @@
                    {

                        var guid = href.mSplits["auctionbidding"];

                        guid = guid.Trim('\"');

                        AuctionInquiry.Instance.SendLocationQuery(guid);//定位查询

                        AuctionInquiry.Instance.JumpAuctionWin(guid);//定位查询

                        //--竞价

                    }

                }