Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_Zxw

2019-03-14 d1bf618d96b946fa72f630e08a01ba506b35ea97

Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

 System/BetterItemGet/PreciousItemGetModel.cs

@@ -98,7 +98,7 @@
            {

                var itemModel = itemModels[0];

                var error = 0; 

                var isHaveMakeNum = ItemOperateUtility.Instance.CanUseItem(itemModel.itemPlace ,1,out error);

                var isHaveMakeNum = ItemOperateUtility.Instance.CanUseItem(itemModel.gridIndex ,1,out error);

                if(isHaveMakeNum)

                {

                    OnGetPreciousItem(PackType.Item, itemModel.guid);


 System/BlastFurnace/BlastFurnaceModel.cs

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

            {

                var item = items[i];

                drugs[item.itemPlace] = item.count;

                drugs[item.gridIndex] = item.count;

            }

        }



@@ -1129,13 +1129,13 @@
                        getMoney += fruitConfig.RecycleExp * modellist[j].count;

                    }



                    if (!recycleDanDict.ContainsKey(modellist[j].itemPlace))

                    if (!recycleDanDict.ContainsKey(modellist[j].gridIndex))

                    {

                        recycleDanDict.Add(modellist[j].itemPlace, modellist[j].count);

                        recycleDanDict.Add(modellist[j].gridIndex, modellist[j].count);

                    }

                    else

                    {

                        recycleDanDict[modellist[j].itemPlace] += modellist[j].count;

                        recycleDanDict[modellist[j].gridIndex] += modellist[j].count;

                    }

                }

            }


 System/Chat/ChatCtrl.cs

@@ -861,7 +861,7 @@
                    int[] equipGems = null;

                    if (equip)

                    {

                        equipGemModel.TryGetEquipGems(itemPlaceList[i].itemPlace, out equipGems);

                        equipGemModel.TryGetEquipGems(itemPlaceList[i].gridIndex, out equipGems);

                    }

                    _textBuilder.Append("#item#");

                    var chatSendItem = new ChatSendItem()


 System/Chat/ChatExtentWin.cs

