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

client_Wu Xijin

2019-02-19 4fbcdd1af685499a25d00b0d0bd07a77e4943e4b

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

 System/Achievement/AchievementModel.cs

@@ -528,10 +528,10 @@
            {

                if (_places.Contains(item.config.EquipPlace))

                {

                    if (!packModelInterface.IsOverdue(item.itemInfo.ItemGUID, item.itemId)

                    if (!packModelInterface.IsOverdue(item.guid, item.itemId)

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

                    {

                        guid = item.itemInfo.ItemGUID;

                        guid = item.guid;

                    }

                }

            }

@@ -551,7 +551,7 @@
            var equipPackage = playerPack.GetSinglePackModel(PackType.Equip);

            foreach (var item in allItems.Values)

            {

                var overdue = packModelInterface.IsOverdue(item.itemInfo.ItemGUID, item.itemId, item.useDataDict);

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



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

                {

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

                    if (item.equipScore > equipdItemScore && item.equipScore > score)

                    {

                        guid = item.itemInfo.ItemGUID;

                        guid = item.guid;

                    }

                }

            }

@@ -587,12 +587,12 @@


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

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

                var overdue = packModelInterface.IsOverdue(item.itemInfo.ItemGUID, item.itemId, item.useDataDict);

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



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

                {

                    score = item.equipScore;

                    guid = item.itemInfo.ItemGUID;

                    guid = item.guid;

                }

            }




 System/BetterItemGet/PreciousItemGetModel.cs

@@ -101,7 +101,7 @@
                bool isHaveMakeNum = ItemLogicUtility.Instance.IsHaveMakeNumber(itemModel.itemPlace);

                if(isHaveMakeNum)

                {

                    OnGetPreciousItem(PackType.Item, itemModel.itemInfo.ItemGUID);

                    OnGetPreciousItem(PackType.Item, itemModel.guid);

                }

            }

        }

@@ -126,7 +126,7 @@
            List<ItemModel> druglist = modelInterface.GetDruglistByRealm();

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

            {

                OnGetPreciousItem(druglist[i].packType,druglist[i].itemInfo.ItemGUID);

                OnGetPreciousItem(druglist[i].packType,druglist[i].guid);

            }

        }




 System/BetterItemGet/RealmBetterEquipModel .cs

