From e5a3ccedb58db83d43ede092b9da4719c181f0a2 Mon Sep 17 00:00:00 2001 From: yoimiya-kokomi <592981798@qq.com> Date: Thu, 13 Oct 2022 01:24:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=BA=B3=E8=A5=BF=E5=A6=B2?= =?UTF-8?q?=E3=80=81=E8=8E=B1=E4=BE=9D=E8=8F=88=E7=9A=84=E5=A4=A9=E8=B5=8B?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/meta/character/纳西妲/data.json | 6 +- .../meta/character/纳西妲/detail.json | 262 +++++++++--------- resources/meta/character/莱依拉/data.json | 8 +- .../meta/character/莱依拉/detail.json | 180 ++++++------ resources/meta/character/魈/calc.js | 4 +- tools/artis-data-sprider.js | 16 +- tools/sprider/CharData.js | 4 +- 7 files changed, 237 insertions(+), 243 deletions(-) diff --git a/resources/meta/character/纳西妲/data.json b/resources/meta/character/纳西妲/data.json index f8fd3d3a..acdd2850 100644 --- a/resources/meta/character/纳西妲/data.json +++ b/resources/meta/character/纳西妲/data.json @@ -5,11 +5,11 @@ "title": "白草净华", "star": 5, "elem": "dendro", - "allegiance": "？？？", + "allegiance": "须弥城", "weapon": "catalyst", - "birth": "1-1", + "birth": "10-27", "astro": "智慧主座", - "desc": "测试角色", + "desc": "深居净善宫的笼中之鸟，只能在梦中将世界尽收眼底。", "cncv": "？？？", "jpcv": "？？？", "costume": false, diff --git a/resources/meta/character/纳西妲/detail.json b/resources/meta/character/纳西妲/detail.json index c45b2f57..e1468aee 100644 --- a/resources/meta/character/纳西妲/detail.json +++ b/resources/meta/character/纳西妲/detail.json @@ -258,21 +258,21 @@ "unit": "", "isSame": false, "values": [ - "103.2%攻击力 + 206.4%元素精通", - "110.94%攻击力 + 221.88%元素精通", - "118.68%攻击力 + 237.36%元素精通", - "129%攻击力 + 258%元素精通", - "136.74%攻击力 + 273.48%元素精通", - "144.48%攻击力 + 288.96%元素精通", - "154.8%攻击力 + 309.6%元素精通", - "165.12%攻击力 + 330.24%元素精通", - "175.44%攻击力 + 350.88%元素精通", - "185.76%攻击力 + 371.52%元素精通", - "196.08%攻击力 + 392.16%元素精通", - "206.4%攻击力 + 412.8%元素精通", - "219.3%攻击力 + 438.6%元素精通", - "232.2%攻击力 + 464.4%元素精通", - "245.1%攻击力 + 490.2%元素精通" + "103.2%攻击 + 206.4%精通", + "110.94%攻击 + 221.88%精通", + "118.68%攻击 + 237.36%精通", + "129%攻击 + 258%精通", + "136.74%攻击 + 273.48%精通", + "144.48%攻击 + 288.96%精通", + "154.8%攻击 + 309.6%精通", + "165.12%攻击 + 330.24%精通", + "175.44%攻击 + 350.88%精通", + "185.76%攻击 + 371.52%精通", + "196.08%攻击 + 392.16%精通", + "206.4%攻击 + 412.8%精通", + "219.3%攻击 + 438.6%精通", + "232.2%攻击 + 464.4%精通", + "245.1%攻击 + 490.2%精通" ] }, { @@ -280,21 +280,21 @@ "unit": "", "isSame": true, "values": [ - "1.9秒", - "1.9秒", - "1.9秒", - "1.9秒", - "1.9秒", - "1.9秒", - "1.9秒", - "1.9秒", - "1.9秒", - "1.9秒", - "1.9秒", - "1.9秒", - "1.9秒", - "1.9秒", - "1.9秒" + "2.5秒", + "2.5秒", + "2.5秒", + "2.5秒", + "2.5秒", + "2.5秒", + "2.5秒", + "2.5秒", + "2.5秒", + "2.5秒", + "2.5秒", + "2.5秒", + "2.5秒", + "2.5秒", + "2.5秒" ] }, { @@ -302,21 +302,21 @@ "unit": "", "isSame": true, "values": [ - "20秒", - "20秒", - "20秒", - "20秒", - "20秒", - "20秒", - "20秒", - "20秒", - "20秒", - "20秒", - "20秒", - "20秒", - "20秒", - "20秒", - "20秒" + "25秒", + "25秒", + "25秒", + "25秒", + "25秒", + "25秒", + "25秒", + "25秒", + "25秒", + "25秒", + "25秒", + "25秒", + "25秒", + "25秒", + "25秒" ] }, { @@ -384,21 +384,21 @@ "unit": "1名角色", "isSame": false, "values": [ - "11.12%", - "11.95%", - "12.79%", - "13.9%", - "14.73%", - "15.57%", - "16.68%", - "17.79%", - "18.9%", - "20.02%", - "21.13%", - "22.24%", - "23.63%", - "25.02%", - "26.41%" + "14.88%", + "16%", + "17.11%", + "18.6%", + "19.72%", + "20.83%", + "22.32%", + "23.81%", + "25.3%", + "26.78%", + "28.27%", + "29.76%", + "31.62%", + "33.48%", + "35.34%" ] }, { @@ -406,49 +406,27 @@ "unit": "2名角色", "isSame": false, "values": [ - "16.72%", - "17.97%", - "19.23%", - "20.9%", - "22.15%", - "23.41%", - "25.08%", - "26.75%", - "28.42%", - "30.1%", - "31.77%", - "33.44%", - "35.53%", - "37.62%", - "39.71%" + "22.32%", + "23.99%", + "25.67%", + "27.9%", + "29.57%", + "31.25%", + "33.48%", + "35.71%", + "37.94%", + "40.18%", + "42.41%", + "44.64%", + "47.43%", + "50.22%", + "53.01%" ] }, { "name": "雷：间隔降低", "unit": "1名角色", "isSame": false, - "values": [ - "0.17秒", - "0.18秒", - "0.19秒", - "0.21秒", - "0.22秒", - "0.23秒", - "0.25秒", - "0.27秒", - "0.28秒", - "0.3秒", - "0.32秒", - "0.33秒", - "0.35秒", - "0.38秒", - "0.4秒" - ] - }, - { - "name": "雷：间隔降低", - "unit": "2名角色", - "isSame": false, "values": [ "0.25秒", "0.27秒", @@ -456,37 +434,59 @@ "0.31秒", "0.33秒", "0.35秒", - "0.38秒", + "0.37秒", "0.4秒", - "0.43秒", + "0.42秒", "0.45秒", - "0.48秒", + "0.47秒", "0.5秒", "0.53秒", "0.56秒", "0.59秒" ] }, + { + "name": "雷：间隔降低", + "unit": "2名角色", + "isSame": false, + "values": [ + "0.37秒", + "0.4秒", + "0.43秒", + "0.47秒", + "0.49秒", + "0.52秒", + "0.56秒", + "0.6秒", + "0.63秒", + "0.67秒", + "0.71秒", + "0.74秒", + "0.79秒", + "0.84秒", + "0.88秒" + ] + }, { "name": "水：持续时间延长", "unit": "1名角色", "isSame": false, "values": [ - "2.22秒", - "2.39秒", - "2.56秒", - "2.78秒", - "2.95秒", - "3.11秒", "3.34秒", - "3.56秒", - "3.78秒", - "4秒", - "4.23秒", - "4.45秒", - "4.73秒", - "5秒", - "5.28秒" + "3.59秒", + "3.85秒", + "4.18秒", + "4.43秒", + "4.68秒", + "5.02秒", + "5.35秒", + "5.68秒", + "6.02秒", + "6.35秒", + "6.69秒", + "7.11秒", + "7.52秒", + "7.94秒" ] }, { @@ -494,21 +494,21 @@ "unit": "2名角色", "isSame": false, "values": [ - "3.34秒", - "3.59秒", - "3.84秒", - "4.17秒", - "4.42秒", - "4.67秒", - "5.01秒", - "5.34秒", - "5.67秒", - "6.01秒", - "6.34秒", - "6.67秒", - "7.09秒", - "7.51秒", - "7.92秒" + "5.02秒", + "5.39秒", + "5.77秒", + "6.27秒", + "6.65秒", + "7.02秒", + "7.52秒", + "8.03秒", + "8.53秒", + "9.03秒", + "9.53秒", + "10.03秒", + "10.66秒", + "11.29秒", + "11.91秒" ] }, { @@ -636,8 +636,8 @@ "name": "净善摄受明论", "desc": [ "施放心景幻成时，摩耶之殿将获得以下效果：", - "依据队伍中元素精通最高的角色的元素精通数值的20%，提高领域内当前场上角色的元素精通。", - "通过这种方式，至多提升200点元素精通。" + "依据队伍中元素精通最高的角色的元素精通数值的25%，提高领域内当前场上角色的元素精通。", + "通过这种方式，至多提升250点元素精通。" ] }, { diff --git a/resources/meta/character/莱依拉/data.json b/resources/meta/character/莱依拉/data.json index 2c585c1a..0a0a2581 100644 --- a/resources/meta/character/莱依拉/data.json +++ b/resources/meta/character/莱依拉/data.json @@ -4,12 +4,12 @@ "abbr": "莱依拉", "title": "绮思晚星", "star": 4, - "elem": "hydro", - "allegiance": "？？？", + "elem": "cryo", + "allegiance": "梨多梵谛学院", "weapon": "sword", - "birth": "1-1", + "birth": "12-19", "astro": "夜莺座", - "desc": "测试角色", + "desc": "专攻理论星相学的梨多梵谛学院学生。时常梦游，长期缺觉，饱受睡眠问题困扰。", "cncv": "？？？", "jpcv": "？？？", "costume": false, diff --git a/resources/meta/character/莱依拉/detail.json b/resources/meta/character/莱依拉/detail.json index 4104215d..f245779c 100644 --- a/resources/meta/character/莱依拉/detail.json +++ b/resources/meta/character/莱依拉/detail.json @@ -189,21 +189,21 @@ "unit": "", "isSame": false, "values": [ - "14.85%", - "15.96%", - "17.08%", - "18.56%", - "19.67%", - "20.79%", - "22.27%", - "23.76%", - "25.24%", - "26.73%", - "28.21%", - "29.7%", - "31.55%", - "33.41%", - "35.26%" + "12.8%", + "13.76%", + "14.72%", + "16%", + "16.96%", + "17.92%", + "19.2%", + "20.48%", + "21.76%", + "23.04%", + "24.32%", + "25.6%", + "27.2%", + "28.8%", + "30.4%" ] }, { @@ -211,21 +211,21 @@ "unit": "", "isSame": false, "values": [ - "17.08%", - "18.36%", - "19.64%", - "21.34%", - "22.62%", - "23.91%", - "25.61%", - "27.32%", - "29.03%", - "30.74%", - "32.44%", - "34.15%", - "36.28%", - "38.42%", - "40.55%" + "14.72%", + "15.82%", + "16.93%", + "18.4%", + "19.5%", + "20.61%", + "22.08%", + "23.55%", + "25.02%", + "26.5%", + "27.97%", + "29.44%", + "31.28%", + "33.12%", + "34.96%" ] }, { @@ -277,21 +277,21 @@ "unit": "", "isSame": true, "values": [ - "15秒", - "15秒", - "15秒", - "15秒", - "15秒", - "15秒", - "15秒", - "15秒", - "15秒", - "15秒", - "15秒", - "15秒", - "15秒", - "15秒", - "15秒" + "12秒", + "12秒", + "12秒", + "12秒", + "12秒", + "12秒", + "12秒", + "12秒", + "12秒", + "12秒", + "12秒", + "12秒", + "12秒", + "12秒", + "12秒" ] } ] @@ -310,21 +310,21 @@ "unit": "生命值上限", "isSame": false, "values": [ - "7.05%", - "7.58%", - "8.11%", - "8.81%", - "9.34%", - "9.87%", - "10.57%", - "11.28%", - "11.98%", - "12.69%", - "13.39%", - "14.1%", - "14.98%", - "15.86%", - "16.74%" + "4.65%", + "5%", + "5.35%", + "5.81%", + "6.16%", + "6.51%", + "6.97%", + "7.44%", + "7.9%", + "8.37%", + "8.83%", + "9.3%", + "9.88%", + "10.46%", + "11.04%" ] }, { @@ -354,21 +354,21 @@ "unit": "", "isSame": true, "values": [ - "15秒", - "15秒", - "15秒", - "15秒", - "15秒", - "15秒", - "15秒", - "15秒", - "15秒", - "15秒", - "15秒", - "15秒", - "15秒", - "15秒", - "15秒" + "12秒", + "12秒", + "12秒", + "12秒", + "12秒", + "12秒", + "12秒", + "12秒", + "12秒", + "12秒", + "12秒", + "12秒", + "12秒", + "12秒", + "12秒" ] }, { @@ -376,21 +376,21 @@ "unit": "", "isSame": true, "values": [ - "60", - "60", - "60", - "60", - "60", - "60", - "60", - "60", - "60", - "60", - "60", - "60", - "60", - "60", - "60" + "40", + "40", + "40", + "40", + "40", + "40", + "40", + "40", + "40", + "40", + "40", + "40", + "40", + "40", + "40" ] } ] diff --git a/resources/meta/character/魈/calc.js b/resources/meta/character/魈/calc.js index ff679378..7b1968ce 100644 --- a/resources/meta/character/魈/calc.js +++ b/resources/meta/character/魈/calc.js @@ -2,8 +2,8 @@ export const details = [{ title: '风轮两立', dmg: ({ talent }, dmg) => dmg(talent.e['技能伤害'], 'e') }, { - title: '满层被动E', - params: { e: 1 }, + title: '开Q满被动E', + params: { e: 1, layer: 5 }, dmg: ({ talent }, dmg) => dmg(talent.e['技能伤害'], 'e') }, { title: '靖妖傩舞·首插', diff --git a/tools/artis-data-sprider.js b/tools/artis-data-sprider.js index 62b18e9f..fc01b19f 100644 --- a/tools/artis-data-sprider.js +++ b/tools/artis-data-sprider.js @@ -2,10 +2,9 @@ import fs from 'fs' import cheerio from 'cheerio' import fetch from 'node-fetch' import { Data } from '../components/index.js' -import lodash from "lodash"; -import request from "request"; +import lodash from 'lodash' +import request from 'request' -const _path = process.cwd() const artiIdx = { Flower: 1, @@ -15,14 +14,6 @@ const artiIdx = { Circlet: 5 } -function getEffect (txt) { - let regRet = /(\d) Piece:/.exec(txt) - if (regRet) { - return [regRet[1], txt.replace(regRet[0], '').trim().replace(/。$/, '')] - } - return [] -} - async function getSets (id) { const url = `https://genshin.honeyhunterworld.com/i_${id}/?lang=CHS` let req = await fetch(url) @@ -31,6 +22,7 @@ async function getSets (id) { let ret = {} if (sTxt && sTxt[1]) { + // eslint-disable-next-line no-eval let arrs = eval(sTxt[1]) lodash.forEach(arrs, (ds) => { let $ = cheerio.load(ds.join('')) @@ -54,10 +46,10 @@ async function down () { let txt = await req.text() let ret = {} - let tmp = {} let sTxt = /sortable_data.push\((.*)\)/.exec(txt) if (sTxt && sTxt[1]) { + // eslint-disable-next-line no-eval let tmp = eval(sTxt[1]) lodash.forEach(tmp, (ds) => { let na = cheerio.load(ds[0])('a:last') diff --git a/tools/sprider/CharData.js b/tools/sprider/CharData.js index a6a8ba11..9f277a54 100644 --- a/tools/sprider/CharData.js +++ b/tools/sprider/CharData.js @@ -184,6 +184,8 @@ const CharData = { let val = lodash.trim($(this).text()) let v = val.replace(/(生命值上限|最大生命值)/, 'HP') v = v.replace(/(防御力)/, '防御') + v = v.replace('元素精通', '精通') + v = v.replace('攻击力', '攻击') values.push(v) if (i > 0 && values[0] !== val) { isSame = false @@ -198,7 +200,7 @@ const CharData = { values2.push(ur[2]) unit = ur[1] } else { - ur = /^(每层)(.*)(攻击力)$/.exec(val) + ur = /^(每层)(.*)(攻击力?)$/.exec(val) if (ur && ur[1] && ur[2] && ur[3]) { values2.push(ur[2]) unit = ur[1] + ' ' + ur[3]