Merge remote-tracking branch 'origin/master' into SpringFestival

client_Zxw

2019-01-28 f47ea60f59e0b2b8601583351e269151237c6708

 System/KnapSack/Logic/PackModelInterface.cs

@@ -147,6 +147,14 @@
                            break;

                    }



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

                    switch (packType)

                    {

                        case PackType.rptJadeDynastyItem:

                            CalculateJadeDynastyLegendAttr(itemConfig,out legendIdlist, out legendValuelist);

                            break;

                    }



                    if (legendIdlist.Count == legendValuelist.Count)

                    {

                        SetLegendData(legendIdlist, legendValuelist);

@@ -244,6 +252,14 @@
                }



            }

        }



        private void CalculateJadeDynastyLegendAttr(ItemConfig itemConfig, out List<int> legendIdlist, out List<int> legendValuelist)

        {

            Dictionary<int, int> attrDict = null;

            itemTipsModel.TryGetJadeDynastyLegendAttr(itemConfig.ID,out attrDict);

            legendIdlist = attrDict.Keys.ToList();

            legendValuelist = attrDict.Values.ToList();

        }



        #region 预览定制属性逻辑处理

@@ -890,63 +906,35 @@
                    }

                }

            }

            ItemModel equipItemModel = null;

            SinglePackModel singlePack = playerPack.GetSinglePackModel(PackType.rptEquip);

            int putOnScore = 0;

            if (model.chinItemModel.EquipPlace != 9)

            {

                if (singlePack != null)

                {

                    equipItemModel = singlePack.GetItemModelByIndex(model.chinItemModel.EquipPlace);

                    if (equipItemModel != null)

                    {

                        putOnScore = equipItemModel.equipScore;

                    }



                    if (CheckIsBetterEquip(model.equipScore, putOnScore))

                    {

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

            int isFightUp = IsFightUp(model.itemId,model.equipScore);

            int equipPlace = model.chinItemModel.EquipPlace;

            if (isFightUp == 1)

            {

               switch(equipPlace)

                {

                    case 9:

                        break;

                    default:

                        if(model.packType == PackType.rptItem)

                        {

                            if (model.EquipPlace > (int)RoleEquipType.retWeapon2 && model.EquipPlace < (int)RoleEquipType.retNeck)

                            var equipItemModel = playerPack.GetItemModelByIndex(PackType.rptEquip, model.chinItemModel.EquipPlace);

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

                            {

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

                                if (model.EquipPlace > (int)RoleEquipType.retWeapon2 && model.EquipPlace < (int)RoleEquipType.retNeck)

                                {

                                    return;

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

                                    {

                                        return;

                                    }

                                }

                            }

                        }

                        if (RefreshGetBetterEquipEvent != null)

                        {

                            RefreshGetBetterEquipEvent(model.itemInfo.ItemGUID);

                        }

                    }



                        break;

                }

            }

            else

            {

                if (singlePack != null)

                if (RefreshGetBetterEquipEvent != null)

                {

                    equipItemModel = singlePack.GetItemModelByIndex(model.chinItemModel.EquipPlace);

                    if (equipItemModel != null)

                    {

                        putOnScore = equipItemModel.equipScore;

                    }

                    bool isbetter = CheckIsBetterEquip(model.equipScore, putOnScore);

                    if (!isbetter)

                    {

                        equipItemModel = singlePack.GetItemModelByIndex(10);

                        putOnScore = equipItemModel == null ? 0 : equipItemModel.equipScore;

                        isbetter = CheckIsBetterEquip(model.equipScore, putOnScore);

                    }



                    if (isbetter)

                    {

                        if (RefreshGetBetterEquipEvent != null)

                        {

                            RefreshGetBetterEquipEvent(model.itemInfo.ItemGUID);

                        }

                    }

                    RefreshGetBetterEquipEvent(model.itemInfo.ItemGUID);

                }

            }

        }

@@ -1693,15 +1681,27 @@
                        putOnModel2 = playerPack.GetItemModelByIndex(PackType.rptJadeDynastyEquip, (int)RoleEquipType.JadeDynasty_Ring2);

                        break;

                }

                if (putOnModel2 != null)



                switch ((RoleEquipType)chinItemModel.EquipPlace)

                {

                    if (putOnModel != null)

                    {

                        if (putOnModel2.equipScore < putOnModel.equipScore)

                    case RoleEquipType.retFairyCan:

                    case RoleEquipType.JadeDynasty_Glove1:

                    case RoleEquipType.JadeDynasty_Ring1:

                        if (putOnModel2 != null)

                        {

                            if (putOnModel != null)

                            {

                                if (putOnModel2.equipScore < putOnModel.equipScore)

                                {

                                    putOnModel = putOnModel2;

                                }

                            }

                        }

                        else

                        {

                            putOnModel = putOnModel2;

                        }

                    }

                        break;

                }



                int equipScore1 = 0;