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

client_Wu Xijin

2019-02-19 2fb0f9761ef9789ce068fbe26d2e4c7af1148ec0

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

 System/BetterItemGet/PreciousItemGetModel.cs

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

            {

                var itemModel = itemModels[0];

                bool isHaveMakeNum = ItemLogicUtility.Instance.IsHaveMakeNumber(itemModel.itemInfo.ItemPlace);

                bool isHaveMakeNum = ItemLogicUtility.Instance.IsHaveMakeNumber(itemModel.itemPlace);

                if(isHaveMakeNum)

                {

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


 System/BlastFurnace/BlastFurnaceModel.cs

@@ -1027,7 +1027,7 @@
        singlePack.GetItemCountByID(itemId, out items);

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

        {

            indexs.Add(items[i].itemInfo.ItemPlace);

            indexs.Add(items[i].itemPlace);

            nums.Add(items[i].itemInfo.ItemCount);

            if (items[i].itemInfo.IsBind == 0)

            {

@@ -1195,13 +1195,13 @@
                        getMoney = getMoney + fruitConfig.RecycleExp * modellist[j].itemInfo.ItemCount;

                    }



                    if (!recycleDanDict.ContainsKey(modellist[j].itemInfo.ItemPlace))

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

                    {

                        recycleDanDict.Add(modellist[j].itemInfo.ItemPlace, modellist[j].itemInfo.ItemCount);

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

                    }

                    else

                    {

                        recycleDanDict[modellist[j].itemInfo.ItemPlace] += modellist[j].itemInfo.ItemCount;

                        recycleDanDict[modellist[j].itemPlace] += modellist[j].itemInfo.ItemCount;

                    }

                }

            }


 System/Chat/ChatCtrl.cs

@@ -857,7 +857,7 @@
                if (cfg.ItemName == matchArray[i].Groups[1].Value)

                {

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

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

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

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

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

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

@@ -876,7 +876,7 @@
                        }

                    }

                    _textBuilder.Append("|");

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

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

                    if (_dictSuitLv != null&& equip)

                    {

                        foreach (int key in _dictSuitLv.Keys)

@@ -885,7 +885,7 @@
                        }

                    }

                    _textBuilder.Append("|");

                    var _dictSuitCnt = ModelCenter.Instance.GetModel<PlayerSuitModel>().GetServerSuitCntByPlace(itemPlaceList[i].itemInfo.ItemPlace);

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

                    if (_dictSuitCnt != null && equip)

                    {

                        foreach (int key in _dictSuitCnt.Keys)

@@ -894,9 +894,9 @@
                        }

                    }

                    _textBuilder.Append("|");

                    _textBuilder.Append(itemPlaceList[i].itemInfo.ItemPlace);

                    _textBuilder.Append(itemPlaceList[i].itemPlace);

                    _textBuilder.Append("|");

                    var _wash = ModelCenter.Instance.GetModel<EquipWashModel>().GetWashEquipInfo(itemPlaceList[i].itemInfo.ItemPlace);

                    var _wash = ModelCenter.Instance.GetModel<EquipWashModel>().GetWashEquipInfo(itemPlaceList[i].itemPlace);

                    if (_wash != null && equip)

                    {

                        _textBuilder.Append("{");


 System/Chat/ChatExtentWin.cs

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

                    foreach (var _equip in equipBodyDict.Values)

                    {

                        if (_equip.itemInfo.ItemPlace <= (int)RoleEquipType.SpiritAnimal)

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

                        {

                            m_DisplayItems.Add(_equip);

                        }


 System/Chat/ChatSendComponent.cs

@@ -106,7 +106,7 @@
                    });

                    return;

                }

                info = new ChatExtraData() { infoint1 = _list[0].itemInfo.ItemPlace };

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

            }

            if (m_ChatInput.text.Length < 1)

            {


 System/Compose/New/ComposeEquipWin.cs

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

                        {

                            ItemModel _model = unSelectItems[j];

                            if (!unfixeAddDict.ContainsKey(_model.itemInfo.ItemPlace))

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

                            {

                                selectModel.AddHaveUnfixedSelectItem(_model.itemInfo.ItemPlace);

                                UpdateSelect(matCell, _model.itemInfo.ItemPlace, SelectItemType.unfixed);

                                selectModel.AddHaveUnfixedSelectItem(_model.itemPlace);

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

                                break;

                            }

                        }


 System/Compose/New/ComposeMatCell.cs

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

            

            if(itemModel.packType == type 

                && itemModel.itemInfo.ItemPlace == index

                && itemModel.itemPlace == index

                && itemModel.itemId == id)

            {

                ClickReduce();

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

            {

                case NeedMatType.unfixedItem:

                    selectModel.RemoveHaveUnfixedSelectItem(itemModel.itemInfo.ItemPlace);

                    selectModel.RemoveHaveUnfixedSelectItem(itemModel.itemPlace);

                    break;

                case NeedMatType.addItem:

                    selectModel.RemoveHaveAddSelectItem(itemModel.itemInfo.ItemPlace);

                    selectModel.RemoveHaveAddSelectItem(itemModel.itemPlace);

                    break;

            }

            composeModel.UpdateReduce(this,matType);


 System/Compose/New/ComposeSelectItemCell.cs

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

            {

                case SelectItemType.unfixed:

                    selectModel.AddHaveUnfixedSelectItem(itemModel.itemInfo.ItemPlace);

                    selectModel.AddHaveUnfixedSelectItem(itemModel.itemPlace);

                    break;

                case SelectItemType.addons:

                    selectModel.AddHaveAddSelectItem(itemModel.itemInfo.ItemPlace);

                    selectModel.AddHaveAddSelectItem(itemModel.itemPlace);

                    break;

            }

            selectModel.UpdateSelectItem(itemModel.itemInfo.ItemPlace);

            selectModel.UpdateSelectItem(itemModel.itemPlace);

            WindowCenter.Instance.Close<SelectItemWin>();

        }

    }


 System/Compose/New/ComposeWingsWin.cs

