diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx
index 5f30949..4a65ae1 100644
--- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx
+++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx
@@ -2475,7 +2475,7 @@
升级材料合并
- 人物天赋(10%)
+ 角色天赋(10%)
树脂预估
diff --git a/src/Snap.Hutao/Snap.Hutao/Service/Cultivation/CultivationStatisticsSurplusMerge.cs b/src/Snap.Hutao/Snap.Hutao/Service/Cultivation/CultivationStatisticsSurplusMerge.cs
index c129a1c..9573b96 100644
--- a/src/Snap.Hutao/Snap.Hutao/Service/Cultivation/CultivationStatisticsSurplusMerge.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Service/Cultivation/CultivationStatisticsSurplusMerge.cs
@@ -10,7 +10,13 @@ namespace Snap.Hutao.Service.Cultivation;
internal static class CultivationStatisticsSurplusMerge
{
- private const uint TalentCombineType = 3U;
+ ///
+ /// 元数据 Combine.Type:1 角色与武器培养素材(野怪等)、2 武器突破、3 角色天赋;与此三类对应的合成均支持 10% 暴击期望。
+ ///
+ private static bool CombineTypeSupportsSynthCritTenPercent(uint combineType)
+ {
+ return combineType is 1U or 2U or 3U;
+ }
public static void Apply(Dictionary items, ICultivationMetadataContext context, CultivationStatisticsMergeOptions options)
{
@@ -76,7 +82,7 @@ internal static class CultivationStatisticsSurplusMerge
continue;
}
- double multiplier = talentCrit && upward.Type == TalentCombineType ? 1.1D : 1D;
+ double multiplier = talentCrit && CombineTypeSupportsSynthCritTenPercent(upward.Type) ? 1.1D : 1D;
double produced = crafts * multiplier;
uint resultId = upward.Result.Id;