diff --git a/CHANGELOG.md b/CHANGELOG.md index 1b147809..b9182bb2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,8 @@ -# 2.5.10 +# 2.5.11 -* 更新原神4.6&4.7、星铁2.1相关数据与资源 +* 更新原神4.8相关数据与资源 -# 2.5.1 ~ 2.5.9 +# 2.5.1 ~ 2.5.10 * 面板功能升级 * 角色面板展示圣遗物副词缀统计 @@ -17,7 +17,7 @@ * 新增`#刷新天赋`命令，用于在有CK情况下强制刷新本地天赋缓存数据 * 初步迁移并重写`#今日素材` * `#角色`增加枫丹探索度统计信息 -* 增加原神4.3~4.5星铁1.5~2.0相关的数据与资源 +* 增加原神4.3~4.7、星铁1.5~2.3相关的数据与资源 # 2.5.0 diff --git a/resources/meta-gs/character/alias.js b/resources/meta-gs/character/alias.js index 38e22a60..35301e81 100644 --- a/resources/meta-gs/character/alias.js +++ b/resources/meta-gs/character/alias.js @@ -91,5 +91,6 @@ export const alias = { 阿蕾奇诺: 'Arlecchino,阿雷奇诺,仆人,黑优菈,黑暗优菈,父亲,佩露薇利', 希格雯: 'Sigewinne,希格文,护士,护士长', 赛索斯: 'Sethos,塞索斯,塞索思,赛索思', - 克洛琳德: 'Clorinde,琳德,科洛琳德,克洛林德,克罗林德' + 克洛琳德: 'Clorinde,琳德,科洛琳德,克洛林德,克罗林德', + 艾梅莉埃: 'Emilie,调香师,艾梅' } diff --git a/resources/meta-gs/character/data.json b/resources/meta-gs/character/data.json index c25024b2..b37e8f6a 100644 --- a/resources/meta-gs/character/data.json +++ b/resources/meta-gs/character/data.json @@ -1502,6 +1502,24 @@ }, "eta": 1717552800000 }, + "10000099": { + "id": 10000099, + "name": "艾梅莉埃", + "abbr": "艾梅莉埃", + "star": 5, + "elem": "dendro", + "weapon": "polearm", + "talentId": { + "10991": "a", + "10992": "e", + "10995": "q" + }, + "talentCons": { + "a": 0, + "e": 3, + "q": 5 + } + }, "20000000": { "id": 20000000, "name": "旅行者", diff --git a/resources/meta-gs/character/艾梅莉埃/data.json b/resources/meta-gs/character/艾梅莉埃/data.json new file mode 100644 index 00000000..49251315 --- /dev/null +++ b/resources/meta-gs/character/艾梅莉埃/data.json @@ -0,0 +1,1046 @@ +{ + "id": 10000099, + "name": "艾梅莉埃", + "abbr": "艾梅莉埃", + "title": "千缕之踪", + "star": 5, + "elem": "dendro", + "allegiance": "枫丹廷", + "weapon": "polearm", + "birth": "9-22", + "astro": "香氛瓶座", + "desc": "枫丹香水设计师，将秘密藏于瓶中之人。", + "cncv": "木子橙", + "jpcv": "日笠阳子", + "costume": false, + "ver": 1, + "baseAttr": { + "hp": 13568, + "atk": 334.85, + "def": 730.13 + }, + "growAttr": { + "key": "cdmg", + "value": 38.4 + }, + "talentId": { + "10991": "a", + "10992": "e", + "10995": "q" + }, + "talentCons": { + "a": 0, + "e": 3, + "q": 5 + }, + "materials": { + "gem": "生长碧翡", + "boss": "金色旋律的断章", + "specialty": "湖光铃兰", + "normal": "奇械机芯齿轮", + "talent": "「秩序」的哲学", + "weekly": "丝织之羽" + }, + "talent": { + "a": { + "id": 9931, + "name": "普通攻击·逐影枪术·改", + "desc": [ + "

普通攻击

", + "进行至多四段的连续枪击。", + "

重击

", + "消耗一定体力，进行向上的挑斩攻击。", + "

下落攻击