@@ -571,7 +571,7 @@
                {

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

                    {

                        var itemIndex = onekeyPutlist[j].itemInfo.ItemPlace;

                        var itemIndex = onekeyPutlist[j].itemPlace;

                        if (!addSelectItemDict.ContainsKey(itemIndex))

                        {

                            if (successRate < compoundModel.successUpper)


 System/Compose/New/SelectEquipModel.cs

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

        {

            ItemModel itemModel = modellist[i];

            int index = itemModel.itemInfo.ItemPlace;

            int index = itemModel.itemPlace;

            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].itemInfo.ItemPlace == index)

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

                            {

                                isAdd = false;

                                modellist[i] = itemModel;

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

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

                        {

                            if (modellist[i].itemInfo.ItemPlace == index)

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

                            {

                                modellist.RemoveAt(i);

                                break;

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

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

            {

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

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

                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.itemInfo.ItemPlace);

                        indexlist.Add(selectModel.itemPlace);

                    }

                    else

                    {

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

                            && putStrenLv < selectStrenLv))

                        {

                            indexlist.Add(dogzModel.selectEquipPlacelist[0].itemInfo.ItemPlace);

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

                        }

                    }

                }


 System/Dogz/SelectCell.cs

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

            {

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

                indexlist.Add(model.itemInfo.ItemPlace);

                indexlist.Add(model.itemPlace);

                dogzModel.SendPutOnEquip(indexlist);

                WindowCenter.Instance.Close<SelectDogzItemWin>();

            }));


 System/Dungeon/DungeonLiquidCell.cs

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

                {

                    WindowCenter.Instance.Close<DungeonUseLiquidWin>();

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

                    ItemLogicUtility.Instance.SendMakeUseQuest(itemModel.itemPlace);

                }

            }));

        }

        else

        {

            WindowCenter.Instance.Close<DungeonUseLiquidWin>();

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

            ItemLogicUtility.Instance.SendMakeUseQuest(itemModel.itemPlace);

        }

    }




 System/FairyAu/FamilyChangeNameWin.cs

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

 System/FashionDress/FashionDecomposeModel.cs

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

                if(item.isSelect)

                {

                    indexs.Add((ushort)item.itemModel.itemInfo.ItemPlace);

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

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

                }

            }


 System/HappyXB/XBGridCell.cs

@@ -40,19 +40,19 @@

        private void ClickItemCell(ItemModel itemModel)
        {
            if(itemModel.config.Type == 30 || itemModel.config.Type == 31)

            {

                if (XBModel.CheckIsEmptyGrid(PackType.RunePack))

                {

                    XBModel.SendPutOutXBItem(PackType.Treasure, PackType.RunePack, itemModel.itemInfo.ItemPlace, 0);

                }

            if(itemModel.config.Type == 30 || itemModel.config.Type == 31)
            {
                if (XBModel.CheckIsEmptyGrid(PackType.RunePack))
                {
                    XBModel.SendPutOutXBItem(PackType.Treasure, PackType.RunePack, itemModel.itemPlace, 0);
                }
            }
            else
            {

                if (XBModel.CheckIsEmptyGrid(PackType.Item))

                {

                    XBModel.SendPutOutXBItem(PackType.Treasure, PackType.Item, itemModel.itemInfo.ItemPlace, 0);

                }

            {
                if (XBModel.CheckIsEmptyGrid(PackType.Item))
                {
                    XBModel.SendPutOutXBItem(PackType.Treasure, PackType.Item, itemModel.itemPlace, 0);
                }
            }
        }


 System/JadeDynastyKnapSack/JadeDynastyDecomposeModel.cs

@@ -187,7 +187,7 @@
                var model = playerPack.GetItemModelByGUID(guid);

                if(model != null)

                {

                    indexs.Add((ushort)model.itemInfo.ItemPlace);

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

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

                }

            }


 System/JadeDynastyKnapSack/JadeDynastyEquipModel.cs

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

            {

                lookGuid = guid;

                int itemIndex = model.itemInfo.ItemPlace;

                int itemIndex = model.itemPlace;

                jumpIndex = itemIndex / 5;



                WindowCenter.Instance.Close<MainInterfaceWin>();


 System/JadeDynastyKnapSack/JadeDynastySelectGemWin.cs

@@ -106,7 +106,7 @@
                ItemModel _item = gemItems[i];

                CellInfo _cellInfo = CellInfo.Default;

                _cellInfo.infoInt1 = _item.itemId;

                _cellInfo.infoInt2 = _item.itemInfo.ItemPlace;

                _cellInfo.infoInt2 = _item.itemPlace;

                _cellInfo.SetInfo(_item.itemInfo.IsBind);

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

                m_SrollerControl.AddCell(ScrollerDataType.Normal, i, OnGemItemClick, _cellInfo);

@@ -244,7 +244,7 @@
            {

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

            }

            return x.itemInfo.ItemPlace.CompareTo(y.itemInfo.ItemPlace);

            return x.itemPlace.CompareTo(y.itemPlace);

        }



        private void OnClose()


 System/KnapSack/ItemUseBehaviour.cs

@@ -63,7 +63,7 @@
                model.ReportConfirmUseItem(model.currentShowItem);
                if (itemModel != null && itemModel.packType == PackType.Item)
                {
                    ItemLogicUtility.Instance.UseItem(ItemOperateType.makeUse, itemModel.itemInfo.ItemPlace);
                    ItemLogicUtility.Instance.UseItem(ItemOperateType.makeUse, itemModel.itemPlace);
                }
            }
        }

 System/KnapSack/Logic/BoxGetItemModel.cs

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

            if (itemModel != null)

            {

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

                ItemLogicUtility.Instance.SendMakeUseQuest(itemModel.itemPlace,useCnt);

            }

        }




 System/KnapSack/Logic/BoxGetItemWin.cs

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



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

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

            ItemLogicUtility.Instance.SendMakeUseQuest(itemModel.itemPlace, 1);

        }



        private void ClickBackBtn()


 System/KnapSack/Logic/EquipDevourWin.cs

