diff --git a/apps/profile/ProfileStat.js b/apps/profile/ProfileStat.js index 031e1b84..a47cac1c 100644 --- a/apps/profile/ProfileStat.js +++ b/apps/profile/ProfileStat.js @@ -34,7 +34,7 @@ const ProfileStat = { }) if (avatarRet.length === 0) { - e.reply(player.getErrMsg() || `查询失败,暂未获得#${uid}角色数据,请绑定CK或 #更新面板`) + e._isReplyed || e.reply(`查询失败,暂未获得#${uid}角色数据,请绑定CK或 #更新面板`) return true } diff --git a/components/Data.js b/components/Data.js index a4c70455..c963c08d 100644 --- a/components/Data.js +++ b/components/Data.js @@ -51,12 +51,26 @@ let Data = { /* * 写JSON * */ - writeJSON (file, data, space = '\t', root = '') { + writeJSON (cfg, data, space = '\t', root = '') { + if (arguments.length > 1) { + return Data.writeJSON({ + name: cfg, + data, + space, + root + }) + } // 检查并创建目录 - Data.createDir(file, root, true) - root = getRoot(root) + let name = cfg.path ? (cfg.path + '/' + cfg.name) : cfg.name + Data.createDir(name, cfg.root, true) + root = getRoot(cfg.root) + data = cfg.data delete data._res - return fs.writeFileSync(`${root}/${file}`, JSON.stringify(data, null, space)) + data = JSON.stringify(data, null, cfg.space || 2) + if (cfg.rn) { + data = data.replaceAll('\n', '\r\n') + } + return fs.writeFileSync(`${root}/${name}`, data) }, delFile (file, root = '') { root = getRoot(root) diff --git a/models/MysApi.js b/models/MysApi.js index 5d341790..2d8cd899 100644 --- a/models/MysApi.js +++ b/models/MysApi.js @@ -76,25 +76,6 @@ export default class MysApi { } } - static async checkRetCode (retcode) { - switch (retcode) { - case -1: - case -100: - case 1001: - case 10001: - case 10103: - return 'CK失效或报错' - case 1008: - return '请先去米游社绑定角色' - case 10101: - return '查询已达今日上限' - case 10102: - return '请先去米游社绑定角色或公开数据' - case 1034: - return '米游社查询遇到验证码,请稍后再试' - } - } - async getMysApi (e, targetType = 'all', option = {}) { if (this.mys) { return this.mys @@ -109,6 +90,7 @@ export default class MysApi { } let e = this.e let mys = await this.getMysApi(e, api, { log: false }) + let mysInfo = this.mysInfo || {} // 暂时先在plugin侧阻止错误,防止刷屏 e._original_reply = e._original_reply || e.reply e._reqCount = e._reqCount || 0 @@ -122,6 +104,7 @@ export default class MysApi { } e._reqCount++ let ret = await mys.getData(api, data) + ret = await mysInfo.checkCode(ret, api) e._reqCount-- if (e._reqCount === 0) { e.reply = e._original_reply diff --git a/models/Player.js b/models/Player.js index 224f43d8..8d54411b 100644 --- a/models/Player.js +++ b/models/Player.js @@ -325,8 +325,4 @@ export default class Player extends Base { } return avatarRet } - - getErrMsg () { - return MysAvatar.getErrMsg(this.e) - } } diff --git a/models/player/EnkaData.js b/models/player/EnkaData.js index f88c072c..46cbc086 100644 --- a/models/player/EnkaData.js +++ b/models/player/EnkaData.js @@ -43,16 +43,15 @@ let EnkaData = { getTalent (charid, ds = {}) { let char = Character.get(charid) - let { talentId = {}, talentElem = {}, talentKey = {} } = char.meta + let { talentId = {}, talentElem = {} } = char.meta let elem = '' let idx = 0 let ret = {} lodash.forEach(ds, (lv, id) => { let key if (talentId[id]) { - let tid = talentId[id] - key = talentKey[tid] - elem = elem || talentElem[tid] + let key = talentId[id] + elem = elem || talentElem[id] ret[key] = lv } else { key = ['a', 'e', 'q'][idx++] diff --git a/models/player/MiaoData.js b/models/player/MiaoData.js index a905f41f..57fa6c2a 100644 --- a/models/player/MiaoData.js +++ b/models/player/MiaoData.js @@ -45,16 +45,15 @@ let MiaoData = { getTalentNew (charid, data = {}) { let char = Character.get(charid) - let { talentId = {}, talentElem = {}, talentKey = {} } = char.meta + let { talentId = {}, talentElem = {} } = char.meta let elem = '' let idx = 0 let ret = {} lodash.forEach(data, (level, id) => { let key if (talentId[id]) { - let tid = talentId[id] - key = talentKey[tid] - elem = elem || talentElem[tid] + key = talentId[id] + elem = elem || talentElem[id] ret[key] = level } else { key = ['a', 'e', 'q'][idx] @@ -70,16 +69,15 @@ let MiaoData = { getTalent (charid, data = {}) { let char = Character.get(charid) - let { talentId = {}, talentElem = {}, talentKey = {} } = char.meta + let { talentId = {}, talentElem = {} } = char.meta let elem = '' let idx = 0 let ret = {} lodash.forEach(data, (ds) => { let key if (talentId[ds.id]) { - let tid = talentId[ds.id] - key = talentKey[tid] - elem = elem || talentElem[tid] + key = talentId[ds.id] + elem = elem || talentElem[ds.id] ret[key] = { level: ds.level } diff --git a/models/player/MysAvatar.js b/models/player/MysAvatar.js index b0b6622b..618629e5 100644 --- a/models/player/MysAvatar.js +++ b/models/player/MysAvatar.js @@ -4,28 +4,6 @@ import { chestInfo } from '../../resources/meta/info/index.js' import moment from 'moment' const MysAvatar = { - getErrMsg (e) { - if (!e._retcode) { - return false - } - switch (e._retcode * 1) { - case -1: - case -100: - case 1001: - case 10001: - case 10103: - return 'CK失效或报错' - case 1008: - return '请先去米游社绑定角色' - case 10101: - return '查询已达今日上限' - case 10102: - return '请先去米游社绑定角色或公开数据' - case 1034: - return '米游社查询遇到验证码,请稍后再试' - } - return false - }, needRefresh (time, force = 0, forceMap = {}) { if (!time || force === 2) { diff --git a/resources/meta/character/七七/data.json b/resources/meta/character/七七/data.json index 89bc2660..9d2123c2 100644 --- a/resources/meta/character/七七/data.json +++ b/resources/meta/character/七七/data.json @@ -23,15 +23,10 @@ "key": "heal", "value": 22.15 }, - "talentKey": { - "3531": "a", - "3532": "e", - "3539": "q" - }, "talentId": { - "10351": 3531, - "10352": 3532, - "10353": 3539 + "10351": "a", + "10352": "e", + "10353": "q" }, "talentCons": { "e": 5, diff --git a/resources/meta/character/丽莎/data.json b/resources/meta/character/丽莎/data.json index 6b4c7090..52923e98 100644 --- a/resources/meta/character/丽莎/data.json +++ b/resources/meta/character/丽莎/data.json @@ -25,15 +25,10 @@ "key": "mastery", "value": 96 }, - "talentKey": { - "431": "a", - "432": "e", - "439": "q" - }, "talentId": { - "10060": 431, - "10061": 432, - "10062": 439 + "10060": "a", + "10061": "e", + "10062": "q" }, "talentCons": { "e": 5, diff --git a/resources/meta/character/久岐忍/data.json b/resources/meta/character/久岐忍/data.json index 8186aeb8..a4786afe 100644 --- a/resources/meta/character/久岐忍/data.json +++ b/resources/meta/character/久岐忍/data.json @@ -23,15 +23,10 @@ "key": "hpPct", "value": 24 }, - "talentKey": { - "6531": "a", - "6532": "e", - "6539": "q" - }, "talentId": { - "10651": 6531, - "10652": 6532, - "10655": 6539 + "10651": "a", + "10652": "e", + "10655": "q" }, "talentCons": { "e": 3, diff --git a/resources/meta/character/九条裟罗/data.json b/resources/meta/character/九条裟罗/data.json index d39704e9..807c1aa5 100644 --- a/resources/meta/character/九条裟罗/data.json +++ b/resources/meta/character/九条裟罗/data.json @@ -23,15 +23,10 @@ "key": "atkPct", "value": 24 }, - "talentKey": { - "5631": "a", - "5632": "e", - "5639": "q" - }, "talentId": { - "10561": 5631, - "10562": 5632, - "10565": 5639 + "10561": "a", + "10562": "e", + "10565": "q" }, "talentCons": { "e": 5, diff --git a/resources/meta/character/云堇/data.json b/resources/meta/character/云堇/data.json index 0f9df444..62232b73 100644 --- a/resources/meta/character/云堇/data.json +++ b/resources/meta/character/云堇/data.json @@ -23,15 +23,10 @@ "key": "recharge", "value": 26.67 }, - "talentKey": { - "6431": "a", - "6432": "e", - "6439": "q" - }, "talentId": { - "10641": 6431, - "10642": 6432, - "10643": 6439 + "10641": "a", + "10642": "e", + "10643": "q" }, "talentCons": { "e": 5, diff --git a/resources/meta/character/五郎/data.json b/resources/meta/character/五郎/data.json index 2e779683..fcc4e071 100644 --- a/resources/meta/character/五郎/data.json +++ b/resources/meta/character/五郎/data.json @@ -23,15 +23,10 @@ "key": "dmg", "value": 24 }, - "talentKey": { - "5531": "a", - "5532": "e", - "5539": "q" - }, "talentId": { - "10551": 5531, - "10552": 5532, - "10555": 5539 + "10551": "a", + "10552": "e", + "10555": "q" }, "talentCons": { "e": 3, diff --git a/resources/meta/character/优菈/data.json b/resources/meta/character/优菈/data.json index f8b477fa..65f9241a 100644 --- a/resources/meta/character/优菈/data.json +++ b/resources/meta/character/优菈/data.json @@ -23,15 +23,10 @@ "key": "cdmg", "value": 38.4 }, - "talentKey": { - "5131": "a", - "5132": "e", - "5139": "q" - }, "talentId": { - "10511": 5131, - "10512": 5132, - "10515": 5139 + "10511": "a", + "10512": "e", + "10515": "q" }, "talentCons": { "e": 5, diff --git a/resources/meta/character/八重神子/data.json b/resources/meta/character/八重神子/data.json index 35b084d8..6daff4e4 100644 --- a/resources/meta/character/八重神子/data.json +++ b/resources/meta/character/八重神子/data.json @@ -23,15 +23,10 @@ "key": "cpct", "value": 19.2 }, - "talentKey": { - "5831": "a", - "5832": "e", - "5839": "q" - }, "talentId": { - "10581": 5831, - "10582": 5832, - "10585": 5839 + "10581": "a", + "10582": "e", + "10585": "q" }, "talentCons": { "e": 3, diff --git a/resources/meta/character/凝光/data.json b/resources/meta/character/凝光/data.json index 03f729ad..e455ac2e 100644 --- a/resources/meta/character/凝光/data.json +++ b/resources/meta/character/凝光/data.json @@ -25,15 +25,10 @@ "key": "dmg", "value": 24 }, - "talentKey": { - "2731": "a", - "2732": "e", - "2739": "q" - }, "talentId": { - "10271": 2731, - "10272": 2732, - "10274": 2739 + "10271": "a", + "10272": "e", + "10274": "q" }, "talentCons": { "e": 5, diff --git a/resources/meta/character/凯亚/data.json b/resources/meta/character/凯亚/data.json index 65e6782a..e18bedad 100644 --- a/resources/meta/character/凯亚/data.json +++ b/resources/meta/character/凯亚/data.json @@ -23,15 +23,10 @@ "key": "recharge", "value": 26.67 }, - "talentKey": { - "1531": "a", - "1532": "e", - "1539": "q" - }, "talentId": { - "10073": 1531, - "10074": 1532, - "10075": 1539 + "10073": "a", + "10074": "e", + "10075": "q" }, "talentCons": { "e": 3, diff --git a/resources/meta/character/刻晴/data.json b/resources/meta/character/刻晴/data.json index 2e594b61..57a1b11c 100644 --- a/resources/meta/character/刻晴/data.json +++ b/resources/meta/character/刻晴/data.json @@ -25,15 +25,10 @@ "key": "cdmg", "value": 38.4 }, - "talentKey": { - "4231": "a", - "4232": "e", - "4239": "q" - }, "talentId": { - "10421": 4231, - "10422": 4232, - "10425": 4239 + "10421": "a", + "10422": "e", + "10425": "q" }, "talentCons": { "e": 5, diff --git a/resources/meta/character/北斗/data.json b/resources/meta/character/北斗/data.json index 3e3954f7..8617c2c5 100644 --- a/resources/meta/character/北斗/data.json +++ b/resources/meta/character/北斗/data.json @@ -23,15 +23,10 @@ "key": "dmg", "value": 24 }, - "talentKey": { - "2431": "a", - "2432": "e", - "2439": "q" - }, "talentId": { - "10241": 2431, - "10242": 2432, - "10245": 2439 + "10241": "a", + "10242": "e", + "10245": "q" }, "talentCons": { "e": 3, diff --git a/resources/meta/character/可莉/data.json b/resources/meta/character/可莉/data.json index b64ee8bf..5ec60de1 100644 --- a/resources/meta/character/可莉/data.json +++ b/resources/meta/character/可莉/data.json @@ -23,15 +23,10 @@ "key": "dmg", "value": 28.8 }, - "talentKey": { - "2931": "a", - "2932": "e", - "2939": "q" - }, "talentId": { - "10291": 2931, - "10292": 2932, - "10295": 2939 + "10291": "a", + "10292": "e", + "10295": "q" }, "talentCons": { "e": 3, diff --git a/resources/meta/character/坎蒂丝/data.json b/resources/meta/character/坎蒂丝/data.json index b7281fbf..bc546060 100644 --- a/resources/meta/character/坎蒂丝/data.json +++ b/resources/meta/character/坎蒂丝/data.json @@ -23,15 +23,10 @@ "key": "hpPct", "value": 24 }, - "talentKey": { - "7231": "a", - "7232": "e", - "7239": "q" - }, "talentId": { - "10721": 7231, - "10722": 7232, - "10725": 7239 + "10721": "a", + "10722": "e", + "10725": "q" }, "talentCons": { "e": 5, diff --git a/resources/meta/character/埃洛伊/data.json b/resources/meta/character/埃洛伊/data.json index fd793232..3876cca0 100644 --- a/resources/meta/character/埃洛伊/data.json +++ b/resources/meta/character/埃洛伊/data.json @@ -23,15 +23,10 @@ "key": "dmg", "value": 28.8 }, - "talentKey": { - "6231": "a", - "6232": "e", - "6239": "q" - }, "talentId": { - "10621": 6231, - "10622": 6232, - "10625": 6239 + "10621": "a", + "10622": "e", + "10625": "q" }, "talentCons": { "e": 5, diff --git a/resources/meta/character/埃洛伊/imgs/face-q.webp b/resources/meta/character/埃洛伊/imgs/face-q.webp new file mode 100644 index 00000000..e69a2119 Binary files /dev/null and b/resources/meta/character/埃洛伊/imgs/face-q.webp differ diff --git a/resources/meta/character/多莉/data.json b/resources/meta/character/多莉/data.json index 26cf3312..a8a692b1 100644 --- a/resources/meta/character/多莉/data.json +++ b/resources/meta/character/多莉/data.json @@ -23,15 +23,10 @@ "key": "hpPct", "value": 24 }, - "talentKey": { - "6831": "a", - "6832": "e", - "6839": "q" - }, "talentId": { - "10681": 6831, - "10682": 6832, - "10685": 6839 + "10681": "a", + "10682": "e", + "10685": "q" }, "talentCons": { "e": 5, diff --git a/resources/meta/character/夜兰/data.json b/resources/meta/character/夜兰/data.json index 63e0a762..d0021efc 100644 --- a/resources/meta/character/夜兰/data.json +++ b/resources/meta/character/夜兰/data.json @@ -23,15 +23,10 @@ "key": "cpct", "value": 19.2 }, - "talentKey": { - "6031": "a", - "6032": "e", - "6039": "q" - }, "talentId": { - "10606": 6031, - "10607": 6032, - "10610": 6039 + "10606": "a", + "10607": "e", + "10610": "q" }, "talentCons": { "e": 5, diff --git a/resources/meta/character/夜兰/detail.json b/resources/meta/character/夜兰/detail.json index 6eba6206..c7595a85 100644 --- a/resources/meta/character/夜兰/detail.json +++ b/resources/meta/character/夜兰/detail.json @@ -803,6 +803,68 @@ 31.049999999999997, 32.88, 34.71 + ], + "玄掷玲珑伤害2": [ + [ + 4.87, + 3 + ], + [ + 5.24, + 3 + ], + [ + 5.6, + 3 + ], + [ + 6.09, + 3 + ], + [ + 6.46, + 3 + ], + [ + 6.82, + 3 + ], + [ + 7.31, + 3 + ], + [ + 7.8, + 3 + ], + [ + 8.28, + 3 + ], + [ + 8.77, + 3 + ], + [ + 9.26, + 3 + ], + [ + 9.74, + 3 + ], + [ + 10.35, + 3 + ], + [ + 10.96, + 3 + ], + [ + 11.57, + 3 + ] ] } }, diff --git a/resources/meta/character/妮露/data.json b/resources/meta/character/妮露/data.json index 79d4f60f..bc78cafa 100644 --- a/resources/meta/character/妮露/data.json +++ b/resources/meta/character/妮露/data.json @@ -23,15 +23,10 @@ "key": "hpPct", "value": 28.8 }, - "talentKey": { - "7031": "a", - "7032": "e", - "7039": "q" - }, "talentId": { - "10701": 7031, - "10702": 7032, - "10705": 7039 + "10701": "a", + "10702": "e", + "10705": "q" }, "talentCons": { "e": 5, @@ -45,5 +40,5 @@ "talent": "「笃行」的哲学", "weekly": "祸神之禊泪" }, - "eta": 1665741600000 + "eta": 1665712800000 } \ No newline at end of file diff --git a/resources/meta/character/安柏/data.json b/resources/meta/character/安柏/data.json index b13a0ad5..cc81a4e6 100644 --- a/resources/meta/character/安柏/data.json +++ b/resources/meta/character/安柏/data.json @@ -23,15 +23,10 @@ "key": "atkPct", "value": 24 }, - "talentKey": { - "2131": "a", - "2132": "e", - "2139": "q" - }, "talentId": { - "10017": 2139, - "10032": 2132, - "10041": 2131 + "10017": "q", + "10032": "e", + "10041": "a" }, "talentCons": { "e": 5, diff --git a/resources/meta/character/宵宫/data.json b/resources/meta/character/宵宫/data.json index d16e281f..3b3837cd 100644 --- a/resources/meta/character/宵宫/data.json +++ b/resources/meta/character/宵宫/data.json @@ -23,15 +23,10 @@ "key": "cpct", "value": 19.2 }, - "talentKey": { - "4931": "a", - "4932": "e", - "4939": "q" - }, "talentId": { - "10491": 4931, - "10492": 4932, - "10495": 4939 + "10491": "a", + "10492": "e", + "10495": "q" }, "talentCons": { "e": 3, diff --git a/resources/meta/character/宵宫/detail.json b/resources/meta/character/宵宫/detail.json index bb76e64c..0eed5c1d 100644 --- a/resources/meta/character/宵宫/detail.json +++ b/resources/meta/character/宵宫/detail.json @@ -462,6 +462,68 @@ 156.34, 163.62 ], + "一段伤害2": [ + [ + 35.64, + 2 + ], + [ + 38.07, + 2 + ], + [ + 40.5, + 2 + ], + [ + 43.74, + 2 + ], + [ + 46.17, + 2 + ], + [ + 49, + 2 + ], + [ + 52.65, + 2 + ], + [ + 56.3, + 2 + ], + [ + 59.94, + 2 + ], + [ + 63.59, + 2 + ], + [ + 67.23, + 2 + ], + [ + 70.88, + 2 + ], + [ + 74.52, + 2 + ], + [ + 78.17, + 2 + ], + [ + 81.81, + 2 + ] + ], "二段伤害": [ 68.38, 73.04, @@ -513,6 +575,68 @@ 203.62, 213.1 ], + "四段伤害2": [ + [ + 46.42, + 2 + ], + [ + 49.58, + 2 + ], + [ + 52.75, + 2 + ], + [ + 56.97, + 2 + ], + [ + 60.14, + 2 + ], + [ + 63.83, + 2 + ], + [ + 68.58, + 2 + ], + [ + 73.32, + 2 + ], + [ + 78.07, + 2 + ], + [ + 82.82, + 2 + ], + [ + 87.56, + 2 + ], + [ + 92.31, + 2 + ], + [ + 97.06, + 2 + ], + [ + 101.81, + 2 + ], + [ + 106.55, + 2 + ] + ], "五段伤害": [ 105.86, 113.08, diff --git a/resources/meta/character/托马/data.json b/resources/meta/character/托马/data.json index a6bc3e94..3af56d74 100644 --- a/resources/meta/character/托马/data.json +++ b/resources/meta/character/托马/data.json @@ -23,15 +23,10 @@ "key": "atkPct", "value": 24 }, - "talentKey": { - "5031": "a", - "5032": "e", - "5039": "q" - }, "talentId": { - "10501": 5031, - "10502": 5032, - "10505": 5039 + "10501": "a", + "10502": "e", + "10505": "q" }, "talentCons": { "e": 3, diff --git a/resources/meta/character/托马/detail.json b/resources/meta/character/托马/detail.json index ed156e1b..26ad51f3 100644 --- a/resources/meta/character/托马/detail.json +++ b/resources/meta/character/托马/detail.json @@ -543,6 +543,68 @@ 135.82, 143.28 ], + "三段伤害2": [ + [ + 26.79, + 2 + ], + [ + 28.97, + 2 + ], + [ + 31.15, + 2 + ], + [ + 34.26, + 2 + ], + [ + 36.45, + 2 + ], + [ + 38.94, + 2 + ], + [ + 42.36, + 2 + ], + [ + 45.79, + 2 + ], + [ + 49.22, + 2 + ], + [ + 52.96, + 2 + ], + [ + 56.69, + 2 + ], + [ + 60.43, + 2 + ], + [ + 64.17, + 2 + ], + [ + 67.91, + 2 + ], + [ + 71.64, + 2 + ] + ], "四段伤害": [ 67.36, 72.84, diff --git a/resources/meta/character/提纳里/data.json b/resources/meta/character/提纳里/data.json index 559072e2..2bc86132 100644 --- a/resources/meta/character/提纳里/data.json +++ b/resources/meta/character/提纳里/data.json @@ -23,15 +23,10 @@ "key": "dmg", "value": 28.8 }, - "talentKey": { - "6931": "a", - "6932": "e", - "6939": "q" - }, "talentId": { - "10691": 6931, - "10692": 6932, - "10695": 6939 + "10691": "a", + "10692": "e", + "10695": "q" }, "talentCons": { "e": 5, diff --git a/resources/meta/character/提纳里/detail.json b/resources/meta/character/提纳里/detail.json index ac18d320..8556006e 100644 --- a/resources/meta/character/提纳里/detail.json +++ b/resources/meta/character/提纳里/detail.json @@ -491,6 +491,68 @@ 134.08, 141.44 ], + "三段伤害2": [ + [ + 26.45, + 2 + ], + [ + 28.6, + 2 + ], + [ + 30.75, + 2 + ], + [ + 33.83, + 2 + ], + [ + 35.98, + 2 + ], + [ + 38.44, + 2 + ], + [ + 41.82, + 2 + ], + [ + 45.2, + 2 + ], + [ + 48.59, + 2 + ], + [ + 52.28, + 2 + ], + [ + 55.97, + 2 + ], + [ + 59.65, + 2 + ], + [ + 63.34, + 2 + ], + [ + 67.04, + 2 + ], + [ + 70.72, + 2 + ] + ], "四段伤害": [ 68.63, 74.21, diff --git a/resources/meta/character/旅行者/data.json b/resources/meta/character/旅行者/data.json index 45a7bbd4..af3dcb3a 100644 --- a/resources/meta/character/旅行者/data.json +++ b/resources/meta/character/旅行者/data.json @@ -23,42 +23,29 @@ "key": "atkPct", "value": 24 }, - "talentKey": { - "731": "a", - "732": "e", - "739": "q", - "932": "e", - "939": "q", - "1031": "a", - "1032": "e", - "1039": "q", - "1131": "a", - "1132": "e", - "1139": "q" - }, "talentId": { - "10067": 732, - "10068": 739, - "10077": 932, - "10078": 939, - "10117": 1132, - "10118": 1139, - "10602": 1032, - "10605": 1039, - "100553": 731, - "100555": 731, - "100556": 1031, - "100557": 1131 + "10067": "e", + "10068": "q", + "10077": "e", + "10078": "q", + "10117": "e", + "10118": "q", + "10602": "e", + "10605": "q", + "100553": "a", + "100555": "a", + "100556": "a", + "100557": "a" }, "talentElem": { - "732": "anemo", - "739": "anemo", - "932": "geo", - "939": "geo", - "1032": "electro", - "1039": "electro", - "1132": "dendro", - "1139": "dendro" + "10067": "anemo", + "10068": "anemo", + "10077": "geo", + "10078": "geo", + "10117": "dendro", + "10118": "dendro", + "10602": "electro", + "10605": "electro" }, "talentCons": { "e": 5, diff --git a/resources/meta/character/早柚/data.json b/resources/meta/character/早柚/data.json index 6eb2a4cf..e9c9f9c8 100644 --- a/resources/meta/character/早柚/data.json +++ b/resources/meta/character/早柚/data.json @@ -23,15 +23,10 @@ "key": "mastery", "value": 96 }, - "talentKey": { - "5331": "a", - "5332": "e", - "5339": "q" - }, "talentId": { - "10531": 5331, - "10532": 5332, - "10535": 5339 + "10531": "a", + "10532": "e", + "10535": "q" }, "talentCons": { "e": 5, diff --git a/resources/meta/character/枫原万叶/data.json b/resources/meta/character/枫原万叶/data.json index e1dba681..6c7c354f 100644 --- a/resources/meta/character/枫原万叶/data.json +++ b/resources/meta/character/枫原万叶/data.json @@ -23,15 +23,10 @@ "key": "mastery", "value": 115.19999694824 }, - "talentKey": { - "4731": "a", - "4732": "e", - "4739": "q" - }, "talentId": { - "10471": 4731, - "10472": 4732, - "10475": 4739 + "10471": "a", + "10472": "e", + "10475": "q" }, "talentCons": { "e": 3, diff --git a/resources/meta/character/枫原万叶/detail.json b/resources/meta/character/枫原万叶/detail.json index 65dae4b6..ce7f7472 100644 --- a/resources/meta/character/枫原万叶/detail.json +++ b/resources/meta/character/枫原万叶/detail.json @@ -618,6 +618,68 @@ 205.56, 221.16 ], + "五段伤害2": [ + [ + 25.37, + 3 + ], + [ + 27.43, + 3 + ], + [ + 29.5, + 3 + ], + [ + 32.45, + 3 + ], + [ + 34.51, + 3 + ], + [ + 36.88, + 3 + ], + [ + 40.12, + 3 + ], + [ + 43.36, + 3 + ], + [ + 46.61, + 3 + ], + [ + 50.15, + 3 + ], + [ + 54.21, + 3 + ], + [ + 58.98, + 3 + ], + [ + 63.75, + 3 + ], + [ + 68.52, + 3 + ], + [ + 73.72, + 3 + ] + ], "重击伤害": [ 117.65, 127.22, diff --git a/resources/meta/character/柯莱/data.json b/resources/meta/character/柯莱/data.json index 19aa3889..22c90e80 100644 --- a/resources/meta/character/柯莱/data.json +++ b/resources/meta/character/柯莱/data.json @@ -23,15 +23,10 @@ "key": "atkPct", "value": 24 }, - "talentKey": { - "6731": "a", - "6732": "e", - "6739": "q" - }, "talentId": { - "10671": 6731, - "10672": 6732, - "10675": 6739 + "10671": "a", + "10672": "e", + "10675": "q" }, "talentCons": { "e": 3, diff --git a/resources/meta/character/流浪者/data.json b/resources/meta/character/流浪者/data.json index e16a2639..b27e3fb7 100644 --- a/resources/meta/character/流浪者/data.json +++ b/resources/meta/character/流浪者/data.json @@ -23,15 +23,10 @@ "key": "cpct", "value": 19.2 }, - "talentKey": { - "7531": "a", - "7532": "e", - "7539": "q" - }, "talentId": { - "10751": 7531, - "10752": 7532, - "10755": 7539 + "10751": "a", + "10752": "e", + "10755": "q" }, "talentCons": { "e": 5, diff --git a/resources/meta/character/温迪/data.json b/resources/meta/character/温迪/data.json index 240cd330..d5b5b2ee 100644 --- a/resources/meta/character/温迪/data.json +++ b/resources/meta/character/温迪/data.json @@ -23,15 +23,10 @@ "key": "recharge", "value": 32 }, - "talentKey": { - "2231": "a", - "2232": "e", - "2239": "q" - }, "talentId": { - "10221": 2231, - "10224": 2232, - "10225": 2239 + "10221": "a", + "10224": "e", + "10225": "q" }, "talentCons": { "e": 5, diff --git a/resources/meta/character/烟绯/data.json b/resources/meta/character/烟绯/data.json index a7eec3b1..94e76909 100644 --- a/resources/meta/character/烟绯/data.json +++ b/resources/meta/character/烟绯/data.json @@ -23,15 +23,10 @@ "key": "dmg", "value": 24 }, - "talentKey": { - "4831": "a", - "4832": "e", - "4839": "q" - }, "talentId": { - "10481": 4831, - "10482": 4832, - "10485": 4839 + "10481": "a", + "10482": "e", + "10485": "q" }, "talentCons": { "e": 3, diff --git a/resources/meta/character/珊瑚宫心海/data.json b/resources/meta/character/珊瑚宫心海/data.json index e7ea1e8f..23e7d16f 100644 --- a/resources/meta/character/珊瑚宫心海/data.json +++ b/resources/meta/character/珊瑚宫心海/data.json @@ -23,15 +23,10 @@ "key": "dmg", "value": 28.8 }, - "talentKey": { - "5431": "a", - "5432": "e", - "5439": "q" - }, "talentId": { - "10541": 5431, - "10542": 5432, - "10545": 5439 + "10541": "a", + "10542": "e", + "10545": "q" }, "talentCons": { "e": 5, diff --git a/resources/meta/character/珐露珊/data.json b/resources/meta/character/珐露珊/data.json index 9cdb94ab..4195b3aa 100644 --- a/resources/meta/character/珐露珊/data.json +++ b/resources/meta/character/珐露珊/data.json @@ -23,15 +23,10 @@ "key": "atkPct", "value": 24 }, - "talentKey": { - "7631": "a", - "7632": "e", - "7639": "q" - }, "talentId": { - "10761": 7631, - "10762": 7632, - "10765": 7639 + "10761": "a", + "10762": "e", + "10765": "q" }, "talentCons": { "e": 3, diff --git a/resources/meta/character/班尼特/data.json b/resources/meta/character/班尼特/data.json index 23e66b22..1434275b 100644 --- a/resources/meta/character/班尼特/data.json +++ b/resources/meta/character/班尼特/data.json @@ -23,15 +23,10 @@ "key": "recharge", "value": 26.67 }, - "talentKey": { - "3231": "a", - "3232": "e", - "3239": "q" - }, "talentId": { - "10321": 3231, - "10322": 3232, - "10323": 3239 + "10321": "a", + "10322": "e", + "10323": "q" }, "talentCons": { "e": 3, diff --git a/resources/meta/character/琴/data.json b/resources/meta/character/琴/data.json index 002f0caf..6858be64 100644 --- a/resources/meta/character/琴/data.json +++ b/resources/meta/character/琴/data.json @@ -25,15 +25,10 @@ "key": "heal", "value": 22.15 }, - "talentKey": { - "331": "a", - "332": "e", - "339": "q" - }, "talentId": { - "10031": 331, - "10033": 332, - "10034": 339 + "10031": "a", + "10033": "e", + "10034": "q" }, "talentCons": { "e": 5, diff --git a/resources/meta/character/瑶瑶/data.json b/resources/meta/character/瑶瑶/data.json index 2a9974cb..f74213c4 100644 --- a/resources/meta/character/瑶瑶/data.json +++ b/resources/meta/character/瑶瑶/data.json @@ -23,15 +23,10 @@ "key": "hpPct", "value": 24 }, - "talentKey": { - "7731": "a", - "7732": "e", - "7739": "q" - }, "talentId": { - "10771": 7731, - "10772": 7732, - "10775": 7739 + "10771": "a", + "10772": "e", + "10775": "q" }, "talentCons": { "e": 3, diff --git a/resources/meta/character/甘雨/data.json b/resources/meta/character/甘雨/data.json index 54926e46..bb7973f7 100644 --- a/resources/meta/character/甘雨/data.json +++ b/resources/meta/character/甘雨/data.json @@ -23,15 +23,10 @@ "key": "cdmg", "value": 38.4 }, - "talentKey": { - "3731": "a", - "3732": "e", - "3739": "q" - }, "talentId": { - "10371": 3731, - "10372": 3732, - "10373": 3739 + "10371": "a", + "10372": "e", + "10373": "q" }, "talentCons": { "e": 5, diff --git a/resources/meta/character/申鹤/data.json b/resources/meta/character/申鹤/data.json index 74c2be71..6be55bd3 100644 --- a/resources/meta/character/申鹤/data.json +++ b/resources/meta/character/申鹤/data.json @@ -23,15 +23,10 @@ "key": "atkPct", "value": 28.8 }, - "talentKey": { - "6331": "a", - "6332": "e", - "6339": "q" - }, "talentId": { - "10631": 6331, - "10632": 6332, - "10635": 6339 + "10631": "a", + "10632": "e", + "10635": "q" }, "talentCons": { "e": 3, diff --git a/resources/meta/character/砂糖/data.json b/resources/meta/character/砂糖/data.json index f267402c..4718f667 100644 --- a/resources/meta/character/砂糖/data.json +++ b/resources/meta/character/砂糖/data.json @@ -23,15 +23,10 @@ "key": "dmg", "value": 24 }, - "talentKey": { - "4331": "a", - "4332": "e", - "4339": "q" - }, "talentId": { - "10431": 4331, - "10432": 4332, - "10435": 4339 + "10431": "a", + "10432": "e", + "10435": "q" }, "talentCons": { "e": 3, diff --git a/resources/meta/character/神里绫人/data.json b/resources/meta/character/神里绫人/data.json index 7016e66f..2375ad3e 100644 --- a/resources/meta/character/神里绫人/data.json +++ b/resources/meta/character/神里绫人/data.json @@ -23,15 +23,10 @@ "key": "cdmg", "value": 38.4 }, - "talentKey": { - "6631": "a", - "6632": "e", - "6639": "q" - }, "talentId": { - "10661": 6631, - "10662": 6632, - "10665": 6639 + "10661": "a", + "10662": "e", + "10665": "q" }, "talentCons": { "e": 3, diff --git a/resources/meta/character/神里绫人/detail.json b/resources/meta/character/神里绫人/detail.json index e29fa525..cbc64efa 100644 --- a/resources/meta/character/神里绫人/detail.json +++ b/resources/meta/character/神里绫人/detail.json @@ -645,6 +645,68 @@ 149.3, 157.52 ], + "四段伤害2": [ + [ + 29.45, + 2 + ], + [ + 31.85, + 2 + ], + [ + 34.24, + 2 + ], + [ + 37.67, + 2 + ], + [ + 40.06, + 2 + ], + [ + 42.8, + 2 + ], + [ + 46.57, + 2 + ], + [ + 50.34, + 2 + ], + [ + 54.1, + 2 + ], + [ + 58.21, + 2 + ], + [ + 62.32, + 2 + ], + [ + 66.43, + 2 + ], + [ + 70.54, + 2 + ], + [ + 74.65, + 2 + ], + [ + 78.76, + 2 + ] + ], "五段伤害": [ 75.6, 81.76, diff --git a/resources/meta/character/神里绫华/data.json b/resources/meta/character/神里绫华/data.json index 0893bc9f..4133f2c6 100644 --- a/resources/meta/character/神里绫华/data.json +++ b/resources/meta/character/神里绫华/data.json @@ -25,15 +25,10 @@ "key": "cdmg", "value": 38.4 }, - "talentKey": { - "231": "a", - "232": "e", - "239": "q" - }, "talentId": { - "10018": 232, - "10019": 239, - "10024": 231 + "10018": "e", + "10019": "q", + "10024": "a" }, "talentCons": { "e": 5, diff --git a/resources/meta/character/空/data.json b/resources/meta/character/空/data.json index b0efaef7..8e9a0c1a 100644 --- a/resources/meta/character/空/data.json +++ b/resources/meta/character/空/data.json @@ -23,42 +23,29 @@ "key": "atkPct", "value": 24 }, - "talentKey": { - "730": "a", - "732": "e", - "739": "q", - "932": "e", - "939": "q", - "1030": "a", - "1032": "e", - "1039": "q", - "1130": "a", - "1132": "e", - "1139": "q" - }, "talentId": { - "10067": 732, - "10068": 739, - "10077": 932, - "10078": 939, - "10117": 1132, - "10118": 1139, - "10602": 1032, - "10605": 1039, - "100543": 730, - "100545": 730, - "100546": 1030, - "100547": 1130 + "10067": "e", + "10068": "q", + "10077": "e", + "10078": "q", + "10117": "e", + "10118": "q", + "10602": "e", + "10605": "q", + "100543": "a", + "100545": "a", + "100546": "a", + "100547": "a" }, "talentElem": { - "732": "anemo", - "739": "anemo", - "932": "geo", - "939": "geo", - "1032": "electro", - "1039": "electro", - "1132": "dendro", - "1139": "dendro" + "10067": "anemo", + "10068": "anemo", + "10077": "geo", + "10078": "geo", + "10117": "dendro", + "10118": "dendro", + "10602": "electro", + "10605": "electro" }, "talentCons": { "e": 5, diff --git a/resources/meta/character/米卡/data.json b/resources/meta/character/米卡/data.json index c22c1b69..c8345d98 100644 --- a/resources/meta/character/米卡/data.json +++ b/resources/meta/character/米卡/data.json @@ -23,11 +23,6 @@ "key": "hpPct", "value": 24 }, - "talentKey": { - "8031": "a", - "8032": "e", - "8039": "q" - }, "talentId": {}, "talentCons": { "e": 5, diff --git a/resources/meta/character/纳西妲/data.json b/resources/meta/character/纳西妲/data.json index d30f087b..b9e8806b 100644 --- a/resources/meta/character/纳西妲/data.json +++ b/resources/meta/character/纳西妲/data.json @@ -23,15 +23,10 @@ "key": "mastery", "value": 115.19999694824 }, - "talentKey": { - "7331": "a", - "7332": "e", - "7339": "q" - }, "talentId": { - "10731": 7331, - "10732": 7332, - "10735": 7339 + "10731": "a", + "10732": "e", + "10735": "q" }, "talentCons": { "e": 3, diff --git a/resources/meta/character/罗莎莉亚/data.json b/resources/meta/character/罗莎莉亚/data.json index b34a7690..196be556 100644 --- a/resources/meta/character/罗莎莉亚/data.json +++ b/resources/meta/character/罗莎莉亚/data.json @@ -23,15 +23,10 @@ "key": "atkPct", "value": 24 }, - "talentKey": { - "4531": "a", - "4532": "e", - "4539": "q" - }, "talentId": { - "10451": 4531, - "10452": 4532, - "10453": 4539 + "10451": "a", + "10452": "e", + "10453": "q" }, "talentCons": { "e": 3, diff --git a/resources/meta/character/罗莎莉亚/detail.json b/resources/meta/character/罗莎莉亚/detail.json index f14e92f0..008bd244 100644 --- a/resources/meta/character/罗莎莉亚/detail.json +++ b/resources/meta/character/罗莎莉亚/detail.json @@ -466,6 +466,68 @@ 161.32, 170.2 ], + "三段伤害2": [ + [ + 31.82, + 2 + ], + [ + 34.41, + 2 + ], + [ + 37, + 2 + ], + [ + 40.7, + 2 + ], + [ + 43.29, + 2 + ], + [ + 46.25, + 2 + ], + [ + 50.32, + 2 + ], + [ + 54.39, + 2 + ], + [ + 58.46, + 2 + ], + [ + 62.9, + 2 + ], + [ + 67.34, + 2 + ], + [ + 71.78, + 2 + ], + [ + 76.22, + 2 + ], + [ + 80.66, + 2 + ], + [ + 85.1, + 2 + ] + ], "四段伤害": [ 69.66, 75.33, diff --git a/resources/meta/character/胡桃/data.json b/resources/meta/character/胡桃/data.json index e2848315..4e80a11e 100644 --- a/resources/meta/character/胡桃/data.json +++ b/resources/meta/character/胡桃/data.json @@ -23,15 +23,10 @@ "key": "cdmg", "value": 38.4 }, - "talentKey": { - "4631": "a", - "4632": "e", - "4639": "q" - }, "talentId": { - "10461": 4631, - "10462": 4632, - "10463": 4639 + "10461": "a", + "10462": "e", + "10463": "q" }, "talentCons": { "e": 3, diff --git a/resources/meta/character/艾尔海森/data.json b/resources/meta/character/艾尔海森/data.json index d2548350..7a25b2ee 100644 --- a/resources/meta/character/艾尔海森/data.json +++ b/resources/meta/character/艾尔海森/data.json @@ -23,15 +23,10 @@ "key": "dmg", "value": 28.8 }, - "talentKey": { - "7831": "a", - "7832": "e", - "7839": "q" - }, "talentId": { - "10781": 7831, - "10782": 7832, - "10785": 7839 + "10781": "a", + "10782": "e", + "10785": "q" }, "talentCons": { "e": 3, diff --git a/resources/meta/character/芭芭拉/data.json b/resources/meta/character/芭芭拉/data.json index c9ff523a..9600e4e4 100644 --- a/resources/meta/character/芭芭拉/data.json +++ b/resources/meta/character/芭芭拉/data.json @@ -25,15 +25,10 @@ "key": "hpPct", "value": 24 }, - "talentKey": { - "1431": "a", - "1432": "e", - "1439": "q" - }, "talentId": { - "10070": 1431, - "10071": 1432, - "10072": 1439 + "10070": "a", + "10071": "e", + "10072": "q" }, "talentCons": { "e": 5, diff --git a/resources/meta/character/荒泷一斗/data.json b/resources/meta/character/荒泷一斗/data.json index a70d7240..603ba9f5 100644 --- a/resources/meta/character/荒泷一斗/data.json +++ b/resources/meta/character/荒泷一斗/data.json @@ -23,15 +23,10 @@ "key": "cpct", "value": 19.2 }, - "talentKey": { - "5731": "a", - "5732": "e", - "5739": "q" - }, "talentId": { - "10571": 5731, - "10572": 5732, - "10575": 5739 + "10571": "a", + "10572": "e", + "10575": "q" }, "talentCons": { "e": 3, diff --git a/resources/meta/character/荧/data.json b/resources/meta/character/荧/data.json index d654e97a..3c538847 100644 --- a/resources/meta/character/荧/data.json +++ b/resources/meta/character/荧/data.json @@ -23,42 +23,29 @@ "key": "atkPct", "value": 24 }, - "talentKey": { - "731": "a", - "732": "e", - "739": "q", - "932": "e", - "939": "q", - "1031": "a", - "1032": "e", - "1039": "q", - "1131": "a", - "1132": "e", - "1139": "q" - }, "talentId": { - "10067": 732, - "10068": 739, - "10077": 932, - "10078": 939, - "10117": 1132, - "10118": 1139, - "10602": 1032, - "10605": 1039, - "100553": 731, - "100555": 731, - "100556": 1031, - "100557": 1131 + "10067": "e", + "10068": "q", + "10077": "e", + "10078": "q", + "10117": "e", + "10118": "q", + "10602": "e", + "10605": "q", + "100553": "a", + "100555": "a", + "100556": "a", + "100557": "a" }, "talentElem": { - "732": "anemo", - "739": "anemo", - "932": "geo", - "939": "geo", - "1032": "electro", - "1039": "electro", - "1132": "dendro", - "1139": "dendro" + "10067": "anemo", + "10068": "anemo", + "10077": "geo", + "10078": "geo", + "10117": "dendro", + "10118": "dendro", + "10602": "electro", + "10605": "electro" }, "talentCons": { "e": 5, diff --git a/resources/meta/character/莫娜/data.json b/resources/meta/character/莫娜/data.json index 22aaa761..0c07e600 100644 --- a/resources/meta/character/莫娜/data.json +++ b/resources/meta/character/莫娜/data.json @@ -23,15 +23,10 @@ "key": "recharge", "value": 32 }, - "talentKey": { - "4131": "a", - "4132": "e", - "4139": "q" - }, "talentId": { - "10411": 4131, - "10412": 4132, - "10415": 4139 + "10411": "a", + "10412": "e", + "10415": "q" }, "talentCons": { "e": 5, diff --git a/resources/meta/character/莱依拉/data.json b/resources/meta/character/莱依拉/data.json index 9dc397aa..6ff7915d 100644 --- a/resources/meta/character/莱依拉/data.json +++ b/resources/meta/character/莱依拉/data.json @@ -23,15 +23,10 @@ "key": "hpPct", "value": 24 }, - "talentKey": { - "7431": "a", - "7432": "e", - "7439": "q" - }, "talentId": { - "10741": 7431, - "10742": 7432, - "10745": 7439 + "10741": "a", + "10742": "e", + "10745": "q" }, "talentCons": { "e": 3, diff --git a/resources/meta/character/菲谢尔/data.json b/resources/meta/character/菲谢尔/data.json index dbf811d4..288910f4 100644 --- a/resources/meta/character/菲谢尔/data.json +++ b/resources/meta/character/菲谢尔/data.json @@ -25,15 +25,10 @@ "key": "atkPct", "value": 24 }, - "talentKey": { - "3131": "a", - "3132": "e", - "3139": "q" - }, "talentId": { - "10311": 3131, - "10312": 3132, - "10313": 3139 + "10311": "a", + "10312": "e", + "10313": "q" }, "talentCons": { "e": 3, diff --git a/resources/meta/character/行秋/data.json b/resources/meta/character/行秋/data.json index 9e0d1567..8189216b 100644 --- a/resources/meta/character/行秋/data.json +++ b/resources/meta/character/行秋/data.json @@ -23,15 +23,10 @@ "key": "atkPct", "value": 24 }, - "talentKey": { - "2531": "a", - "2532": "e", - "2539": "q" - }, "talentId": { - "10381": 2531, - "10382": 2532, - "10385": 2539 + "10381": "a", + "10382": "e", + "10385": "q" }, "talentCons": { "e": 5, diff --git a/resources/meta/character/诺艾尔/data.json b/resources/meta/character/诺艾尔/data.json index f8d2d98e..7231ccb5 100644 --- a/resources/meta/character/诺艾尔/data.json +++ b/resources/meta/character/诺艾尔/data.json @@ -23,15 +23,10 @@ "key": "defPct", "value": 30 }, - "talentKey": { - "3431": "a", - "3432": "e", - "3439": "q" - }, "talentId": { - "10341": 3431, - "10342": 3432, - "10343": 3439 + "10341": "a", + "10342": "e", + "10343": "q" }, "talentCons": { "e": 3, diff --git a/resources/meta/character/赛诺/data.json b/resources/meta/character/赛诺/data.json index 68d5dd99..e63e4d51 100644 --- a/resources/meta/character/赛诺/data.json +++ b/resources/meta/character/赛诺/data.json @@ -23,15 +23,10 @@ "key": "cdmg", "value": 38.4 }, - "talentKey": { - "7131": "a", - "7132": "e", - "7139": "q" - }, "talentId": { - "10711": 7131, - "10712": 7132, - "10715": 7139 + "10711": "a", + "10712": "e", + "10715": "q" }, "talentCons": { "e": 5, diff --git a/resources/meta/character/辛焱/data.json b/resources/meta/character/辛焱/data.json index 2eb52c0b..e1fe3305 100644 --- a/resources/meta/character/辛焱/data.json +++ b/resources/meta/character/辛焱/data.json @@ -23,15 +23,10 @@ "key": "atkPct", "value": 24 }, - "talentKey": { - "4431": "a", - "4432": "e", - "4439": "q" - }, "talentId": { - "10441": 4431, - "10442": 4432, - "10443": 4439 + "10441": "a", + "10442": "e", + "10443": "q" }, "talentCons": { "e": 3, diff --git a/resources/meta/character/达达利亚/data.json b/resources/meta/character/达达利亚/data.json index 5d6adc72..248e4ab7 100644 --- a/resources/meta/character/达达利亚/data.json +++ b/resources/meta/character/达达利亚/data.json @@ -23,15 +23,10 @@ "key": "dmg", "value": 28.8 }, - "talentKey": { - "3331": "a", - "3332": "e", - "3339": "q" - }, "talentId": { - "10331": 3331, - "10332": 3332, - "10333": 3339 + "10331": "a", + "10332": "e", + "10333": "q" }, "talentCons": { "e": 3, diff --git a/resources/meta/character/达达利亚/detail.json b/resources/meta/character/达达利亚/detail.json index d48ae88a..b4287dd3 100644 --- a/resources/meta/character/达达利亚/detail.json +++ b/resources/meta/character/达达利亚/detail.json @@ -918,6 +918,68 @@ 83.69999999999999, 88.35 ], + "断流·闪 伤害2": [ + [ + 12.4, + 3 + ], + [ + 13.33, + 3 + ], + [ + 14.26, + 3 + ], + [ + 15.5, + 3 + ], + [ + 16.43, + 3 + ], + [ + 17.36, + 3 + ], + [ + 18.6, + 3 + ], + [ + 19.84, + 3 + ], + [ + 21.08, + 3 + ], + [ + 22.32, + 3 + ], + [ + 23.56, + 3 + ], + [ + 24.8, + 3 + ], + [ + 26.35, + 3 + ], + [ + 27.9, + 3 + ], + [ + 29.45, + 3 + ] + ], "断流·破 伤害": [ 62, 66.65, diff --git a/resources/meta/character/迪卢克/data.json b/resources/meta/character/迪卢克/data.json index 8fe380df..453f8630 100644 --- a/resources/meta/character/迪卢克/data.json +++ b/resources/meta/character/迪卢克/data.json @@ -25,15 +25,10 @@ "key": "cpct", "value": 19.2 }, - "talentKey": { - "1631": "a", - "1632": "e", - "1639": "q" - }, "talentId": { - "10160": 1631, - "10161": 1632, - "10165": 1639 + "10160": "a", + "10161": "e", + "10165": "q" }, "talentCons": { "e": 3, diff --git a/resources/meta/character/迪奥娜/data.json b/resources/meta/character/迪奥娜/data.json index d132c1ac..597f2b8e 100644 --- a/resources/meta/character/迪奥娜/data.json +++ b/resources/meta/character/迪奥娜/data.json @@ -23,15 +23,10 @@ "key": "dmg", "value": 24 }, - "talentKey": { - "3931": "a", - "3932": "e", - "3939": "q" - }, "talentId": { - "10391": 3931, - "10392": 3932, - "10395": 3939 + "10391": "a", + "10392": "e", + "10395": "q" }, "talentCons": { "e": 5, diff --git a/resources/meta/character/迪希雅/data.json b/resources/meta/character/迪希雅/data.json index 2dde3263..8226af58 100644 --- a/resources/meta/character/迪希雅/data.json +++ b/resources/meta/character/迪希雅/data.json @@ -23,11 +23,6 @@ "key": "hpPct", "value": 28.8 }, - "talentKey": { - "7931": "a", - "7932": "e", - "7939": "q" - }, "talentId": {}, "talentCons": { "e": 5, diff --git a/resources/meta/character/重云/data.json b/resources/meta/character/重云/data.json index 2b74447d..b5af8128 100644 --- a/resources/meta/character/重云/data.json +++ b/resources/meta/character/重云/data.json @@ -23,15 +23,10 @@ "key": "atkPct", "value": 24 }, - "talentKey": { - "3631": "a", - "3632": "e", - "3639": "q" - }, "talentId": { - "10401": 3631, - "10402": 3632, - "10403": 3639 + "10401": "a", + "10402": "e", + "10403": "q" }, "talentCons": { "e": 5, diff --git a/resources/meta/character/钟离/data.json b/resources/meta/character/钟离/data.json index 24c91170..e8413b49 100644 --- a/resources/meta/character/钟离/data.json +++ b/resources/meta/character/钟离/data.json @@ -23,15 +23,10 @@ "key": "dmg", "value": 28.8 }, - "talentKey": { - "3031": "a", - "3032": "e", - "3039": "q" - }, "talentId": { - "10301": 3031, - "10302": 3032, - "10303": 3039 + "10301": "a", + "10302": "e", + "10303": "q" }, "talentCons": { "e": 3, diff --git a/resources/meta/character/钟离/detail.json b/resources/meta/character/钟离/detail.json index 250502e9..05cdd760 100644 --- a/resources/meta/character/钟离/detail.json +++ b/resources/meta/character/钟离/detail.json @@ -604,6 +604,68 @@ 116.12, 124.96 ], + "五段伤害2": [ + [ + 10.75, + 4 + ], + [ + 11.63, + 4 + ], + [ + 12.5, + 4 + ], + [ + 13.75, + 4 + ], + [ + 14.62, + 4 + ], + [ + 15.63, + 4 + ], + [ + 17, + 4 + ], + [ + 18.38, + 4 + ], + [ + 19.75, + 4 + ], + [ + 21.25, + 4 + ], + [ + 22.97, + 4 + ], + [ + 24.99, + 4 + ], + [ + 27.01, + 4 + ], + [ + 29.03, + 4 + ], + [ + 31.24, + 4 + ] + ], "六段伤害": [ 54.5, 58.93, diff --git a/resources/meta/character/阿贝多/data.json b/resources/meta/character/阿贝多/data.json index 2878ab09..15452b90 100644 --- a/resources/meta/character/阿贝多/data.json +++ b/resources/meta/character/阿贝多/data.json @@ -23,15 +23,10 @@ "key": "dmg", "value": 28.8 }, - "talentKey": { - "3831": "a", - "3832": "e", - "3839": "q" - }, "talentId": { - "10386": 3831, - "10387": 3832, - "10388": 3839 + "10386": "a", + "10387": "e", + "10388": "q" }, "talentCons": { "e": 3, diff --git a/resources/meta/character/雷泽/data.json b/resources/meta/character/雷泽/data.json index a1c9dc5b..6ee64953 100644 --- a/resources/meta/character/雷泽/data.json +++ b/resources/meta/character/雷泽/data.json @@ -23,15 +23,10 @@ "key": "phy", "value": 30 }, - "talentKey": { - "2031": "a", - "2032": "e", - "2039": "q" - }, "talentId": { - "10201": 2031, - "10202": 2032, - "10203": 2039 + "10201": "a", + "10202": "e", + "10203": "q" }, "talentCons": { "e": 5, diff --git a/resources/meta/character/雷电将军/data.json b/resources/meta/character/雷电将军/data.json index e70de3fa..f74cb96e 100644 --- a/resources/meta/character/雷电将军/data.json +++ b/resources/meta/character/雷电将军/data.json @@ -23,15 +23,10 @@ "key": "recharge", "value": 32 }, - "talentKey": { - "5231": "a", - "5232": "e", - "5239": "q" - }, "talentId": { - "10521": 5231, - "10522": 5232, - "10525": 5239 + "10521": "a", + "10522": "e", + "10525": "q" }, "talentCons": { "e": 5, diff --git a/resources/meta/character/香菱/data.json b/resources/meta/character/香菱/data.json index 2b9ac9dc..59126845 100644 --- a/resources/meta/character/香菱/data.json +++ b/resources/meta/character/香菱/data.json @@ -23,15 +23,10 @@ "key": "mastery", "value": 96 }, - "talentKey": { - "2331": "a", - "2332": "e", - "2339": "q" - }, "talentId": { - "10231": 2331, - "10232": 2332, - "10235": 2339 + "10231": "a", + "10232": "e", + "10235": "q" }, "talentCons": { "e": 5, diff --git a/resources/meta/character/香菱/detail.json b/resources/meta/character/香菱/detail.json index 26c3431e..bacf4f03 100644 --- a/resources/meta/character/香菱/detail.json +++ b/resources/meta/character/香菱/detail.json @@ -487,68 +487,6 @@ 140.74, 151.44 ], - "三段伤害2": [ - [ - 26.06, - 26.06 - ], - [ - 28.18, - 28.18 - ], - [ - 30.3, - 30.3 - ], - [ - 33.33, - 33.33 - ], - [ - 35.45, - 35.45 - ], - [ - 37.87, - 37.87 - ], - [ - 41.21, - 41.21 - ], - [ - 44.54, - 44.54 - ], - [ - 47.87, - 47.87 - ], - [ - 51.51, - 51.51 - ], - [ - 55.68, - 55.68 - ], - [ - 60.58, - 60.58 - ], - [ - 65.48, - 65.48 - ], - [ - 70.37, - 70.37 - ], - [ - 75.72, - 75.72 - ] - ], "四段伤害": [ 56.4, 61, @@ -618,128 +556,21 @@ 170.98 ], "低空/高空坠地冲击伤害": [ - [ - 127.84, - 159.68 - ], - [ - 138.24, - 172.67 - ], - [ - 148.65, - 185.67 - ], - [ - 163.51, - 204.24 - ], - [ - 173.92, - 217.23 - ], - [ - 185.81, - 232.09 - ], - [ - 202.16, - 252.51 - ], - [ - 218.51, - 272.93 - ], - [ - 234.86, - 293.36 - ], - [ - 252.7, - 315.64 - ], - [ - 270.54, - 337.92 - ], - [ - 288.38, - 360.2 - ], - [ - 306.22, - 382.48 - ], - [ - 324.05, - 404.76 - ], - [ - 341.89, - 427.04 - ] - ], - "低空/高空坠地冲击伤害2": [ - [ - 127.84, - 159.68 - ], - [ - 138.24, - 172.67 - ], - [ - 148.65, - 185.67 - ], - [ - 163.51, - 204.24 - ], - [ - 173.92, - 217.23 - ], - [ - 185.81, - 232.09 - ], - [ - 202.16, - 252.51 - ], - [ - 218.51, - 272.93 - ], - [ - 234.86, - 293.36 - ], - [ - 252.7, - 315.64 - ], - [ - 270.54, - 337.92 - ], - [ - 288.38, - 360.2 - ], - [ - 306.22, - 382.48 - ], - [ - 324.05, - 404.76 - ], - [ - 341.89, - 427.04 - ] + "[127.84,159.68]", + "[138.24,172.67]", + "[148.65,185.67]", + "[163.51,204.24]", + "[173.92,217.23]", + "[185.81,232.09]", + "[202.16,252.51]", + "[218.51,272.93]", + "[234.86,293.36]", + "[252.7,315.64]", + "[270.54,337.92]", + "[288.38,360.2]", + "[306.22,382.48]", + "[324.05,404.76]", + "[341.89,427.04]" ] }, "e": { diff --git a/resources/meta/character/魈/data.json b/resources/meta/character/魈/data.json index 534da916..e73ab0b3 100644 --- a/resources/meta/character/魈/data.json +++ b/resources/meta/character/魈/data.json @@ -23,15 +23,10 @@ "key": "cpct", "value": 19.2 }, - "talentKey": { - "2631": "a", - "2632": "e", - "2639": "q" - }, "talentId": { - "10261": 2631, - "10262": 2632, - "10265": 2639 + "10261": "a", + "10262": "e", + "10265": "q" }, "talentCons": { "e": 3, diff --git a/resources/meta/character/鹿野院平藏/data.json b/resources/meta/character/鹿野院平藏/data.json index f96caf4a..680bac0a 100644 --- a/resources/meta/character/鹿野院平藏/data.json +++ b/resources/meta/character/鹿野院平藏/data.json @@ -23,15 +23,10 @@ "key": "dmg", "value": 24 }, - "talentKey": { - "5931": "a", - "5932": "e", - "5939": "q" - }, "talentId": { - "10591": 5931, - "10592": 5932, - "10595": 5939 + "10591": "a", + "10592": "e", + "10595": "q" }, "talentCons": { "e": 3, diff --git a/resources/meta/material/data.json b/resources/meta/material/data.json index f2f245f4..1fee5b22 100644 --- a/resources/meta/material/data.json +++ b/resources/meta/material/data.json @@ -1,407 +1,44 @@ { - "生长碧翡": { - "id": 374, - "name": "生长碧翡", + "璀璨原钻": { + "id": 304, + "name": "璀璨原钻", "type": "gem", "star": 5, "items": { - "生长碧翡碎屑": { - "id": 371, - "name": "生长碧翡碎屑", + "璀璨原钻碎屑": { + "id": 301, + "name": "璀璨原钻碎屑", "type": "gem", "star": 2 }, - "生长碧翡断片": { - "id": 372, - "name": "生长碧翡断片", + "璀璨原钻断片": { + "id": 302, + "name": "璀璨原钻断片", "type": "gem", "star": 3 }, - "生长碧翡块": { - "id": 373, - "name": "生长碧翡块", + "璀璨原钻块": { + "id": 303, + "name": "璀璨原钻块", "type": "gem", "star": 4 }, - "生长碧翡": { - "id": 374, - "name": "生长碧翡", + "璀璨原钻": { + "id": 304, + "name": "璀璨原钻", "type": "gem", "star": 5 } } }, - "蕈王钩喙": { - "id": "n113036", - "name": "蕈王钩喙", + "undefined": { + "id": 0, "type": "boss", - "star": 4 - }, - "月莲": { - "id": "n101215", - "name": "月莲", - "type": "specialty", "star": 1 }, - "孢囊晶尘": { - "id": "n112061", - "name": "孢囊晶尘", - "type": "normal", - "star": 3, - "items": { - "蕈兽孢子": { - "id": "n112059", - "name": "蕈兽孢子", - "type": "normal", - "star": 1 - }, - "荧光孢粉": { - "id": "n112060", - "name": "荧光孢粉", - "type": "normal", - "star": 2 - }, - "孢囊晶尘": { - "id": "n112061", - "name": "孢囊晶尘", - "type": "normal", - "star": 3 - } - } - }, - "「诤言」的哲学": { - "id": "n104331", - "name": "「诤言」的哲学", - "type": "talent", - "star": 4, - "items": { - "「诤言」的教导": { - "id": "n104329", - "name": "「诤言」的教导", - "type": "talent", - "star": 2 - }, - "「诤言」的指引": { - "id": "n104330", - "name": "「诤言」的指引", - "type": "talent", - "star": 3 - }, - "「诤言」的哲学": { - "id": "n104331", - "name": "「诤言」的哲学", - "type": "talent", - "star": 4 - } - } - }, - "万劫之真意": { - "id": 485, - "name": "万劫之真意", - "type": "weekly", - "star": 5 - }, - "涤净青金": { - "id": 324, - "name": "涤净青金", - "type": "gem", - "star": 5, - "items": { - "涤净青金碎屑": { - "id": 321, - "name": "涤净青金碎屑", - "type": "gem", - "star": 2 - }, - "涤净青金断片": { - "id": 322, - "name": "涤净青金断片", - "type": "gem", - "star": 3 - }, - "涤净青金块": { - "id": 323, - "name": "涤净青金块", - "type": "gem", - "star": 4 - }, - "涤净青金": { - "id": 324, - "name": "涤净青金", - "type": "gem", - "star": 5 - } - } - }, - "永续机芯": { - "id": "n113038", - "name": "永续机芯", - "type": "boss", - "star": 4 - }, - "帕蒂沙兰": { - "id": "n101214", - "name": "帕蒂沙兰", - "type": "specialty", - "star": 1 - }, - "「笃行」的哲学": { - "id": "n104337", - "name": "「笃行」的哲学", - "type": "talent", - "star": 4, - "items": { - "「笃行」的教导": { - "id": "n104335", - "name": "「笃行」的教导", - "type": "talent", - "star": 2 - }, - "「笃行」的指引": { - "id": "n104336", - "name": "「笃行」的指引", - "type": "talent", - "star": 3 - }, - "「笃行」的哲学": { - "id": "n104337", - "name": "「笃行」的哲学", - "type": "talent", - "star": 4 - } - } - }, - "祸神之禊泪": { - "id": 484, - "name": "祸神之禊泪", - "type": "weekly", - "star": 5 - }, - "最胜紫晶": { - "id": 334, - "name": "最胜紫晶", - "type": "gem", - "star": 5, - "items": { - "最胜紫晶碎屑": { - "id": 331, - "name": "最胜紫晶碎屑", - "type": "gem", - "star": 2 - }, - "最胜紫晶断片": { - "id": 332, - "name": "最胜紫晶断片", - "type": "gem", - "star": 3 - }, - "最胜紫晶块": { - "id": 333, - "name": "最胜紫晶块", - "type": "gem", - "star": 4 - }, - "最胜紫晶": { - "id": 334, - "name": "最胜紫晶", - "type": "gem", - "star": 5 - } - } - }, - "藏雷野实": { - "id": "n113037", - "name": "藏雷野实", - "type": "boss", - "star": 4 - }, - "圣金虫": { - "id": "n101225", - "name": "圣金虫", - "type": "specialty", - "star": 1 - }, - "禁咒绘卷": { - "id": 43, - "name": "禁咒绘卷", - "type": "normal", - "star": 3, - "items": { - "导能绘卷": { - "id": 41, - "name": "导能绘卷", - "type": "normal", - "star": 1 - }, - "封魔绘卷": { - "id": 42, - "name": "封魔绘卷", - "type": "normal", - "star": 2 - }, - "禁咒绘卷": { - "id": 43, - "name": "禁咒绘卷", - "type": "normal", - "star": 3 - } - } - }, - "凶将之手眼": { - "id": 483, - "name": "凶将之手眼", - "type": "weekly", - "star": 5 - }, - "导光四面体": { - "id": "n113039", - "name": "导光四面体", - "type": "boss", - "star": 4 - }, - "赤念果": { - "id": "n101220", - "name": "赤念果", - "type": "specialty", - "star": 1 - }, - "织金红绸": { - "id": "n112067", - "name": "织金红绸", - "type": "normal", - "star": 3, - "items": { - "褪色红绸": { - "id": "n112065", - "name": "褪色红绸", - "type": "normal", - "star": 1 - }, - "镶边红绸": { - "id": "n112066", - "name": "镶边红绸", - "type": "normal", - "star": 2 - }, - "织金红绸": { - "id": "n112067", - "name": "织金红绸", - "type": "normal", - "star": 3 - } - } - }, - "树王圣体菇": { - "id": "n101213", - "name": "树王圣体菇", - "type": "specialty", - "star": 1 - }, - "历战的箭簇": { - "id": 53, - "name": "历战的箭簇", - "type": "normal", - "star": 3, - "items": { - "牢固的箭簇": { - "id": 51, - "name": "牢固的箭簇", - "type": "normal", - "star": 1 - }, - "锐利的箭簇": { - "id": 52, - "name": "锐利的箭簇", - "type": "normal", - "star": 2 - }, - "历战的箭簇": { - "id": 53, - "name": "历战的箭簇", - "type": "normal", - "star": 3 - } - } - }, - "劫波莲": { - "id": "n101217", - "name": "劫波莲", - "type": "specialty", - "star": 1 - }, - "「巧思」的哲学": { - "id": "n104334", - "name": "「巧思」的哲学", - "type": "talent", - "star": 4, - "items": { - "「巧思」的教导": { - "id": "n104332", - "name": "「巧思」的教导", - "type": "talent", - "star": 2 - }, - "「巧思」的指引": { - "id": "n104333", - "name": "「巧思」的指引", - "type": "talent", - "star": 3 - }, - "「巧思」的哲学": { - "id": "n104334", - "name": "「巧思」的哲学", - "type": "talent", - "star": 4 - } - } - }, - "血玉之枝": { - "id": 471, - "name": "血玉之枝", - "type": "weekly", - "star": 5 - }, - "自在松石": { - "id": 354, - "name": "自在松石", - "type": "gem", - "star": 5, - "items": { - "自在松石碎屑": { - "id": 351, - "name": "自在松石碎屑", - "type": "gem", - "star": 2 - }, - "自在松石断片": { - "id": 352, - "name": "自在松石断片", - "type": "gem", - "star": 3 - }, - "自在松石块": { - "id": 353, - "name": "自在松石块", - "type": "gem", - "star": 4 - }, - "自在松石": { - "id": 354, - "name": "自在松石", - "type": "gem", - "star": 5 - } - } - }, - "飓风之种": { - "id": 205, - "name": "飓风之种", - "type": "boss", - "star": 4 - }, - "蒲公英籽": { - "id": 603, - "name": "蒲公英籽", + "风车菊": { + "id": 612, + "name": "风车菊", "type": "specialty", "star": 1 }, @@ -431,91 +68,21 @@ } } }, - "「抗争」的哲学": { - "id": 453, - "name": "「抗争」的哲学", - "type": "talent", - "star": 4, - "items": { - "「抗争」的教导": { - "id": 451, - "name": "「抗争」的教导", - "type": "talent", - "star": 2 - }, - "「抗争」的指引": { - "id": 452, - "name": "「抗争」的指引", - "type": "talent", - "star": 3 - }, - "「抗争」的哲学": { - "id": 453, - "name": "「抗争」的哲学", - "type": "talent", - "star": 4 - } - } - }, - "东风之翎": { - "id": 461, - "name": "东风之翎", - "type": "weekly", - "star": 5 - }, - "雷光棱镜": { - "id": 203, - "name": "雷光棱镜", - "type": "boss", - "star": 4 - }, - "落落莓": { - "id": 610, - "name": "落落莓", - "type": "specialty", - "star": 1 - }, - "史莱姆原浆": { - "id": 23, - "name": "史莱姆原浆", - "type": "normal", - "star": 3, - "items": { - "史莱姆凝液": { - "id": 21, - "name": "史莱姆凝液", - "type": "normal", - "star": 1 - }, - "史莱姆清": { - "id": 22, - "name": "史莱姆清", - "type": "normal", - "star": 2 - }, - "史莱姆原浆": { - "id": 23, - "name": "史莱姆原浆", - "type": "normal", - "star": 3 - } - } - }, "「诗文」的哲学": { "id": 403, "name": "「诗文」的哲学", "type": "talent", "star": 4, "items": { - "「诗文」的教导": { - "id": 401, - "name": "「诗文」的教导", + "「自由」的教导": { + "id": 421, + "name": "「自由」的教导", "type": "talent", "star": 2 }, - "「诗文」的指引": { - "id": 402, - "name": "「诗文」的指引", + "「抗争」的指引": { + "id": 452, + "name": "「抗争」的指引", "type": "talent", "star": 3 }, @@ -527,129 +94,9 @@ } } }, - "东风之爪": { - "id": 462, - "name": "东风之爪", - "type": "weekly", - "star": 5 - }, - "净水之心": { - "id": 202, - "name": "净水之心", - "type": "boss", - "star": 4 - }, - "慕风蘑菇": { - "id": 607, - "name": "慕风蘑菇", - "type": "specialty", - "star": 1 - }, - "「自由」的哲学": { - "id": 423, - "name": "「自由」的哲学", - "type": "talent", - "star": 4, - "items": { - "「自由」的教导": { - "id": 421, - "name": "「自由」的教导", - "type": "talent", - "star": 2 - }, - "「自由」的指引": { - "id": 422, - "name": "「自由」的指引", - "type": "talent", - "star": 3 - }, - "「自由」的哲学": { - "id": 423, - "name": "「自由」的哲学", - "type": "talent", - "star": 4 - } - } - }, - "北风之环": { - "id": 465, - "name": "北风之环", - "type": "weekly", - "star": 5 - }, - "哀叙冰玉": { - "id": 344, - "name": "哀叙冰玉", - "type": "gem", - "star": 5, - "items": { - "哀叙冰玉碎屑": { - "id": 341, - "name": "哀叙冰玉碎屑", - "type": "gem", - "star": 2 - }, - "哀叙冰玉断片": { - "id": 342, - "name": "哀叙冰玉断片", - "type": "gem", - "star": 3 - }, - "哀叙冰玉块": { - "id": 343, - "name": "哀叙冰玉块", - "type": "gem", - "star": 4 - }, - "哀叙冰玉": { - "id": 344, - "name": "哀叙冰玉", - "type": "gem", - "star": 5 - } - } - }, - "极寒之核": { - "id": 204, - "name": "极寒之核", - "type": "boss", - "star": 4 - }, - "嘟嘟莲": { - "id": 600, - "name": "嘟嘟莲", - "type": "specialty", - "star": 1 - }, - "攫金鸦印": { - "id": 123, - "name": "攫金鸦印", - "type": "normal", - "star": 3, - "items": { - "寻宝鸦印": { - "id": 121, - "name": "寻宝鸦印", - "type": "normal", - "star": 1 - }, - "藏银鸦印": { - "id": 122, - "name": "藏银鸦印", - "type": "normal", - "star": 2 - }, - "攫金鸦印": { - "id": 123, - "name": "攫金鸦印", - "type": "normal", - "star": 3 - } - } - }, - "北风的魂匣": { - "id": 466, - "name": "北风的魂匣", + "东风的吐息": { + "id": 463, + "name": "东风的吐息", "type": "weekly", "star": 5 }, @@ -691,82 +138,38 @@ "type": "boss", "star": 4 }, - "小灯草": { - "id": 609, - "name": "小灯草", + "绝云椒椒": { + "id": 605, + "name": "绝云椒椒", "type": "specialty", "star": 1 }, - "尉官的徽记": { - "id": 113, - "name": "尉官的徽记", + "史莱姆原浆": { + "id": 23, + "name": "史莱姆原浆", "type": "normal", "star": 3, "items": { - "新兵的徽记": { - "id": 111, - "name": "新兵的徽记", + "史莱姆凝液": { + "id": 21, + "name": "史莱姆凝液", "type": "normal", "star": 1 }, - "士官的徽记": { - "id": 112, - "name": "士官的徽记", + "史莱姆清": { + "id": 22, + "name": "史莱姆清", "type": "normal", "star": 2 }, - "尉官的徽记": { - "id": 113, - "name": "尉官的徽记", + "史莱姆原浆": { + "id": 23, + "name": "史莱姆原浆", "type": "normal", "star": 3 } } }, - "坚牢黄玉": { - "id": 364, - "name": "坚牢黄玉", - "type": "gem", - "star": 5, - "items": { - "坚牢黄玉碎屑": { - "id": 361, - "name": "坚牢黄玉碎屑", - "type": "gem", - "star": 2 - }, - "坚牢黄玉断片": { - "id": 362, - "name": "坚牢黄玉断片", - "type": "gem", - "star": 3 - }, - "坚牢黄玉块": { - "id": 363, - "name": "坚牢黄玉块", - "type": "gem", - "star": 4 - }, - "坚牢黄玉": { - "id": 364, - "name": "坚牢黄玉", - "type": "gem", - "star": 5 - } - } - }, - "兽境王器": { - "id": 215, - "name": "兽境王器", - "type": "boss", - "star": 4 - }, - "琉璃百合": { - "id": 604, - "name": "琉璃百合", - "type": "specialty", - "star": 1 - }, "「勤劳」的哲学": { "id": 413, "name": "「勤劳」的哲学", @@ -793,1268 +196,10 @@ } } }, - "灰烬之心": { - "id": 482, - "name": "灰烬之心", + "东风之爪": { + "id": 462, + "name": "东风之爪", "type": "weekly", "star": 5 - }, - "恒常机关之心": { - "id": 211, - "name": "恒常机关之心", - "type": "boss", - "star": 4 - }, - "绯樱绣球": { - "id": 678, - "name": "绯樱绣球", - "type": "specialty", - "star": 1 - }, - "名刀镡": { - "id": 163, - "name": "名刀镡", - "type": "normal", - "star": 3, - "items": { - "破旧的刀镡": { - "id": 161, - "name": "破旧的刀镡", - "type": "normal", - "star": 1 - }, - "影打刀镡": { - "id": 162, - "name": "影打刀镡", - "type": "normal", - "star": 2 - }, - "名刀镡": { - "id": 163, - "name": "名刀镡", - "type": "normal", - "star": 3 - } - } - }, - "「风雅」的哲学": { - "id": 418, - "name": "「风雅」的哲学", - "type": "talent", - "star": 4, - "items": { - "「风雅」的教导": { - "id": 416, - "name": "「风雅」的教导", - "type": "talent", - "star": 2 - }, - "「风雅」的指引": { - "id": 417, - "name": "「风雅」的指引", - "type": "talent", - "star": 3 - }, - "「风雅」的哲学": { - "id": 418, - "name": "「风雅」的哲学", - "type": "talent", - "star": 4 - } - } - }, - "钩钩果": { - "id": 613, - "name": "钩钩果", - "type": "specialty", - "star": 1 - }, - "东风的吐息": { - "id": 463, - "name": "东风的吐息", - "type": "weekly", - "star": 5 - }, - "塞西莉亚花": { - "id": 601, - "name": "塞西莉亚花", - "type": "specialty", - "star": 1 - }, - "北风之尾": { - "id": 464, - "name": "北风之尾", - "type": "weekly", - "star": 5 - }, - "绝云椒椒": { - "id": 605, - "name": "绝云椒椒", - "type": "specialty", - "star": 1 - }, - "夜泊石": { - "id": 606, - "name": "夜泊石", - "type": "specialty", - "star": 1 - }, - "「黄金」的哲学": { - "id": 433, - "name": "「黄金」的哲学", - "type": "talent", - "star": 4, - "items": { - "「黄金」的教导": { - "id": 431, - "name": "「黄金」的教导", - "type": "talent", - "star": 2 - }, - "「黄金」的指引": { - "id": 432, - "name": "「黄金」的指引", - "type": "talent", - "star": 3 - }, - "「黄金」的哲学": { - "id": 433, - "name": "「黄金」的哲学", - "type": "talent", - "star": 4 - } - } - }, - "霓裳花": { - "id": 608, - "name": "霓裳花", - "type": "specialty", - "star": 1 - }, - "未熟之玉": { - "id": 207, - "name": "未熟之玉", - "type": "boss", - "star": 4 - }, - "清心": { - "id": 614, - "name": "清心", - "type": "specialty", - "star": 1 - }, - "「繁荣」的哲学": { - "id": 443, - "name": "「繁荣」的哲学", - "type": "talent", - "star": 4, - "items": { - "「繁荣」的教导": { - "id": 441, - "name": "「繁荣」的教导", - "type": "talent", - "star": 2 - }, - "「繁荣」的指引": { - "id": 442, - "name": "「繁荣」的指引", - "type": "talent", - "star": 3 - }, - "「繁荣」的哲学": { - "id": 443, - "name": "「繁荣」的哲学", - "type": "talent", - "star": 4 - } - } - }, - "武炼之魂·孤影": { - "id": 469, - "name": "武炼之魂·孤影", - "type": "weekly", - "star": 5 - }, - "玄岩之塔": { - "id": 206, - "name": "玄岩之塔", - "type": "boss", - "star": 4 - }, - "石珀": { - "id": 602, - "name": "石珀", - "type": "specialty", - "star": 1 - }, - "吞天之鲸·只角": { - "id": 467, - "name": "吞天之鲸·只角", - "type": "weekly", - "star": 5 - }, - "风车菊": { - "id": 612, - "name": "风车菊", - "type": "specialty", - "star": 1 - }, - "星螺": { - "id": 663, - "name": "星螺", - "type": "specialty", - "star": 1 - }, - "魔王之刃·残片": { - "id": 468, - "name": "魔王之刃·残片", - "type": "weekly", - "star": 5 - }, - "琉璃袋": { - "id": 611, - "name": "琉璃袋", - "type": "specialty", - "star": 1 - }, - "龙嗣伪鳍": { - "id": 216, - "name": "龙嗣伪鳍", - "type": "boss", - "star": 4 - }, - "海灵芝": { - "id": 675, - "name": "海灵芝", - "type": "specialty", - "star": 1 - }, - "「天光」的哲学": { - "id": 428, - "name": "「天光」的哲学", - "type": "talent", - "star": 4, - "items": { - "「天光」的教导": { - "id": 426, - "name": "「天光」的教导", - "type": "talent", - "star": 2 - }, - "「天光」的指引": { - "id": 427, - "name": "「天光」的指引", - "type": "talent", - "star": 3 - }, - "「天光」的哲学": { - "id": 428, - "name": "「天光」的哲学", - "type": "talent", - "star": 4 - } - } - }, - "符纹之齿": { - "id": 486, - "name": "符纹之齿", - "type": "boss", - "star": 4 - }, - "鬼兜虫": { - "id": 677, - "name": "鬼兜虫", - "type": "specialty", - "star": 1 - }, - "「浮世」的哲学": { - "id": 408, - "name": "「浮世」的哲学", - "type": "talent", - "star": 4, - "items": { - "「浮世」的教导": { - "id": 406, - "name": "「浮世」的教导", - "type": "talent", - "star": 2 - }, - "「浮世」的指引": { - "id": 407, - "name": "「浮世」的指引", - "type": "talent", - "star": 3 - }, - "「浮世」的哲学": { - "id": 408, - "name": "「浮世」的哲学", - "type": "talent", - "star": 4 - } - } - }, - "鎏金之鳞": { - "id": 472, - "name": "鎏金之鳞", - "type": "weekly", - "star": 5 - }, - "晶凝之华": { - "id": 208, - "name": "晶凝之华", - "type": "boss", - "star": 4 - }, - "晶化骨髓": { - "id": 679, - "name": "晶化骨髓", - "type": "specialty", - "star": 1 - }, - "浮游晶化核": { - "id": 187, - "name": "浮游晶化核", - "type": "normal", - "star": 3, - "items": { - "浮游干核": { - "id": 185, - "name": "浮游干核", - "type": "normal", - "star": 1 - }, - "浮游幽核": { - "id": 186, - "name": "浮游幽核", - "type": "normal", - "star": 2 - }, - "浮游晶化核": { - "id": 187, - "name": "浮游晶化核", - "type": "normal", - "star": 3 - } - } - }, - "熔毁之刻": { - "id": 480, - "name": "熔毁之刻", - "type": "weekly", - "star": 5 - }, - "原素花蜜": { - "id": 133, - "name": "原素花蜜", - "type": "normal", - "star": 3, - "items": { - "骗骗花蜜": { - "id": 131, - "name": "骗骗花蜜", - "type": "normal", - "star": 1 - }, - "微光花蜜": { - "id": 132, - "name": "微光花蜜", - "type": "normal", - "star": 2 - }, - "原素花蜜": { - "id": 133, - "name": "原素花蜜", - "type": "normal", - "star": 3 - } - } - }, - "狱火之蝶": { - "id": 481, - "name": "狱火之蝶", - "type": "weekly", - "star": 5 - }, - "鸣草": { - "id": 681, - "name": "鸣草", - "type": "specialty", - "star": 1 - }, - "排异之露": { - "id": 213, - "name": "排异之露", - "type": "boss", - "star": 4 - }, - "魔偶机心": { - "id": 210, - "name": "魔偶机心", - "type": "boss", - "star": 4 - }, - "阴燃之珠": { - "id": 212, - "name": "阴燃之珠", - "type": "boss", - "star": 4 - }, - "龙王之冕": { - "id": 470, - "name": "龙王之冕", - "type": "weekly", - "star": 5 - }, - "幽灯蕈": { - "id": 688, - "name": "幽灯蕈", - "type": "specialty", - "star": 1 - }, - "雷霆数珠": { - "id": 214, - "name": "雷霆数珠", - "type": "boss", - "star": 4 - }, - "天云草实": { - "id": 686, - "name": "天云草实", - "type": "specialty", - "star": 1 - }, - "珊瑚真珠": { - "id": 685, - "name": "珊瑚真珠", - "type": "specialty", - "star": 1 - }, - "血斛": { - "id": 680, - "name": "血斛", - "type": "specialty", - "star": 1 - }, - "璀璨原钻": { - "id": 304, - "name": "璀璨原钻", - "type": "gem", - "star": 5, - "items": { - "璀璨原钻碎屑": { - "id": 301, - "name": "璀璨原钻碎屑", - "type": "gem", - "star": 2 - }, - "璀璨原钻断片": { - "id": 302, - "name": "璀璨原钻断片", - "type": "gem", - "star": 3 - }, - "璀璨原钻块": { - "id": 303, - "name": "璀璨原钻块", - "type": "gem", - "star": 4 - }, - "璀璨原钻": { - "id": 304, - "name": "璀璨原钻", - "type": "gem", - "star": 5 - } - } - }, - "灭诤草蔓": { - "id": "n113040", - "name": "灭诤草蔓", - "type": "boss", - "star": 4 - }, - "???": { - "id": "n113042", - "name": "???", - "type": "weekly", - "star": 5 - }, - "傀儡的悬丝": { - "id": "n113041", - "name": "傀儡的悬丝", - "type": "weekly", - "star": 5 - }, - "无心的渊镜": { - "id": "n113042", - "name": "无心的渊镜", - "type": "weekly", - "star": 5 - }, - "空行的虚铃": { - "id": "n113043", - "name": "空行的虚铃", - "type": "weekly", - "star": 5 - }, - "混沌真眼": { - "id": 173, - "name": "混沌真眼", - "type": "monster", - "star": 4, - "items": { - "混沌机关": { - "id": 171, - "name": "混沌机关", - "type": "monster", - "star": 2 - }, - "混沌枢纽": { - "id": 172, - "name": "混沌枢纽", - "type": "monster", - "star": 3 - }, - "混沌真眼": { - "id": 173, - "name": "混沌真眼", - "type": "monster", - "star": 4 - } - } - }, - "远海夷地的金枝": { - "id": 564, - "name": "远海夷地的金枝", - "type": "weapon", - "star": 5, - "items": { - "远海夷地的瑚枝": { - "id": 561, - "name": "远海夷地的瑚枝", - "type": "weapon", - "star": 2 - }, - "远海夷地的玉枝": { - "id": 562, - "name": "远海夷地的玉枝", - "type": "weapon", - "star": 3 - }, - "远海夷地的琼枝": { - "id": 563, - "name": "远海夷地的琼枝", - "type": "weapon", - "star": 4 - }, - "远海夷地的金枝": { - "id": 564, - "name": "远海夷地的金枝", - "type": "weapon", - "star": 5 - } - } - }, - "黑晶号角": { - "id": 63, - "name": "黑晶号角", - "type": "monster", - "star": 4, - "items": { - "沉重号角": { - "id": 61, - "name": "沉重号角", - "type": "monster", - "star": 2 - }, - "黑铜号角": { - "id": 62, - "name": "黑铜号角", - "type": "monster", - "star": 3 - }, - "黑晶号角": { - "id": 63, - "name": "黑晶号角", - "type": "monster", - "star": 4 - } - } - }, - "高塔孤王的碎梦": { - "id": 504, - "name": "高塔孤王的碎梦", - "type": "weapon", - "star": 5, - "items": { - "高塔孤王的破瓦": { - "id": 501, - "name": "高塔孤王的破瓦", - "type": "weapon", - "star": 2 - }, - "高塔孤王的残垣": { - "id": 502, - "name": "高塔孤王的残垣", - "type": "weapon", - "star": 3 - }, - "高塔孤王的断片": { - "id": 503, - "name": "高塔孤王的断片", - "type": "weapon", - "star": 4 - }, - "高塔孤王的碎梦": { - "id": 504, - "name": "高塔孤王的碎梦", - "type": "weapon", - "star": 5 - } - } - }, - "地脉的新芽": { - "id": 73, - "name": "地脉的新芽", - "type": "monster", - "star": 4, - "items": { - "地脉的旧枝": { - "id": 71, - "name": "地脉的旧枝", - "type": "monster", - "star": 2 - }, - "地脉的枯叶": { - "id": 72, - "name": "地脉的枯叶", - "type": "monster", - "star": 3 - }, - "地脉的新芽": { - "id": 73, - "name": "地脉的新芽", - "type": "monster", - "star": 4 - } - } - }, - "凛风奔狼的怀乡": { - "id": 524, - "name": "凛风奔狼的怀乡", - "type": "weapon", - "star": 5, - "items": { - "凛风奔狼的始龀": { - "id": 521, - "name": "凛风奔狼的始龀", - "type": "weapon", - "star": 2 - }, - "凛风奔狼的裂齿": { - "id": 522, - "name": "凛风奔狼的裂齿", - "type": "weapon", - "star": 3 - }, - "凛风奔狼的断牙": { - "id": 523, - "name": "凛风奔狼的断牙", - "type": "weapon", - "star": 4 - }, - "凛风奔狼的怀乡": { - "id": 524, - "name": "凛风奔狼的怀乡", - "type": "weapon", - "star": 5 - } - } - }, - "混沌炉心": { - "id": 83, - "name": "混沌炉心", - "type": "monster", - "star": 4, - "items": { - "混沌装置": { - "id": 81, - "name": "混沌装置", - "type": "monster", - "star": 2 - }, - "混沌回路": { - "id": 82, - "name": "混沌回路", - "type": "monster", - "star": 3 - }, - "混沌炉心": { - "id": 83, - "name": "混沌炉心", - "type": "monster", - "star": 4 - } - } - }, - "狮牙斗士的理想": { - "id": 544, - "name": "狮牙斗士的理想", - "type": "weapon", - "star": 5, - "items": { - "狮牙斗士的枷锁": { - "id": 541, - "name": "狮牙斗士的枷锁", - "type": "weapon", - "star": 2 - }, - "狮牙斗士的铁链": { - "id": 542, - "name": "狮牙斗士的铁链", - "type": "weapon", - "star": 3 - }, - "狮牙斗士的镣铐": { - "id": 543, - "name": "狮牙斗士的镣铐", - "type": "weapon", - "star": 4 - }, - "狮牙斗士的理想": { - "id": 544, - "name": "狮牙斗士的理想", - "type": "weapon", - "star": 5 - } - } - }, - "督察长祭刀": { - "id": 103, - "name": "督察长祭刀", - "type": "monster", - "star": 4, - "items": { - "猎兵祭刀": { - "id": 101, - "name": "猎兵祭刀", - "type": "monster", - "star": 2 - }, - "特工祭刀": { - "id": 102, - "name": "特工祭刀", - "type": "monster", - "star": 3 - }, - "督察长祭刀": { - "id": 103, - "name": "督察长祭刀", - "type": "monster", - "star": 4 - } - } - }, - "孤云寒林的神体": { - "id": 514, - "name": "孤云寒林的神体", - "type": "weapon", - "star": 5, - "items": { - "孤云寒林的光砂": { - "id": 511, - "name": "孤云寒林的光砂", - "type": "weapon", - "star": 2 - }, - "孤云寒林的辉岩": { - "id": 512, - "name": "孤云寒林的辉岩", - "type": "weapon", - "star": 3 - }, - "孤云寒林的圣骸": { - "id": 513, - "name": "孤云寒林的圣骸", - "type": "weapon", - "star": 4 - }, - "孤云寒林的神体": { - "id": 514, - "name": "孤云寒林的神体", - "type": "weapon", - "star": 5 - } - } - }, - "雾虚灯芯": { - "id": 93, - "name": "雾虚灯芯", - "type": "monster", - "star": 4, - "items": { - "雾虚花粉": { - "id": 91, - "name": "雾虚花粉", - "type": "monster", - "star": 2 - }, - "雾虚草囊": { - "id": 92, - "name": "雾虚草囊", - "type": "monster", - "star": 3 - }, - "雾虚灯芯": { - "id": 93, - "name": "雾虚灯芯", - "type": "monster", - "star": 4 - } - } - }, - "雾海云间的转还": { - "id": 534, - "name": "雾海云间的转还", - "type": "weapon", - "star": 5, - "items": { - "雾海云间的铅丹": { - "id": 531, - "name": "雾海云间的铅丹", - "type": "weapon", - "star": 2 - }, - "雾海云间的汞丹": { - "id": 532, - "name": "雾海云间的汞丹", - "type": "weapon", - "star": 3 - }, - "雾海云间的金丹": { - "id": 533, - "name": "雾海云间的金丹", - "type": "weapon", - "star": 4 - }, - "雾海云间的转还": { - "id": 534, - "name": "雾海云间的转还", - "type": "weapon", - "star": 5 - } - } - }, - "石化的骨片": { - "id": 143, - "name": "石化的骨片", - "type": "monster", - "star": 4, - "items": { - "脆弱的骨片": { - "id": 141, - "name": "脆弱的骨片", - "type": "monster", - "star": 2 - }, - "结实的骨片": { - "id": 142, - "name": "结实的骨片", - "type": "monster", - "star": 3 - }, - "石化的骨片": { - "id": 143, - "name": "石化的骨片", - "type": "monster", - "star": 4 - } - } - }, - "漆黑陨铁的一块": { - "id": 554, - "name": "漆黑陨铁的一块", - "type": "weapon", - "star": 5, - "items": { - "漆黑陨铁的一粒": { - "id": 551, - "name": "漆黑陨铁的一粒", - "type": "weapon", - "star": 2 - }, - "漆黑陨铁的一片": { - "id": 552, - "name": "漆黑陨铁的一片", - "type": "weapon", - "star": 3 - }, - "漆黑陨铁的一角": { - "id": 553, - "name": "漆黑陨铁的一角", - "type": "weapon", - "star": 4 - }, - "漆黑陨铁的一块": { - "id": 554, - "name": "漆黑陨铁的一块", - "type": "weapon", - "star": 5 - } - } - }, - "幽邃刻像": { - "id": 153, - "name": "幽邃刻像", - "type": "monster", - "star": 4, - "items": { - "晦暗刻像": { - "id": 151, - "name": "晦暗刻像", - "type": "monster", - "star": 2 - }, - "夤夜刻像": { - "id": 152, - "name": "夤夜刻像", - "type": "monster", - "star": 3 - }, - "幽邃刻像": { - "id": 153, - "name": "幽邃刻像", - "type": "monster", - "star": 4 - } - } - }, - "今昔剧画之鬼人": { - "id": 584, - "name": "今昔剧画之鬼人", - "type": "weapon", - "star": 5, - "items": { - "今昔剧画之恶尉": { - "id": 581, - "name": "今昔剧画之恶尉", - "type": "weapon", - "star": 2 - }, - "今昔剧画之虎啮": { - "id": 582, - "name": "今昔剧画之虎啮", - "type": "weapon", - "star": 3 - }, - "今昔剧画之一角": { - "id": 583, - "name": "今昔剧画之一角", - "type": "weapon", - "star": 4 - }, - "今昔剧画之鬼人": { - "id": 584, - "name": "今昔剧画之鬼人", - "type": "weapon", - "star": 5 - } - } - }, - "混沌锚栓": { - "id": "n112070", - "name": "混沌锚栓", - "type": "monster", - "star": 4, - "items": { - "混沌容器": { - "id": "n112068", - "name": "混沌容器", - "type": "monster", - "star": 2 - }, - "混沌模块": { - "id": "n112069", - "name": "混沌模块", - "type": "monster", - "star": 3 - }, - "混沌锚栓": { - "id": "n112070", - "name": "混沌锚栓", - "type": "monster", - "star": 4 - } - } - }, - "谧林涓露的金符": { - "id": "n114040", - "name": "谧林涓露的金符", - "type": "weapon", - "star": 5, - "items": { - "谧林涓露的铜符": { - "id": "n114037", - "name": "谧林涓露的铜符", - "type": "weapon", - "star": 2 - }, - "谧林涓露的铁符": { - "id": "n114038", - "name": "谧林涓露的铁符", - "type": "weapon", - "star": 3 - }, - "谧林涓露的银符": { - "id": "n114039", - "name": "谧林涓露的银符", - "type": "weapon", - "star": 4 - }, - "谧林涓露的金符": { - "id": "n114040", - "name": "谧林涓露的金符", - "type": "weapon", - "star": 5 - } - } - }, - "辉光棱晶": { - "id": "n112073", - "name": "辉光棱晶", - "type": "monster", - "star": 4, - "items": { - "破缺棱晶": { - "id": "n112071", - "name": "破缺棱晶", - "type": "monster", - "star": 2 - }, - "混浊棱晶": { - "id": "n112072", - "name": "混浊棱晶", - "type": "monster", - "star": 3 - }, - "辉光棱晶": { - "id": "n112073", - "name": "辉光棱晶", - "type": "monster", - "star": 4 - } - } - }, - "鸣神御灵的勇武": { - "id": 574, - "name": "鸣神御灵的勇武", - "type": "weapon", - "star": 5, - "items": { - "鸣神御灵的明惠": { - "id": 571, - "name": "鸣神御灵的明惠", - "type": "weapon", - "star": 2 - }, - "鸣神御灵的欢喜": { - "id": 572, - "name": "鸣神御灵的欢喜", - "type": "weapon", - "star": 3 - }, - "鸣神御灵的亲爱": { - "id": 573, - "name": "鸣神御灵的亲爱", - "type": "weapon", - "star": 4 - }, - "鸣神御灵的勇武": { - "id": 574, - "name": "鸣神御灵的勇武", - "type": "weapon", - "star": 5 - } - } - }, - "烈日威权的旧日": { - "id": "n114048", - "name": "烈日威权的旧日", - "type": "weapon", - "star": 5, - "items": { - "烈日威权的残响": { - "id": "n114045", - "name": "烈日威权的残响", - "type": "weapon", - "star": 2 - }, - "烈日威权的余光": { - "id": "n114046", - "name": "烈日威权的余光", - "type": "weapon", - "star": 3 - }, - "烈日威权的梦想": { - "id": "n114047", - "name": "烈日威权的梦想", - "type": "weapon", - "star": 4 - }, - "烈日威权的旧日": { - "id": "n114048", - "name": "烈日威权的旧日", - "type": "weapon", - "star": 5 - } - } - }, - "隐兽鬼爪": { - "id": 176, - "name": "隐兽鬼爪", - "type": "monster", - "star": 4, - "items": { - "隐兽指爪": { - "id": 174, - "name": "隐兽指爪", - "type": "monster", - "star": 2 - }, - "隐兽利爪": { - "id": 175, - "name": "隐兽利爪", - "type": "monster", - "star": 3 - }, - "隐兽鬼爪": { - "id": 176, - "name": "隐兽鬼爪", - "type": "monster", - "star": 4 - } - } - }, - "绿洲花园的真谛": { - "id": "n114044", - "name": "绿洲花园的真谛", - "type": "weapon", - "star": 5, - "items": { - "绿洲花园的追忆": { - "id": "n114041", - "name": "绿洲花园的追忆", - "type": "weapon", - "star": 2 - }, - "绿洲花园的恩惠": { - "id": "n114042", - "name": "绿洲花园的恩惠", - "type": "weapon", - "star": 3 - }, - "绿洲花园的哀思": { - "id": "n114043", - "name": "绿洲花园的哀思", - "type": "weapon", - "star": 4 - }, - "绿洲花园的真谛": { - "id": "n114044", - "name": "绿洲花园的真谛", - "type": "weapon", - "star": 5 - } - } - }, - "偏光棱镜": { - "id": 183, - "name": "偏光棱镜", - "type": "monster", - "star": 4, - "items": { - "黯淡棱镜": { - "id": 181, - "name": "黯淡棱镜", - "type": "monster", - "star": 2 - }, - "水晶棱镜": { - "id": 182, - "name": "水晶棱镜", - "type": "monster", - "star": 3 - }, - "偏光棱镜": { - "id": 183, - "name": "偏光棱镜", - "type": "monster", - "star": 4 - } - } - }, - "茁壮菌核": { - "id": "n112064", - "name": "茁壮菌核", - "type": "monster", - "star": 4, - "items": { - "失活菌核": { - "id": "n112062", - "name": "失活菌核", - "type": "monster", - "star": 2 - }, - "休眠菌核": { - "id": "n112063", - "name": "休眠菌核", - "type": "monster", - "star": 3 - }, - "茁壮菌核": { - "id": "n112064", - "name": "茁壮菌核", - "type": "monster", - "star": 4 - } - } - }, - "苍砾蕊羽": { - "id": "n113044", - "name": "苍砾蕊羽", - "type": "boss", - "star": 4 - }, - "沙脂蛹": { - "id": "n101222", - "name": "沙脂蛹", - "type": "specialty", - "star": 1 - }, - "锲纹的横脊": { - "id": "n112076", - "name": "锲纹的横脊", - "type": "monster", - "star": 4, - "items": { - "残毁的横脊": { - "id": "n112074", - "name": "残毁的横脊", - "type": "monster", - "star": 2 - }, - "密固的横脊": { - "id": "n112075", - "name": "密固的横脊", - "type": "monster", - "star": 3 - }, - "锲纹的横脊": { - "id": "n112076", - "name": "锲纹的横脊", - "type": "monster", - "star": 4 - } - } } } \ No newline at end of file diff --git a/tools/char-data.js b/tools/char-data.js index 822d711b..9c581f2e 100644 --- a/tools/char-data.js +++ b/tools/char-data.js @@ -1,4 +1,3 @@ -import fs from 'fs' import cheerio from 'cheerio' import lodash from 'lodash' import fetch from 'node-fetch' @@ -7,14 +6,7 @@ import CharData from './sprider/CharData.js' import { Data } from '../components/index.js' import tId from './sprider/TalentId.js' -const _path = process.cwd() -const _root = _path + '/plugins/miao-plugin/' -const _mRoot = _root + 'resources/meta/material/' - -let mData = {} -if (fs.existsSync(_mRoot + 'data.json')) { - mData = JSON.parse(fs.readFileSync(_mRoot + 'data.json', 'utf8')) -} +let mData = Data.readJSON('/resources/meta/material/data.json') const tElems = ['anemo', 'geo', 'electro', 'dendro'] @@ -83,12 +75,6 @@ let getCharData = async function (id, key, name = '', _id = id) { detail.attr = attr detail.elem = tElems[idx] details.push(detail) - lodash.forEach(detail.talent, (ds, k) => { - talentKey[ds.id] = k - if (k === 'e' || k === 'q') { - talentElem[ds.id] = tElems[idx] - } - }) const te = { anemo: 4, geo: 6, @@ -99,6 +85,12 @@ let getCharData = async function (id, key, name = '', _id = id) { lodash.forEach(tId[cid].ProudMap || {}, (v, k) => { talentId[k] = v }) + lodash.forEach(detail.talent, (ds, k) => { + talentKey[ds.id] = k + if (k === 'e' || k === 'q') { + talentElem[ds.id] = tElems[idx] + } + }) } } else { let detail = CharData.getDetail({ $, id, name }) @@ -107,10 +99,18 @@ let getCharData = async function (id, key, name = '', _id = id) { } let detail = details[0] let { talent, cons } = detail - data.talentKey = talentKey || lodash.invert(lodash.mapValues(talent, (t) => t.id)) - data.talentId = talentId + talentKey = talentKey || lodash.invert(lodash.mapValues(talent, (t) => t.id)) + data.talentId = {} + let talentKeyId = {} + lodash.forEach(talentId, (tid, id) => { + data.talentId[id] = talentKey[tid] + talentKeyId[tid] = id + }) if (data.elem === 'multi') { - data.talentElem = talentElem + data.talentElem = {} + lodash.forEach(talentElem, (elem, tid) => { + data.talentElem[talentKeyId[tid]] = elem + }) } data.talentCons = CharData.getConsTalent(talent, cons) data.materials = CharData.getMaterials($, mData) @@ -158,14 +158,17 @@ async function saveCharData (id, key, name = '', force = false, _id = id) { if (eta[name]) { data.eta = new Date(`${eta[name]} 10:00:00`) * 1 } - let charPath = `${_path}/plugins/miao-plugin/resources/meta/character/${name}/` - fs.writeFileSync(`${charPath}data.json`, JSON.stringify(data, '', 2).replaceAll('\n', '\r\n')) + let charPath = `/resources/meta/character/${name}/` + // fs.writeFileSync(`${charPath}data.json`, JSON.stringify(data, '', 2).replaceAll('\n', '\r\n')) + Data.writeJSON({ path: charPath, name: 'data.json', data, rn: true }) if (details.length === 1) { - fs.writeFileSync(`${charPath}detail.json`, JSON.stringify(details[0], '', 2).replaceAll('\n', '\r\n')) + // fs.writeFileSync(`${charPath}detail.json`, JSON.stringify(details[0], '', 2).replaceAll('\n', '\r\n')) + Data.writeJSON({ path: charPath, name: 'detail.json', data: details[0], rn: true }) } else if (data.id === 20000000) { for (let idx in details) { let detail = details[idx] - fs.writeFileSync(`${charPath}/${detail.elem}/detail.json`, JSON.stringify(detail, '', 2).replaceAll('\n', '\r\n')) + // fs.writeFileSync(`${charPath}/${detail.elem}/detail.json`, JSON.stringify(detail, '', 2).replaceAll('\n', '\r\n')) + Data.writeJSON({ path: `${charPath}/${detail.elem}`, name: 'detail.json', data: detail, rn: true }) } } @@ -187,12 +190,13 @@ async function down (name = '', force = false) { ds = ds.split(',') ds = { key: ds[0], name: ds[1] } } + if (!names.includes(id) && !names.includes(ds.key) && !names.includes(ds.name)) { continue } await saveCharData(ds.id || id, ds.key, ds.name, force, id) } - fs.writeFileSync(`${_mRoot}data.json`, JSON.stringify(mData, '', 2).replaceAll('\n', '\r\n')) + Data.writeJSON({ name: '/resources/meta/material/data.json', data: mData, rn: true }) } const charData = { @@ -275,4 +279,4 @@ let eta = { 迪希雅: '2023-03-01', 米卡: '2023-03-01' } -await down('迪希雅,米卡', true) +await down('香菱', true)