diff --git a/FightPropRule_genshin.json b/FightPropRule_genshin.json index 6922bce..0e2c830 100644 --- a/FightPropRule_genshin.json +++ b/FightPropRule_genshin.json @@ -498,5 +498,19 @@ "暴击伤害": 0.0, "防御力": 0.0, "防御力百分比": 0.0 + }, + "米卡": { + "生命值百分比": 0.0, + "治疗加成": 0.0, + "攻击力百分比": 0.0, + "元素精通": 0.0, + "元素充能效率": 0.0 + }, + "赛索斯": { + "元素精通": 0.0, + "雷元素伤害加成": 0.0, + "暴击伤害": 0.0, + "暴击率": 0.0, + "元素充能效率": 0.0 } } \ No newline at end of file diff --git a/GenshinDamageRule.json b/GenshinDamageRule.json index 8830b99..a63d069 100644 --- a/GenshinDamageRule.json +++ b/GenshinDamageRule.json @@ -2868,5 +2868,48 @@ "stack": 5.0 } } + }, + "嘉明": { + "skills": [ + { + "name": "四段伤害 - 普通攻击·刃爪悬星 - 蒸发", + "index": 3, + "damage_key": "vaporize", + "transformative_damage_key": null + }, + { + "name": "低空坠地冲击伤害 - 普通攻击·刃爪悬星 - 蒸发", + "index": 7, + "damage_key": "vaporize", + "transformative_damage_key": null + }, + { + "name": "下落攻击·踏云献瑞伤害 - 瑞兽登高楼 - 蒸发", + "index": 9, + "damage_key": "vaporize", + "transformative_damage_key": null + }, + { + "name": "下落攻击·踏云献瑞伤害 - 瑞兽登高楼 - 烈绽放", + "index": 9, + "damage_key": null, + "transformative_damage_key": "hyper_bloom" + }, + { + "name": "技能治疗量 - 璨焰金猊舞", + "index": 11, + "damage_key": "normal", + "transformative_damage_key": null + } + ], + "config": { + "hp_above50": false, + "c2_rate": 0.0 + }, + "config_skill": { + "pyro": true + }, + "config_weapon": null, + "artifact_config": null } } \ No newline at end of file diff --git a/avatars_genshin.json b/avatars_genshin.json index 4815f72..9ec4cdb 100644 --- a/avatars_genshin.json +++ b/avatars_genshin.json @@ -1,82 +1,87 @@ [ - "温迪", - "卡维", - "赛诺", - "久岐忍", - "凯亚", - "纳西妲", - "早柚", - "宵宫", - "提纳里", - "千织", - "北斗", - "托马", - "雷电将军", - "芙宁娜", - "砂糖", - "罗莎莉亚", - "迪卢克", - "重云", - "枫原万叶", - "烟绯", - "林尼", - "荒泷一斗", - "那维莱特", - "达达利亚", - "迪希雅", - "香菱", - "绮良良", - "旅行者", - "凝光", - "芭芭拉", - "阿贝多", - "九条裟罗", - "多莉", - "胡桃", - "莱依拉", - "优菈", - "珊瑚宫心海", - "云堇", - "艾尔海森", - "鹿野院平藏", - "神里绫人", - "辛焱", - "妮露", - "埃洛伊", - "神里绫华", - "钟离", - "流浪者", "琴", - "夏沃蕾", - "八重神子", - "甘雨", - "夏洛蒂", - "刻晴", - "莫娜", - "瑶瑶", - "菲谢尔", - "夜兰", - "迪奥娜", - "菲米尼", - "琳妮特", - "珐露珊", - "行秋", - "申鹤", - "坎蒂丝", - "七七", - "五郎", - "莱欧斯利", - "娜维娅", - "嘉明", - "诺艾尔", - "柯莱", + "丽莎", + "芭芭拉", + "凯亚", + "迪卢克", "雷泽", "安柏", - "米卡", - "闲云", - "白术", + "温迪", + "香菱", + "北斗", + "行秋", + "凝光", "可莉", + "菲谢尔", + "班尼特", + "诺艾尔", + "七七", + "重云", + "莫娜", + "刻晴", + "砂糖", + "达达利亚", + "迪奥娜", + "钟离", + "辛焱", + "阿贝多", + "甘雨", "魈", - "丽莎", - "班尼特" + "胡桃", + "罗莎莉亚", + "烟绯", + "优菈", + "枫原万叶", + "神里绫华", + "宵宫", + "早柚", + "雷电将军", + "九条裟罗", + "埃洛伊", + "珊瑚宫心海", + "托马", + "五郎", + "荒泷一斗", + "申鹤", + "云堇", + "八重神子", + "神里绫人", + "夜兰", + "久岐忍", + "鹿野院平藏", + "旅行者", + "柯莱", + "提纳里", + "多莉", + "赛诺", + "坎蒂丝", + "妮露", + "纳西妲", + "莱依拉", + "流浪者", + "珐露珊", + "瑶瑶", + "艾尔海森", + "迪希雅", + "米卡", + "卡维", + "白术", + "绮良良", + "琳妮特", + "林尼", + "菲米尼", + "那维莱特", + "莱欧斯利", + "夏洛蒂", + "芙宁娜", + "娜维娅", + "夏沃蕾", + "嘉明", + "闲云", + "千织", + "阿蕾奇诺", + "赛索斯", + "克洛琳德", + "希格雯", + "艾梅莉埃" ] \ No newline at end of file diff --git a/avatars_starrail.json b/avatars_starrail.json index 6b5c38a..65d67f6 100644 --- a/avatars_starrail.json +++ b/avatars_starrail.json @@ -1,50 +1,57 @@ [ - "桂乃芬", - "寒鸦", - "雪衣", - "黄泉", - "姬子", - "桑博", - "银狼", - "布洛妮娅", - "三月七", - "希儿", - "罗刹", - "停云", - "砂金", - "托帕&账账", - "驭空", - "克拉拉", "丹恒", - "玲可", - "银枝", - "阮•梅", - "黑天鹅", - "丹恒•饮月", - "彦卿", - "素裳", - "米沙", - "卡芙卡", + "姬子", + "瓦尔特", + "阿兰", + "艾丝妲", + "黑塔", + "布洛妮娅", + "希儿", + "希露瓦", + "杰帕德", + "娜塔莎", + "佩拉", + "克拉拉", + "桑博", "虎克", "青雀", + "停云", + "素裳", + "彦卿", "白露", - "镜流", - "希露瓦", - "阿兰", - "娜塔莎", - "刃", - "加拉赫", - "杰帕德", - "符玄", - "花火", - "瓦尔特", - "佩拉", "景元", - "真理医生", + "银狼", + "罗刹", + "驭空", + "卡芙卡", "卢卡", + "刃", + "丹恒•饮月", + "玲可", + "符玄", + "镜流", + "托帕&账账", + "桂乃芬", "藿藿", - "黑塔", - "艾丝妲", + "寒鸦", + "银枝", + "雪衣", + "阮•梅", + "真理医生", + "花火", + "黑天鹅", + "米沙", + "加拉赫", + "黄泉", + "砂金", + "知更鸟", + "波提欧", + "流萤", + "翡翠", + "三月七", + "云璃", + "椒丘", "开拓者·毁灭", - "开拓者·存护" + "开拓者·存护", + "开拓者·同谐" ] \ No newline at end of file diff --git a/src/choose.py b/src/choose.py index 9904755..375f1fc 100644 --- a/src/choose.py +++ b/src/choose.py @@ -45,11 +45,11 @@ def choose_view(page: Page): icon=ft.icons.LOGIN, on_click=genshin, ), - ft.FilledButton( - "Starrail", - icon=ft.icons.LOGIN, - on_click=starrail, - ), + # ft.FilledButton( + # "Starrail", + # icon=ft.icons.LOGIN, + # on_click=starrail, + # ), ft.FilledButton( "GenshinDamage", icon=ft.icons.LOGIN, diff --git a/src/data.py b/src/data.py index d039a56..738162c 100644 --- a/src/data.py +++ b/src/data.py @@ -33,15 +33,11 @@ class Base: ignore_id_start = "-1" res = get(api) if res.status_code == 200: - data = res.json() - self.character = list( - { - i.get("name") - for i in data.get("data", {}).get("items", {}).values() - if not str(i.get("id", 0)).startswith(ignore_id_start) - } - ) - self.character.sort() + data: Dict = res.json() + items: List[Dict] = list(data.get("data", {}).get("items", {}).values()) + ch_map = {i.get("name"): i.get("release", 0) for i in items if not str(i.get("id", 0)).startswith(ignore_id_start)} + ch_sort = sorted(ch_map.items(), key=lambda x: x[1]) + self.character = [i[0] for i in ch_sort] class Genshin(Base): @@ -119,9 +115,9 @@ class Starrail(Base): [ "开拓者·毁灭", "开拓者·存护", + "开拓者·同谐", ] ) - self.character.sort() self.save_data_to_file(starrail_avatars_path)