From 3d0a6f9b72da4bfb0ceddbbb124dcdab14b246f9 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期二, 16 七月 2019 11:44:55 +0800
Subject: [PATCH] 8082 子 【主干】拍卖行装备展示规则 / 【前端】【主干】拍卖行装备展示
---
System/Auction/MyAuctionCell.cs | 17 ++++++++
System/Auction/MyFocusCell.cs | 17 ++++++++
System/Auction/AuctionModel.cs | 21 +++++++---
System/Auction/FamilyAuctioncell.cs | 17 ++++++++
System/Auction/FullServiceAuctioncell.cs | 17 ++++++++
5 files changed, 78 insertions(+), 11 deletions(-)
diff --git a/System/Auction/AuctionModel.cs b/System/Auction/AuctionModel.cs
index 41463bb..5560d5f 100644
--- a/System/Auction/AuctionModel.cs
+++ b/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锛屼篃灏辨槸褰撳墠鏈�楂樼珵浠风帺瀹禝D
- 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淇℃伅瀛樺偍
diff --git a/System/Auction/FamilyAuctioncell.cs b/System/Auction/FamilyAuctioncell.cs
index 4de61c2..0e5d43d 100644
--- a/System/Auction/FamilyAuctioncell.cs
+++ b/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()
diff --git a/System/Auction/FullServiceAuctioncell.cs b/System/Auction/FullServiceAuctioncell.cs
index 4022b98..51654c1 100644
--- a/System/Auction/FullServiceAuctioncell.cs
+++ b/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()
diff --git a/System/Auction/MyAuctionCell.cs b/System/Auction/MyAuctionCell.cs
index 5147a80..d39049f 100644
--- a/System/Auction/MyAuctionCell.cs
+++ b/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()
diff --git a/System/Auction/MyFocusCell.cs b/System/Auction/MyFocusCell.cs
index 3836583..c342b28 100644
--- a/System/Auction/MyFocusCell.cs
+++ b/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()
--
Gitblit v1.8.0