From 6c55e088b09aaa7c667bcca6cc05f5c0c1874f64 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期三, 17 四月 2019 13:53:25 +0800
Subject: [PATCH] 3335 修改装备预览tip
---
System/ItemTip/TipGemInfoWidget.cs | 4 ++--
System/ItemTip/EquipTipUtility.cs | 15 ++++++++++++++-
2 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/System/ItemTip/EquipTipUtility.cs b/System/ItemTip/EquipTipUtility.cs
index bbdd8c3..9cad4d2 100644
--- a/System/ItemTip/EquipTipUtility.cs
+++ b/System/ItemTip/EquipTipUtility.cs
@@ -277,6 +277,7 @@
skillInfo = GetSkillInfo(itemId),
suitInfo = GetSuitInfo(itemId),
gemInfo = GetGemInfo(itemId),
+ starInfo = GetStarInfo(itemId)
};
}
@@ -754,7 +755,19 @@
private static GemInfo GetGemInfo(int itemId)
{
- return default(GemInfo);
+ var config = ItemConfig.Get(itemId);
+ var level = config.LV;
+ var place = config.EquipPlace;
+
+ var gemInfo = new GemInfo();
+ var maxStar = EquipStarModel.GetMaxStarLevel(config.ItemColor, config.LV);
+ gemInfo.activeStates = new Dictionary<int, bool>();
+ for (int i = 0; i < 4; i++)
+ {
+ gemInfo.activeStates[i] = IsEquipGemHoleOpen(new Int2(level, place), maxStar, i);
+ }
+
+ return gemInfo;
}
private static GemInfo GetGemInfo(string guid)
diff --git a/System/ItemTip/TipGemInfoWidget.cs b/System/ItemTip/TipGemInfoWidget.cs
index 7897ff3..1fe503c 100644
--- a/System/ItemTip/TipGemInfoWidget.cs
+++ b/System/ItemTip/TipGemInfoWidget.cs
@@ -20,7 +20,7 @@
{
var behaviour = m_GemBehaviours[i];
var active = gemInfo.activeStates.ContainsKey(i) ? gemInfo.activeStates[i] : false;
- var gem = gemInfo.gems.ContainsKey(i) ? gemInfo.gems[i] : 0;
+ var gem = (gemInfo.gems != null && gemInfo.gems.ContainsKey(i)) ? gemInfo.gems[i] : 0;
behaviour.Display(active, gem);
}
}
@@ -70,7 +70,7 @@
for (int i = 0; i < properties.Count; i++)
{
var property = properties[i];
- lines[i] =PlayerPropertyConfig.GetFullDescription(property.x, property.y);
+ lines[i] = PlayerPropertyConfig.GetFullDescription(property.x, property.y);
}
propertyBehaviour.text = string.Join("\r\n", lines);
--
Gitblit v1.8.0