diff --git a/plugins/genshin/defSet/daily/daily.yaml b/plugins/genshin/defSet/daily/daily.yaml index d19ca06..ff430db 100644 --- a/plugins/genshin/defSet/daily/daily.yaml +++ b/plugins/genshin/defSet/daily/daily.yaml @@ -1,4 +1,7 @@ -- - 笃行: +- - 秩序: + - 枫丹 + - - 琳妮特 + 笃行: - 须弥 - - 柯莱 - 妮露 @@ -27,7 +30,12 @@ - 凯亚 - 丽莎 - 米卡 - - 烈日威权: + - 无垢之海: + - 枫丹 + - - 浪影阔剑 + - 峡湾长歌 + - 公义的酬报 + 烈日威权: - 须弥 - - 王下近侍 - 竭泽 @@ -35,6 +43,7 @@ - 玛海菈的水色 - 图莱杜拉的回忆 - 苇海信标 + - 烈阳之嗣 今昔剧画: - 稻妻 - - 神乐之真意 @@ -77,7 +86,10 @@ - 暗巷猎手 - 祭礼残章 - 饰铁之花 -- - 诤言: +- - 公平: + - 枫丹 + - - 林尼 + 诤言: - 须弥 - - 提纳里 - 赛诺 @@ -107,7 +119,12 @@ - 砂糖 - 芭芭拉 - 安柏 - - 谧林涓露: + - 悠古弦音: + - 枫丹 + - - 灰河渡手 + - 静谧之曲 + - 最初的大魔术 + 谧林涓露: - 须弥 - - 原木刀 - 森林王器 @@ -138,6 +155,7 @@ - 黑岩战弓 - 千岩古剑 - 碧落之珑 + - 遗祀玉珑 高塔孤王: - 蒙德 - - 松籁响起之时 @@ -153,7 +171,11 @@ - 苍翠猎弓 - 雪葬的星银 - 幽夜华尔兹 -- - 巧思: + - 狼牙 +- - 正义: + - 枫丹 + - - 菲米尼 + 巧思: - 须弥 - - 多莉 - 纳西妲 @@ -185,13 +207,18 @@ - 班尼特 - 诺艾尔 - 雷泽 - - 绿洲花园: + - 纯圣露滴: + - 枫丹 + - - 海渊终曲 + - 纯水流华 + 绿洲花园: - 须弥 - - 贯月矢 - 盈满之实 - 赤沙之杖 - 流浪的晚星 - 千夜浮梦 + - 聊聊棒 鸣神御灵: - 稻妻 - - 飞雷之弦振 diff --git a/plugins/genshin/defSet/element/role.yaml b/plugins/genshin/defSet/element/role.yaml index 063c5f5..517dedc 100644 --- a/plugins/genshin/defSet/element/role.yaml +++ b/plugins/genshin/defSet/element/role.yaml @@ -66,6 +66,7 @@ 申鹤: 冰 莱依拉: 冰 米卡: 冰 +菲米尼: 冰 提纳里: 草 柯莱: 草 diff --git a/plugins/genshin/defSet/element/weapon.yaml b/plugins/genshin/defSet/element/weapon.yaml index 54b680e..4b775e2 100644 --- a/plugins/genshin/defSet/element/weapon.yaml +++ b/plugins/genshin/defSet/element/weapon.yaml @@ -33,6 +33,7 @@ 西福斯的月光: 单手剑 东花坊时雨: 单手剑 裁叶萃光: 单手剑 +狼牙: 单手剑 海渊终曲: 单手剑 灰河渡手: 单手剑 @@ -64,9 +65,8 @@ 玛海菈的水色: 大剑 苇海信标: 大剑 饰铁之花: 大剑 -狼牙: 大剑 -浪影阔剑: 大剑 聊聊棒: 大剑 +浪影阔剑: 大剑 新手长枪: 枪 铁尖枪: 枪 @@ -92,8 +92,8 @@ 贯月矢: 枪 赤沙之杖: 枪 风信之锋: 枪 -公义的酬报: 枪 峡湾长歌: 枪 +公义的酬报: 枪 学徒笔记: 法器 口袋魔导书: 法器 @@ -124,8 +124,8 @@ 流浪的晚星: 法器 图莱杜拉的回忆: 法器 碧落之珑: 法器 -纯水流华: 法器 遗祀玉珑: 法器 +纯水流华: 法器 猎弓: 弓 历练的猎弓: 弓 @@ -159,6 +159,6 @@ 王下近侍: 弓 冬极白星: 弓 鹮穿之喙: 弓 -最初的大魔术: 弓 +烈阳之嗣: 弓 静谧之曲: 弓 -烈阳之嗣: 弓 \ No newline at end of file +最初的大魔术: 弓 diff --git a/plugins/genshin/defSet/role/name.yaml b/plugins/genshin/defSet/role/name.yaml index 35516e1..1183613 100644 --- a/plugins/genshin/defSet/role/name.yaml +++ b/plugins/genshin/defSet/role/name.yaml @@ -793,3 +793,30 @@ - 送货员 - 快递员 - 草猫快递 +10000083: + - 琳妮特 + - Lynette + - lynette + - 林妮特 + - 林尼特 + - 琳尼特 + - 魔术助手 + - 魔术助理 + - 助手 + - 助理 + - 二姐 + - 二妹 +10000084: + - 林尼 + - Lyney + - lyney + - 大魔术师 + - 魔术师 + - 大哥 +10000085: + - 菲米尼 + - Freminet + - freminet + - 非米尼 + - 潜水员 + - 三弟 diff --git a/plugins/genshin/defSet/role/other.yaml b/plugins/genshin/defSet/role/other.yaml index c348d5f..46341ed 100644 --- a/plugins/genshin/defSet/role/other.yaml +++ b/plugins/genshin/defSet/role/other.yaml @@ -22,6 +22,8 @@ costumes: - 殷红终夜 - 花时来信 - 叶隐芳名 + - 琪花星烛 + - 帆影游风 #五星角色 five: @@ -60,6 +62,7 @@ five: - 10000078 - 10000079 - 10000082 + - 10000084 #四星角色 four: - 10000006 @@ -96,3 +99,5 @@ four: - 10000077 - 10000080 - 10000081 + - 10000083 + - 10000085 diff --git a/plugins/genshin/defSet/weapon/other.yaml b/plugins/genshin/defSet/weapon/other.yaml index 748c0ce..f9c24a1 100644 --- a/plugins/genshin/defSet/weapon/other.yaml +++ b/plugins/genshin/defSet/weapon/other.yaml @@ -43,6 +43,8 @@ sortName: 裁叶萃光: 萃光 流浪的晚星: 流浪晚星 鹮穿之喙: 鸟弓 + 公义的酬报: 公义酬报 + 最初的大魔术: 大魔术 角斗士的终幕礼: 角斗士 流浪大地的乐团: 流浪乐团 @@ -73,3 +75,4 @@ actWeapon: - 东花坊时雨 - 饰铁之花 - 鹮穿之喙 + - 灰河渡手 diff --git a/plugins/genshin/resources/img/gacha/character/林尼.png b/plugins/genshin/resources/img/gacha/character/林尼.png index 43d1685..49b59c6 100644 Binary files a/plugins/genshin/resources/img/gacha/character/林尼.png and b/plugins/genshin/resources/img/gacha/character/林尼.png differ diff --git a/plugins/genshin/resources/img/gacha/character/琳妮特.png b/plugins/genshin/resources/img/gacha/character/琳妮特.png index 54f3fdb..bfc7b8e 100644 Binary files a/plugins/genshin/resources/img/gacha/character/琳妮特.png and b/plugins/genshin/resources/img/gacha/character/琳妮特.png differ diff --git a/plugins/genshin/resources/img/gacha/character/菲米尼.png b/plugins/genshin/resources/img/gacha/character/菲米尼.png new file mode 100644 index 0000000..f97e8a8 Binary files /dev/null and b/plugins/genshin/resources/img/gacha/character/菲米尼.png differ diff --git a/plugins/genshin/resources/img/gacha/weapon/最初的大魔术.png b/plugins/genshin/resources/img/gacha/weapon/最初的大魔术.png index ddfe880..3c3dbbc 100644 Binary files a/plugins/genshin/resources/img/gacha/weapon/最初的大魔术.png and b/plugins/genshin/resources/img/gacha/weapon/最初的大魔术.png differ diff --git a/plugins/genshin/resources/img/namecard/林尼.png b/plugins/genshin/resources/img/namecard/林尼.png index 6ff48e6..b19f630 100644 Binary files a/plugins/genshin/resources/img/namecard/林尼.png and b/plugins/genshin/resources/img/namecard/林尼.png differ diff --git a/plugins/genshin/resources/img/other/枫丹.png b/plugins/genshin/resources/img/other/枫丹.png new file mode 100644 index 0000000..93b0f8d Binary files /dev/null and b/plugins/genshin/resources/img/other/枫丹.png differ diff --git a/plugins/genshin/resources/img/reliquaries/杰作的序曲.png b/plugins/genshin/resources/img/reliquaries/杰作的序曲.png index 27c560c..7c3ef1a 100644 Binary files a/plugins/genshin/resources/img/reliquaries/杰作的序曲.png and b/plugins/genshin/resources/img/reliquaries/杰作的序曲.png differ diff --git a/plugins/genshin/resources/img/reliquaries/猎人的胸花.png b/plugins/genshin/resources/img/reliquaries/猎人的胸花.png index 3babeaf..6d6e6a8 100644 Binary files a/plugins/genshin/resources/img/reliquaries/猎人的胸花.png and b/plugins/genshin/resources/img/reliquaries/猎人的胸花.png differ diff --git a/plugins/genshin/resources/img/reliquaries/老兵的容颜.png b/plugins/genshin/resources/img/reliquaries/老兵的容颜.png index 50fd729..db53530 100644 Binary files a/plugins/genshin/resources/img/reliquaries/老兵的容颜.png and b/plugins/genshin/resources/img/reliquaries/老兵的容颜.png differ diff --git a/plugins/genshin/resources/img/reliquaries/裁判的时刻.png b/plugins/genshin/resources/img/reliquaries/裁判的时刻.png new file mode 100644 index 0000000..04caf21 Binary files /dev/null and b/plugins/genshin/resources/img/reliquaries/裁判的时刻.png differ diff --git a/plugins/genshin/resources/img/reliquaries/遗忘的容器.png b/plugins/genshin/resources/img/reliquaries/遗忘的容器.png index 666a74a..c73f7ff 100644 Binary files a/plugins/genshin/resources/img/reliquaries/遗忘的容器.png and b/plugins/genshin/resources/img/reliquaries/遗忘的容器.png differ diff --git a/plugins/genshin/resources/img/reliquaries/黄金之夜的喧嚣.png b/plugins/genshin/resources/img/reliquaries/黄金之夜的喧嚣.png index 52383fc..c5fa9f9 100644 Binary files a/plugins/genshin/resources/img/reliquaries/黄金之夜的喧嚣.png and b/plugins/genshin/resources/img/reliquaries/黄金之夜的喧嚣.png differ diff --git a/plugins/genshin/resources/img/reliquaries/黄金乐曲的变奏.png b/plugins/genshin/resources/img/reliquaries/黄金乐曲的变奏.png index 1aa4441..8032f06 100644 Binary files a/plugins/genshin/resources/img/reliquaries/黄金乐曲的变奏.png and b/plugins/genshin/resources/img/reliquaries/黄金乐曲的变奏.png differ diff --git a/plugins/genshin/resources/img/reliquaries/黄金剧团的奖赏.png b/plugins/genshin/resources/img/reliquaries/黄金剧团的奖赏.png index 3506030..51a4d0f 100644 Binary files a/plugins/genshin/resources/img/reliquaries/黄金剧团的奖赏.png and b/plugins/genshin/resources/img/reliquaries/黄金剧团的奖赏.png differ diff --git a/plugins/genshin/resources/img/reliquaries/黄金时代的先声.png b/plugins/genshin/resources/img/reliquaries/黄金时代的先声.png index 2cda976..2101142 100644 Binary files a/plugins/genshin/resources/img/reliquaries/黄金时代的先声.png and b/plugins/genshin/resources/img/reliquaries/黄金时代的先声.png differ diff --git a/plugins/genshin/resources/img/reliquaries/黄金飞鸟的落羽.png b/plugins/genshin/resources/img/reliquaries/黄金飞鸟的落羽.png index e6db051..592f577 100644 Binary files a/plugins/genshin/resources/img/reliquaries/黄金飞鸟的落羽.png and b/plugins/genshin/resources/img/reliquaries/黄金飞鸟的落羽.png differ diff --git a/plugins/genshin/resources/img/role/林尼.png b/plugins/genshin/resources/img/role/林尼.png index 35868ba..67019e8 100644 Binary files a/plugins/genshin/resources/img/role/林尼.png and b/plugins/genshin/resources/img/role/林尼.png differ diff --git a/plugins/genshin/resources/img/role/琳妮特.png b/plugins/genshin/resources/img/role/琳妮特.png index 7028b26..1b790f6 100644 Binary files a/plugins/genshin/resources/img/role/琳妮特.png and b/plugins/genshin/resources/img/role/琳妮特.png differ diff --git a/plugins/genshin/resources/img/role/菲米尼.png b/plugins/genshin/resources/img/role/菲米尼.png new file mode 100644 index 0000000..24bda13 Binary files /dev/null and b/plugins/genshin/resources/img/role/菲米尼.png differ diff --git a/plugins/genshin/resources/img/side/林尼.png b/plugins/genshin/resources/img/side/林尼.png index f7b217e..43d18b0 100644 Binary files a/plugins/genshin/resources/img/side/林尼.png and b/plugins/genshin/resources/img/side/林尼.png differ diff --git a/plugins/genshin/resources/img/side/琳妮特.png b/plugins/genshin/resources/img/side/琳妮特.png index 62a3bf3..738ae34 100644 Binary files a/plugins/genshin/resources/img/side/琳妮特.png and b/plugins/genshin/resources/img/side/琳妮特.png differ diff --git a/plugins/genshin/resources/img/side/菲米尼.png b/plugins/genshin/resources/img/side/菲米尼.png new file mode 100644 index 0000000..96d736b Binary files /dev/null and b/plugins/genshin/resources/img/side/菲米尼.png differ diff --git a/plugins/genshin/resources/img/talent/公平_2.png b/plugins/genshin/resources/img/talent/公平_2.png new file mode 100644 index 0000000..efe464c Binary files /dev/null and b/plugins/genshin/resources/img/talent/公平_2.png differ diff --git a/plugins/genshin/resources/img/talent/公平_3.png b/plugins/genshin/resources/img/talent/公平_3.png new file mode 100644 index 0000000..8f1fa14 Binary files /dev/null and b/plugins/genshin/resources/img/talent/公平_3.png differ diff --git a/plugins/genshin/resources/img/talent/公平_4.png b/plugins/genshin/resources/img/talent/公平_4.png new file mode 100644 index 0000000..e15670d Binary files /dev/null and b/plugins/genshin/resources/img/talent/公平_4.png differ diff --git a/plugins/genshin/resources/img/talent/正义_2.png b/plugins/genshin/resources/img/talent/正义_2.png new file mode 100644 index 0000000..b1fadcf Binary files /dev/null and b/plugins/genshin/resources/img/talent/正义_2.png differ diff --git a/plugins/genshin/resources/img/talent/正义_3.png b/plugins/genshin/resources/img/talent/正义_3.png new file mode 100644 index 0000000..b226a64 Binary files /dev/null and b/plugins/genshin/resources/img/talent/正义_3.png differ diff --git a/plugins/genshin/resources/img/talent/正义_4.png b/plugins/genshin/resources/img/talent/正义_4.png new file mode 100644 index 0000000..895c5ed Binary files /dev/null and b/plugins/genshin/resources/img/talent/正义_4.png differ diff --git a/plugins/genshin/resources/img/talent/秩序_2.png b/plugins/genshin/resources/img/talent/秩序_2.png new file mode 100644 index 0000000..0929229 Binary files /dev/null and b/plugins/genshin/resources/img/talent/秩序_2.png differ diff --git a/plugins/genshin/resources/img/talent/秩序_3.png b/plugins/genshin/resources/img/talent/秩序_3.png new file mode 100644 index 0000000..58eb9ee Binary files /dev/null and b/plugins/genshin/resources/img/talent/秩序_3.png differ diff --git a/plugins/genshin/resources/img/talent/秩序_4.png b/plugins/genshin/resources/img/talent/秩序_4.png new file mode 100644 index 0000000..5d51c13 Binary files /dev/null and b/plugins/genshin/resources/img/talent/秩序_4.png differ diff --git a/plugins/genshin/resources/img/weapon/公义的酬报.png b/plugins/genshin/resources/img/weapon/公义的酬报.png index 5f818c1..34d90c4 100644 Binary files a/plugins/genshin/resources/img/weapon/公义的酬报.png and b/plugins/genshin/resources/img/weapon/公义的酬报.png differ diff --git a/plugins/genshin/resources/img/weapon/峡湾长歌.png b/plugins/genshin/resources/img/weapon/峡湾长歌.png index 792a9bb..79873ce 100644 Binary files a/plugins/genshin/resources/img/weapon/峡湾长歌.png and b/plugins/genshin/resources/img/weapon/峡湾长歌.png differ diff --git a/plugins/genshin/resources/img/weapon/最初的大魔术.png b/plugins/genshin/resources/img/weapon/最初的大魔术.png index dd50d16..b1d9c80 100644 Binary files a/plugins/genshin/resources/img/weapon/最初的大魔术.png and b/plugins/genshin/resources/img/weapon/最初的大魔术.png differ diff --git a/plugins/genshin/resources/img/weapon/浪影阔剑.png b/plugins/genshin/resources/img/weapon/浪影阔剑.png index 7248228..97e18e1 100644 Binary files a/plugins/genshin/resources/img/weapon/浪影阔剑.png and b/plugins/genshin/resources/img/weapon/浪影阔剑.png differ diff --git a/plugins/genshin/resources/img/weapon/海渊终曲.png b/plugins/genshin/resources/img/weapon/海渊终曲.png index 5282ece..34e05a8 100644 Binary files a/plugins/genshin/resources/img/weapon/海渊终曲.png and b/plugins/genshin/resources/img/weapon/海渊终曲.png differ diff --git a/plugins/genshin/resources/img/weapon/灰河渡手.png b/plugins/genshin/resources/img/weapon/灰河渡手.png index 7f1b2af..73bc5ed 100644 Binary files a/plugins/genshin/resources/img/weapon/灰河渡手.png and b/plugins/genshin/resources/img/weapon/灰河渡手.png differ diff --git a/plugins/genshin/resources/img/weapon/烈阳之嗣.png b/plugins/genshin/resources/img/weapon/烈阳之嗣.png index 572adf1..af4949b 100644 Binary files a/plugins/genshin/resources/img/weapon/烈阳之嗣.png and b/plugins/genshin/resources/img/weapon/烈阳之嗣.png differ diff --git a/plugins/genshin/resources/img/weapon/狼牙.png b/plugins/genshin/resources/img/weapon/狼牙.png new file mode 100644 index 0000000..24e8b39 Binary files /dev/null and b/plugins/genshin/resources/img/weapon/狼牙.png differ diff --git a/plugins/genshin/resources/img/weapon/纯水流华.png b/plugins/genshin/resources/img/weapon/纯水流华.png index 5075282..7370317 100644 Binary files a/plugins/genshin/resources/img/weapon/纯水流华.png and b/plugins/genshin/resources/img/weapon/纯水流华.png differ diff --git a/plugins/genshin/resources/img/weapon/聊聊棒.png b/plugins/genshin/resources/img/weapon/聊聊棒.png index e937678..9718d31 100644 Binary files a/plugins/genshin/resources/img/weapon/聊聊棒.png and b/plugins/genshin/resources/img/weapon/聊聊棒.png differ diff --git a/plugins/genshin/resources/img/weapon/遗祀玉珑.png b/plugins/genshin/resources/img/weapon/遗祀玉珑.png index fe6cfd5..00efaf5 100644 Binary files a/plugins/genshin/resources/img/weapon/遗祀玉珑.png and b/plugins/genshin/resources/img/weapon/遗祀玉珑.png differ diff --git a/plugins/genshin/resources/img/weapon/静谧之曲.png b/plugins/genshin/resources/img/weapon/静谧之曲.png index 231330f..a43ffdb 100644 Binary files a/plugins/genshin/resources/img/weapon/静谧之曲.png and b/plugins/genshin/resources/img/weapon/静谧之曲.png differ