@@ -186,7 +186,7 @@
            {

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

                {

                    if(playerPack.selectDevourlist[i].itemInfo.ItemPlace == index)

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

                    {

                        playerPack.selectDevourlist.RemoveAt(i);

                        break;

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

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

            {

                _petIndex[i] = (ushort)realDevourlist[i].itemInfo.ItemPlace;

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

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

            }

            _petEat.Count = (byte)_petIndex.Length;


 System/KnapSack/Logic/GuardOverdueWin.cs

@@ -143,7 +143,7 @@


                    if (isOk)

                    {

                        itemOverdue.SendRenewalQuest(itemModel.itemInfo.ItemPlace,2);

                        itemOverdue.SendRenewalQuest(itemModel.itemPlace,2);

                        CloseWin();

                    }

                });

@@ -165,7 +165,7 @@


                    if(isOk)

                    {

                        itemOverdue.SendRenewalQuest(itemModel.itemInfo.ItemPlace, 1);

                        itemOverdue.SendRenewalQuest(itemModel.itemPlace, 1);

                        CloseWin();

                    }

                });


 System/KnapSack/Logic/ItemLogicUtility.cs

@@ -44,7 +44,7 @@
                return;
            }

            itemIndex = selectedItem.itemInfo.ItemPlace;
            itemIndex = selectedItem.itemPlace;
            var putOnLimits = selectedItem.GetUseDataModel((int)ItemUseDataKey.cancelUseLimit);
            if (putOnLimits != null)
            {
@@ -615,7 +615,7 @@

            SinglePackModel singlePack = null;
            int remainGrid = 0;
            int equipPlace = item.itemInfo.ItemPlace;
            int equipPlace = item.itemPlace;
            if (item.packType == PackType.JadeDynastyEquip)
            {
                equipPlace += 121;
@@ -693,7 +693,7 @@
            }

            var putInWarehouse = new C0C01_tagCPutItemInWarehouse();
            putInWarehouse.ItemIndex = (ushort)itemModel.itemInfo.ItemPlace;
            putInWarehouse.ItemIndex = (ushort)itemModel.itemPlace;
            putInWarehouse.WarehouseIndex = 0;
            putInWarehouse.Count = (ushort)itemModel.itemInfo.ItemCount;
            GameNetSystem.Instance.SendInfo(putInWarehouse);
@@ -710,7 +710,7 @@
            }

            var putOutWarehouse = new C0C02_tagCGetItemInWarehouse();
            putOutWarehouse.WarehouseIndex = (ushort)itemModel.itemInfo.ItemPlace;
            putOutWarehouse.WarehouseIndex = (ushort)itemModel.itemPlace;
            putOutWarehouse.ItemIndex = 0;
            putOutWarehouse.Count = (ushort)itemModel.itemInfo.ItemCount;
            GameNetSystem.Instance.SendInfo(putOutWarehouse);
@@ -793,7 +793,7 @@
                if (itemTipsModel.jumpAndUseTypes[i] == useItemModel.config.Type)
                {
                    bool isMakeUse = CheckUseCondition(useItemModel);
                    if (isMakeUse && IsHaveMakeNumber(useItemModel.itemInfo.ItemPlace))
                    if (isMakeUse && IsHaveMakeNumber(useItemModel.itemPlace))
                    {
                        if (useItemModel.config.Jump != 0)
                        {
@@ -903,7 +903,7 @@
                {
                    if (!CheckIsMaxOfflineTime(maxUseCnt, itemModel))
                    {
                        SendMakeUseQuest(itemModel.itemInfo.ItemPlace);
                        SendMakeUseQuest(itemModel.itemPlace);
                    }
                    else
                    {
@@ -954,7 +954,7 @@
                    {
                        if (isOk)
                        {
                            SendMakeUseQuest(itemModel.itemInfo.ItemPlace);
                            SendMakeUseQuest(itemModel.itemPlace);
                        }
                    }
                    );
@@ -970,7 +970,7 @@
                            ItemCDCool cool = KnapsackTimeCDMgr.Instance.GetItemCoolById(itemModel.itemInfo.ItemGUID);
                            if (cool == null || cool.GetRemainTime() <= 0)
                            {
                                SendMakeUseQuest(itemModel.itemInfo.ItemPlace);
                                SendMakeUseQuest(itemModel.itemPlace);
                            }
                            else
                            {
@@ -1016,7 +1016,7 @@
                    {
                        if (isOk)
                        {
                            SendMakeUseQuest(itemModel.itemInfo.ItemPlace, useNum);
                            SendMakeUseQuest(itemModel.itemPlace, useNum);
                        }
                    });
                    return true;
@@ -1119,7 +1119,7 @@
            else
            {
                var sendInfo = new C0708_tagCDragItem();
                sendInfo.SrcIndex = (ushort)itemModel.itemInfo.ItemPlace;
                sendInfo.SrcIndex = (ushort)itemModel.itemPlace;
                sendInfo.DestIndex = (ushort)singlePack.GetNullGridIndex();
                sendInfo.ItemCount = (ushort)splitCount;
                GameNetSystem.Instance.SendInfo(sendInfo); //拆分物体

 System/KnapSack/Logic/ItemModel.cs

@@ -24,12 +24,13 @@
                }

                else

                {

                    return itemInfo == null ? 0 : itemInfo.ItemPlace;

                    return itemPlace;

                }

            }

        }



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



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


 System/KnapSack/Logic/ItemOverdueModel.cs

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

                                        {

                                            ItemModel overdueModel = models[0];

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

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

                                            break;

                                        }

                                    }

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

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

            {

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

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

            }

        }




 System/KnapSack/Logic/ItemTipsModel.cs

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

            {

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

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

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

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



                if (isCompare)

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

        {

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

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

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

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

        }



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

        {

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

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

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

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

        }



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

            {

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

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

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

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



            }


 System/KnapSack/Logic/MakeDrugCell.cs

@@ -203,7 +203,7 @@
            {

                if(ItemLogicUtility.Instance.CheckItemUselimit(itemId))

                {

                    ItemLogicUtility.Instance.SendMakeUseQuest(list[0].itemInfo.ItemPlace);

                    ItemLogicUtility.Instance.SendMakeUseQuest(list[0].itemPlace);

                }

            }

        }


 System/KnapSack/Logic/PackModelInterface.cs

