From f00af6cd10d2edab5cb95b3c21feab9b22f25db0 Mon Sep 17 00:00:00 2001 From: CWorld <37377181+cworld1@users.noreply.github.com> Date: Wed, 3 May 2023 17:25:32 +0800 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20Update=20characters=20&=20prop=20ru?= =?UTF-8?q?le?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + metadata/pool/pool_200.py | 2 +- metadata/shortname.py | 9 +++++---- modules/playercards/metadata/FightPropRule.json | 14 ++++++++++++-- 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 15b2e0a7..5c7ce6e2 100644 --- a/.gitignore +++ b/.gitignore @@ -139,6 +139,7 @@ data/ plugins/genshin/daily/daily.json metadata/data/ resources/assets/ +run.ps1 ### private plugins ### plugins/private diff --git a/metadata/pool/pool_200.py b/metadata/pool/pool_200.py index 3bc83392..382993f6 100644 --- a/metadata/pool/pool_200.py +++ b/metadata/pool/pool_200.py @@ -1 +1 @@ -POOL_200 = [{"five": ["常驻池"], "four": [], "from": "2020-09-15 06:00:00", "name": "常驻池", "to": "2050-09-15 17:59:59"}] +POOL_200 = [{"five": ["常驻池"], "four": [], "from": "2020-09-15 06:00:00", "name": "奔行世间", "to": "2050-09-15 17:59:59"}] diff --git a/metadata/shortname.py b/metadata/shortname.py index 74389390..df71b332 100644 --- a/metadata/shortname.py +++ b/metadata/shortname.py @@ -589,6 +589,7 @@ roles = { "七彩阳光秘密主", "正机之神", "伪神", + "阿帽", ], 10000076: ["珐露珊", "faruzan", "法露珊", "珐妹", "初音", "初音未来", "miku", "发露姗", "发姐", "法姐", "百岁珊", "百岁山", "童姥", "知论派名宿"], 10000077: ["瑶瑶", "yaoyao", "遥遥", "遥遥无期", "香菱师妹", "萝卜", "四星草奶"], @@ -596,7 +597,7 @@ roles = { 10000079: ["迪希雅", "dehya", "狮女", "狮子", "腕豪", "女拳"], 10000080: ["米卡", "mika", "镜音连", "咪卡", "小米"], 10000081: ["卡维", "kaveh"], - 10000082: ["白术", "baizhuer"], + 10000082: ["白术", "baizhuer", "白大夫", "草行秋"], } not_real_roles = [] weapons = { @@ -674,7 +675,7 @@ weapons = { "赤角石溃杵": ["赤角", "石溃杵", "荒泷一斗专武", "巧乐兹"], "息灾": ["申鹤专武"], "神乐之真意": ["神乐", "真意", "八重神子专武"], - "证誓之明瞳": ["证誓", "明瞳", "证誓明瞳"], + "证誓之明瞳": ["证誓", "明瞳", "证誓明瞳", "大贝壳"], "波乱月白经津": ["波乱", "月白", "波乱月白", "经津", "波波津", "神里绫人专武", "钵钵鸡"], "若水": ["麒麟弓", "夜兰专武"], "笼钓瓶一心": ["万叶刀", "一心传名刀", "妖刀"], @@ -686,7 +687,7 @@ weapons = { "贯月矢": ["须弥锻造长枪", "原木枪"], "盈满之实": ["须弥锻造法器"], "王下近侍": ["须弥锻造弓", "原木弓"], - "赤沙之杖": ["赤沙", "赛诺专武", "船桨"], + "赤沙之杖": ["赤沙", "赛诺专武", "船桨", "洛阳铲"], "圣显之钥": ["圣显之钥", "圣显", "不灭剑华", "妮露专武", "板砖"], "风信之锋": ["风信", "风信锋"], "西福斯的月光": ["西福斯", "月光", "月光小剑", "月光剑"], @@ -698,7 +699,7 @@ weapons = { "裁叶萃光": ["萃光", "韭菜刀", "裁叶", "菜叶"], "饰铁之花": ["饰铁", "铁花"], "苇海信标": ["苇海", "信标"], - "碧落之珑": ["碧落", "白术专武"], + "碧落之珑": ["碧落", "白术专武", "不灭绿华"], } diff --git a/modules/playercards/metadata/FightPropRule.json b/modules/playercards/metadata/FightPropRule.json index 6c56255e..d372bc00 100644 --- a/modules/playercards/metadata/FightPropRule.json +++ b/modules/playercards/metadata/FightPropRule.json @@ -162,9 +162,9 @@ ], "辛焱": [ "防御力百分比", - "攻击力百分比", "暴击率", "暴击伤害", + "攻击力百分比", "物理伤害加成" ], "钟离": [ @@ -245,7 +245,6 @@ "早柚": [ "攻击力百分比", "暴击率", - "暴击伤害", "元素精通", "元素充能效率", "治疗加成" @@ -407,5 +406,16 @@ "暴击伤害", "元素精通", "元素充能效率" + ], + "白术": [ + "生命值百分比", + "元素充能效率", + "元素精通", + "治疗加成" + ], + "卡维": [ + "元素精通", + "元素充能效率", + "治疗加成" ] } \ No newline at end of file