", + "从空中下坠冲击地面，攻击下落路径上的敌人，并在落地时造成范围伤害。" + ], + "tables": [ + { + "name": "一段伤害", + "unit": "", + "isSame": false, + "values": [ + "48.56%", + "52.51%", + "56.47%", + "62.11%", + "66.07%", + "70.58%", + "76.79%", + "83.01%", + "89.22%", + "95.99%", + "102.77%", + "109.54%", + "116.32%", + "123.1%", + "129.87%" + ] + }, + { + "name": "二段伤害", + "unit": "", + "isSame": false, + "values": [ + "44.9%", + "48.55%", + "52.2%", + "57.42%", + "61.08%", + "65.26%", + "71%", + "76.74%", + "82.48%", + "88.75%", + "95.01%", + "101.28%", + "107.54%", + "113.8%", + "120.07%" + ] + }, + { + "name": "三段伤害", + "unit": "", + "isSame": false, + "values": [ + "59.3%", + "64.13%", + "68.95%", + "75.85%", + "80.68%", + "86.19%", + "93.78%", + "101.36%", + "108.95%", + "117.22%", + "125.5%", + "133.77%", + "142.05%", + "150.32%", + "158.59%" + ] + }, + { + "name": "四段伤害", + "unit": "", + "isSame": false, + "values": [ + "75.1%", + "81.22%", + "87.33%", + "96.06%", + "102.17%", + "109.16%", + "118.77%", + "128.37%", + "137.98%", + "148.46%", + "158.94%", + "169.42%", + "179.9%", + "190.38%", + "200.86%" + ] + }, + { + "name": "重击伤害", + "unit": "", + "isSame": false, + "values": [ + "91.33%", + "98.77%", + "106.2%", + "116.82%", + "124.25%", + "132.75%", + "144.43%", + "156.11%", + "167.8%", + "180.54%", + "193.28%", + "206.03%", + "218.77%", + "231.52%", + "244.26%" + ] + }, + { + "name": "重击体力消耗", + "unit": "", + "isSame": true, + "values": [ + "25点", + "25点", + "25点", + "25点", + "25点", + "25点", + "25点", + "25点", + "25点", + "25点", + "25点", + "25点", + "25点", + "25点", + "25点" + ] + }, + { + "name": "下坠期间伤害", + "unit": "", + "isSame": false, + "values": [ + "63.93%", + "69.14%", + "74.34%", + "81.77%", + "86.98%", + "92.93%", + "101.1%", + "109.28%", + "117.46%", + "126.38%", + "135.3%", + "144.22%", + "153.14%", + "162.06%", + "170.98%" + ] + }, + { + "name": "低空/高空坠地冲击伤害", + "unit": "", + "isSame": false, + "values": [ + "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": { + "id": 9932, + "name": "撷萃调香", + "desc": [ + "创造柔灯之匣，造成草元素范围伤害。", + "

柔灯之匣

", + "·间歇性对附近的敌人发射「纯露芳息」，造成草元素伤害；", + "·附近的敌人处于燃烧状态下时，将间歇性产生「香韵」，每2秒至多通过这种方式产生一枚香韵。柔灯之匣会萃集附近的香韵，萃集两枚香韵后，其品阶将会提升，发射纯露芳息时，将额外发射一枚纯露芳息，且提高上述攻击的攻击范围与造成的伤害。", + "·同时至多存在一个艾梅莉埃自己创造的柔灯之匣。柔灯之匣创造时的初始品阶为一阶，至多提升至二阶。处于场上时，若8秒内未萃集香韵，则柔灯之匣的品阶将会回到一阶。", + "

始基力：芒性

