4519 【主干】拍卖行展示装备tips错误

client_linchunjie

2019-07-17 701a67a3cf8a6c984ca0cc807eaf19555504b340

4519 【主干】拍卖行展示装备tips错误

 System/Auction/FamilyAuctioncell.cs

@@ -82,9 +82,10 @@
            ItemCellModel cellModel = new ItemCellModel(auctionItem.itemId, true, (ulong)auctionItem.itemCount,

                string.Empty, PackType.Deleted, false, auctionItem.userDataDict);

            m_ItemCell.Init(cellModel);

            var score = 0;

            if (ItemLogicUtility.Instance.IsRealmEquip(auctionItem.itemId))

            {

                var score = ItemLogicUtility.Instance.GetEquipScore(auctionItem.itemId, auctionItem.userDataDict);

                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)

@@ -102,6 +103,8 @@
                {

                    itemId = auctionItem.itemId,

                    compare = true,

                    isAuctionEquip = ItemLogicUtility.Instance.IsRealmEquip(auctionItem.itemId),

                    score = score,

                    legendProperty = ItemLogicUtility.Instance.IsRealmEquip(auctionItem.itemId) ?

                    ItemTipUtility.GetLegendProperty(auctionItem.itemId, auctionItem.userDataDict)

                    : default(ItemTipUtility.LegendProperty),


 System/Auction/FullServiceAuctioncell.cs

@@ -103,9 +103,10 @@
            ItemCellModel cellModel = new ItemCellModel(auctionItem.itemId, true, (ulong)auctionItem.itemCount,

                string.Empty, PackType.Deleted, false, auctionItem.userDataDict);

            m_ItemCell.Init(cellModel);

            var score = 0;

            if (ItemLogicUtility.Instance.IsRealmEquip(auctionItem.itemId))

            {

                var score = ItemLogicUtility.Instance.GetEquipScore(auctionItem.itemId, auctionItem.userDataDict);

                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)

@@ -123,6 +124,8 @@
                {

                    itemId = auctionItem.itemId,

                    compare = true,

                    isAuctionEquip = ItemLogicUtility.Instance.IsRealmEquip(auctionItem.itemId),

                    score = score,

                    legendProperty = ItemLogicUtility.Instance.IsRealmEquip(auctionItem.itemId) ?

                    ItemTipUtility.GetLegendProperty(auctionItem.itemId, auctionItem.userDataDict)

                    : default(ItemTipUtility.LegendProperty),


 System/Auction/MyAuctionCell.cs

@@ -91,9 +91,10 @@
            ItemCellModel cellModel = new ItemCellModel(auctionItem.itemId, true, (ulong)auctionItem.itemCount,

                string.Empty, PackType.Deleted, false, auctionItem.userDataDict);

            m_ItemCell.Init(cellModel);

            var score = 0;

            if (ItemLogicUtility.Instance.IsRealmEquip(auctionItem.itemId))

            {

                var score = ItemLogicUtility.Instance.GetEquipScore(auctionItem.itemId, auctionItem.userDataDict);

                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)

@@ -111,6 +112,8 @@
                {

                    itemId = auctionItem.itemId,

                    compare = true,

                    isAuctionEquip = ItemLogicUtility.Instance.IsRealmEquip(auctionItem.itemId),

                    score = score,

                    legendProperty = ItemLogicUtility.Instance.IsRealmEquip(auctionItem.itemId) ?

                    ItemTipUtility.GetLegendProperty(auctionItem.itemId, auctionItem.userDataDict)

                    : default(ItemTipUtility.LegendProperty),


 System/Auction/MyFocusCell.cs

@@ -84,9 +84,10 @@
            ItemCellModel cellModel = new ItemCellModel(auctionItem.itemId, true, (ulong)auctionItem.itemCount,

                string.Empty, PackType.Deleted, false, auctionItem.userDataDict);

            m_ItemCell.Init(cellModel);

            var score = 0;

            if (ItemLogicUtility.Instance.IsRealmEquip(auctionItem.itemId))

            {

                var score = ItemLogicUtility.Instance.GetEquipScore(auctionItem.itemId, auctionItem.userDataDict);

                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)

@@ -104,6 +105,8 @@
                {

                    itemId = auctionItem.itemId,

                    compare = true,

                    isAuctionEquip = ItemLogicUtility.Instance.IsRealmEquip(auctionItem.itemId),

                    score = score,

                    legendProperty = ItemLogicUtility.Instance.IsRealmEquip(auctionItem.itemId) ?

                    ItemTipUtility.GetLegendProperty(auctionItem.itemId, auctionItem.userDataDict)

                    : default(ItemTipUtility.LegendProperty),


 System/FriendSystem/MailWin.cs

@@ -321,13 +321,28 @@
                        {
                            itemCell.gameObject.SetActive(true);
                            MailItemModel itemModel = info.Items[giftCount];
                            var userDataDict = ConfigParse.Analysis(itemModel.UserData);
                            ItemCellModel cellModel = new ItemCellModel((int)itemModel.ItemID, false, (ulong)itemModel.Count,
                               "", PackType.Deleted, false, ConfigParse.Analysis(itemModel.UserData));
                               "", PackType.Deleted, false, userDataDict);
                            itemCell.Init(cellModel);
                            itemCell.button.onClick.RemoveAllListeners();
                            itemCell.button.onClick.AddListener(() =>
                            {
                                ItemTipUtility.Show((int)itemModel.ItemID);
                                if (itemModel.IsBind == 1 &&

                                ItemLogicUtility.Instance.IsRealmEquip((int)itemModel.ItemID))

                                {

                                    ItemTipUtility.Show(new ItemTipUtility.ItemViewInfo()

                                    {

                                        itemId = (int)itemModel.ItemID,

                                        isAuctionEquip = true,

                                        score = ItemLogicUtility.Instance.GetEquipScore((int)itemModel.ItemID, userDataDict),

                                        legendProperty = ItemTipUtility.GetLegendProperty((int)itemModel.ItemID, userDataDict),

                                    });

                                }
                                else

                                {

                                    ItemTipUtility.Show((int)itemModel.ItemID);
                                }
                            }
                            );
                        }

 System/ItemTip/ItemTipUtility.cs

@@ -87,6 +87,7 @@
            public int itemId;
            public int trueCount;
            public List<Int2> properties;
            public int score;
        }

        public struct SuitInfo
@@ -197,7 +198,9 @@
            public int itemId;

            public bool compare;

            public bool unfoldGetWay;

            public bool isAuctionEquip;

            public LegendProperty legendProperty;

            public int score;

        }

        static PackModel packModel { get { return ModelCenter.Instance.GetModel<PackModel>(); } }
@@ -252,9 +255,11 @@
            {

                case TipType.Equip:

                    mainTipData = CreateNormalEquipData(itemId);

                    if (!item.legendProperty.Equals(default(LegendProperty)))

                    if (item.isAuctionEquip)

                    {

                        mainTipData.legendProperty = item.legendProperty;

                        mainTipData.baseInfo.score = item.score;

                        mainTipData.baseInfo.isPreview = false;

                    }



                    if (item.compare)


 System/ItemTip/TipEquipBaseInfoWidget.cs

@@ -72,7 +72,7 @@

            if (baseInfo.score != 0)
            {
                if (!baseInfo.isPreview && !baseInfo.isAuction)
                if (!baseInfo.isPreview)
                {
                    m_ScoreOrType.text = Language.Get("EquipWin_EquipPointText_1") + baseInfo.score;
                }

 System/Store/StoreModel.cs

@@ -380,6 +380,7 @@
    {

        showStoreTypeDict.Clear();

        int playeLv = PlayerDatas.Instance.baseData.LV;

        int vipLevel = PlayerDatas.Instance.baseData.VIPLv;

        foreach (var type in storeTypeDict.Keys)

        {

            var storeDatas = storeTypeDict[type];

@@ -745,6 +746,11 @@


    private void RefreshPlayerData(PlayerDataType type)

    {

        if (type == PlayerDataType.VIPLv && !isLogin)

        {

            UpdateShowStore();

        }



        switch (type)

        {

            case PlayerDataType.LV: