From 63fc4da9be3ed8d057e6e9763efa75f4486dc46d Mon Sep 17 00:00:00 2001 From: bietiaop <1527109126@qq.com> Date: Tue, 30 Jul 2024 15:36:57 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E6=9B=B4=E5=A4=9A?= =?UTF-8?q?=E8=AF=84=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 3 + lib/authkey.js | 3 +- resources/map/EquipScore.json | 253 ++++++++++++++++++++++++++++--- resources/map/Property2Name.json | 40 ++--- 4 files changed, 257 insertions(+), 42 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a5c1b9f..56ef091 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +# 1.3 +* 添加驱动盘评分 + # 1.2 * 添加伤害计算，支持目前为止所有 `驱动盘` 以及 `艾莲` 、 `朱鸢` 的伤害计算，`强攻武器` 支持 `B` 级以上。 * 修复攻略问题，若有对不上的问题，请“刷新攻略”。 diff --git a/lib/authkey.js b/lib/authkey.js index 8c4957d..f8f45e2 100644 --- a/lib/authkey.js +++ b/lib/authkey.js @@ -64,7 +64,7 @@ export const getAuthKey = async (e, _user, zzzUid, authAppid = 'csc') => { '获取cookie失败，请确认绑定了cookie或者查询的UID是否与cookie对应，请确认bot所使用的是绝区零UID' ); } - if (uidData.ltuid !== ck.stuid) { + if (String(uidData.ltuid) !== String(ck.stuid)) { throw new Error( `当前UID${zzzUid}查询所使用的米游社ID${ck.stuid}与当前切换的米游社ID${uidData.ltuid}不匹配，请切换UID后尝试` ); @@ -91,6 +91,7 @@ export const getAuthKey = async (e, _user, zzzUid, authAppid = 'csc') => { }); // 获取数据 res = await res.json(); + logger.debug(`[zzz:authkey]`, res); // 返回 authkey return res?.data?.authkey; }; diff --git a/resources/map/EquipScore.json b/resources/map/EquipScore.json index 8b35735..d1e9ea8 100644 --- a/resources/map/EquipScore.json +++ b/resources/map/EquipScore.json @@ -1,15 +1,147 @@ { - "1011": {}, - "1021": {}, - "1031": {}, - "1041": {}, - "1061": {}, - "1081": {}, + "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 + }, + "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 + }, + "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 + }, + "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 + }, + "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 + }, + "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 + }, "1091": {}, - "1101": {}, - "1111": {}, - "1121": {}, - "1131": {}, + "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 + }, + "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 + }, + "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 + }, + "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 + }, "1141": { "11103": 0, "11102": 0, @@ -20,7 +152,10 @@ "20103": 0.75, "21103": 0.75, "23203": 0.75, - "31403": 0 + "31403": 0, + "23103": 1, + "12202": 1, + "31703": 1 }, "1151": { "11103": 0, @@ -32,10 +167,26 @@ "20103": 0.75, "21103": 0.75, "23203": 0.5, - "31403": 0.5 + "31403": 0.5, + "30502": 1, + "23103": 1, + "31603": 1 }, "1161": {}, - "1181": {}, + "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 + }, "1191": { "11103": 0, "11102": 0, @@ -46,25 +197,83 @@ "20103": 1, "21103": 1, "23203": 0.75, - "31403": 0 + "31403": 0, + "23103": 1, + "31703": 1 }, "1201": {}, "1211": { "11103": 0, "11102": 0, - "12103": 0.5, - "12102": 0.5, + "12103": 0.75, + "12102": 0.75, "13103": 0, "13102": 0, "20103": 0.75, "21103": 0.75, "23203": 1, - "31403": 0.75 + "31403": 0.5, + "30502": 1, + "23103": 1, + "31803": 1 }, "1221": {}, - "1241": {}, - "1251": {}, - "1271": {}, + "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 + }, + "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 + }, + "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 + }, + "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 + }, "1281": { "11103": 0, "11102": 0, @@ -75,7 +284,9 @@ "20103": 0.5, "21103": 0.5, "23203": 0.5, - "31403": 1 + "31203": 1, + "31403": 1, + "31503": 1 }, "2011": {}, "2021": {} diff --git a/resources/map/Property2Name.json b/resources/map/Property2Name.json index 92a03f8..3314cc3 100644 --- a/resources/map/Property2Name.json +++ b/resources/map/Property2Name.json @@ -1,21 +1,21 @@ { - "12102":["AttackAddedRatio","攻击力百分比"], - "12103":["AttackDelta","攻击力"], - "11102":["HPAddedRatio","生命值百分比"], - "11103":["HPDelta","生命值"], - "13102":["DefenceAddedRatio","防御力百分比"], - "13103":["DefenceDelta","防御力"], - "20103":["CriticalChanceBase","暴击率"], - "21103":["CriticalDamageBase","暴击伤害"], - "12202":["ImpactRatio","冲击力"], - "31203":["ElementMystery","异常精通"], - "31403":["ElementAbnormalPower","异常精通"], - "23203":["PenDelta","穿透值"], - "30502":["SpGetRatio","能量恢复"], - "23103":["PenRatioBase","穿透率"], - "31703":["IceAddedRatio","冰属性伤害提高"], - "31603":["FireAddedRatio","火属性伤害提高"], - "31503":["PhysicalAddedRatio","物理属性伤害提高"], - "31803":["ElectricAddedRatio","电属性伤害提高"], - "31903":["EtherAddedRatio","以太属性伤害提高"] -} \ No newline at end of file + "12102": ["AttackAddedRatio", "攻击力百分比"], + "12103": ["AttackDelta", "攻击力"], + "11102": ["HPAddedRatio", "生命值百分比"], + "11103": ["HPDelta", "生命值"], + "13102": ["DefenceAddedRatio", "防御力百分比"], + "13103": ["DefenceDelta", "防御力"], + "20103": ["CriticalChanceBase", "暴击率"], + "21103": ["CriticalDamageBase", "暴击伤害"], + "12202": ["ImpactRatio", "冲击力"], + "31203": ["ElementMystery", "异常精通"], + "31403": ["ElementAbnormalPower", "异常掌控"], + "23203": ["PenDelta", "穿透值"], + "30502": ["SpGetRatio", "能量恢复"], + "23103": ["PenRatioBase", "穿透率"], + "31703": ["IceAddedRatio", "冰属性伤害提高"], + "31603": ["FireAddedRatio", "火属性伤害提高"], + "31503": ["PhysicalAddedRatio", "物理属性伤害提高"], + "31803": ["ElectricAddedRatio", "电属性伤害提高"], + "31903": ["EtherAddedRatio", "以太属性伤害提高"] +}