", + "每隔一段时间，艾梅莉埃通过这种方式创造柔灯之匣后，将在前方降下穿透敌人的灵息之刺，造成具有芒性的草元素伤害。", + "「世间之景，正如无数芬芳、色彩与歌声悠长的应和。」" + ], + "tables": [ + { + "name": "技能伤害", + "unit": "", + "isSame": false, + "values": [ + "47.08%", + "50.61%", + "54.14%", + "58.85%", + "62.38%", + "65.91%", + "70.62%", + "75.33%", + "80.04%", + "84.74%", + "89.45%", + "94.16%", + "100.05%", + "105.93%", + "111.82%" + ] + }, + { + "name": "柔灯之匣·一阶攻击伤害", + "unit": "", + "isSame": false, + "values": [ + "39.6%", + "42.57%", + "45.54%", + "49.5%", + "52.47%", + "55.44%", + "59.4%", + "63.36%", + "67.32%", + "71.28%", + "75.24%", + "79.2%", + "84.15%", + "89.1%", + "94.05%" + ] + }, + { + "name": "柔灯之匣·二阶攻击伤害", + "unit": "", + "isSame": false, + "values": [ + "84%*2", + "90.3%*2", + "96.6%*2", + "105%*2", + "111.3%*2", + "117.6%*2", + "126%*2", + "134.4%*2", + "142.8%*2", + "151.2%*2", + "159.6%*2", + "168%*2", + "178.5%*2", + "189%*2", + "199.5%*2" + ] + }, + { + "name": "柔灯之匣持续时间", + "unit": "", + "isSame": true, + "values": [ + "22秒", + "22秒", + "22秒", + "22秒", + "22秒", + "22秒", + "22秒", + "22秒", + "22秒", + "22秒", + "22秒", + "22秒", + "22秒", + "22秒", + "22秒" + ] + }, + { + "name": "灵息之刺伤害", + "unit": "", + "isSame": false, + "values": [ + "38.52%", + "41.41%", + "44.3%", + "48.15%", + "51.04%", + "53.93%", + "57.78%", + "61.63%", + "65.48%", + "69.34%", + "73.19%", + "77.04%", + "81.86%", + "86.67%", + "91.49%" + ] + }, + { + "name": "灵息之刺冷却间隔", + "unit": "", + "isSame": true, + "values": [ + "10秒", + "10秒", + "10秒", + "10秒", + "10秒", + "10秒", + "10秒", + "10秒", + "10秒", + "10秒", + "10秒", + "10秒", + "10秒", + "10秒", + "10秒" + ] + }, + { + "name": "技能冷却时间", + "unit": "", + "isSame": true, + "values": [ + "14秒", + "14秒", + "14秒", + "14秒", + "14秒", + "14秒", + "14秒", + "14秒", + "14秒", + "14秒", + "14秒", + "14秒", + "14秒", + "14秒", + "14秒" + ] + } + ] + }, + "q": { + "id": 9939, + "name": "香氛演绎", + "desc": [ + "引导匣中萃集的香氛，将其化作纯粹的草元素之力，创造柔灯之匣·三阶，并收存已有的柔灯之匣。", + "存在期间内，柔灯之匣·三阶不会萃集附近的香韵，而是会持续降下香露，攻击范围内的敌人，造成草元素伤害。持续期间，每0.3秒将会降下一枚香露，且每名敌人每0.7秒只能被选为一次目标。", + "持续时间结束时，将重新创造柔灯之匣·一阶；若施放香氛演绎时收存了柔灯之匣，则改为放置已收存的柔灯之匣，并重置其持续时间。", + "香氛演绎持续期间，元素战技「撷萃调香」不会生成柔灯之匣。", + "无论是什么样的香水，自接触空气的那一刻开始，其香调便会随着时间推移而改变，最终消溶在风与草木的低语中。某种意义上，人们永远也无法欣赏同一瓶香水。", + "众生的轨迹也是这样。因此，或许可以说，香水便是人生的演绎。" + ], + "tables": [ + { + "name": "柔灯之匣·三阶攻击伤害", + "unit": "", + "isSame": false, + "values": [ + "217.2%", + "233.49%", + "249.78%", + "271.5%", + "287.79%", + "304.08%", + "325.8%", + "347.52%", + "369.24%", + "390.96%", + "412.68%", + "434.4%", + "461.55%", + "488.7%", + "515.85%" + ] + }, + { + "name": "柔灯之匣·三阶持续时间", + "unit": "", + "isSame": true, + "values": [ + "2.8秒", + "2.8秒", + "2.8秒", + "2.8秒", + "2.8秒", + "2.8秒", + "2.8秒", + "2.8秒", + "2.8秒", + "2.8秒", + "2.8秒", + "2.8秒", + "2.8秒", + "2.8秒", + "2.8秒" + ] + }, + { + "name": "冷却时间", + "unit": "", + "isSame": true, + "values": [ + "13.5秒", + "13.5秒", + "13.5秒", + "13.5秒", + "13.5秒", + "13.5秒", + "13.5秒", + "13.5秒", + "13.5秒", + "13.5秒", + "13.5秒", + "13.5秒", + "13.5秒", + "13.5秒", + "13.5秒" + ] + }, + { + "name": "元素能量", + "unit": "", + "isSame": true, + "values": [ + "50", + "50", + "50", + "50", + "50", + "50", + "50", + "50", + "50", + "50", + "50", + "50", + "50", + "50", + "50" + ] + } + ] + } + }, + "talentData": { + "a": { + "一段伤害": [ + 48.56, + 52.51, + 56.47, + 62.11, + 66.07, + 70.58, + 76.79, + 83.01, + 89.22, + 95.99, + 102.77, + 109.54, + 116.32, + 123.1, + 129.87 + ], + "二段伤害": [ + 44.9, + 48.55, + 52.2, + 57.42, + 61.08, + 65.26, + 71, + 76.74, + 82.48, + 88.75, + 95.01, + 101.28, + 107.54, + 113.8, + 120.07 + ], + "三段伤害": [ + 59.3, + 64.13, + 68.95, + 75.85, + 80.68, + 86.19, + 93.78, + 101.36, + 108.95, + 117.22, + 125.5, + 133.77, + 142.05, + 150.32, + 158.59 + ], + "四段伤害": [ + 75.1, + 81.22, + 87.33, + 96.06, + 102.17, + 109.16, + 118.77, + 128.37, + 137.98, + 148.46, + 158.94, + 169.42, + 179.9, + 190.38, + 200.86 + ], + "重击伤害": [ + 91.33, + 98.77, + 106.2, + 116.82, + 124.25, + 132.75, + 144.43, + 156.11, + 167.8, + 180.54, + 193.28, + 206.03, + 218.77, + 231.52, + 244.26 + ], + "下坠期间伤害": [ + 63.93, + 69.14, + 74.34, + 81.77, + 86.98, + 92.93, + 101.1, + 109.28, + 117.46, + 126.38, + 135.3, + 144.22, + 153.14, + 162.06, + 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 + ] + ] + }, + "e": { + "技能伤害": [ + 47.08, + 50.61, + 54.14, + 58.85, + 62.38, + 65.91, + 70.62, + 75.33, + 80.04, + 84.74, + 89.45, + 94.16, + 100.05, + 105.93, + 111.82 + ], + "柔灯之匣·一阶攻击伤害": [ + 39.6, + 42.57, + 45.54, + 49.5, + 52.47, + 55.44, + 59.4, + 63.36, + 67.32, + 71.28, + 75.24, + 79.2, + 84.15, + 89.1, + 94.05 + ], + "柔灯之匣·二阶攻击伤害": [ + 168, + 180.6, + 193.2, + 210, + 222.6, + 235.2, + 252, + 268.8, + 285.6, + 302.4, + 319.2, + 336, + 357, + 378, + 399 + ], + "柔灯之匣·二阶攻击伤害2": [ + [ + 84, + 2 + ], + [ + 90.3, + 2 + ], + [ + 96.6, + 2 + ], + [ + 105, + 2 + ], + [ + 111.3, + 2 + ], + [ + 117.6, + 2 + ], + [ + 126, + 2 + ], + [ + 134.4, + 2 + ], + [ + 142.8, + 2 + ], + [ + 151.2, + 2 + ], + [ + 159.6, + 2 + ], + [ + 168, + 2 + ], + [ + 178.5, + 2 + ], + [ + 189, + 2 + ], + [ + 199.5, + 2 + ] + ], + "灵息之刺伤害": [ + 38.52, + 41.41, + 44.3, + 48.15, + 51.04, + 53.93, + 57.78, + 61.63, + 65.48, + 69.34, + 73.19, + 77.04, + 81.86, + 86.67, + 91.49 + ] + }, + "q": { + "柔灯之匣·三阶攻击伤害": [ + 217.2, + 233.49, + 249.78, + 271.5, + 287.79, + 304.08, + 325.8, + 347.52, + 369.24, + 390.96, + 412.68, + 434.4, + 461.55, + 488.7, + 515.85 + ] + } + }, + "cons": { + "1": { + "name": "淡香浸析", + "desc": [ + "撷萃调香与固有天赋「余薰」的清露香氛造成的伤害提升20%，后者需要解锁固有天赋「余薰」。", + "此外，队伍中附近的角色对敌人触发燃烧反应或对处于燃烧状态下的敌人造成草元素伤害时，会额外生成一枚香韵。此效果每2.9秒至多触发一次。" + ] + }, + "2": { + "name": "湖光顶调", + "desc": [ + "撷萃调香、香氛演绎或固有天赋「余薰」的清露香氛（需解锁该固有天赋）命中敌人时，该敌人的草元素抗性降低30%，持续10秒。" + ] + }, + "3": { + "name": "郁馥臻萃", + "desc": [ + "