@@ -69,8 +69,8 @@
            currentEquipGuid = string.Empty;

            foreach (var model in pairs.Values)

            {

                betterEquipModels[model.itemInfo.ItemGUID] = model;

                currentEquipGuid = model.itemInfo.ItemGUID;

                betterEquipModels[model.guid] = model;

                currentEquipGuid = model.guid;

            }

            if (showEquipRefreshEvent != null)

            {


 System/Chat/ChatCtrl.cs

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

        return HrefAnalysis.EquipDetailRegex.IsMatch(msg);

    }

    public string CheckHasItem(string msg,ChatCenter.RecentlyChat _recently)

    public string CheckHasItem(string msg, ChatCenter.RecentlyChat _recently)

    {

        if (!HrefAnalysis.EquipRegex.IsMatch(msg))

        {

@@ -877,7 +877,7 @@
                    }

                    _textBuilder.Append("|");

                    var _dictSuitLv = ModelCenter.Instance.GetModel<PlayerSuitModel>().GetServerSuitModelByPlace(itemPlaceList[i].itemPlace);

                    if (_dictSuitLv != null&& equip)

                    if (_dictSuitLv != null && equip)

                    {

                        foreach (int key in _dictSuitLv.Keys)

                        {

@@ -1084,14 +1084,14 @@
        var config = ItemConfig.Get(flauntGemId);

        if (config != null)

        {

            ItemModel _item = new ItemModel(PackType.Item);

            ItemInfo _itemInfo = new ItemInfo();

            _itemInfo.ItemID = flauntGemId;

            _itemInfo.IsBind = flauntGemBind ? 1 : 0;

            _item.SetItemInfo(_itemInfo);

            var itemInfo = string.Format("[{0}]", config.ItemName);

            itemPlaceList.Add(_item);

            return Language.Get("GemLookTalk", itemInfo);

            var item = new ItemModel(PackType.Item);

            var itemInfo = new ItemInfo();

            itemInfo.ItemID = flauntGemId;

            itemInfo.IsBind = flauntGemBind ? 1 : 0;

            item.SetItemInfo(itemInfo);

            var tip = string.Format("[{0}]", config.ItemName);

            itemPlaceList.Add(item);

            return Language.Get("GemLookTalk", tip);

        }

        return string.Empty;

    }


 System/Compose/New/ComposeEquipWin.cs

@@ -666,13 +666,13 @@
            if (model.config.EquipPlace != (int)RoleEquipType.SpiritAnimal

                || model.config.ExpireTime <= 0) return false;



            ItemCDCool cool = KnapsackTimeCDMgr.Instance.GetItemCoolById(model.itemInfo.ItemGUID);

            ItemCDCool cool = KnapsackTimeCDMgr.Instance.GetItemCoolById(model.guid);

            bool isShow = model.config.ExpireTime > 0;

            if (isShow)

            {

                List<int> itemEffectTime = model.GetUseDataModel((int)ItemUseDataKey.createTime);

                seconds = model.config.ExpireTime;

                if (itemEffectTime != null && itemEffectTime[0] != 0 && model.itemInfo.ItemGUID != "")

                if (itemEffectTime != null && itemEffectTime[0] != 0 && model.guid != "")

                {

                    seconds = cool == null ? 0 : (int)cool.GetRemainTime();

                }


 System/Compose/New/ComposeMatCell.cs

@@ -180,7 +180,7 @@
            }

            else

            {

                tipsModel.SetItemTipsModel(PackType.Item, itemModel.itemInfo.ItemGUID);

                tipsModel.SetItemTipsModel(PackType.Item, itemModel.guid);

            }

        }




 System/Compose/New/ComposeSelectItemCell.cs

@@ -46,7 +46,7 @@


        private void UpdateRemainTime(string guid)

        {

            if (itemModel == null || guid != itemModel.itemInfo.ItemGUID) return;

            if (itemModel == null || guid != itemModel.guid) return;





            UpdateRemainTime();

@@ -57,14 +57,14 @@
            remainTimeText.gameObject.SetActive(false);

            if (itemModel == null || itemModel.config.EquipPlace != (int)RoleEquipType.SpiritAnimal) return;



            ItemCDCool cool = KnapsackTimeCDMgr.Instance.GetItemCoolById(itemModel.itemInfo.ItemGUID);

            ItemCDCool cool = KnapsackTimeCDMgr.Instance.GetItemCoolById(itemModel.guid);

            bool isShow = itemModel.config.ExpireTime > 0;

            remainTimeText.gameObject.SetActive(isShow);

            if (isShow)

            {

                List<int> itemEffectTime = itemModel.GetUseDataModel((int)ItemUseDataKey.createTime);

                double remianTime = itemModel.config.ExpireTime;

                if (itemEffectTime != null && itemEffectTime[0] != 0 && itemModel.itemInfo.ItemGUID != "")

                if (itemEffectTime != null && itemEffectTime[0] != 0 && itemModel.guid != "")

                {

                    remianTime = cool == null ? 0 : cool.GetRemainTime();

                }


 System/Compose/New/GuardComposeConfirmWin.cs

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

    public class GuardComposeConfirmWin : Window

    {

        [SerializeField] Button popConfirmBtn;
        [SerializeField] RichText popConfirmInfo;
        [SerializeField] Text popConfirmTitle;
        [SerializeField] Button popConfirmBtn;

        [SerializeField] RichText popConfirmInfo;

        [SerializeField] Text popConfirmTitle;

        [SerializeField] Button closeBtn;



        SelectEquipModel _selectModel;

@@ -66,7 +66,7 @@
            itemModel = modellist.Count > 0 ? modellist[0] : null;

            if(itemModel != null)

            {

                UpdateRemainTime(itemModel.itemInfo.ItemGUID);

                UpdateRemainTime(itemModel.guid);

            }

        }



@@ -75,7 +75,7 @@
            if (composeWinModel.CurComposeModel == null

                || itemModel == null) return;



            if (itemModel.itemInfo.ItemGUID == guid)

            if (itemModel.guid == guid)

            {

                int remainTime = 0;

                bool isRemain = TryGetRemainTime(itemModel, out remainTime);

@@ -120,13 +120,13 @@
            if (model.config.EquipPlace != (int)RoleEquipType.SpiritAnimal

                || model.config.ExpireTime <= 0) return false;



            ItemCDCool cool = KnapsackTimeCDMgr.Instance.GetItemCoolById(model.itemInfo.ItemGUID);

            ItemCDCool cool = KnapsackTimeCDMgr.Instance.GetItemCoolById(model.guid);

            bool isShow = model.config.ExpireTime > 0;

            if (isShow)

            {

                List<int> itemEffectTime = model.GetUseDataModel((int)ItemUseDataKey.createTime);

                seconds = model.config.ExpireTime;

                if (itemEffectTime != null && itemEffectTime[0] != 0 && model.itemInfo.ItemGUID != "")

                if (itemEffectTime != null && itemEffectTime[0] != 0 && model.guid != "")

                {

                    seconds = cool == null ? 0 : (int)cool.GetRemainTime();

                }


 System/Compose/New/SelectEquipModel.cs

@@ -73,7 +73,7 @@
               switch((RoleEquipType)itemModel.config.EquipPlace)

                {

                    case RoleEquipType.SpiritAnimal:

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

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

                        if(isOverdue)

                        {

                            continue;

@@ -117,7 +117,7 @@
                switch ((RoleEquipType)itemModel.config.EquipPlace)

                {

                    case RoleEquipType.SpiritAnimal:

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

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

                        if (isOverdue)

                        {

                            continue;


 System/DailyQuest/DailyQuestHangTimeBehaviour.cs

@@ -66,7 +66,7 @@
                var guid = playerPackModel.GetItemGUIDByID(952);

                var itemModel = playerPackModel.GetItemModelByGUID(guid);



                itemTipsModel.SetItemTipsModel(PackType.Item, itemModel.itemInfo.ItemGUID, false, true);

                itemTipsModel.SetItemTipsModel(PackType.Item, itemModel.guid, false, true);

                itemTipsModel.SetBagTipsBtn(itemTipsModel.curAttrData);

                itemTipsModel.ShowUICtrl();

            }


 System/Dogz/DogzEquip.cs

@@ -33,7 +33,7 @@
            itemBaisc.cellBtn.RemoveAllListeners();

            itemBaisc.cellBtn.AddListener(()=>

            {

                tipsModel.SetItemTipsModel(model.packType,model.itemInfo.ItemGUID,false,false);

                tipsModel.SetItemTipsModel(model.packType,model.guid,false,false);

                tipsModel.SetDogzEquipBtn(tipsModel.curAttrData);

                tipsModel.ShowUICtrl();

            });


 System/Dogz/DogzItemCell.cs

@@ -54,7 +54,7 @@
            itemBaisc.cellBtn.RemoveAllListeners();

            itemBaisc.cellBtn.AddListener(()=>

            {

                tipsModel.SetItemTipsModel(model.packType, model.itemInfo.ItemGUID, false, true);

                tipsModel.SetItemTipsModel(model.packType, model.guid, false, true);

                tipsModel.SetDogzItemBtn(tipsModel.curAttrData);

                tipsModel.ShowUICtrl();

            });


 System/Dungeon/DungeonLiquidCell.cs

@@ -212,6 +212,6 @@


    private void OnItemClick(ItemModel _itemModel)

    {

        ModelCenter.Instance.GetModel<ItemTipsModel>().SetItemTipsModel(_itemModel.packType, _itemModel.itemInfo.ItemGUID);

        ModelCenter.Instance.GetModel<ItemTipsModel>().SetItemTipsModel(_itemModel.packType, _itemModel.guid);

    }

}


 System/Dungeon/TrialDungeonModel.cs

@@ -320,7 +320,7 @@
                        if (itemModel.config.EquipPlace == config.EquipPlace

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

                            || itemModel.config.JobLimit == 0)

                            && !ModelCenter.Instance.GetModel<PackModelInterface>().IsOverdue(itemModel.itemInfo.ItemGUID, itemModel.itemId, itemModel.useDataDict))

                            && !ModelCenter.Instance.GetModel<PackModelInterface>().IsOverdue(itemModel.guid, itemModel.itemId, itemModel.useDataDict))

                        {

                            var compare = EquipCompare(itemModel, config);

                            if (compare == 0)


 System/FairyAu/DonateEquipTipsWin.cs

@@ -192,7 +192,7 @@
                        _ItemBtn.AddListener(() =>
                        {
                            _BagIndex = _index;
                            itemTipsModel.SetItemTipsModel(PackType.Item, model.itemInfo.ItemGUID, false, true, ItemTipChildType.UnionWarehouseDonation);
                            itemTipsModel.SetItemTipsModel(PackType.Item, model.guid, false, true, ItemTipChildType.UnionWarehouseDonation);
                            itemTipsModel.curAttrData.SetTipsFuncBtn(ItemOperateType.donate, Donation);
                            itemTipsModel.ShowUICtrl();
                        });

 System/FashionDress/FashionDecomposeLineBeh.cs

@@ -58,7 +58,7 @@
                    itemBaisc.cellBtn.RemoveAllListeners();

                    itemBaisc.cellBtn.AddListener(()=>

                    {

                        decomposeModel.UpdateDecomposeItem(itemModel.itemInfo.ItemGUID, !selectObj.activeInHierarchy);

                        decomposeModel.UpdateDecomposeItem(itemModel.guid, !selectObj.activeInHierarchy);

                        selectObj.SetActive(!selectObj.activeInHierarchy);

                    });

                }


 System/FashionDress/FashionDecomposeModel.cs

@@ -113,7 +113,7 @@


            public void SetModel(ItemModel _model)

            {

                guid = _model.itemInfo.ItemGUID;

                guid = _model.guid;

                isSelect = true;

                itemModel = _model;

                if(itemModel.config.Effect1 == 243)


 System/Guard/GuardModel.cs

@@ -114,7 +114,7 @@
                    {

                        for (int k = 0; k < list.Count; k++)

                        {

                            bool isOverdue = packModelInterface.IsOverdue(list[k].itemInfo.ItemGUID,

                            bool isOverdue = packModelInterface.IsOverdue(list[k].guid,

                                list[k].itemId, list[k].useDataDict);



                            if (!isOverdue)


 System/HappyXB/XBGridCell.cs

@@ -63,7 +63,7 @@
            ItemModel itemModel = playerPack.GetItemModelByIndex(type,index);
            if(itemModel != null)
            {
                SetModel(itemModel.itemInfo.ItemGUID,index);
                SetModel(itemModel.guid,index);
            }
            else
            {

 System/HappyXB/XBWarehouseWin.cs

@@ -123,7 +123,7 @@
                ItemModel itemModel = playerPack.GetItemModelByIndex(PackType.Treasure, cellCount-1);

                if(itemModel != null)

                {

                    xBGrid.SetModel(itemModel.itemInfo.ItemGUID,cellCount-1);

                    xBGrid.SetModel(itemModel.guid,cellCount-1);

                }

                else

                {


 System/JadeDynastyKnapSack/JadeDynastyDecomposeLineBeh.cs

@@ -58,7 +58,7 @@
                else

                {

                    itemBaisc.gameObject.SetActive(true);

                    selectObj.SetActive(selectGuids.Contains(itemModel.itemInfo.ItemGUID));

                    selectObj.SetActive(selectGuids.Contains(itemModel.guid));

                    itemBaisc.Init(itemModel,true);

                    if(itemModel.config.EquipPlace > 0)

                    {

@@ -70,11 +70,11 @@
                    {

                        if (selectObj.activeInHierarchy)

                        {

                            this.decomposeModel.RemoveSelectModel(itemModel.itemInfo.ItemGUID);

                            this.decomposeModel.RemoveSelectModel(itemModel.guid);

                        }

                        else

                        {

                            this.decomposeModel.AddSelectModel(itemModel.itemInfo.ItemGUID);

                            this.decomposeModel.AddSelectModel(itemModel.guid);

                        }

                        selectObj.SetActive(!selectObj.activeInHierarchy);

                    });


 System/JadeDynastyKnapSack/JadeDynastyDecomposeModel.cs

@@ -118,7 +118,7 @@
                var model = itemDict[index];

                if(model.config.EquipPlace > 0)

                {

                    allGuids.Add(model.itemInfo.ItemGUID);

                    allGuids.Add(model.guid);

                }

            }

        }

@@ -135,7 +135,7 @@
                       && model.config.LV <= selectEquipLv

                       && modelInterface.IsFightUp(model.itemId,model.equipScore) != 1)

                    {

                        selectGuids.Add(model.itemInfo.ItemGUID);

                        selectGuids.Add(model.guid);

                    }

                }

            }


 System/JadeDynastyKnapSack/JadeDynastyEquipBeh.cs

@@ -131,7 +131,7 @@
        {

            if (item == null) return;



            tipsModel.SetItemTipsModel(item.packType,item.itemInfo.ItemGUID,false);

            tipsModel.SetItemTipsModel(item.packType,item.guid,false);

            tipsModel.SetJadeDynastyPutOnTipsBtn(tipsModel.curAttrData);

            tipsModel.ShowUICtrl();

        }


 System/JadeDynastyKnapSack/JadeDynastyGemWin.cs

@@ -275,7 +275,7 @@
            {

                return;

            }

            ModelCenter.Instance.GetModel<ItemTipsModel>().SetItemTipsModel(PackType.JadeDynastyEquip, itemModel.itemInfo.ItemGUID);

            ModelCenter.Instance.GetModel<ItemTipsModel>().SetItemTipsModel(PackType.JadeDynastyEquip, itemModel.guid);

        }



        private void OnHoleClick(int hole)


 System/JadeDynastyKnapSack/JadeDynastyItemBeh.cs

@@ -29,7 +29,7 @@
            {

                lockBtn.gameObject.SetActive(false);

                itemCell.Init(itemModel,true);

                if (itemModel.EquipPlace > 0)

                if (itemModel.equipPlace > 0)

                {

                    equipLvObj.SetActive(true);

                    string equipLvSB = Language.Get(StringUtility.Contact("Num_CHS_", itemModel.config.LV));

@@ -40,11 +40,11 @@
                itemCell.cellBtn.AddListener(()=>

                {

                    equipModel.ClearLookItemModel();

                    tipsModel.SetItemTipsModel(itemModel.packType,itemModel.itemInfo.ItemGUID,false,true);

                    tipsModel.SetItemTipsModel(itemModel.packType,itemModel.guid,false,true);

                    tipsModel.SetJadeDynastyItemTipsBtn(tipsModel.curAttrData);

                    tipsModel.ShowUICtrl();

                });

                UpdatePlayerEffect(itemModel.itemInfo.ItemGUID);

                UpdatePlayerEffect(itemModel.guid);

            }

            else

            {


 System/KnapSack/BetterItemGetBehaviour.cs

@@ -82,7 +82,7 @@
                    var coolData = KnapsackTimeCDMgr.Instance.GetItemCoolById(model.currentEquipGuid);

                    if (model.CheckIsAutoEquip(betterEquip) && coolData == null)

                    {

                        KnapsackTimeCDMgr.Instance.Register(betterEquip.itemInfo.ItemGUID, betterEquip.itemId, model.autoEquipCoolTime);

                        KnapsackTimeCDMgr.Instance.Register(betterEquip.guid, betterEquip.itemId, model.autoEquipCoolTime);

                    }

                }

            }

@@ -112,7 +112,7 @@
            var itemConfig = ItemConfig.Get(betterEquip.itemId);

            if (NewBieCenter.Instance.inGuiding)

            {

                playerPack.SetLookIndex(betterEquip.itemInfo.ItemGUID);

                playerPack.SetLookIndex(betterEquip.guid);

                WindowCenter.Instance.Close<MainInterfaceWin>();

                WindowCenter.Instance.Open<KnapSackWin>();



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

                if (itemConfig.ItemColor >= 3)

                {

                    playerPack.SetLookIndex(betterEquip.itemInfo.ItemGUID);

                    playerPack.SetLookIndex(betterEquip.guid);

                    WindowCenter.Instance.Close<MainInterfaceWin>();

                    WindowCenter.Instance.Open<KnapSackWin>();



@@ -147,7 +147,7 @@
        private void ToOpenJadeDynastyKnapsack(ItemModel betterEquip)

        {

            var equipModel = ModelCenter.Instance.GetModel<JadeDynastyEquipModel>();

            equipModel.SetLookItemModel(betterEquip.itemInfo.ItemGUID);

            equipModel.SetLookItemModel(betterEquip.guid);

            model.ReportConfirmBetterEquip(model.currentEquipGuid);

        }



@@ -158,7 +158,7 @@
            {

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

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

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

                itemTipsModel.SetItemTipsModel(packType, betterEquip.guid);

            }

        }



@@ -174,7 +174,7 @@
            m_EquipName.color = UIHelper.GetUIColor(itemConfig.ItemColor, true);

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

            m_EquipBehaviour.Init(betterModel, true);

            UpdateCoolTime(betterModel.itemInfo.ItemGUID);

            UpdateCoolTime(betterModel.guid);



            if(betterModel.packType == PackType.JadeDynastyItem && betterModel.config.EquipPlace > 0)

            {


 System/KnapSack/ItemOverdueBehaviour.cs

@@ -74,7 +74,7 @@
                ItemModel itemModel = playerPack.GetItemModelByGUID(model.currentShowItem.guid);
                if (itemModel != null)
                {
                    itemTipsModel.SetItemTipsModel(itemModel.packType, itemModel.itemInfo.ItemGUID);
                    itemTipsModel.SetItemTipsModel(itemModel.packType, itemModel.guid);
                }
                else
                {

 System/KnapSack/Logic/BoxGetItemModel.cs

@@ -315,7 +315,7 @@
                    playerPack.IsReachUseLimit(guid, out maxValue);

                    if (itemModel.config.BatchUse != 0 && maxValue > 1)

                    {

                        BatchUseModel.Instance.SetBatchModel(itemModel.itemInfo.ItemGUID);

                        BatchUseModel.Instance.SetBatchModel(itemModel.guid);

                        WindowCenter.Instance.Open<BatchWin>();

                        return;

                    }


 System/KnapSack/Logic/BoxGetItemWin.cs

@@ -164,7 +164,7 @@
        private void RefreshUI(PackType type, int index, int id)

        {

            ItemModel itemModel = playerPack.GetItemModelByIndex(type, index);

            if (itemModel != null && itemModel.itemInfo.ItemGUID == BoxModel.guid)

            if (itemModel != null && itemModel.guid == BoxModel.guid)

            {

                ShowUICtrl();

            }


 System/KnapSack/Logic/ItemLogicUtility.cs

@@ -737,7 +737,7 @@
            switch (useItemModel.config.Type)
            {
                case (int)ItemType.Box:
                    BoxModel.SetModel(useItemModel.itemInfo.ItemGUID, useItemModel.itemId);
                    BoxModel.SetModel(useItemModel.guid, useItemModel.itemId);
                    return;
                case 83:
                    var fashionModel = ModelCenter.Instance.GetModel<FashionDressModel>();
@@ -884,7 +884,7 @@

            if (itemModel.config.Type == 59)
            {
                playerPack.SetWashAttrPointModel(itemModel.itemInfo.ItemGUID);
                playerPack.SetWashAttrPointModel(itemModel.guid);
                WindowCenter.Instance.Open<WashAttrPointWin>();
                return true;
            }
@@ -912,7 +912,7 @@
                }
                else
                {
                    BatchUseModel.Instance.SetOfflineUseModel(itemModel.itemInfo.ItemGUID);
                    BatchUseModel.Instance.SetOfflineUseModel(itemModel.guid);
                    WindowCenter.Instance.Open<OfflineHangUpUseWin>();
                }
                return true;
@@ -940,10 +940,10 @@
            }

            ulong maxValue = 0;
            playerPack.IsReachUseLimit(itemModel.itemInfo.ItemGUID, out maxValue);
            playerPack.IsReachUseLimit(itemModel.guid, out maxValue);
            if (itemModel.config.BatchUse != 0 && maxValue > 1)
            {
                BatchUseModel.Instance.SetBatchModel(itemModel.itemInfo.ItemGUID);
                BatchUseModel.Instance.SetBatchModel(itemModel.guid);
                WindowCenter.Instance.Open<BatchWin>();
            }
            else
@@ -967,7 +967,7 @@
                            WindowCenter.Instance.Open<RoleRenameWin>();
                            break;
                        default:
                            ItemCDCool cool = KnapsackTimeCDMgr.Instance.GetItemCoolById(itemModel.itemInfo.ItemGUID);
                            ItemCDCool cool = KnapsackTimeCDMgr.Instance.GetItemCoolById(itemModel.guid);
                            if (cool == null || cool.GetRemainTime() <= 0)
                            {
                                SendMakeUseQuest(itemModel.itemPlace);

 System/KnapSack/Logic/ItemModel.cs

@@ -14,7 +14,7 @@
        public int equipScore { get; private set; }

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



        public int EquipPlace

        public int equipPlace

        {

            get

            {

@@ -29,6 +29,7 @@
            }

        }



        public string guid { get { return itemInfo == null ? string.Empty : itemInfo.ItemGUID; } }

        public int itemId { get { return itemInfo == null ? 0 : itemInfo.ItemID; } }

        public int itemPlace { get { return itemInfo == null ? 0 : itemInfo.ItemPlace; } }

        public int preItemCount { get; private set; }

@@ -62,7 +63,7 @@
                itemInfo.ItemCount = GetUseDataModel((int)ItemUseDataKey.itemCount)[0];

            }



            var  itemEffectTime = GetUseDataModel((int)ItemUseDataKey.createTime);

            var itemEffectTime = GetUseDataModel((int)ItemUseDataKey.createTime);

            if (itemEffectTime != null && itemEffectTime[0] != 0 && config.ExpireTime > 0)

            {

                DebugEx.Log("创建时间：" + itemEffectTime[0]);


 System/KnapSack/Logic/ItemOverdueModel.cs

@@ -264,7 +264,7 @@
                                    models = pairs[idlist[i]];

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

                                    {

                                        if (!modelInterface.IsOverdue(models[j].itemInfo.ItemGUID, models[j].itemId, models[j].useDataDict))

                                        if (!modelInterface.IsOverdue(models[j].guid, models[j].itemId, models[j].useDataDict))

                                        {

                                            isOverdue = false;

                                            break;

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

                                        {

                                            ItemModel overdueModel = models[0];

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

                                            OnGetOverdueItem(overdueModel.itemId, overdueModel.guid, overdueModel.itemPlace);

                                            break;

                                        }

                                    }

@@ -327,7 +327,7 @@
                    models = allGuardDict[type][idlist[i]];

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

                    {

                        if (!modelInterface.IsOverdue(models[j].itemInfo.ItemGUID, models[j].itemId, models[j].useDataDict))

                        if (!modelInterface.IsOverdue(models[j].guid, models[j].itemId, models[j].useDataDict))

                        {

                            isOverdue = false;

                            break;

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

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

            {

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

                OnGetOverdueItem(overdueGuardPushlist[i].itemId, overdueGuardPushlist[i].guid, overdueGuardPushlist[i].itemPlace);

            }

        }




 System/KnapSack/Logic/ItemTipsModel.cs

@@ -799,7 +799,7 @@
        {

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

                  , itemModel.itemPlace, itemModel.itemInfo.IsBind, isCompare

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

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

        }





@@ -807,7 +807,7 @@
        {

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

                  , itemModel.itemPlace, itemModel.itemInfo.IsBind, true

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

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

        }



        private void SetCompareAttrData(PackType type,int equipPlace)

@@ -890,7 +890,7 @@
            {

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

                  , itemModel.itemPlace, itemModel.itemInfo.IsBind, true

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

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



            }

        }


 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.itemId, itemModel.useDataDict);

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

            if (isOverdue)

            {

                return;

@@ -560,7 +560,7 @@
                    {

                        if (GetPreciousItemEvent != null)

                        {

                            GetPreciousItemEvent(itemModel.packType, itemModel.itemInfo.ItemGUID);

                            GetPreciousItemEvent(itemModel.packType, itemModel.guid);

                        }

                    }

                }

@@ -609,7 +609,7 @@
            }



            ulong canUseCnt = 0;

            if (playerPack.IsReachUseLimit(itemModel.itemInfo.ItemGUID, out canUseCnt))

            if (playerPack.IsReachUseLimit(itemModel.guid, out canUseCnt))

            {

                isReach = false;

                return isReach;

@@ -898,7 +898,7 @@
            {

                if (itemEffectTime[0] != 0)

                {

                    ItemCDCool cool = KnapsackTimeCDMgr.Instance.GetItemCoolById(model.itemInfo.ItemGUID);

                    ItemCDCool cool = KnapsackTimeCDMgr.Instance.GetItemCoolById(model.guid);

                    double remainTime = 0;

                    if (cool != null)

                    {

@@ -926,7 +926,7 @@
                            var equipItemModel = playerPack.GetItemModelByIndex(PackType.Equip, model.config.EquipPlace);

                            if (PlayerDatas.Instance.baseData.LV >= 200)

                            {

                                if (model.EquipPlace > (int)RoleEquipType.Weapon2 && model.EquipPlace < (int)RoleEquipType.Neck)

                                if (model.equipPlace > (int)RoleEquipType.Weapon2 && model.equipPlace < (int)RoleEquipType.Neck)

                                {

                                    if (equipItemModel != null && equipItemModel.config.ItemColor > model.config.ItemColor)

                                    {

@@ -939,7 +939,7 @@
                }

                if (RefreshGetBetterEquipEvent != null)

                {

                    RefreshGetBetterEquipEvent(model.itemInfo.ItemGUID);

                    RefreshGetBetterEquipEvent(model.guid);

                }

            }

        }

@@ -988,18 +988,18 @@
                if (model.config.EquipPlace > 0

                    && model.config.EquipPlace != (int)RoleEquipType.SpiritAnimal

                    && model.config.RealmLimit <= realmLv

                    && !IsOverdue(model.itemInfo.ItemGUID, model.itemId, model.useDataDict)

                    && !IsOverdue(model.guid, model.itemId, model.useDataDict)

                    && IsFightUp(model.itemId, model.equipScore) == 1)

                {

                    if (!RealmBetterDict.ContainsKey(model.EquipPlace))

                    if (!RealmBetterDict.ContainsKey(model.equipPlace))

                    {

                        RealmBetterDict.Add(model.EquipPlace, model);

                        RealmBetterDict.Add(model.equipPlace, model);

                    }

                    else

                    {

                        if (model.equipScore > RealmBetterDict[model.EquipPlace].equipScore)

                        if (model.equipScore > RealmBetterDict[model.equipPlace].equipScore)

                        {

                            RealmBetterDict[model.EquipPlace] = model;

                            RealmBetterDict[model.equipPlace] = model;

                        }

                    }

                }

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

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

                        {

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

                            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)

                            {

@@ -1490,10 +1490,10 @@
            {

                if (item.config.EquipPlace == equipPlace)

                {

                    if (!IsOverdue(item.itemInfo.ItemGUID, item.itemId, item.useDataDict)

                    if (!IsOverdue(item.guid, item.itemId, item.useDataDict)

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

                    {

                        guid = item.itemInfo.ItemGUID;

                        guid = item.guid;

                        score = item.equipScore;

                    }

                }


 System/KnapSack/Logic/PlayerPackModels.cs

@@ -244,6 +244,7 @@
            }



            ItemInfo itemInfo = new ItemInfo();



            itemInfo.ItemID = (int)item.ItemID;

            itemInfo.ItemPlace = item.ItemPlace;

            itemInfo.ItemCount = item.ItemCount;

@@ -254,6 +255,7 @@
            itemInfo.IsLocked = item.IsLocked;

            itemInfo.ItemGUID = item.ItemGUID;

            playerPackDict[type].SetPackModel(itemInfo);



            DebugEx.Log("Add:" + item.ItemGUID);

            if (RefreshItemCountAct != null)

            {

@@ -317,7 +319,7 @@
                            ItemCntAddAct(type, itemModel.itemPlace, itemModel.itemId);

                        }

                        modelInterface.GetPreciousItem(itemModel);

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

                        modelInterface.RefreshPickItem(type, itemModel.guid);

                    }

                    else

                    {

@@ -371,9 +373,9 @@
            if (singlePack != null)

            {

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

                guid = itemModel.itemInfo.ItemGUID;

                guid = itemModel.guid;

                int itemId = itemModel.itemId;

                DeleteItemDictByGUID(type, itemModel.itemInfo.ItemGUID);

                DeleteItemDictByGUID(type, itemModel.guid);

                singlePack.ClearItemModelByIndex(clearItem.ItemIndex);

                if (RefreshItemCountAct != null)

                {

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

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

                    {

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

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

                        break;

                    }

                }

@@ -455,15 +457,15 @@


        public void SetItemGUIDDict(ItemModel itemModel)

        {

            if (!itemGUIDDict.ContainsKey(itemModel.itemInfo.ItemGUID))

            if (!itemGUIDDict.ContainsKey(itemModel.guid))

            {

                itemGUIDDict.Add(itemModel.itemInfo.ItemGUID, itemModel);

                itemGUIDDict.Add(itemModel.guid, itemModel);

                GetItemEventCtrl(itemModel);

            }

            else

            {

                PackType prePack = itemGUIDDict[itemModel.itemInfo.ItemGUID].packType;

                itemGUIDDict[itemModel.itemInfo.ItemGUID] = itemModel;

                PackType prePack = itemGUIDDict[itemModel.guid].packType;

                itemGUIDDict[itemModel.guid] = itemModel;

                if (prePack != itemModel.packType)

                {

                    GetItemEventCtrl(itemModel);

@@ -781,7 +783,7 @@
                bool isOverdue = false;

                if (itemModel.config.ExpireTime > 0)

                {

                    ItemCDCool cool = KnapsackTimeCDMgr.Instance.GetItemCoolById(itemModel.itemInfo.ItemGUID);

                    ItemCDCool cool = KnapsackTimeCDMgr.Instance.GetItemCoolById(itemModel.guid);

                    switch ((EquipReduceType)itemModel.config.EndureReduceType)

                    {

                        case EquipReduceType.Def_EquipReduceType_Time:

@@ -808,7 +810,7 @@
                {

                    modelInterface.GetPreciousItem(itemModel);

                    modelInterface.OnGetEquip(itemModel);

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

                    modelInterface.RefreshPickItem(itemModel.packType, itemModel.guid);

                }

            }



@@ -1334,7 +1336,7 @@
                    DebugEx.Log("Buff是否存在" + isExist);

                    if (itemUseAct != null && !isExist)

                    {

                        itemUseAct(PackType.Item, itemModel.itemInfo.ItemGUID);

                        itemUseAct(PackType.Item, itemModel.guid);

                    }

                }

            }


 System/KnapSack/Logic/WashAttrPointWin.cs

@@ -163,7 +163,7 @@


                if (itemModel.config.BatchUse == 1 && needCnt > 1)

                {

                    BatchUseModel.Instance.SetBatchModel(itemModel.itemInfo.ItemGUID);

                    BatchUseModel.Instance.SetBatchModel(itemModel.guid);

                    BatchUseModel.Instance.SetExtraInfo((int)selectAttr,needCnt);

                    WindowCenter.Instance.Open<WashPointBatchUseWin>();

                }


 System/KnapSack/Logic/WashPointBatchUseWin.cs

@@ -103,7 +103,7 @@
            ulong maxValue = 0;
            if (BatchUseModel.Instance.maxValue <= 0)
            {
                playerPack.IsReachUseLimit(itemModel.itemInfo.ItemGUID, out maxValue);
                playerPack.IsReachUseLimit(itemModel.guid, out maxValue);
            }
            else
            {

 System/KnapSack/New/BagWin.cs

@@ -269,14 +269,14 @@
                        gridCell.itemCellBtn.OnOneParaClick = (int info) =>

                        {



                            itemTipsModel.SetItemTipsModel(PackType.Item, itemModel.itemInfo.ItemGUID, false, true);

                            itemTipsModel.SetItemTipsModel(PackType.Item, itemModel.guid, false, true);

                            itemTipsModel.SetDepotBagTipsBtn(itemTipsModel.curAttrData);

                            itemTipsModel.ShowUICtrl();



                        };

                        gridCell.itemCellBtn.m_OnDbClick = () =>

                          {

                              ItemLogicUtility.Instance.PutInWareHouse(ItemOperateType.putIn, itemModel.itemInfo.ItemGUID);

                              ItemLogicUtility.Instance.PutInWareHouse(ItemOperateType.putIn, itemModel.guid);

                          };



                    }

@@ -284,7 +284,7 @@
                    {

                        gridCell.itemCellBtn.OnOneParaClick = (int info) =>

                        {

                            itemTipsModel.SetItemTipsModel(PackType.Item, itemModel.itemInfo.ItemGUID, false, true);

                            itemTipsModel.SetItemTipsModel(PackType.Item, itemModel.guid, false, true);

                            itemTipsModel.SetBagTipsBtn(itemTipsModel.curAttrData);

                            itemTipsModel.ShowUICtrl();

                        };

@@ -294,7 +294,7 @@
                    bool isLookEquip = false;

                    if (playerPack.lookLineIndex > -1)

                    {

                        if (itemModel.itemInfo.ItemGUID == playerPack.lookItemGUID)

                        if (itemModel.guid == playerPack.lookItemGUID)

                        {

                            gridCell.uiEffect.Play();

                            _lookEquipCell = gridCell;

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

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

                        {

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

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

                            if (!isOverdue)

                            {

                                gridCell.uiEffect.Play();


 System/KnapSack/New/BatchWin.cs

@@ -120,7 +120,7 @@
            ulong maxValue = 0;

            if(BatchUseModel.Instance.maxValue <= 0)

            {

                playerPack.IsReachUseLimit(itemModel.itemInfo.ItemGUID, out maxValue);

                playerPack.IsReachUseLimit(itemModel.guid, out maxValue);

            }

            else

            {

@@ -128,7 +128,7 @@
            }

          

            ItemCellModel cellModel = new ItemCellModel(itemModel.itemId, false, (ulong)maxValue, itemModel.itemInfo.IsBind, 

             itemModel.itemInfo.ItemGUID,itemModel.packType, false);

             itemModel.guid,itemModel.packType, false);

            _itemCell.Init(cellModel);

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

            _itemName.text = itemModel.config.ItemName;

@@ -186,7 +186,7 @@
            }

            else if(itemModel.config.Type == (int)ItemType.Box)

            {

                ModelCenter.Instance.GetModel<BoxGetItemModel>().CheckOpenBoxCondi(itemModel.itemInfo.ItemGUID,itemModel.itemId, (ushort)Mathf.Ceil(_splitSlider.value));

                ModelCenter.Instance.GetModel<BoxGetItemModel>().CheckOpenBoxCondi(itemModel.guid,itemModel.itemId, (ushort)Mathf.Ceil(_splitSlider.value));

            }

            else

            {


 System/KnapSack/New/CommonItemBaisc.cs

@@ -129,7 +129,7 @@
        public virtual void Init(ItemModel model,bool isCompare = false,int compareScore = 0)

        {

            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);

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

        }



        /// <summary>


 System/KnapSack/New/DepotWin.cs

@@ -191,13 +191,13 @@
                    gridCell.itemCellBtn.m_OnDbClick = null;

                    gridCell.itemCellBtn.OnOneParaClick=(int info)=>

                    {

                        itemTipsModel.SetItemTipsModel(PackType.Warehouse,itemModel.itemInfo.ItemGUID,false,true);

                        itemTipsModel.SetItemTipsModel(PackType.Warehouse,itemModel.guid,false,true);

                        itemTipsModel.SetDepotTipsBtn(itemTipsModel.curAttrData);

                        itemTipsModel.ShowUICtrl();

                    };

                    gridCell.itemCellBtn.m_OnDbClick = () =>

                    {

                        ItemLogicUtility.Instance.TakeOutFromWarehouse(ItemOperateType.putOut, itemModel.itemInfo.ItemGUID);

                        ItemLogicUtility.Instance.TakeOutFromWarehouse(ItemOperateType.putOut, itemModel.guid);

                    };

                  

                }


 System/KnapSack/New/EquipPlaceCell.cs

@@ -83,7 +83,7 @@
                itemCell.gameObject.SetActive(true);

                itemCell.Init(itemModel);

                itemCell.cellBtn.onClick.AddListener(() => {

                    itemTipsModel.SetItemTipsModel(PackType.Equip, itemModel.itemInfo.ItemGUID, false);

                    itemTipsModel.SetItemTipsModel(PackType.Equip, itemModel.guid, false);

                    itemTipsModel.SetPutOnTipsBtn(itemTipsModel.curAttrData);

                    itemTipsModel.ShowUICtrl();




 System/KnapSack/New/FairyWearWin.cs

@@ -106,7 +106,7 @@
                }

                m_ItemCell01.cellBtn.SetListener(() =>

                {

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

                    itemTipsModel.SetItemTipsModel(m_ItemModel01.packType, m_ItemModel01.guid);

                });

                m_WearText01.text = Language.Get("BagWin_BtnText_1");

            }

@@ -126,7 +126,7 @@
                }

                m_ItemCell02.cellBtn.SetListener(() =>

                {

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

                    itemTipsModel.SetItemTipsModel(m_ItemModel02.packType, m_ItemModel02.guid);

                });

            }

            else


 System/KnapSack/RealmBetterEquipBehaviour.cs

@@ -67,7 +67,7 @@
            if (model.TryGetBetterEquip(model.currentEquipGuid, out betterEquip))

            {

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

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

                itemTipsModel.SetItemTipsModel(PackType.Item, betterEquip.guid);

            }

        }




 System/MainInterfacePanel/DungeonGuardCheckBehaviour.cs

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

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

using System.Collections.Generic;



using UnityEngine;
using UnityEngine;

using UnityEngine.UI;



namespace Snxxz.UI

@@ -27,7 +27,7 @@
        {

            if (model.fairyLandItemModel != null)

            {

                ItemLogicUtility.Instance.PutOnItem(ItemOperateType.putOn, model.fairyLandItemModel.itemInfo.ItemGUID);

                ItemLogicUtility.Instance.PutOnItem(ItemOperateType.putOn, model.fairyLandItemModel.guid);

                OnClose();

            }

        }

@@ -40,7 +40,7 @@
            {

                if (_itemModel != null)

                {

                    ModelCenter.Instance.GetModel<ItemTipsModel>().SetItemTipsModel(_itemModel.packType, _itemModel.itemInfo.ItemGUID);

                    ModelCenter.Instance.GetModel<ItemTipsModel>().SetItemTipsModel(_itemModel.packType, _itemModel.guid);

                }

            });



@@ -57,5 +57,5 @@
            gameObject.SetActive(false);

        }

    }

}

}




 System/Market/MarketBagItemCell.cs

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

                return;

            }

            itemTipsModel.SetItemTipsModel(itemBag.packType, itemBag.itemInfo.ItemGUID, false);

            itemTipsModel.SetItemTipsModel(itemBag.packType, itemBag.guid, false);

            itemTipsModel.curAttrData.SetTipsFuncBtn(ItemOperateType.putAway, OnPutawayClick);

            itemTipsModel.ShowUICtrl();




 System/OffLineTime/OffLineTimeLackBehaviour.cs

@@ -43,7 +43,7 @@
                var guid = playerPackModel.GetItemGUIDByID(952);

                var itemModel = playerPackModel.GetItemModelByGUID(guid);



                itemTipsModel.SetItemTipsModel(PackType.Item, itemModel.itemInfo.ItemGUID, false, true);

                itemTipsModel.SetItemTipsModel(PackType.Item, itemModel.guid, false, true);

                itemTipsModel.SetBagTipsBtn(itemTipsModel.curAttrData);

                itemTipsModel.ShowUICtrl();

            }


 System/Strengthening/EquipSuitTips.cs

@@ -463,7 +463,7 @@
            itemCell.cellBtn.RemoveAllListeners();

            itemCell.cellBtn.AddListener(() =>

            {

                itemTipsModel.SetItemTipsModel(PackType.Equip,itemModel.itemInfo.ItemGUID);

                itemTipsModel.SetItemTipsModel(PackType.Equip,itemModel.guid);

            });

            bool isMaker = SuitModel.IsMakerSuit(E_SuitType,itemModel.config.ItemColor,itemModel.config.StarLevel);

            if(E_SuitType == SuitType.HighSuit)


 System/Strengthening/GodBeastAttributes.cs

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

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

                    {

                        if (itemModel[i].EquipPlace == GodBeastPart)

                        if (itemModel[i].equipPlace == GodBeastPart)

                        {

                            ItemCellModel ItemModel = new ItemCellModel(itemModel[i].itemId, true, 0, 0);//默认显示不上锁

                            m_ItemCell.Init(ItemModel);

@@ -260,7 +260,7 @@
                            int type = i;

                            m_ItemCell.cellBtn.AddListener(() =>

                            {

                                itemTipsModel.SetItemTipsModel(PackType.DogzEquip, itemModel[type].itemInfo.ItemGUID);

                                itemTipsModel.SetItemTipsModel(PackType.DogzEquip, itemModel[type].guid);

                            });

                        }

                    }

@@ -522,7 +522,7 @@
            {

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

                {

                    if (itemModel[i].EquipPlace == GodBeastPart)

                    if (itemModel[i].equipPlace == GodBeastPart)

                    {

                        ItemModel = itemModel[i];

                    }


 System/Strengthening/GodBeastEntry.cs

@@ -45,7 +45,7 @@
            {

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

                {

                    if (itemModel[i].EquipPlace == godBeastPart)

                    if (itemModel[i].equipPlace == godBeastPart)

                    {

                        ItemCellModel ItemModel = new ItemCellModel(itemModel[i].itemId, true, 0, 0);//不显示绑定

                        if (godBeastModel.GodBeastRedPointDic.ContainsKey(itemModel[i].itemPlace))


 System/Strengthening/GodBeastModel.cs

@@ -132,7 +132,7 @@
                int lv = IudetDogzEquipPlus[0];

                if (lv > 0)

                {

                    var DogzEquipConfig = DogzEquipPlusConfig.GetEquipplaceAndLevel(item.EquipPlace, lv);

                    var DogzEquipConfig = DogzEquipPlusConfig.GetEquipplaceAndLevel(item.equipPlace, lv);

                    int[] AttType = DogzEquipConfig.attType;

                    int[] AttValue = DogzEquipConfig.attValue;

                    for (int j = 0; j < AttType.Length; j++)

@@ -164,7 +164,7 @@
        var IudetDogzEquipPlus = item.GetUseDataModel((int)ItemUseDataKey.dogzEquipPlus);

        if (IudetDogzEquipPlus != null && IudetDogzEquipPlus[0] > 0)

        {

            var DogzEquipConfig = DogzEquipPlusConfig.GetEquipplaceAndLevel(item.EquipPlace, IudetDogzEquipPlus[0]);

            var DogzEquipConfig = DogzEquipPlusConfig.GetEquipplaceAndLevel(item.equipPlace, IudetDogzEquipPlus[0]);

            int[] AttType = DogzEquipConfig.attType;

            int[] AttValue = DogzEquipConfig.attValue;

            for (int j = 0; j < AttType.Length; j++)


 System/Strengthening/GodBeastReinforcementWin.cs

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

                        GodBeastClass godBeastClass = new GodBeastClass();

                        godBeastClass.GodBeastNumber = key;

                        godBeastClass.GodBeastPart = itemModel[i].EquipPlace;

                        godBeastClass.GodBeastPart = itemModel[i].equipPlace;

                        godBeastClass.GodBeastQuality = itemModel[i].config.ItemColor;

                        godBeastClass.GodBeastStar = itemModel[i].config.StarLevel;

                        godBeastClass.EquipScore = itemModel[i].equipScore;

@@ -186,7 +186,7 @@
                            godBeastClass.GodBeastLv = IudetDogzEquipPlus[0];

                            godBeastClass.GodBeasProficiency = IudetDogzEquipPlus[1];

                        }

                        godBeastClass.LocationMarker = itemModel[i].EquipPlace * 100 + key;

                        godBeastClass.LocationMarker = itemModel[i].equipPlace * 100 + key;

                        GodBeastList.Add(godBeastClass);

                    }

                }


 System/Strengthening/GodBeastSlidingList.cs

@@ -212,7 +212,7 @@
                godBeastBagClass.Color = itemModel.config.ItemColor;

                godBeastBagClass.Star = itemModel.config.StarLevel;

                godBeastBagClass.EquipScore = itemModel.equipScore;

                godBeastBagClass.Part = itemModel.EquipPlace;

                godBeastBagClass.Part = itemModel.equipPlace;

                godBeastBagClass.Count = itemModel.itemInfo.ItemCount;

                var IudetDogzEquipPlus = itemModel.GetUseDataModel((int)ItemUseDataKey.dogzEquipPlus);// 神兽装备强化信息列表 [强化等级, 强化熟练度]

                if (IudetDogzEquipPlus == null)

@@ -418,7 +418,7 @@
                    if (godBeastModel.Absorption_Dic.ContainsKey(godBeastBagClass.Index))

                    {

                        GodBeastChildNodes.ChoosenImg.SetActive(true);

                        if (itemModel.EquipPlace <= 0 && itemModel.itemInfo.ItemCount > 1)

                        if (itemModel.equipPlace <= 0 && itemModel.itemInfo.ItemCount > 1)

                        {

                            GodBeastChildNodes.NumberNow.gameObject.SetActive(true);

                            GodBeastChildNodes.NumberNow.text = godBeastModel.Absorption_Dic[godBeastBagClass.Index].ToString() + "/" + itemModel.itemInfo.ItemCount;

@@ -426,7 +426,7 @@
                    }

                    else

                    {

                        if (itemModel.EquipPlace <= 0 && itemModel.itemInfo.ItemCount > 1)

                        if (itemModel.equipPlace <= 0 && itemModel.itemInfo.ItemCount > 1)

                        {

                            GodBeastChildNodes.NumberNow.gameObject.SetActive(true);

                            GodBeastChildNodes.NumberNow.text = itemModel.itemInfo.ItemCount.ToString();

@@ -435,7 +435,7 @@
                    GodBeastChildNodes.GetGodBeastIndex(godBeastBagClass.Index);

                    GodBeastChildNodes.ButtonDown.AddListener(() =>

                    {

                        if (itemModel.EquipPlace > 0)//选中的物品为装备

                        if (itemModel.equipPlace > 0)//选中的物品为装备

                        {

                            if (godBeastModel.Absorption_Dic.ContainsKey(godBeastBagClass.Index))

                            {


 System/Strengthening/InlaidPanel.cs

@@ -616,7 +616,7 @@
            return;

        }



        itemTipsModel.SetItemTipsModel(PackType.Equip, itemModel.itemInfo.ItemGUID);

        itemTipsModel.SetItemTipsModel(PackType.Equip, itemModel.guid);



    }




 System/Strengthening/MasterCell.cs

@@ -31,7 +31,7 @@
                itemBaisc.cellBtn.RemoveAllListeners();
                itemBaisc.cellBtn.AddListener(()=>
                {
                    tipsModel.SetItemTipsModel(PackType.Equip,itemModel.itemInfo.ItemGUID);
                    tipsModel.SetItemTipsModel(PackType.Equip,itemModel.guid);
                });
            }
        }

 System/Strengthening/StrengtheningSripts.cs

@@ -772,7 +772,7 @@
        FullIteemCell.cellBtn.RemoveAllListeners();

        FullIteemCell.cellBtn.AddListener(() =>

        {

            itemTipsModel.SetItemTipsModel(PackType.Equip, item.itemInfo.ItemGUID);

            itemTipsModel.SetItemTipsModel(PackType.Equip, item.guid);

        });

        ItemPlusMaxConfig _tagItem = new ItemPlusMaxConfig();

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

@@ -810,7 +810,7 @@
        NowIteemCell.cellBtn.RemoveAllListeners();

        NowIteemCell.cellBtn.AddListener(() =>

        {

            itemTipsModel.SetItemTipsModel(PackType.Equip, item.itemInfo.ItemGUID, false);

            itemTipsModel.SetItemTipsModel(PackType.Equip, item.guid, false);

            itemTipsModel.curAttrData.SetStrengthData(strengthengmodel.StrengthenTheCeiling(item.itemPlace) + 1, strengthengmodel.GameDefineIndex(item.itemPlace

                ));

            itemTipsModel.ShowUICtrl();

@@ -820,7 +820,7 @@
        UpIteemCell.cellBtn.RemoveAllListeners();

        UpIteemCell.cellBtn.AddListener(() =>

        {

            itemTipsModel.SetItemTipsModel(PackType.Equip, item.itemInfo.ItemGUID);

            itemTipsModel.SetItemTipsModel(PackType.Equip, item.guid);

        });

        int _levelNum = strengthengmodel._EqInfo[_tag].EquipPartStarLV;//获取服务端的当前等级

        int _strType = strengthengmodel.GameDefineIndex(_tag);


 System/Strengthening/WashMasterCell.cs

@@ -29,7 +29,7 @@
                itemBaisc.cellBtn.RemoveAllListeners();

                itemBaisc.cellBtn.AddListener(()=>

                {

                    tipsModel.SetItemTipsModel(PackType.Equip,itemModel.itemInfo.ItemGUID);

                    tipsModel.SetItemTipsModel(PackType.Equip,itemModel.guid);

                });

                int curLv = 1;

                WashProCount washPro = washModel.GetWashEquipInfo((int)equipPlace);


 System/Strengthening/WashTips.cs

@@ -311,7 +311,7 @@
            _washEquipCell.cellBtn.RemoveAllListeners();

            _washEquipCell.cellBtn.onClick.AddListener(() =>

            {

                itemTipsModel.SetItemTipsModel(PackType.Equip, itemModel.itemInfo.ItemGUID);

                itemTipsModel.SetItemTipsModel(PackType.Equip, itemModel.guid);

            });

        }




 System/Strengthening/WingsBouncedWin.cs

@@ -117,7 +117,7 @@
            _WingButton.WingBG.AddListener(() =>

            {



                ItemLogicUtility.Instance.PutOnItem(ItemOperateType.putIn, model.itemInfo.ItemGUID);

                ItemLogicUtility.Instance.PutOnItem(ItemOperateType.putIn, model.guid);



                //string strJob = tagItem.JobLimit.ToString();

                //if (_ReincarnationLv >= int.Parse(strJob.Substring(strJob.Length - 1, 1)))


 System/Strengthening/WingsRefined.cs

@@ -575,7 +575,7 @@
            IconButton.RemoveAllListeners();

            IconButton.AddListener(() =>

            {

                itemTipsModel.SetItemTipsModel(PackType.Equip, itemModel.itemInfo.ItemGUID);

                itemTipsModel.SetItemTipsModel(PackType.Equip, itemModel.guid);

            });

            ModelCreationDisplay();//模型展示创建

            RefiningDegrees();//精炼度（刷新）


 System/Vip/FirstTimeRechargeModel.cs

@@ -113,7 +113,7 @@
                    {

                        for (int k = 0; k < list.Count; k++)

                        {

                            bool isOverdue = packModelInterface.IsOverdue(list[k].itemInfo.ItemGUID,

                            bool isOverdue = packModelInterface.IsOverdue(list[k].guid,

                                        list[k].itemId, list[k].useDataDict);

                            if (isOverdue)

                            {