From da04fb9ab98e1cbbff582e75370a2906b6d7a4f2 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期二, 02 四月 2019 10:35:42 +0800
Subject: [PATCH] 3201 【BUG】【2.0】强化界面查看装备tip没显示强化数值
---
System/EquipStar/EquipStarModel.cs | 10 ++++++++++
System/ItemTip/EquipTipUtility.cs | 34 ++++++++++++++++++++++++++--------
System/ItemTip/TipEquipBaseInfoWidget.cs | 5 +++--
3 files changed, 39 insertions(+), 10 deletions(-)
diff --git a/System/EquipStar/EquipStarModel.cs b/System/EquipStar/EquipStarModel.cs
index e8447eb..4de0f0f 100644
--- a/System/EquipStar/EquipStarModel.cs
+++ b/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);
diff --git a/System/ItemTip/EquipTipUtility.cs b/System/ItemTip/EquipTipUtility.cs
index bb0d342..3b07cbc 100644
--- a/System/ItemTip/EquipTipUtility.cs
+++ b/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;
diff --git a/System/ItemTip/TipEquipBaseInfoWidget.cs b/System/ItemTip/TipEquipBaseInfoWidget.cs
index b45b589..426f52e 100644
--- a/System/ItemTip/TipEquipBaseInfoWidget.cs
+++ b/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);
}
--
Gitblit v1.8.0