From de597aba8a3214de77c67c109b81b36cacf13743 Mon Sep 17 00:00:00 2001
From: UCPr <2032385471@qq.com>
Date: Fri, 14 Mar 2025 18:20:37 +0800
Subject: [PATCH] =?UTF-8?q?Upd=EF=BC=9A=E9=9B=B6=E5=8F=B7=C2=B7=E5=AE=89?=
 =?UTF-8?q?=E6=AF=94=E8=AF=84=E5=88=86=E3=80=81=E8=AF=84=E5=88=86=E6=9D=83?=
 =?UTF-8?q?=E9=87=8DID=E8=BD=AC=E4=B8=AD=E6=96=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/convert/property.js       |  11 +
 lib/score.js                  |  17 +-
 resources/map/EquipScore.json | 754 +++++++++++++++++-----------------
 3 files changed, 412 insertions(+), 370 deletions(-)

diff --git a/lib/convert/property.js b/lib/convert/property.js
index 8d6c75f..fb4332d 100644
--- a/lib/convert/property.js
+++ b/lib/convert/property.js
@@ -65,3 +65,14 @@ export const idToName = _id => {
   if (!result) return null;
   return result[1];
 };
+
+/**
+ * 属性名转id
+ * @param {string} propName 属性名
+ */
+export const nameToId = (propName) => {
+  for (const id in propertyData) {
+    if (propertyData[id]?.[1] === propName) return Number(id);
+  }
+  return null;
+};
diff --git a/lib/score.js b/lib/score.js
index 365113e..4f97be3 100644
--- a/lib/score.js
+++ b/lib/score.js
@@ -1,7 +1,22 @@
 import { getMapData } from '../utils/file.js';
+import { charNameToID } from './convert/char.js';
+import { nameToId } from './convert/property.js';
 
-const scoreData = getMapData('EquipScore');
 const baseValueData = getMapData('EquipBaseValue');
