snxxz_scripts.git

parent: e3321e6b | 补丁 | 提交 | ignore whitespace

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

client_Wu Xijin

2019-04-01 185f20862cfa5dbcf13c7ba57e847ab6a1f32eb7

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

6个文件已修改

	System/Auction/AuctionHelpModel.cs	33 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Auction/AuctionModel.cs	74 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Auction/FamilyAuctioncell.cs	19 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Auction/FullServiceAuctioncell.cs	19 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Auction/MyAuctionCell.cs	16 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Auction/MyFocusCell.cs	18 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 System/Auction/AuctionHelpModel.cs

@@ -51,12 +51,9 @@
            get { return wait; }

            set { wait = value; }

        }



        public bool isOpenPanel = true;

        public bool IsOpenPanel

        {

            get { return isOpenPanel; }

            set { isOpenPanel = value; }

        }



        public override void Init()

        {

            AuctionLogicUtil.Initialize();

@@ -196,33 +193,7 @@
            }

            return score;

        }



        public bool WhetherEquipped(int equipLevel, int equipPlace)//是否显示需要

        {

            bool isBool = false;

            string equipGuid = string.Empty;

            var equipSet = equipModel.GetEquipSet(equipLevel);

            if (equipSet == null)

            {

                return true;

            }

            equipGuid = equipSet.GetEquip(equipPlace);

            isBool = !string.IsNullOrEmpty(equipGuid);

            return isBool;

        }



        public bool IsItemWarmUp(AuctionItem item)

        {

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

            if (config == null)

            {

                return false;

            }

            var ts = TimeUtility.ServerNow - item.putAwayTime;

            return ts.TotalMinutes < config.NoticeSaleMinutes;

        }

    }

}



 System/Auction/AuctionModel.cs