@@ -312,7 +312,7 @@
                {

                    foreach (var _equip in equipBodyDict.Values)

                    {

                        if (_equip.itemPlace <= (int)RoleEquipType.Guard1)

                        if (_equip.gridIndex <= (int)RoleEquipType.Guard1)

                        {

                            m_DisplayItems.Add(_equip);

                        }


 System/Chat/ChatSendComponent.cs

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



                var items = singlePack.GetItemsById(chatCenter.bugleItem);

                info = new ChatExtraData() { infoint1 = items[0].itemPlace };

                info = new ChatExtraData() { infoint1 = items[0].gridIndex };

            }

            if (m_ChatInput.text.Length < 1)

            {


 System/Compose/New/ComposeEquipWin.cs

@@ -634,10 +634,10 @@
                        for (int j = 0; j < unSelectItems.Count; j++)

                        {

                            ItemModel _model = unSelectItems[j];

                            if (!unfixeAddDict.ContainsKey(_model.itemPlace))

                            if (!unfixeAddDict.ContainsKey(_model.gridIndex))

                            {

                                selectModel.AddHaveUnfixedSelectItem(_model.itemPlace);

                                UpdateSelect(matCell, _model.itemPlace, SelectItemType.unfixed);

                                selectModel.AddHaveUnfixedSelectItem(_model.gridIndex);

                                UpdateSelect(matCell, _model.gridIndex, SelectItemType.unfixed);

                                break;

                            }

                        }


 System/Compose/New/ComposeMatCell.cs

@@ -204,7 +204,7 @@
            if (itemModel == null) return;

            

            if(itemModel.packType == type 

                && itemModel.itemPlace == index

                && itemModel.gridIndex == index

                && itemModel.itemId == id)

            {

                ClickReduce();

@@ -218,10 +218,10 @@
            switch (matType)

            {

                case NeedMatType.unfixedItem:

                    selectModel.RemoveHaveUnfixedSelectItem(itemModel.itemPlace);

                    selectModel.RemoveHaveUnfixedSelectItem(itemModel.gridIndex);

                    break;

                case NeedMatType.addItem:

                    selectModel.RemoveHaveAddSelectItem(itemModel.itemPlace);

                    selectModel.RemoveHaveAddSelectItem(itemModel.gridIndex);

                    break;

            }

            composeModel.UpdateReduce(this,matType);


 System/Compose/New/ComposeSelectItemCell.cs

@@ -102,13 +102,13 @@
            switch (selectModel.selectItem)

            {

                case SelectItemType.unfixed:

                    selectModel.AddHaveUnfixedSelectItem(itemModel.itemPlace);

                    selectModel.AddHaveUnfixedSelectItem(itemModel.gridIndex);

                    break;

                case SelectItemType.addons:

                    selectModel.AddHaveAddSelectItem(itemModel.itemPlace);

                    selectModel.AddHaveAddSelectItem(itemModel.gridIndex);

                    break;

            }

            selectModel.UpdateSelectItem(itemModel.itemPlace);

            selectModel.UpdateSelectItem(itemModel.gridIndex);

            WindowCenter.Instance.Close<SelectItemWin>();

        }

    }


 System/Compose/New/ComposeWingsWin.cs

@@ -570,7 +570,7 @@
                {

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

                    {

                        var itemIndex = onekeyPutlist[j].itemPlace;

                        var itemIndex = onekeyPutlist[j].gridIndex;

                        if (!addSelectItemDict.ContainsKey(itemIndex))

                        {

                            if (successRate < compoundModel.successUpper)


 System/Compose/New/SelectEquipModel.cs

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

        {

            ItemModel itemModel = modellist[i];

            int index = itemModel.itemPlace;

            int index = itemModel.gridIndex;

            if (!haveAddSelectItemDic.ContainsKey(index))

            {

                switch ((RoleEquipType)itemModel.config.EquipPlace)


 System/Dogz/DogzModel.cs

@@ -445,7 +445,7 @@
                        bool isAdd = true;

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

                        {

                            if (modellist[i].itemPlace == index)

                            if (modellist[i].gridIndex == index)

                            {

                                isAdd = false;

                                modellist[i] = itemModel;

@@ -461,7 +461,7 @@
                    {

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

                        {

                            if (modellist[i].itemPlace == index)

                            if (modellist[i].gridIndex == index)

                            {

                                modellist.RemoveAt(i);

                                break;

@@ -585,7 +585,7 @@
           

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

            {

                int equipPlace = GetDogzEquipPlaceByIndex(_list[i].itemPlace);

                int equipPlace = GetDogzEquipPlaceByIndex(_list[i].gridIndex);

                if(equipPlace == _equipPlace)

                {

                    _equipData = _list[i];


 System/Dogz/DogzPackWin.cs

@@ -272,7 +272,7 @@
                    dogzModel.TryGetDogzEquip(dogzModel.presentSelectDogz,equipPlace,out itemModel);

                    if(itemModel == null)

                    {

                        indexlist.Add(selectModel.itemPlace);

                        indexlist.Add(selectModel.gridIndex);

                    }

                    else

                    {

@@ -299,7 +299,7 @@
                            && itemModel.config.StarLevel == selectModel.config.StarLevel

                            && putStrenLv < selectStrenLv))

                        {

                            indexlist.Add(dogzModel.selectEquipPlacelist[0].itemPlace);

                            indexlist.Add(dogzModel.selectEquipPlacelist[0].gridIndex);

                        }

                    }

                }


 System/Dogz/SelectCell.cs

@@ -42,7 +42,7 @@
            selectBtn.AddListener((UnityEngine.Events.UnityAction)(()=>

            {

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

                indexlist.Add(model.itemPlace);

                indexlist.Add(model.gridIndex);

                dogzModel.SendPutOnEquip(indexlist);

                WindowCenter.Instance.Close<SelectDogzItemWin>();

            }));


 System/Dungeon/DungeonLiquidCell.cs

@@ -193,14 +193,14 @@
                if (isOk)

                {

                    WindowCenter.Instance.Close<DungeonUseLiquidWin>();

                    ItemOperateUtility.Instance.UseItem(itemModel.itemPlace);

                    ItemOperateUtility.Instance.UseItem(itemModel.gridIndex);

                }

            }));

        }

        else

        {

            WindowCenter.Instance.Close<DungeonUseLiquidWin>();

            ItemOperateUtility.Instance.UseItem(itemModel.itemPlace);

            ItemOperateUtility.Instance.UseItem(itemModel.gridIndex);

        }

    }




 System/Equip/EquipModel.cs

@@ -446,7 +446,7 @@
                    var items = packModel.GetItems(PackType.Equip, new SinglePack.FilterParams() { });
                    foreach (var item in items)
                    {
                        var clientPlace = EquipSet.ServerPlaceToClientPlace(item.itemPlace);
                        var clientPlace = EquipSet.ServerPlaceToClientPlace(item.gridIndex);
                        equipSets[clientPlace.x].UpdateEquipSlot(clientPlace.y, item.guid);
                    }


 System/EquipGem/EquipGemSelectWin.cs

@@ -222,7 +222,7 @@
            var item = packModel.GetItemByGuid(guid);

            CA304_tagCMEquipEnchase _pak = new CA304_tagCMEquipEnchase();

            _pak.HoleIndex = equipHole == 3 ? (byte)10 : (byte)equipHole;

            _pak.StoneIndex = (byte)item.itemPlace;

            _pak.StoneIndex = (byte)item.gridIndex;

            _pak.EquipIndex = (byte)EquipPlaceMapConfig.GetServerPlace(equipLevel, equipPlace);

            GameNetSystem.Instance.SendInfo(_pak);

            CloseClick();


 System/EquipStar/EquipStarModel.cs

@@ -116,7 +116,7 @@
                if (!string.IsNullOrEmpty(material.value))
                {
                    var item = packModel.GetItemByGuid(material.value);
                    materialIndexs.Add((ushort)item.itemPlace);
                    materialIndexs.Add((ushort)item.gridIndex);
                    materialItemIds.Add((uint)item.itemId);
                }
            }

 System/FairyAu/FamilyChangeNameWin.cs

@@ -97,7 +97,7 @@
                         {
                             if(ItemOperateUtility.Instance.useItemModel.itemId == model.changeFairyNameItem)
                             {
                                 model.SendChangeFairyName(m_FairyNameInput.text, ItemOperateUtility.Instance.useItemModel.itemPlace);
                                 model.SendChangeFairyName(m_FairyNameInput.text, ItemOperateUtility.Instance.useItemModel.gridIndex);
                             }
                         }
                     }

 System/FashionDress/FashionDecomposeModel.cs

@@ -84,7 +84,7 @@
            {

                if (item.isSelect)

                {

                    indexs.Add((ushort)item.itemModel.itemPlace);

                    indexs.Add((ushort)item.itemModel.gridIndex);

                    ids.Add((uint)item.itemModel.itemId);

                }

            }


 System/HappyXB/XBGridCell.cs

@@ -44,14 +44,14 @@
            {
                if (XBModel.CheckIsEmptyGrid(PackType.RunePack))
                {
                    XBModel.SendPutOutXBItem(PackType.Treasure, PackType.RunePack, itemModel.itemPlace, 0);
                    XBModel.SendPutOutXBItem(PackType.Treasure, PackType.RunePack, itemModel.gridIndex, 0);
                }
            }
            else
            {
                if (XBModel.CheckIsEmptyGrid(PackType.Item))
                {
                    XBModel.SendPutOutXBItem(PackType.Treasure, PackType.Item, itemModel.itemPlace, 0);
                    XBModel.SendPutOutXBItem(PackType.Treasure, PackType.Item, itemModel.gridIndex, 0);
                }
            }
        }

 System/JadeDynastyKnapSack/JadeDynastyDecomposeModel.cs

@@ -186,7 +186,7 @@
                var model = playerPack.GetItemByGuid(guid);

                if(model != null)

                {

                    indexs.Add((ushort)model.itemPlace);

                    indexs.Add((ushort)model.gridIndex);

                    ids.Add((uint)model.itemId);

                }

            }


 System/JadeDynastyKnapSack/JadeDynastyEquipModel.cs

@@ -266,7 +266,7 @@
            if (model != null)

            {

                lookGuid = guid;

                int itemIndex = model.itemPlace;

                int itemIndex = model.gridIndex;

                jumpIndex = itemIndex / 5;



                WindowCenter.Instance.Close<MainInterfaceWin>();


 System/KnapSack/ItemUseBehaviour.cs

@@ -63,7 +63,7 @@
                model.ReportConfirmUseItem(model.currentShowItem);
                if (itemModel != null && itemModel.packType == PackType.Item)
                {
                    ItemOperateUtility.Instance.GotoUseItem(itemModel.itemPlace);
                    ItemOperateUtility.Instance.GotoUseItem(itemModel.gridIndex);
                }
            }
        }

 System/KnapSack/Logic/BoxGetItemModel.cs