+const equipScore = getMapData('EquipScore');
+const scoreData = {};
+for (const charName in equipScore) {
+  const charID = charNameToID(charName);
+  if (!charID)
+    continue;
+  scoreData[charID] = {};
+  for (const propName in equipScore[charName]) {
+    const propID = nameToId(propName);
+    if (!propID)
+      continue;
+    scoreData[charID][propID] = equipScore[charName][propName];
+  };
+};
 
 /**
  * 是否有分数数据
diff --git a/resources/map/EquipScore.json b/resources/map/EquipScore.json
index 6c41f16..2029808 100644
--- a/resources/map/EquipScore.json
+++ b/resources/map/EquipScore.json
@@ -1,397 +1,413 @@
 {
-  "1011": {
-    "11103": 0,
-    "11102": 0,
-    "12103": 1,
-    "12102": 1,
-    "13103": 0,
-    "13102": 0,
-    "20103": 0.75,
-    "21103": 0.75,
-    "23203": 0.75,
-    "31403": 0,
-    "23103": 1,
-    "12202": 1,
-    "31803": 1
+  "哲": {},
+  "铃": {},
+  "安比": {
+    "生命值百分比": 0,
+    "生命值": 0,
+    "攻击力百分比": 1,
+    "攻击力": 1,
+    "冲击力": 1,
+    "防御力百分比": 0,
+    "防御力": 0,
+    "暴击率": 0.75,
+    "暴击伤害": 0.75,
+    "穿透率": 1,
+    "穿透值": 0.75,
+    "异常掌控": 0,
+    "电属性伤害提高": 1
   },
-  "1021": {
-    "11103": 0,
-    "11102": 0,
-    "12103": 0.75,
-    "12102": 0.75,
-    "13103": 0,
-    "13102": 0,
-    "20103": 1,
-    "21103": 1,
-    "23203": 0.75,
-    "31403": 0,
-    "23103": 1,
-    "31503": 1
+  "猫又": {
+    "生命值百分比": 0,
+    "生命值": 0,
+    "攻击力百分比": 0.75,
+    "攻击力": 0.75,
+    "防御力百分比": 0,
+    "防御力": 0,
+    "暴击率": 1,
+    "暴击伤害": 1,
+    "穿透率": 1,
+    "穿透值": 0.75,
+    "异常掌控": 0,
+    "物理属性伤害提高": 1
   },
-  "1031": {
-    "11103": 0,
-    "11102": 0,
-    "12103": 0.75,
-    "12102": 0.75,
-    "13103": 0,
-    "13102": 0,
-    "20103": 0.75,
-    "21103": 0.75,
-    "23203": 0.75,
-    "31403": 0.75,
-    "30502": 1,
-    "23103": 1,
-    "31903": 1
+  "妮可": {
+    "生命值百分比": 0,
+    "生命值": 0,
+    "攻击力百分比": 0.75,
+    "攻击力": 0.75,
+    "防御力百分比": 0,
+    "防御力": 0,
+    "暴击率": 0.75,
+    "暴击伤害": 0.75,
+    "穿透率": 1,
+    "穿透值": 0.75,
+    "能量恢复": 1,
+    "异常掌控": 0.75,
+    "以太属性伤害提高": 1
   },
-  "1041": {
-    "11103": 0,
-    "11102": 0,
-    "12103": 0.75,
-    "12102": 0.75,
-    "13103": 0,
-    "13102": 0,
-    "20103": 1,
-    "21103": 1,
-    "23203": 0.75,
-    "31403": 0,
-    "23103": 1,
-    "31603": 1
+  "「11号」": {
+    "生命值百分比": 0,
+    "生命值": 0,
+    "攻击力百分比": 0.75,
+    "攻击力": 0.75,
+    "防御力百分比": 0,
+    "防御力": 0,
+    "暴击率": 1,
+    "暴击伤害": 1,
+    "穿透率": 1,
+    "穿透值": 0.75,
+    "异常掌控": 0,
+    "火属性伤害提高": 1
   },
-  "1061": {
-    "11103": 0,
-    "11102": 0,
-    "12103": 0.75,
-    "12102": 0.75,
-    "13103": 0,
-    "13102": 0,
-    "20103": 1,
-    "21103": 1,
-    "23203": 0.75,
-    "31403": 0,
-    "23103": 1,
-    "31503": 1
+  "可琳": {
+    "生命值百分比": 0,
+    "生命值": 0,
+    "攻击力百分比": 0.75,
+    "攻击力": 0.75,
+    "防御力百分比": 0,
+    "防御力": 0,
+    "暴击率": 1,
+    "暴击伤害": 1,
+    "穿透率": 1,
+    "穿透值": 0.75,
+    "异常掌控": 0,
+    "物理属性伤害提高": 1
   },
-  "1081": {
-    "11103": 0,
-    "11102": 0,
-    "12103": 0.75,
-    "12102": 0.75,
-    "13103": 0,
-    "13102": 0,
-    "20103": 1,
-    "21103": 1,
-    "23203": 0.75,
-    "31403": 0,
-    "23103": 1,
-    "31503": 1
+  "比利": {
+    "生命值百分比": 0,
+    "生命值": 0,
+    "攻击力百分比": 0.75,
+    "攻击力": 0.75,
+    "防御力百分比": 0,
+    "防御力": 0,
+    "暴击率": 1,
+    "暴击伤害": 1,
+    "穿透率": 1,
+    "穿透值": 0.75,
+    "异常掌控": 0,
+    "物理属性伤害提高": 1
   },
-  "1091": {
-    "11103": 0,
-    "11102": 0,
-    "12103": 1,
-    "12102": 1,
-    "13103": 0,
-    "13102": 0,
-    "20103": 1,
-    "21103": 1,
-    "23203": 0.75,
-    "23103": 1,
-    "31403": 0.5,
-    "31203": 1,
-    "31703": 1
+  "雅": {
+    "生命值百分比": 0,
+    "生命值": 0,
+    "攻击力百分比": 1,
+    "攻击力": 1,
+    "防御力百分比": 0,
+    "防御力": 0,
+    "暴击率": 1,
+    "暴击伤害": 1,
+    "穿透率": 1,
+    "穿透值": 0.75,
+    "异常精通": 1,
+    "异常掌控": 0.5,
+    "冰属性伤害提高": 1
   },
-  "1101": {
-    "11103": 0,
-    "11102": 0,
-    "12103": 1,
-    "12102": 1,
-    "13103": 0,
-    "13102": 0,
-    "20103": 0.75,
-    "21103": 0.75,
-    "23203": 0.75,
-    "31403": 0,
-    "23103": 1,
-    "12202": 1,
-    "31603": 1
+  "珂蕾妲": {
+    "生命值百分比": 0,
+    "生命值": 0,
+    "攻击力百分比": 1,
+    "攻击力": 1,
+    "冲击力": 1,
+    "防御力百分比": 0,
+    "防御力": 0,
+    "暴击率": 0.75,
+    "暴击伤害": 0.75,
+    "穿透率": 1,
+    "穿透值": 0.75,
+    "异常掌控": 0,
+    "火属性伤害提高": 1
   },
-  "1111": {
-    "11103": 0,
-    "11102": 0,
-    "12103": 0.75,
-    "12102": 0.75,
-    "13103": 0,
-    "13102": 0,
-    "20103": 1,
-    "21103": 1,
-    "23203": 0.75,
-    "31403": 0,
-    "23103": 1,
-    "31803": 1
+  "安东": {
+    "生命值百分比": 0,
+    "生命值": 0,
+    "攻击力百分比": 0.75,
+    "攻击力": 0.75,
+    "防御力百分比": 0,
+    "防御力": 0,
+    "暴击率": 1,
+    "暴击伤害": 1,
+    "穿透率": 1,
+    "穿透值": 0.75,
+    "异常掌控": 0,
+    "电属性伤害提高": 1
   },
-  "1121": {
-    "11103": 0,
-    "11102": 0,
-    "12103": 0,
-    "12102": 0,
-    "13103": 1,
-    "13102": 1,
-    "20103": 0.75,
-    "21103": 0.75,
-    "23203": 0.75,
-    "30502": 1,
-    "31603": 1
+  "本": {
+    "生命值百分比": 0,
+    "生命值": 0,
+    "攻击力百分比": 0,
+    "攻击力": 0,
+    "防御力百分比": 1,
+    "防御力": 1,
+    "暴击率": 0.75,
+    "暴击伤害": 0.75,
+    "穿透值": 0.75,
+    "能量恢复": 1,
+    "火属性伤害提高": 1
   },
-  "1131": {
-    "11103": 0,
-    "11102": 0,
-    "12103": 1,
-    "12102": 1,
-    "13103": 0,
-    "13102": 0,
-    "20103": 0.75,
-    "21103": 0.75,
-    "23203": 1,
-    "31403": 0,
-    "23103": 1,
-    "31703": 1
+  "苍角": {
+    "生命值百分比": 0,
+    "生命值": 0,
+    "攻击力百分比": 1,
+    "攻击力": 1,
+    "防御力百分比": 0,
+    "防御力": 0,
+    "暴击率": 0.75,
+    "暴击伤害": 0.75,
+    "穿透率": 1,
+    "穿透值": 1,
+    "异常掌控": 0,
+    "冰属性伤害提高": 1
   },
-  "1141": {
-    "11103": 0,
-    "11102": 0,
-    "12103": 1,
-    "12102": 1,
-    "13103": 0,
-    "13102": 0,
-    "20103": 0.75,
-    "21103": 0.75,
-    "23203": 0.75,
-    "31403": 0,
-    "23103": 1,
-    "12202": 1,
-    "31703": 1
+  "莱卡恩": {
+    "生命值百分比": 0,
+    "生命值": 0,
+    "攻击力百分比": 1,
+    "攻击力": 1,
+    "冲击力": 1,
+    "防御力百分比": 0,
+    "防御力": 0,
+    "暴击率": 0.75,
+    "暴击伤害": 0.75,
+    "穿透率": 1,
+    "穿透值": 0.75,
+    "异常掌控": 0,
+    "冰属性伤害提高": 1
   },
-  "1151": {
-    "11103": 0,
-    "11102": 0,
-    "12103": 1,
-    "12102": 1,
-    "13103": 0,
-    "13102": 0,
-    "20103": 0.75,
-    "21103": 0.75,
-    "23203": 0.5,
-    "31403": 0.5,
-    "30502": 1,
-    "23103": 1,
-    "31603": 1
+  "露西": {
+    "生命值百分比": 0,
+    "生命值": 0,
+    "攻击力百分比": 1,
+    "攻击力": 1,
+    "防御力百分比": 0,
+    "防御力": 0,
+    "暴击率": 0.75,
+    "暴击伤害": 0.75,
+    "穿透率": 1,
+    "穿透值": 0.5,
+    "能量恢复": 1,
+    "异常掌控": 0.5,
+    "火属性伤害提高": 1
   },
-  "1161": {
-    "11103": 0,
-    "11102": 0,
-    "12103": 1,
-    "12102": 1,
-    "13103": 0,
-    "13102": 0,
-    "20103": 0.75,
-    "21103": 0.75,
-    "23203": 0.75,
-    "31403": 0,
-    "23103": 1,
-    "12202": 1,
-    "31603": 1
+  "莱特": {
+    "生命值百分比": 0,
+    "生命值": 0,
+    "攻击力百分比": 1,
+    "攻击力": 1,
+    "冲击力": 1,
+    "防御力百分比": 0,
+    "防御力": 0,
+    "暴击率": 0.75,
+    "暴击伤害": 0.75,
+    "穿透率": 1,
+    "穿透值": 0.75,
+    "异常掌控": 0,
+    "火属性伤害提高": 1
   },
-  "1171": {
-    "11103": 0,
-    "11102": 0,
-    "12103": 1,
-    "12102": 1,
-    "13103": 0,
-    "13102": 0,
-    "20103": 0,
-    "21103": 0,
-    "23203": 0.75,
-    "31403": 1,
-    "23103": 1,
-    "31203": 1,
-    "31603": 1,
-    "30502": 1
+  "柏妮思": {
+    "生命值百分比": 0,
+    "生命值": 0,
+    "攻击力百分比": 1,
+    "攻击力": 1,
+    "防御力百分比": 0,
+    "防御力": 0,
+    "暴击率": 0,
+    "暴击伤害": 0,
+    "穿透率": 1,
+    "穿透值": 0.75,
+    "能量恢复": 1,
+    "异常精通": 1,
+    "异常掌控": 1,
+    "火属性伤害提高": 1
   },
-  "1181": {
-    "11103": 0,
-    "11102": 0,
-    "12103": 0.75,
-    "12102": 0.75,
-    "13103": 0,
-    "13102": 0,
-    "20103": 0.5,
-    "21103": 0.5,
-    "23203": 0.5,
-    "31203": 1,
-    "31403": 1,
-    "31803": 1
+  "格莉丝": {
+    "生命值百分比": 0,
+    "生命值": 0,
+    "攻击力百分比": 0.75,
+    "攻击力": 0.75,
+    "防御力百分比": 0,
+    "防御力": 0,
+    "暴击率": 0.5,
+    "暴击伤害": 0.5,
+    "穿透值": 0.5,
+    "异常精通": 1,
+    "异常掌控": 1,
+    "电属性伤害提高": 1
   },
-  "1191": {
-    "11103": 0,
-    "11102": 0,
-    "12103": 0.75,
-    "12102": 0.75,
-    "13103": 0,
-    "13102": 0,
-    "20103": 1,
-    "21103": 1,
-    "23203": 0.75,
-    "31403": 0,
-    "23103": 1,
-    "31703": 1
+  "艾莲": {
+    "生命值百分比": 0,
+    "生命值": 0,
+    "攻击力百分比": 0.75,
+    "攻击力": 0.75,
+    "防御力百分比": 0,
+    "防御力": 0,
+    "暴击率": 1,
+    "暴击伤害": 1,
+    "穿透率": 1,
+    "穿透值": 0.75,
+    "异常掌控": 0,
+    "冰属性伤害提高": 1
   },
-  "1201": {
-    "11103": 0,
-    "11102": 0,
-    "12103": 0.75,
-    "12102": 0.75,
-    "13103": 0,
-    "13102": 0,
-    "20103": 1,
-    "21103": 1,
-    "23203": 0.75,
-    "31403": 0,
-    "23103": 1,
-    "31803": 1
+  "悠真": {
+    "生命值百分比": 0,
+    "生命值": 0,
+    "攻击力百分比": 0.75,
+    "攻击力": 0.75,
+    "防御力百分比": 0,
+    "防御力": 0,
+    "暴击率": 1,
+    "暴击伤害": 1,
+    "穿透率": 1,
+    "穿透值": 0.75,
+    "异常掌控": 0,
+    "电属性伤害提高": 1
   },
-  "1211": {
-    "11103": 0,
-    "11102": 0,
-    "12103": 0.75,
-    "12102": 0.75,
-    "13103": 0,
-    "13102": 0,
-    "20103": 0.75,
-    "21103": 0.75,
-    "23203": 1,
-    "31403": 0.5,
-    "30502": 1,
-    "23103": 1,
-    "31803": 1
+  "丽娜": {
+    "生命值百分比": 0,
+    "生命值": 0,
+    "攻击力百分比": 0.75,
+    "攻击力": 0.75,
+    "防御力百分比": 0,
+    "防御力": 0,
+    "暴击率": 0.75,
+    "暴击伤害": 0.75,
+    "穿透率": 1,
+    "穿透值": 1,
+    "能量恢复": 1,
+    "异常掌控": 0.5,
+    "电属性伤害提高": 1
   },
-  "1221": {
-    "11103": 0,
-    "11102": 0,
-    "12103": 1,
-    "12102": 1,
-    "13103": 0,
-    "13102": 0,
-    "20103": 0,
-    "21103": 0,
-    "23203": 0.75,
-    "31403": 1,
-    "23103": 1,
-    "31203": 1,
-    "31803": 1,
-    "30502": 1
+  "柳": {
+    "生命值百分比": 0,
+    "生命值": 0,
+    "攻击力百分比": 1,
+    "攻击力": 1,
+    "防御力百分比": 0,
+    "防御力": 0,
+    "暴击率": 0,
+    "暴击伤害": 0,
+    "穿透率": 1,
+    "穿透值": 0.75,
+    "能量恢复": 1,
+    "异常精通": 1,
+    "异常掌控": 1,
+    "电属性伤害提高": 1
   },
-  "1241": {
-    "11103": 0,
-    "11102": 0,
-    "12103": 0.75,
-    "12102": 0.75,
-    "13103": 0,
-    "13102": 0,
-    "20103": 1,
-    "21103": 1,
-    "23203": 0.75,
-    "31403": 0,
-    "23103": 1,
-    "31903": 1
+  "朱鸢": {
+    "生命值百分比": 0,
+    "生命值": 0,
+    "攻击力百分比": 0.75,
+    "攻击力": 0.75,
+    "防御力百分比": 0,
+    "防御力": 0,
+    "暴击率": 1,
+    "暴击伤害": 1,
+    "穿透率": 1,
+    "穿透值": 0.75,
+    "异常掌控": 0,
+    "以太属性伤害提高": 1
   },
-  "1251": {
-    "11103": 0,
-    "11102": 0,
-    "12103": 1,
-    "12102": 1,
-    "13103": 0,
-    "13102": 0,
-    "20103": 0.75,
-    "21103": 0.75,
-    "23203": 0.75,
-    "31403": 0,
-    "23103": 1,
-    "12202": 1,
-    "31803": 1
+  "青衣": {
+    "生命值百分比": 0,
+    "生命值": 0,
+    "攻击力百分比": 1,
+    "攻击力": 1,
+    "冲击力": 1,
+    "防御力百分比": 0,
+    "防御力": 0,
+    "暴击率": 0.75,
+    "暴击伤害": 0.75,
+    "穿透率": 1,
+    "穿透值": 0.75,
+    "异常掌控": 0,
+    "电属性伤害提高": 1
   },
-  "1261": {
-    "11103": 0,
-    "11102": 0,
-    "12103": 0.75,
-    "12102": 0.75,
-    "13103": 0,
-    "13102": 0,
-    "20103": 0.5,
-    "21103": 0.5,
-    "23203": 0.5,
-    "31203": 1,
-    "31403": 1,
-    "31503": 1
+  "简": {
+    "生命值百分比": 0,
+    "生命值": 0,
+    "攻击力百分比": 0.75,
+    "攻击力": 0.75,
+    "防御力百分比": 0,
+    "防御力": 0,
+    "暴击率": 0.5,
+    "暴击伤害": 0.5,
+    "穿透值": 0.5,
+    "异常精通": 1,
+    "异常掌控": 1,
+    "物理属性伤害提高": 1
   },
-  "1271": {
-    "11103": 0,
-    "11102": 0,
-    "12103": 0,
-    "12102": 0,
-    "13103": 1,
-    "13102": 1,
-    "20103": 0.75,
-    "21103": 0.75,
-    "23203": 0.75,
-    "30502": 1,
-    "31803": 1
+  "赛斯": {
+    "生命值百分比": 0,
+    "生命值": 0,
+    "攻击力百分比": 0,
+    "攻击力": 0,
+    "防御力百分比": 1,
+    "防御力": 1,
+    "暴击率": 0.75,
+    "暴击伤害": 0.75,
+    "穿透值": 0.75,
+    "能量恢复": 1,
+    "电属性伤害提高": 1
   },
-  "1281": {
-    "11103": 0,
-    "11102": 0,
-    "12103": 0.75,
-    "12102": 0.75,
-    "13103": 0,
-    "13102": 0,
-    "20103": 0.5,
-    "21103": 0.5,
-    "23203": 0.5,
-    "31203": 1,
-    "31403": 1,
-    "31503": 1
+  "派派": {
+    "生命值百分比": 0,
+    "生命值": 0,
+    "攻击力百分比": 0.75,
+    "攻击力": 0.75,
+    "防御力百分比": 0,
+    "防御力": 0,
+    "暴击率": 0.5,
+    "暴击伤害": 0.5,
+    "穿透值": 0.5,
+    "异常精通": 1,
+    "异常掌控": 1,
+    "物理属性伤害提高": 1
   },
-  "1311": {
-    "11102": 0,
-    "11103": 0,
-    "12102": 1,
-    "12103": 1,
-    "13103": 0,
-    "13102": 0,
-    "20103": 0.75,
-    "21103": 0.75,
-    "23103": 0.5,
-    "23203": 0.5,
-    "30502": 1,
-    "31203": 0,
-    "31403": 0,
-    "31903": 0.5
+  "耀嘉音": {
+    "生命值百分比": 0,
+    "生命值": 0,
+    "攻击力百分比": 1,
+    "攻击力": 1,
+    "防御力百分比": 0,
+    "防御力": 0,
+    "暴击率": 0.75,
+    "暴击伤害": 0.75,
+    "穿透率": 1,
+    "穿透值": 0.5,
+    "能量恢复": 1,
+    "异常精通": 0,
+    "异常掌控": 0,
+    "以太属性伤害提高": 0.5
   },
-  "1321": {
-    "11102": 0,
-    "11103": 0,
-    "12102": 0.75,
-    "12103": 0.75,
-    "13103": 0,
-    "13102": 0,
-    "20103": 1,
-    "21103": 1,
-    "23103": 0.75,
-    "23203": 0.75,
-    "30502": 0,
-    "31203": 0,
-    "31403": 0,
-    "31603": 1
+  "伊芙琳": {
+    "生命值百分比": 0,
+    "生命值": 0,
+    "攻击力百分比": 0.75,
+    "攻击力": 0.75,
+    "防御力百分比": 0,
+    "防御力": 0,
+    "暴击率": 1,
+    "暴击伤害": 1,
+    "穿透率": 1,
+    "穿透值": 0.75,
+    "能量恢复": 0,
+    "异常精通": 0,
+    "异常掌控": 0,
+    "火属性伤害提高": 1
   },
-  "2011": {},
-  "2021": {}
-}
+  "零号·安比": {
+    "生命值百分比": 0,
+    "生命值": 0,
+    "攻击力百分比": 0.75,
+    "攻击力": 0.75,
+    "防御力百分比": 0,
+    "防御力": 0,
+    "暴击率": 1,
+    "暴击伤害": 1,
+    "穿透率": 1,
+    "穿透值": 0.75,
+    "能量恢复": 0,
+    "异常精通": 0,
+    "异常掌控": 0,
+    "电属性伤害提高": 1
+  }
+}
\ No newline at end of file