From d0b9d4c175c037b07d197745bddb51ec72ec4026 Mon Sep 17 00:00:00 2001 From: Kokomi <102026640+yoimiya-kokomi@users.noreply.github.com> Date: Wed, 22 Feb 2023 01:26:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9F=83=E6=B4=9B=E4=BC=8A?= =?UTF-8?q?=E7=9A=84=E5=A4=B4=E5=83=8F=EF=BC=8C=E9=83=A8=E5=88=86Mys?= =?UTF-8?q?=E8=AF=B7=E6=B1=82=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/profile/ProfileStat.js | 2 +- components/Data.js | 22 +- models/MysApi.js | 21 +- models/Player.js | 4 - models/player/EnkaData.js | 7 +- models/player/MiaoData.js | 14 +- models/player/MysAvatar.js | 22 - resources/meta/character/七七/data.json | 11 +- resources/meta/character/丽莎/data.json | 11 +- resources/meta/character/久岐忍/data.json | 11 +- .../meta/character/九条裟罗/data.json | 11 +- resources/meta/character/云堇/data.json | 11 +- resources/meta/character/五郎/data.json | 11 +- resources/meta/character/优菈/data.json | 11 +- .../meta/character/八重神子/data.json | 11 +- resources/meta/character/凝光/data.json | 11 +- resources/meta/character/凯亚/data.json | 11 +- resources/meta/character/刻晴/data.json | 11 +- resources/meta/character/北斗/data.json | 11 +- resources/meta/character/可莉/data.json | 11 +- resources/meta/character/坎蒂丝/data.json | 11 +- resources/meta/character/埃洛伊/data.json | 11 +- .../meta/character/埃洛伊/imgs/face-q.webp | Bin 0 -> 50706 bytes resources/meta/character/多莉/data.json | 11 +- resources/meta/character/夜兰/data.json | 11 +- resources/meta/character/夜兰/detail.json | 62 + resources/meta/character/妮露/data.json | 13 +- resources/meta/character/安柏/data.json | 11 +- resources/meta/character/宵宫/data.json | 11 +- resources/meta/character/宵宫/detail.json | 124 ++ resources/meta/character/托马/data.json | 11 +- resources/meta/character/托马/detail.json | 62 + resources/meta/character/提纳里/data.json | 11 +- .../meta/character/提纳里/detail.json | 62 + resources/meta/character/旅行者/data.json | 53 +- resources/meta/character/早柚/data.json | 11 +- .../meta/character/枫原万叶/data.json | 11 +- .../meta/character/枫原万叶/detail.json | 62 + resources/meta/character/柯莱/data.json | 11 +- resources/meta/character/流浪者/data.json | 11 +- resources/meta/character/温迪/data.json | 11 +- resources/meta/character/烟绯/data.json | 11 +- .../meta/character/珊瑚宫心海/data.json | 11 +- resources/meta/character/珐露珊/data.json | 11 +- resources/meta/character/班尼特/data.json | 11 +- resources/meta/character/琴/data.json | 11 +- resources/meta/character/瑶瑶/data.json | 11 +- resources/meta/character/甘雨/data.json | 11 +- resources/meta/character/申鹤/data.json | 11 +- resources/meta/character/砂糖/data.json | 11 +- .../meta/character/神里绫人/data.json | 11 +- .../meta/character/神里绫人/detail.json | 62 + .../meta/character/神里绫华/data.json | 11 +- resources/meta/character/空/data.json | 53 +- resources/meta/character/米卡/data.json | 5 - resources/meta/character/纳西妲/data.json | 11 +- .../meta/character/罗莎莉亚/data.json | 11 +- .../meta/character/罗莎莉亚/detail.json | 62 + resources/meta/character/胡桃/data.json | 11 +- .../meta/character/艾尔海森/data.json | 11 +- resources/meta/character/芭芭拉/data.json | 11 +- .../meta/character/荒泷一斗/data.json | 11 +- resources/meta/character/荧/data.json | 53 +- resources/meta/character/莫娜/data.json | 11 +- resources/meta/character/莱依拉/data.json | 11 +- resources/meta/character/菲谢尔/data.json | 11 +- resources/meta/character/行秋/data.json | 11 +- resources/meta/character/诺艾尔/data.json | 11 +- resources/meta/character/赛诺/data.json | 11 +- resources/meta/character/辛焱/data.json | 11 +- .../meta/character/达达利亚/data.json | 11 +- .../meta/character/达达利亚/detail.json | 62 + resources/meta/character/迪卢克/data.json | 11 +- resources/meta/character/迪奥娜/data.json | 11 +- resources/meta/character/迪希雅/data.json | 5 - resources/meta/character/重云/data.json | 11 +- resources/meta/character/钟离/data.json | 11 +- resources/meta/character/钟离/detail.json | 62 + resources/meta/character/阿贝多/data.json | 11 +- resources/meta/character/雷泽/data.json | 11 +- .../meta/character/雷电将军/data.json | 11 +- resources/meta/character/香菱/data.json | 11 +- resources/meta/character/香菱/detail.json | 199 +- resources/meta/character/魈/data.json | 11 +- .../meta/character/鹿野院平藏/data.json | 11 +- resources/meta/material/data.json | 1949 +---------------- tools/char-data.js | 52 +- 87 files changed, 987 insertions(+), 2778 deletions(-) create mode 100644 resources/meta/character/埃洛伊/imgs/face-q.webp 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 0000000000000000000000000000000000000000..e69a211944fd85d822eb469428d5d3f8bf963a56 GIT binary patch literal 50706 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 literal 0 HcmV?d00001 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)