撷萃调香的技能等级提高3级。

", + "至多提升至15级。" + ] + }, + "4": { + "name": "柔灯心韵", + "desc": [ + "香氛演绎的持续时间延长2秒，且每名敌人被香露选为目标的间隔降低0.3秒。" + ] + }, + "5": { + "name": "纯露凝芳", + "desc": [ + "

香氛演绎的技能等级提高3级。

", + "至多提升至15级。" + ] + }, + "6": { + "name": "茉洁香迹", + "desc": [ + "施放撷萃调香或香氛演绎时，艾梅莉埃将获得「香迹留驻」，持续5秒。", + "持续期间，艾梅莉埃进行普通攻击或重击后，将会产生一枚香韵，且艾梅莉埃的普通攻击与重击将转为无法被附魔覆盖的草元素伤害，并提升造成的伤害，提升值相当于艾梅莉埃攻击力的300%。", + "「香迹留驻」效果将在通过这种方式产生4枚香韵或持续时间结束时解除。每12秒至多获得一次「香迹留驻」效果。" + ] + } + }, + "passive": [ + { + "name": "顶空集香", + "desc": [ + "场上存在艾梅莉埃自己创造的柔灯之匣时，队伍中附近的所有角色对燃烧伤害的火元素抗性提升85%。" + ] + }, + { + "name": "余薰", + "desc": [ + "每萃集两枚香韵，柔灯之匣·二阶将消耗香韵，并浸析出「清露香氛」，对敌人造成相当于艾梅莉埃攻击力600%的草元素范围伤害。该伤害不被视为元素战技伤害。" + ] + }, + { + "name": "精馏", + "desc": [ + "基于艾梅莉埃的攻击力，提升艾梅莉埃对处于燃烧状态下的敌人造成的伤害：每1000点攻击力都将提升15%伤害，至多通过这种方式提升36%伤害。" + ] + } + ], + "attr": { + "keys": [ + "hpBase", + "atkBase", + "defBase", + "cdmg" + ], + "details": { + "1": [ + 1056, + 26.07, + 56.84, + 0 + ], + "20": [ + 2740, + 67.62, + 147.44, + 0 + ], + "40": [ + 5455, + 134.62, + 293.54, + 0 + ], + "50": [ + 7016, + 173.16, + 377.56, + 9.6 + ], + "60": [ + 8802, + 217.22, + 473.63, + 19.2 + ], + "70": [ + 10381, + 256.19, + 558.62, + 19.2 + ], + "80": [ + 11971, + 295.43, + 644.17, + 28.8 + ], + "90": [ + 13568, + 334.85, + 730.13, + 38.4 + ], + "20+": [ + 3646, + 89.97, + 196.17, + 0 + ], + "40+": [ + 6099, + 150.5, + 328.17, + 9.6 + ], + "50+": [ + 7874, + 194.33, + 423.73, + 19.2 + ], + "60+": [ + 9445, + 233.1, + 508.26, + 19.2 + ], + "70+": [ + 11025, + 272.07, + 593.25, + 28.8 + ], + "80+": [ + 12615, + 311.31, + 678.8, + 38.4 + ] + } + } +} \ No newline at end of file diff --git a/resources/meta-gs/character/艾梅莉埃/icons/cons-1.webp b/resources/meta-gs/character/艾梅莉埃/icons/cons-1.webp new file mode 100644 index 00000000..90930048 Binary files /dev/null and b/resources/meta-gs/character/艾梅莉埃/icons/cons-1.webp differ diff --git a/resources/meta-gs/character/艾梅莉埃/icons/cons-2.webp b/resources/meta-gs/character/艾梅莉埃/icons/cons-2.webp new file mode 100644 index 00000000..ef62c6c9 Binary files /dev/null and b/resources/meta-gs/character/艾梅莉埃/icons/cons-2.webp differ diff --git a/resources/meta-gs/character/艾梅莉埃/icons/cons-3.webp b/resources/meta-gs/character/艾梅莉埃/icons/cons-3.webp new file mode 100644 index 00000000..c00f05d6 Binary files /dev/null and b/resources/meta-gs/character/艾梅莉埃/icons/cons-3.webp differ diff --git a/resources/meta-gs/character/艾梅莉埃/icons/cons-4.webp b/resources/meta-gs/character/艾梅莉埃/icons/cons-4.webp new file mode 100644 index 00000000..5d839013 Binary files /dev/null and b/resources/meta-gs/character/艾梅莉埃/icons/cons-4.webp differ diff --git a/resources/meta-gs/character/艾梅莉埃/icons/cons-5.webp b/resources/meta-gs/character/艾梅莉埃/icons/cons-5.webp new file mode 100644 index 00000000..d8d6664a Binary files /dev/null and b/resources/meta-gs/character/艾梅莉埃/icons/cons-5.webp differ diff --git a/resources/meta-gs/character/艾梅莉埃/icons/cons-6.webp b/resources/meta-gs/character/艾梅莉埃/icons/cons-6.webp new file mode 100644 index 00000000..95e476c1 Binary files /dev/null and b/resources/meta-gs/character/艾梅莉埃/icons/cons-6.webp differ diff --git a/resources/meta-gs/character/艾梅莉埃/icons/passive-0.webp b/resources/meta-gs/character/艾梅莉埃/icons/passive-0.webp new file mode 100644 index 00000000..320782e3 Binary files /dev/null and b/resources/meta-gs/character/艾梅莉埃/icons/passive-0.webp differ diff --git a/resources/meta-gs/character/艾梅莉埃/icons/passive-1.webp b/resources/meta-gs/character/艾梅莉埃/icons/passive-1.webp new file mode 100644 index 00000000..4f3aac14 Binary files /dev/null and b/resources/meta-gs/character/艾梅莉埃/icons/passive-1.webp differ diff --git a/resources/meta-gs/character/艾梅莉埃/icons/passive-2.webp b/resources/meta-gs/character/艾梅莉埃/icons/passive-2.webp new file mode 100644 index 00000000..c7cc8b4f Binary files /dev/null and b/resources/meta-gs/character/艾梅莉埃/icons/passive-2.webp differ diff --git a/resources/meta-gs/character/艾梅莉埃/imgs/banner.webp b/resources/meta-gs/character/艾梅莉埃/imgs/banner.webp new file mode 100644 index 00000000..144dd163 Binary files /dev/null and b/resources/meta-gs/character/艾梅莉埃/imgs/banner.webp differ diff --git a/resources/meta-gs/character/艾梅莉埃/imgs/card.webp b/resources/meta-gs/character/艾梅莉埃/imgs/card.webp new file mode 100644 index 00000000..66addcc5 Binary files /dev/null and b/resources/meta-gs/character/艾梅莉埃/imgs/card.webp differ diff --git a/resources/meta-gs/character/艾梅莉埃/imgs/face.webp b/resources/meta-gs/character/艾梅莉埃/imgs/face.webp new file mode 100644 index 00000000..4cd5fc21 Binary files /dev/null and b/resources/meta-gs/character/艾梅莉埃/imgs/face.webp differ diff --git a/resources/meta-gs/character/艾梅莉埃/imgs/gacha.webp b/resources/meta-gs/character/艾梅莉埃/imgs/gacha.webp new file mode 100644 index 00000000..428929c8 Binary files /dev/null and b/resources/meta-gs/character/艾梅莉埃/imgs/gacha.webp differ diff --git a/resources/meta-gs/character/艾梅莉埃/imgs/side.webp b/resources/meta-gs/character/艾梅莉埃/imgs/side.webp new file mode 100644 index 00000000..6d415a35 Binary files /dev/null and b/resources/meta-gs/character/艾梅莉埃/imgs/side.webp differ diff --git a/resources/meta-gs/character/艾梅莉埃/imgs/splash.webp b/resources/meta-gs/character/艾梅莉埃/imgs/splash.webp new file mode 100644 index 00000000..058fb179 Binary files /dev/null and b/resources/meta-gs/character/艾梅莉埃/imgs/splash.webp differ diff --git a/resources/meta-gs/material/data.json b/resources/meta-gs/material/data.json index f66c774e..7bc0814f 100644 --- a/resources/meta-gs/material/data.json +++ b/resources/meta-gs/material/data.json @@ -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 @@ -2605,5 +2605,11 @@ "name": "万相石", "type": "specialty", "star": 1 + }, + "丝织之羽": { + "id": "n113061", + "name": "丝织之羽", + "type": "weekly", + "star": 5 } } \ No newline at end of file diff --git a/resources/meta-gs/material/weekly/丝织之羽.webp b/resources/meta-gs/material/weekly/丝织之羽.webp new file mode 100644 index 00000000..e93faeee Binary files /dev/null and b/resources/meta-gs/material/weekly/丝织之羽.webp differ diff --git a/resources/meta-gs/weapon/polearm/data.json b/resources/meta-gs/weapon/polearm/data.json index bdebb907..7360a63f 100644 --- a/resources/meta-gs/weapon/polearm/data.json +++ b/resources/meta-gs/weapon/polearm/data.json @@ -155,9 +155,8 @@ "star": 5 }, "13513": { - "id": "13513", + "id": 13513, "name": "柔灯挽歌", - "star": 5, - "wid": "n13513" + "star": 5 } } \ No newline at end of file diff --git a/resources/meta-gs/weapon/polearm/柔灯挽歌/awaken.webp b/resources/meta-gs/weapon/polearm/柔灯挽歌/awaken.webp new file mode 100644 index 00000000..9fd0081f Binary files /dev/null and b/resources/meta-gs/weapon/polearm/柔灯挽歌/awaken.webp differ diff --git a/resources/meta-gs/weapon/polearm/柔灯挽歌/data.json b/resources/meta-gs/weapon/polearm/柔灯挽歌/data.json new file mode 100644 index 00000000..92851019 --- /dev/null +++ b/resources/meta-gs/weapon/polearm/柔灯挽歌/data.json @@ -0,0 +1,73 @@ +{ + "id": 13513, + "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": "cpct", + "bonusData": { + "1": 7.2, + "20": 12.72, + "40": 18.54, + "50": 21.45, + "60": 24.36, + "70": 27.26, + "80": 30.17, + "90": 33.08, + "20+": 12.72, + "40+": 18.54, + "50+": 21.45, + "60+": 24.36, + "70+": 27.26, + "80+": 30.17 + } + }, + "materials": { + "weapon": "无垢之海的金杯", + "monster": "未熄的剑柄", + "normal": "原素花蜜" + }, + "affixData": { + "text": "攻击力提升$[0]；装备者对敌人触发燃烧反应或对处于燃烧状态下的敌人造成草元素伤害后，造成的伤害提高$[1]。该效果持续8秒，至多叠加2层；叠加至2层或2层的持续时间刷新时，恢复$[2]点元素能量，每12秒至多通过这种方式恢复一次元素能量。上述2种效果角色处于队伍后台时也能触发。", + "datas": { + "0": [ + "15%", + "19%", + "23%", + "27%", + "31%" + ], + "1": [ + "18%", + "23%", + "28%", + "33%", + "38%" + ], + "2": [ + "12", + "13", + "14", + "15", + "16" + ] + } + } +} \ No newline at end of file diff --git a/resources/meta-gs/weapon/polearm/柔灯挽歌/gacha.webp b/resources/meta-gs/weapon/polearm/柔灯挽歌/gacha.webp new file mode 100644 index 00000000..74fccf73 Binary files /dev/null and b/resources/meta-gs/weapon/polearm/柔灯挽歌/gacha.webp differ diff --git a/resources/meta-gs/weapon/polearm/柔灯挽歌/icon.webp b/resources/meta-gs/weapon/polearm/柔灯挽歌/icon.webp new file mode 100644 index 00000000..6014a63d Binary files /dev/null and b/resources/meta-gs/weapon/polearm/柔灯挽歌/icon.webp differ diff --git a/resources/meta-sr/artifact/artis-mark.js b/resources/meta-sr/artifact/artis-mark.js index 93d5a7a6..ca2ba843 100644 --- a/resources/meta-sr/artifact/artis-mark.js +++ b/resources/meta-sr/artifact/artis-mark.js @@ -54,10 +54,10 @@ export const usefulAttr = { 停云: { hp: 50, atk: 100, def: 0, speed: 100, cpct: 0, cdmg: 0, stance: 0, heal: 0, recharge: 100, effPct: 0, effDef: 0, dmg: 0 }, 素裳: { hp: 0, atk: 75, def: 0, speed: 75, cpct: 100, cdmg: 100, stance: 50, heal: 0, recharge: 50, effPct: 0, effDef: 0, dmg: 100 }, // 主角 - 穹·同谐: { hp: 75, atk: 0, def: 75, speed: 100, cpct: 0, cdmg: 0, stance: 100, heal: 0, recharge: 75, effPct: 0, effDef: 0, dmg: 0 }, - 星·同谐: { hp: 75, atk: 0, def: 75, speed: 100, cpct: 0, cdmg: 0, stance: 100, heal: 0, recharge: 75, effPct: 0, effDef: 0, dmg: 0 }, - 穹·存护: { hp: 50, atk: 0, def: 100, speed: 100, cpct: 0, cdmg: 0, stance: 0, heal: 0, recharge: 0, effPct: 100, effDef: 50, dmg: 0 }, - 星·存护: { hp: 50, atk: 0, def: 100, speed: 100, cpct: 0, cdmg: 0, stance: 0, heal: 0, recharge: 0, effPct: 100, effDef: 50, dmg: 0 }, - 穹·毁灭: { hp: 0, atk: 75, def: 0, speed: 75, cpct: 100, cdmg: 100, stance: 0, heal: 0, recharge: 50, effPct: 0, effDef: 0, dmg: 100 }, - 星·毁灭: { hp: 0, atk: 75, def: 0, speed: 75, cpct: 100, cdmg: 100, stance: 0, heal: 0, recharge: 50, effPct: 0, effDef: 0, dmg: 100 } + '穹·同谐': { hp: 75, atk: 0, def: 75, speed: 100, cpct: 0, cdmg: 0, stance: 100, heal: 0, recharge: 75, effPct: 0, effDef: 0, dmg: 0 }, + '星·同谐': { hp: 75, atk: 0, def: 75, speed: 100, cpct: 0, cdmg: 0, stance: 100, heal: 0, recharge: 75, effPct: 0, effDef: 0, dmg: 0 }, + '穹·存护': { hp: 50, atk: 0, def: 100, speed: 100, cpct: 0, cdmg: 0, stance: 0, heal: 0, recharge: 0, effPct: 100, effDef: 50, dmg: 0 }, + '星·存护': { hp: 50, atk: 0, def: 100, speed: 100, cpct: 0, cdmg: 0, stance: 0, heal: 0, recharge: 0, effPct: 100, effDef: 50, dmg: 0 }, + '穹·毁灭': { hp: 0, atk: 75, def: 0, speed: 75, cpct: 100, cdmg: 100, stance: 0, heal: 0, recharge: 50, effPct: 0, effDef: 0, dmg: 100 }, + '星·毁灭': { hp: 0, atk: 75, def: 0, speed: 75, cpct: 100, cdmg: 100, stance: 0, heal: 0, recharge: 50, effPct: 0, effDef: 0, dmg: 100 } }