@@ -325,12 +325,12 @@
            return m_MyFocusItemIds.Contains(id);

        }



        public void ReceivePackage(HB501_tagGCAuctionItemInfo info)// 拍卖行拍卖中的物品信息

        public void ReceivePackage(HB501_tagGCAuctionItemInfo package)// 拍卖行拍卖中的物品信息

        {

            List<string> fullServiceAuctionList = new List<string>();

            for (int i = 0; i < info.AuctionItemCount; i++)

            for (int i = 0; i < package.AuctionItemCount; i++)

            {

                var data = info.AuctionItemList[i];

                var data = package.AuctionItemList[i];

                var guid = UIHelper.ServerStringTrim(data.ItemGUID);

                AuctionItem item;

                if (!TryGetAuctionItem(guid, out item))

@@ -357,17 +357,17 @@
                }

            }



            if (info.QueryDir == 1)//往后查询

            if (package.QueryDir == 1)//往后查询

            {

                QueryRemaining.DownBool = info.QueryRemainlCount != 0;

                QueryRemaining.DownBool = package.QueryRemainlCount != 0;

                m_ServerAuctionItemGuids.AddRange(fullServiceAuctionList);

            }

            else if (info.QueryDir == 2)//往前查询

            else if (package.QueryDir == 2)//往前查询

            {

                QueryRemaining.UpBool = info.QueryRemainlCount != 0;

                QueryRemaining.UpBool = package.QueryRemainlCount != 0;

                m_ServerAuctionItemGuids.InsertRange(0, fullServiceAuctionList);

            }

            else if (info.QueryDir == 3)//定位查询

            else if (package.QueryDir == 3)//定位查询

            {

                m_ServerAuctionItemGuids.AddRange(fullServiceAuctionList);

                auctionHelpModel.SelectedGenreNow = 0;

@@ -381,11 +381,11 @@
            }

        }



        public void ReceivePackage(HB502_tagGCPlayerAuctionItemInfo info)//拍卖行玩家拍卖中的物品信息

        public void ReceivePackage(HB502_tagGCPlayerAuctionItemInfo package)//拍卖行玩家拍卖中的物品信息

        {

            for (int i = 0; i < info.AuctionItemCount; i++)

            for (int i = 0; i < package.AuctionItemCount; i++)

            {

                var data = info.AuctionItemList[i];

                var data = package.AuctionItemList[i];

                var guid = UIHelper.ServerStringTrim(data.ItemGUID);



                AuctionItem item;

@@ -419,11 +419,11 @@
            }

        }



        public void ReceivePackage(HB503_tagGCPlayerAuctionRecordInfo info)//拍卖行玩家拍卖记录

        public void ReceivePackage(HB503_tagGCPlayerAuctionRecordInfo package)//拍卖行玩家拍卖记录

        {

            for (int i = 0; i < info.Count; i++)

            for (int i = 0; i < package.Count; i++)

            {

                var data = info.AuctionRecordList[i];

                var data = package.AuctionRecordList[i];

                var guid = UIHelper.ServerStringTrim(data.ItemGUID);



                AuctionItem item;

@@ -453,14 +453,14 @@
            }

        }



        public void ReceivePackage(HB504_tagGCAddAuctionItemInfo info)//拍卖行新上架拍品(玩家有关注的拍品 )

        public void ReceivePackage(HB504_tagGCAddAuctionItemInfo package)//拍卖行新上架拍品(玩家有关注的拍品 )

        {

            for (int i = 0; i < info.AddCount; i++)

            for (int i = 0; i < package.AddCount; i++)

            {

                var AddAuctionItem = info.AddAuctionItemList[i];

                var data = package.AddAuctionItemList[i];

                AddAuctionItemInfoClass addAuctionItemInfo = new AddAuctionItemInfoClass();

                addAuctionItemInfo.ItemGUID = UIHelper.ServerStringTrim(AddAuctionItem.ItemGUID);

                addAuctionItemInfo.ItemID = (int)AddAuctionItem.ItemID;

                addAuctionItemInfo.ItemGUID = UIHelper.ServerStringTrim(data.ItemGUID);

                addAuctionItemInfo.ItemID = (int)data.ItemID;

                addAuctionItemInfo.Bool = true;

                if (AddAuctionItemInfoDic.ContainsKey(addAuctionItemInfo.ItemID))

                {

@@ -477,11 +477,11 @@
            }

        }



        public void ReceivePackage(HB505_tagGCFamilyAuctionItemInfo info)//拍卖行仙盟拍卖中的物品信息(上线同步，刷新同步)

        public void ReceivePackage(HB505_tagGCFamilyAuctionItemInfo package)//拍卖行仙盟拍卖中的物品信息(上线同步，刷新同步)

        {

            for (int i = 0; i < info.AuctionItemCount; i++)

            for (int i = 0; i < package.AuctionItemCount; i++)

            {

                var data = info.AuctionItemList[i];

                var data = package.AuctionItemList[i];

                var guid = UIHelper.ServerStringTrim(data.ItemGUID);



                AuctionItem item;

@@ -518,12 +518,12 @@
            }

        }



        public void ReceivePackage(HB506_tagGCAttentionAuctionItemInfo info)//拍卖行关注中的拍品信息

        public void ReceivePackage(HB506_tagGCAttentionAuctionItemInfo package)//拍卖行关注中的拍品信息

        {

            m_MyFocusAuctionItemGuids.Clear();

            for (int i = 0; i < info.AuctionItemCount; i++)

            for (int i = 0; i < package.AuctionItemCount; i++)

            {

                var data = info.AuctionItemList[i];

                var data = package.AuctionItemList[i];

                var guid = UIHelper.ServerStringTrim(data.ItemGUID);



                AuctionItem item;

@@ -557,12 +557,12 @@
            }

        }



        public void ReceivePackage(HB507_tagGCAttentionAuctionItemID info)//关注的物品ID（需要主动查询）

        public void ReceivePackage(HB507_tagGCAttentionAuctionItemID package)//关注的物品ID（需要主动查询）

        {

            m_MyFocusItemIds.Clear();

            for (int i = 0; i < info.AttentionCount; i++)

            for (int i = 0; i < package.AttentionCount; i++)

            {

                var itemId = (int)info.AttentionItemIDList[i];

                var itemId = (int)package.AttentionItemIDList[i];

                if (!m_MyFocusItemIds.Contains(itemId))

                {

                    m_MyFocusItemIds.Add(itemId);

@@ -575,11 +575,11 @@


        }



        public void ReceivePackage(HB508_tagGCRefreshAuctionItemInfo info)//拍卖行刷新拍品(只进行刷新)

        public void ReceivePackage(HB508_tagGCRefreshAuctionItemInfo package)//拍卖行刷新拍品(只进行刷新)

        {

            for (int i = 0; i < info.RefreshCount; i++)

            for (int i = 0; i < package.RefreshCount; i++)

            {

                var data = info.RefreshAuctionItemList[i];

                var data = package.RefreshAuctionItemList[i];



                var guid = UIHelper.ServerStringTrim(data.ItemGUID);



@@ -615,11 +615,11 @@
            }

        }



        public void ReceivePackage(HB509_tagGCClearAuctionItemInfo info)//拍卖行清除拍品 
        public void ReceivePackage(HB509_tagGCClearAuctionItemInfo package)//拍卖行清除拍品 
        {

            for (int i = 0; i < info.ClearCount; i++)

            for (int i = 0; i < package.ClearCount; i++)

            {

                var ItemGUIDList = info.ClearAuctionItemList[i];

                var ItemGUIDList = package.ClearAuctionItemList[i];

                var guid = UIHelper.ServerStringTrim(ItemGUIDList.ItemGUID);



                if (m_MyBiddingItemGuids.Contains(guid))//清除拍卖行玩家参与竞价中的物品信息 

@@ -656,11 +656,11 @@
            }

        }



        public void ReceivePackage(HB510_tagGCBiddingItemInfo info)//拍卖行玩家竞价中的物品信息 (每次上线同步一次)

        public void ReceivePackage(HB510_tagGCBiddingItemInfo package)//拍卖行玩家竞价中的物品信息 (每次上线同步一次)

        {

            for (int i = 0; i < info.AuctionItemCount; i++)

            for (int i = 0; i < package.AuctionItemCount; i++)

            {

                var data = info.AuctionItemList[i];

                var data = package.AuctionItemList[i];



                var guid = UIHelper.ServerStringTrim(data.ItemGUID);




 System/Auction/FamilyAuctioncell.cs

@@ -16,10 +16,6 @@
        [SerializeField] GameObject m_ParticipateImage;//参与竞价

        [SerializeField] ItemCell m_ItemCell;//物品

        [SerializeField] TextEx m_ItemName;//物品名

        [SerializeField] GameObject m_EquipmentScoreObj;//装备评分

        [SerializeField] TextEx m_Score;//评分

        [SerializeField] GameObject m_StateIcon;//上升剪头

        [SerializeField] GameObject m_DeclineIcon;//下降剪头

        [SerializeField] Text m_BiddingText;//竞价中

        [SerializeField] GameObject m_HighestPriceImage;//最高价

        [SerializeField] TextEx m_JadeNumber;//当前价格

@@ -64,7 +60,6 @@
            m_NeedImage.SetActive(false);

            m_ParticipateImage.SetActive(false);

            m_HighestPriceImage.SetActive(false);

            m_EquipmentScoreObj.SetActive(false);



            AuctionItem auctionItem;

            if (!model.TryGetFairyAuctionItem(guid, out auctionItem))

@@ -96,20 +91,6 @@


            var itemConfig = ItemConfig.Get(auctionItem.itemId);

            m_ItemName.text = itemConfig.ItemName;



            if (itemConfig.EquipPlace != 0)

            {

                m_EquipmentScoreObj.SetActive(true);

                m_Score.text = cellModel.score.ToString();

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

                var equipScore = auctionHelpModel.GetEquipScore(itemConfig.LV, itemConfig.EquipPlace);

                m_StateIcon.SetActive(cellModel.score > equipScore && isMyJobItem);

                m_DeclineIcon.SetActive(equipScore > cellModel.score && isMyJobItem);

            }

            else

            {

                m_EquipmentScoreObj.SetActive(false);

            }



            int requireMoney = AuctionLogicUtil.GetBiddingRequireMoney(auctionItem);




 System/Auction/FullServiceAuctioncell.cs

@@ -18,10 +18,6 @@
        [SerializeField] GameObject m_ParticipateImage;//参与竞价

        [SerializeField] ItemCell m_ItemCell;//物品

        [SerializeField] TextEx m_ItemName;//物品名

        [SerializeField] GameObject m_EquipmentScoreObj;//装备评分

        [SerializeField] TextEx m_Score;//评分

        [SerializeField] GameObject m_StateIcon;//上升剪头

        [SerializeField] GameObject m_DeclineIcon;//下降剪头

        [SerializeField] Text m_BiddingText;//竞价中

        [SerializeField] GameObject m_HighestPriceImage;//最高价

        [SerializeField] TextEx m_JadeNumber;//当前价格

@@ -64,7 +60,6 @@
            m_NeedImage.SetActive(false);

            m_ParticipateImage.SetActive(false);

            m_HighestPriceImage.SetActive(false);

            m_EquipmentScoreObj.SetActive(false);



            AuctionItem auctionItem;

            if (!model.TryGetServerAuctionItem(guid, out auctionItem))

@@ -117,20 +112,6 @@
            var itemConfig = ItemConfig.Get(auctionItem.itemId);



            m_ItemName.text = itemConfig.ItemName;



            if (itemConfig.EquipPlace != 0)

            {

                m_EquipmentScoreObj.SetActive(true);

                m_Score.text = cellModel.score.ToString();

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

                var equipScore = auctionHelpModel.GetEquipScore(itemConfig.LV, itemConfig.EquipPlace);

                m_StateIcon.SetActive(cellModel.score > equipScore && isMyJobItem);

                m_DeclineIcon.SetActive(equipScore > cellModel.score && isMyJobItem);

            }

            else

            {

                m_EquipmentScoreObj.SetActive(false);

            }



            int requireMoney = AuctionLogicUtil.GetBiddingRequireMoney(auctionItem);




 System/Auction/MyAuctionCell.cs

@@ -17,10 +17,6 @@
        [SerializeField] GameObject m_FamilyImage;//仙盟拍品

        [SerializeField] ItemCell m_ItemCell;//物品

        [SerializeField] TextEx m_ItemName;//物品名

        [SerializeField] GameObject m_EquipmentScoreObj;//装备评分

        [SerializeField] TextEx m_Score;//评分

        [SerializeField] GameObject m_StateIcon;//上升剪头

        [SerializeField] GameObject m_DeclineIcon;//下降剪头

        [SerializeField] Text m_BiddingText;//竞价状态

        [SerializeField] TextEx m_JadeNumber;//当前价格

        [SerializeField] TextEx m_TimeText;//时间

@@ -100,18 +96,6 @@
                itemTipsModel.SetItemTipsModel(attrData);

            });

            m_ItemName.text = itemConfig.ItemName;

            if (itemConfig.EquipPlace != 0)

            {

                m_EquipmentScoreObj.SetActive(true);

                m_Score.text = cellModel.score.ToString();

                var equipScore = auctionHelpModel.GetEquipScore(itemConfig.LV, itemConfig.EquipPlace);

                m_StateIcon.SetActive(cellModel.score > equipScore && jobBool);

                m_DeclineIcon.SetActive(equipScore > cellModel.score && jobBool);

            }

            else

            {

                m_EquipmentScoreObj.SetActive(false);

            }



            m_JadeNumber.text = auctionItem.biddingPrice.ToString();




 System/Auction/MyFocusCell.cs

@@ -16,10 +16,6 @@
        [SerializeField] GameObject m_ParticipateImage;//参与竞价

        [SerializeField] ItemCell m_ItemCell;//物品

        [SerializeField] TextEx m_ItemName;//物品名

        [SerializeField] GameObject m_EquipmentScoreObj;//装备评分

        [SerializeField] TextEx m_Score;//评分

        [SerializeField] GameObject m_StateIcon;//上升剪头

        [SerializeField] GameObject m_DeclineIcon;//下降剪头

        [SerializeField] TextEx m_BiddingText;//竞价中

        [SerializeField] GameObject m_HighestPriceImage;//最高价

        [SerializeField] TextEx m_JadeNumber;//当前价格

@@ -70,7 +66,6 @@
            m_NeedImage.SetActive(false);

            m_ParticipateImage.SetActive(false);

            m_HighestPriceImage.SetActive(false);

            m_EquipmentScoreObj.SetActive(false);



            var playerId = PlayerDatas.Instance.baseData.PlayerID;

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

@@ -97,19 +92,6 @@
            });



            m_ItemName.text = itemConfig.ItemName;

            if (itemConfig.EquipPlace != 0)

            {

                m_EquipmentScoreObj.SetActive(true);

                m_Score.text = cellModel.score.ToString();

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

                var equipScore = auctionHelpModel.GetEquipScore(itemConfig.LV, itemConfig.EquipPlace);

                m_StateIcon.SetActive(cellModel.score > equipScore && isMyJobItem);

                m_DeclineIcon.SetActive(equipScore > cellModel.score && isMyJobItem);

            }

            else

            {

                m_EquipmentScoreObj.SetActive(false);

            }



            int requireMoney = AuctionLogicUtil.GetBiddingRequireMoney(auctionItem);

			@@ -51,12 +51,9 @@
			get { return wait; }
			set { wait = value; }
			}

			public bool isOpenPanel = true;
			public bool IsOpenPanel
			{
			get { return isOpenPanel; }
			set { isOpenPanel = value; }
			}

			public override void Init()
			{
			AuctionLogicUtil.Initialize();
			@@ -196,33 +193,7 @@
			}
			return score;
			}

			public bool WhetherEquipped(int equipLevel, int equipPlace)//是否显示需要
			{
			bool isBool = false;
			string equipGuid = string.Empty;
			var equipSet = equipModel.GetEquipSet(equipLevel);
			if (equipSet == null)
			{
			return true;
			}
			equipGuid = equipSet.GetEquip(equipPlace);
			isBool = !string.IsNullOrEmpty(equipGuid);
			return isBool;
			}

			public bool IsItemWarmUp(AuctionItem item)
			{
			var config = AuctionItemConfig.Get(item.itemId);
			if (config == null)
			{
			return false;
			}
			var ts = TimeUtility.ServerNow - item.putAwayTime;
			return ts.TotalMinutes < config.NoticeSaleMinutes;
			}
			}

			}

			@@ -325,12 +325,12 @@
			return m_MyFocusItemIds.Contains(id);
			}

			public void ReceivePackage(HB501_tagGCAuctionItemInfo info)// 拍卖行拍卖中的物品信息
			public void ReceivePackage(HB501_tagGCAuctionItemInfo package)// 拍卖行拍卖中的物品信息
			{
			List<string> fullServiceAuctionList = new List<string>();
			for (int i = 0; i < info.AuctionItemCount; i++)
			for (int i = 0; i < package.AuctionItemCount; i++)
			{
			var data = info.AuctionItemList[i];
			var data = package.AuctionItemList[i];
			var guid = UIHelper.ServerStringTrim(data.ItemGUID);
			AuctionItem item;
			if (!TryGetAuctionItem(guid, out item))
			@@ -357,17 +357,17 @@
			}
			}

			if (info.QueryDir == 1)//往后查询
			if (package.QueryDir == 1)//往后查询
			{
			QueryRemaining.DownBool = info.QueryRemainlCount != 0;
			QueryRemaining.DownBool = package.QueryRemainlCount != 0;
			m_ServerAuctionItemGuids.AddRange(fullServiceAuctionList);
			}
			else if (info.QueryDir == 2)//往前查询
			else if (package.QueryDir == 2)//往前查询
			{
			QueryRemaining.UpBool = info.QueryRemainlCount != 0;
			QueryRemaining.UpBool = package.QueryRemainlCount != 0;
			m_ServerAuctionItemGuids.InsertRange(0, fullServiceAuctionList);
			}
			else if (info.QueryDir == 3)//定位查询
			else if (package.QueryDir == 3)//定位查询
			{
			m_ServerAuctionItemGuids.AddRange(fullServiceAuctionList);
			auctionHelpModel.SelectedGenreNow = 0;
			@@ -381,11 +381,11 @@
			}
			}

			public void ReceivePackage(HB502_tagGCPlayerAuctionItemInfo info)//拍卖行玩家拍卖中的物品信息
			public void ReceivePackage(HB502_tagGCPlayerAuctionItemInfo package)//拍卖行玩家拍卖中的物品信息
			{
			for (int i = 0; i < info.AuctionItemCount; i++)
			for (int i = 0; i < package.AuctionItemCount; i++)
			{
			var data = info.AuctionItemList[i];
			var data = package.AuctionItemList[i];
			var guid = UIHelper.ServerStringTrim(data.ItemGUID);

			AuctionItem item;
			@@ -419,11 +419,11 @@
			}
			}

			public void ReceivePackage(HB503_tagGCPlayerAuctionRecordInfo info)//拍卖行玩家拍卖记录
			public void ReceivePackage(HB503_tagGCPlayerAuctionRecordInfo package)//拍卖行玩家拍卖记录
			{
			for (int i = 0; i < info.Count; i++)
			for (int i = 0; i < package.Count; i++)
			{
			var data = info.AuctionRecordList[i];
			var data = package.AuctionRecordList[i];
			var guid = UIHelper.ServerStringTrim(data.ItemGUID);

			AuctionItem item;
			@@ -453,14 +453,14 @@
			}
			}

			public void ReceivePackage(HB504_tagGCAddAuctionItemInfo info)//拍卖行新上架拍品(玩家有关注的拍品 )
			public void ReceivePackage(HB504_tagGCAddAuctionItemInfo package)//拍卖行新上架拍品(玩家有关注的拍品 )
			{
			for (int i = 0; i < info.AddCount; i++)
			for (int i = 0; i < package.AddCount; i++)
			{
			var AddAuctionItem = info.AddAuctionItemList[i];
			var data = package.AddAuctionItemList[i];
			AddAuctionItemInfoClass addAuctionItemInfo = new AddAuctionItemInfoClass();
			addAuctionItemInfo.ItemGUID = UIHelper.ServerStringTrim(AddAuctionItem.ItemGUID);
			addAuctionItemInfo.ItemID = (int)AddAuctionItem.ItemID;
			addAuctionItemInfo.ItemGUID = UIHelper.ServerStringTrim(data.ItemGUID);
			addAuctionItemInfo.ItemID = (int)data.ItemID;
			addAuctionItemInfo.Bool = true;
			if (AddAuctionItemInfoDic.ContainsKey(addAuctionItemInfo.ItemID))
			{
			@@ -477,11 +477,11 @@
			}
			}

			public void ReceivePackage(HB505_tagGCFamilyAuctionItemInfo info)//拍卖行仙盟拍卖中的物品信息(上线同步，刷新同步)
			public void ReceivePackage(HB505_tagGCFamilyAuctionItemInfo package)//拍卖行仙盟拍卖中的物品信息(上线同步，刷新同步)
			{
			for (int i = 0; i < info.AuctionItemCount; i++)
			for (int i = 0; i < package.AuctionItemCount; i++)
			{
			var data = info.AuctionItemList[i];
			var data = package.AuctionItemList[i];
			var guid = UIHelper.ServerStringTrim(data.ItemGUID);

			AuctionItem item;
			@@ -518,12 +518,12 @@
			}
			}

			public void ReceivePackage(HB506_tagGCAttentionAuctionItemInfo info)//拍卖行关注中的拍品信息
			public void ReceivePackage(HB506_tagGCAttentionAuctionItemInfo package)//拍卖行关注中的拍品信息
			{
			m_MyFocusAuctionItemGuids.Clear();
			for (int i = 0; i < info.AuctionItemCount; i++)
			for (int i = 0; i < package.AuctionItemCount; i++)
			{
			var data = info.AuctionItemList[i];
			var data = package.AuctionItemList[i];
			var guid = UIHelper.ServerStringTrim(data.ItemGUID);

			AuctionItem item;
			@@ -557,12 +557,12 @@
			}
			}

			public void ReceivePackage(HB507_tagGCAttentionAuctionItemID info)//关注的物品ID（需要主动查询）
			public void ReceivePackage(HB507_tagGCAttentionAuctionItemID package)//关注的物品ID（需要主动查询）
			{
			m_MyFocusItemIds.Clear();
			for (int i = 0; i < info.AttentionCount; i++)
			for (int i = 0; i < package.AttentionCount; i++)
			{
			var itemId = (int)info.AttentionItemIDList[i];
			var itemId = (int)package.AttentionItemIDList[i];
			if (!m_MyFocusItemIds.Contains(itemId))
			{
			m_MyFocusItemIds.Add(itemId);
			@@ -575,11 +575,11 @@

			}

			public void ReceivePackage(HB508_tagGCRefreshAuctionItemInfo info)//拍卖行刷新拍品(只进行刷新)
			public void ReceivePackage(HB508_tagGCRefreshAuctionItemInfo package)//拍卖行刷新拍品(只进行刷新)
			{
			for (int i = 0; i < info.RefreshCount; i++)
			for (int i = 0; i < package.RefreshCount; i++)
			{
			var data = info.RefreshAuctionItemList[i];
			var data = package.RefreshAuctionItemList[i];

			var guid = UIHelper.ServerStringTrim(data.ItemGUID);

			@@ -615,11 +615,11 @@
			}
			}

			public void ReceivePackage(HB509_tagGCClearAuctionItemInfo info)//拍卖行清除拍品
			public void ReceivePackage(HB509_tagGCClearAuctionItemInfo package)//拍卖行清除拍品
			{
			for (int i = 0; i < info.ClearCount; i++)
			for (int i = 0; i < package.ClearCount; i++)
			{
			var ItemGUIDList = info.ClearAuctionItemList[i];
			var ItemGUIDList = package.ClearAuctionItemList[i];
			var guid = UIHelper.ServerStringTrim(ItemGUIDList.ItemGUID);

			if (m_MyBiddingItemGuids.Contains(guid))//清除拍卖行玩家参与竞价中的物品信息
			@@ -656,11 +656,11 @@
			}
			}

			public void ReceivePackage(HB510_tagGCBiddingItemInfo info)//拍卖行玩家竞价中的物品信息 (每次上线同步一次)
			public void ReceivePackage(HB510_tagGCBiddingItemInfo package)//拍卖行玩家竞价中的物品信息 (每次上线同步一次)
			{
			for (int i = 0; i < info.AuctionItemCount; i++)
			for (int i = 0; i < package.AuctionItemCount; i++)
			{
			var data = info.AuctionItemList[i];
			var data = package.AuctionItemList[i];

			var guid = UIHelper.ServerStringTrim(data.ItemGUID);

			@@ -16,10 +16,6 @@
			[SerializeField] GameObject m_ParticipateImage;//参与竞价
			[SerializeField] ItemCell m_ItemCell;//物品
			[SerializeField] TextEx m_ItemName;//物品名
			[SerializeField] GameObject m_EquipmentScoreObj;//装备评分
			[SerializeField] TextEx m_Score;//评分
			[SerializeField] GameObject m_StateIcon;//上升剪头
			[SerializeField] GameObject m_DeclineIcon;//下降剪头
			[SerializeField] Text m_BiddingText;//竞价中
			[SerializeField] GameObject m_HighestPriceImage;//最高价
			[SerializeField] TextEx m_JadeNumber;//当前价格
			@@ -64,7 +60,6 @@
			m_NeedImage.SetActive(false);
			m_ParticipateImage.SetActive(false);
			m_HighestPriceImage.SetActive(false);
			m_EquipmentScoreObj.SetActive(false);

			AuctionItem auctionItem;
			if (!model.TryGetFairyAuctionItem(guid, out auctionItem))
			@@ -96,20 +91,6 @@

			var itemConfig = ItemConfig.Get(auctionItem.itemId);
			m_ItemName.text = itemConfig.ItemName;

			if (itemConfig.EquipPlace != 0)
			{
			m_EquipmentScoreObj.SetActive(true);
			m_Score.text = cellModel.score.ToString();
			var isMyJobItem = itemConfig.JobLimit == 0 \|\| itemConfig.JobLimit == PlayerDatas.Instance.baseData.Job;
			var equipScore = auctionHelpModel.GetEquipScore(itemConfig.LV, itemConfig.EquipPlace);
			m_StateIcon.SetActive(cellModel.score > equipScore && isMyJobItem);
			m_DeclineIcon.SetActive(equipScore > cellModel.score && isMyJobItem);
			}
			else
			{
			m_EquipmentScoreObj.SetActive(false);
			}

			int requireMoney = AuctionLogicUtil.GetBiddingRequireMoney(auctionItem);

			@@ -18,10 +18,6 @@
			[SerializeField] GameObject m_ParticipateImage;//参与竞价
			[SerializeField] ItemCell m_ItemCell;//物品
			[SerializeField] TextEx m_ItemName;//物品名
			[SerializeField] GameObject m_EquipmentScoreObj;//装备评分
			[SerializeField] TextEx m_Score;//评分
			[SerializeField] GameObject m_StateIcon;//上升剪头
			[SerializeField] GameObject m_DeclineIcon;//下降剪头
			[SerializeField] Text m_BiddingText;//竞价中
			[SerializeField] GameObject m_HighestPriceImage;//最高价
			[SerializeField] TextEx m_JadeNumber;//当前价格
			@@ -64,7 +60,6 @@
			m_NeedImage.SetActive(false);
			m_ParticipateImage.SetActive(false);
			m_HighestPriceImage.SetActive(false);
			m_EquipmentScoreObj.SetActive(false);

			AuctionItem auctionItem;
			if (!model.TryGetServerAuctionItem(guid, out auctionItem))
			@@ -117,20 +112,6 @@
			var itemConfig = ItemConfig.Get(auctionItem.itemId);

			m_ItemName.text = itemConfig.ItemName;

			if (itemConfig.EquipPlace != 0)
			{
			m_EquipmentScoreObj.SetActive(true);
			m_Score.text = cellModel.score.ToString();
			var isMyJobItem = itemConfig.JobLimit == 0 \|\| itemConfig.JobLimit == PlayerDatas.Instance.baseData.Job;
			var equipScore = auctionHelpModel.GetEquipScore(itemConfig.LV, itemConfig.EquipPlace);
			m_StateIcon.SetActive(cellModel.score > equipScore && isMyJobItem);
			m_DeclineIcon.SetActive(equipScore > cellModel.score && isMyJobItem);
			}
			else
			{
			m_EquipmentScoreObj.SetActive(false);
			}

			int requireMoney = AuctionLogicUtil.GetBiddingRequireMoney(auctionItem);

			@@ -17,10 +17,6 @@
			[SerializeField] GameObject m_FamilyImage;//仙盟拍品
			[SerializeField] ItemCell m_ItemCell;//物品
			[SerializeField] TextEx m_ItemName;//物品名
			[SerializeField] GameObject m_EquipmentScoreObj;//装备评分
			[SerializeField] TextEx m_Score;//评分
			[SerializeField] GameObject m_StateIcon;//上升剪头
			[SerializeField] GameObject m_DeclineIcon;//下降剪头
			[SerializeField] Text m_BiddingText;//竞价状态
			[SerializeField] TextEx m_JadeNumber;//当前价格
			[SerializeField] TextEx m_TimeText;//时间
			@@ -100,18 +96,6 @@
			itemTipsModel.SetItemTipsModel(attrData);
			});
			m_ItemName.text = itemConfig.ItemName;
			if (itemConfig.EquipPlace != 0)
			{
			m_EquipmentScoreObj.SetActive(true);
			m_Score.text = cellModel.score.ToString();
			var equipScore = auctionHelpModel.GetEquipScore(itemConfig.LV, itemConfig.EquipPlace);
			m_StateIcon.SetActive(cellModel.score > equipScore && jobBool);
			m_DeclineIcon.SetActive(equipScore > cellModel.score && jobBool);
			}
			else
			{
			m_EquipmentScoreObj.SetActive(false);
			}

			m_JadeNumber.text = auctionItem.biddingPrice.ToString();