dev

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系数 = {

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,
-    '<span style="color:#3d9147">[$1]</span>',
-  ),
+    /\[(?![^\]]*技能)[^\[\]]+\]/g, match => `<span style="color:#3d9147">${match}</span>`
+  )
 )
 
 const bufferDetail = computed(() => {
   const detail = props.equipment?.bufferDetail
   if (!detail || detail == '-') return undefined
   return props.equipment?.bufferDetail.replace(
-    /\[([^\[\]技能]+?)\]/g,
-    '<span style="color:#3d9147">[$1]</span>',
+    /\[(?![^\]]*技能)[^\[\]]+\]/g, match => `<span style="color:#3d9147">${match}</span>`
   )
 })
 </script>