@@ -724,7 +724,7 @@
                    }

                    break;

                case 127:

                    bool isHaveMakeNum = ItemLogicUtility.Instance.IsHaveMakeNumber(itemModel.itemInfo.ItemPlace);

                    bool isHaveMakeNum = ItemLogicUtility.Instance.IsHaveMakeNumber(itemModel.itemPlace);

                    int remainNum = CrossServerOneVsOnePlayerInfo.Instance.GetDayRemainNum();

                    if (!CrossServerOneVsOnePKSeason.Instance.isSatisfyMatch

                        || remainNum > 0

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

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

            {

                itemIndexs[i] = (byte)_oneKeySelllist[i].itemInfo.ItemPlace;

                itemIndexs[i] = (byte)_oneKeySelllist[i].itemPlace;

            }

            CA311_tagCMSellItem sellItem = new CA311_tagCMSellItem();

            sellItem.PackType = (int)PackType.Item;

@@ -1386,7 +1386,7 @@
            }

            else

            {

                int index = playerPack.GetItemModelByGUID(guid).itemInfo.ItemPlace;

                int index = playerPack.GetItemModelByGUID(guid).itemPlace;

                lookLineIndex = index / singleRowCount;

                lookItemGUID = guid;

            }

@@ -1517,7 +1517,7 @@
                Dictionary<int, ItemModel> dict = new Dictionary<int, ItemModel>();

                if (IsFightUp(itemModel.itemId, itemModel.equipScore) == 1)

                {

                    dict.Add(itemModel.itemInfo.ItemPlace, itemModel);

                    dict.Add(itemModel.itemPlace, itemModel);

                    itemModelDict.Add(equipPlace, dict);

                }

            }

@@ -1525,7 +1525,7 @@
            {

                if (IsFightUp(itemModel.itemId, itemModel.equipScore) == 1)

                {

                    itemModelDict[equipPlace].Add(itemModel.itemInfo.ItemPlace, itemModel);

                    itemModelDict[equipPlace].Add(itemModel.itemPlace, itemModel);

                }

            }




 System/KnapSack/Logic/PlayerPackModels.cs

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

                        if (ItemCntAddAct != null)

                        {

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

                            ItemCntAddAct(type, itemModel.itemPlace, itemModel.itemId);

                        }

                        modelInterface.GetPreciousItem(itemModel);

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

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

                        if (ItemCntReduceAct != null)

                        {

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

                            ItemCntReduceAct(type, itemModel.itemPlace, itemModel.itemId);

                        }

                    }



                    if (RefreshItemCountAct != null)

                    {

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

                        RefreshItemCountAct(type, itemModel.itemPlace, itemModel.itemId);

                    }

                }

            }

@@ -1277,7 +1277,7 @@
            }

            else

            {

                int index = GetItemModelByGUID(guid).itemInfo.ItemPlace;

                int index = GetItemModelByGUID(guid).itemPlace;

                lookLineIndex = index / singleRowCount;

                lookItemGUID = guid;

            }

@@ -1811,7 +1811,7 @@
            var idlist = new uint[recordAutoDecomNum];

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

            {

                _petIndex[i] = (ushort)itemModels[i].itemInfo.ItemPlace;

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

                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/SinglePackModel.cs

@@ -184,7 +184,7 @@
            {
                if(count < needCount)
                {
                    itemIndexlist.Add(itemModellist[i].itemInfo.ItemPlace);
                    itemIndexlist.Add(itemModellist[i].itemPlace);
                    count += itemModellist[i].itemInfo.ItemCount;
                }
                else
@@ -222,7 +222,7 @@
                {
                    if(itemModellist[i].itemInfo.IsBind == isBind)
                    {
                        itemIndexlist.Add(itemModellist[i].itemInfo.ItemPlace);
                        itemIndexlist.Add(itemModellist[i].itemPlace);
                        count += itemModellist[i].itemInfo.ItemCount;
                    }
                }
@@ -238,7 +238,7 @@
                {
                    if (itemModellist[i].itemInfo.IsBind != isBind)
                    {
                        itemIndexlist.Add(itemModellist[i].itemInfo.ItemPlace);
                        itemIndexlist.Add(itemModellist[i].itemPlace);
                        count += itemModellist[i].itemInfo.ItemCount;
                    }
                }

 System/KnapSack/Logic/WashAttrPointWin.cs

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

                else

                {

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

                    ItemLogicUtility.Instance.SendMakeUseQuest(itemModel.itemPlace,1,(int)selectAttr);

                }

                

            }


 System/KnapSack/Logic/WashPointBatchUseWin.cs

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

            ItemLogicUtility.Instance.SendMakeUseQuest(itemModel.itemInfo.ItemPlace, (ushort)Mathf.Ceil(_splitSlider.value), BatchUseModel.Instance.extraPrams);
            ItemLogicUtility.Instance.SendMakeUseQuest(itemModel.itemPlace, (ushort)Mathf.Ceil(_splitSlider.value), BatchUseModel.Instance.extraPrams);
            OnClickCloseBtn();
        }


 System/KnapSack/New/BagWin.cs