@@ -177,7 +177,7 @@
            ItemModel itemModel = playerPack.GetItemByGuid(guid);

            if (itemModel != null)

            {

                ItemOperateUtility.Instance.UseItem(itemModel.itemPlace,useCnt);

                ItemOperateUtility.Instance.UseItem(itemModel.gridIndex,useCnt);

            }

        }




 System/KnapSack/Logic/BoxGetItemWin.cs

@@ -246,7 +246,7 @@
            if (itemModel == null) return;



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

            ItemOperateUtility.Instance.UseItem(itemModel.itemPlace, 1);

            ItemOperateUtility.Instance.UseItem(itemModel.gridIndex, 1);

        }



        private void ClickBackBtn()


 System/KnapSack/Logic/EquipDevourWin.cs

@@ -185,7 +185,7 @@
            {

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

                {

                    if(playerPack.selectDevourlist[i].itemPlace == index)

                    if(playerPack.selectDevourlist[i].gridIndex == index)

                    {

                        playerPack.selectDevourlist.RemoveAt(i);

                        break;

@@ -598,7 +598,7 @@
            var idlist = new uint[realDevourlist.Count];

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

            {

                _petIndex[i] = (ushort)realDevourlist[i].itemPlace;

                _petIndex[i] = (ushort)realDevourlist[i].gridIndex;

                idlist[i] = (uint)realDevourlist[i].itemId;

            }

            _petEat.Count = (byte)_petIndex.Length;


 System/KnapSack/Logic/GuardOverdueWin.cs

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


                    if (isOk)

                    {

                        itemOverdue.SendRenewalQuest(itemModel.itemPlace,2);

                        itemOverdue.SendRenewalQuest(itemModel.gridIndex,2);

                        CloseWin();

                    }

                });

@@ -159,7 +159,7 @@


                    if(isOk)

                    {

                        itemOverdue.SendRenewalQuest(itemModel.itemPlace, 1);

                        itemOverdue.SendRenewalQuest(itemModel.gridIndex, 1);

                        CloseWin();

                    }

                });


 System/KnapSack/Logic/ItemLogicUtility.cs

