少年修仙传客户端代码仓库
client_linchunjie
2019-07-16 3d0a6f9b72da4bfb0ceddbbb124dcdab14b246f9
8082 子 【主干】拍卖行装备展示规则 / 【前端】【主干】拍卖行装备展示
5个文件已修改
89 ■■■■■ 已修改文件
System/Auction/AuctionModel.cs 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Auction/FamilyAuctioncell.cs 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Auction/FullServiceAuctioncell.cs 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Auction/MyAuctionCell.cs 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Auction/MyFocusCell.cs 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Auction/AuctionModel.cs
@@ -406,7 +406,8 @@
                var biddingTimeLabel = UIHelper.ServerStringTrim(data.BiddingTime);
                item.biddingTime = string.IsNullOrEmpty(biddingTimeLabel) ? DateTime.MinValue : DateTime.Parse(biddingTimeLabel);
                item.biddingPrice = data.BidderPrice;
                item.customData = data.UserData;
                item.userData = data.UserData;
                item.userDataDict = ConfigParse.Analysis(item.userData);
                if (!m_ServerAuctionItemGuids.Contains(guid))
                {
@@ -472,7 +473,8 @@
                var biddingTimeLabel = UIHelper.ServerStringTrim(data.BiddingTime);
                item.biddingTime = string.IsNullOrEmpty(biddingTimeLabel) ? DateTime.MinValue : DateTime.Parse(biddingTimeLabel);
                item.biddingPrice = data.BidderPrice;
                item.customData = data.UserData;
                item.userData = data.UserData;
                item.userDataDict = ConfigParse.Analysis(item.userData);
                if (!m_MyAuctionItemGuids.Contains(guid))
                {
@@ -518,7 +520,8 @@
                item.biddingPlayerName = data.BidderName;//玩家名
                item.itemId = (int)data.ItemID;
                item.itemCount = (int)data.ItemCount;
                item.customData = data.UserData;
                item.userData = data.UserData;
                item.userDataDict = ConfigParse.Analysis(item.userData);
                if (!m_AuctionRecords.Contains(guid))
                {
                    m_AuctionRecords.Add(guid);
@@ -591,7 +594,8 @@
                var biddingTimeLabel = UIHelper.ServerStringTrim(data.BiddingTime);
                item.biddingTime = string.IsNullOrEmpty(biddingTimeLabel) ? DateTime.MinValue : DateTime.Parse(biddingTimeLabel);
                item.biddingPrice = data.BidderPrice;
                item.customData = data.UserData;
                item.userData = data.UserData;
                item.userDataDict = ConfigParse.Analysis(item.userData);
                item.familyPlayers = new List<int>();
                item.familyPlayers = ParseFairyPlayers(data.FamilyPlayerIDInfo);
                item.auctionType = data.AuctionType;
@@ -632,7 +636,8 @@
                var biddingTimeLabel = UIHelper.ServerStringTrim(data.BiddingTime);
                item.biddingTime = string.IsNullOrEmpty(biddingTimeLabel) ? DateTime.MinValue : DateTime.Parse(biddingTimeLabel);
                item.biddingPrice = data.BidderPrice;
                item.customData = data.UserData;
                item.userData = data.UserData;
                item.userDataDict = ConfigParse.Analysis(item.userData);
                if (!m_MyFocusAuctionItemGuids.Contains(guid))
                {
@@ -791,7 +796,8 @@
                item.biddingTime = string.IsNullOrEmpty(biddingTimeLabel) ? DateTime.MinValue : DateTime.Parse(biddingTimeLabel);
                item.biddingPrice = data.BidderPrice;//竞拍玩家出价
                item.biddingPlayer = (int)data.BidderID;//竞拍玩家ID,也就是当前最高竞价玩家ID
                item.customData = data.UserData;
                item.userData = data.UserData;
                item.userDataDict = ConfigParse.Analysis(item.userData);
                if (!m_MyBiddingItemGuids.Contains(guid))
                {
@@ -993,7 +999,8 @@
        public DateTime putAwayTime;              //上架时间
        public DateTime biddingTime;              //最新竞价时间
        public string customData;                 //自定义数据
        public string userData;                 //自定义数据
        public Dictionary<int, List<int>> userDataDict;
        public int familyId;                      //有值时为仙盟拍品
        public List<int> familyPlayers;           //可获得收益的仙盟玩家ID信息存储
System/Auction/FamilyAuctioncell.cs
@@ -79,8 +79,23 @@
                m_ParticipateImage.SetActive(true);
            }
            ItemCellModel cellModel = new ItemCellModel(auctionItem.itemId, true, (ulong)auctionItem.itemCount);
            ItemCellModel cellModel = new ItemCellModel(auctionItem.itemId, true, (ulong)auctionItem.itemCount,
                string.Empty, PackType.Deleted, false, auctionItem.userDataDict);
            m_ItemCell.Init(cellModel);
            if (ItemLogicUtility.Instance.IsRealmEquip(auctionItem.itemId))
            {
                var score = ItemLogicUtility.Instance.GetEquipScore(auctionItem.itemId, auctionItem.userDataDict);
                var isUp = ItemLogicUtility.Instance.IsFightUp(auctionItem.itemId, score);
                m_ItemCell.stateIcon.gameObject.SetActive(isUp == 1);
                if (isUp == 1)
                {
                    m_ItemCell.stateIcon.SetSprite(isUp == 1 ? "EquipUpIcon" : "EquipDownIcon");
                }
            }
            else
            {
                m_ItemCell.stateIcon.gameObject.SetActive(false);
            }
            m_ItemCell.button.SetListener(() =>
            {
                ItemTipUtility.Show(new ItemTipUtility.ItemViewInfo()
System/Auction/FullServiceAuctioncell.cs
@@ -100,8 +100,23 @@
                m_ParticipateImage.SetActive(true);
            }
            ItemCellModel cellModel = new ItemCellModel(auctionItem.itemId, true, (ulong)auctionItem.itemCount);
            ItemCellModel cellModel = new ItemCellModel(auctionItem.itemId, true, (ulong)auctionItem.itemCount,
                string.Empty, PackType.Deleted, false, auctionItem.userDataDict);
            m_ItemCell.Init(cellModel);
            if (ItemLogicUtility.Instance.IsRealmEquip(auctionItem.itemId))
            {
                var score = ItemLogicUtility.Instance.GetEquipScore(auctionItem.itemId, auctionItem.userDataDict);
                var isUp = ItemLogicUtility.Instance.IsFightUp(auctionItem.itemId, score);
                m_ItemCell.stateIcon.gameObject.SetActive(isUp == 1);
                if (isUp == 1)
                {
                    m_ItemCell.stateIcon.SetSprite(isUp == 1 ? "EquipUpIcon" : "EquipDownIcon");
                }
            }
            else
            {
                m_ItemCell.stateIcon.gameObject.SetActive(false);
            }
            m_ItemCell.button.SetListener(() =>
            {
                ItemTipUtility.Show(new ItemTipUtility.ItemViewInfo()
System/Auction/MyAuctionCell.cs
@@ -88,8 +88,23 @@
            m_Income.text = income.ToString();
            ItemCellModel cellModel = new ItemCellModel(auctionItem.itemId, true, (ulong)auctionItem.itemCount);
            ItemCellModel cellModel = new ItemCellModel(auctionItem.itemId, true, (ulong)auctionItem.itemCount,
                string.Empty, PackType.Deleted, false, auctionItem.userDataDict);
            m_ItemCell.Init(cellModel);
            if (ItemLogicUtility.Instance.IsRealmEquip(auctionItem.itemId))
            {
                var score = ItemLogicUtility.Instance.GetEquipScore(auctionItem.itemId, auctionItem.userDataDict);
                var isUp = ItemLogicUtility.Instance.IsFightUp(auctionItem.itemId, score);
                m_ItemCell.stateIcon.gameObject.SetActive(isUp == 1);
                if (isUp == 1)
                {
                    m_ItemCell.stateIcon.SetSprite(isUp == 1 ? "EquipUpIcon" : "EquipDownIcon");
                }
            }
            else
            {
                m_ItemCell.stateIcon.gameObject.SetActive(false);
            }
            m_ItemCell.button.SetListener(() =>
            {
                ItemTipUtility.Show(new ItemTipUtility.ItemViewInfo()
System/Auction/MyFocusCell.cs
@@ -81,8 +81,23 @@
                m_ParticipateImage.SetActive(true);
            }
            ItemCellModel cellModel = new ItemCellModel(auctionItem.itemId, true, (ulong)auctionItem.itemCount);
            ItemCellModel cellModel = new ItemCellModel(auctionItem.itemId, true, (ulong)auctionItem.itemCount,
                string.Empty, PackType.Deleted, false, auctionItem.userDataDict);
            m_ItemCell.Init(cellModel);
            if (ItemLogicUtility.Instance.IsRealmEquip(auctionItem.itemId))
            {
                var score = ItemLogicUtility.Instance.GetEquipScore(auctionItem.itemId, auctionItem.userDataDict);
                var isUp = ItemLogicUtility.Instance.IsFightUp(auctionItem.itemId, score);
                m_ItemCell.stateIcon.gameObject.SetActive(isUp == 1);
                if (isUp == 1)
                {
                    m_ItemCell.stateIcon.SetSprite(isUp == 1 ? "EquipUpIcon" : "EquipDownIcon");
                }
            }
            else
            {
                m_ItemCell.stateIcon.gameObject.SetActive(false);
            }
            m_ItemCell.button.SetListener(() =>
            {
                ItemTipUtility.Show(new ItemTipUtility.ItemViewInfo()