[1556]修改系统广播属性展示错误问题

Client_PangDeRong

2018-08-13 df95a3a54fa07849feffc7bbd92ed6441699a5ae

[1556]修改系统广播属性展示错误问题

 System/KnapSack/Logic/ItemTipsModel.cs

@@ -1648,39 +1648,9 @@
            this.ChildType = childType;

            this.isCustom = false;

            this.extraInfos = null;

            if (type == PackType.rptEquip)

            {

                Dictionary<int, EquipmentInitialization> p_strengInfoDict = strengthengmodel._EqInfo;

                if (p_strengInfoDict.ContainsKey(index))

                {

                    SetStrengthData(strengthengmodel.StrengthenTheCeiling(index), strengthengmodel.GameDefineIndex(index));

                }



                WashProCount washPro = washModel.GetWashEquipInfo(index);

                if (washPro != null)

                {

                    SetWashModel(washModel.OnGetWashType(index), washPro.XLAttrLV, washModel.WashProValues(index));

                }

                SetGemModel(PlayerStoneData.Instance.GetStoneInfo(index));

                SetSuitData(itemId,index);

            } 
            
            SetLegendData(GetUseDataModel(17), GetUseDataModel(19));

            SetExhaustedData(GetUseDataModel(21),GetUseDataModel(23));

            SetWingsRefineMat(GetUseDataModel((int)ItemUseDataKey.Def_IudetWingMaterialItemID),GetUseDataModel((int)ItemUseDataKey.Def_IudetWingMaterialItemCount));

            isHavePutLimit = true;



            if (GetUseDataModel(20) != null)

            {

                if (GetUseDataModel(20)[0] == 1)

                {

                    isHavePutLimit = false;

                }

            }

            else

            {

                this.isCustom = CheckIsCustomItem();

                if (this.isCustom)

            if(isCustom)

                {

                    AppointItemConfig appointItemConfig = ConfigManager.Instance.GetTemplate<AppointItemConfig>(itemId);

                    if (appointItemConfig != null)

@@ -1693,8 +1663,6 @@
                    }

                    this.itemId = itemConfig.EffectValueA1;

                    this.itemConfig = ConfigManager.Instance.GetTemplate<ItemConfig>(this.itemId);



                  
                }

                else

                {

@@ -1757,9 +1725,38 @@
                            SetLegendData(legendIdlist,legendValuelist);

                        }

                    }

                else

                {

                    if (GetUseDataModel(20) != null)

                    {

                        if (GetUseDataModel(20)[0] == 1)

                        {

                            isHavePutLimit = false;

                }

            }



                    if (type == PackType.rptEquip)

                    {

                        Dictionary<int, EquipmentInitialization> p_strengInfoDict = strengthengmodel._EqInfo;

                        if (p_strengInfoDict.ContainsKey(index))

                        {

                            SetStrengthData(strengthengmodel.StrengthenTheCeiling(index), strengthengmodel.GameDefineIndex(index));

                        }



                        WashProCount washPro = washModel.GetWashEquipInfo(index);

                        if (washPro != null)

                        {

                            SetWashModel(washModel.OnGetWashType(index), washPro.XLAttrLV, washModel.WashProValues(index));

                        }

                        SetGemModel(PlayerStoneData.Instance.GetStoneInfo(index));

                        SetSuitData(itemId, index);

                    }



                    SetLegendData(GetUseDataModel(17), GetUseDataModel(19));

                    SetExhaustedData(GetUseDataModel(21), GetUseDataModel(23));

                    SetWingsRefineMat(GetUseDataModel((int)ItemUseDataKey.Def_IudetWingMaterialItemID), GetUseDataModel((int)ItemUseDataKey.Def_IudetWingMaterialItemCount));

                }

            }

            this.score = modelInterface.SetEquipScore(id,useDataDict,isPreview);

            PetEatEquipConfig petEatConfig = PetEatEquipConfig.GetEquipColorAndEquipClass(itemConfig.ItemColor,itemConfig.LV);//仙盟仓库装备积分兑换表

            this.unionWarehouseScore = 0;

@@ -1768,7 +1765,7 @@
                this.unionWarehouseScore = petEatConfig.integrate;

            }



            if(itemTipsModel.randomRuneIds.Contains(id))

            if(itemTipsModel.randomRuneIds.Contains(this.itemId))

            {

                Dictionary<int, List<int>> unlockRuneDict = runeModel.GetAllUnlockRuneIdlist();

                List<string> extraInfos = new List<string>();


 System/KnapSack/Logic/PackModelInterface.cs

@@ -103,21 +103,6 @@
            specAttrDic.Clear();

            int id = itemId;

            ItemConfig itemConfig = ConfigManager.Instance.GetTemplate<ItemConfig>(itemId);

            if(useDataDic != null)

            {

                if(useDataDic.ContainsKey((int)ItemUseDataKey.Def_IudetLegendAttrID))

                {

                    SetLegendData(useDataDic[(int)ItemUseDataKey.Def_IudetLegendAttrID], useDataDic[(int)ItemUseDataKey.Def_IudetLegendAttrValue]);

                }

                
                if(useDataDic.ContainsKey((int)ItemUseDataKey.Def_IudetOutOfPrintAttrID))

                {

                    SetExhaustedData(useDataDic[(int)ItemUseDataKey.Def_IudetOutOfPrintAttrID],useDataDic[(int)ItemUseDataKey.Def_IudetOutOfPrintAttrValue]);

                }

            
            }

            else

            {

                if (CheckIsCustomItem(itemConfig))

                {

                    AppointItemConfig appointItemConfig = ConfigManager.Instance.GetTemplate<AppointItemConfig>(itemId);

@@ -169,9 +154,23 @@
                            SetLegendData(legendIdlist, legendValuelist);

                        }

                    }

                }

                else

                {

                    if (useDataDic != null)

                    {

                        if (useDataDic.ContainsKey((int)ItemUseDataKey.Def_IudetLegendAttrID))

                        {

                            SetLegendData(useDataDic[(int)ItemUseDataKey.Def_IudetLegendAttrID], useDataDic[(int)ItemUseDataKey.Def_IudetLegendAttrValue]);

            }



                        if (useDataDic.ContainsKey((int)ItemUseDataKey.Def_IudetOutOfPrintAttrID))

                        {

                            SetExhaustedData(useDataDic[(int)ItemUseDataKey.Def_IudetOutOfPrintAttrID], useDataDic[(int)ItemUseDataKey.Def_IudetOutOfPrintAttrValue]);

                        }



                    }

                }

            }

          return GetEquipScore(id,specAttrDic);

          

        }