@@ -616,7 +616,7 @@
                    break;
                case 127:
                    var error = 0;
                    bool isHaveMakeNum = ItemOperateUtility.Instance.CanUseItem(item.itemPlace, 1, out error);
                    bool isHaveMakeNum = ItemOperateUtility.Instance.CanUseItem(item.gridIndex, 1, out error);
                    int remainNum = CrossServerOneVsOnePlayerInfo.Instance.GetDayRemainNum();
                    if (!CrossServerOneVsOnePKSeason.Instance.isSatisfyMatch
                        || remainNum > 0
@@ -1174,7 +1174,7 @@
            int i = 0;
            for (i = 0; i < _oneKeySelllist.Count; i++)
            {
                itemIndexs[i] = (byte)_oneKeySelllist[i].itemPlace;
                itemIndexs[i] = (byte)_oneKeySelllist[i].gridIndex;
            }
            CA311_tagCMSellItem sellItem = new CA311_tagCMSellItem();
            sellItem.PackType = (int)PackType.Item;
@@ -1232,7 +1232,7 @@
            }
            else
            {
                int index = playerPack.GetItemByGuid(guid).itemPlace;
                int index = playerPack.GetItemByGuid(guid).gridIndex;
                lookLineIndex = index / singleRowCount;
                lookItemGUID = guid;
            }
@@ -1297,7 +1297,7 @@
                var dict = new Dictionary<int, ItemModel>();
                if (IsFightUp(itemModel.itemId, itemModel.equipScore) == 1)
                {
                    dict.Add(itemModel.itemPlace, itemModel);
                    dict.Add(itemModel.gridIndex, itemModel);
                    itemModelDict.Add(equipPlace, dict);
                }
            }
@@ -1305,7 +1305,7 @@
            {
                if (IsFightUp(itemModel.itemId, itemModel.equipScore) == 1)
                {
                    itemModelDict[equipPlace].Add(itemModel.itemPlace, itemModel);
                    itemModelDict[equipPlace].Add(itemModel.gridIndex, itemModel);
                }
            }


 System/KnapSack/Logic/ItemModel.cs

