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

client_linchunjie

2019-04-02 b65997d592811f5c4e66cc8313c390edee0f3250

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

 System/EquipStar/EquipStarModel.cs

@@ -333,6 +333,11 @@
            return equipStars[level].GetTotalStarLevel();
        }

        /// <summary>
        /// 这是指已经装备位置已经升级到的星级，不考虑当前穿戴的装备
        /// </summary>
        /// <param name="equipPosition"></param>
        /// <returns></returns>
        public int GetStarLevel(Int2 equipPosition)
        {
            if (!equipStars.ContainsKey(equipPosition.x))
@@ -343,6 +348,11 @@
            return equipStars[equipPosition.x].GetEquipStarLevel(equipPosition.y);
        }

        /// <summary>
        /// 这是指受当前装备限制的星级，比如当前装备位已经升级到了9星，但是穿戴的装备最高可升级到6星，那么返回的值是6
        /// </summary>
        /// <param name="equipPosition"></param>
        /// <returns></returns>
        public int GetEquipStarLevel(Int2 equipPosition)
        {
            var starLevel = GetStarLevel(equipPosition);

 System/ItemTip/EquipTipUtility.cs

@@ -44,6 +44,7 @@
            public bool isEquiped;

            public int star;
            public int strengthenLevel;
            public int score;
            public int auctionSurplusTime;
            public int levelLimit;
@@ -354,8 +355,17 @@
        {
            var item = packModel.GetItemByGuid(guid);

            var isEquiped = equipModel.GetEquip(new Int2(item.config.LV, item.config.EquipPlace)) == guid;
            var star = isEquiped ? starModel.GetEquipStarLevel(new Int2(item.config.LV, item.config.EquipPlace)) : -1;
            var level = item.config.LV;
            var place = item.config.EquipPlace;

            var isEquiped = equipModel.GetEquip(new Int2(level, place)) == guid;

            var type = strengthenModel.GetEquipStrengthType(place);
            var star = starModel.GetEquipStarLevel(new Int2(level, place));
            var maxStar = EquipStarModel.GetMaxStarLevel(item.config.ItemColor, level);
            var maxStrengthenLevel = strengthenModel.GetEquipLevelMax(type, Mathf.Min(star, maxStar));
            var placeStrengthenLevel = strengthenModel.GetStrengthLevel(level, place);

            var baseInfo = new BaseInfo()
            {
                itemId = item.itemId,
@@ -366,7 +376,8 @@
                auctionSurplusTime = item.isAuction ? item.auctionSurplusTime : 0,
                levelLimit = item.isAuction ? 0 : item.config.UseLV,
                realmLimit = item.isAuction ? 0 : item.config.RealmLimit,
                star = star,
                star = isEquiped ? star : -1,
                strengthenLevel = Mathf.Min(placeStrengthenLevel, maxStrengthenLevel)
            };

            return baseInfo;
@@ -597,14 +608,21 @@

            var level = item.config.LV;
            var place = item.config.EquipPlace;

            var data = new StrengthenProperty();
            data.strengthenLevel = strengthenModel.GetStrengthLevel(level, place);

            var strengthenLevel = strengthenModel.GetStrengthLevel(level, place);
            var type = strengthenModel.GetEquipStrengthType(place);
            var star = starModel.GetEquipStarLevel(new Int2(level, place));
            var maxStar = EquipStarModel.GetMaxStarLevel(item.config.ItemColor, item.config.LV);
            var maxStrengthenLevel = strengthenModel.GetEquipLevelMax(type, Mathf.Min(star, maxStar));

            data.strengthenLevel = Mathf.Min(strengthenLevel, maxStrengthenLevel);

            data.properties = new List<Int2>();
            var values = strengthenModel.GetEquipValueList(level, place);
            foreach (var value in values)
            var config = ItemPlusConfig.GetTypeAndLevel(type, data.strengthenLevel);
            for (int i = 0; i < config.attType.Length; i++)
            {
                data.properties.Add(new Int2(value.AttType, value.AttValue));
                data.properties.Add(new Int2(config.attType[i], config.attValue[i]));
            }

            return data;
@@ -702,6 +720,12 @@
            {
                operates.Add(ItemOperateType.makeUse);
            }

            if (config.Type == 25 || config.Effect1 == 225)
            {
                operates.Add(ItemOperateType.inlay);
            }

            return operates;
        }

@@ -751,19 +775,10 @@
                        }
                        else
                        {
                            if (item.config.CanSell == 1)
                            {
                                operates.Add(ItemOperateType.sell);
                            }

                            operates.AddRange(GetOperates(item.itemId));
                            if (item.count > 1)
                            {
                                operates.Add(ItemOperateType.split);
                            }

                            if (item.config.UseTag == 1)
                            {
                                operates.Add(ItemOperateType.makeUse);
                            }
                        }
                    }

 System/ItemTip/ItemTipWin.cs

@@ -167,6 +167,9 @@
                    case ItemOperateType.split:
                        this.m_Title.text = "拆分";
                        break;
                    case ItemOperateType.inlay:
                        this.m_Title.text = "镶嵌";
                        break;
                    default:
                        this.m_Title.text = "";
                        break;

 System/ItemTip/TipEquipBaseInfoWidget.cs

@@ -44,15 +44,16 @@
            }

            var itemConfig = ItemConfig.Get(baseInfo.itemId);
            var strengthenPostfix = baseInfo.strengthenLevel > 0 ? string.Format("+{0}", baseInfo.strengthenLevel) : "";
            if (itemConfig.SuiteiD > 0)
            {
                var setName = UIHelper.AppendColor(TextColType.Green, EquipModel.GetSuitName(itemConfig.LV));
                var itemNeme = UIHelper.AppendColor(itemConfig.ItemColor, itemConfig.ItemName);
                var itemNeme = UIHelper.AppendColor(itemConfig.ItemColor, itemConfig.ItemName + strengthenPostfix);
                m_ItemName.text = setName + itemNeme;
            }
            else
            {
                m_ItemName.text = itemConfig.ItemName;
                m_ItemName.text = itemConfig.ItemName + strengthenPostfix;
                m_ItemName.color = UIHelper.GetUIColor(itemConfig.ItemColor);
            }