diff --git a/backend/core/basic/formula.py b/backend/core/basic/formula.py index d5142b25..45e58e23 100644 --- a/backend/core/basic/formula.py +++ b/backend/core/basic/formula.py @@ -233,6 +233,7 @@ def 锻造四维(装备等级, 品质, 锻造等级): '玄机弓': (1, 1, 1), '强攻弩': (1.05, 1, 1), '妖影弓': (0.95, 0.95, 1), + '嵌合弓': (1, 1, 1), } MP系数 = { diff --git a/backend/dataFiles/dcalc_0.db b/backend/dataFiles/dcalc_0.db index ff37eb8c..d9da99ce 100644 Binary files a/backend/dataFiles/dcalc_0.db and b/backend/dataFiles/dcalc_0.db differ diff --git a/frontend/src/components/dnf/Equipment/Info/index.vue b/frontend/src/components/dnf/Equipment/Info/index.vue index 09fccf3e..20d04dae 100644 --- a/frontend/src/components/dnf/Equipment/Info/index.vue +++ b/frontend/src/components/dnf/Equipment/Info/index.vue @@ -94,19 +94,19 @@ const mainAttr = computed(() => { return info }) +// a.match(/\[(?!.*?技能).*?]/g) + const detail = computed(() => props.equipment?.detail.replace( - /\[([^\[\]技能]+?)\]/g, - '[$1]', - ), + /\[(?![^\]]*技能)[^\[\]]+\]/g, match => `${match}` + ) ) const bufferDetail = computed(() => { const detail = props.equipment?.bufferDetail if (!detail || detail == '-') return undefined return props.equipment?.bufferDetail.replace( - /\[([^\[\]技能]+?)\]/g, - '[$1]', + /\[(?![^\]]*技能)[^\[\]]+\]/g, match => `${match}` ) })