@@ -30,7 +30,7 @@
        public string guid { get { return itemInfo == null ? string.Empty : itemInfo.guid; } }

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

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

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

        public int gridIndex { get { return itemInfo == null ? 0 : itemInfo.index; } }

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

        public int preItemCount { get; private set; }

        public int auctionSurplusTime {

@@ -79,7 +79,7 @@
                switch ((EquipReduceType)config.EndureReduceType)

                {

                    case EquipReduceType.Def_EquipReduceType_Time:

                        ItemLogicUtility.Instance.SetItemEffectCDTime(info.guid, info.itemId, itemEffectTime[0], serverSurplusTime);

                    case EquipReduceType.Def_EquipReduceType_RTimeItem:

                        ItemLogicUtility.Instance.SetItemEffectCDTime(info.guid, info.itemId, itemEffectTime[0], serverSurplusTime);

                        break;

                    default:

@@ -117,8 +117,6 @@


        public int itemId;



        public int isLocked; //是否锁定



        public int count; //物品数量



        public int isBind;//是否绑定

@@ -141,7 +139,6 @@
            count = serverItem.ItemCount;

            remainHour = (int)serverItem.RemainHour;

            userData = serverItem.UserData;

            isLocked = serverItem.IsLocked;

            guid = serverItem.ItemGUID;

            isBind = serverItem.IsBind;

        }

@@ -153,7 +150,6 @@
            count = serverItem.ItemCount;

            remainHour = (int)serverItem.RemainHour;

            userData = serverItem.UserData;

            isLocked = serverItem.IsLocked;

            guid = serverItem.ItemGUID;

            isBind = serverItem.IsBind;

        }


 System/KnapSack/Logic/ItemOperateUtility.cs

@@ -135,7 +135,7 @@
            var item = packModel.GetItemByGuid(guid);
            var putOnEquip = new C0703_tagCEquipItem();
            putOnEquip.RoleEquipType = (byte)equipPlace;
            putOnEquip.ItemIndex = (byte)item.itemPlace;
            putOnEquip.ItemIndex = (byte)item.gridIndex;
            GameNetSystem.Instance.SendInfo(putOnEquip);
        }

@@ -144,7 +144,7 @@
            var item = packModel.GetItemByGuid(guid);
            var equipZhuXianItem = new CA330_tagCMEquipZhuXianItem();
            equipZhuXianItem.EquipIndex = (byte)(equipPlace - 121);
            equipZhuXianItem.ItemIndex = (byte)item.itemPlace;
            equipZhuXianItem.ItemIndex = (byte)item.gridIndex;
            GameNetSystem.Instance.SendInfo(equipZhuXianItem);
        }

@@ -254,7 +254,7 @@
            }

            var putInWarehouse = new C0C01_tagCPutItemInWarehouse();
            putInWarehouse.ItemIndex = (ushort)itemModel.itemPlace;
            putInWarehouse.ItemIndex = (ushort)itemModel.gridIndex;
            putInWarehouse.WarehouseIndex = 0;
            putInWarehouse.Count = (ushort)itemModel.count;
            GameNetSystem.Instance.SendInfo(putInWarehouse);
@@ -269,7 +269,7 @@
            }

            var putOutWarehouse = new C0C02_tagCGetItemInWarehouse();
            putOutWarehouse.WarehouseIndex = (ushort)itemModel.itemPlace;
            putOutWarehouse.WarehouseIndex = (ushort)itemModel.gridIndex;
            putOutWarehouse.ItemIndex = 0;
            putOutWarehouse.Count = (ushort)itemModel.count;
            GameNetSystem.Instance.SendInfo(putOutWarehouse);
