From 70191de3e564da5e7b836821ae2a69492c9cb1ff Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期三, 17 四月 2019 11:46:06 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/ItemTip/EquipTipUtility.cs | 39 +++++++++++++++++++++++++++------------
System/ItemTip/TipSuitPropertyWidget.cs | 19 ++++++++++++-------
2 files changed, 39 insertions(+), 19 deletions(-)
diff --git a/System/ItemTip/EquipTipUtility.cs b/System/ItemTip/EquipTipUtility.cs
index 7037f49..bbdd8c3 100644
--- a/System/ItemTip/EquipTipUtility.cs
+++ b/System/ItemTip/EquipTipUtility.cs
@@ -316,7 +316,7 @@
guid = guid,
baseInfo = GetBaseInfo(guid),
- petMountBaseProperty=GetPetMountBaseProperty(item.itemId),
+ petMountBaseProperty = GetPetMountBaseProperty(item.itemId),
operates = GetOperates(guid),
};
}
@@ -411,7 +411,7 @@
{
itemId = item.itemId,
count = item.count,
- isAuction =item.isAuction,
+ isAuction = item.isAuction,
isEquiped = isEquiped,
score = item.score,
auctionSurplusTime = item.isAuction ? item.auctionSurplusTime : 0,
@@ -599,31 +599,46 @@
return default(SuitInfo);
}
+ var equipPosition = new Int2(item.config.LV, item.config.EquipPlace);
+ var equiped = equipModel.GetEquip(equipPosition) == guid;
+
var job = config.JobLimit;
var twoConfigs = EquipSuitConfig.GetConfigs(job, config.LV, EquipSuitType.TwoSuit);
-
var name = twoConfigs[0].name;
var level = config.LV;
- var maxSuitLevel = EquipStarModel.GetMaxStarLevel(level);
+ var maxSuitLevel = equiped ? EquipStarModel.GetMaxStarLevel(level) : -1;
+
var places = new List<int>();
- for (int i = 1; i <= 8; i++)
+ if (equiped)
{
- var equip = packModel.GetItemByGuid(equipModel.GetEquip(new Int2(level, i)));
- var hasSuit = equip != null && equip.config.SuiteiD > 0;
- if (hasSuit)
+ for (int i = 1; i <= 8; i++)
{
- places.Add(i);
+ var equip = packModel.GetItemByGuid(equipModel.GetEquip(new Int2(level, i)));
+ var hasSuit = equip != null && equip.config.SuiteiD > 0;
+ if (hasSuit)
+ {
+ places.Add(i);
+ }
}
}
var twoSuitProperties = new Dictionary<int, EquipSuitPropertyEntry>();
var fiveSuitProperties = new Dictionary<int, EquipSuitPropertyEntry>();
var eightSuits = new Dictionary<int, bool>();
- var eightSuitLevel = equipModel.GetSuitLevel(config.LV, EquipSuitType.EightSuit);
+ var eightSuitLevel = equiped ? equipModel.GetSuitLevel(config.LV, EquipSuitType.EightSuit) : -1;
- twoSuitProperties[0] = equipModel.GetEquipSuitEntry(config.LV, 0, EquipSuitType.TwoSuit);
- fiveSuitProperties[0] = equipModel.GetEquipSuitEntry(config.LV, 0, EquipSuitType.FiveSuit);
+ var twoSuitProperties0 = equipModel.GetEquipSuitEntry(config.LV, 0, EquipSuitType.TwoSuit);
+ var fiveSuitProperties0 = equipModel.GetEquipSuitEntry(config.LV, 0, EquipSuitType.FiveSuit);
+
+ if (!equiped)
+ {
+ twoSuitProperties0.actived = false;
+ fiveSuitProperties0.actived = false;
+ }
+
+ twoSuitProperties[0] = twoSuitProperties0;
+ fiveSuitProperties[0] = fiveSuitProperties0;
eightSuits[0] = eightSuitLevel >= 0;
if (maxSuitLevel >= 3)
diff --git a/System/ItemTip/TipSuitPropertyWidget.cs b/System/ItemTip/TipSuitPropertyWidget.cs
index f485f09..1690312 100644
--- a/System/ItemTip/TipSuitPropertyWidget.cs
+++ b/System/ItemTip/TipSuitPropertyWidget.cs
@@ -13,6 +13,7 @@
public class TipSuitPropertyWidget : MonoBehaviour
{
[SerializeField] Text m_SuitName;
+ [SerializeField] RectTransform m_StarsContainer;
[SerializeField] StarToggle[] m_StarToggles;
[SerializeField] Text[] m_SuitEquipNames;
@@ -36,14 +37,18 @@
}
var maxLevel = suitInfo.maxSuitLevel;
- m_StarToggles[0].SetActive(true, DisplaySuitProperty);
- m_StarToggles[1].SetActive(maxLevel >= 3, DisplaySuitProperty);
- m_StarToggles[2].SetActive(maxLevel >= 6, DisplaySuitProperty);
- m_StarToggles[3].SetActive(maxLevel >= 9, DisplaySuitProperty);
-
- for (int i = 0; i < m_StarToggles.Length; i++)
+ m_StarsContainer.gameObject.SetActive(maxLevel >= 0);
+ if (maxLevel>=0)
{
- m_StarToggles[i].toggle.isOn = i == 0;
+ m_StarToggles[0].SetActive(true, DisplaySuitProperty);
+ m_StarToggles[1].SetActive(maxLevel >= 3, DisplaySuitProperty);
+ m_StarToggles[2].SetActive(maxLevel >= 6, DisplaySuitProperty);
+ m_StarToggles[3].SetActive(maxLevel >= 9, DisplaySuitProperty);
+
+ for (int i = 0; i < m_StarToggles.Length; i++)
+ {
+ m_StarToggles[i].toggle.isOn = i == 0;
+ }
}
DisplaySuitProperty(0);
--
Gitblit v1.8.0