3335 物品管理相关功能重构。

client_Wu Xijin

2019-02-19 283a720f06b0834b71ce8413a28caf24eeedc017

3335 物品管理相关功能重构。

 Core/GameEngine/Model/Player/Market/MarketModel.cs

@@ -190,7 +190,7 @@
                }

                return false;

            }

            ItemConfig cfg = ItemConfig.Get(_itemModel.itemInfo.ItemID);

            ItemConfig cfg = ItemConfig.Get(_itemModel.itemId);

            if (cfg.CanTrade != 1)

            {

                if (_showTip)


 Fight/GameActor/GA_Hero.cs

@@ -622,7 +622,7 @@
            if (_horsePackModel != null)

            {

                ItemModel _horseItem = _horsePackModel.GetItemModelByIndex((int)RoleEquipType.mount);

                SwitchHorse((uint)_horseItem.itemInfo.ItemID);

                SwitchHorse((uint)_horseItem.itemId);

            }

        }

        else


 Fight/Stage/StageLoad.cs

@@ -325,11 +325,11 @@
        m_InitHeroStep = 4;
        if (fashion != null)
        {
            hero.SwitchClothes((uint)fashion.itemInfo.ItemID, (int)RoleEquipType.FashionClothes);
            hero.SwitchClothes((uint)fashion.itemId, (int)RoleEquipType.FashionClothes);
        }
        else if (itemModel != null)
        {
            hero.SwitchClothes((uint)itemModel.itemInfo.ItemID);
            hero.SwitchClothes((uint)itemModel.itemId);
        }
        else
        {
@@ -343,11 +343,11 @@

        if (fashion != null)
        {
            hero.SwitchWeapon((uint)fashion.itemInfo.ItemID, (int)RoleEquipType.FashionWeapon);
            hero.SwitchWeapon((uint)fashion.itemId, (int)RoleEquipType.FashionWeapon);
        }
        else if (itemModel != null)
        {
            hero.SwitchWeapon((uint)itemModel.itemInfo.ItemID);
            hero.SwitchWeapon((uint)itemModel.itemId);
        }
        else
        {
@@ -360,11 +360,11 @@

        if (fashion != null)
        {
            hero.SwitchSecondary((uint)fashion.itemInfo.ItemID, (int)RoleEquipType.FashionWeapon2);
            hero.SwitchSecondary((uint)fashion.itemId, (int)RoleEquipType.FashionWeapon2);
        }
        else if (itemModel != null)
        {
            hero.SwitchSecondary((uint)itemModel.itemInfo.ItemID);
            hero.SwitchSecondary((uint)itemModel.itemId);
        }
        else
        {
@@ -376,7 +376,7 @@
        itemModel = equipModel.GetItemModelByIndex((int)RoleEquipType.Wing);
        if (itemModel != null)
        {
            hero.SwitchWing((uint)itemModel.itemInfo.ItemID);
            hero.SwitchWing((uint)itemModel.itemId);
        }

        m_InitHeroStep = 8;
@@ -399,7 +399,7 @@
        itemModel = equipModel.GetItemModelByIndex((int)RoleEquipType.SpiritAnimal);
        if (itemModel != null)
        {
            hero.SwitchGuard((uint)itemModel.itemInfo.ItemID);
            hero.SwitchGuard((uint)itemModel.itemId);
        }

        m_InitHeroStep = 10;

 System/Chat/ChatCtrl.cs

@@ -853,12 +853,12 @@
            var _length = _textBuilder.Length;

            if (i < itemPlaceList.Count)

            {

                ItemConfig cfg = ItemConfig.Get((int)itemPlaceList[i].itemInfo.ItemID);

                ItemConfig cfg = ItemConfig.Get((int)itemPlaceList[i].itemId);

                if (cfg.ItemName == matchArray[i].Groups[1].Value)

                {

                    bool equip = itemPlaceList[i].packType == PackType.Equip;

                    uint[] stones = equip ? PlayerStoneData.Instance.GetStoneInfo(itemPlaceList[i].itemInfo.ItemPlace) : null;

                    _textBuilder.Append(StringUtility.Contact("#item#", itemPlaceList[i].itemInfo.ItemID,

                    _textBuilder.Append(StringUtility.Contact("#item#", itemPlaceList[i].itemId,

                                                              "|", itemPlaceList[i].itemInfo.IsBind,

                                                              "|", itemPlaceList[i].itemInfo.ItemCount,

                                                              "|", stones != null ? LitJson.JsonMapper.ToJson(stones) :


 System/Chat/ChatExtentWin.cs

@@ -94,7 +94,7 @@
                {

                    _itemCell.items[i].gameObject.SetActive(true);

                    ItemModel _item = m_DisplayItems[index];

                    ItemConfig itemCfg = ItemConfig.Get((int)_item.itemInfo.ItemID);

                    ItemConfig itemCfg = ItemConfig.Get((int)_item.itemId);

                    _itemCell.items[i].Init(_item);

                    _itemCell.itemEquips[i].gameObject.SetActive(_item.packType == PackType.Equip);

                    _itemCell.items[i].cellBtn.onClick.RemoveAllListeners();

@@ -117,7 +117,7 @@
                chatCenter.recentlyChat = null;

                chatCenter.ChangeChatValue(string.Empty, false, false);

            }

            ItemConfig _cfg = ItemConfig.Get((int)_item.itemInfo.ItemID);

            ItemConfig _cfg = ItemConfig.Get((int)_item.itemId);

            string _showtext = StringUtility.Contact("[", _cfg.ItemName, "]");

            ChatCtrl.Inst.itemPlaceList.Add(_item);

            chatCenter.ChangeChatValue(_showtext, true, true);


 System/Chat/ChatSendComponent.cs

@@ -192,7 +192,7 @@
                {

                    Match match = matchArray[m];

                    ItemModel itemModel = ChatCtrl.Inst.itemPlaceList[i];

                    ItemConfig cfg = ItemConfig.Get((int)itemModel.itemInfo.ItemID);

                    ItemConfig cfg = ItemConfig.Get((int)itemModel.itemId);

                    if (cfg.ItemName != match.Groups[1].Value)

                    {

                        ChatCtrl.Inst.itemPlaceList.RemoveAt(i);


 System/Compose/New/SelectEquipModel.cs

@@ -84,7 +84,7 @@
                int i = 0;

                for (i = 0; i < unfixedIds.Length; i++)

                {

                    if (unfixedIds[i] == allBagItemInfo[key].itemInfo.ItemID)

                    if (unfixedIds[i] == allBagItemInfo[key].itemId)

                    {

                        _unfixedItemDict.Add(key, allBagItemInfo[key]);

                        break;


 System/Dungeon/DungeonLiquidCell.cs

@@ -54,7 +54,7 @@
            if (index < model.liquidItemList.Count)

            {

                ItemModel itemModel = model.liquidItemList[index];

                ItemConfig cfg = ItemConfig.Get((int)itemModel.itemInfo.ItemID);

                ItemConfig cfg = ItemConfig.Get((int)itemModel.itemId);

                m_ItemIcon.SetSprite(cfg.IconKey);

                m_ItemBG.SetItemBackGround(cfg.ItemColor);

                if (itemModel.itemInfo.ItemCount > 1)


 System/FairyAu/DonateEquipTipsWin.cs

@@ -88,7 +88,7 @@
            foreach (int item_id in backpack_dic.Keys)
            {

                ItemConfig _ChinItem = ItemConfig.Get((int)backpack_dic[item_id].itemInfo.ItemID);
                ItemConfig _ChinItem = ItemConfig.Get((int)backpack_dic[item_id].itemId);

                if (backpack_dic[item_id].itemInfo.IsBind == 1)
                    continue;
@@ -97,7 +97,7 @@
                    if (_ChinItem.EquipPlace == key && _ChinItem.LV >= _ProductOrderJudgment[key].Class && _ChinItem.StarLevel >= _ProductOrderJudgment[key].TheStar && _ChinItem.ItemColor >= _ProductOrderJudgment[key].Color)
                    {

                        string IDnumber = backpack_dic[item_id].itemInfo.ItemID.ToString() + "|" + item_id.ToString();//添加ID和位置索引
                        string IDnumber = backpack_dic[item_id].itemId.ToString() + "|" + item_id.ToString();//添加ID和位置索引

                        phagocytosisID.Add(IDnumber);


 System/FairyAu/FairyFeastTransmitShow.cs

@@ -202,19 +202,19 @@
        void DisplayPlayer()

        {

            var clothes = playerPack.GetItemModelByIndex(PackType.Equip, (int)RoleEquipType.Clothes);

            var clothesId = clothes == null ? 0 : (int)clothes.itemInfo.ItemID;

            var clothesId = clothes == null ? 0 : (int)clothes.itemId;



            var wings = playerPack.GetItemModelByIndex(PackType.Equip, (int)RoleEquipType.Wing);

            var wingsId = wings == null ? 0 : (int)wings.itemInfo.ItemID;

            var wingsId = wings == null ? 0 : (int)wings.itemId;



            var secondary = playerPack.GetItemModelByIndex(PackType.Equip, (int)RoleEquipType.Weapon2);

            var secondaryId = secondary == null ? 0 : (int)secondary.itemInfo.ItemID;

            var secondaryId = secondary == null ? 0 : (int)secondary.itemId;



            var fashionClothes = playerPack.GetItemModelByIndex(PackType.Equip, (int)RoleEquipType.FashionClothes);

            var fashionClothesId = fashionClothes == null ? 0 : (int)fashionClothes.itemInfo.ItemID;

            var fashionClothesId = fashionClothes == null ? 0 : (int)fashionClothes.itemId;



            var fashionSecondary = playerPack.GetItemModelByIndex(PackType.Equip, (int)RoleEquipType.FashionWeapon2);

            var fashionSecondaryId = fashionSecondary == null ? 0 : (int)fashionSecondary.itemInfo.ItemID;

            var fashionSecondaryId = fashionSecondary == null ? 0 : (int)fashionSecondary.itemId;



            var data = new UI3DPlayerExhibitionData

            {


 System/FairyAu/FamilyChangeNameWin.cs

@@ -95,7 +95,7 @@
                     {
                         if(ItemLogicUtility.Instance.useItemModel != null)
                         {
                             if(ItemLogicUtility.Instance.useItemModel.itemInfo.ItemID == model.changeFairyNameItem)
                             if(ItemLogicUtility.Instance.useItemModel.itemId == model.changeFairyNameItem)
                             {
                                 model.SendChangeFairyName(m_FairyNameInput.text, ItemLogicUtility.Instance.useItemModel.itemInfo.ItemPlace);
                             }

 System/FairyAu/WarehouseTipsWin.cs

@@ -1116,7 +1116,7 @@
            Dictionary<int, ProductOrderJudgment> _ProductOrderJudgment = AttributeJudgment();

            foreach (int item_id in backpack_dic.Keys)

            {

                ItemConfig _ChinItem = ItemConfig.Get((int)backpack_dic[item_id].itemInfo.ItemID);

                ItemConfig _ChinItem = ItemConfig.Get((int)backpack_dic[item_id].itemId);

                if (backpack_dic[item_id].itemInfo.IsBind == 1)

                    continue;

                foreach (int key in _ProductOrderJudgment.Keys)


 System/FashionDress/FashionDressWin.cs

@@ -321,16 +321,16 @@
            var playerPack = ModelCenter.Instance.GetModel<PlayerPackModel>();



            var clothes = playerPack.GetItemModelByIndex(PackType.Equip, (int)RoleEquipType.Clothes);

            var clothesId = clothes == null ? 0 : (int)clothes.itemInfo.ItemID;

            var clothesId = clothes == null ? 0 : (int)clothes.itemId;



            var weapon = playerPack.GetItemModelByIndex(PackType.Equip, (int)RoleEquipType.Weapon);

            var weaponId = weapon == null ? 0 : (int)weapon.itemInfo.ItemID;

            var weaponId = weapon == null ? 0 : (int)weapon.itemId;



            var wings = playerPack.GetItemModelByIndex(PackType.Equip, (int)RoleEquipType.Wing);

            var wingsId = wings == null ? 0 : (int)wings.itemInfo.ItemID;

            var wingsId = wings == null ? 0 : (int)wings.itemId;



            var secondary = playerPack.GetItemModelByIndex(PackType.Equip, (int)RoleEquipType.Weapon2);

            var secondaryId = secondary == null ? 0 : (int)secondary.itemInfo.ItemID;

            var secondaryId = secondary == null ? 0 : (int)secondary.itemId;



            var fashionDressClothesId = 0;

            var fashionDressWeaponId = 0;


 System/Guard/GuardModel.cs

@@ -58,7 +58,7 @@
            var _itemModel = _equipModel.GetItemModelByIndex((int)RoleEquipType.SpiritAnimal);

            if (_itemModel != null && _itemModel.itemInfo != null)

            {

                _hero.SwitchGuard((uint)_itemModel.itemInfo.ItemID);

                _hero.SwitchGuard((uint)_itemModel.itemId);

            }

        }




 System/JadeDynastyKnapSack/JadeDynastyGemEquipCell.cs

@@ -1,14 +1,14 @@
using System.Collections;
using System.Collections.Generic;



using UnityEngine;
using UnityEngine.UI;



namespace Snxxz.UI

{

    [XLua.Hotfix]

    public class JadeDynastyGemEquipCell : CellView

    {

using UnityEngine.UI;

namespace Snxxz.UI
{
    [XLua.Hotfix]
    public class JadeDynastyGemEquipCell : CellView
    {
        [SerializeField] ItemCell m_Item;
        [SerializeField] Transform m_ContainerSelect;
        [SerializeField] Image m_EquipBG;
@@ -19,8 +19,8 @@
        [SerializeField] Text m_EquipName;
        [SerializeField] Text m_Content;
        [SerializeField] Text m_Remind;
        [SerializeField] Button m_Select;



        [SerializeField] Button m_Select;

        int equipPlace = 0;

        GemModel model
@@ -33,9 +33,9 @@
            get { return ModelCenter.Instance.GetModel<PlayerPackModel>(); }
        }

        JadeDynastyGemModel jadeDynastyGemModel

        {

            get { return ModelCenter.Instance.GetModel<JadeDynastyGemModel>(); }

        JadeDynastyGemModel jadeDynastyGemModel
        {
            get { return ModelCenter.Instance.GetModel<JadeDynastyGemModel>(); }
        }

        private void Awake()
@@ -49,14 +49,14 @@
            m_ContainerSelect.gameObject.SetActive(equipPlace == jadeDynastyGemModel.selectEquipPlace);
            ItemModel itemModel = playerPack.GetItemModelByIndex(PackType.JadeDynastyEquip, _pos);
            bool existEquip = itemModel != null;
            m_Item.gameObject.SetActive(existEquip);

            m_Item.gameObject.SetActive(existEquip);
            m_Remind.gameObject.SetActive(!existEquip);
            m_Content.gameObject.SetActive(!existEquip);
            m_ContainerGem.gameObject.SetActive(existEquip);
            m_EquipName.gameObject.SetActive(existEquip);
            if (itemModel != null)
            {
                ItemConfig config = ItemConfig.Get(itemModel.itemInfo.ItemID);
                ItemConfig config = ItemConfig.Get(itemModel.itemId);
                m_EquipName.gameObject.SetActive(true);
                m_EquipName.text = UIHelper.AppendStringColor(config.ItemColor, config.ItemName, true);
                m_Item.Init(itemModel);
@@ -68,8 +68,8 @@
                m_Remind.text = Language.Get("L1067");
            }

            if (existEquip)

            {

            if (existEquip)
            {
                DisplayGems();
            }

@@ -80,7 +80,7 @@
        void DisplayGems()
        {
            var itemModel = playerPack.GetItemModelByIndex(PackType.JadeDynastyEquip, equipPlace);
            var config = ItemConfig.Get(itemModel.itemInfo.ItemID);
            var config = ItemConfig.Get(itemModel.itemId);
            var holeCount = 0;
            m_GemIdQueue.Clear();
            JadeDynastyGemModel.GemEquipData equipData;
@@ -135,7 +135,7 @@
        private void OnSelect()
        {
            jadeDynastyGemModel.selectEquipPlace = equipPlace;
        }

    }

        }
    }
}


 System/JadeDynastyKnapSack/JadeDynastyGemModel.cs

@@ -1,9 +1,9 @@
using System;

using System.Collections;
using System.Collections.Generic;
using System.Collections;

using System.Collections.Generic;

using System.Linq;



using UnityEngine;
using UnityEngine;

namespace Snxxz.UI

{

    [XLua.Hotfix]

@@ -252,7 +252,7 @@
                {

                    continue;

                }

                ItemConfig itemCfg = ItemConfig.Get((int)item.itemInfo.ItemID);

                ItemConfig itemCfg = ItemConfig.Get((int)item.itemId);

                List<ItemModel> list = IsBagHaveGem(GetGemType(equipPlace));

                if (list == null || list.Count == 0)

                {

@@ -348,7 +348,7 @@
                {

                    continue;

                }

                var itemConfig = ItemConfig.Get((int)equip.itemInfo.ItemID);

                var itemConfig = ItemConfig.Get((int)equip.itemId);

                GemEquipData equipData;

                var existGem = TryGetEquipGems(equipPlace, out equipData);

                for (int j = 0; j < 4; j++)

@@ -484,7 +484,7 @@
            for (int i = 0; i < _list.Count; i++)

            {

                ItemModel _itemModel = _list[i];

                ItemConfig _itemCfg = ItemConfig.Get(_itemModel.itemInfo.ItemID);

                ItemConfig _itemCfg = ItemConfig.Get(_itemModel.itemId);

                if (_itemCfg.EffectValueA1 == _type && _itemCfg.EffectValueB1 == _level)

                {

                    if (_bind)

@@ -513,7 +513,7 @@
                for (int i = 0; i < list.Count; i++)

                {

                    ItemModel item = list[i];

                    ItemConfig cfg = ItemConfig.Get((int)item.itemInfo.ItemID);

                    ItemConfig cfg = ItemConfig.Get((int)item.itemId);

                    if (cfg.EffectValueA1 != type)

                    {

                        list.RemoveAt(i);

@@ -530,5 +530,5 @@
            public int[] binds;

        }

    }

}

}




 System/JadeDynastyKnapSack/JadeDynastyGemWin.cs

@@ -137,7 +137,7 @@
        {

            var itemModel = PlayerPack.GetItemModelByIndex(PackType.JadeDynastyEquip, model.selectEquipPlace);

            var existEquip = itemModel != null;

            var config = itemModel != null ? ItemConfig.Get(itemModel.itemInfo.ItemID) : null;

            var config = itemModel != null ? ItemConfig.Get(itemModel.itemId) : null;

            for (int i = 0; i < 4; i++)

            {

                if (existEquip)


 System/JadeDynastyKnapSack/JadeDynastySelectGemWin.cs

@@ -105,7 +105,7 @@
            {

                ItemModel _item = gemItems[i];

                CellInfo _cellInfo = CellInfo.Default;

                _cellInfo.infoInt1 = _item.itemInfo.ItemID;

                _cellInfo.infoInt1 = _item.itemId;

                _cellInfo.infoInt2 = _item.itemInfo.ItemPlace;

                _cellInfo.SetInfo(_item.itemInfo.IsBind);

                _cellInfo.infoStr1 = _item.itemInfo.ItemCount.ToString();

@@ -227,7 +227,7 @@
            for (int i = 0; i < list.Count; i++)

            {

                ItemModel _itemModel = list[i];

                ItemConfig _itemCfg = ItemConfig.Get(_itemModel.itemInfo.ItemID);

                ItemConfig _itemCfg = ItemConfig.Get(_itemModel.itemId);

                if (_itemCfg.EffectValueA1 == type)

                {

                    gemItems.Add(_itemModel);

@@ -238,8 +238,8 @@


        private int Compare(ItemModel x, ItemModel y)

        {

            ItemConfig cfgx = ItemConfig.Get((int)x.itemInfo.ItemID);

            ItemConfig cfgy = ItemConfig.Get((int)y.itemInfo.ItemID);

            ItemConfig cfgx = ItemConfig.Get((int)x.itemId);

            ItemConfig cfgy = ItemConfig.Get((int)y.itemId);

            if (cfgx.EffectValueB1.CompareTo(cfgy.EffectValueB1) != 0)

            {

                return -cfgx.EffectValueB1.CompareTo(cfgy.EffectValueB1);


 System/KnapSack/BetterItemGetBehaviour.cs

@@ -109,7 +109,7 @@


        private void ToOpenRoleKanpsack(ItemModel betterEquip)

        {

            var itemConfig = ItemConfig.Get(betterEquip.itemInfo.ItemID);

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

            if (NewBieCenter.Instance.inGuiding)

            {

                playerPack.SetLookIndex(betterEquip.itemInfo.ItemGUID);

@@ -156,7 +156,7 @@
            ItemModel betterEquip;

            if (model.TryGetBetterEquip(model.currentEquipGuid, out betterEquip))

            {

                var itemConfig = ItemConfig.Get(betterEquip.itemInfo.ItemID);

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

                var packType = GeneralDefine.GetPackTypeByItemType(itemConfig.Type);

                itemTipsModel.SetItemTipsModel(packType, betterEquip.itemInfo.ItemGUID);

            }

@@ -169,7 +169,7 @@


        private void DrawBetterEquip(ItemModel betterModel)

        {

            var itemConfig = ItemConfig.Get(betterModel.itemInfo.ItemID);

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

            m_EquipName.text = itemConfig.ItemName;

            m_EquipName.color = UIHelper.GetUIColor(itemConfig.ItemColor, true);

            m_FunctionTitle.text = Language.Get(itemConfig.ItemColor >= 3 ? "GoodEquip_See" : "GoodEquip_FitUp");


 System/KnapSack/ItemUseBehaviour.cs

@@ -86,7 +86,7 @@
        {
            if (_item != null)
            {
                var itemConfig = ItemConfig.Get(_item.itemInfo.ItemID);
                var itemConfig = ItemConfig.Get(_item.itemId);
                m_ItemName.text = itemConfig.ItemName;
                m_ItemName.color = UIHelper.GetUIColor(itemConfig.ItemColor, true);


 System/KnapSack/Logic/BoxGetItemWin.cs

@@ -249,7 +249,7 @@
        {

            if (itemModel == null) return;



            int useCnt = BoxModel.GetUseCntByID(itemModel.itemInfo.ItemID);

            int useCnt = BoxModel.GetUseCntByID(itemModel.itemId);

            ItemLogicUtility.Instance.SendMakeUseQuest(itemModel.itemInfo.ItemPlace, 1);

        }




 System/KnapSack/Logic/GuardOverdueWin.cs

@@ -96,12 +96,12 @@
            itemModel = playerPack.GetItemModelByGUID(guid);

            if (itemModel == null) return;



            itemBG.SetItemBackGround(modelInterface.GetItemQuality(itemModel.itemInfo.ItemID,itemModel.useDataDict));

            itemBG.SetItemBackGround(modelInterface.GetItemQuality(itemModel.itemId,itemModel.useDataDict));

            itemIcon.SetSprite(itemModel.config.IconKey);

            itemOverduelist = itemOverdue.GetRenewallist(itemModel.itemInfo.ItemID);

            itemOverduelist = itemOverdue.GetRenewallist(itemModel.itemId);

            itemConfig = ItemConfig.Get(itemOverduelist[0]);

            guardTime = TimeSpan.FromSeconds(itemConfig.ExpireTime);

            guardIcon.SetSprite(itemOverdue.GetGuardOverdueIcon(itemModel.itemInfo.ItemID));

            guardIcon.SetSprite(itemOverdue.GetGuardOverdueIcon(itemModel.itemId));

            if (itemOverduelist[2] == 0)

            {

                goldRenewalBtn.gameObject.SetActive(false);

@@ -122,7 +122,7 @@
            {

                var showObj = showObjlist[i];

                string showName = showObj.name;

                if(showName.Contains(itemModel.itemInfo.ItemID.ToString()))

                if(showName.Contains(itemModel.itemId.ToString()))

                {

                    showObj.SetActive(true);

                }


 System/KnapSack/Logic/ItemLogicUtility.cs

@@ -36,8 +36,8 @@
                return;
            }

            var itemId = selectedItem.itemInfo.ItemID;
            sendItemConfig = ItemConfig.Get(selectedItem.itemInfo.ItemID);
            var itemId = selectedItem.itemId;
            sendItemConfig = ItemConfig.Get(selectedItem.itemId);
            if (sendItemConfig.JobLimit != 0 && sendItemConfig.JobLimit / 100 != PlayerDatas.Instance.baseData.Job)
            {
                SysNotifyMgr.Instance.ShowTip("GeRen_lhs_31379");
@@ -539,7 +539,7 @@
            if (putOnModel == null) return;

            Dictionary<int, EquipmentInitialization> equipStrengthDic = strengthModel._EqInfo;
            bool isPrompt = strengthModel.TheRatingPrompt(item.itemInfo.ItemID);
            bool isPrompt = strengthModel.TheRatingPrompt(item.itemId);
            if (isPrompt && !PlayerPrefs.HasKey(PlayerPackModel.StrengthAttrShift_RecordKey))
            {
                LocalSave.SetBool(PlayerPackModel.StrengthAttrShift_RecordKey, true);
@@ -737,7 +737,7 @@
            switch (useItemModel.config.Type)
            {
                case (int)ItemType.Box:
                    BoxModel.SetModel(useItemModel.itemInfo.ItemGUID, useItemModel.itemInfo.ItemID);
                    BoxModel.SetModel(useItemModel.itemInfo.ItemGUID, useItemModel.itemId);
                    return;
                case 83:
                    var fashionModel = ModelCenter.Instance.GetModel<FashionDressModel>();
@@ -760,7 +760,7 @@
                    }
                    break;
            }
            if (playerPack.CheckIsDrugById(useItemModel.itemInfo.ItemID))
            if (playerPack.CheckIsDrugById(useItemModel.itemId))
            {
                if (CheckItemUselimit(useItemModel.itemId))
                {
@@ -769,7 +769,7 @@
                return;
            }

            int dungeonID = playerPack.GetDungeonIDByDrugID(useItemModel.itemInfo.ItemID);
            int dungeonID = playerPack.GetDungeonIDByDrugID(useItemModel.itemId);
            if (dungeonID != 0)
            {
                MapConfig tagMapModel = MapConfig.Get(PlayerDatas.Instance.baseData.MapID);
@@ -918,7 +918,7 @@
                return true;
            }

            if (itemModel.itemInfo.ItemID == fairyModel.changeFairyNameItem)
            if (itemModel.itemId == fairyModel.changeFairyNameItem)
            {
                if (PlayerDatas.Instance.fairyData.HasFairy)
                {
@@ -933,7 +933,7 @@

            }

            if (dogzModel.AddAssistItem == itemModel.itemInfo.ItemID)
            if (dogzModel.AddAssistItem == itemModel.itemId)
            {
                dogzModel.MakeUseAddAssistNum();
                return true;
@@ -948,7 +948,7 @@
            }
            else
            {
                if (Buffmodel.BuffCover(itemModel.itemInfo.ItemID))
                if (Buffmodel.BuffCover(itemModel.itemId))
                {
                    ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"), Language.Get("FairyLand_Func22"), (bool isOk) =>
                    {
@@ -961,7 +961,7 @@
                }
                else
                {
                    switch (itemModel.itemInfo.ItemID)
                    switch (itemModel.itemId)
                    {
                        case RoleRenameWin.renameToolId:
                            WindowCenter.Instance.Open<RoleRenameWin>();
@@ -1030,14 +1030,14 @@
            ItemModel itemModel = playerPack.GetItemModelByIndex(PackType.Item, index);
            if (itemModel == null) return;

            int haveUseCnt = playerPack.GetDayUseCntByID(itemModel.itemInfo.ItemID);
            int haveUseCnt = playerPack.GetDayUseCntByID(itemModel.itemId);
            if (itemModel.config.MaxSkillCnt > 0 && itemModel.config.MaxSkillCnt <= haveUseCnt)
            {
                SysNotifyMgr.Instance.ShowTip("EverydayUseLimit");
                return;
            }
            int sumHaveUseCnt = playerPack.GetSumUseCntByID(itemModel.itemInfo.ItemID);
            AttrFruitConfig fruitConfig = AttrFruitConfig.Get(itemModel.itemInfo.ItemID);
            int sumHaveUseCnt = playerPack.GetSumUseCntByID(itemModel.itemId);
            AttrFruitConfig fruitConfig = AttrFruitConfig.Get(itemModel.itemId);
            if (fruitConfig != null && (sumHaveUseCnt >= fruitConfig.MaxUseCnt || useCnt > fruitConfig.MaxUseCnt))
            {
                SysNotifyMgr.Instance.ShowTip("UseCntLimit");
@@ -1052,13 +1052,13 @@
            ItemModel itemModel = playerPack.GetItemModelByIndex(PackType.Item, index);
            if (itemModel == null) return false;

            int haveUseCnt = playerPack.GetDayUseCntByID(itemModel.itemInfo.ItemID);
            int haveUseCnt = playerPack.GetDayUseCntByID(itemModel.itemId);
            if (itemModel.config.MaxSkillCnt > 0 && itemModel.config.MaxSkillCnt <= haveUseCnt)
            {
                return false;
            }
            int sumHaveUseCnt = playerPack.GetSumUseCntByID(itemModel.itemInfo.ItemID);
            AttrFruitConfig fruitConfig = AttrFruitConfig.Get(itemModel.itemInfo.ItemID);
            int sumHaveUseCnt = playerPack.GetSumUseCntByID(itemModel.itemId);
            AttrFruitConfig fruitConfig = AttrFruitConfig.Get(itemModel.itemId);
            if (fruitConfig != null
                && (sumHaveUseCnt >= fruitConfig.MaxUseCnt
                   || useCnt > fruitConfig.MaxUseCnt))

 System/KnapSack/Logic/ItemModel.cs

@@ -55,7 +55,7 @@
                serverSurplusTime = useDataDict[48][0];

            }



            this.equipScore = modelInterface.SetEquipScore(packType, itemInfo.ItemID, useDataDict);

            this.equipScore = modelInterface.SetEquipScore(packType, itemId, useDataDict);

            if (GetUseDataModel((int)ItemUseDataKey.itemCount) != null)

            {

                itemInfo.ItemCount = GetUseDataModel((int)ItemUseDataKey.itemCount)[0];


 System/KnapSack/Logic/ItemOverdueModel.cs

@@ -279,7 +279,7 @@
                                        if (models != null && models.Count > 0)

                                        {

                                            ItemModel overdueModel = models[0];

                                            OnGetOverdueItem(overdueModel.itemInfo.ItemID, overdueModel.itemInfo.ItemGUID, overdueModel.itemInfo.ItemPlace);

                                            OnGetOverdueItem(overdueModel.itemId, overdueModel.itemInfo.ItemGUID, overdueModel.itemInfo.ItemPlace);

                                            break;

                                        }

                                    }

@@ -366,7 +366,7 @@
            }

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

            {

                OnGetOverdueItem(overdueGuardPushlist[i].itemInfo.ItemID, overdueGuardPushlist[i].itemInfo.ItemGUID, overdueGuardPushlist[i].itemInfo.ItemPlace);

                OnGetOverdueItem(overdueGuardPushlist[i].itemId, overdueGuardPushlist[i].itemInfo.ItemGUID, overdueGuardPushlist[i].itemInfo.ItemPlace);

            }

        }




 System/KnapSack/Logic/ItemTipsModel.cs

@@ -734,7 +734,7 @@
            ItemModel itemModel = playerPack.GetItemModelByGUID(guid);

            if (itemModel != null)

            {

                curAttrData = new ItemAttrData(itemModel.itemInfo.ItemID,false, (ulong)itemModel.itemInfo.ItemCount

                curAttrData = new ItemAttrData(itemModel.itemId,false, (ulong)itemModel.itemInfo.ItemCount

                    , itemModel.itemInfo.ItemPlace, itemModel.itemInfo.IsBind,isCompare

                    , type, guid, ConfigParse.Analysis(itemModel.itemInfo.UserData),childType);



@@ -797,7 +797,7 @@


        public void SetCurrentAttrData(ItemModel itemModel,bool isCompare )

        {

            curAttrData = new ItemAttrData(itemModel.itemInfo.ItemID, false, (ulong)itemModel.itemInfo.ItemCount

            curAttrData = new ItemAttrData(itemModel.itemId, false, (ulong)itemModel.itemInfo.ItemCount

                  , itemModel.itemInfo.ItemPlace, itemModel.itemInfo.IsBind, isCompare

                  , itemModel.packType, itemModel.itemInfo.ItemGUID, ConfigParse.Analysis(itemModel.itemInfo.UserData),ItemTipChildType.Normal);

        }

@@ -805,7 +805,7 @@


        public void SetCompareAttrData(ItemModel itemModel)

        {

            compareAttrData = new ItemAttrData(itemModel.itemInfo.ItemID, false, (ulong)itemModel.itemInfo.ItemCount

            compareAttrData = new ItemAttrData(itemModel.itemId, false, (ulong)itemModel.itemInfo.ItemCount

                  , itemModel.itemInfo.ItemPlace, itemModel.itemInfo.IsBind, true

                  , itemModel.packType, itemModel.itemInfo.ItemGUID, ConfigParse.Analysis(itemModel.itemInfo.UserData));

        }

@@ -888,7 +888,7 @@


            if (itemModel != null)

            {

                compareAttrData = new ItemAttrData(itemModel.itemInfo.ItemID, false, (ulong)itemModel.itemInfo.ItemCount

                compareAttrData = new ItemAttrData(itemModel.itemId, false, (ulong)itemModel.itemInfo.ItemCount

                  , itemModel.itemInfo.ItemPlace, itemModel.itemInfo.IsBind, true

                  , type,itemModel.itemInfo.ItemGUID, ConfigParse.Analysis(itemModel.itemInfo.UserData));




 System/KnapSack/Logic/ModelShowPerfab.cs

@@ -104,16 +104,16 @@
            //var playerPack = ModelCenter.Instance.GetModel<PlayerPackModel>();



            //var clothes = playerPack.GetItemModelByIndex(PackType.rptEquip, (int)RoleEquipType.retClothes);

            //var clothesId = clothes == null ? 0 : (int)clothes.itemInfo.ItemID;

            //var clothesId = clothes == null ? 0 : (int)clothes.itemId;



            //var weapon = playerPack.GetItemModelByIndex(PackType.rptEquip, (int)RoleEquipType.retWeapon);

            //var weaponId = weapon == null ? 0 : (int)weapon.itemInfo.ItemID;

            //var weaponId = weapon == null ? 0 : (int)weapon.itemId;



            //var wings = playerPack.GetItemModelByIndex(PackType.rptEquip, (int)RoleEquipType.retWing);

            //var wingsId = wings == null ? 0 : (int)wings.itemInfo.ItemID;

            //var wingsId = wings == null ? 0 : (int)wings.itemId;



            //var secondary = playerPack.GetItemModelByIndex(PackType.rptEquip, (int)RoleEquipType.retWeapon2);

            //var secondaryId = secondary == null ? 0 : (int)secondary.itemInfo.ItemID;

            //var secondaryId = secondary == null ? 0 : (int)secondary.itemId;

            var fashionClothesId = 0;

            var fashionWeaponId = 0;

            var fashionSecondaryId = 0;

@@ -179,25 +179,25 @@
            var job = PlayerDatas.Instance.baseData.Job;



            var clothes = playerPack.GetItemModelByIndex(PackType.Equip, (int)RoleEquipType.Clothes);

            var clothesId = clothes == null ? 0 : (int)clothes.itemInfo.ItemID;

            var clothesId = clothes == null ? 0 : (int)clothes.itemId;



            var weapon = playerPack.GetItemModelByIndex(PackType.Equip, (int)RoleEquipType.Weapon);

            var weaponId = weapon == null ? 0 : (int)weapon.itemInfo.ItemID;

            var weaponId = weapon == null ? 0 : (int)weapon.itemId;



            var wings = playerPack.GetItemModelByIndex(PackType.Equip, (int)RoleEquipType.Wing);

            var wingsId = wings == null ? 0 : (int)wings.itemInfo.ItemID;

            var wingsId = wings == null ? 0 : (int)wings.itemId;



            var secondary = playerPack.GetItemModelByIndex(PackType.Equip, (int)RoleEquipType.Weapon2);

            var secondaryId = secondary == null ? 0 : (int)secondary.itemInfo.ItemID;

            var secondaryId = secondary == null ? 0 : (int)secondary.itemId;



            var fashionClothes = playerPack.GetItemModelByIndex(PackType.Equip, (int)RoleEquipType.FashionClothes);

            var fashionClothesId = fashionClothes == null ? 0 : (int)fashionClothes.itemInfo.ItemID;

            var fashionClothesId = fashionClothes == null ? 0 : (int)fashionClothes.itemId;



            var fashionWeapon = playerPack.GetItemModelByIndex(PackType.Equip, (int)RoleEquipType.FashionWeapon);

            var fashionWeaponId = fashionWeapon == null ? 0 : (int)fashionWeapon.itemInfo.ItemID;

            var fashionWeaponId = fashionWeapon == null ? 0 : (int)fashionWeapon.itemId;



            var fashionSecondary = playerPack.GetItemModelByIndex(PackType.Equip, (int)RoleEquipType.FashionWeapon2);

            var fashionSecondaryId = fashionSecondary == null ? 0 : (int)fashionSecondary.itemInfo.ItemID;

            var fashionSecondaryId = fashionSecondary == null ? 0 : (int)fashionSecondary.itemId;



            int _suitLevel = 0;




 System/KnapSack/Logic/PackModelInterface.cs

@@ -545,7 +545,7 @@


            if (itemModel.config.UseLV > PlayerDatas.Instance.baseData.LV) return;



            bool isOverdue = IsOverdue(itemModel.itemInfo.ItemGUID, itemModel.itemInfo.ItemID, itemModel.useDataDict);

            bool isOverdue = IsOverdue(itemModel.itemInfo.ItemGUID, itemModel.itemId, itemModel.useDataDict);

            if (isOverdue)

            {

                return;

@@ -881,7 +881,7 @@
                case RoleEquipType.JadeDynasty_Sword4:

                    if (betterEquipExceptDungeonDict.ContainsKey(PlayerDatas.Instance.baseData.MapID))

                    {

                        if (betterEquipExceptDungeonDict[PlayerDatas.Instance.baseData.MapID].Contains(model.itemInfo.ItemID))

                        if (betterEquipExceptDungeonDict[PlayerDatas.Instance.baseData.MapID].Contains(model.itemId))

                        {

                            return;

                        }

@@ -1123,8 +1123,8 @@
            int color1 = startModel.config.ItemColor;

            int color2 = endModel.config.ItemColor;

            if (color1.CompareTo(color2) != 0) return -color1.CompareTo(color2);

            int code1 = startModel.itemInfo.ItemID;

            int code2 = endModel.itemInfo.ItemID;

            int code1 = startModel.itemId;

            int code2 = endModel.itemId;

            if (code1.CompareTo(code2) != 0) return -code1.CompareTo(code2);

            return 0;

        }

@@ -1153,7 +1153,7 @@
            {

                GetCanSellEquipList(_packModelDict[key]);

                ItemModel itemModel = _packModelDict[key];

                if (drugIDs.Contains(itemModel.itemInfo.ItemID))

                if (drugIDs.Contains(itemModel.itemId))

                {

                    if (!_lifePotionDict.ContainsKey(itemModel.config.LV))

                    {

@@ -1423,7 +1423,7 @@
                        int i = 0;

                        for (i = 0; i < itemlist.Count; i++)

                        {

                            bool isOverdue = IsOverdue(itemlist[i].itemInfo.ItemGUID, itemlist[i].itemInfo.ItemID, itemlist[i].useDataDict);

                            bool isOverdue = IsOverdue(itemlist[i].itemInfo.ItemGUID, itemlist[i].itemId, itemlist[i].useDataDict);

                            bool isRealm = PlayerDatas.Instance.baseData.realmLevel >= itemlist[i].config.RealmLimit ? true : false;

                            if (itemlist[i].equipScore > putOnDic[key].equipScore && !isOverdue && isRealm)

                            {


 System/KnapSack/Logic/PlayerPackModels.cs

@@ -314,7 +314,7 @@
                    {

                        if (ItemCntAddAct != null)

                        {

                            ItemCntAddAct(type, itemModel.itemInfo.ItemPlace, itemModel.itemInfo.ItemID);

                            ItemCntAddAct(type, itemModel.itemInfo.ItemPlace, itemModel.itemId);

                        }

                        modelInterface.GetPreciousItem(itemModel);

                        modelInterface.RefreshPickItem(type, itemModel.itemInfo.ItemGUID);

@@ -323,13 +323,13 @@
                    {

                        if (ItemCntReduceAct != null)

                        {

                            ItemCntReduceAct(type, itemModel.itemInfo.ItemPlace, itemModel.itemInfo.ItemID);

                            ItemCntReduceAct(type, itemModel.itemInfo.ItemPlace, itemModel.itemId);

                        }

                    }



                    if (RefreshItemCountAct != null)

                    {

                        RefreshItemCountAct(type, itemModel.itemInfo.ItemPlace, itemModel.itemInfo.ItemID);

                        RefreshItemCountAct(type, itemModel.itemInfo.ItemPlace, itemModel.itemId);

                    }

                }

            }

@@ -372,7 +372,7 @@
            {

                ItemModel itemModel = singlePack.GetItemModelByIndex(clearItem.ItemIndex);

                guid = itemModel.itemInfo.ItemGUID;

                int itemId = itemModel.itemInfo.ItemID;

                int itemId = itemModel.itemId;

                DeleteItemDictByGUID(type, itemModel.itemInfo.ItemGUID);

                singlePack.ClearItemModelByIndex(clearItem.ItemIndex);

                if (RefreshItemCountAct != null)

@@ -445,7 +445,7 @@
                        || modellist[i].itemId == 903

                        || modellist[i].itemId == 904)

                    {

                        KnapsackTimeCDMgr.Instance.Register(modellist[i].itemInfo.ItemGUID, modellist[i].itemInfo.ItemID, configCdTime);

                        KnapsackTimeCDMgr.Instance.Register(modellist[i].itemInfo.ItemGUID, modellist[i].itemId, configCdTime);

                        break;

                    }

                }

@@ -1416,9 +1416,9 @@
            ItemModel itemModel = GetItemModelByGUID(guid);

            if (itemModel == null) return false;



            AttrFruitConfig fruitConfig = AttrFruitConfig.Get(itemModel.itemInfo.ItemID);

            int haveUseCnt = GetDayUseCntByID(itemModel.itemInfo.ItemID);

            int sumHaveUseCnt = GetSumUseCntByID(itemModel.itemInfo.ItemID);

            AttrFruitConfig fruitConfig = AttrFruitConfig.Get(itemModel.itemId);

            int haveUseCnt = GetDayUseCntByID(itemModel.itemId);

            int sumHaveUseCnt = GetSumUseCntByID(itemModel.itemId);

            count = (ulong)itemModel.itemInfo.ItemCount;

            bool isReach = false;

            int remainDayCnt = 0;


 System/KnapSack/Logic/SinglePackModel.cs

@@ -59,15 +59,15 @@


        public ItemModel GetItemModelByIndex(int index)
        {

            switch (packType)

            {

                case PackType.JadeDynastyEquip:

                    if (index >= 121)

                    {

                        index = index - 121;

                    }

                    break;

        {
            switch (packType)
            {
                case PackType.JadeDynastyEquip:
                    if (index >= 121)
                    {
                        index = index - 121;
                    }
                    break;
            }
            ItemModel itemModel = null;
            packModelIndexDict.TryGetValue(index, out itemModel);
@@ -89,7 +89,7 @@
            list = new List<ItemModel>();
            foreach (ItemModel model in packModelIndexDict.Values)
            {
                if (model.itemInfo.ItemID == itemId)
                if (model.itemId == itemId)
                {
                    count += model.itemInfo.ItemCount;
                    list.Add(model);
@@ -108,7 +108,7 @@
            int count = 0;
            foreach (ItemModel model in packModelIndexDict.Values)
            {
                if (model.itemInfo.ItemID == itemId)
                if (model.itemId == itemId)
                {
                    count += model.itemInfo.ItemCount;
                }
@@ -150,7 +150,7 @@
            {
                if (value.config.ItemColor == _quality)
                {
                    itemList.Add(value.itemInfo.ItemID);
                    itemList.Add(value.itemId);
                }
            }

@@ -170,7 +170,7 @@
            List<ItemModel> itemModellist = new List<ItemModel>();
            foreach (ItemModel model in packModelIndexDict.Values)
            {
                if (model.itemInfo.ItemID == itemId)
                if (model.itemId == itemId)
                {
                    itemModellist.Add(model);
                }
@@ -209,7 +209,7 @@
            List<ItemModel> itemModellist = new List<ItemModel>();
            foreach (ItemModel model in packModelIndexDict.Values)
            {
                if (model.itemInfo.ItemID == itemId)
                if (model.itemId == itemId)
                {
                    itemModellist.Add(model);
                }

 System/KnapSack/New/BagWin.cs

@@ -306,7 +306,7 @@
                    {

                        if (modelInterface.GetBagSortBetterEquip(itemModel.config.EquipPlace, itemModel.itemInfo.ItemPlace) != null)

                        {

                            bool isOverdue = modelInterface.IsOverdue(itemModel.itemInfo.ItemGUID, itemModel.itemInfo.ItemID, itemModel.useDataDict);

                            bool isOverdue = modelInterface.IsOverdue(itemModel.itemInfo.ItemGUID, itemModel.itemId, itemModel.useDataDict);

                            if (!isOverdue)

                            {

                                gridCell.uiEffect.Play();


 System/KnapSack/New/BatchWin.cs

@@ -127,7 +127,7 @@
                maxValue = (ulong)BatchUseModel.Instance.maxValue;

            }

          

            ItemCellModel cellModel = new ItemCellModel(itemModel.itemInfo.ItemID, false, (ulong)maxValue, itemModel.itemInfo.IsBind, 
            ItemCellModel cellModel = new ItemCellModel(itemModel.itemId, false, (ulong)maxValue, itemModel.itemInfo.IsBind, 
             itemModel.itemInfo.ItemGUID,itemModel.packType, false);

            _itemCell.Init(cellModel);

            _itemCell.countText.text = maxValue.ToString();

@@ -172,7 +172,7 @@
            if (itemModel == null)

                return;



            if (Buffmodel.BuffCover(itemModel.itemInfo.ItemID))

            if (Buffmodel.BuffCover(itemModel.itemId))

            {

                ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"), Language.Get("FairyLand_Func22"), (bool isOk) =>

                {


 System/KnapSack/New/CommonItemBaisc.cs

@@ -128,8 +128,8 @@
        /// <param name="isCompare"></param>

        public virtual void Init(ItemModel model,bool isCompare = false,int compareScore = 0)

        {

            itemConfig = ItemConfig.Get(model.itemInfo.ItemID);

            InitUI(model.itemInfo.ItemGUID,model.itemInfo.ItemID,(ulong)model.itemInfo.ItemCount,model.equipScore,model.itemInfo.IsBind,model.packType,isCompare,model.useDataDict,compareScore);

            itemConfig = ItemConfig.Get(model.itemId);

            InitUI(model.itemInfo.ItemGUID,model.itemId,(ulong)model.itemInfo.ItemCount,model.equipScore,model.itemInfo.IsBind,model.packType,isCompare,model.useDataDict,compareScore);

        }



        /// <summary>


 System/KnapSack/New/OneKeySellWin.cs

@@ -158,7 +158,7 @@
            int i = 0;

            for(i = 0; i < _oneKeySelllist.Count; i++)

            {

                _chinModel = ItemConfig.Get((int)_oneKeySelllist[i].itemInfo.ItemID);

                _chinModel = ItemConfig.Get((int)_oneKeySelllist[i].itemId);

                if(_chinModel != null)

                {

                    sellMoney += _chinModel.SilverPrice;


 System/KnapSack/New/RoleEquipStarTips.cs

@@ -80,7 +80,7 @@
        {

            foreach (var model in _itemDict.Values)

            {

                _tagChinModel = ItemConfig.Get((int)model.itemInfo.ItemID);

                _tagChinModel = ItemConfig.Get((int)model.itemId);

                if (_tagChinModel == null)

                    return;

                _curStarsCount += _tagChinModel.StarLevel;


 System/KnapSack/NewItemGetWin.cs

@@ -86,7 +86,7 @@

                if (model != null)
                {
                    int itemId = model.itemInfo.ItemID;
                    int itemId = model.itemId;
                    var itemBehaviour = RequireBehaviour();
                    if (itemBehaviour != null)
                    {

 System/KnapSack/PreciousItemGetBehaviour.cs

@@ -123,7 +123,7 @@
        {

            if (_item != null)

            {

                var itemConfig = ItemConfig.Get(_item.itemInfo.ItemID);

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

                m_ItemName.text = itemConfig.ItemName;

                m_ItemName.color = UIHelper.GetUIColor(itemConfig.ItemColor, true);




 System/KnapSack/RealmBetterEquipBehaviour.cs

@@ -66,7 +66,7 @@
            ItemModel betterEquip;

            if (model.TryGetBetterEquip(model.currentEquipGuid, out betterEquip))

            {

                var itemConfig = ItemConfig.Get(betterEquip.itemInfo.ItemID);

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

                itemTipsModel.SetItemTipsModel(PackType.Item, betterEquip.itemInfo.ItemGUID);

            }

        }

@@ -78,7 +78,7 @@


        private void DrawBetterEquip(ItemModel betterModel)

        {

            var itemConfig = ItemConfig.Get(betterModel.itemInfo.ItemID);

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

            m_EquipName.text = itemConfig.ItemName;

            m_EquipName.color = UIHelper.GetUIColor(itemConfig.ItemColor, true);

            m_EquipBehaviour.Init(betterModel, true);


 System/Market/PutawayWin.cs

@@ -10,8 +10,8 @@
using UnityEngine.UI;

using Snxxz.UI;
using UnityEngine.Serialization;



using UnityEngine.Serialization;

namespace Snxxz.UI
{
    [XLua.Hotfix]
@@ -48,9 +48,9 @@

        ItemTipsModel itemTipsModel { get { return ModelCenter.Instance.GetModel<ItemTipsModel>(); } }

        PlayerPackModel packModel { get { return ModelCenter.Instance.GetModel<PlayerPackModel>(); } }





        PlayerPackModel packModel { get { return ModelCenter.Instance.GetModel<PlayerPackModel>(); } }


        #region Built-in
        protected override void BindController()
        {
@@ -69,21 +69,21 @@
            m_Keyboard.onConfirm.AddListener((bool isOk) =>
            {
                if (isOk)
                {

                {
                    PutawayData.Instance.priceCount = Mathf.Max(PutawayData.Instance.priceCount, model.minprice);
                    m_Keyboard.gameObject.SetActive(false);
                }
                RefreshPriceCnt((int)PutawayData.Instance.priceCount, true);
            });
            m_ClickSpace.AddListener(ClickSpace);
        }



        }

        protected override void OnPreOpen()
        {
            if (PutawayData.Instance.itemModel != null)
            {
                CB503_tagCGPYQueryBourseItemOnSale pak = new CB503_tagCGPYQueryBourseItemOnSale();
                pak.ItemID = (uint)PutawayData.Instance.itemModel.itemInfo.ItemID;
                pak.ItemID = (uint)PutawayData.Instance.itemModel.itemId;
                pak.ItemName = string.Empty;
                pak.QueryType = 0;
                GameNetSystem.Instance.SendInfo(pak);
@@ -96,14 +96,14 @@

            Display();

            OnRefreshItemDealPrice((int)PutawayData.Instance.itemModel.itemInfo.ItemID);
            OnRefreshItemDealPrice((int)PutawayData.Instance.itemModel.itemId);
        }

        private void OnRefreshItemDealPrice(int itemId)
        {
            if (PutawayData.Instance.itemModel.itemInfo.ItemID == (uint)itemId)
            if (PutawayData.Instance.itemModel.itemId == (uint)itemId)
            {
                uint price = model.GetItemDealPrice((uint)PutawayData.Instance.itemModel.itemInfo.ItemID);
                uint price = model.GetItemDealPrice((uint)PutawayData.Instance.itemModel.itemId);
                if (price == 0)
                {
                    m_DealItemTip.text = Language.Get("Market_Text_21");
@@ -156,10 +156,10 @@
                    MarketItemData data = list[i];
                    if (data.PlayerID != PlayerDatas.Instance.baseData.PlayerID)
                    {
                        if (index < m_PutawayItems.Length)

                        {

                            m_PutawayItems[index].gameObject.SetActive(true);

                            m_PutawayItems[index].Init(data, OnQueryItemClick);

                        if (index < m_PutawayItems.Length)
                        {
                            m_PutawayItems[index].gameObject.SetActive(true);
                            m_PutawayItems[index].Init(data, OnQueryItemClick);
                        }
                        index++;
                    }
@@ -167,7 +167,7 @@
                for (int i = index; i < 3; i++)
                {
                    m_PutawayItems[i].gameObject.SetActive(false);
                }

                }
                m_ContainerNoneItems.gameObject.SetActive(index == 0);
            }
        }
@@ -257,16 +257,16 @@

        private void Display()
        {
            for (int i = 0; i < m_PutawayItems.Length; i++)

            {

                m_PutawayItems[i].gameObject.SetActive(false);

            for (int i = 0; i < m_PutawayItems.Length; i++)
            {
                m_PutawayItems[i].gameObject.SetActive(false);
            }
            m_ContainerNoneItems.gameObject.SetActive(true);
            if (PutawayData.Instance.itemModel == null)
            {
                return;
            }
            ItemConfig config = ItemConfig.Get((int)PutawayData.Instance.itemModel.itemInfo.ItemID);
            ItemConfig config = ItemConfig.Get((int)PutawayData.Instance.itemModel.itemId);
            if (config != null)
            {
                var _itemColor = config.ItemColor;
@@ -314,7 +314,7 @@
            m_PutawayBtnTxt.text = UIHelper.ReplaceNewLine(Language.Get("Market_Text_17", model.totalPutawayCnt - PlayerDatas.Instance.market.putawayCnt));
            int pwdVipLv = vipModel.GetPrivilegeVipLv(VipPrivilegeType.MarketPutawayPwd);
            m_SetPasswordTxt.text = UIHelper.ReplaceNewLine(Language.Get("Market_Text_16", pwdVipLv));
            OnRefreshItemDealPrice((int)PutawayData.Instance.itemModel.itemInfo.ItemID);
            OnRefreshItemDealPrice((int)PutawayData.Instance.itemModel.itemId);

            if (PlayerDatas.Instance.baseData.VIPLv < pwdVipLv)
            {
@@ -363,16 +363,16 @@

        private void OnValueChange()
        {
            int result = int.Parse(m_Keyboard.Value);

            int result = int.Parse(m_Keyboard.Value);
            PutawayData.Instance.priceCount = result;
            RefreshPriceCnt((int)PutawayData.Instance.priceCount, false);
        }

        private void ClickSpace()

        {

        private void ClickSpace()
        {
            int result = int.Parse(m_Keyboard.Value);
            PutawayData.Instance.priceCount = Mathf.Max(result, model.minprice);
            RefreshPriceCnt((int)PutawayData.Instance.priceCount, true);

            RefreshPriceCnt((int)PutawayData.Instance.priceCount, true);
        }

        private void RefreshPriceCnt(int _count, bool verify)

 System/Mount/MountWin.cs

@@ -139,7 +139,7 @@
        {

            if (ItemLogicUtility.Instance.useItemModel != null)//坐骑单

            {

                int ItemId = ItemLogicUtility.Instance.useItemModel.itemInfo.ItemID;

                int ItemId = ItemLogicUtility.Instance.useItemModel.itemId;

                if (ItemId == 181)

                {

                   int MountID= mountModel.GetMinExpMount();

@@ -153,7 +153,7 @@


            if (ItemLogicUtility.Instance.useItemModel != null)//跳轉選中（碎片）

            {

                int ItemId = ItemLogicUtility.Instance.useItemModel.itemInfo.ItemID;

                int ItemId = ItemLogicUtility.Instance.useItemModel.itemId;



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

                {


 System/Mount/PlayerMountDatas.cs

@@ -491,7 +491,7 @@
            // var configs = HorseConfig.GetValues();

            foreach (var config in Hconfigs)

            {

                if (config.ItemID == info.itemInfo.ItemID)

                if (config.ItemID == info.itemId)

                {

                    HorseIDNow = config.HorseID;

                    _HorseIDNow = config.HorseID.ToString();


 System/Pet/PetAttributeWin.cs

@@ -321,7 +321,7 @@
        {

            if (ItemLogicUtility.Instance.useItemModel != null)//灵宠单

            {

                int ItemId = ItemLogicUtility.Instance.useItemModel.itemInfo.ItemID;

                int ItemId = ItemLogicUtility.Instance.useItemModel.itemId;

                if (ItemId == 4151)

                {

                    int Pet = petmodel.GetMinPetExp();

@@ -335,7 +335,7 @@
            }

            if (ItemLogicUtility.Instance.useItemModel != null)//坐骑碎片

            {

                int ItemId = ItemLogicUtility.Instance.useItemModel.itemInfo.ItemID;

                int ItemId = ItemLogicUtility.Instance.useItemModel.itemId;

                //var petinfo = PetInfoConfig.GetValues();



                foreach (var Value in petinfo)


 System/Realm/RealmBossShow.cs

@@ -116,16 +116,16 @@
            var _job = PlayerDatas.Instance.baseData.Job;

            #region 装备

            var clothes = playerPack.GetItemModelByIndex(PackType.Equip, (int)RoleEquipType.Clothes);

            var _clothesId = clothes == null ? 0 : (int)clothes.itemInfo.ItemID;

            var _clothesId = clothes == null ? 0 : (int)clothes.itemId;



            var secondary = playerPack.GetItemModelByIndex(PackType.Equip, (int)RoleEquipType.Weapon2);

            var _secondaryId = secondary == null ? 0 : (int)secondary.itemInfo.ItemID;

            var _secondaryId = secondary == null ? 0 : (int)secondary.itemId;



            var fashionClothes = playerPack.GetItemModelByIndex(PackType.Equip, (int)RoleEquipType.FashionClothes);

            var fashionClothesId = fashionClothes == null ? 0 : (int)fashionClothes.itemInfo.ItemID;

            var fashionClothesId = fashionClothes == null ? 0 : (int)fashionClothes.itemId;



            var fashionSecondary = playerPack.GetItemModelByIndex(PackType.Equip, (int)RoleEquipType.FashionWeapon2);

            var fashionSecondaryId = fashionSecondary == null ? 0 : (int)fashionSecondary.itemInfo.ItemID;

            var fashionSecondaryId = fashionSecondary == null ? 0 : (int)fashionSecondary.itemId;

            #endregion



            showPoint = m_HeroStage;


 System/Realm/RealmPropertyUpWin.cs

@@ -309,22 +309,22 @@
                    m_ModelRawImage.rectTransform.sizeDelta = new Vector2(680, 510);



                    var clothes = playerPack.GetItemModelByIndex(PackType.Equip, (int)RoleEquipType.Clothes);

                    var _clothesId = clothes == null ? 0 : (int)clothes.itemInfo.ItemID;

                    var _clothesId = clothes == null ? 0 : (int)clothes.itemId;



                    var weapon = playerPack.GetItemModelByIndex(PackType.Equip, (int)RoleEquipType.Weapon);

                    var _weaponId = weapon == null ? 0 : (int)weapon.itemInfo.ItemID;

                    var _weaponId = weapon == null ? 0 : (int)weapon.itemId;



                    var secondary = playerPack.GetItemModelByIndex(PackType.Equip, (int)RoleEquipType.Weapon2);

                    var _secondaryId = secondary == null ? 0 : (int)secondary.itemInfo.ItemID;

                    var _secondaryId = secondary == null ? 0 : (int)secondary.itemId;



                    var fashionClothes = playerPack.GetItemModelByIndex(PackType.Equip, (int)RoleEquipType.FashionClothes);

                    var fashionClothesId = fashionClothes == null ? 0 : (int)fashionClothes.itemInfo.ItemID;

                    var fashionClothesId = fashionClothes == null ? 0 : (int)fashionClothes.itemId;



                    var fashionWeapon = playerPack.GetItemModelByIndex(PackType.Equip, (int)RoleEquipType.FashionWeapon);

                    var fashionWeaponId = fashionWeapon == null ? 0 : (int)fashionWeapon.itemInfo.ItemID;

                    var fashionWeaponId = fashionWeapon == null ? 0 : (int)fashionWeapon.itemId;



                    var fashionSecondary = playerPack.GetItemModelByIndex(PackType.Equip, (int)RoleEquipType.FashionWeapon2);

                    var fashionSecondaryId = fashionSecondary == null ? 0 : (int)fashionSecondary.itemInfo.ItemID;

                    var fashionSecondaryId = fashionSecondary == null ? 0 : (int)fashionSecondary.itemId;



                    var model = ModelCenter.Instance.GetModel<MagicianModel>();

                    Dictionary<int, int> dict = new Dictionary<int, int>();


 System/Role/GodWeaponPreviewWin.cs

@@ -248,25 +248,25 @@
            var playerPack = ModelCenter.Instance.GetModel<PlayerPackModel>();



            var clothes = playerPack.GetItemModelByIndex(PackType.Equip, (int)RoleEquipType.Clothes);

            var clothesId = clothes == null ? 0 : (int)clothes.itemInfo.ItemID;

            var clothesId = clothes == null ? 0 : (int)clothes.itemId;



            var weapon = playerPack.GetItemModelByIndex(PackType.Equip, (int)RoleEquipType.Weapon);

            var weaponId = weapon == null ? 0 : (int)weapon.itemInfo.ItemID;

            var weaponId = weapon == null ? 0 : (int)weapon.itemId;



            var wings = playerPack.GetItemModelByIndex(PackType.Equip, (int)RoleEquipType.Wing);

            var wingsId = wings == null ? 0 : (int)wings.itemInfo.ItemID;

            var wingsId = wings == null ? 0 : (int)wings.itemId;



            var secondary = playerPack.GetItemModelByIndex(PackType.Equip, (int)RoleEquipType.Weapon2);

            var secondaryId = secondary == null ? 0 : (int)secondary.itemInfo.ItemID;

            var secondaryId = secondary == null ? 0 : (int)secondary.itemId;



            var fashionClothes = playerPack.GetItemModelByIndex(PackType.Equip, (int)RoleEquipType.FashionClothes);

            var fashionClothesId = fashionClothes == null ? 0 : (int)fashionClothes.itemInfo.ItemID;

            var fashionClothesId = fashionClothes == null ? 0 : (int)fashionClothes.itemId;



            var fashionWeapon = playerPack.GetItemModelByIndex(PackType.Equip, (int)RoleEquipType.FashionWeapon);

            var fashionWeaponId = fashionWeapon == null ? 0 : (int)fashionWeapon.itemInfo.ItemID;

            var fashionWeaponId = fashionWeapon == null ? 0 : (int)fashionWeapon.itemId;



            var fashionSecondary = playerPack.GetItemModelByIndex(PackType.Equip, (int)RoleEquipType.FashionWeapon2);

            var fashionSecondaryId = fashionSecondary == null ? 0 : (int)fashionSecondary.itemInfo.ItemID;

            var fashionSecondaryId = fashionSecondary == null ? 0 : (int)fashionSecondary.itemId;



            int _suitLevel = 0;




 System/RoleParticulars/ViewFuncCell.cs

@@ -116,7 +116,7 @@
                                break;

                            foreach (var itemData in packTypeModel.GetPackModelIndexDict().Values)

                            {

                                ItemConfig _tagChinItemModel = ItemConfig.Get((int)itemData.itemInfo.ItemID);

                                ItemConfig _tagChinItemModel = ItemConfig.Get((int)itemData.itemId);

                                if (_tagChinItemModel != null && (_tagChinItemModel.ItemColor > viewRoleFuncModel.condition[0]

                                    || (_tagChinItemModel.ItemColor == viewRoleFuncModel.condition[0]

                                    && (viewRoleFuncModel.condition.Length < 2 || _tagChinItemModel.StarLevel >= viewRoleFuncModel.condition[1]))))

@@ -167,7 +167,7 @@
                            ItemModel itemModel = playerPack.GetItemModelByIndex(PackType.Equip, (int)RoleEquipType.Wing);

                            if (itemModel != null)

                            {

                                ItemConfig _tagChinItemModel = ItemConfig.Get((int)itemModel.itemInfo.ItemID);

                                ItemConfig _tagChinItemModel = ItemConfig.Get((int)itemModel.itemId);

                                selfCompareTxt.text = string.Format(viewRoleFuncModel.compareTip, _tagChinItemModel.ItemName);

                            }

                            else


 System/Strengthening/EquipWashModel.cs

@@ -465,7 +465,7 @@
        if (model == null)

            return false;



        chinItemModel = ItemConfig.Get((int)model.itemInfo.ItemID);

        chinItemModel = ItemConfig.Get((int)model.itemId);

        int fullLv = GetWashFullLv(chinItemModel.EquipPlace,chinItemModel.LV);

        if (washPro.XLAttrLV == fullLv)

        {

@@ -499,7 +499,7 @@
        if (model == null)

            return false;



        chinItemModel = ItemConfig.Get((int)model.itemInfo.ItemID);

        chinItemModel = ItemConfig.Get((int)model.itemId);

        if(chinItemModel.LV >= GetEquipWashMinLv(chinItemModel.EquipPlace))

        {

            return true;


 System/Strengthening/GemEquipPlate.cs

@@ -58,7 +58,7 @@
            ItemModel _itemModel = playerPack.GetItemModelByIndex(PackType.Equip,_pos);
            if (_itemModel != null)
            {
                ItemConfig cfg = ItemConfig.Get(_itemModel.itemInfo.ItemID);
                ItemConfig cfg = ItemConfig.Get(_itemModel.itemId);
                m_EquipNameTxt.gameObject.SetActive(true);
                m_EquipNameTxt.text = UIHelper.AppendStringColor(cfg.ItemColor, cfg.ItemName, true);
                m_ItemCell.gameObject.SetActive(true);
@@ -75,9 +75,9 @@
                }
                m_ContentTxt.gameObject.SetActive(true);
                var equipPartName = string.Empty;
                if (_pos - 1 < model.equipPartNames.Length)

                {

                    equipPartName = model.equipPartNames[_pos - 1];

                if (_pos - 1 < model.equipPartNames.Length)
                {
                    equipPartName = model.equipPartNames[_pos - 1];
                }
                m_ContentTxt.text = Language.Get("L1076", equipPartName);
                m_TipTxt.gameObject.SetActive(true);
@@ -96,7 +96,7 @@
            {
                return;
            }
            ItemConfig cfg = ItemConfig.Get(_itemModel.itemInfo.ItemID);
            ItemConfig cfg = ItemConfig.Get(_itemModel.itemId);
            int holeCnt = 0;
            m_GemIdQueue.Clear();
            uint[] stones = PlayerStoneData.Instance.GetStoneInfo(EquipPos);

 System/Strengthening/GemModel.cs

@@ -128,7 +128,7 @@
            for (int i = 0; i < _list.Count; i++)

            {

                ItemModel _itemModel = _list[i];

                ItemConfig _itemCfg = ItemConfig.Get(_itemModel.itemInfo.ItemID);

                ItemConfig _itemCfg = ItemConfig.Get(_itemModel.itemId);

                if (_itemCfg.EffectValueA1 == _type && _itemCfg.EffectValueB1 == _level)

                {

                    if (_bind)

@@ -315,7 +315,7 @@
                {

                    continue;

                }

                ItemConfig itemCfg = ItemConfig.Get((int)item.itemInfo.ItemID);

                ItemConfig itemCfg = ItemConfig.Get((int)item.itemId);

                List<ItemModel> list = IsBagHaveGem(FuncConfigConfig.GetGemTypeByEquipPos(item.itemInfo.ItemPlace));

                if (list == null || list.Count == 0)

                {

@@ -389,7 +389,7 @@
                {

                    continue;

                }

                var itemConfig = ItemConfig.Get((int)equip.itemInfo.ItemID);

                var itemConfig = ItemConfig.Get((int)equip.itemId);

                uint[] stones = PlayerStoneData.Instance.GetStoneInfo(i);

                for (int j = 0; j < 4; j++)

                {

@@ -563,7 +563,7 @@
                for (int i = 0; i < list.Count; i++)

                {

                    ItemModel item = list[i];

                    ItemConfig cfg = ItemConfig.Get((int)item.itemInfo.ItemID);

                    ItemConfig cfg = ItemConfig.Get((int)item.itemId);

                    if (cfg.EffectValueA1 != type)

                    {

                        list.RemoveAt(i);


 System/Strengthening/InlaidPanel.cs

@@ -171,7 +171,7 @@
        {

            presentItemCell.gameObject.SetActive(true);

            m_ContainerNoEquip.gameObject.SetActive(false);

            ItemConfig _itemCfg = ItemConfig.Get(_itemModel.itemInfo.ItemID);

            ItemConfig _itemCfg = ItemConfig.Get(_itemModel.itemId);

            presentItemCell.Init(_itemModel);

            for (int i = 1; i < 5; i++)

            {

@@ -191,7 +191,7 @@


    void UpdateHole(ItemModel _itemModel, int _index)

    {

        ItemConfig _itemCfg = ItemConfig.Get(_itemModel.itemInfo.ItemID);

        ItemConfig _itemCfg = ItemConfig.Get(_itemModel.itemId);

        bool openHole = false;

        if (_index < 4)

        {

@@ -374,7 +374,7 @@
        {

            ItemModel _item = m_GemItems[i];

            CellInfo _cellInfo = CellInfo.Default;

            _cellInfo.infoInt1 = _item.itemInfo.ItemID;

            _cellInfo.infoInt1 = _item.itemId;

            _cellInfo.infoInt2 = _item.itemInfo.ItemPlace;

            _cellInfo.SetInfo(_item.itemInfo.IsBind);

            _cellInfo.infoStr1 = _item.itemInfo.ItemCount.ToString();

@@ -648,7 +648,7 @@
        for (int i = 0; i < list.Count; i++)

        {

            ItemModel _itemModel = list[i];

            ItemConfig _itemCfg = ItemConfig.Get(_itemModel.itemInfo.ItemID);

            ItemConfig _itemCfg = ItemConfig.Get(_itemModel.itemId);

            if (_itemCfg.EffectValueA1 == type)

            {

                m_GemItems.Add(_itemModel);

@@ -674,8 +674,8 @@


    private int Compare(ItemModel x, ItemModel y)

    {

        ItemConfig cfgx = ItemConfig.Get((int)x.itemInfo.ItemID);

        ItemConfig cfgy = ItemConfig.Get((int)y.itemInfo.ItemID);

        ItemConfig cfgx = ItemConfig.Get((int)x.itemId);

        ItemConfig cfgy = ItemConfig.Get((int)y.itemId);

        if (cfgx.EffectValueB1.CompareTo(cfgy.EffectValueB1) != 0)

        {

            return -cfgx.EffectValueB1.CompareTo(cfgy.EffectValueB1);


 System/Strengthening/PlayerStrengthengDatas.cs

@@ -195,7 +195,7 @@
            ItemModel itemModel = singlePack.GetItemModelByIndex(key);

            if (itemModel != null)

            {

                ItemConfig _Item = ItemConfig.Get((int)itemModel.itemInfo.ItemID);

                ItemConfig _Item = ItemConfig.Get((int)itemModel.itemId);

                ItemPlusMaxConfig _itemPM = new ItemPlusMaxConfig();

                if (EquipMax(_Item.EquipPlace) != 3)

                {

@@ -320,7 +320,7 @@
        int EquipPartStarLV = _EqInfo[_equippedWith].EquipPartStarLV;

        ItemModel itemModel = playerPack.GetItemModelByIndex(PackType.Equip, _equippedWith);

        ;

        ItemConfig _Item = ItemConfig.Get((int)itemModel.itemInfo.ItemID);

        ItemConfig _Item = ItemConfig.Get((int)itemModel.itemId);

        ItemPlusMaxConfig _itemPM = new ItemPlusMaxConfig();

        if (EquipMax(_Item.EquipPlace) != 3)

        {

@@ -470,7 +470,7 @@
            ItemModel itemModel = playerPack.GetItemModelByIndex(PackType.Equip, key);

            if (itemModel != null)

            {

                ItemConfig _Item = ItemConfig.Get((int)itemModel.itemInfo.ItemID);

                ItemConfig _Item = ItemConfig.Get((int)itemModel.itemId);

                ItemPlusMaxConfig _itemPM = new ItemPlusMaxConfig();

                if (EquipMax(_Item.EquipPlace) != 3)

                {


 System/Strengthening/StrengtheningSripts.cs

@@ -333,7 +333,7 @@
            ItemPlusMaxConfig _itemPM = new ItemPlusMaxConfig();

            if (strengthengmodel.EquipMax(_tag) != 3)

            {

                _itemPM = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(strengthengmodel.EquipMax(_tag), ItemConfig.Get((int)item.itemInfo.ItemID).LV, ItemConfig.Get(item.itemInfo.ItemID).ItemColor);

                _itemPM = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(strengthengmodel.EquipMax(_tag), ItemConfig.Get((int)item.itemId).LV, ItemConfig.Get(item.itemId).ItemColor);

            }

            else

            {

@@ -393,7 +393,7 @@
            if (strengthengmodel.EquipMax(_tag) != 3)

            {

                _itemPM = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(strengthengmodel.EquipMax(_tag),

                    ItemConfig.Get(item.itemInfo.ItemID).LV, ItemConfig.Get(item.itemInfo.ItemID).ItemColor);

                    ItemConfig.Get(item.itemId).LV, ItemConfig.Get(item.itemId).ItemColor);

            }

            else

            {

@@ -476,7 +476,7 @@
        if (strengthengmodel.EquipMax(_tag) != 3)

        {

            _itemPM = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(strengthengmodel.EquipMax(_tag),

                ItemConfig.Get(item.itemInfo.ItemID).LV, ItemConfig.Get(item.itemInfo.ItemID).ItemColor);

                ItemConfig.Get(item.itemId).LV, ItemConfig.Get(item.itemId).ItemColor);

        }

        else

        {

@@ -595,7 +595,7 @@
                if (strengthengmodel.EquipMax(int.Parse(_locationSort[i])) != 3)

                {

                    _itemPM = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(strengthengmodel.EquipMax(int.Parse(_locationSort[i])),

                        ItemConfig.Get(item.itemInfo.ItemID).LV, ItemConfig.Get(item.itemInfo.ItemID).ItemColor);

                        ItemConfig.Get(item.itemId).LV, ItemConfig.Get(item.itemId).ItemColor);

                }

                else

                {

@@ -634,7 +634,7 @@
                ItemCell _ItemCell = _content.GetChild(i - 1).transform.Find("ItemCell").GetComponent<ItemCell>();

                _ItemCell.gameObject.SetActive(true);

                _ItemCell.Init(item);

                _content.GetChild(i - 1).transform.Find("ContentText").GetComponent<Text>().text = ItemColor((int)item.itemInfo.ItemID, (_wear[i - 1]));

                _content.GetChild(i - 1).transform.Find("ContentText").GetComponent<Text>().text = ItemColor((int)item.itemId, (_wear[i - 1]));

                _content.GetChild(i - 1).transform.Find("ContentText").gameObject.SetActive(true);

                _content.GetChild(i - 1).transform.Find("TextBGPanel").gameObject.SetActive(false);

            }

@@ -662,7 +662,7 @@
                    ItemCell _ItemCell = _content.GetChild(i - 1).transform.Find("ItemCell").GetComponent<ItemCell>();

                    _ItemCell.gameObject.SetActive(true);

                    _ItemCell.Init(item);

                    _content.GetChild(i - 1).transform.Find("ContentText").GetComponent<Text>().text = ItemColor((int)item.itemInfo.ItemID, (_fullLevel[i - _wear.Count - _notWear.Count - 1]));

                    _content.GetChild(i - 1).transform.Find("ContentText").GetComponent<Text>().text = ItemColor((int)item.itemId, (_fullLevel[i - _wear.Count - _notWear.Count - 1]));

                    _content.GetChild(i - 1).transform.Find("ContentText").gameObject.SetActive(true);

                    _content.GetChild(i - 1).transform.Find("TextBGPanel").gameObject.SetActive(false);

                }

@@ -778,7 +778,7 @@
        if (strengthengmodel.EquipMax(_number) != 3)

        {

            _tagItem = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(strengthengmodel.EquipMax(_number),

                ItemConfig.Get(item.itemInfo.ItemID).LV, ItemConfig.Get(item.itemInfo.ItemID).ItemColor);

                ItemConfig.Get(item.itemId).LV, ItemConfig.Get(item.itemId).ItemColor);

        }

        else

        {

@@ -805,7 +805,7 @@
        TheningFloor.color = new Color32(255, 255, 255, 255);

        ItemModel item = playerPack.GetItemModelByIndex(PackType.Equip, _tag);

        NowIteemCell.Init(item);

        ItemConfig tagItem = ItemConfig.Get(item.itemInfo.ItemID.ToString());

        ItemConfig tagItem = ItemConfig.Get(item.itemId.ToString());



        NowIteemCell.cellBtn.RemoveAllListeners();

        NowIteemCell.cellBtn.AddListener(() =>

@@ -855,7 +855,7 @@


        if (_tagItem.attType.Split('|').Length == 1)

        {

            Dictionary<int, int> _dicOne = AsStipulated((int)item.itemInfo.ItemID);

            Dictionary<int, int> _dicOne = AsStipulated((int)item.itemId);

            PlayerPropertyConfig _playPM = PlayerPropertyConfig.Get(_tagItem.attType);

            if (ItemPlusConfig.GetTypeAndGrade(_strType, _levelNum + 1) == null)

                return;

@@ -872,7 +872,7 @@
            m_DefenseText.gameObject.SetActive(true);

            m_LifeValueText.gameObject.SetActive(true);



            Dictionary<int, int> _dicTwo = AsStipulated((int)item.itemInfo.ItemID);

            Dictionary<int, int> _dicTwo = AsStipulated((int)item.itemId);

            string[] _str = new string[] { };

            string[] _strA = new string[] { };

            _str = _tagItem.attType.Split('|');

@@ -1120,7 +1120,7 @@


        Text _nameText = _content.Find(_toggleName[_equippedWithA] + "/ContentText").GetComponent<Text>();

        string str = null;

        ItemConfig _Item = ItemConfig.Get((int)item.itemInfo.ItemID);

        ItemConfig _Item = ItemConfig.Get((int)item.itemId);

        ItemPlusMaxConfig _itemPM = new ItemPlusMaxConfig();

        if (strengthengmodel.EquipMax(_equippedWithA) != 3)

        {


 System/Strengthening/WingsBouncedWin.cs

@@ -91,9 +91,9 @@
        {

            int Index = cell.index;

            WingButton _WingButton = cell.GetComponent<WingButton>();

            ItemConfig tagItem = ItemConfig.Get((int)WingDic[Index].itemInfo.ItemID);

            ItemConfig tagItem = ItemConfig.Get((int)WingDic[Index].itemId);

            ItemModel model = playerPack.GetItemModelByIndex(PackType.Item, Index);

            int color = modelInterface.GetItemQuality(model.itemInfo.ItemID, model.useDataDict);

            int color = modelInterface.GetItemQuality(model.itemId, model.useDataDict);

            _WingButton.IconBG.SetItemBackGround(color);

            _WingButton.Icon.SetSprite(tagItem.IconKey);

            _WingButton.WingsText.text = UIHelper.AppendStringColor((TextColType)color, tagItem.ItemName, true);

@@ -153,7 +153,7 @@


            foreach (int index in backpack_dic.Keys)

            {

                int itemId = (int)backpack_dic[index].itemInfo.ItemID;

                int itemId = (int)backpack_dic[index].itemId;

                if ( !WingRefineExpConfig.Has(itemId)|| !ItemConfig.IsWing(itemId))

                {

                    continue;


 System/Strengthening/WingsRedDot.cs

@@ -91,7 +91,7 @@
                Marking = 0;

                return;

            }

            var WingItemA = WingRefineExpConfig.Get(itemModel.itemInfo.ItemID);

            var WingItemA = WingRefineExpConfig.Get(itemModel.itemId);

            if (WingItemA == null)

            {

                WingNumber = 0;

@@ -104,7 +104,7 @@
            List<int> wingsRefinelist = itemModel.GetUseDataModel((int)ItemUseDataKey.wingProgressValue);

            if (wingsRefinelist != null)

            {

                var config = WingRefineExpConfig.Get((int)itemModel.itemInfo.ItemID);

                var config = WingRefineExpConfig.Get((int)itemModel.itemId);

                int WingsPhase = config.WingsPhase;//获取翅膀阶数

                if (WingRefineAttr.Count <= 0)

                {

@@ -131,7 +131,7 @@
            foreach (int index in backpack_dic.Keys)

            {

                var item = backpack_dic[index];

                var itemId = item.itemInfo.ItemID;

                var itemId = item.itemId;

                if (WingRefineExpConfig.Has(itemId) && ItemConfig.IsWing(itemId))

                {

                    var  _WingsInformation = new WingsInformation();

@@ -141,7 +141,7 @@
                }

            }



            var config1 = WingRefineExpConfig.Get((int)itemModel.itemInfo.ItemID);

            var config1 = WingRefineExpConfig.Get((int)itemModel.itemId);

            foreach (var key in _dicWings.Keys)

            {

                var wings = ItemConfig.Get(_dicWings[key].WingsID);


 System/Strengthening/WingsRefined.cs

@@ -214,7 +214,7 @@
            {

                expValue += Sort2(key);

                //ItemModel model = playerPack.GetItemModelByIndex(PackType.rptItem, key);

                //expValue += WingRefineExpConfig.Get(model.itemInfo.ItemID).EXPupper;

                //expValue += WingRefineExpConfig.Get(model.itemId).EXPupper;

            }

        }

        return _currentRefiningAll > expValue;

@@ -340,7 +340,7 @@
        {

            PreviewMax = _currentRefiningAll;

        }

        var config = WingRefineExpConfig.Get((int)itemModel.itemInfo.ItemID);

        var config = WingRefineExpConfig.Get((int)itemModel.itemId);

        _RefiningDegreesMin = (float)Math.Round((itemModel.config.EffectValueA2 +

            _DicWingRe[config.WingsPhase].Ability2Value *

            ((float)PreviewMin / _currentRefiningAll)) / 100, 2);

@@ -490,7 +490,7 @@
        Dictionary<int, ItemModel> backpack_dic = singlePack.GetPackModelIndexDict();

        foreach (int index in backpack_dic.Keys)

        {

            int _id = (int)backpack_dic[index].itemInfo.ItemID;

            int _id = (int)backpack_dic[index].itemId;

            if (!ItemConfig.IsWing(_id))

            {

                continue;

@@ -526,7 +526,7 @@
        {

            return;

        }

        int itemID = putOnModel.itemInfo.ItemID;//物品ID

        int itemID = putOnModel.itemId;//物品ID

        var WingItem = WingRefineExpConfig.Get(itemID);

        if (WingItem == null)

        {

@@ -537,11 +537,11 @@
        foreach (var itemIndex in items.Keys)

        {

            var item = items[itemIndex];

            if (WingRefineExpConfig.Has(item.itemInfo.ItemID))

            if (WingRefineExpConfig.Has(item.itemId))

            {

                if (ItemConfig.IsWing(item.itemInfo.ItemID))

                if (ItemConfig.IsWing(item.itemId))

                {

                    _wingItemDic.Add(itemIndex, item.itemInfo.ItemID);

                    _wingItemDic.Add(itemIndex, item.itemId);

                    WingDic.Add(itemIndex, item);

                }

            }

@@ -563,14 +563,14 @@
        int itemID = 0;

        if (itemModel != null)

        {

            itemID = itemModel.itemInfo.ItemID;//物品ID

            itemID = itemModel.itemId;//物品ID

        }

        var WingItem = WingRefineExpConfig.Get(itemID);

        if (itemModel != null && WingItem != null)

        {

            WingsImage.gameObject.SetActive(false);

            IconButton.gameObject.SetActive(true);

            WingsBG.SetItemBackGround(modelInterface.GetItemQuality(itemModel.itemInfo.ItemID, itemModel.useDataDict));

            WingsBG.SetItemBackGround(modelInterface.GetItemQuality(itemModel.itemId, itemModel.useDataDict));

            IconButton.GetComponent<Image>().SetSprite(itemModel.config.IconKey);

            IconButton.RemoveAllListeners();

            IconButton.AddListener(() =>

@@ -600,9 +600,9 @@
        }

        EquipFirstTxt.SetActive(false);

        ItemModel itemModel = playerPack.GetItemModelByIndex(PackType.Equip, (int)RoleEquipType.Wing);

        var config = WingRefineExpConfig.Get((int)itemModel.itemInfo.ItemID);

        var config = WingRefineExpConfig.Get((int)itemModel.itemId);

        int _modelID = config.Model;

        if (itemModel.itemInfo.ItemID == 3724)

        if (itemModel.itemId == 3724)

        {

            _wingRawImage2.gameObject.SetActive(true);

            _wingRawImage.gameObject.SetActive(false);

@@ -699,7 +699,7 @@


            ItemModel itemModel = playerPack.GetItemModelByIndex(PackType.Equip, (int)RoleEquipType.Wing);

            ;

            int ItemColor = modelInterface.GetItemQuality(itemModel.itemInfo.ItemID, itemModel.useDataDict);

            int ItemColor = modelInterface.GetItemQuality(itemModel.itemId, itemModel.useDataDict);

            WingsBG.SetItemBackGround(ItemColor);

            IconButton.GetComponent<Image>().SetSprite(itemModel.config.IconKey);

            int Number = Mathf.CeilToInt(((float)_currentRefining / _currentRefiningAll) * 100);

@@ -793,7 +793,7 @@
        ItemModel itemModel = playerPack.GetItemModelByIndex(PackType.Equip, (int)RoleEquipType.Wing);

        if (itemModel != null)

        {

            WingRefineExpConfig wingRefineExpConfig = WingRefineExpConfig.Get(itemModel.itemInfo.ItemID);

            WingRefineExpConfig wingRefineExpConfig = WingRefineExpConfig.Get(itemModel.itemId);

            if (wingRefineExpConfig != null)

            {

                if (wingLv2GenerDict.ContainsKey(wingRefineExpConfig.WingsPhase) && wingLv2GenerDict[wingRefineExpConfig.WingsPhase] > MaxMaxOrder)

@@ -809,7 +809,7 @@
            for (int i = 0; i < intPetAbsorbTyp.Count; i++)

            {

                ItemModel model = playerPack.GetItemModelByIndex(PackType.Item, intPetAbsorbTyp[i]);

                WingRefineExpConfig wingRefineExpConfig = WingRefineExpConfig.Get(model.itemInfo.ItemID);

                WingRefineExpConfig wingRefineExpConfig = WingRefineExpConfig.Get(model.itemId);

                if (wingRefineExpConfig != null)

                {

                    if (wingLv2GenerDict.ContainsKey(wingRefineExpConfig.WingsPhase) && wingLv2GenerDict[wingRefineExpConfig.WingsPhase] > MaxMaxOrder)

@@ -839,7 +839,7 @@
            for (int i = 0; i < intPetAbsorbTyp.Count; i++)

            {

                ItemModel model = playerPack.GetItemModelByIndex(PackType.Item, intPetAbsorbTyp[i]);

                WingRefineExpConfig wingRefineExpConfig = WingRefineExpConfig.Get(model.itemInfo.ItemID);

                WingRefineExpConfig wingRefineExpConfig = WingRefineExpConfig.Get(model.itemId);

                if (wingRefineExpConfig.WingsPhase <= 0 || (wingLv2GenerDict.ContainsKey(wingRefineExpConfig.WingsPhase) && wingLv2GenerDict[wingRefineExpConfig.WingsPhase] <= 1))

                {

                    ClassifyList.Add(intPetAbsorbTyp[i]);

@@ -851,7 +851,7 @@
            for (int i = 0; i < intPetAbsorbTyp.Count; i++)

            {

                ItemModel model = playerPack.GetItemModelByIndex(PackType.Item, intPetAbsorbTyp[i]);

                WingRefineExpConfig wingRefineExpConfig = WingRefineExpConfig.Get(model.itemInfo.ItemID);

                WingRefineExpConfig wingRefineExpConfig = WingRefineExpConfig.Get(model.itemId);

                if (wingRefineExpConfig.WingsPhase <= 0 || (wingLv2GenerDict.ContainsKey(wingRefineExpConfig.WingsPhase) && wingLv2GenerDict[wingRefineExpConfig.WingsPhase] <= MaxMaxOrder - 2))

                {

                    ClassifyList.Add(intPetAbsorbTyp[i]);

@@ -883,7 +883,7 @@
    private bool Sort1(int Index)

    {

        ItemModel model = playerPack.GetItemModelByIndex(PackType.Item, Index);

        if (model.itemInfo.ItemID == 3807 || model.itemInfo.ItemID == 3808)

        if (model.itemId == 3807 || model.itemId == 3808)

        {

            return true;

        }


 System/SystemSetting/SettingEffectMgr.cs

@@ -317,9 +317,9 @@


    private int CompareDrugLv(ItemModel start, ItemModel next)

    {

        _tagItemModel = ItemConfig.Get((int)start.itemInfo.ItemID);

        _tagItemModel = ItemConfig.Get((int)start.itemId);

        int lv1 = _tagItemModel.LV;

        _tagItemModel = ItemConfig.Get((int)next.itemInfo.ItemID);

        _tagItemModel = ItemConfig.Get((int)next.itemId);

        int lv2 = _tagItemModel.LV;

        return -lv1.CompareTo(lv2);

    }


 UI/Common/UI3DHeroSkillShow.cs

@@ -92,25 +92,25 @@


            #region 装备

            var clothes = playerPack.GetItemModelByIndex(PackType.Equip, (int)RoleEquipType.Clothes);

            var _clothesId = clothes == null ? 0 : (int)clothes.itemInfo.ItemID;

            var _clothesId = clothes == null ? 0 : (int)clothes.itemId;



            var weapon = playerPack.GetItemModelByIndex(PackType.Equip, (int)RoleEquipType.Weapon);

            var _weaponId = weapon == null ? 0 : (int)weapon.itemInfo.ItemID;

            var _weaponId = weapon == null ? 0 : (int)weapon.itemId;



            var wings = playerPack.GetItemModelByIndex(PackType.Equip, (int)RoleEquipType.Wing);

            var _wingsId = wings == null ? 0 : (int)wings.itemInfo.ItemID;

            var _wingsId = wings == null ? 0 : (int)wings.itemId;



            var secondary = playerPack.GetItemModelByIndex(PackType.Equip, (int)RoleEquipType.Weapon2);

            var _secondaryId = secondary == null ? 0 : (int)secondary.itemInfo.ItemID;

            var _secondaryId = secondary == null ? 0 : (int)secondary.itemId;



            var fashionClothes = playerPack.GetItemModelByIndex(PackType.Equip, (int)RoleEquipType.FashionClothes);

            var fashionClothesId = fashionClothes == null ? 0 : (int)fashionClothes.itemInfo.ItemID;

            var fashionClothesId = fashionClothes == null ? 0 : (int)fashionClothes.itemId;



            var fashionWeapon = playerPack.GetItemModelByIndex(PackType.Equip, (int)RoleEquipType.FashionWeapon);

            var fashionWeaponId = fashionWeapon == null ? 0 : (int)fashionWeapon.itemInfo.ItemID;

            var fashionWeaponId = fashionWeapon == null ? 0 : (int)fashionWeapon.itemId;



            var fashionSecondary = playerPack.GetItemModelByIndex(PackType.Equip, (int)RoleEquipType.FashionWeapon2);

            var fashionSecondaryId = fashionSecondary == null ? 0 : (int)fashionSecondary.itemInfo.ItemID;

            var fashionSecondaryId = fashionSecondary == null ? 0 : (int)fashionSecondary.itemId;



            int _suitLevel = 0;




 UI/Common/UI3DModelExhibition.cs

@@ -183,21 +183,21 @@
        {

            var clothes = playerPack.GetItemModelByIndex(PackType.Equip, (int)RoleEquipType.Clothes);

            var flashClothes = playerPack.GetItemModelByIndex(PackType.Equip, (int)RoleEquipType.FashionClothes);

            var clothesId = clothes == null ? 0 : (int)clothes.itemInfo.ItemID;

            var flashClothesId = flashClothes == null ? 0 : flashClothes.itemInfo.ItemID;

            var clothesId = clothes == null ? 0 : (int)clothes.itemId;

            var flashClothesId = flashClothes == null ? 0 : flashClothes.itemId;



            var weapon = playerPack.GetItemModelByIndex(PackType.Equip, (int)RoleEquipType.Weapon);

            var flashWeapon = playerPack.GetItemModelByIndex(PackType.Equip, (int)RoleEquipType.FashionWeapon);

            var weaponId = weapon == null ? 0 : (int)weapon.itemInfo.ItemID;

            var flashWeaponId = flashWeapon == null ? 0 : flashWeapon.itemInfo.ItemID;

            var weaponId = weapon == null ? 0 : (int)weapon.itemId;

            var flashWeaponId = flashWeapon == null ? 0 : flashWeapon.itemId;



            var wings = playerPack.GetItemModelByIndex(PackType.Equip, (int)RoleEquipType.Wing);

            var wingsId = wings == null ? 0 : (int)wings.itemInfo.ItemID;

            var wingsId = wings == null ? 0 : (int)wings.itemId;



            var flahsSecondary = playerPack.GetItemModelByIndex(PackType.Equip, (int)RoleEquipType.FashionWeapon2);

            var secondary = playerPack.GetItemModelByIndex(PackType.Equip, (int)RoleEquipType.Weapon2);

            var secondaryId = secondary == null ? 0 : (int)secondary.itemInfo.ItemID;

            var flashSecondaryId = flahsSecondary == null ? 0 : flahsSecondary.itemInfo.ItemID;

            var secondaryId = secondary == null ? 0 : (int)secondary.itemId;

            var flashSecondaryId = flahsSecondary == null ? 0 : flahsSecondary.itemId;



            int suitLevel = 0;

            if (clothes != null)

@@ -247,30 +247,30 @@
            {

                clothes = playerPack.GetItemModelByIndex(PackType.Equip, (int)RoleEquipType.Clothes);

                var flashClothes = playerPack.GetItemModelByIndex(PackType.Equip, (int)RoleEquipType.FashionClothes);

                clothesId = clothes == null ? 0 : (int)clothes.itemInfo.ItemID;

                flashClothesId = flashClothes == null ? 0 : flashClothes.itemInfo.ItemID;

                clothesId = clothes == null ? 0 : (int)clothes.itemId;

                flashClothesId = flashClothes == null ? 0 : flashClothes.itemId;

            }



            if (exceptEquip != RoleEquipType.Weapon)

            {

                var flashWeapon = playerPack.GetItemModelByIndex(PackType.Equip, (int)RoleEquipType.FashionWeapon);

                var weapon = playerPack.GetItemModelByIndex(PackType.Equip, (int)RoleEquipType.Weapon);

                weaponId = weapon == null ? 0 : (int)weapon.itemInfo.ItemID;

                flashWeaponId = flashWeapon == null ? 0 : flashWeapon.itemInfo.ItemID;

                weaponId = weapon == null ? 0 : (int)weapon.itemId;

                flashWeaponId = flashWeapon == null ? 0 : flashWeapon.itemId;

            }



            if (exceptEquip != RoleEquipType.Wing)

            {

                var wings = playerPack.GetItemModelByIndex(PackType.Equip, (int)RoleEquipType.Wing);

                wingsId = wings == null ? 0 : (int)wings.itemInfo.ItemID;

                wingsId = wings == null ? 0 : (int)wings.itemId;

            }



            if (exceptEquip != RoleEquipType.Weapon2)

            {

                var flashSecondary = playerPack.GetItemModelByIndex(PackType.Equip, (int)RoleEquipType.FashionWeapon2);

                var secondary = playerPack.GetItemModelByIndex(PackType.Equip, (int)RoleEquipType.Weapon2);

                secondaryId = secondary == null ? 0 : (int)secondary.itemInfo.ItemID;

                flashSecondaryId = flashSecondary == null ? 0 : flashSecondary.itemInfo.ItemID;

                secondaryId = secondary == null ? 0 : (int)secondary.itemId;

                flashSecondaryId = flashSecondary == null ? 0 : flashSecondary.itemId;

            }



            var suitLevel = 0;

@@ -373,21 +373,21 @@
        {

            var clothes = playerPack.GetItemModelByIndex(PackType.Equip, (int)RoleEquipType.Clothes);

            var flashClothes = playerPack.GetItemModelByIndex(PackType.Equip, (int)RoleEquipType.FashionClothes);

            var clothesId = clothes == null ? 0 : (int)clothes.itemInfo.ItemID;

            var flashClothesId = flashClothes == null ? 0 : flashClothes.itemInfo.ItemID;

            var clothesId = clothes == null ? 0 : (int)clothes.itemId;

            var flashClothesId = flashClothes == null ? 0 : flashClothes.itemId;



            var weapon = playerPack.GetItemModelByIndex(PackType.Equip, (int)RoleEquipType.Weapon);

            var flashWeapon = playerPack.GetItemModelByIndex(PackType.Equip, (int)RoleEquipType.FashionWeapon);

            var weaponId = weapon == null ? 0 : (int)weapon.itemInfo.ItemID;

            var flashWeaponId = flashWeapon == null ? 0 : flashWeapon.itemInfo.ItemID;

            var weaponId = weapon == null ? 0 : (int)weapon.itemId;

            var flashWeaponId = flashWeapon == null ? 0 : flashWeapon.itemId;



            var wings = playerPack.GetItemModelByIndex(PackType.Equip, (int)RoleEquipType.Wing);

            var wingsId = wings == null ? 0 : (int)wings.itemInfo.ItemID;

            var wingsId = wings == null ? 0 : (int)wings.itemId;



            var flahsSecondary = playerPack.GetItemModelByIndex(PackType.Equip, (int)RoleEquipType.FashionWeapon2);

            var secondary = playerPack.GetItemModelByIndex(PackType.Equip, (int)RoleEquipType.Weapon2);

            var secondaryId = secondary == null ? 0 : (int)secondary.itemInfo.ItemID;

            var flashSecondaryId = flahsSecondary == null ? 0 : flahsSecondary.itemInfo.ItemID;

            var secondaryId = secondary == null ? 0 : (int)secondary.itemId;

            var flashSecondaryId = flahsSecondary == null ? 0 : flahsSecondary.itemId;



            int suitLevel = 0;

            if (clothes != null)