@@ -354,7 +354,7 @@
                    if (CheckUseCondition(useItemModel))
                    {
                        var error = 0;
                        if (CanUseItem(useItemModel.itemPlace, 1, out error))
                        if (CanUseItem(useItemModel.gridIndex, 1, out error))
                        {
                            if (useItemModel.config.Jump != 0)
                            {
@@ -465,7 +465,7 @@
                {
                    if (!CheckIsMaxOfflineTime(maxUseCnt, itemModel))
                    {
                        UseItem(itemModel.itemPlace);
                        UseItem(itemModel.gridIndex);
                    }
                    else
                    {
@@ -516,7 +516,7 @@
                    {
                        if (isOk)
                        {
                            UseItem(itemModel.itemPlace);
                            UseItem(itemModel.gridIndex);
                        }
                    }
                    );
@@ -532,7 +532,7 @@
                            ItemCDCool cool = KnapsackTimeCDMgr.Instance.GetItemCoolById(itemModel.guid);
                            if (cool == null || cool.GetRemainTime() <= 0)
                            {
                                UseItem(itemModel.itemPlace);
                                UseItem(itemModel.gridIndex);
                            }
                            else
                            {
@@ -579,7 +579,7 @@
                    {
                        if (isOk)
                        {
                            UseItem(itemModel.itemPlace, useNum);
                            UseItem(itemModel.gridIndex, useNum);
                        }
                    });
                    return true;
@@ -703,7 +703,7 @@
            else
            {
                var sendInfo = new C0708_tagCDragItem();
                sendInfo.SrcIndex = (ushort)itemModel.itemPlace;
                sendInfo.SrcIndex = (ushort)itemModel.gridIndex;
                sendInfo.DestIndex = (ushort)singlePack.GetFirstEmptyGridIndex();
                sendInfo.ItemCount = (ushort)splitCount;
                GameNetSystem.Instance.SendInfo(sendInfo); //拆分物体

 System/KnapSack/Logic/ItemOverdueModel.cs

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

                                        {

                                            ItemModel overdueModel = models[0];

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

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

                                            break;

                                        }

                                    }

@@ -360,7 +360,7 @@
            }

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

            {

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

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

            }

        }




 System/KnapSack/Logic/ItemTipsModel.cs

@@ -473,7 +473,7 @@
            if (itemModel != null)

            {

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

                    , itemModel.itemPlace, isCompare

                    , itemModel.gridIndex, isCompare

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



                if (isCompare)

@@ -536,7 +536,7 @@
        public void SetCurrentAttrData(ItemModel itemModel, bool isCompare)

        {

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

                  , itemModel.itemPlace,  isCompare

                  , itemModel.gridIndex,  isCompare

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

        }



@@ -544,7 +544,7 @@
        public void SetCompareAttrData(ItemModel itemModel)

        {

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

                  , itemModel.itemPlace, true

                  , itemModel.gridIndex, true

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

        }



@@ -566,7 +566,7 @@
            if (itemModel == null) return;



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

              , itemModel.itemPlace,  true

              , itemModel.gridIndex,  true

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

        }




 System/KnapSack/Logic/MakeDrugCell.cs

@@ -201,7 +201,7 @@
            {

                if (ItemOperateUtility.Instance.CheckItemUselimit(itemId))

                {

                    ItemOperateUtility.Instance.UseItem(list[0].itemPlace);

                    ItemOperateUtility.Instance.UseItem(list[0].gridIndex);

                }

            }

        }


 System/KnapSack/Logic/PackModel.cs

@@ -277,7 +277,7 @@
                    {
                        if (itemCntAddEvent != null)
                        {
                            itemCntAddEvent(type, itemModel.itemPlace, itemModel.itemId);
                            itemCntAddEvent(type, itemModel.gridIndex, itemModel.itemId);
                        }
                        ItemLogicUtility.Instance.RecommendItem(itemModel);
                        ItemLogicUtility.Instance.RefreshPickItem(type, itemModel.guid);
@@ -286,13 +286,13 @@
                    {
                        if (itemCntReduceEvent != null)
                        {
                            itemCntReduceEvent(type, itemModel.itemPlace, itemModel.itemId);
                            itemCntReduceEvent(type, itemModel.gridIndex, itemModel.itemId);
                        }
                    }

                    if (refreshItemCountEvent != null)
                    {
                        refreshItemCountEvent(type, itemModel.itemPlace, itemModel.itemId);
                        refreshItemCountEvent(type, itemModel.gridIndex, itemModel.itemId);
                    }
                }
            }
@@ -1239,7 +1239,7 @@
            }
            else
            {
                int index = GetItemByGuid(guid).itemPlace;
                int index = GetItemByGuid(guid).gridIndex;
                lookLineIndex = index / singleRowCount;
                lookItemGUID = guid;
            }