@@ -304,7 +304,7 @@


                    if (playerPack.isPlayBetterEquipEffect)

                    {

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

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

                        {

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

                            if (!isOverdue)


 System/KnapSack/New/BatchWin.cs

@@ -178,7 +178,7 @@
                {

                    if (isOk)

                    {

                        ItemLogicUtility.Instance.SendMakeUseQuest(itemModel.itemInfo.ItemPlace, (ushort)Mathf.Ceil(_splitSlider.value), BatchUseModel.Instance.extraPrams);

                        ItemLogicUtility.Instance.SendMakeUseQuest(itemModel.itemPlace, (ushort)Mathf.Ceil(_splitSlider.value), BatchUseModel.Instance.extraPrams);

                    }

                }

                );

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

            else

            {

                ItemLogicUtility.Instance.SendMakeUseQuest(itemModel.itemInfo.ItemPlace, (ushort)Mathf.Ceil(_splitSlider.value), BatchUseModel.Instance.extraPrams);

                ItemLogicUtility.Instance.SendMakeUseQuest(itemModel.itemPlace, (ushort)Mathf.Ceil(_splitSlider.value), BatchUseModel.Instance.extraPrams);

            }

         

            OnClickCloseBtn();


 System/KnapSack/New/ChooseItemWin.cs

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

            if(itemModel != null)

            {

                ItemLogicUtility.Instance.SendMakeUseQuest(itemModel.itemInfo.ItemPlace,useNum,chooseId);

                ItemLogicUtility.Instance.SendMakeUseQuest(itemModel.itemPlace,useNum,chooseId);

            }

            CloseImmediately();

        }


 System/KnapSack/New/OfflineHangUpUseWin.cs

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

            if(!isMax)

            {

                ItemLogicUtility.Instance.SendMakeUseQuest(itemModel.itemInfo.ItemPlace, (int)Mathf.Ceil(_batchUseSlider.value));

                ItemLogicUtility.Instance.SendMakeUseQuest(itemModel.itemPlace, (int)Mathf.Ceil(_batchUseSlider.value));

            }

            CloseClick();

        }


 System/KnapSack/PreciousItemGetBehaviour.cs

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

                            break;

                        default:

                            ItemLogicUtility.Instance.UseItem(ItemOperateType.makeUse, itemModel.itemInfo.ItemPlace);

                            ItemLogicUtility.Instance.UseItem(ItemOperateType.makeUse, itemModel.itemPlace);

                            break;

                    }

                }


 System/Market/PutawayWin.cs

