From f3b2449efb879a7495c857b044f0ff0cedb6d21e Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期一, 21 十月 2019 21:56:46 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/ItemTip/ItemTipUtility.cs | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/System/ItemTip/ItemTipUtility.cs b/System/ItemTip/ItemTipUtility.cs
index 36354e7..355647d 100644
--- a/System/ItemTip/ItemTipUtility.cs
+++ b/System/ItemTip/ItemTipUtility.cs
@@ -36,6 +36,7 @@
public BaseProperty baseProperty;
public BaseProperty petMountBaseProperty;
public SpiritWeaponProperty spiritWeaponProperty;
+ public ShenProperty shenProperty;
public LegendProperty legendProperty;
public SkillInfo skillInfo;
public SuitInfo suitInfo;
@@ -511,6 +512,7 @@
gemInfo = GetGemInfo(guid),
trainProperty = GetTrainProperty(guid),
operates = operatable ? GetOperates(guid) : null,
+ shenProperty = GetShenProperty(item.itemId)
};
}
@@ -529,7 +531,8 @@
suitInfo = GetSuitInfo(itemId),
gemInfo = GetGemInfo(itemId),
starInfo = GetStarInfo(itemId),
- getWay = GetGetWay(itemId)
+ getWay = GetGetWay(itemId),
+ shenProperty = GetShenProperty(itemId)
};
}
@@ -714,6 +717,7 @@
strengthenProperty = strengthenProperty,
gemInfo = gemInfo,
trainProperty = trainProperty,
+ shenProperty = GetShenProperty(info.itemId)
};
}
@@ -733,7 +737,8 @@
suitInfo = GetSuitInfo(itemId),
gemInfo = GetGemInfo(itemId),
starInfo = GetStarInfo(itemId),
- operates = GetGoodOperates(goodId)
+ operates = GetGoodOperates(goodId),
+ shenProperty = GetShenProperty(itemId)
};
}
@@ -786,6 +791,7 @@
petMountBaseProperty = GetPetMountBaseProperty(item.itemId),
operates = operatable ? GetOperates(guid) : null,
refineMaterials = GetWingRefineMaterials(guid),
+ shenProperty = GetShenProperty(item.itemId)
};
}
@@ -801,6 +807,7 @@
legendProperty = GetLegendProperty(itemId),
petMountBaseProperty = GetPetMountBaseProperty(itemId),
getWay = GetGetWay(itemId),
+ shenProperty = GetShenProperty(itemId)
};
}
@@ -816,6 +823,7 @@
spiritWeaponProperty = GetSpiritWeaponProperty(itemId),
petMountBaseProperty = GetPetMountBaseProperty(itemId),
operates = GetGoodOperates(goodId),
+ shenProperty = GetShenProperty(itemId)
};
}
@@ -1145,7 +1153,7 @@
var config = ItemConfig.Get(itemId);
- data.properties = ShenPropertyUtility.GetEquipProperties(itemId);
+ data.properties = ShenPropertyUtility.GetEquipShenProperties(itemId);
return data;
@@ -1175,6 +1183,15 @@
{
data.trueCount = LegendPropertyUtility.GetEquipPropertyCount(itemId);
data.properties = LegendPropertyUtility.GetEquipProperties(itemId);
+ if (data.properties == null)
+ {
+ data.properties = LegendPropertyUtility.GetLegendProFromEquipShen(itemId);
+ if (data.properties != null)
+ {
+ data.trueCount = 0;
+ data.isPreview = false;
+ }
+ }
}
return data;
--
Gitblit v1.8.0