3335 删除诛仙装备。

client_Wu Xijin

2019-03-10 cb0cf278557838c3cf2a14a9b5569bda1b07ca36

3335 删除诛仙装备。

 Core/GameEngine/Model/Player/Equip/PlayerStoneData.cs

@@ -27,13 +27,6 @@
        for (int i = 0; i < vNetData.EquipCount; i++)
        {
            HA3BC_tagMCStoneInfo.tagMCStoneMsg data = vNetData.InfoList[i];

            if (data.EquipPlace >= (int)RoleEquipType.JadeDynasty_Cloak
                && data.EquipPlace <= (int)RoleEquipType.JadeDynasty_Sword4)

            {

                continue;

            }

            if (stoneDic.ContainsKey(data.EquipPlace))
            {
                stoneDic[data.EquipPlace] = data.StoneInfo;

 Core/NetworkPackage/DTCFile/ClientPack/ClientToGameServer.meta

File was renamed from Core/NetworkPackage/DTCFile/ServerPack/HAF_Merge.meta
@@ -1,7 +1,7 @@
fileFormatVersion: 2
guid: 71e878ac60c49ad4f964dd2dbc725739
guid: b219540db33d1ae44bda7c98ab9e55a7
folderAsset: yes
timeCreated: 1547643019
timeCreated: 1552218038
licenseType: Pro
DefaultImporter:
  userData: 

 Core/NetworkPackage/DTCFile/ServerPack/HAD_SaleActivity.meta

File was deleted

 Core/NetworkPackage/DTCFile/ServerPack/HAE_Truck.meta

File was deleted

 Core/NetworkPackage/DTCFile/ServerPack/HB0_Event.meta

File was deleted

 Core/NetworkPackage/ServerPack/HAD_SaleActivity.meta

File was deleted

 Core/NetworkPackage/ServerPack/HAE_Truck.meta

File was deleted

 Core/NetworkPackage/ServerPack/HAF_Merge.meta

File was deleted

 Core/NetworkPackage/ServerPack/HB0_Event.meta

File was deleted

 Lua/Gen/SnxxzUIItemLogicUtilityWrap.cs

@@ -582,7 +582,7 @@
                {
                    System.Collections.Generic.List<Snxxz.UI.ItemModel> __oneKeySelllist = (System.Collections.Generic.List<Snxxz.UI.ItemModel>)translator.GetObject(L, 2, typeof(System.Collections.Generic.List<Snxxz.UI.ItemModel>));
                    
                    gen_to_be_invoked.SendOneKeySellQuest( __oneKeySelllist );
                    gen_to_be_invoked.OneKeySell( __oneKeySelllist );
                    
                    
                    
@@ -610,7 +610,7 @@
                {
                    PackType _type;translator.Get(L, 2, out _type);
                    
                    gen_to_be_invoked.SendPackResetQuest( _type );
                    gen_to_be_invoked.ResetPack( _type );
                    
                    
                    
@@ -680,11 +680,6 @@
                
                {
                    RoleEquipType _ignoreType;translator.Get(L, 2, out _ignoreType);
                    
                        bool gen_ret = gen_to_be_invoked.CheckBetterEquip( _ignoreType );
                        LuaAPI.lua_pushboolean(L, gen_ret);
                    
                    
                    
                    return 1;
                }

 System/Achievement/AchievementModel.cs

@@ -486,7 +486,7 @@
                if (_places.Contains(item.config.EquipPlace))

                {

                    if (!ItemLogicUtility.Instance.IsOverdue(item.guid, item.itemId)

                        && (item.config.JobLimit == 0 || (item.config.JobLimit / 100) == job) && item.equipScore > score)

                        && (ItemLogicUtility.Instance.IsJobCompatibleItem( item.itemId)) && item.equipScore > score)

                    {

                        guid = item.guid;

                    }

@@ -510,7 +510,7 @@
            {

                var overdue = ItemLogicUtility.Instance.IsOverdue(item.guid, item.itemId, item.useDataDict);



                if (!overdue && _places.Contains(item.config.EquipPlace) && (item.config.JobLimit == 0 || (item.config.JobLimit / 100) == job))

                if (!overdue && _places.Contains(item.config.EquipPlace) && ItemLogicUtility.Instance.IsJobCompatibleItem(item.itemId))

                {

                    var equipedItem = equipPackage.GetItemByIndex(item.config.EquipPlace);

                    var equipdItemScore = equipedItem == null ? 0 : equipedItem.equipScore;

@@ -546,7 +546,7 @@
                var equipdItemScore = equipedItem == null ? 0 : equipedItem.equipScore;

                var overdue = ItemLogicUtility.Instance.IsOverdue(item.guid, item.itemId, item.useDataDict);



                if (!overdue && (item.config.JobLimit == 0 || (item.config.JobLimit / 100) == job) && item.equipScore > equipdItemScore && item.equipScore > score)

                if (!overdue && (ItemLogicUtility.Instance.IsJobCompatibleItem(item.itemId)) && item.equipScore > equipdItemScore && item.equipScore > score)

                {

                    score = item.equipScore;

                    guid = item.guid;


 System/BlastFurnace/GetEquipPathWin.cs

@@ -483,25 +483,18 @@
                case RoleEquipType.Neck:

                case RoleEquipType.FairyCan1:

                case RoleEquipType.FairyCan2:

                case RoleEquipType.Guard1:

                case RoleEquipType.JadeDynasty_Cloak:

                case RoleEquipType.JadeDynasty_FaceMask:

                case RoleEquipType.JadeDynasty_Glove1:

                case RoleEquipType.JadeDynasty_Glove2:

                case RoleEquipType.JadeDynasty_Pendant:

                case RoleEquipType.JadeDynasty_Ring1:

                case RoleEquipType.JadeDynasty_Ring2:

                case RoleEquipType.JadeDynasty_Ruyi:

                case RoleEquipType.JadeDynasty_Sword1:

                case RoleEquipType.JadeDynasty_Sword2:

                case RoleEquipType.JadeDynasty_Sword3:

                case RoleEquipType.JadeDynasty_Sword4:

                case RoleEquipType.Glove:

                case RoleEquipType.Jade:

                    if (itemAttrData.itemConfig.LV < gemOpenLvs[0])

                    {

                        gemAttr.SetActive(false);

                        return;

                    }

                    break;

                case RoleEquipType.Guard1:

                case RoleEquipType.Guard2:

                case RoleEquipType.PeerlessWeapon1:

                case RoleEquipType.PeerlessWeapon2:

                case RoleEquipType.Wing:

                    gemAttr.SetActive(false);

                    return;


 System/Dungeon/TrialDungeonModel.cs

@@ -318,8 +318,7 @@
                    foreach (var itemModel in dict.Values)

                    {

                        if (itemModel.config.EquipPlace == config.EquipPlace

                            && (itemModel.config.JobLimit / 100 == PlayerDatas.Instance.baseData.Job

                            || itemModel.config.JobLimit == 0)

                            && ItemLogicUtility.Instance.IsJobCompatibleItem(itemModel.itemId)

                            && !ItemLogicUtility.Instance.IsOverdue(itemModel.guid, itemModel.itemId, itemModel.useDataDict))

                        {

                            var compare = EquipCompare(itemModel, config);


 System/Equip/EquipModel.cs

@@ -542,6 +542,45 @@

            sortedLevels.Sort((int a, int b) => { return a.CompareTo(b); });
        }

        public static int GetItemServerEquipPlace(int itemId)
        {
            var config = ItemConfig.Get(itemId);
            if (config == null)
            {
                return -1;
            }

            var serverEquipPlace = -1;
            switch ((RoleEquipType)config.EquipPlace)
            {
                case RoleEquipType.Weapon:
                case RoleEquipType.Weapon2:
                case RoleEquipType.Hat:
                case RoleEquipType.Clothes:
                case RoleEquipType.Belt:
                case RoleEquipType.Trousers:
                case RoleEquipType.Shoes:
                case RoleEquipType.Neck:
                case RoleEquipType.FairyCan1:
                case RoleEquipType.FairyCan2:
                case RoleEquipType.Glove:
                case RoleEquipType.Jade:
                    EquipSet.ClientPlaceToServerPlace(config.LV, config.EquipPlace);
                    break;
                case RoleEquipType.Wing:
                case RoleEquipType.Guard1:
                case RoleEquipType.Guard2:
                case RoleEquipType.PeerlessWeapon1:
                case RoleEquipType.PeerlessWeapon2:
                    EquipSet.ClientPlaceToServerPlace(0, config.EquipPlace);
                    break;
            }

            return serverEquipPlace;

        }

    }

    public struct EquipSuitPropertyEntry

 System/FairyAu/WarehouseTipsWin.cs

@@ -1206,7 +1206,7 @@
                    }

                    if (item_config.LV >= Order && item_config.ItemColor >= Color

                        && item_config.StarLevel >= Star && EquipPlace == item_config.EquipPlace

                        && PlayerDatas.Instance.baseData.Job == item_config.JobLimit / 100)

                        && ItemLogicUtility.Instance.IsJobCompatibleItem(Item_ID))

                    {

                        if (!DicHighlight.ContainsKey(key))

                        {


 System/HappyXB/XBWarehouseWin.cs

@@ -156,7 +156,7 @@


        private void ClickSortBtn()

        {

            ItemLogicUtility.Instance.SendPackResetQuest(PackType.Treasure);

            ItemLogicUtility.Instance.ResetPack(PackType.Treasure);

            TimeDownMgr.Instance.Begin(TimeDownMgr.CoolTimeType.HappyXBWarehouse, 5.0f, RefreshTime);

            sortBtnText.text = Language.Get("BagWin_SortCDbtn_Text_1", 5);

            sortImage.SetSprite("BlackBtn");


 System/JadeDynastyKnapSack/JadeDynastyEquipModel.cs

@@ -10,7 +10,7 @@
{

    [XLua.Hotfix]

    [XLua.LuaCallCSharp]

    public class JadeDynastyEquipModel : Model,IBeforePlayerDataInitialize,IAfterPlayerDataInitialize,IPlayerLoginOk

    public class JadeDynastyEquipModel : Model, IBeforePlayerDataInitialize, IAfterPlayerDataInitialize, IPlayerLoginOk

    {

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

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

@@ -18,9 +18,8 @@
        public string LocalSaveEquipUnlock { get; private set; }

        public string LocalSaveActiveSuit { get; private set; }

        public string LocalSaveActiveStoneSuit { get; private set; }

    
        public int UnlockTowerLayer

        {



        public int UnlockTowerLayer {

            get { return towerModel.highestPassFloor; }

        }



@@ -40,42 +39,42 @@
        public void OnAfterPlayerDataInitialize()

        {

            int playerId = (int)PlayerDatas.Instance.baseData.PlayerID;

            LocalSaveEquipUnlock = StringUtility.Contact("UnLockJadeDynastyEquip",playerId);

            LocalSaveActiveSuit = StringUtility.Contact("JadeDynastyEquipSuit",playerId);

            LocalSaveEquipUnlock = StringUtility.Contact("UnLockJadeDynastyEquip", playerId);

            LocalSaveActiveSuit = StringUtility.Contact("JadeDynastyEquipSuit", playerId);

            LocalSaveActiveStoneSuit = StringUtility.Contact("JadeDynastyEquipStoneSuit", playerId);

            GetLocalSaveUnlockEquip();

        }



        public void OnPlayerLoginOk()

        {

            


        }



        public override void UnInit()

        {

           


        }



        #region 解析表数据

        public Dictionary<int, int> lockEquipLayerDict { get; private set; }

        public Dictionary<int, List<int>> suitTypeDict { get; private set;}

        public Dictionary<int, List<int>> equipGetPathDict { get; private set;}

        public List<int> equipPlaceComposes { get; private set;}

        public int gemResonanceNum { get; private set;}

        public Dictionary<int, List<int>> suitTypeDict { get; private set; }

        public Dictionary<int, List<int>> equipGetPathDict { get; private set; }

        public List<int> equipPlaceComposes { get; private set; }

        public int gemResonanceNum { get; private set; }

        public void ParseFuncConfig()

        {

            suitTypeDict = new Dictionary<int, List<int>>();

            var equipZhuXian = FuncConfigConfig.Get("EquipZhuXian");

            var suitGroupData = JsonMapper.ToObject(equipZhuXian.Numerical2);

            foreach(var key in suitGroupData.Keys)

            foreach (var key in suitGroupData.Keys)

            {

                int groupType = int.Parse(key);

                var equipPlaces = suitGroupData[key];

                if(equipPlaces.IsArray)

                if (equipPlaces.IsArray)

                {

                    List<int> list = new List<int>();

                    suitTypeDict.Add(groupType,list);

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

                    suitTypeDict.Add(groupType, list);

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

                    {

                        var equipPlace = equipPlaces[i];

                        list.Add(int.Parse(equipPlace.ToString()));

@@ -86,16 +85,16 @@
            equipGetPathDict = new Dictionary<int, List<int>>();

            var jadeDynastyEquipGetPaths = FuncConfigConfig.Get("JadeDynastyEquipGetPaths");

            var equipGetPathData = JsonMapper.ToObject(jadeDynastyEquipGetPaths.Numerical1);

         
            foreach(var key in equipGetPathData.Keys)



            foreach (var key in equipGetPathData.Keys)

            {

                var pathData = equipGetPathData[key];

                int equipPlace = int.Parse(key);

                List<int> pathIds = new List<int>();

                equipGetPathDict.Add(equipPlace,pathIds);

                if(pathData.IsArray)

                equipGetPathDict.Add(equipPlace, pathIds);

                if (pathData.IsArray)

                {

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

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

                    {

                        int pathId = int.Parse(pathData[i].ToString());

                        pathIds.Add(pathId);

@@ -116,7 +115,7 @@
        {

            suitAttrDict = new Dictionary<int, Dictionary<int, JadeDynastySuitAttrData>>();

            var suitConfigs = JadeDynastySuitAttrConfig.GetValues();

            foreach(var config in suitConfigs)

            foreach (var config in suitConfigs)

            {

                int suitLv = config.suiteLV;

                int type = config.suiteType;

@@ -124,13 +123,13 @@
                if (!suitAttrDict.ContainsKey(type))

                {

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

                    dict.Add(suitLv,suitAttrData);

                    suitAttrDict.Add(type,dict);

                    dict.Add(suitLv, suitAttrData);

                    suitAttrDict.Add(type, dict);

                }

                else

                {

                    var dict = suitAttrDict[type];

                    if(!dict.ContainsKey(suitLv))

                    if (!dict.ContainsKey(suitLv))

                    {

                        dict.Add(suitLv, suitAttrData);

                    }

@@ -138,7 +137,7 @@
            }

        }



        public Dictionary<int, Dictionary<int,JadeDynastyStoneSuitAttrData>> stoneSuitAttrDict { get; private set; }

        public Dictionary<int, Dictionary<int, JadeDynastyStoneSuitAttrData>> stoneSuitAttrDict { get; private set; }

        public void ParseStoneSuitAttrConfig()

        {

            stoneSuitAttrDict = new Dictionary<int, Dictionary<int, JadeDynastyStoneSuitAttrData>>();

@@ -169,15 +168,15 @@
        {

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

            var configs = JadeDynastyTowerConfig.GetValues();

            foreach(var key in configs)

            foreach (var key in configs)

            {

                if(key.unLockEquipPlace != 0)

                if (key.unLockEquipPlace != 0)

                {

                    int equipPlace = key.unLockEquipPlace;

                    int towerLayer = key.floorIndex;

                    lockEquipLayerDict.Add(equipPlace, towerLayer);

                }

               


            }

        }



@@ -193,18 +192,18 @@
                suitLv = 0;

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

                suitAttrConfig = JadeDynastySuitAttrConfig.Get(id);

                if(suitAttrConfig != null)

                if (suitAttrConfig != null)

                {

                    suitLv = suitAttrConfig.suiteLV;

                    int[] attrIds = suitAttrConfig.attrIDList;

                    int[] attrValues = suitAttrConfig.attrValueList;

                    if(attrIds != null && attrValues != null)

                    if (attrIds != null && attrValues != null)

                    {

                        for(int i = 0; i < attrIds.Length; i++)

                        for (int i = 0; i < attrIds.Length; i++)

                        {

                            int attrId = attrIds[i];

                            int attrValue = attrValues[i];

                            if(!attrDict.ContainsKey(attrId))

                            if (!attrDict.ContainsKey(attrId))

                            {

                                attrDict.Add(attrId, attrValue);

                            }

@@ -257,7 +256,7 @@


        #region 查看物品

        public string lookGuid { get; private set; }

        public int jumpIndex { get; private set;}

        public int jumpIndex { get; private set; }

        public void SetLookItemModel(string guid)

        {

            jumpIndex = -1;

@@ -265,14 +264,14 @@
            if (string.IsNullOrEmpty(guid)) return;



            var model = playerPack.GetItemByGuid(guid);

            if(model != null)

            if (model != null)

            {

                lookGuid = guid;

                int itemIndex = model.itemPlace;

                jumpIndex = itemIndex / 5;



                WindowCenter.Instance.Close<MainInterfaceWin>();

                WindowCenter.Instance.Open<JadeDynastyKnapSackWin>(false,0);

                WindowCenter.Instance.Open<JadeDynastyKnapSackWin>(false, 0);

            }

        }



@@ -290,7 +289,7 @@
        {

            this.targetEquipPlace = equipPlace;

            RectTransformUtility.ScreenPointToLocalPointInRectangle(WindowCenter.Instance.uiRoot.tipsCanvas, Input.mousePosition, WindowCenter.Instance.uiRoot.uicamera, out targetPos);

            if(!WindowCenter.Instance.IsOpen<JadeDynastyEquipGetPathsWin>())

            if (!WindowCenter.Instance.IsOpen<JadeDynastyEquipGetPathsWin>())

            {

                WindowCenter.Instance.Open<JadeDynastyEquipGetPathsWin>();

            }

@@ -317,14 +316,14 @@
        public void SetLockLocalSaveUnlockEquip(int equipPlace)

        {

            unlockEquips = unlockEquips == null ? new List<int>() : unlockEquips;

            if(!unlockEquips.Contains(equipPlace))

            if (!unlockEquips.Contains(equipPlace))

            {

                unlockEquips.Add(equipPlace);

                LocalSave.SetIntArray(LocalSaveEquipUnlock,unlockEquips.ToArray());

                LocalSave.SetIntArray(LocalSaveEquipUnlock, unlockEquips.ToArray());

            }

        }



        public void SetLockLocalSaveActiveSuit(List<int> suitTypes,List<int> suitLvs)

        public void SetLockLocalSaveActiveSuit(List<int> suitTypes, List<int> suitLvs)

        {

            alreadyActiveSuits = alreadyActiveSuits == null ? new List<string>() : alreadyActiveSuits;

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

@@ -391,7 +390,7 @@
                    int suitType = suitTypes[i];

                    int suitLv = suitLvs[i];

                    bool isLocalSaveActiveSuit = IsLocalSaveActiveSuit(suitType, suitLv);

                    if(!isLocalSaveActiveSuit)

                    if (!isLocalSaveActiveSuit)

                    {

                        return true;

                    }

@@ -401,7 +400,7 @@
            return false;

        }



        public void StopPlaySuitEffect(UIEffect effect,bool isSave = false)

        public void StopPlaySuitEffect(UIEffect effect, bool isSave = false)

        {

            if (isSave)

            {

@@ -464,18 +463,14 @@
        public bool TryGetEquipPaths(int equipPlace, out List<int> pathIds)

        {

            pathIds = null;

            return equipGetPathDict.TryGetValue(equipPlace,out pathIds);

            return equipGetPathDict.TryGetValue(equipPlace, out pathIds);

        }



        public bool TryGetJadeDynastyEquipIndex(int equipPlace,out int equipIndex)

        public bool TryGetJadeDynastyEquipIndex(int equipPlace, out int equipIndex)

        {

            equipIndex = 0;

            if(equipPlace >= (int)RoleEquipType.JadeDynasty_Cloak && equipPlace <= (int)RoleEquipType.JadeDynasty_Sword4)

            {

                equipIndex = equipPlace - 121;

                return true;

            }

            return false;

            equipIndex = equipPlace - 121;

            return true;

        }



        public int GetJadeDynastyEquipPlace(int equipIndex)

@@ -484,19 +479,19 @@
            return equipIndex + 121;

        }



        public bool TryGetLockTowerLayer(int equipPlace,out int towerLayer)

        public bool TryGetLockTowerLayer(int equipPlace, out int towerLayer)

        {

            towerLayer = 0;

            return lockEquipLayerDict.TryGetValue(equipPlace,out towerLayer);

            return lockEquipLayerDict.TryGetValue(equipPlace, out towerLayer);

        }



        public bool TryGetSuitType(int equipPlace,out int suitType)

        public bool TryGetSuitType(int equipPlace, out int suitType)

        {

            suitType = 0;

            foreach(var type in suitTypeDict.Keys)

            foreach (var type in suitTypeDict.Keys)

            {

                var equipPlaces = suitTypeDict[type];

                if(equipPlaces.Contains(equipPlace))

                if (equipPlaces.Contains(equipPlace))

                {

                    suitType = type;

                    return true;

@@ -505,12 +500,12 @@
            return false;

        }



        public bool TryGetEquipPlaces(int equipPlace,out List<int> equipPlaces)

        public bool TryGetEquipPlaces(int equipPlace, out List<int> equipPlaces)

        {

            int suitType = 0;

            equipPlaces = null;

            bool isSuit = TryGetSuitType(equipPlace,out suitType);

            if(isSuit)

            bool isSuit = TryGetSuitType(equipPlace, out suitType);

            if (isSuit)

            {

                equipPlaces = suitTypeDict[suitType];

                return true;

@@ -518,15 +513,15 @@
            return false;

        }



        public bool TryGetSuitAttrData(int equipPlace,int suitLv,out JadeDynastySuitAttrData suitAttrData)

        public bool TryGetSuitAttrData(int equipPlace, int suitLv, out JadeDynastySuitAttrData suitAttrData)

        {

            suitAttrData = null;

            int suitType = 0;

            TryGetSuitType(equipPlace,out suitType);

            if(suitAttrDict.ContainsKey(suitType))

            TryGetSuitType(equipPlace, out suitType);

            if (suitAttrDict.ContainsKey(suitType))

            {

                var dict = suitAttrDict[suitType];

                return dict.TryGetValue(suitLv,out suitAttrData);

                return dict.TryGetValue(suitLv, out suitAttrData);

            }

            return false;

        }

@@ -547,7 +542,7 @@
            int willUnlockPlace = 0;

            int unlockTowerLayer = UnlockTowerLayer;

            int minTowerLayer = 0;

            foreach(var key in lockEquipLayerDict.Keys)

            foreach (var key in lockEquipLayerDict.Keys)

            {

                int lockTowerLayer = lockEquipLayerDict[key];

                if (lockTowerLayer > unlockTowerLayer

@@ -565,27 +560,27 @@
        {

            int unlockTowerLayer = UnlockTowerLayer;

            int towerLayer = 0;

            bool isLock = TryGetLockTowerLayer(equipPlace,out towerLayer);

            if(isLock && towerLayer > unlockTowerLayer)

            bool isLock = TryGetLockTowerLayer(equipPlace, out towerLayer);

            if (isLock && towerLayer > unlockTowerLayer)

            {

                return true;

            }

            return false;

        }



        public bool TryGetMaxSuitLV(int itemId,int equipPlace,out int maxSuitLv)

        public bool TryGetMaxSuitLV(int itemId, int equipPlace, out int maxSuitLv)

        {

            maxSuitLv = 0;

            var config = ItemConfig.Get(itemId);

            if (config == null) return false;

         


            var suitLvs = GetSuitLvList(equipPlace);

            if(suitLvs != null && suitLvs.Count > 0)

            if (suitLvs != null && suitLvs.Count > 0)

            {

                for(int i = suitLvs.Count - 1; i > -1; i--)

                for (int i = suitLvs.Count - 1; i > -1; i--)

                {

                    var suitLv = suitLvs[i];

                    if(suitLv <= config.LV)

                    if (suitLv <= config.LV)

                    {

                        maxSuitLv = suitLv;

                        return true;

@@ -598,8 +593,8 @@
        public List<int> GetSuitLvList(int equipPlace)

        {

            int suitType = 0;

            bool isSuit = TryGetSuitType(equipPlace,out suitType);

            if(suitAttrDict.ContainsKey(suitType))

            bool isSuit = TryGetSuitType(equipPlace, out suitType);

            if (suitAttrDict.ContainsKey(suitType))

            {

                var dict = suitAttrDict[suitType];

                return dict.Keys.ToList();

@@ -617,18 +612,18 @@
            return null;

        }



        public bool TryGetIsActiveSuit(int equipPlace,int suitLV,out List<int> activeEquips)

        public bool TryGetIsActiveSuit(int equipPlace, int suitLV, out List<int> activeEquips)

        {

            activeEquips = new List<int>();

            List<int> equipPlaces = null;

            bool isSuit = TryGetEquipPlaces(equipPlace, out equipPlaces);

            bool isActive = true;

            if(equipPlaces != null)

            if (equipPlaces != null)

            {

                foreach(var key in equipPlaces)

                foreach (var key in equipPlaces)

                {

                    var model = playerPack.GetItemByIndex(PackType.JadeDynastyEquip,key);

                    if(model != null)

                    var model = playerPack.GetItemByIndex(PackType.JadeDynastyEquip, key);

                    if (model != null)

                    {

                        int equipLv = model.config.LV;

                        if (equipLv >= suitLV)

@@ -653,7 +648,7 @@
            return isActive;

        }



        public bool TryGetIsActiveStoneSuit(int suitType,int suitLv,out int activeStoneNum)

        public bool TryGetIsActiveStoneSuit(int suitType, int suitLv, out int activeStoneNum)

        {

            activeStoneNum = 0;

            var equipPlaces = suitTypeDict[suitType];

@@ -667,11 +662,11 @@
                        JadeDynastyGemModel.GemEquipData equipData;

                        var existGem = gemModel.TryGetEquipGems(key, out equipData);

                        uint[] stoneIds = existGem ? equipData.items : null;

                        if(stoneIds != null)

                        if (stoneIds != null)

                        {

                            foreach(var id in stoneIds)

                            foreach (var id in stoneIds)

                            {

                                if(id != 0)

                                if (id != 0)

                                {

                                    var config = ItemConfig.Get((int)id);

                                    if (config.EffectValueB1 >= suitLv)

@@ -684,24 +679,24 @@
                    }

                }

            }

            


            return activeStoneNum >= gemResonanceNum;

        }



        public bool TryGetIsActiveSuit(out List<int> suitTypes,out List<int> suitLvs)

        public bool TryGetIsActiveSuit(out List<int> suitTypes, out List<int> suitLvs)

        {

            suitTypes = new List<int>();

            suitLvs = new List<int>();

            foreach(var key in suitTypeDict.Keys)

            foreach (var key in suitTypeDict.Keys)

            {

                var equipPlaces = suitTypeDict[key];

                if(equipPlaces.Count > 0)

                if (equipPlaces.Count > 0)

                {

                    int curSuitLv = 0;

                    int nextSuitLv = 0;

                    var equipPlace = equipPlaces[0];

                    bool isSuit = TryGetSuitLV(equipPlace,PackType.JadeDynastyEquip,out curSuitLv,out nextSuitLv);

                    if(isSuit && curSuitLv != 0)

                    bool isSuit = TryGetSuitLV(equipPlace, PackType.JadeDynastyEquip, out curSuitLv, out nextSuitLv);

                    if (isSuit && curSuitLv != 0)

                    {

                        suitTypes.Add(key);

                        suitLvs.Add(curSuitLv);

@@ -723,7 +718,7 @@
                    int curSuitLv = 0;

                    int nextSuitLv = 0;

                    var equipPlace = equipPlaces[0];

                    bool isSuit = TryGetStoneSuitLV(key,out curSuitLv, out nextSuitLv);

                    bool isSuit = TryGetStoneSuitLV(key, out curSuitLv, out nextSuitLv);

                    if (isSuit && curSuitLv != 0)

                    {

                        suitTypes.Add(key);

@@ -734,18 +729,18 @@
            return suitTypes.Count > 0;

        }



        public bool TryGetSuitLV(int equipPlace,PackType type,out int curSuitLv,out int nextSuitLV,int itemId = 0)

        public bool TryGetSuitLV(int equipPlace, PackType type, out int curSuitLv, out int nextSuitLV, int itemId = 0)

        {

            curSuitLv = 0;

            nextSuitLV = 0;

            switch(type)

            switch (type)

            {

                case PackType.JadeDynastyItem:

                    if(itemId != 0)

                    if (itemId != 0)

                    {

                        int maxSuitLv = 0;

                        bool isMax = TryGetMaxSuitLV(itemId,equipPlace, out maxSuitLv);

                        if(isMax)

                        bool isMax = TryGetMaxSuitLV(itemId, equipPlace, out maxSuitLv);

                        if (isMax)

                        {

                            nextSuitLV = maxSuitLv;

                            return true;

@@ -761,14 +756,14 @@
                    {

                        foreach (var key in equipPlaces)

                        {

                            var model = playerPack.GetItemByIndex(type,key);

                            if(model != null 
                            var model = playerPack.GetItemByIndex(type, key);

                            if (model != null

                                && (minEquipLv > model.config.LV

                                || minEquipLv == 0))

                            {

                                minEquipLv = model.config.LV;

                            }

                            else if(model == null)

                            else if (model == null)

                            {

                                minEquipLv = 0;

                                break;

@@ -776,7 +771,7 @@
                        }

                    }



                    if(suitLvs != null)

                    if (suitLvs != null)

                    {

                        if (minEquipLv != 0)

                        {

@@ -809,7 +804,7 @@
            }



            return false;

           


        }



        public bool TryGetStoneSuitLV(int suitType, out int curSuitLv, out int nextSuitLV)

@@ -833,7 +828,7 @@
                        {

                            foreach (var id in stoneIds)

                            {

                                if(id != 0)

                                if (id != 0)

                                {

                                    var config = ItemConfig.Get((int)id);

                                    if (!stoneDict.ContainsKey(config.EffectValueB1))

@@ -845,23 +840,23 @@
                                        stoneDict[config.EffectValueB1] += 1;

                                    }

                                }

                              


                            }

                        }

                    }

                }

            }



            if(suitLvs != null)

            if (suitLvs != null)

            {

                int maxLv = suitLvs[suitLvs.Count - 1];

                for (int i = suitLvs.Count - 1; i > -1; i--)

                {

                    int suitLv = suitLvs[i];

                    int haveNum = 0;

                    foreach(var lv in stoneDict.Keys)

                    foreach (var lv in stoneDict.Keys)

                    {

                        if(lv >= suitLv)

                        if (lv >= suitLv)

                        {

                            haveNum += stoneDict[lv];

                        }

@@ -873,8 +868,8 @@
                        break;

                    }

                }

                
                if(curSuitLv < maxLv)



                if (curSuitLv < maxLv)

                {

                    nextSuitLV = curSuitLv + 1;

                }

@@ -889,7 +884,7 @@


        }



        public bool TryGetSumSuitAttr(int suitType,PackType type,out JadeDynastySuitAttrData activeSuit,out JadeDynastySuitAttrData nextSuit,int itemId = 0)

        public bool TryGetSumSuitAttr(int suitType, PackType type, out JadeDynastySuitAttrData activeSuit, out JadeDynastySuitAttrData nextSuit, int itemId = 0)

        {

            activeSuit = null;

            nextSuit = null;

@@ -898,15 +893,15 @@
            int equipPlace = suitTypeDict[suitType][0];

            int curSuitLv = 0;

            int nextSuitLv = 0;

            bool isSuitLv = TryGetSuitLV(equipPlace,type,out curSuitLv,out nextSuitLv,itemId);

            bool isSuitLv = TryGetSuitLV(equipPlace, type, out curSuitLv, out nextSuitLv, itemId);



            TryGetSuitAttrData(equipPlace,curSuitLv,out activeSuit);

            TryGetSuitAttrData(equipPlace,nextSuitLv,out nextSuit);

            TryGetSuitAttrData(equipPlace, curSuitLv, out activeSuit);

            TryGetSuitAttrData(equipPlace, nextSuitLv, out nextSuit);



            return activeSuit != null || nextSuit != null;

        }



        public bool TryGetStoneSumSuitAttr(int suitType,out JadeDynastyStoneSuitAttrData activeSuit, out JadeDynastyStoneSuitAttrData nextSuit)

        public bool TryGetStoneSumSuitAttr(int suitType, out JadeDynastyStoneSuitAttrData activeSuit, out JadeDynastyStoneSuitAttrData nextSuit)

        {

            activeSuit = null;

            nextSuit = null;

@@ -914,7 +909,7 @@


            int curSuitLv = 0;

            int nextSuitLv = 0;

            bool isSuitLv = TryGetStoneSuitLV(suitType,out curSuitLv, out nextSuitLv);

            bool isSuitLv = TryGetStoneSuitLV(suitType, out curSuitLv, out nextSuitLv);



            TryGetStoneSuitAttrData(suitType, curSuitLv, out activeSuit);

            TryGetStoneSuitAttrData(suitType, nextSuitLv, out nextSuit);


 System/JadeDynastyKnapSack/JadeDynastyEquipWin.cs

@@ -309,7 +309,7 @@


        public void OnClickSort()

        {

            ItemLogicUtility.Instance.SendPackResetQuest(PackType.JadeDynastyItem);

            ItemLogicUtility.Instance.ResetPack(PackType.JadeDynastyItem);

            TimeDownMgr.Instance.Begin(TimeDownMgr.CoolTimeType.BagSort, 5.0f, RefreshTime);

            sortText.text = Language.Get("BagWin_SortCDbtn_Text_1", 5);

            sortImage.SetSprite("BlackBtn");


 System/JadeDynastyKnapSack/JadeDynastyGemModel.cs

@@ -188,11 +188,6 @@
            for (int i = 0; i < package.EquipCount; i++)

            {

                var data = package.InfoList[i];

                if (data.EquipPlace < (int)RoleEquipType.JadeDynasty_Cloak

                    || data.EquipPlace > (int)RoleEquipType.JadeDynasty_Sword4)

                {

                    continue;

                }

                var gemEquipData = new GemEquipData()

                {

                    binds = new int[4] { 0, 0, 0, 0 },


 System/KnapSack/Logic/EquipTip.cs

@@ -237,7 +237,6 @@
            SetWashAttrUI();

            SetGemAttrUI();

            SetSuitAttrUI();

            SetJadeDynastySuitAttr();

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

            {

                if (i == curAttrTypeNum - 1)

@@ -856,27 +855,6 @@
                num.text = StringUtility.Contact("<color=#9e8f73>", num.text, "</color>");

                attr.text = StringUtility.Contact("<color=#9e8f73>", attr.text, "</color>");

            }

        }



        private void SetJadeDynastySuitAttr()

        {

            if (jadeDynastySuitObj == null) return;



            if(itemAttrData.itemConfig.EquipPlace >= (int)RoleEquipType.JadeDynasty_Cloak

                && itemAttrData.itemConfig.EquipPlace <= (int)RoleEquipType.JadeDynasty_Sword4)

            {

                jadeDynastySuitObj.SetActive(true);

            }

            else

            {

                jadeDynastySuitObj.SetActive(false);

                return;

            }



            PackType packType = itemAttrData.packType == PackType.Deleted ? PackType.JadeDynastyItem : itemAttrData.packType;



            curJadeDynastySuitAttr.SetDisplay(packType,false,itemAttrData.itemConfig.EquipPlace,itemAttrData.itemId);

            nextJadeDynastySuitAttr.SetDisplay(packType, true, itemAttrData.itemConfig.EquipPlace,itemAttrData.itemId);

        }



        private void SetMidUIHeight(float midHeight)


 System/KnapSack/Logic/ItemLogicUtility.cs

@@ -17,7 +17,6 @@
        private int[] drugIDs;
        private int[] onekeySellTypes;
        private int[] pushItemIds;
        private int[] pushBuffTypeIds;

        private List<int> equipBaseProperties = new List<int>();
        private Dictionary<int, int> promptUseLimitDict;
@@ -56,7 +55,6 @@
            onekeySellTypes = ConfigParse.GetMultipleStr<int>(FuncConfigConfig.Get("OneKeySellItemType").Numerical1);

            pushItemIds = ConfigParse.GetMultipleStr<int>(FuncConfigConfig.Get("IntroductionItem").Numerical1);
            pushBuffTypeIds = ConfigParse.GetMultipleStr<int>(FuncConfigConfig.Get("IntroductionItem").Numerical2);

            betterEquipExceptDungeonDict = new Dictionary<int, List<int>>();
            var excEquipData = JsonMapper.ToObject(FuncConfigConfig.Get("GoodItemDungeon").Numerical1);
@@ -696,7 +694,7 @@
            {
                for (int i = 0; i < itemModels.Count; i++)
                {
                    if (itemModels[i].config.JobLimit / 100 == PlayerDatas.Instance.baseData.Job)
                    if (IsJobCompatibleItem(itemModels[i].itemId))
                    {
                        if (itemModels[i].config.LV >= item.config.LV)
                        {
@@ -739,7 +737,7 @@
                return;
            }

            if (item.packType != PackType.Item && item.packType != PackType.JadeDynastyItem)
            if (item.packType != PackType.Item)
            {
                return;
            }
@@ -764,18 +762,11 @@
                case RoleEquipType.FairyCan2:
                case RoleEquipType.Wing:
                case RoleEquipType.Guard1:
                case RoleEquipType.JadeDynasty_Cloak:
                case RoleEquipType.JadeDynasty_FaceMask:
                case RoleEquipType.JadeDynasty_Glove1:
                case RoleEquipType.JadeDynasty_Glove2:
                case RoleEquipType.JadeDynasty_Ruyi:
                case RoleEquipType.JadeDynasty_Pendant:
                case RoleEquipType.JadeDynasty_Ring1:
                case RoleEquipType.JadeDynasty_Ring2:
                case RoleEquipType.JadeDynasty_Sword1:
                case RoleEquipType.JadeDynasty_Sword2:
                case RoleEquipType.JadeDynasty_Sword3:
                case RoleEquipType.JadeDynasty_Sword4:
                case RoleEquipType.Guard2:
                case RoleEquipType.Glove:
                case RoleEquipType.Jade:
                case RoleEquipType.PeerlessWeapon1:
                case RoleEquipType.PeerlessWeapon2:
                    if (betterEquipExceptDungeonDict.ContainsKey(PlayerDatas.Instance.baseData.MapID))
                    {
                        if (betterEquipExceptDungeonDict[PlayerDatas.Instance.baseData.MapID].Contains(item.itemId))
@@ -1031,7 +1022,6 @@
                if (_sellItemScorelist.Count > 0)
                {
                    int score = 0;
                    int curJob = PlayerDatas.Instance.baseData.Job;
                    for (score = _sellItemScorelist.Count - 1; score > -1; score--)
                    {
                        SinglePack equipPack = playerPack.GetSinglePack(PackType.Equip);
@@ -1041,17 +1031,15 @@
                            model = equipPack.GetItemByIndex(key);
                        }

                        List<ItemModel> modellist = _sameIndexEquipDict[key][_sellItemScorelist[score]];
                        int i = 0;
                        var modellist = _sameIndexEquipDict[key][_sellItemScorelist[score]];
                        bool remainBetter = true;
                        for (i = 0; i < modellist.Count; i++)
                        for (var i = 0; i < modellist.Count; i++)
                        {
                            double joblimit = Math.Floor((double)modellist[i].config.JobLimit / 100);
                            if (model != null)
                            {
                                if (remainBetter)
                                {
                                    if (model.equipScore < _sellItemScorelist[score] && curJob == joblimit)
                                    if (model.equipScore < _sellItemScorelist[score] && IsJobCompatibleItem(model.itemId))
                                    {
                                        _sameIndexEquipDict[key].Remove(_sellItemScorelist[score]);
                                        remainBetter = false;
@@ -1062,7 +1050,7 @@
                            }
                            else
                            {
                                if (curJob == joblimit)
                                if (IsJobCompatibleItem(model.itemId))
                                {
                                    if (remainBetter)
                                    {
@@ -1080,15 +1068,14 @@
                        }

                    }
                    int j = 0;
                    for (j = 0; j < _sellItemScorelist.Count; j++)

                    for (var j = 0; j < _sellItemScorelist.Count; j++)
                    {

                        if (_sameIndexEquipDict[key].ContainsKey(_sellItemScorelist[j]))
                        {
                            int k = 0;
                            List<ItemModel> sellModlelist = _sameIndexEquipDict[key][_sellItemScorelist[j]];
                            for (k = 0; k < sellModlelist.Count; k++)
                            var sellModlelist = _sameIndexEquipDict[key][_sellItemScorelist[j]];
                            for (var k = 0; k < sellModlelist.Count; k++)
                            {
                                _sellItemlist.Add(sellModlelist[k]);
                            }
@@ -1174,7 +1161,7 @@
        /// 一键出售物品的请求
        /// </summary>
        /// <param name="_oneKeySelllist"></param>
        public void SendOneKeySellQuest(List<ItemModel> _oneKeySelllist)
        public void OneKeySell(List<ItemModel> _oneKeySelllist)
        {
            if (!isPackResetOk || SettingEffectMgr.Instance.isStartOneKeySell) return;

@@ -1197,7 +1184,7 @@
        /// </summary>
        /// <param name="type"></param>
        public bool isPackResetOk { get; set; }
        public void SendPackResetQuest(PackType type)
        public void ResetPack(PackType type)
        {
            if (lookLineIndex > -1)
            {
@@ -1212,7 +1199,7 @@
            SinglePack singlePack = playerPack.GetSinglePack(type);
            if (singlePack != null)
            {
                C070F_tagCItemPackReset packReset = new C070F_tagCItemPackReset();
                var packReset = new C070F_tagCItemPackReset();
                packReset.Type = (byte)type;
                packReset.ItemBeginIndex = 0;
                packReset.ItemEndIndex = (ushort)(singlePack.unlockedGridCount - 1);
@@ -1255,76 +1242,6 @@
        #endregion

        #region 判断是否有更好的装备替换
        /// <summary>
        /// 过滤装备位判断
        /// </summary>
        /// <param name="ignoreType"></param>
        /// <returns></returns>
        public bool CheckBetterEquip(RoleEquipType ignoreType)
        {
            SinglePack singlePack = playerPack.GetSinglePack(PackType.Equip);
            if (singlePack != null)
            {
                Dictionary<int, ItemModel> putOnDic = singlePack.GetAllItems();
                foreach (var key in putOnDic.Keys)
                {
                    if ((RoleEquipType)key == ignoreType)
                    {
                        continue;
                    }
                    if (key < 13)
                    {
                        List<ItemModel> itemlist = GetSameEquipPlacelist(key);
                        int i = 0;
                        for (i = 0; i < itemlist.Count; i++)
                        {
                            bool isOverdue = IsOverdue(itemlist[i].guid, 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)
                            {
                                return true;
                            }
                        }
                    }
                }
            }
            else
            {
                int i = 1;
                for (i = 1; i < 13; i++)
                {
                    List<ItemModel> itemlist = GetSameEquipPlacelist(i);
                    if (itemlist.Count > 0)
                    {
                        return true;
                    }
                }
            }
            return false;
        }

        private List<ItemModel> GetSameEquipPlacelist(int equipPlace)
        {
            List<ItemModel> modellist = new List<ItemModel>();
            Dictionary<int, ItemModel> dic = null;
            SinglePack singlePack = playerPack.GetSinglePack(PackType.Item);
            if (singlePack != null)
            {
                dic = singlePack.GetAllItems();
                foreach (var model in dic.Values)
                {
                    if (model.config.EquipPlace == equipPlace)
                    {
                        double equipJob = Math.Floor((double)model.config.JobLimit / 100);
                        if (equipJob == 0 || equipJob == PlayerDatas.Instance.baseData.Job)
                        {
                            modellist.Add(model);
                        }
                    }
                }
            }
            return modellist;
        }

        /// <summary>
        /// 获取装备评分最高可提升战力的装备
@@ -1338,15 +1255,13 @@
            ItemModel putModel = playerPack.GetItemByIndex(PackType.Equip, equipPlace);
            equipPlace = (equipPlace == 9 || equipPlace == 10) ? 9 : equipPlace;
            var guid = string.Empty;
            var equips = new List<string>();
            var score = putModel == null ? 0 : putModel.equipScore;
            var job = PlayerDatas.Instance.baseData.Job;
            foreach (var item in allItems.Values)
            {
                if (item.config.EquipPlace == equipPlace)
                {
                    if (!IsOverdue(item.guid, item.itemId, item.useDataDict)
                       && (item.config.JobLimit == 0 || (item.config.JobLimit / 100) == job) && item.equipScore > score)
                       && (IsJobCompatibleItem(item.itemId)) && item.equipScore > score)
                    {
                        guid = item.guid;
                        score = item.equipScore;
@@ -1375,7 +1290,7 @@
            int equipPlace = itemModel.config.EquipPlace;
            if (!itemModelDict.ContainsKey(equipPlace))
            {
                Dictionary<int, ItemModel> dict = new Dictionary<int, ItemModel>();
                var dict = new Dictionary<int, ItemModel>();
                if (IsFightUp(itemModel.itemId, itemModel.equipScore) == 1)
                {
                    dict.Add(itemModel.itemPlace, itemModel);
@@ -1402,16 +1317,21 @@
            return itemModel;
        }

        public bool IsCanPutOn(ItemModel itemModel)
        bool IsCanPutOn(ItemModel item)
        {
            double equipJob = Math.Floor((double)itemModel.config.JobLimit / 100);
            int playerJob = PlayerDatas.Instance.baseData.Job;
            int equipPlace = itemModel.config.EquipPlace;
            if (equipPlace == 0 || equipPlace > 12) return false;
            if (equipJob != 0 && equipJob != playerJob) return false;
            if (IsJobCompatibleItem(item.itemId))
            {
                return false;
            }

            List<int> putOnlimitList = itemModel.GetUseDataModel((int)ItemUseDataKey.cancelUseLimit);
            if (putOnlimitList != null)
            int equipPlace = item.config.EquipPlace;
            if (equipPlace == 0 || equipPlace > 17)
            {
                return false;
            }

            var putOnlimitList = item.GetUseDataModel((int)ItemUseDataKey.cancelUseLimit);
            if (!putOnlimitList.IsNullOrEmpty())
            {
                if (putOnlimitList[0] == 1)
                {
@@ -1419,18 +1339,9 @@
                }
            }

            return CheckPutOnRealm(itemModel.config);
            return PlayerDatas.Instance.baseData.realmLevel >= item.config.RealmLimit;
        }

        private bool CheckPutOnRealm(ItemConfig config)
        {
            var _realmLv = config.RealmLimit;
            if (PlayerDatas.Instance.baseData.realmLevel < _realmLv)
            {
                return false;
            }
            return true;
        }
        #endregion

        #region 得到物品的品质颜色
@@ -1466,7 +1377,6 @@
        //设置玩家货币显示
        public string OnChangeCoinsUnit(ulong value)
        {

            string strCoins = value.ToString();
            if (strCoins.Length > 4 && strCoins.Length < 9)
            {
@@ -1498,99 +1408,27 @@
        /// <returns></returns>
        public int IsFightUp(int _itemID, int _score)//-1低级，0不是本职业，1更好
        {
            ItemConfig chinItemModel = ItemConfig.Get(_itemID);
            if (chinItemModel != null)
            var config = ItemConfig.Get(_itemID);
            if (config != null)
            {
                ItemModel putOnModel = null;
                switch ((RoleEquipType)chinItemModel.EquipPlace)
                var index = EquipModel.GetItemServerEquipPlace(_itemID);
                if (index == -1)
                {
                    case RoleEquipType.Clothes:
                    case RoleEquipType.FairyCan1:
                    case RoleEquipType.Belt:
                    case RoleEquipType.Hat:
                    case RoleEquipType.Neck:
                    case RoleEquipType.Shoes:
                    case RoleEquipType.Guard1:
                    case RoleEquipType.Trousers:
                    case RoleEquipType.Weapon:
                    case RoleEquipType.Weapon2:
                    case RoleEquipType.Wing:
                        putOnModel = playerPack.GetItemByIndex(PackType.Equip, chinItemModel.EquipPlace);
                        break;
                    case RoleEquipType.JadeDynasty_Cloak:
                    case RoleEquipType.JadeDynasty_FaceMask:
                    case RoleEquipType.JadeDynasty_Glove1:
                    case RoleEquipType.JadeDynasty_Pendant:
                    case RoleEquipType.JadeDynasty_Ring1:
                    case RoleEquipType.JadeDynasty_Ruyi:
                    case RoleEquipType.JadeDynasty_Sword1:
                    case RoleEquipType.JadeDynasty_Sword2:
                    case RoleEquipType.JadeDynasty_Sword3:
                    case RoleEquipType.JadeDynasty_Sword4:
                        putOnModel = playerPack.GetItemByIndex(PackType.JadeDynastyEquip, chinItemModel.EquipPlace);
                        break;
                    default:
                        return 0;
                    return 0;
                }

                ItemModel putOnModel2 = null;
                switch ((RoleEquipType)chinItemModel.EquipPlace)
                var item = playerPack.GetItemByIndex(PackType.Equip, index);
                var equipScore = item != null ? item.equipScore : 0;
                if (IsJobCompatibleItem(_itemID))
                {
                    case RoleEquipType.FairyCan1:
                        putOnModel2 = playerPack.GetItemByIndex(PackType.Equip, (int)RoleEquipType.FairyCan2);
                        break;
                    case RoleEquipType.JadeDynasty_Glove1:
                        putOnModel2 = playerPack.GetItemByIndex(PackType.JadeDynastyEquip, (int)RoleEquipType.JadeDynasty_Glove2);
                        break;
                    case RoleEquipType.JadeDynasty_Ring1:
                        putOnModel2 = playerPack.GetItemByIndex(PackType.JadeDynastyEquip, (int)RoleEquipType.JadeDynasty_Ring2);
                        break;
                }

                switch ((RoleEquipType)chinItemModel.EquipPlace)
                {
                    case RoleEquipType.FairyCan1:
                    case RoleEquipType.JadeDynasty_Glove1:
                    case RoleEquipType.JadeDynasty_Ring1:
                        if (putOnModel2 != null)
                        {
                            if (putOnModel != null)
                            {
                                if (putOnModel2.equipScore < putOnModel.equipScore)
                                {
                                    putOnModel = putOnModel2;
                                }
                            }
                        }
                        else
                        {
                            putOnModel = putOnModel2;
                        }
                        break;
                }

                int equipScore1 = 0;
                if (putOnModel != null)
                {
                    equipScore1 = (int)putOnModel.equipScore;
                }

                int playerJob = PlayerDatas.Instance.baseData.Job;

                if (playerJob == Math.Floor((double)chinItemModel.JobLimit / 100) || chinItemModel.JobLimit == 0)
                {
                    if (equipScore1 > _score)
                        return -1;
                    else if (equipScore1 < _score)
                        return 1;
                    else
                        return 0;
                    return _score.CompareTo(equipScore);
                }
                else
                {
                    return 0;
                }
            }

            return 0;
        }

@@ -1643,5 +1481,12 @@
            return false;
        }
        #endregion

        public bool IsJobCompatibleItem(int itemId)
        {
            var config = ItemConfig.Get(itemId);
            return config.JobLimit == 0 || config.JobLimit / 100 == PlayerDatas.Instance.baseData.Job;
        }

    }
}

 System/KnapSack/Logic/ItemOperateUtility.cs

@@ -34,7 +34,7 @@
            }

            var itemId = selectedItem.itemId;
            if (selectedItem.config.JobLimit != 0 && selectedItem.config.JobLimit / 100 != PlayerDatas.Instance.baseData.Job)
            if (!ItemLogicUtility.Instance.IsJobCompatibleItem(selectedItem.itemId))
            {
                SysNotifyMgr.Instance.ShowTip("GeRen_lhs_31379");
                return;
@@ -43,25 +43,13 @@
            var putOnLimits = selectedItem.GetUseDataModel((int)ItemUseDataKey.cancelUseLimit);
            if (putOnLimits != null && putOnLimits[0] == 1)
            {
                var placable = CheckPutOnPlace(itemId);
                if (!placable)
                {
                    return;
                }

                PutOnEquip(selectedItem.equipPlace,selectedItem.guid);
                PutOnEquip(selectedItem.equipPlace, selectedItem.guid);
                return;
            }

            var wearable = IsWearable(itemId);
            if (wearable)
            {
                var placable = CheckPutOnPlace(itemId);
                if (!placable)
                {
                    return;
                }

                PutOnEquip(selectedItem.equipPlace, selectedItem.guid);
            }
        }
@@ -130,65 +118,11 @@
            return true;
        }

        private bool CheckPutOnPlace(int itemId)
        {
            var config = ItemConfig.Get(itemId);
            if (config == null)
            {
                return false;
            }

            ItemModel putOnModel1 = null;
            ItemModel putOnModel2 = null;
            bool isSameEquip = false;
            switch ((RoleEquipType)config.EquipPlace)
            {
                case RoleEquipType.JadeDynasty_Glove1:
                    isSameEquip = true;
                    putOnModel1 = packModel.GetItemByIndex(PackType.JadeDynastyEquip, config.EquipPlace);
                    putOnModel2 = packModel.GetItemByIndex(PackType.JadeDynastyEquip, (int)RoleEquipType.JadeDynasty_Glove2);
                    break;
                case RoleEquipType.JadeDynasty_Ring1:
                    isSameEquip = true;
                    putOnModel1 = packModel.GetItemByIndex(PackType.JadeDynastyEquip, config.EquipPlace);
                    putOnModel2 = packModel.GetItemByIndex(PackType.JadeDynastyEquip, (int)RoleEquipType.JadeDynasty_Ring2);
                    break;
            }

            if (isSameEquip)
            {
                if (putOnModel1 != null || putOnModel2 != null)
                {
                    WindowCenter.Instance.Open<FairyWearWin>();
                    return false;
                }
            }

            return true;

        }

        public void CheckSuitReplaceInfo(int equipPlace, ItemModel item)
        {
            if (item == null)
            {
                return;
            }

            if (item.packType == PackType.JadeDynastyItem)
            {
                if (equipPlace >= (int)RoleEquipType.JadeDynasty_Cloak && equipPlace <= (int)RoleEquipType.JadeDynasty_Sword4)
                {
                    var jadeDynastyModel = ModelCenter.Instance.GetModel<JadeDynastyEquipModel>();
                    bool islock = jadeDynastyModel.IsLockEquipPlace(equipPlace);
                    if (islock)
                    {
                        int towerlayer = 0;
                        jadeDynastyModel.TryGetLockTowerLayer(equipPlace, out towerlayer);
                        SysNotifyMgr.Instance.ShowTip("JadeDynastyEquip", towerlayer);
                        return;
                    }
                }
            }

            var replaceDic = suitModel.SetReplaceSuitModel(item.itemId, equipPlace);
@@ -236,15 +170,6 @@
                isReplace = true;
            }

            if (item.packType == PackType.JadeDynastyItem)
            {
                if (item != null && item.config.BindType == 1)
                {
                    replaceTip = Language.Get("JadeDynastyEquip5");
                    isReplace = true;
                }
            }

            if (isReplace)
            {
                ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"), replaceTip,
@@ -272,27 +197,7 @@
                EquipAttrShift(equipPlace, oldItem);
            }

            switch ((RoleEquipType)equipPlace)
            {
                case RoleEquipType.JadeDynasty_Cloak:
                case RoleEquipType.JadeDynasty_FaceMask:
                case RoleEquipType.JadeDynasty_Glove1:
                case RoleEquipType.JadeDynasty_Glove2:
                case RoleEquipType.JadeDynasty_Pendant:
                case RoleEquipType.JadeDynasty_Ring1:
                case RoleEquipType.JadeDynasty_Ring2:
                case RoleEquipType.JadeDynasty_Ruyi:
                case RoleEquipType.JadeDynasty_Sword1:
                case RoleEquipType.JadeDynasty_Sword2:
                case RoleEquipType.JadeDynasty_Sword3:
                case RoleEquipType.JadeDynasty_Sword4:
                    PutOnJadeDynastyEquip(equipPlace, guid);
                    break;
                default:
                    PutOnNormalEquip(equipPlace, guid);
                    break;
            }

            PutOnNormalEquip(equipPlace, guid);
            SoundPlayer.Instance.PlayUIAudio(24);
        }

@@ -320,16 +225,7 @@
        private void EquipAttrShift(int equipPlace, ItemModel item)
        {
            var packType = GeneralDefine.GetPackTypeByItemType(item.config.Type);
            ItemModel putOnModel = null;
            switch (packType)
            {
                case PackType.JadeDynastyItem:
                    putOnModel = packModel.GetItemByIndex(PackType.JadeDynastyEquip, equipPlace);
                    break;
                default:
                    putOnModel = packModel.GetItemByIndex(PackType.Equip, equipPlace);
                    break;
            }
            var putOnModel = packModel.GetItemByIndex(PackType.Equip, equipPlace);

            if (putOnModel == null)
            {
@@ -352,21 +248,8 @@
                }
            }

            uint[] stones = null;
            switch (packType)
            {
                case PackType.Item:
                    stones = PlayerStoneData.Instance.GetStoneInfo(equipPlace);
                    break;
                case PackType.JadeDynastyItem:
                    JadeDynastyGemModel.GemEquipData equipData;
                    var model = ModelCenter.Instance.GetModel<JadeDynastyGemModel>();
                    var existGem = model.TryGetEquipGems(equipPlace, out equipData);
                    stones = existGem ? equipData.items : null;
                    break;
            }

            var gemOpenLvs = packType == PackType.JadeDynastyItem ? itemTipsModel.jadeDynastyGemOpenLvs : itemTipsModel.gemOpenLvs;
            var stones = PlayerStoneData.Instance.GetStoneInfo(equipPlace);
            var gemOpenLvs = itemTipsModel.gemOpenLvs;
            if (stones != null)
            {
                int i = 0;
@@ -409,56 +292,21 @@
                return;
            }

            SinglePack singlePack = null;
            int remainGrid = 0;
            int equipPlace = item.itemPlace;
            if (item.packType == PackType.JadeDynastyEquip)
            var equipPlace = EquipModel.GetItemServerEquipPlace(item.itemId);
            var singlePack = packModel.GetSinglePack(PackType.Item);
            var remainGrid = packModel.GetEmptyGridCount(PackType.Item);
            if (remainGrid < 1)
            {
                equipPlace += 121;
                SysNotifyMgr.Instance.ShowTip("GeRen_chenxin_998371");
            }

            switch ((RoleEquipType)equipPlace)
            else
            {
                case RoleEquipType.JadeDynasty_Cloak:
                case RoleEquipType.JadeDynasty_FaceMask:
                case RoleEquipType.JadeDynasty_Glove1:
                case RoleEquipType.JadeDynasty_Glove2:
                case RoleEquipType.JadeDynasty_Pendant:
                case RoleEquipType.JadeDynasty_Ring1:
                case RoleEquipType.JadeDynasty_Ring2:
                case RoleEquipType.JadeDynasty_Ruyi:
                case RoleEquipType.JadeDynasty_Sword1:
                case RoleEquipType.JadeDynasty_Sword2:
                case RoleEquipType.JadeDynasty_Sword3:
                case RoleEquipType.JadeDynasty_Sword4:
                    remainGrid = packModel.GetEmptyGridCount(PackType.JadeDynastyItem);
                    if (remainGrid < 1)
                    {
                        SysNotifyMgr.Instance.ShowTip("GeRen_chenxin_998371");
                    }
                    else
                    {
                        SendPutOffJadeDynastyEquip(equipPlace);
                        SoundPlayer.Instance.PlayUIAudio(25);
                    }
                    break;
                default:
                    singlePack = packModel.GetSinglePack(PackType.Item);
                    remainGrid = packModel.GetEmptyGridCount(PackType.Item);
                    if (remainGrid < 1)
                    {
                        SysNotifyMgr.Instance.ShowTip("GeRen_chenxin_998371");
                    }
                    else
                    {
                        if (singlePack != null)
                        {
                            int gridIndex = singlePack.GetFirstEmptyGridIndex();
                            SendPutOffNormalEquip(equipPlace, gridIndex);
                            SoundPlayer.Instance.PlayUIAudio(25);
                        }
                    }
                    break;
                if (singlePack != null)
                {
                    int gridIndex = singlePack.GetFirstEmptyGridIndex();
                    SendPutOffNormalEquip(equipPlace, gridIndex);
                    SoundPlayer.Instance.PlayUIAudio(25);
                }
            }
        }

@@ -999,21 +847,8 @@
            if (attrData.itemConfig.EquipPlace > 0 && attrData.itemConfig.EquipPlace <= (int)RoleEquipType.Guard1)
            {
                bool isOverdue = ItemLogicUtility.Instance.IsOverdue(attrData.guid, attrData.itemConfig.ID, attrData.useDataDict);
                bool isLimit = Math.Floor((double)attrData.itemConfig.JobLimit / 100) == PlayerDatas.Instance.baseData.Job
                    || attrData.itemConfig.JobLimit == 0 ? true : false;
                bool isLimit = ItemLogicUtility.Instance.IsJobCompatibleItem(attrData.itemId) ? true : false;
                var putModel = packModel.GetItemByIndex(PackType.Equip, attrData.itemConfig.EquipPlace);
                if (attrData.itemConfig.EquipPlace == (int)RoleEquipType.FairyCan1)
                {
                    var fairy2Model = packModel.GetItemByIndex(PackType.Equip, (int)RoleEquipType.FairyCan2);
                    if (fairy2Model == null || putModel == null)
                    {
                        putModel = null;
                    }
                    else
                    {
                        putModel = putModel.equipScore > fairy2Model.equipScore ? fairy2Model : putModel;
                    }
                }

                if (!isLimit || isOverdue || (putModel != null && attrData.score < putModel.equipScore))
                {

 System/KnapSack/Logic/ItemTipsModel.cs

@@ -561,76 +561,13 @@
                    var dogzModel = ModelCenter.Instance.GetModel<DogzModel>();

                    dogzModel.TryGetDogzEquip(dogzModel.presentSelectDogz, equipPlace, out itemModel);

                    break;

                case PackType.JadeDynastyEquip:

                    itemModel = playerPack.GetItemByIndex(type, equipPlace);

                    break;

            }



            if (itemModel == null) return;



            ItemModel fairyModel2 = null;

            switch ((RoleEquipType)equipPlace)

            {

                case RoleEquipType.FairyCan1:

                    fairyModel2 = playerPack.GetItemByIndex(type, (int)RoleEquipType.FairyCan2);

                    if (fairyModel2 != null)

                    {

                        if (itemModel != null)

                        {

                            if (fairyModel2.equipScore < itemModel.equipScore)

                            {

                                itemModel = fairyModel2;

                            }

                        }

                    }

                    else

                    {

                        itemModel = fairyModel2;

                    }

                    break;

                case RoleEquipType.JadeDynasty_Glove1:

                    fairyModel2 = playerPack.GetItemByIndex(type, (int)RoleEquipType.JadeDynasty_Glove2);

                    if (fairyModel2 != null)

                    {

                        if (itemModel != null)

                        {

                            if (fairyModel2.equipScore < itemModel.equipScore)

                            {

                                itemModel = fairyModel2;

                            }

                        }

                    }

                    else

                    {

                        itemModel = fairyModel2;

                    }

                    break;

                case RoleEquipType.JadeDynasty_Ring1:

                    fairyModel2 = playerPack.GetItemByIndex(type, (int)RoleEquipType.JadeDynasty_Ring2);

                    if (fairyModel2 != null)

                    {

                        if (itemModel != null)

                        {

                            if (fairyModel2.equipScore < itemModel.equipScore)

                            {

                                itemModel = fairyModel2;

                            }

                        }

                    }

                    else

                    {

                        itemModel = fairyModel2;

                    }

                    break;

            }



            if (itemModel != null)

            {

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

                  , itemModel.itemPlace, itemModel.isBind, true

                  , type, itemModel.guid, ConfigParse.Analysis(itemModel.itemInfo.userData));



            }

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

              , itemModel.itemPlace, itemModel.isBind, true

              , type, itemModel.guid, ConfigParse.Analysis(itemModel.itemInfo.userData));

        }



        public void ShowUICtrl()

@@ -1993,15 +1930,13 @@
        #endregion



        #region 解锁背包格子数据

        public int OpenCount

        {

        public int OpenCount {

            get; private set;

        }



        public PackType packType { get; private set; }



        public int Index

        {

        public int Index {

            get; private set;

        }




 System/KnapSack/New/CommonItemBaisc.cs

@@ -1,10 +1,6 @@
using UnityEngine;

using System.Collections.Generic;

using UnityEngine;

using UnityEngine.UI;



using Snxxz.UI;

using System.Collections.Generic;

using System;

using System.Linq;



namespace Snxxz.UI

{

@@ -187,7 +183,7 @@
                return 0;

            }



            if (compareSocre <= 0 && (type == PackType.Equip || type == PackType.DogzEquip || type == PackType.JadeDynastyEquip))

            if (compareSocre <= 0 && (type == PackType.Equip || type == PackType.DogzEquip))

            {

                return 0;

            }

@@ -204,8 +200,7 @@
                return 1;

            }



            var job = PlayerDatas.Instance.baseData.Job;

            if (config.JobLimit != 0 && job != config.JobLimit / 100)

            if (!ItemLogicUtility.Instance.IsJobCompatibleItem(itemId))

            {

                return 1;

            }

@@ -216,9 +211,6 @@
                {

                    case PackType.DogzItem:

                        compareSocre = GetCurrentEquipSocre(PackType.DogzEquip, config.EquipPlace);

                        break;

                    case PackType.JadeDynastyItem:

                        compareSocre = GetCurrentEquipSocre(PackType.JadeDynastyEquip, config.EquipPlace);

                        break;

                    default:

                        var result = equipModel.CompareToCurrent(guid);

@@ -250,8 +242,6 @@


        int GetCurrentEquipSocre(PackType type, int equipPlace)

        {

            ItemModel fairy01 = null;

            ItemModel fairy02 = null;

            switch (type)

            {

                case PackType.DogzEquip:

@@ -259,39 +249,10 @@
                    ItemModel putOnModel = null;

                    dogzModel.TryGetDogzEquip(dogzModel.presentSelectDogz, equipPlace, out putOnModel);

                    return putOnModel == null ? 0 : putOnModel.equipScore;

                case PackType.JadeDynastyEquip:



                    switch ((RoleEquipType)equipPlace)

                    {

                        case RoleEquipType.JadeDynasty_Glove1:

                            fairy01 = packModel.GetItemByIndex(type, (int)RoleEquipType.JadeDynasty_Glove1);

                            fairy02 = packModel.GetItemByIndex(type, (int)RoleEquipType.JadeDynasty_Glove2);

                            if (fairy01 == null || fairy02 == null)

                            {

                                return 0;

                            }

                            else

                            {

                                return fairy01.equipScore >= fairy02.equipScore ? fairy02.equipScore : fairy01.equipScore;

                            }

                        case RoleEquipType.JadeDynasty_Ring1:

                            fairy01 = packModel.GetItemByIndex(type, (int)RoleEquipType.JadeDynasty_Ring1);

                            fairy02 = packModel.GetItemByIndex(type, (int)RoleEquipType.JadeDynasty_Ring2);

                            if (fairy01 == null || fairy02 == null)

                            {

                                return 0;

                            }

                            else

                            {

                                return fairy01.equipScore >= fairy02.equipScore ? fairy02.equipScore : fairy01.equipScore;

                            }

                        default:

                            ItemModel model = packModel.GetItemByIndex(type, equipPlace);

                            return model == null ? 0 : model.equipScore;

                    }

                default:

                    ItemModel model = packModel.GetItemByIndex(type, equipPlace);

                    return model == null ? 0 : model.equipScore;

            }



            return 0;

        }

    }



@@ -339,5 +300,7 @@
            return false;

        }

    }





}




 System/KnapSack/New/DepotWin.cs

@@ -223,7 +223,7 @@


        public void OnClickSortBtn()

        {

            ItemLogicUtility.Instance.SendPackResetQuest(PackType.Item);

            ItemLogicUtility.Instance.ResetPack(PackType.Item);

            TimeDownMgr.Instance.Begin(TimeDownMgr.CoolTimeType.BagSort, 5.0f, RefreshBagSortTime);

            _timeBagDown.text = Language.Get("BagWin_SortCDbtn_Text_1", 5);

            _bagSortImage.SetSprite("BlackBtn");

@@ -231,7 +231,7 @@
        }

        public void OnClickDepotSortBtn()

        {

            ItemLogicUtility.Instance.SendPackResetQuest(PackType.Warehouse);

            ItemLogicUtility.Instance.ResetPack(PackType.Warehouse);

            TimeDownMgr.Instance.Begin(TimeDownMgr.CoolTimeType.DepotSort, 5.0f, RefreshDepotSortTime);

            _timeDepotDown.text = Language.Get("BagWin_SortCDbtn_Text_1", 5);

            _depotSortImage.SetSprite("BlackBtn");


 System/KnapSack/New/FairyWearWin.cs

File was deleted

 System/KnapSack/New/FairyWearWin.cs.meta

File was deleted

 System/KnapSack/New/OneKeySellWin.cs

@@ -182,7 +182,7 @@


        private void OnClickSellBtn(List<ItemModel> _oneKeySelllist)

        {

            ItemLogicUtility.Instance.SendOneKeySellQuest(_oneKeySelllist);

            ItemLogicUtility.Instance.OneKeySell(_oneKeySelllist);

            if(_oneKeySelllist.Count < 1)

            {

                OnClickCloseBtn();

@@ -196,7 +196,7 @@


            if(obj.Result == 1)

            {

                ItemLogicUtility.Instance.SendPackResetQuest(PackType.Item);

                ItemLogicUtility.Instance.ResetPack(PackType.Item);

            }



            OnClickCloseBtn();


 System/KnapSack/New/RoleEquipWin.cs

@@ -160,7 +160,7 @@


        void OnClickSortBtn()

        {

            ItemLogicUtility.Instance.SendPackResetQuest(PackType.Item);

            ItemLogicUtility.Instance.ResetPack(PackType.Item);

            sortableTime = Time.time + 5f;



            if (sortableLogicUpdate != null)


 System/MainInterfacePanel/FlyingShoesTask.cs

@@ -135,11 +135,11 @@
                }

                else

                {

                    int job = PlayerDatas.Instance.baseData.Job;

                    foreach (var key in BackpackDic.Keys)

                    {

                        ItemModel ItemM = BackpackDic[key];

                        if (ItemM.config.Type == 111 && ItemM.config.ExpireTime == 0 && ItemM.config.JobLimit / 100 == job)

                        var item = BackpackDic[key];

                        if (item.config.Type == 111 && item.config.ExpireTime == 0 
                            && ItemLogicUtility.Instance.IsJobCompatibleItem(item.itemId))

                        {

                            WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.KnapSackFunc1Type2);//跳到背包

                            return;

@@ -614,7 +614,7 @@
            if (taskmodel.FairyAuDic.ContainsKey(_taskID))

            {

                int FairyNumber = TaskAllocation.Instance.FairyAuNumber();

                if (FairyNumber == 10 && !WindowCenter.Instance.IsOpen<FairyWearWin>())

                if (FairyNumber == 10 )

                {

                    WindowCenter.Instance.Close<MainInterfaceWin>();

                    WindowCenter.Instance.Open<FairyAuTaskWin>();


 System/Strengthening/WingsBouncedWin.cs

@@ -146,13 +146,13 @@
            foreach (int index in backpack_dic.Keys)

            {

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

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

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

                {

                    continue;

                }



                var wingConfig = ItemConfig.Get(itemId);

                if (wingConfig.Type == 111 && (wingConfig.JobLimit / 100) == _Job)

                if (wingConfig.Type == 111 && ItemLogicUtility.Instance.IsJobCompatibleItem(itemId))

                {

                    WingDic.Add(index, backpack_dic[index]);

                }


 System/Strengthening/WingsRefined.cs

@@ -494,7 +494,7 @@
            }



            var wingConfig = ItemConfig.Get(_id);

            if (wingConfig.Type == 111 && (wingConfig.JobLimit / 100) == PlayerDatas.Instance.baseData.Job)

            if (wingConfig.Type == 111 && ItemLogicUtility.Instance.IsJobCompatibleItem(_id))

            {

                markingbbol = true;

            }


 System/SystemSetting/SettingEffectMgr.cs

@@ -195,7 +195,7 @@
             && !isStartOneKeySell

             && ItemLogicUtility.Instance.GetSellItemList().Count > 0)

            {

                ItemLogicUtility.Instance.SendOneKeySellQuest(ItemLogicUtility.Instance.GetSellItemList());

                ItemLogicUtility.Instance.OneKeySell(ItemLogicUtility.Instance.GetSellItemList());

                return;

            }




 Utility/EnumHelper.cs

@@ -379,22 +379,11 @@
    PeerlessWeapon2=17,//绝世副手



    Mount = 19,              //当前的坐骑



    FashionWeapon = 20,//时装武器

    FashionClothes = 21, //时装衣服

    FashionWeapon2 = 22,//时装副手



    JadeDynasty_Cloak = 121, //诛仙披风

    JadeDynasty_FaceMask = 122, //诛仙面罩

    JadeDynasty_Glove1 = 123, //诛仙手套

    JadeDynasty_Glove2 = 124, //诛仙手套

    JadeDynasty_Ruyi = 125, //诛仙如意

    JadeDynasty_Pendant = 126, //诛仙吊坠

    JadeDynasty_Ring1 = 127, //诛仙戒指

    JadeDynasty_Ring2 = 128, //诛仙戒指

    JadeDynasty_Sword1 = 129, //诛仙剑

    JadeDynasty_Sword2 = 130, //戮仙剑

    JadeDynasty_Sword3 = 131, //陷仙剑

    JadeDynasty_Sword4 = 132, //绝仙剑

    retMax,

};