@@ -458,7 +458,7 @@
        private void SendPutawayPack()
        {
            CB501_tagCMPYPlayerSellBourseItem pak = new CB501_tagCMPYPlayerSellBourseItem();
            pak.ItemIndex = (byte)PutawayData.Instance.itemModel.itemInfo.ItemPlace;
            pak.ItemIndex = (byte)PutawayData.Instance.itemModel.itemPlace;
            pak.Count = PutawayData.Instance.itemCount;
            pak.PriceCount = (uint)PutawayData.Instance.priceCount;
            pak.PriceType = PutawayData.Instance.priceType;

 System/Mount/PlayerMountDatas.cs

@@ -482,7 +482,7 @@


        if (info == null || info.packType != PackType.Equip)

            return;

        if (info.itemInfo.ItemPlace == (byte)RoleEquipType.mount)//坐骑位置19

        if (info.itemPlace == (byte)RoleEquipType.mount)//坐骑位置19

        {

            if (Hconfigs.Count <= 0)

            {


 System/Pet/PlayerPetDatas.cs

@@ -563,7 +563,7 @@
                int petLv = 0;

                int petState = 0;

                int[] petSkill = null;

                int petIndex = info.itemInfo.ItemPlace;

                int petIndex = info.itemPlace;

                int petExp = 0;

                if (GetUseDataModel(201, _dic) != null)

                {


 System/Strengthening/EquipSuit/PlayerSuitModel.cs

@@ -473,9 +473,9 @@
            Dictionary<int, ItemModel> equipDict = singlePack.GetPackModelIndexDict();

            foreach (ItemModel model in equipDict.Values)

            {

                if (GetGroupType(model.itemInfo.ItemPlace) == GetGroupType(equipPlace))

                if (GetGroupType(model.itemPlace) == GetGroupType(equipPlace))

                {

                    int serverSuitLv = GetServerSuitLv(model.itemInfo.ItemPlace, (int)suitType);

                    int serverSuitLv = GetServerSuitLv(model.itemPlace, (int)suitType);



                    if (serverSuitLv != 0)

                    {

@@ -494,7 +494,7 @@
                        if (serverSuitLv == suitLv)

                        {

                            sumNumber++;

                            equipPlacelist.Add(model.itemInfo.ItemPlace);

                            equipPlacelist.Add(model.itemPlace);

                        }

                    }

                }

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

            foreach (ItemModel model in equipDict.Values)

            {

                Dictionary<int, int> suitTypeDic = GetServerSuitModelByPlace(model.itemInfo.ItemPlace);

                Dictionary<int, int> suitTypeDic = GetServerSuitModelByPlace(model.itemPlace);

                if (suitTypeDic != null)

                {

                    if (suitTypeDic.ContainsKey((int)suitType))


 System/Strengthening/GemModel.cs

@@ -316,7 +316,7 @@
                    continue;

                }

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

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

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

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

                {

                    continue;

@@ -385,7 +385,7 @@
                {

                    continue;

                }

                if (FuncConfigConfig.GetGemTypeByEquipPos(equip.itemInfo.ItemPlace) != _type)

                if (FuncConfigConfig.GetGemTypeByEquipPos(equip.itemPlace) != _type)

                {

                    continue;

                }


 System/Strengthening/GodBeastAttributes.cs

@@ -1,32 +1,32 @@
//--------------------------------------------------------
//    [Author]:           第二世界
//    [  Date ]:           Tuesday, August 21, 2018
//--------------------------------------------------------
using UnityEngine;
using System.Collections;
using UnityEngine.UI;
//--------------------------------------------------------

//    [Author]:           第二世界

//    [  Date ]:           Tuesday, August 21, 2018

//--------------------------------------------------------

using UnityEngine;

using System.Collections;

using UnityEngine.UI;

using System.Collections.Generic;

using System;

//神兽强化（神兽属性展示）
using System;



//神兽强化（神兽属性展示）

namespace Snxxz.UI

{

{



    public class GodBeastAttributes : MonoBehaviour

    {
        [SerializeField] ItemCell m_ItemCell;
        [SerializeField] GameObject m_FrameNull;
        [SerializeField] GameObject m_FullLevel;
        [SerializeField] GameObject m_BottomDisplay;
    {

        [SerializeField] ItemCell m_ItemCell;

        [SerializeField] GameObject m_FrameNull;

        [SerializeField] GameObject m_FullLevel;

        [SerializeField] GameObject m_BottomDisplay;

        [SerializeField] Text m_LvNowText;

        [SerializeField] Text m_LvNextText;

        [SerializeField] IntensifySmoothSlider m_ExpSlider;
        [SerializeField] Text m_ExpNum;

        [SerializeField] Text m_TextAttributes1;
        [SerializeField] Text m_LvNextText;



        [SerializeField] IntensifySmoothSlider m_ExpSlider;

        [SerializeField] Text m_ExpNum;



        [SerializeField] Text m_TextAttributes1;

        [SerializeField] Text m_TextAttributesAdd1;

        [SerializeField] Text m_TextAttributes2;
        [SerializeField] Text m_TextAttributes2;

        [SerializeField] Text m_TextAttributesAdd2;

        [SerializeField] GodBeastSlidingList m_GodBeastSlidingList;



@@ -50,22 +50,22 @@
        ItemTipsModel _itemTipsModel;

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

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

        private int GodBeastNumber = 0;//神兽编号
        private int GodBeastPart = 0;//神兽装备ID

        private int DogZLv = 0;//获取神兽等级
        private int DogZExp = 0;//熟练度

        private ItemModel m_DogZItemModel = null;
        private int SingleProficiency = 0;//单倍熟练度
        private int DoubleProficiency = 0;//双倍熟练度
        private int NeedFairyJade = 0;//所需仙玉
        private int GodBeastNumber = 0;//神兽编号

        private int GodBeastPart = 0;//神兽装备ID



        private int DogZLv = 0;//获取神兽等级

        private int DogZExp = 0;//熟练度



        private ItemModel m_DogZItemModel = null;

        private int SingleProficiency = 0;//单倍熟练度

        private int DoubleProficiency = 0;//双倍熟练度

        private int NeedFairyJade = 0;//所需仙玉

        private void Start()

        {

            m_DoubleToggle.onValueChanged.AddListener(OnClickToggle);

            m_StrengthenBtn.AddListener(OnClickStrengthBtn);

            m_StrengthenDoubleBtn.AddListener(OnClickStrengthBtn);

        }
        }

        private void OnEnable()

        {

            if (m_DoubleToggle.isOn)

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

                    if (isOk)

                    {

                        dogz_model.SendDogzEquipStrength(m_DogZItemModel.itemInfo.ItemPlace, ListIndex, ListCount, 0);

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

                    }

                });

            }

            else

            {

                dogz_model.SendDogzEquipStrength(m_DogZItemModel.itemInfo.ItemPlace, ListIndex, ListCount, 0);

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

            }



        }

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

                        if (isOk)

                        {

                            dogz_model.SendDogzEquipStrength(m_DogZItemModel.itemInfo.ItemPlace, ListIndex, ListCount, 0);

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

                        }

                    });

                }

                else

                {

                    dogz_model.SendDogzEquipStrength(m_DogZItemModel.itemInfo.ItemPlace, ListIndex, ListCount, 0);

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

                }

            }

            else//所需仙玉不为0时

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

                                    if (Gold >= NeedFairyJade)

                                    {

                                        dogz_model.SendDogzEquipStrength(m_DogZItemModel.itemInfo.ItemPlace, ListIndex, ListCount, 1);

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

                                    }

                                    else

                                    {

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

                            if (Gold >= NeedFairyJade)

                            {

                                dogz_model.SendDogzEquipStrength(m_DogZItemModel.itemInfo.ItemPlace, ListIndex, ListCount, 1);

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

                            }

                            else

                            {

@@ -630,9 +630,9 @@
                m_Text_Attributes3.text = StrName1 + ":" + AttValue[0];

            }

        }

    }

}



    }



}








 System/Strengthening/GodBeastEntry.cs

@@ -1,31 +1,31 @@
//--------------------------------------------------------
//    [Author]:           第二世界
//    [  Date ]:           Thursday, August 16, 2018
//--------------------------------------------------------
using UnityEngine;
using System.Collections;
using UnityEngine.UI;
//--------------------------------------------------------

//    [Author]:           第二世界

//    [  Date ]:           Thursday, August 16, 2018

//--------------------------------------------------------

using UnityEngine;

using System.Collections;

using UnityEngine.UI;

using System.Collections.Generic;



//神兽强化；列表条目

namespace Snxxz.UI