@@ -1772,7 +1772,7 @@
            var idlist = new uint[recordAutoDecomNum];
            for (int i = 0; i < recordAutoDecomNum; i++)
            {
                _petIndex[i] = (ushort)itemModels[i].itemPlace;
                _petIndex[i] = (ushort)itemModels[i].gridIndex;
                idlist[i] = (uint)itemModels[i].itemId;
                if (itemModels[i].config.StarLevel >= 2
                    || (itemModels[i].config.EquipPlace == 0 && itemModels[i].config.Type != 29))

 System/KnapSack/Logic/SinglePack.cs

@@ -168,7 +168,7 @@
            {
                if (count < needCount)
                {
                    itemIndexs.Add(goalItems[i].itemPlace);
                    itemIndexs.Add(goalItems[i].gridIndex);
                    count += goalItems[i].count;
                }
                else

 System/KnapSack/Logic/WashAttrPointWin.cs

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

                else

                {

                    ItemOperateUtility.Instance.UseItem(itemModel.itemPlace,1,(int)selectAttr);

                    ItemOperateUtility.Instance.UseItem(itemModel.gridIndex,1,(int)selectAttr);

                }

                

            }


 System/KnapSack/Logic/WashPointBatchUseWin.cs

@@ -155,7 +155,7 @@
            if (itemModel == null)
                return;

            ItemOperateUtility.Instance.UseItem(itemModel.itemPlace, (ushort)Mathf.Ceil(_splitSlider.value), BatchUseModel.Instance.extraPrams);
            ItemOperateUtility.Instance.UseItem(itemModel.gridIndex, (ushort)Mathf.Ceil(_splitSlider.value), BatchUseModel.Instance.extraPrams);
            OnClickCloseBtn();
        }


 System/KnapSack/New/BagWin.cs

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


                    if (playerPack.isPlayBetterEquipEffect)

                    {

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

                        if (ItemLogicUtility.Instance.GetBagSortBetterEquip(itemModel.config.EquipPlace, itemModel.gridIndex) != null)

                        {

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

                            if (!isOverdue)


 System/KnapSack/New/BatchWin.cs

@@ -146,7 +146,7 @@
                {

                    if (isOk)

                    {

                        ItemOperateUtility.Instance.UseItem(itemModel.itemPlace, (ushort)Mathf.Ceil(m_SplitSlider.value), BatchUseModel.Instance.extraPrams);

                        ItemOperateUtility.Instance.UseItem(itemModel.gridIndex, (ushort)Mathf.Ceil(m_SplitSlider.value), BatchUseModel.Instance.extraPrams);

                    }

                }

                );

@@ -158,7 +158,7 @@
            }

            else

            {

                ItemOperateUtility.Instance.UseItem(itemModel.itemPlace, (ushort)Mathf.Ceil(m_SplitSlider.value), BatchUseModel.Instance.extraPrams);

                ItemOperateUtility.Instance.UseItem(itemModel.gridIndex, (ushort)Mathf.Ceil(m_SplitSlider.value), BatchUseModel.Instance.extraPrams);

            }



            OnClickCloseBtn();


 System/KnapSack/New/ChooseItemWin.cs

@@ -208,7 +208,7 @@
            ItemModel itemModel = playerPack.GetItemByGuid(BoxModel.guid);

            if(itemModel != null)

            {

                ItemOperateUtility.Instance.UseItem(itemModel.itemPlace,useNum,chooseId);

                ItemOperateUtility.Instance.UseItem(itemModel.gridIndex,useNum,chooseId);

            }

            CloseImmediately();

        }


 System/KnapSack/New/OfflineHangUpUseWin.cs

@@ -104,7 +104,7 @@
            bool isMax = ItemOperateUtility.Instance.CheckIsMaxOfflineTime((int)Mathf.Ceil(_batchUseSlider.value), itemModel);

            if(!isMax)

            {

                ItemOperateUtility.Instance.UseItem(itemModel.itemPlace, (int)Mathf.Ceil(_batchUseSlider.value));

                ItemOperateUtility.Instance.UseItem(itemModel.gridIndex, (int)Mathf.Ceil(_batchUseSlider.value));

            }

            CloseClick();

        }


 System/KnapSack/PreciousItemGetBehaviour.cs

@@ -98,7 +98,7 @@
                            }

                            break;

                        default:

                            ItemOperateUtility.Instance.GotoUseItem(itemModel.itemPlace);

                            ItemOperateUtility.Instance.GotoUseItem(itemModel.gridIndex);

                            break;

                    }

                }


 System/Mount/MountModel.cs

@@ -486,7 +486,7 @@

        if (info == null || info.packType != PackType.Equip)
            return;
        if (info.itemPlace == (byte)RoleEquipType.Mount)//坐骑位置19
        if (info.gridIndex == (byte)RoleEquipType.Mount)//坐骑位置19
        {
            if (Hconfigs.Count <= 0)
            {

 System/Pet/PetModel.cs

@@ -555,7 +555,7 @@
                int petLv = 0;
                int petState = 0;
                int[] petSkill = null;
                int petIndex = info.itemPlace;
                int petIndex = info.gridIndex;
                int petExp = 0;
                if (GetUseDataModel(201, _dic) != null)
                {

 System/Strengthening/GodBeastAttributes.cs

@@ -138,13 +138,13 @@
                {

                    if (isOk)

                    {

                        dogz_model.SendDogzEquipStrength(m_DogZItemModel.itemPlace, ListIndex, ListCount, 0);

                        dogz_model.SendDogzEquipStrength(m_DogZItemModel.gridIndex, ListIndex, ListCount, 0);

                    }

                });

            }

            else

            {

                dogz_model.SendDogzEquipStrength(m_DogZItemModel.itemPlace, ListIndex, ListCount, 0);

                dogz_model.SendDogzEquipStrength(m_DogZItemModel.gridIndex, ListIndex, ListCount, 0);

            }



        }

