diff --git a/models/character/CharImg.js b/models/character/CharImg.js
index 699c6fdd..e9b67182 100644
--- a/models/character/CharImg.js
+++ b/models/character/CharImg.js
@@ -115,8 +115,9 @@ const CharImg = {
tAdd(`passive${i}`, `icons/passive-${i}`)
}
imgs.a = `/common/item/atk-${weaponType}.webp`
- imgs.e = talentCons.e === 3 ? imgs.cons3 : imgs.cons5
- imgs.q = talentCons.q === 5 ? imgs.cons5 : imgs.cons3
+ for (let t of ['e', 'q']) {
+ imgs[t] = talentCons[t] > 0 ? imgs[`cons${talentCons[t]}`] : `${nPath}icons/talent-${t}.webp`
+ }
return imgs
},
getImgsSr (name, talentCons) {
diff --git a/models/character/CharTalent.js b/models/character/CharTalent.js
index 69ace5f5..7118e91a 100644
--- a/models/character/CharTalent.js
+++ b/models/character/CharTalent.js
@@ -9,7 +9,7 @@ const CharTalent = {
let { id, talentCons, game, isGs } = char
let ret = {}
let addTalent = {
- gs: { a: 0, e: 3, q: 3 },
+ gs: { a: 3, e: 3, q: 3 },
sr: { a: 1, e: 2, q: 2, t: 2 }
}
lodash.forEach(addTalent[game], (addNum, key) => {
@@ -33,9 +33,8 @@ const CharTalent = {
original = value
if (key === 'a' && isGs) {
level = aPlus ? value + 1 : value
- } else {
- level = cons >= talentCons[key] ? (value + addNum) : value
}
+ level = (talentCons[key] > 0 && cons >= talentCons[key]) ? (value + addNum) : value
}
}
if (mode === 'level') {
@@ -44,9 +43,8 @@ const CharTalent = {
level = value
if (key === 'a' && isGs) {
original = aPlus ? value - 1 : value
- } else {
- original = cons >= talentCons[key] ? (value - addNum) : value
}
+ original = (talentCons[key] > 0 && cons >= talentCons[key]) ? (value - addNum) : value
}
ret[key] = { level, original }
})
diff --git a/resources/meta/character/卡维/data.json b/resources/meta/character/卡维/data.json
index af3f50c2..e9cbfc15 100644
--- a/resources/meta/character/卡维/data.json
+++ b/resources/meta/character/卡维/data.json
@@ -29,6 +29,7 @@
"10815": "q"
},
"talentCons": {
+ "a": 0,
"e": 5,
"q": 3
},
diff --git a/resources/meta/character/卡维/detail.json b/resources/meta/character/卡维/detail.json
index 78869f7a..52dcb0a3 100644
--- a/resources/meta/character/卡维/detail.json
+++ b/resources/meta/character/卡维/detail.json
@@ -1,5 +1,5 @@
{
- "id": "81",
+ "id": 10000081,
"name": "卡维",
"talent": {
"a": {
diff --git a/resources/meta/character/林尼/data.json b/resources/meta/character/林尼/data.json
index eedd1b35..4db76c13 100644
--- a/resources/meta/character/林尼/data.json
+++ b/resources/meta/character/林尼/data.json
@@ -5,13 +5,13 @@
"title": "惑光幻戏",
"star": 5,
"elem": "pyro",
- "allegiance": "？？？",
+ "allegiance": "布法蒂公馆",
"weapon": "bow",
- "birth": "1-1",
+ "birth": "2-2",
"astro": "黑斑猫座",
- "desc": "测试角色",
- "cncv": "？？？",
- "jpcv": "？？？",
+ "desc": "伶牙俐齿，演技精湛的著名枫丹魔术师，以精妙的手法和言语牵动着观众的心。",
+ "cncv": "锦鲤",
+ "jpcv": "下野纮",
"costume": false,
"ver": 1,
"baseAttr": {
@@ -23,9 +23,14 @@
"key": "cpct",
"value": 19.2
},
- "talentId": {},
+ "talentId": {
+ "10841": "a",
+ "10842": "e",
+ "10845": "q"
+ },
"talentCons": {
- "e": 5,
+ "a": 3,
+ "e": 0,
"q": 5
},
"materials": {
diff --git a/resources/meta/character/林尼/detail.json b/resources/meta/character/林尼/detail.json
index de8a9c0d..04124529 100644
--- a/resources/meta/character/林尼/detail.json
+++ b/resources/meta/character/林尼/detail.json
@@ -15,7 +15,7 @@
"瞄准时，火焰的力量会在箭矢上持续积聚，并随攻击发射出去。根据蓄力时间长短，能造成不同的效果：",
"·一段蓄力：射出附有火元素的箭矢，造成火元素伤害；",
"·二段蓄力：发射隐具魔术箭，造成火元素伤害，并在命中后，召唤一顶「怪笑猫猫帽」。",
- "发射隐具魔术箭时，当林尼的生命值高于60%时，林尼将消耗一部分生命值，并获得一层「隐具余数」，该效果至多叠加5层。",
+ "发射隐具魔术箭时，当林尼的生命值高于60%时，林尼将消耗一部分生命值，并获得一层「隐具余数」，该效果至多叠加5层，会在脱离战斗30秒后清除。",
"通过这种方式，至多使林尼的生命值降低至60%。",
"怪笑猫猫帽
",
"·能够嘲讽周围的敌人，吸引敌人攻击。每名敌人每5秒只能被怪笑猫猫帽嘲讽一次；",
@@ -317,21 +317,21 @@
"unit": "",
"isSame": false,
"values": [
- "37.92%",
- "40.76%",
- "43.61%",
- "47.4%",
- "50.24%",
- "53.09%",
- "56.88%",
- "60.67%",
- "64.46%",
- "68.26%",
- "72.05%",
- "75.84%",
- "80.58%",
- "85.32%",
- "90.06%"
+ "27.55%",
+ "29.62%",
+ "31.68%",
+ "34.44%",
+ "36.51%",
+ "38.57%",
+ "41.33%",
+ "44.08%",
+ "46.84%",
+ "49.59%",
+ "52.35%",
+ "55.1%",
+ "58.55%",
+ "61.99%",
+ "65.44%"
]
},
{
@@ -374,21 +374,21 @@
"unit": "",
"isSame": false,
"values": [
- "130.24%",
- "140.01%",
- "149.78%",
- "162.8%",
- "172.57%",
- "182.34%",
- "195.36%",
- "208.38%",
- "221.41%",
- "234.43%",
- "247.46%",
- "260.48%",
- "276.76%",
- "293.04%",
- "309.32%"
+ "167.2%",
+ "179.74%",
+ "192.28%",
+ "209%",
+ "221.54%",
+ "234.08%",
+ "250.8%",
+ "267.52%",
+ "284.24%",
+ "300.96%",
+ "317.68%",
+ "334.4%",
+ "355.3%",
+ "376.2%",
+ "397.1%"
]
},
{
@@ -396,21 +396,21 @@
"unit": " / 层",
"isSame": false,
"values": [
- "48.84%攻击力",
- "52.5%攻击力",
- "56.17%攻击力",
- "61.05%攻击力",
- "64.71%攻击力",
- "68.38%攻击力",
- "73.26%攻击力",
- "78.14%攻击力",
- "83.03%攻击力",
- "87.91%攻击力",
- "92.8%攻击力",
- "97.68%攻击力",
- "103.79%攻击力",
- "109.89%攻击力",
- "116%攻击力"
+ "53.2%攻击力",
+ "57.19%攻击力",
+ "61.18%攻击力",
+ "66.5%攻击力",
+ "70.49%攻击力",
+ "74.48%攻击力",
+ "79.8%攻击力",
+ "85.12%攻击力",
+ "90.44%攻击力",
+ "95.76%攻击力",
+ "101.08%攻击力",
+ "106.4%攻击力",
+ "113.05%攻击力",
+ "119.7%攻击力",
+ "126.35%攻击力"
]
},
{
@@ -464,7 +464,8 @@
"name": "大魔术·灵迹巡游",
"desc": [
"林尼施展魔术，化形为能够快速移动的「怪笑帽帽猫」。（并不是「怪笑猫猫帽」。这是两个不同的演出道具！）",
- "怪笑帽帽猫接近敌人时，会对身边的敌人降下焰火，对每个敌人造成至多一次火元素伤害。持续时间结束或使用元素战技时，林尼将解除怪笑帽帽猫，引爆华丽的礼花，造成火元素范围伤害，召唤一顶怪笑猫猫帽，并获得一层「隐具余数」。",
+ "怪笑帽帽猫接近敌人时，会对身边的敌人降下焰火，对每个敌人造成至多一次火元素伤害。持续时间结束时林尼将解除怪笑帽帽猫，引爆华丽的礼花，造成火元素范围伤害，召唤一顶怪笑猫猫帽，并获得一层「隐具余数」。",
+ "可以主动解除怪笑帽帽猫。
",
"「那就让你们稍微见识一下吧，要看仔细咯，这是仅属于我们的，独一无二的，奇迹时刻！」"
],
"tables": [
@@ -473,21 +474,21 @@
"unit": "",
"isSame": false,
"values": [
- "138%",
- "148.35%",
- "158.7%",
- "172.5%",
- "182.85%",
- "193.2%",
- "207%",
- "220.8%",
- "234.6%",
- "248.4%",
- "262.2%",
- "276%",
- "293.25%",
- "310.5%",
- "327.75%"
+ "154%",
+ "165.55%",
+ "177.1%",
+ "192.5%",
+ "204.05%",
+ "215.6%",
+ "231%",
+ "246.4%",
+ "261.8%",
+ "277.2%",
+ "292.6%",
+ "308%",
+ "327.25%",
+ "346.5%",
+ "365.75%"
]
},
{
@@ -957,76 +958,76 @@
503.5
],
"灵息之刺伤害": [
- 37.92,
- 40.76,
- 43.61,
- 47.4,
- 50.24,
- 53.09,
- 56.88,
- 60.67,
- 64.46,
- 68.26,
- 72.05,
- 75.84,
- 80.58,
- 85.32,
- 90.06
+ 27.55,
+ 29.62,
+ 31.68,
+ 34.44,
+ 36.51,
+ 38.57,
+ 41.33,
+ 44.08,
+ 46.84,
+ 49.59,
+ 52.35,
+ 55.1,
+ 58.55,
+ 61.99,
+ 65.44
]
},
"e": {
"技能伤害": [
- 130.24,
- 140.01,
- 149.78,
- 162.8,
- 172.57,
- 182.34,
- 195.36,
- 208.38,
- 221.41,
- 234.43,
- 247.46,
- 260.48,
- 276.76,
- 293.04,
- 309.32
+ 167.2,
+ 179.74,
+ 192.28,
+ 209,
+ 221.54,
+ 234.08,
+ 250.8,
+ 267.52,
+ 284.24,
+ 300.96,
+ 317.68,
+ 334.4,
+ 355.3,
+ 376.2,
+ 397.1
],
"技能伤害加成": [
- 48.84,
- 52.5,
- 56.17,
- 61.05,
- 64.71,
- 68.38,
- 73.26,
- 78.14,
- 83.03,
- 87.91,
- 92.8,
- 97.68,
- 103.79,
- 109.89,
- 116
+ 53.2,
+ 57.19,
+ 61.18,
+ 66.5,
+ 70.49,
+ 74.48,
+ 79.8,
+ 85.12,
+ 90.44,
+ 95.76,
+ 101.08,
+ 106.4,
+ 113.05,
+ 119.7,
+ 126.35
]
},
"q": {
"技能伤害": [
- 138,
- 148.35,
- 158.7,
- 172.5,
- 182.85,
- 193.2,
- 207,
- 220.8,
- 234.6,
- 248.4,
- 262.2,
- 276,
- 293.25,
- 310.5,
- 327.75
+ 154,
+ 165.55,
+ 177.1,
+ 192.5,
+ 204.05,
+ 215.6,
+ 231,
+ 246.4,
+ 261.8,
+ 277.2,
+ 292.6,
+ 308,
+ 327.25,
+ 346.5,
+ 365.75
],
"引爆礼花伤害": [
414,
@@ -1071,7 +1072,7 @@
"4": {
"name": "熟稔习练的筹谋",
"desc": [
- "林尼的元素类型为火元素的重击攻击命中敌人后，该敌人的火元素抗性降低25%，持续6秒。"
+ "林尼的元素类型为火元素的重击攻击命中敌人后，该敌人的火元素抗性降低20%，持续6秒。"
]
},
"5": {
@@ -1084,7 +1085,7 @@
"6": {
"name": "违心的笑",
"desc": [
- "林尼发射隐具魔术箭时，将发射一枚礼花术弹·重奏，造成礼花术弹100%的伤害。该伤害视为重击伤害。"
+ "林尼发射隐具魔术箭时，将发射一枚礼花术弹·重奏，造成礼花术弹80%的伤害。该伤害视为重击伤害。"
]
}
},
diff --git a/resources/meta/character/林尼/icons/cons-1.webp b/resources/meta/character/林尼/icons/cons-1.webp
index e643750f..92429013 100644
Binary files a/resources/meta/character/林尼/icons/cons-1.webp and b/resources/meta/character/林尼/icons/cons-1.webp differ
diff --git a/resources/meta/character/林尼/icons/cons-2.webp b/resources/meta/character/林尼/icons/cons-2.webp
index f616acaf..fad14ce5 100644
Binary files a/resources/meta/character/林尼/icons/cons-2.webp and b/resources/meta/character/林尼/icons/cons-2.webp differ
diff --git a/resources/meta/character/林尼/icons/cons-3.webp b/resources/meta/character/林尼/icons/cons-3.webp
index d8492de6..2dadb335 100644
Binary files a/resources/meta/character/林尼/icons/cons-3.webp and b/resources/meta/character/林尼/icons/cons-3.webp differ
diff --git a/resources/meta/character/林尼/icons/cons-4.webp b/resources/meta/character/林尼/icons/cons-4.webp
index cadbfbcf..578e12d5 100644
Binary files a/resources/meta/character/林尼/icons/cons-4.webp and b/resources/meta/character/林尼/icons/cons-4.webp differ
diff --git a/resources/meta/character/林尼/icons/cons-5.webp b/resources/meta/character/林尼/icons/cons-5.webp
index eebbbb4a..8360f90a 100644
Binary files a/resources/meta/character/林尼/icons/cons-5.webp and b/resources/meta/character/林尼/icons/cons-5.webp differ
diff --git a/resources/meta/character/林尼/icons/cons-6.webp b/resources/meta/character/林尼/icons/cons-6.webp
index 08508d20..d29a89e8 100644
Binary files a/resources/meta/character/林尼/icons/cons-6.webp and b/resources/meta/character/林尼/icons/cons-6.webp differ
diff --git a/resources/meta/character/林尼/icons/passive-0.webp b/resources/meta/character/林尼/icons/passive-0.webp
index 12fe9cc6..5d47785e 100644
Binary files a/resources/meta/character/林尼/icons/passive-0.webp and b/resources/meta/character/林尼/icons/passive-0.webp differ
diff --git a/resources/meta/character/林尼/icons/passive-1.webp b/resources/meta/character/林尼/icons/passive-1.webp
index 0debbd82..7c072671 100644
Binary files a/resources/meta/character/林尼/icons/passive-1.webp and b/resources/meta/character/林尼/icons/passive-1.webp differ
diff --git a/resources/meta/character/林尼/icons/passive-2.webp b/resources/meta/character/林尼/icons/passive-2.webp
index 3fd3e1e1..499c2468 100644
Binary files a/resources/meta/character/林尼/icons/passive-2.webp and b/resources/meta/character/林尼/icons/passive-2.webp differ
diff --git a/resources/meta/character/林尼/icons/talent-e.webp b/resources/meta/character/林尼/icons/talent-e.webp
new file mode 100644
index 00000000..b2d5f4a0
Binary files /dev/null and b/resources/meta/character/林尼/icons/talent-e.webp differ
diff --git a/resources/meta/character/琳妮特/data.json b/resources/meta/character/琳妮特/data.json
index 87435c0c..7687c5a5 100644
--- a/resources/meta/character/琳妮特/data.json
+++ b/resources/meta/character/琳妮特/data.json
@@ -5,13 +5,13 @@
"title": "丽影绮行",
"star": 4,
"elem": "anemo",
- "allegiance": "？？？",
+ "allegiance": "布法蒂公馆",
"weapon": "sword",
- "birth": "1-1",
+ "birth": "2-2",
"astro": "白尾猫座",
- "desc": "测试角色",
- "cncv": "？？？",
- "jpcv": "？？？",
+ "desc": "寡言少语，罕有表情的魔术助手，性情像猫一样难以猜测。",
+ "cncv": "可可味",
+ "jpcv": "篠原侑",
"costume": false,
"ver": 1,
"baseAttr": {
@@ -23,8 +23,13 @@
"key": "dmg",
"value": 24
},
- "talentId": {},
+ "talentId": {
+ "10831": "a",
+ "10832": "e",
+ "10835": "q"
+ },
"talentCons": {
+ "a": 0,
"e": 5,
"q": 3
},
diff --git a/resources/meta/character/琳妮特/detail.json b/resources/meta/character/琳妮特/detail.json
index 8e111aef..328e08aa 100644
--- a/resources/meta/character/琳妮特/detail.json
+++ b/resources/meta/character/琳妮特/detail.json
@@ -1,5 +1,5 @@
{
- "id": "83",
+ "id": 10000083,
"name": "琳妮特",
"talent": {
"a": {
@@ -202,7 +202,7 @@
"点按
",
"迅速击出谜影突刺。",
"长按
",
- "以「谜身影盗」的姿态疾走，并对附近的敌人施加「刺影征标」。",
+ "琳妮特以「谜身影盗」的姿态疾走，并对附近的敌人施加「刺影征标」。期间可以控制疾走的方向，并能通过再次施放技能，提前结束疾走状态。",
"疾走结束时，琳妮特将击出谜影突刺。若附近存在具有刺影征标的敌人，琳妮特将在击出谜影突刺前高速闪掠接近该敌人。",
"同时至多有一名敌人具有琳妮特自身施加的刺影征标。与具有刺影征标的敌人距离过远时，将移除该刺影征标。",
"始基力：荒性
",
diff --git a/resources/meta/character/白术/data.json b/resources/meta/character/白术/data.json
index 63799a20..febedd28 100644
--- a/resources/meta/character/白术/data.json
+++ b/resources/meta/character/白术/data.json
@@ -29,6 +29,7 @@
"10825": "q"
},
"talentCons": {
+ "a": 0,
"e": 5,
"q": 3
},
diff --git a/resources/meta/character/白术/detail.json b/resources/meta/character/白术/detail.json
index 7c790acc..f0a39c69 100644
--- a/resources/meta/character/白术/detail.json
+++ b/resources/meta/character/白术/detail.json
@@ -1,5 +1,5 @@
{
- "id": "82",
+ "id": 10000082,
"name": "白术",
"talent": {
"a": {
@@ -1067,7 +1067,7 @@
{
"name": "在地为化",
"desc": [
- "受到无郤气护盾治疗的角色，将获得「木运之岁」效果：基于白术生命值上限不超过50000点的部分，每1000点将使该角色触发的燃烧、绽放、超绽放、烈绽放反应造成的伤害提升2%，超激化、蔓激化反应带来的伤害提升0.8%，持续6秒。"
+ "受到无郤气护盾治疗的角色，将获得「木运之岁」效果：基于白术生命值上限不超过50000点的部分，每1000点将使该角色触发的燃烧、绽放、超绽放、烈绽放反应造成的伤害提升2%，超激化、蔓激化反应带来的伤害提升提高0.8%，持续6秒。"
]
}
],
diff --git a/resources/meta/character/绮良良/data.json b/resources/meta/character/绮良良/data.json
index 01e6d720..caa63d84 100644
--- a/resources/meta/character/绮良良/data.json
+++ b/resources/meta/character/绮良良/data.json
@@ -29,6 +29,7 @@
"10615": "q"
},
"talentCons": {
+ "a": 0,
"e": 3,
"q": 5
},
diff --git a/resources/meta/character/绮良良/detail.json b/resources/meta/character/绮良良/detail.json
index fcf11b74..901de74c 100644
--- a/resources/meta/character/绮良良/detail.json
+++ b/resources/meta/character/绮良良/detail.json
@@ -1,5 +1,5 @@
{
- "id": "61",
+ "id": 10000061,
"name": "绮良良",
"talent": {
"a": {
@@ -1149,7 +1149,7 @@
"4": {
"name": "韦驮骏足",
"desc": [
- "处于安全运输护盾或安全运输护盾·要件的当前场上角色的普通攻击、重击与下落攻击命中敌人后，绮良良将使用猫草小豆蔻进行协同攻击，造成相当于绮良良攻击力200%草元素伤害，通过这种方式造成的伤害视为元素爆发伤害。此效果每3.8秒至多触发一次。"
+ "处于安全运输护盾或安全运输护盾·要件的当前场上角色的普通攻击、重击与下落攻击命中敌人后，绮良良将使用猫草小豆蔻进行协同攻击，造成相当于绮良良攻击力200%草元素伤害，通过这种方式造成的伤害视为元素爆发伤害。此效果每3.8秒至多触发一次，队伍中所有角色共享冷却时间。"
]
},
"5": {
diff --git a/resources/meta/character/菲米尼/data.json b/resources/meta/character/菲米尼/data.json
index 50ed502b..fd431936 100644
--- a/resources/meta/character/菲米尼/data.json
+++ b/resources/meta/character/菲米尼/data.json
@@ -9,9 +9,9 @@
"weapon": "claymore",
"birth": "9-24",
"astro": "机巧座",
- "desc": "测试角色",
- "cncv": "？？？",
- "jpcv": "？？？",
+ "desc": "精于潜水的寡言少年，在如寒冰般拒人千里的外表下，藏有一颗无瑕的纯真之心。",
+ "cncv": "锦鲤",
+ "jpcv": "土岐隼一",
"costume": false,
"ver": 1,
"baseAttr": {
@@ -23,10 +23,15 @@
"key": "atkPct",
"value": 24
},
- "talentId": {},
+ "talentId": {
+ "10851": "a",
+ "10852": "e",
+ "10855": "q"
+ },
"talentCons": {
+ "a": 3,
"e": 5,
- "q": 3
+ "q": 0
},
"materials": {
"gem": "哀叙冰玉",
diff --git a/resources/meta/character/菲米尼/detail.json b/resources/meta/character/菲米尼/detail.json
index 4f2086ff..f567c07b 100644
--- a/resources/meta/character/菲米尼/detail.json
+++ b/resources/meta/character/菲米尼/detail.json
@@ -1,5 +1,5 @@
{
- "id": "85",
+ "id": 10000085,
"name": "菲米尼",
"talent": {
"a": {
@@ -247,11 +247,10 @@
"依据佩伊刻计的压力阶级进行不同的攻击，并移除佩伊刻计状态：",
"·零阶时：进行纵斩，造成冰元素伤害；",
"·一阶至三阶时：进行纵斩并协同佩伊，造成冰元素伤害与物理伤害。伤害依据压力阶级有所不同；",
- "·四阶时：借助充满压力的佩伊的力量，造成物理伤害。",
+ "·四阶时：借助充满压力的佩伊的力量，造成物理伤害。此时「普通攻击·洑流剑」将被替换为高压粉碎。",
"佩伊刻计
",
"菲米尼进行普通攻击时，将同时释放霜寒造成冰元素伤害，并为佩伊刻计提升压力阶级。",
"同时造成的冰元素伤害视为元素战技伤害。",
- "压力阶级达到四阶后，进行普通攻击将转为施放四阶的高压粉碎。",
"始基力：芒性
",
"每隔一段时间，进行上挑攻击后，将形成进行挑击的灵息之刺，造成具有芒性的冰元素伤害。",
"阻滞对手的行动，而非夺去对手的性命。从某种意义上来说，这也是为了「生存」而选择的战略。",
@@ -285,21 +284,21 @@
"unit": "",
"isSame": false,
"values": [
- "3.58%",
- "3.85%",
- "4.12%",
- "4.48%",
- "4.74%",
- "5.01%",
- "5.37%",
- "5.73%",
- "6.09%",
- "6.44%",
- "6.8%",
"7.16%",
- "7.61%",
- "8.06%",
- "8.5%"
+ "7.7%",
+ "8.23%",
+ "8.95%",
+ "9.49%",
+ "10.02%",
+ "10.74%",
+ "11.46%",
+ "12.17%",
+ "12.89%",
+ "13.6%",
+ "14.32%",
+ "15.22%",
+ "16.11%",
+ "17%"
]
},
{
@@ -329,21 +328,21 @@
"unit": "",
"isSame": false,
"values": [
- "100.24%冰元素 + 45.82%物理",
- "107.76%冰元素 + 49.26%物理",
- "115.28%冰元素 + 52.7%物理",
- "125.3%冰元素 + 57.28%物理",
- "132.82%冰元素 + 60.72%物理",
- "140.34%冰元素 + 64.15%物理",
- "150.36%冰元素 + 68.74%物理",
- "160.38%冰元素 + 73.32%物理",
- "170.41%冰元素 + 77.9%物理",
- "180.43%冰元素 + 82.48%物理",
- "190.46%冰元素 + 87.07%物理",
- "200.48%冰元素 + 91.65%物理",
- "213.01%冰元素 + 97.38%物理",
- "225.54%冰元素 + 103.1%物理",
- "238.07%冰元素 + 108.83%物理"
+ "100.24%冰元素 + 48.69%物理",
+ "107.76%冰元素 + 52.34%物理",
+ "115.28%冰元素 + 55.99%物理",
+ "125.3%冰元素 + 60.86%物理",
+ "132.82%冰元素 + 64.51%物理",
+ "140.34%冰元素 + 68.16%物理",
+ "150.36%冰元素 + 73.03%物理",
+ "160.38%冰元素 + 77.9%物理",
+ "170.41%冰元素 + 82.77%物理",
+ "180.43%冰元素 + 87.64%物理",
+ "190.46%冰元素 + 92.51%物理",
+ "200.48%冰元素 + 97.38%物理",
+ "213.01%冰元素 + 103.46%物理",
+ "225.54%冰元素 + 109.55%物理",
+ "238.07%冰元素 + 115.63%物理"
]
},
{
@@ -351,21 +350,21 @@
"unit": "",
"isSame": false,
"values": [
- "70.17%冰元素 + 80.19%物理",
- "75.43%冰元素 + 86.21%物理",
- "80.69%冰元素 + 92.22%物理",
- "87.71%冰元素 + 100.24%物理",
- "92.97%冰元素 + 106.25%物理",
- "98.24%冰元素 + 112.27%物理",
- "105.25%冰元素 + 120.29%物理",
- "112.27%冰元素 + 128.31%物理",
- "119.29%冰元素 + 136.33%物理",
- "126.3%冰元素 + 144.35%物理",
- "133.32%冰元素 + 152.36%物理",
- "140.34%冰元素 + 160.38%物理",
- "149.11%冰元素 + 170.41%物理",
- "157.88%冰元素 + 180.43%物理",
- "166.65%冰元素 + 190.46%物理"
+ "70.17%冰元素 + 85.2%物理",
+ "75.43%冰元素 + 91.59%物理",
+ "80.69%冰元素 + 97.98%物理",
+ "87.71%冰元素 + 106.51%物理",
+ "92.97%冰元素 + 112.9%物理",
+ "98.24%冰元素 + 119.29%物理",
+ "105.25%冰元素 + 127.81%物理",
+ "112.27%冰元素 + 136.33%物理",
+ "119.29%冰元素 + 144.85%物理",
+ "126.3%冰元素 + 153.37%物理",
+ "133.32%冰元素 + 161.89%物理",
+ "140.34%冰元素 + 170.41%物理",
+ "149.11%冰元素 + 181.06%物理",
+ "157.88%冰元素 + 191.71%物理",
+ "166.65%冰元素 + 202.36%物理"
]
},
{
@@ -373,21 +372,21 @@
"unit": "",
"isSame": false,
"values": [
- "40.1%冰元素 + 114.56%物理",
- "43.1%冰元素 + 123.15%物理",
- "46.11%冰元素 + 131.74%物理",
- "50.12%冰元素 + 143.2%物理",
- "53.13%冰元素 + 151.79%物理",
- "56.13%冰元素 + 160.38%物理",
- "60.14%冰元素 + 171.84%物理",
- "64.15%冰元素 + 183.3%物理",
- "68.16%冰元素 + 194.75%物理",
- "72.17%冰元素 + 206.21%物理",
- "76.18%冰元素 + 217.66%物理",
- "80.19%冰元素 + 229.12%物理",
- "85.2%冰元素 + 243.44%物理",
- "90.22%冰元素 + 257.76%物理",
- "95.23%冰元素 + 272.08%物理"
+ "40.1%冰元素 + 121.72%物理",
+ "43.1%冰元素 + 130.85%物理",
+ "46.11%冰元素 + 139.98%物理",
+ "50.12%冰元素 + 152.15%物理",
+ "53.13%冰元素 + 161.28%物理",
+ "56.13%冰元素 + 170.41%物理",
+ "60.14%冰元素 + 182.58%物理",
+ "64.15%冰元素 + 194.75%物理",
+ "68.16%冰元素 + 206.92%物理",
+ "72.17%冰元素 + 219.1%物理",
+ "76.18%冰元素 + 231.27%物理",
+ "80.19%冰元素 + 243.44%物理",
+ "85.2%冰元素 + 258.65%物理",
+ "90.22%冰元素 + 273.87%物理",
+ "95.23%冰元素 + 289.09%物理"
]
},
{
@@ -395,21 +394,21 @@
"unit": "",
"isSame": false,
"values": [
- "229.12%",
- "246.3%",
- "263.49%",
- "286.4%",
- "303.58%",
- "320.77%",
- "343.68%",
- "366.59%",
+ "243.44%",
+ "261.7%",
+ "279.96%",
+ "304.3%",
+ "322.56%",
+ "340.82%",
+ "365.16%",
"389.5%",
- "412.42%",
- "435.33%",
- "458.24%",
+ "413.85%",
+ "438.19%",
+ "462.54%",
"486.88%",
- "515.52%",
- "544.16%"
+ "517.31%",
+ "547.74%",
+ "578.17%"
]
},
{
@@ -848,21 +847,21 @@
197.22
],
"霜寒伤害": [
- 3.58,
- 3.85,
- 4.12,
- 4.48,
- 4.74,
- 5.01,
- 5.37,
- 5.73,
- 6.09,
- 6.44,
- 6.8,
7.16,
- 7.61,
- 8.06,
- 8.5
+ 7.7,
+ 8.23,
+ 8.95,
+ 9.49,
+ 10.02,
+ 10.74,
+ 11.46,
+ 12.17,
+ 12.89,
+ 13.6,
+ 14.32,
+ 15.22,
+ 16.11,
+ 17
],
"零阶高压粉碎伤害": [
200.48,
@@ -882,258 +881,258 @@
476.14
],
"一阶高压粉碎伤害": [
- 146.06,
- 157.02,
- 167.98000000000002,
- 182.57999999999998,
- 193.54,
- 204.49,
- 219.10000000000002,
- 233.7,
- 248.31,
- 262.91,
- 277.53,
- 292.13,
- 310.39,
- 328.64,
- 346.9
+ 148.93,
+ 160.10000000000002,
+ 171.27,
+ 186.16,
+ 197.32999999999998,
+ 208.5,
+ 223.39000000000001,
+ 238.28,
+ 253.18,
+ 268.07,
+ 282.97,
+ 297.86,
+ 316.46999999999997,
+ 335.09,
+ 353.7
],
"一阶高压粉碎伤害2": [
[
100.24,
- 45.82
+ 48.69
],
[
107.76,
- 49.26
+ 52.34
],
[
115.28,
- 52.7
+ 55.99
],
[
125.3,
- 57.28
+ 60.86
],
[
132.82,
- 60.72
+ 64.51
],
[
140.34,
- 64.15
+ 68.16
],
[
150.36,
- 68.74
+ 73.03
],
[
160.38,
- 73.32
- ],
- [
- 170.41,
77.9
],
+ [
+ 170.41,
+ 82.77
+ ],
[
180.43,
- 82.48
+ 87.64
],
[
190.46,
- 87.07
+ 92.51
],
[
200.48,
- 91.65
- ],
- [
- 213.01,
97.38
],
+ [
+ 213.01,
+ 103.46
+ ],
[
225.54,
- 103.1
+ 109.55
],
[
238.07,
- 108.83
+ 115.63
]
],
"二阶高压粉碎伤害": [
- 150.36,
- 161.64,
- 172.91,
- 187.95,
- 199.22,
- 210.51,
- 225.54000000000002,
- 240.57999999999998,
- 255.62,
- 270.65,
- 285.68,
- 300.72,
- 319.52,
- 338.31,
- 357.11
+ 155.37,
+ 167.02,
+ 178.67000000000002,
+ 194.22,
+ 205.87,
+ 217.53,
+ 233.06,
+ 248.60000000000002,
+ 264.14,
+ 279.67,
+ 295.21,
+ 310.75,
+ 330.17,
+ 349.59000000000003,
+ 369.01
],
"二阶高压粉碎伤害2": [
[
70.17,
- 80.19
+ 85.2
],
[
75.43,
- 86.21
+ 91.59
],
[
80.69,
- 92.22
+ 97.98
],
[
87.71,
- 100.24
+ 106.51
],
[
92.97,
- 106.25
+ 112.9
],
[
98.24,
- 112.27
+ 119.29
],
[
105.25,
- 120.29
+ 127.81
],
[
112.27,
- 128.31
- ],
- [
- 119.29,
136.33
],
+ [
+ 119.29,
+ 144.85
+ ],
[
126.3,
- 144.35
+ 153.37
],
[
133.32,
- 152.36
+ 161.89
],
[
140.34,
- 160.38
- ],
- [
- 149.11,
170.41
],
+ [
+ 149.11,
+ 181.06
+ ],
[
157.88,
- 180.43
+ 191.71
],
[
166.65,
- 190.46
+ 202.36
]
],
"三阶高压粉碎伤害": [
- 154.66,
- 166.25,
- 177.85000000000002,
- 193.32,
- 204.92,
- 216.51,
- 231.98000000000002,
- 247.45000000000002,
- 262.90999999999997,
- 278.38,
- 293.84000000000003,
- 309.31,
- 328.64,
- 347.98,
- 367.31
+ 161.82,
+ 173.95,
+ 186.08999999999997,
+ 202.27,
+ 214.41,
+ 226.54,
+ 242.72000000000003,
+ 258.9,
+ 275.08,
+ 291.27,
+ 307.45000000000005,
+ 323.63,
+ 343.84999999999997,
+ 364.09000000000003,
+ 384.32
],
"三阶高压粉碎伤害2": [
[
40.1,
- 114.56
+ 121.72
],
[
43.1,
- 123.15
+ 130.85
],
[
46.11,
- 131.74
+ 139.98
],
[
50.12,
- 143.2
+ 152.15
],
[
53.13,
- 151.79
+ 161.28
],
[
56.13,
- 160.38
+ 170.41
],
[
60.14,
- 171.84
+ 182.58
],
[
64.15,
- 183.3
- ],
- [
- 68.16,
194.75
],
+ [
+ 68.16,
+ 206.92
+ ],
[
72.17,
- 206.21
+ 219.1
],
[
76.18,
- 217.66
+ 231.27
],
[
80.19,
- 229.12
- ],
- [
- 85.2,
243.44
],
+ [
+ 85.2,
+ 258.65
+ ],
[
90.22,
- 257.76
+ 273.87
],
[
95.23,
- 272.08
+ 289.09
]
],
"四阶高压粉碎伤害": [
- 229.12,
- 246.3,
- 263.49,
- 286.4,
- 303.58,
- 320.77,
- 343.68,
- 366.59,
+ 243.44,
+ 261.7,
+ 279.96,
+ 304.3,
+ 322.56,
+ 340.82,
+ 365.16,
389.5,
- 412.42,
- 435.33,
- 458.24,
+ 413.85,
+ 438.19,
+ 462.54,
486.88,
- 515.52,
- 544.16
+ 517.31,
+ 547.74,
+ 578.17
],
"灵息之刺伤害": [
14.4,
@@ -1196,7 +1195,7 @@
"4": {
"name": "雪月与芦笛之舞",
"desc": [
- "菲米尼对敌人触发冰冻、碎冰、超导反应时，攻击力提升9%。该效果持续6秒，至多叠加2次，每0.3秒至多触发一次。"
+ "菲米尼对敌人触发冰冻、碎冰、超导反应后，攻击力提升9%。该效果持续6秒，至多叠加2次，每0.3秒至多触发一次。"
]
},
"5": {
@@ -1209,7 +1208,7 @@
"6": {
"name": "梦晓与决意之刻",
"desc": [
- "菲米尼对敌人触发冰冻、碎冰、超导反应时，暴击伤害提升12%。该效果持续6秒，至多叠加3次，每0.3秒至多触发一次。"
+ "菲米尼对敌人触发冰冻、碎冰、超导反应后，暴击伤害提升12%。该效果持续6秒，至多叠加3次，每0.3秒至多触发一次。"
]
}
},
diff --git a/resources/meta/character/菲米尼/icons/cons-1.webp b/resources/meta/character/菲米尼/icons/cons-1.webp
index 7dc7991a..daec7545 100644
Binary files a/resources/meta/character/菲米尼/icons/cons-1.webp and b/resources/meta/character/菲米尼/icons/cons-1.webp differ
diff --git a/resources/meta/character/菲米尼/icons/cons-2.webp b/resources/meta/character/菲米尼/icons/cons-2.webp
index d17e0930..e75c434a 100644
Binary files a/resources/meta/character/菲米尼/icons/cons-2.webp and b/resources/meta/character/菲米尼/icons/cons-2.webp differ
diff --git a/resources/meta/character/菲米尼/icons/cons-3.webp b/resources/meta/character/菲米尼/icons/cons-3.webp
index 26b3324a..9d8a1055 100644
Binary files a/resources/meta/character/菲米尼/icons/cons-3.webp and b/resources/meta/character/菲米尼/icons/cons-3.webp differ
diff --git a/resources/meta/character/菲米尼/icons/cons-4.webp b/resources/meta/character/菲米尼/icons/cons-4.webp
index 7e2e8531..7fc6ca38 100644
Binary files a/resources/meta/character/菲米尼/icons/cons-4.webp and b/resources/meta/character/菲米尼/icons/cons-4.webp differ
diff --git a/resources/meta/character/菲米尼/icons/cons-5.webp b/resources/meta/character/菲米尼/icons/cons-5.webp
index 40caa6ab..10582540 100644
Binary files a/resources/meta/character/菲米尼/icons/cons-5.webp and b/resources/meta/character/菲米尼/icons/cons-5.webp differ
diff --git a/resources/meta/character/菲米尼/icons/cons-6.webp b/resources/meta/character/菲米尼/icons/cons-6.webp
index 9f2970ab..a67575a5 100644
Binary files a/resources/meta/character/菲米尼/icons/cons-6.webp and b/resources/meta/character/菲米尼/icons/cons-6.webp differ
diff --git a/resources/meta/character/菲米尼/icons/passive-0.webp b/resources/meta/character/菲米尼/icons/passive-0.webp
index 93c6caa9..1156da75 100644
Binary files a/resources/meta/character/菲米尼/icons/passive-0.webp and b/resources/meta/character/菲米尼/icons/passive-0.webp differ
diff --git a/resources/meta/character/菲米尼/icons/passive-1.webp b/resources/meta/character/菲米尼/icons/passive-1.webp
index d5cc15d2..516b7f38 100644
Binary files a/resources/meta/character/菲米尼/icons/passive-1.webp and b/resources/meta/character/菲米尼/icons/passive-1.webp differ
diff --git a/resources/meta/character/菲米尼/icons/passive-2.webp b/resources/meta/character/菲米尼/icons/passive-2.webp
index 0cd165fd..18118814 100644
Binary files a/resources/meta/character/菲米尼/icons/passive-2.webp and b/resources/meta/character/菲米尼/icons/passive-2.webp differ
diff --git a/resources/meta/character/菲米尼/icons/talent-q.webp b/resources/meta/character/菲米尼/icons/talent-q.webp
new file mode 100644
index 00000000..0318946c
Binary files /dev/null and b/resources/meta/character/菲米尼/icons/talent-q.webp differ
diff --git a/resources/meta/material/data.json b/resources/meta/material/data.json
index 45f435c1..885ac19e 100644
--- a/resources/meta/material/data.json
+++ b/resources/meta/material/data.json
@@ -44,25 +44,25 @@
"star": 1
},
"孢囊晶尘": {
- "id": 112061,
+ "id": "n112061",
"name": "孢囊晶尘",
"type": "normal",
"star": 3,
"items": {
"蕈兽孢子": {
- "id": 112059,
+ "id": "n112059",
"name": "蕈兽孢子",
"type": "normal",
"star": 1
},
"荧光孢粉": {
- "id": 112060,
+ "id": "n112060",
"name": "荧光孢粉",
"type": "normal",
"star": 2
},
"孢囊晶尘": {
- "id": 112061,
+ "id": "n112061",
"name": "孢囊晶尘",
"type": "normal",
"star": 3
@@ -2126,25 +2126,25 @@
"star": 1
},
"奇械机芯齿轮": {
- "id": 112085,
+ "id": "n112085",
"name": "奇械机芯齿轮",
"type": "normal",
"star": 3,
"items": {
"啮合齿轮": {
- "id": 112083,
+ "id": "n112083",
"name": "啮合齿轮",
"type": "normal",
"star": 1
},
"机关正齿轮": {
- "id": 112084,
+ "id": "n112084",
"name": "机关正齿轮",
"type": "normal",
"star": 2
},
"奇械机芯齿轮": {
- "id": 112085,
+ "id": "n112085",
"name": "奇械机芯齿轮",
"type": "normal",
"star": 3
@@ -2228,25 +2228,25 @@
"star": 1
},
"异色结晶石": {
- "id": 112082,
+ "id": "n112082",
"name": "异色结晶石",
"type": "normal",
"star": 3,
"items": {
"异海凝珠": {
- "id": 112080,
+ "id": "n112080",
"name": "异海凝珠",
"type": "normal",
"star": 1
},
"异海之块": {
- "id": 112081,
+ "id": "n112081",
"name": "异海之块",
"type": "normal",
"star": 2
},
"异色结晶石": {
- "id": 112082,
+ "id": "n112082",
"name": "异色结晶石",
"type": "normal",
"star": 3