{

{



    public class GodBeastEntry : MonoBehaviour

    {

        [SerializeField] ItemCell m_itemCell;
        [SerializeField] GameObject m_Selectedbar_Image;
        [SerializeField] Text m_Item_Text;
        [SerializeField] Button m_GodBeastButton;
        [SerializeField] RedpointBehaviour m_RedPoint;
        [SerializeField] Image m_GodBeastIcon;
        public float Magnification = 1f;
        [SerializeField] ItemCell m_itemCell;

        [SerializeField] GameObject m_Selectedbar_Image;

        [SerializeField] Text m_Item_Text;

        [SerializeField] Button m_GodBeastButton;

        [SerializeField] RedpointBehaviour m_RedPoint;

        [SerializeField] Image m_GodBeastIcon;

        public float Magnification = 1f;

        public Button GodBeastButton

        {

            get { return m_GodBeastButton; }

            set { m_GodBeastButton = value; }

        }

        }



        DogzModel Dogz_model;

        DogzModel dogz_model { get { return Dogz_model ?? (Dogz_model = ModelCenter.Instance.GetModel<DogzModel>()); } }

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

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

                    {

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

                        if (godBeastModel.GodBeastRedPointDic.ContainsKey(itemModel[i].itemInfo.ItemPlace))

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

                        {

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

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

                        }

                        m_itemCell.Init(ItemModel);

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

@@ -77,10 +77,10 @@
                    }

                }

            }

        }
    }

}



        }

    }



}








 System/Strengthening/GodBeastModel.cs

@@ -1,7 +1,7 @@
//--------------------------------------------------------
//    [Author]:           第二世界
//    [  Date ]:           Friday, September 07, 2018
//--------------------------------------------------------
//--------------------------------------------------------

//    [Author]:           第二世界

//    [  Date ]:           Friday, September 07, 2018

//--------------------------------------------------------

using Snxxz.UI;

using System;

using System.Collections;

@@ -11,7 +11,7 @@
using UnityEngine;



// 关于神兽强化

[XLua.LuaCallCSharp]
[XLua.LuaCallCSharp]

    public class GodBeastModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk

{

    public Dictionary<int, int> Absorption_Dic = new Dictionary<int, int>();//获取选择的物品

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

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

                {

                    int IndexId = itemModel[i].itemInfo.ItemPlace;

                    int IndexId = itemModel[i].itemPlace;

                    int RedPoint = Redpoint_key1 * 1000 + IndexId;

                    Redpoint redPointStare = new Redpoint(Redpoint_key1, RedPoint);

                    if (!GodBeastRedPointDic.ContainsKey(IndexId))

@@ -452,8 +452,8 @@
        }

        return IsBool;

    }

}




}










 System/Strengthening/GodBeastReinforcementWin.cs

@@ -1,17 +1,17 @@
//--------------------------------------------------------
//    [Author]:           第二世界
//    [  Date ]:           Thursday, August 16, 2018
//--------------------------------------------------------

//--------------------------------------------------------

//    [Author]:           第二世界

//    [  Date ]:           Thursday, August 16, 2018

//--------------------------------------------------------



using EnhancedUI.EnhancedScroller;

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

using System.Collections;

using System.Collections.Generic;

using UnityEngine;

using UnityEngine.UI;

//神兽强化

namespace Snxxz.UI

{
{

    public class GodBeastClass

    {

        public int GodBeastNumber;//神兽编号

@@ -24,11 +24,11 @@
        public int EquipScore;//装备评分

        public int ItemPlace;//背包装备位置

        public int GodBeastId;//神兽ID

    }
    public class GodBeastReinforcementWin : Window
    }

    public class GodBeastReinforcementWin : Window

    {

        [SerializeField] ScrollerController m_ScrollerController;
        [SerializeField] GodBeastSlidingList m_GodBeastSlidingList;
        [SerializeField] ScrollerController m_ScrollerController;

        [SerializeField] GodBeastSlidingList m_GodBeastSlidingList;

        [SerializeField] GameObject m_Listprompt_Text;

        [SerializeField] GodBeastAttributes m_GodBeastAttributes;

        [SerializeField] UIEffect m_UIEffect;

@@ -39,26 +39,26 @@
        GodBeastModel GodBeastModel;

        GodBeastModel godBeastModel { get { return GodBeastModel ?? (GodBeastModel = ModelCenter.Instance.GetModel<GodBeastModel>()); } }

        public static event Action<int> ChooseToModify;

        private List<GodBeastClass> GodBeastList = new List<GodBeastClass>();
        private int CurrentlySelected = 0;
        private int JumpIndex = 0;
        public int Offset = 0;//偏移量
        #region Built-in
        protected override void BindController()
        private List<GodBeastClass> GodBeastList = new List<GodBeastClass>();

        private int CurrentlySelected = 0;

        private int JumpIndex = 0;

        public int Offset = 0;//偏移量

        #region Built-in

        protected override void BindController()

        {

            m_ScrollerController.OnRefreshCell += OnRefreshGridCell;
        }

        protected override void AddListeners()
            m_ScrollerController.OnRefreshCell += OnRefreshGridCell;

        }



        protected override void AddListeners()

        {

           
        }

        protected override void OnPreOpen()
           
        }



        protected override void OnPreOpen()

        {

            CurrentlySelected = 0;

            GetGodBeast();//获取神兽强化装备信息

           
           
            if (godBeastModel.ItemPlace != -1)//装备强化跳转选中

            {

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

@@ -100,35 +100,35 @@
                        JumpIndex = 0;

                    }

                }

            }
            }

            OnCreateGridLineCell(m_ScrollerController);

            m_GodBeastSlidingList.Init();
            m_GodBeastAttributes.Init();
            m_GodBeastSlidingList.Init();

            m_GodBeastAttributes.Init();

            m_GodBeastAttributes.GetGodBeastLocationMarker(CurrentlySelected);

           







        }

        }



        protected override void OnActived()

        {

            var offset = 0f;

            m_ScrollerController.JumpIndex(JumpIndex,ref offset);

            m_ScrollerController.JumpIndex(Offset + offset, 0, EnhancedScroller.TweenType.immediate);

        }
        protected override void OnAfterOpen()
        {
        }

        protected override void OnAfterOpen()

        {

            playerPack.RefreshItemCountAct += RefreshItemCountAct;

            DTC0721_tagMakeItemAnswer.MakeItemAnswerEvent += MakeItemAnswerEvent;
        }

        protected override void OnPreClose()
            DTC0721_tagMakeItemAnswer.MakeItemAnswerEvent += MakeItemAnswerEvent;

        }



        protected override void OnPreClose()

        {

            JumpIndex = 0;

            godBeastModel.ItemPlace = -1;

            playerPack.RefreshItemCountAct -= RefreshItemCountAct;

            DTC0721_tagMakeItemAnswer.MakeItemAnswerEvent -= MakeItemAnswerEvent;
            DTC0721_tagMakeItemAnswer.MakeItemAnswerEvent -= MakeItemAnswerEvent;

        }



        private void MakeItemAnswerEvent(H0721_tagMakeItemAnswer obj)

