diff --git a/resources/meta/info/pool.js b/resources/meta/info/pool.js index 6a96c24b..fb0364d9 100644 --- a/resources/meta/info/pool.js +++ b/resources/meta/info/pool.js @@ -446,7 +446,7 @@ export const poolDetail = [{ }, { version: '3.6', half: '下半', - from: '2023-05-02 18:59:59', + from: '2023-05-02 18:00:00', to: '2023-05-23 14:59:59', char5: ['白术', '甘雨'], char4: ['坎蒂丝', '菲谢尔', '卡维'], diff --git a/resources/meta/material/data.json b/resources/meta/material/data.json index 9e6c6c5f..121ac9b9 100644 --- a/resources/meta/material/data.json +++ b/resources/meta/material/data.json @@ -44,25 +44,25 @@ "star": 1 }, "孢囊晶尘": { - "id": "n112061", + "id": 112061, "name": "孢囊晶尘", "type": "normal", "star": 3, "items": { "蕈兽孢子": { - "id": "n112059", + "id": 112059, "name": "蕈兽孢子", "type": "normal", "star": 1 }, "荧光孢粉": { - "id": "n112060", + "id": 112060, "name": "荧光孢粉", "type": "normal", "star": 2 }, "孢囊晶尘": { - "id": "n112061", + "id": 112061, "name": "孢囊晶尘", "type": "normal", "star": 3 @@ -2086,5 +2086,31 @@ "name": "生长天地之蕨草", "type": "weekly", "star": 5 + }, + "漫游者的盛放之花": { + "id": 112079, + "name": "漫游者的盛放之花", + "type": "monster", + "star": 4, + "items": { + "来自何处的待放之花": { + "id": 112077, + "name": "来自何处的待放之花", + "type": "monster", + "star": 2 + }, + "何人所珍藏之花": { + "id": 112078, + "name": "何人所珍藏之花", + "type": "monster", + "star": 3 + }, + "漫游者的盛放之花": { + "id": 112079, + "name": "漫游者的盛放之花", + "type": "monster", + "star": 4 + } + } } } \ No newline at end of file diff --git a/resources/meta/material/monster/何人所珍藏之花.webp b/resources/meta/material/monster/何人所珍藏之花.webp new file mode 100644 index 00000000..a11d652b Binary files /dev/null and b/resources/meta/material/monster/何人所珍藏之花.webp differ diff --git a/resources/meta/material/monster/来自何处的待放之花.webp b/resources/meta/material/monster/来自何处的待放之花.webp new file mode 100644 index 00000000..4cc78e50 Binary files /dev/null and b/resources/meta/material/monster/来自何处的待放之花.webp differ diff --git a/resources/meta/material/monster/漫游者的盛放之花.webp b/resources/meta/material/monster/漫游者的盛放之花.webp new file mode 100644 index 00000000..d34f77d7 Binary files /dev/null and b/resources/meta/material/monster/漫游者的盛放之花.webp differ diff --git a/resources/meta/weapon/catalyst/calc.js b/resources/meta/weapon/catalyst/calc.js index b6cd3a24..e043275c 100644 --- a/resources/meta/weapon/catalyst/calc.js +++ b/resources/meta/weapon/catalyst/calc.js @@ -147,6 +147,12 @@ export default function (step, staticStep) { refine: { dmg: step(10, 4) } + }, + 碧落之珑: { + title: '释放元素爆发后基于生命值提高元素伤害[dmg]%', + data: { + dmg: (attr, calc, refine) => Math.min(Math.floor(calc(attr.hp) / 1000) * step(0.3, 0.2), step(12, 8)) + } } } } diff --git a/resources/meta/weapon/catalyst/data.json b/resources/meta/weapon/catalyst/data.json index 56992202..901ac764 100644 --- a/resources/meta/weapon/catalyst/data.json +++ b/resources/meta/weapon/catalyst/data.json @@ -153,5 +153,10 @@ "id": 14512, "name": "图莱杜拉的回忆", "star": 5 + }, + "碧落之珑": { + "id": 14505, + "name": "碧落之珑", + "star": 5 } } \ No newline at end of file diff --git a/resources/meta/weapon/catalyst/碧落之珑/awaken.webp b/resources/meta/weapon/catalyst/碧落之珑/awaken.webp new file mode 100644 index 00000000..d96f0c5e Binary files /dev/null and b/resources/meta/weapon/catalyst/碧落之珑/awaken.webp differ diff --git a/resources/meta/weapon/catalyst/碧落之珑/data.json b/resources/meta/weapon/catalyst/碧落之珑/data.json new file mode 100644 index 00000000..57b576ed --- /dev/null +++ b/resources/meta/weapon/catalyst/碧落之珑/data.json @@ -0,0 +1,73 @@ +{ + "id": 14505, + "name": "碧落之珑", + "affixTitle": "定土玉圭", + "star": 5, + "desc": "由碧色美玉雕成的礼器，放射着天空与碧水的光泽。", + "attr": { + "atk": { + "1": 45.94, + "20": 121.73, + "40": 235.2, + "50": 308.42, + "60": 382.43, + "70": 456.99, + "80": 532.23, + "90": 608.07, + "20+": 152.83, + "40+": 266.3, + "50+": 339.62, + "60+": 413.53, + "70+": 488.09, + "80+": 563.33 + }, + "bonusKey": "hpPct", + "bonusData": { + "1": 10.8, + "20": 19.08, + "40": 27.81, + "50": 32.17, + "60": 36.54, + "70": 40.89, + "80": 45.25, + "90": 49.62, + "20+": 19.08, + "40+": 27.81, + "50+": 32.17, + "60+": 36.54, + "70+": 40.89, + "80+": 45.25 + } + }, + "materials": { + "weapon": "孤云寒林的神体", + "monster": "漫游者的盛放之花", + "normal": "孢囊晶尘" + }, + "affixData": { + "text": "施放元素爆发或创造护盾后的3秒内，将产生「定土玉圭」效果：每2.5秒恢复$[0]点元素能量，并基于装备者的生命值上限，每1000点使其对应元素类型的元素伤害加成提高$[1]，至多提高$[2]。装备该武器的角色处于队伍后台时，依然能产生「定土玉圭」效果。", + "datas": { + "0": [ + "4.5", + "5", + "5.5", + "6", + "6.5" + ], + "1": [ + "0.3%", + "0.5%", + "0.7%", + "0.9%", + "1.1%" + ], + "2": [ + "12%", + "20%", + "28%", + "36%", + "44%" + ] + } + } +} \ No newline at end of file diff --git a/resources/meta/weapon/catalyst/碧落之珑/gacha.webp b/resources/meta/weapon/catalyst/碧落之珑/gacha.webp new file mode 100644 index 00000000..291b4b3b Binary files /dev/null and b/resources/meta/weapon/catalyst/碧落之珑/gacha.webp differ diff --git a/resources/meta/weapon/catalyst/碧落之珑/icon.webp b/resources/meta/weapon/catalyst/碧落之珑/icon.webp new file mode 100644 index 00000000..450c3321 Binary files /dev/null and b/resources/meta/weapon/catalyst/碧落之珑/icon.webp differ diff --git a/tools/weapon-data.js b/tools/weapon-data.js index 6ee875f7..61099b6a 100644 --- a/tools/weapon-data.js +++ b/tools/weapon-data.js @@ -35,12 +35,15 @@ let getWeaponTypeData = async function (type) { } }) let txt = await req.text() - let sTxt = /sortable_data.push\((.*)\)/.exec(txt) + let sTxt = /sortable_data.push\((\[.*?\])[\n\s]*\)/.exec(txt) + console.log('1', sTxt[1]) if (sTxt && sTxt[1]) { - let tmp = eval(sTxt[1]) + let tmp = eval(sTxt[1]) + lodash.forEach(tmp, (ds) => { let a = cheerio.load(ds[1])('a') let name = a.text() + console.log(a.attr('href')) let idRet = /i_(.*)\//.exec(a.attr('href')) let star = cheerio.load(ds[2])('img').length let wid = idRet && idRet[1] ? idRet[1] : '' @@ -53,6 +56,7 @@ let getWeaponTypeData = async function (type) { if (wid !== 'n' + tmp.id) { tmp.wid = wid } + console.log(tmp) ret[type][name] = tmp }) } @@ -145,4 +149,4 @@ async function down (t, n) { } // 'sword', 'claymore', 'polearm', 'bow', 'catalyst' -await down('claymore', '') +await down('catalyst', '')