@@ -163,13 +163,13 @@
                    {

                        if (isOk)

                        {

                            dogz_model.SendDogzEquipStrength(m_DogZItemModel.itemPlace, ListIndex, ListCount, 0);

                            dogz_model.SendDogzEquipStrength(m_DogZItemModel.gridIndex, ListIndex, ListCount, 0);

                        }

                    });

                }

                else

                {

                    dogz_model.SendDogzEquipStrength(m_DogZItemModel.itemPlace, ListIndex, ListCount, 0);

                    dogz_model.SendDogzEquipStrength(m_DogZItemModel.gridIndex, ListIndex, ListCount, 0);

                }

            }

            else//所需仙玉不为0时

@@ -188,7 +188,7 @@
                                {

                                    if (Gold >= NeedFairyJade)

                                    {

                                        dogz_model.SendDogzEquipStrength(m_DogZItemModel.itemPlace, ListIndex, ListCount, 1);

                                        dogz_model.SendDogzEquipStrength(m_DogZItemModel.gridIndex, ListIndex, ListCount, 1);

                                    }

                                    else

                                    {

@@ -212,7 +212,7 @@
                        {

                            if (Gold >= NeedFairyJade)

                            {

                                dogz_model.SendDogzEquipStrength(m_DogZItemModel.itemPlace, ListIndex, ListCount, 1);

                                dogz_model.SendDogzEquipStrength(m_DogZItemModel.gridIndex, ListIndex, ListCount, 1);

                            }

                            else

                            {


 System/Strengthening/GodBeastEntry.cs

@@ -48,9 +48,9 @@
                    if (itemModel[i].config.EquipPlace == godBeastPart)

                    {

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

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

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

                        {

                            m_RedPoint.redpointId = godBeastModel.GodBeastRedPointDic[(itemModel[i].itemPlace)].id;

                            m_RedPoint.redpointId = godBeastModel.GodBeastRedPointDic[(itemModel[i].gridIndex)].id;

                        }

                        m_itemCell.Init(ItemModel);

                        var itemConfig = ItemConfig.Get(itemModel[i].itemId);


 System/Strengthening/GodBeastModel.cs

@@ -270,7 +270,7 @@
                }

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

                {

                    int IndexId = itemModel[i].itemPlace;

                    int IndexId = itemModel[i].gridIndex;

                    int RedPoint = Redpoint_key1 * 1000 + IndexId;

                    Redpoint redPointStare = new Redpoint(Redpoint_key1, RedPoint);

                    if (!GodBeastRedPointDic.ContainsKey(IndexId))


 System/Strengthening/GodBeastReinforcementWin.cs

@@ -173,7 +173,7 @@
                        godBeastClass.GodBeastQuality = itemModel[i].config.ItemColor;

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

                        godBeastClass.EquipScore = itemModel[i].equipScore;

                        godBeastClass.ItemPlace = itemModel[i].itemPlace;

                        godBeastClass.ItemPlace = itemModel[i].gridIndex;

                        godBeastClass.GodBeastId = key;

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

                        if (IudetDogzEquipPlus == null)


 System/SystemSetting/SettingEffectMgr.cs

@@ -235,7 +235,7 @@
                    if (singlePack.GetCountById(_tagItemModel.ID) > 0)

                    {

                        var list = singlePack.GetItemsById(_tagItemModel.ID);

                        ItemOperateUtility.Instance.GotoUseItem(list[0].itemPlace);

                        ItemOperateUtility.Instance.GotoUseItem(list[0].gridIndex);

                        break;

                    }

                    else


 System/Vip/VipModel.cs

@@ -591,7 +591,7 @@
                {

                    var itemModel = list[0];

                    CA323_tagCMUseItems pak = new CA323_tagCMUseItems();

                    pak.ItemIndex = (byte)itemModel.itemPlace;

                    pak.ItemIndex = (byte)itemModel.gridIndex;

                    pak.UseCnt = 1;

                    pak.ExData = 0;

                    GameNetSystem.Instance.SendInfo(pak);