@@ -150,11 +150,11 @@
            }

        }



        protected override void OnAfterClose()
        {
        protected override void OnAfterClose()

        {

        }

        #endregion

        #endregion



        private void GetGodBeast()//存储神兽强化列表数据和排序

        {

            GodBeastList.Clear();

@@ -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].itemInfo.ItemPlace;

                        godBeastClass.ItemPlace = itemModel[i].itemPlace;

                        godBeastClass.GodBeastId = key;

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

                        if (IudetDogzEquipPlus == null)

@@ -220,7 +220,7 @@
                return -x.EquipScore.CompareTo(y.EquipScore);

            }

            return 1;

        }
        }

        void OnCreateGridLineCell(ScrollerController gridCtrl)

        {

            gridCtrl.Refresh();

@@ -259,8 +259,8 @@
                    }

                }

            });

        }

        }



        private void GetDogZBagIndex()//获取选择的神兽装备的装备下标

        {

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

@@ -273,11 +273,11 @@
                }

            }



        }
    }

}




        }

    }



}










 System/Strengthening/InlaidPanel.cs

@@ -233,7 +233,7 @@
        {

            m_GemHoles[_index - 1].m_ContainerInlay.gameObject.SetActive(true);

            FuncConfigConfig _funcCfg = null;

            int _type = FuncConfigConfig.GetGemTypeByEquipPos(_itemModel.itemInfo.ItemPlace, out _funcCfg);

            int _type = FuncConfigConfig.GetGemTypeByEquipPos(_itemModel.itemPlace, out _funcCfg);

            if (_type != -1)

            {

                m_GemHoles[_index - 1].m_GemTypeTxt.text = _funcCfg.Numerical2;

@@ -344,7 +344,7 @@
        ItemModel _itemModel = playerPack.GetItemModelByIndex(PackType.Equip, model.presentGemEquip);

        m_Scroller.Refresh();

        _strikeBtn.gameObject.SetActive(hasStone);

        int _type = FuncConfigConfig.GetGemTypeByEquipPos(_itemModel.itemInfo.ItemPlace);

        int _type = FuncConfigConfig.GetGemTypeByEquipPos(_itemModel.itemPlace);

        if (_type == -1)

        {

            return;

@@ -375,7 +375,7 @@
            ItemModel _item = m_GemItems[i];

            CellInfo _cellInfo = CellInfo.Default;

            _cellInfo.infoInt1 = _item.itemId;

            _cellInfo.infoInt2 = _item.itemInfo.ItemPlace;

            _cellInfo.infoInt2 = _item.itemPlace;

            _cellInfo.SetInfo(_item.itemInfo.IsBind);

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

            m_Scroller.AddCell(ScrollerDataType.Normal, i, OnGemItemClick, _cellInfo);

@@ -680,7 +680,7 @@
        {

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

        }

        return x.itemInfo.ItemPlace.CompareTo(y.itemInfo.ItemPlace);

        return x.itemPlace.CompareTo(y.itemPlace);

    }



    private int Compare(int x, int y)


 System/Strengthening/StrengtheningSripts.cs

@@ -811,7 +811,7 @@
        NowIteemCell.cellBtn.AddListener(() =>

        {

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

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

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

                ));

            itemTipsModel.ShowUICtrl();

        });


 System/SystemSetting/SettingEffectMgr.cs

@@ -245,7 +245,7 @@
                    List<ItemModel> list = null;

                    if (singlePack.GetItemCountByID(_tagItemModel.ID,out list) > 0)

                    {

                        ItemLogicUtility.Instance.UseItem(ItemOperateType.makeUse, list[0].itemInfo.ItemPlace);

                        ItemLogicUtility.Instance.UseItem(ItemOperateType.makeUse, list[0].itemPlace);

                        break;

                    }

                    else


 System/TreasureFindHost/TreasureFindHostModel.cs

@@ -193,7 +193,7 @@
                progress = 0;

                foreach (var place in equipDict.Keys)

                {

                    int serverSuitLv = playerSuit.GetServerSuitLv(equipDict[place].itemInfo.ItemPlace,condi[1]);

                    int serverSuitLv = playerSuit.GetServerSuitLv(equipDict[place].itemPlace,condi[1]);

                    bool isMaker = playerSuit.IsMakerSuit((SuitType)condi[1], equipDict[place].config.ItemColor,

                        equipDict[place].config.StarLevel);




 System/Vip/VipModel.cs

@@ -621,7 +621,7 @@
                {

                    var itemModel = list[0];

                    CA323_tagCMUseItems pak = new CA323_tagCMUseItems();

                    pak.ItemIndex = (byte)itemModel.itemInfo.ItemPlace;

                    pak.ItemIndex = (byte)itemModel.itemPlace;

                    pak.UseCnt = 1;

                    pak.ExData = 0;

                    GameNetSystem.Instance.SendInfo(pak);