From f1e8bb618e4fe3aad7a7eaa04aab635b6e9d6e68 Mon Sep 17 00:00:00 2001 From: omg-xtao <100690902+omg-xtao@users.noreply.github.com> Date: Mon, 21 Aug 2023 17:17:45 +0800 Subject: [PATCH] :recycle: Move FightPropRule to submodule --- .gitmodules | 3 + modules/playercards/helpers.py | 2 +- modules/playercards/metadata | 1 + .../playercards/metadata/FightPropRule.json | 427 ------------------ 4 files changed, 5 insertions(+), 428 deletions(-) create mode 160000 modules/playercards/metadata delete mode 100644 modules/playercards/metadata/FightPropRule.json diff --git a/.gitmodules b/.gitmodules index b67cba9..b62574e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,3 +2,6 @@ path = gram_core url = https://github.com/PaiGramTeam/GramCore.git branch = v4 +[submodule "modules/playercards/metadata"] + path = modules/playercards/metadata + url = https://github.com/PaiGramTeam/FightPropRule.git diff --git a/modules/playercards/helpers.py b/modules/playercards/helpers.py index c4c18c0..13fd0f8 100644 --- a/modules/playercards/helpers.py +++ b/modules/playercards/helpers.py @@ -6,7 +6,7 @@ from enkanetwork import EquipmentsStats from modules.playercards.fight_prop import FightProp, FightPropScore _project_path = os.path.dirname(__file__) -_fight_prop_rule_file = os.path.join(_project_path, "metadata", "FightPropRule.json") +_fight_prop_rule_file = os.path.join(_project_path, "metadata", "FightPropRule_genshin.json") with open(_fight_prop_rule_file, "r", encoding="utf-8") as f: fight_prop_rule_data: dict = json.load(f) diff --git a/modules/playercards/metadata b/modules/playercards/metadata new file mode 160000 index 0000000..6f366f6 --- /dev/null +++ b/modules/playercards/metadata @@ -0,0 +1 @@ +Subproject commit 6f366f6367d29cc89643ddf591608f58826dd9dd diff --git a/modules/playercards/metadata/FightPropRule.json b/modules/playercards/metadata/FightPropRule.json deleted file mode 100644 index 6b1e876..0000000 --- a/modules/playercards/metadata/FightPropRule.json +++ /dev/null @@ -1,427 +0,0 @@ -{ - "旅行者": [ - "攻击力百分比", - "暴击率", - "暴击伤害", - "元素充能效率", - "元素精通" - ], - "安柏": [ - "攻击力百分比", - "暴击率", - "暴击伤害", - "元素精通" - ], - "凯亚": [ - "攻击力百分比", - "暴击率", - "暴击伤害", - "元素充能效率" - ], - "丽莎": [ - "攻击力百分比", - "暴击率", - "暴击伤害", - "元素精通" - ], - "芭芭拉": [ - "生命值百分比", - "元素充能效率", - "元素精通" - ], - "芭芭拉-核爆": [ - "攻击力百分比", - "暴击率", - "暴击伤害", - "元素精通" - ], - "雷泽": [ - "攻击力百分比", - "暴击率", - "暴击伤害", - "物理伤害加成" - ], - "香菱": [ - "攻击力百分比", - "暴击率", - "暴击伤害", - "元素精通", - "元素充能效率" - ], - "北斗": [ - "攻击力百分比", - "暴击率", - "暴击伤害", - "元素充能效率" - ], - "行秋": [ - "攻击力百分比", - "暴击率", - "暴击伤害", - "元素充能效率" - ], - "凝光": [ - "攻击力百分比", - "暴击率", - "暴击伤害", - "元素充能效率" - ], - "菲谢尔": [ - "攻击力百分比", - "暴击率", - "暴击伤害", - "元素精通" - ], - "班尼特": [ - "生命值百分比", - "元素充能效率", - "治疗加成" - ], - "诺艾尔": [ - "攻击力百分比", - "防御力百分比", - "暴击率", - "暴击伤害", - "元素充能效率" - ], - "重云": [ - "攻击力百分比", - "暴击率", - "暴击伤害", - "元素精通", - "元素充能效率" - ], - "砂糖": [ - "攻击力百分比", - "暴击率", - "暴击伤害", - "元素精通", - "元素充能效率" - ], - "琴": [ - "攻击力百分比", - "暴击率", - "暴击伤害", - "物理伤害加成", - "元素充能效率", - "治疗加成" - ], - "迪卢克": [ - "攻击力百分比", - "暴击率", - "暴击伤害", - "元素精通" - ], - "七七": [ - "攻击力百分比", - "暴击率", - "暴击伤害", - "物理伤害加成", - "元素充能效率", - "治疗加成" - ], - "莫娜": [ - "攻击力百分比", - "暴击率", - "暴击伤害", - "元素精通", - "元素充能效率" - ], - "刻晴": [ - "攻击力百分比", - "暴击率", - "暴击伤害", - "元素精通", - "物理伤害加成" - ], - "温迪": [ - "攻击力百分比", - "暴击率", - "暴击伤害", - "元素精通", - "元素充能效率" - ], - "可莉": [ - "攻击力百分比", - "暴击率", - "暴击伤害", - "元素精通", - "元素充能效率" - ], - "迪奥娜": [ - "生命值百分比", - "元素充能效率", - "治疗加成" - ], - "达达利亚": [ - "攻击力百分比", - "暴击率", - "暴击伤害", - "元素精通", - "元素充能效率" - ], - "辛焱": [ - "防御力百分比", - "暴击率", - "暴击伤害", - "攻击力百分比", - "物理伤害加成" - ], - "钟离": [ - "生命值百分比", - "攻击力百分比", - "暴击率", - "暴击伤害", - "物理伤害加成", - "元素充能效率" - ], - "钟离-安如磐石": [ - "生命值百分比", - "暴击率" - ], - "阿贝多": [ - "防御力百分比", - "暴击率", - "暴击伤害" - ], - "甘雨": [ - "攻击力百分比", - "暴击率", - "暴击伤害", - "元素精通" - ], - "甘雨-永冻": [ - "攻击力百分比", - "暴击率", - "暴击伤害", - "元素充能效率" - ], - "魈": [ - "攻击力百分比", - "暴击率", - "暴击伤害", - "元素充能效率" - ], - "胡桃": [ - "生命值百分比", - "暴击率", - "暴击伤害", - "元素精通" - ], - "罗莎莉亚": [ - "攻击力百分比", - "暴击率", - "暴击伤害", - "物理伤害加成", - "元素充能效率" - ], - "烟绯": [ - "攻击力百分比", - "暴击率", - "暴击伤害", - "元素精通", - "元素充能效率" - ], - "优菈": [ - "攻击力百分比", - "暴击率", - "暴击伤害", - "物理伤害加成", - "元素充能效率" - ], - "枫原万叶": [ - "攻击力百分比", - "暴击率", - "暴击伤害", - "元素精通", - "元素充能效率" - ], - "神里绫华": [ - "攻击力百分比", - "暴击率", - "暴击伤害", - "元素充能效率" - ], - "早柚": [ - "攻击力百分比", - "暴击率", - "元素精通", - "元素充能效率", - "治疗加成" - ], - "宵宫": [ - "攻击力百分比", - "暴击率", - "暴击伤害", - "元素精通" - ], - "埃洛伊": [ - "攻击力百分比", - "暴击率", - "暴击伤害" - ], - "九条裟罗": [ - "攻击力百分比", - "暴击率", - "暴击伤害", - "元素充能效率" - ], - "雷电将军": [ - "攻击力百分比", - "暴击率", - "暴击伤害", - "元素充能效率", - "元素精通" - ], - "珊瑚宫心海": [ - "生命值百分比", - "攻击力百分比", - "元素充能效率", - "治疗加成", - "元素精通" - ], - "托马": [ - "生命值百分比", - "暴击率", - "元素充能效率", - "元素精通" - ], - "五郎": [ - "防御力百分比", - "暴击率", - "元素充能效率" - ], - "荒泷一斗": [ - "防御力百分比", - "暴击率", - "暴击伤害", - "元素充能效率" - ], - "云堇": [ - "防御力百分比", - "暴击率", - "元素充能效率" - ], - "申鹤": [ - "攻击力百分比", - "暴击率", - "暴击伤害", - "元素充能效率" - ], - "八重神子": [ - "攻击力百分比", - "暴击率", - "暴击伤害", - "元素精通", - "元素充能效率" - ], - "神里绫人": [ - "生命值百分比", - "攻击力百分比", - "暴击率", - "暴击伤害", - "元素精通", - "元素充能效率" - ], - "夜兰": [ - "生命值百分比", - "暴击率", - "暴击伤害", - "元素精通", - "元素充能效率" - ], - "久岐忍": [ - "生命值百分比", - "元素精通", - "治疗加成" - ], - "鹿野院平藏": [ - "攻击力百分比", - "暴击率", - "暴击伤害", - "元素充能效率" - ], - "提纳里": [ - "攻击力百分比", - "暴击率", - "暴击伤害", - "元素精通", - "元素充能效率" - ], - "柯莱": [ - "攻击力百分比", - "暴击率", - "暴击伤害", - "元素精通", - "元素充能效率" - ], - "赛诺": [ - "攻击力百分比", - "暴击率", - "暴击伤害", - "元素精通", - "元素充能效率" - ], - "妮露": [ - "生命值百分比", - "暴击率", - "暴击伤害", - "元素精通", - "元素充能效率" - ], - "纳西妲": [ - "暴击率", - "暴击伤害", - "元素精通", - "元素充能效率", - "攻击力百分比" - ], - "流浪者": [ - "攻击力百分比", - "暴击率", - "暴击伤害", - "元素充能效率" - ], - "珐露珊": [ - "攻击力百分比", - "暴击率", - "暴击伤害", - "元素充能效率" - ], - "艾尔海森": [ - "攻击力百分比", - "暴击率", - "暴击伤害", - "元素精通", - "元素充能效率" - ], - "瑶瑶": [ - "生命值百分比", - "元素充能效率" - ], - "迪希雅": [ - "生命值百分比", - "攻击力百分比", - "暴击率", - "暴击伤害", - "元素精通" - ], - "白术": [ - "生命值百分比", - "元素充能效率", - "元素精通", - "治疗加成" - ], - "卡维": [ - "元素精通", - "元素充能效率", - "治疗加成" - ], - "绮良良": [ - "生命值百分比", - "暴击率", - "暴击伤害", - "元素精通", - "攻击力百分比" - ] -} \ No newline at end of file