diff --git a/assets/i18n/zh-CN.json b/assets/i18n/zh-CN.json index 0072efefbc..379ccb91a7 100644 --- a/assets/i18n/zh-CN.json +++ b/assets/i18n/zh-CN.json @@ -157,6 +157,7 @@ "costume_battle_scene_type": "战斗场景", "costume_battle_scene_type_help": "", "costume_shikigami_12": "拾光之窗", + "costume_shikigami_13": "梦隙闲花", "save_touch_fish": "惠比寿的摸鱼行动", "save_touch_fish_help": "默认使用全部存储按钮，主要目的是为了配合真蛇每周打一次即可获得俩次奖励(并不会节省体力)", "green_mark_type": "绿标匹配方式", diff --git a/tasks/Component/Costume/config.py b/tasks/Component/Costume/config.py index 44f1693fc4..efbdf1905d 100644 --- a/tasks/Component/Costume/config.py +++ b/tasks/Component/Costume/config.py @@ -55,6 +55,7 @@ class ShikigamiType(str, Enum): COSTUME_SHIKIGAMI_10 = 'costume_shikigami_10' # 今宵胧明 COSTUME_SHIKIGAMI_11 = 'costume_shikigami_11' # 花札幕台 COSTUME_SHIKIGAMI_12 = 'costume_shikigami_12' # 拾光之窗 + COSTUME_SHIKIGAMI_13 = 'costume_shikigami_13' # 梦隙闲花 # 签到主题 class SignType(str, Enum): diff --git a/tasks/Component/Costume/costume_base.py b/tasks/Component/Costume/costume_base.py index 6bd0365b80..22af05ecd9 100644 --- a/tasks/Component/Costume/costume_base.py +++ b/tasks/Component/Costume/costume_base.py @@ -97,7 +97,7 @@ 'I_ST_SOULS': f'I_ST_SOULS_{i}', 'I_ST_REPLACE': f'I_ST_REPLACE_{i}', } - for i in range(1, 13) # 目前支持 COSTUME_SHIKIGAMI_1 到 COSTUME_SHIKIGAMI_12 + for i in range(1, 14) # 目前支持 COSTUME_SHIKIGAMI_1 到 COSTUME_SHIKIGAMI_13 } class CostumeBase: diff --git a/tasks/Component/CostumeShikigami/assets.py b/tasks/Component/CostumeShikigami/assets.py index 5a5a3f6e7e..4c27e4df00 100644 --- a/tasks/Component/CostumeShikigami/assets.py +++ b/tasks/Component/CostumeShikigami/assets.py @@ -178,6 +178,47 @@ class CostumeShikigamiAssets: I_SOU_CLICK_PRESENT_12 = RuleImage(roi_front=(975,292,34,34), roi_back=(971,134,42,530), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk12/sk12_sou_click_present_12.png") + # Image Rule Assets + # 用于判断在式神录 + I_CHECK_RECORDS_13 = RuleImage(roi_front=(279,87,30,35), roi_back=(274,82,40,45), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk13/sk13_check_records_13.png") + # 退出式神录 + I_RECORD_SOUL_BACK_13 = RuleImage(roi_front=(21,10,38,36), roi_back=(14,4,52,54), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk13/sk13_record_soul_back_13.png") + # 用于判断是否在式神录里面 + I_SOU_CHECK_IN_13 = RuleImage(roi_front=(277,84,34,36), roi_back=(277,84,34,36), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk13/sk13_sou_check_in_13.png") + # 预设 + I_SOUL_PRESET_13 = RuleImage(roi_front=(350,87,56,25), roi_back=(344,82,70,36), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk13/sk13_soul_preset_13.png") + # 队伍预设标题 + I_SOU_TEAM_PRESENT_13 = RuleImage(roi_front=(730,82,103,30), roi_back=(724,76,115,42), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk13/sk13_sou_team_present_13.png") + # 第一队切换 + I_SOU_SWITCH_1_13 = RuleImage(roi_front=(975,137,35,34), roi_back=(970,132,45,44), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk13/sk13_sou_switch_1_13.png") + # 第二队切换 + I_SOU_SWITCH_2_13 = RuleImage(roi_front=(975,291,35,34), roi_back=(970,286,45,44), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk13/sk13_sou_switch_2_13.png") + # 第三队切换 + I_SOU_SWITCH_3_13 = RuleImage(roi_front=(975,445,35,34), roi_back=(970,440,45,44), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk13/sk13_sou_switch_3_13.png") + # 第四队切换 + I_SOU_SWITCH_4_13 = RuleImage(roi_front=(975,599,35,34), roi_back=(970,594,45,44), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk13/sk13_sou_switch_4_13.png") + # 点击预设队伍 + I_SOU_CLICK_PRESENT_13 = RuleImage(roi_front=(975,291,35,34), roi_back=(971,134,42,530), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk13/sk13_sou_click_present_13.png") + # 第一组选中态 + I_SOU_CHECK_GROUP_1_13 = RuleImage(roi_front=(1088,79,18,55), roi_back=(1088,79,18,55), threshold=0.9, method="Template matching", file="./tasks/Component/CostumeShikigami/sk13/sk13_sou_check_group_1_13.png") + # 第二组选中态 + I_SOU_CHECK_GROUP_2_13 = RuleImage(roi_front=(1088,149,18,55), roi_back=(1088,149,18,55), threshold=0.9, method="Template matching", file="./tasks/Component/CostumeShikigami/sk13/sk13_sou_check_group_2_13.png") + # 第三组选中态 + I_SOU_CHECK_GROUP_3_13 = RuleImage(roi_front=(1088,219,18,55), roi_back=(1088,219,18,55), threshold=0.9, method="Template matching", file="./tasks/Component/CostumeShikigami/sk13/sk13_sou_check_group_3_13.png") + # 第四组选中态 + I_SOU_CHECK_GROUP_4_13 = RuleImage(roi_front=(1088,289,18,55), roi_back=(1088,289,18,55), threshold=0.9, method="Template matching", file="./tasks/Component/CostumeShikigami/sk13/sk13_sou_check_group_4_13.png") + # 第五组选中态 + I_SOU_CHECK_GROUP_5_13 = RuleImage(roi_front=(1088,359,18,55), roi_back=(1088,359,18,55), threshold=0.9, method="Template matching", file="./tasks/Component/CostumeShikigami/sk13/sk13_sou_check_group_5_13.png") + # 第六组选中态 + I_SOU_CHECK_GROUP_6_13 = RuleImage(roi_front=(1088,429,18,55), roi_back=(1088,429,18,55), threshold=0.9, method="Template matching", file="./tasks/Component/CostumeShikigami/sk13/sk13_sou_check_group_6_13.png") + # 第七组选中态 + I_SOU_CHECK_GROUP_7_13 = RuleImage(roi_front=(1088,499,18,55), roi_back=(1088,499,18,55), threshold=0.9, method="Template matching", file="./tasks/Component/CostumeShikigami/sk13/sk13_sou_check_group_7_13.png") + # 御魂按钮 + I_ST_SOULS_13 = RuleImage(roi_front=(1195,228,37,85), roi_back=(1187,220,53,100), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk13/sk13_st_souls_13.png") + # 更换按钮 + I_ST_REPLACE_13 = RuleImage(roi_front=(863,141,94,125), roi_back=(853,131,114,145), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk13/sk13_st_replace_13.png") + + # Image Rule Assets # 用于判断在式神录 I_CHECK_RECORDS_2 = RuleImage(roi_front=(267,76,51,46), roi_back=(265,74,55,50), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk2/sk2_check_records_2.png") diff --git a/tasks/Component/CostumeShikigami/sk13/image.json b/tasks/Component/CostumeShikigami/sk13/image.json new file mode 100644 index 0000000000..74519af8c8 --- /dev/null +++ b/tasks/Component/CostumeShikigami/sk13/image.json @@ -0,0 +1,173 @@ +[ + { + "itemName": "check_records_13", + "imageName": "sk13_check_records_13.png", + "roiFront": "279,87,30,35", + "roiBack": "274,82,40,45", + "method": "Template matching", + "threshold": 0.8, + "description": "用于判断在式神录" + }, + { + "itemName": "record_soul_back_13", + "imageName": "sk13_record_soul_back_13.png", + "roiFront": "21,10,38,36", + "roiBack": "14,4,52,54", + "method": "Template matching", + "threshold": 0.8, + "description": "退出式神录" + }, + { + "itemName": "sou_check_in_13", + "imageName": "sk13_sou_check_in_13.png", + "roiFront": "277,84,34,36", + "roiBack": "277,84,34,36", + "method": "Template matching", + "threshold": 0.8, + "description": "用于判断是否在式神录里面" + }, + { + "itemName": "soul_preset_13", + "imageName": "sk13_soul_preset_13.png", + "roiFront": "350,87,56,25", + "roiBack": "344,82,70,36", + "method": "Template matching", + "threshold": 0.8, + "description": "预设" + }, + { + "itemName": "sou_team_present_13", + "imageName": "sk13_sou_team_present_13.png", + "roiFront": "730,82,103,30", + "roiBack": "724,76,115,42", + "method": "Template matching", + "threshold": 0.8, + "description": "队伍预设标题" + }, + { + "itemName": "sou_switch_1_13", + "imageName": "sk13_sou_switch_1_13.png", + "roiFront": "975,137,35,34", + "roiBack": "970,132,45,44", + "method": "Template matching", + "threshold": 0.8, + "description": "第一队切换" + }, + { + "itemName": "sou_switch_2_13", + "imageName": "sk13_sou_switch_2_13.png", + "roiFront": "975,291,35,34", + "roiBack": "970,286,45,44", + "method": "Template matching", + "threshold": 0.8, + "description": "第二队切换" + }, + { + "itemName": "sou_switch_3_13", + "imageName": "sk13_sou_switch_3_13.png", + "roiFront": "975,445,35,34", + "roiBack": "970,440,45,44", + "method": "Template matching", + "threshold": 0.8, + "description": "第三队切换" + }, + { + "itemName": "sou_switch_4_13", + "imageName": "sk13_sou_switch_4_13.png", + "roiFront": "975,599,35,34", + "roiBack": "970,594,45,44", + "method": "Template matching", + "threshold": 0.8, + "description": "第四队切换" + }, + { + "itemName": "sou_click_present_13", + "imageName": "sk13_sou_click_present_13.png", + "roiFront": "975,291,35,34", + "roiBack": "971,134,42,530", + "method": "Template matching", + "threshold": 0.8, + "description": "点击预设队伍" + }, + { + "itemName": "sou_check_group_1_13", + "imageName": "sk13_sou_check_group_1_13.png", + "roiFront": "1088,79,18,55", + "roiBack": "1088,79,18,55", + "method": "Template matching", + "threshold": 0.9, + "description": "第一组选中态" + }, + { + "itemName": "sou_check_group_2_13", + "imageName": "sk13_sou_check_group_2_13.png", + "roiFront": "1088,149,18,55", + "roiBack": "1088,149,18,55", + "method": "Template matching", + "threshold": 0.9, + "description": "第二组选中态" + }, + { + "itemName": "sou_check_group_3_13", + "imageName": "sk13_sou_check_group_3_13.png", + "roiFront": "1088,219,18,55", + "roiBack": "1088,219,18,55", + "method": "Template matching", + "threshold": 0.9, + "description": "第三组选中态" + }, + { + "itemName": "sou_check_group_4_13", + "imageName": "sk13_sou_check_group_4_13.png", + "roiFront": "1088,289,18,55", + "roiBack": "1088,289,18,55", + "method": "Template matching", + "threshold": 0.9, + "description": "第四组选中态" + }, + { + "itemName": "sou_check_group_5_13", + "imageName": "sk13_sou_check_group_5_13.png", + "roiFront": "1088,359,18,55", + "roiBack": "1088,359,18,55", + "method": "Template matching", + "threshold": 0.9, + "description": "第五组选中态" + }, + { + "itemName": "sou_check_group_6_13", + "imageName": "sk13_sou_check_group_6_13.png", + "roiFront": "1088,429,18,55", + "roiBack": "1088,429,18,55", + "method": "Template matching", + "threshold": 0.9, + "description": "第六组选中态" + }, + { + "itemName": "sou_check_group_7_13", + "imageName": "sk13_sou_check_group_7_13.png", + "roiFront": "1088,499,18,55", + "roiBack": "1088,499,18,55", + "method": "Template matching", + "threshold": 0.9, + "description": "第七组选中态" + }, + { + "itemName": "st_souls_13", + "imageName": "sk13_st_souls_13.png", + "roiFront": "1195,228,37,85", + "roiBack": "1187,220,53,100", + "method": "Template matching", + "threshold": 0.8, + "description": "御魂按钮" + }, + { + "itemName": "st_replace_13", + "imageName": "sk13_st_replace_13.png", + "roiFront": "863,141,94,125", + "roiBack": "853,131,114,145", + "method": "Template matching", + "threshold": 0.8, + "description": "更换按钮" + } +] \ No newline at end of file diff --git a/tasks/Component/CostumeShikigami/sk13/sk13_check_records_13.png b/tasks/Component/CostumeShikigami/sk13/sk13_check_records_13.png new file mode 100644 index 0000000000..f6c355847f Binary files /dev/null and b/tasks/Component/CostumeShikigami/sk13/sk13_check_records_13.png differ diff --git a/tasks/Component/CostumeShikigami/sk13/sk13_record_soul_back_13.png b/tasks/Component/CostumeShikigami/sk13/sk13_record_soul_back_13.png new file mode 100644 index 0000000000..de5b6b7981 Binary files /dev/null and b/tasks/Component/CostumeShikigami/sk13/sk13_record_soul_back_13.png differ diff --git a/tasks/Component/CostumeShikigami/sk13/sk13_sou_check_group_1_13.png b/tasks/Component/CostumeShikigami/sk13/sk13_sou_check_group_1_13.png new file mode 100644 index 0000000000..a7c13e34c4 Binary files /dev/null and b/tasks/Component/CostumeShikigami/sk13/sk13_sou_check_group_1_13.png differ diff --git a/tasks/Component/CostumeShikigami/sk13/sk13_sou_check_group_2_13.png b/tasks/Component/CostumeShikigami/sk13/sk13_sou_check_group_2_13.png new file mode 100644 index 0000000000..40f5574aa6 Binary files /dev/null and b/tasks/Component/CostumeShikigami/sk13/sk13_sou_check_group_2_13.png differ diff --git a/tasks/Component/CostumeShikigami/sk13/sk13_sou_check_group_3_13.png b/tasks/Component/CostumeShikigami/sk13/sk13_sou_check_group_3_13.png new file mode 100644 index 0000000000..053bbd6498 Binary files /dev/null and b/tasks/Component/CostumeShikigami/sk13/sk13_sou_check_group_3_13.png differ diff --git a/tasks/Component/CostumeShikigami/sk13/sk13_sou_check_group_4_13.png b/tasks/Component/CostumeShikigami/sk13/sk13_sou_check_group_4_13.png new file mode 100644 index 0000000000..480ecba03b Binary files /dev/null and b/tasks/Component/CostumeShikigami/sk13/sk13_sou_check_group_4_13.png differ diff --git a/tasks/Component/CostumeShikigami/sk13/sk13_sou_check_group_5_13.png b/tasks/Component/CostumeShikigami/sk13/sk13_sou_check_group_5_13.png new file mode 100644 index 0000000000..f7d04e2438 Binary files /dev/null and b/tasks/Component/CostumeShikigami/sk13/sk13_sou_check_group_5_13.png differ diff --git a/tasks/Component/CostumeShikigami/sk13/sk13_sou_check_group_6_13.png b/tasks/Component/CostumeShikigami/sk13/sk13_sou_check_group_6_13.png new file mode 100644 index 0000000000..270486fbdc Binary files /dev/null and b/tasks/Component/CostumeShikigami/sk13/sk13_sou_check_group_6_13.png differ diff --git a/tasks/Component/CostumeShikigami/sk13/sk13_sou_check_group_7_13.png b/tasks/Component/CostumeShikigami/sk13/sk13_sou_check_group_7_13.png new file mode 100644 index 0000000000..fd3a748c5d Binary files /dev/null and b/tasks/Component/CostumeShikigami/sk13/sk13_sou_check_group_7_13.png differ diff --git a/tasks/Component/CostumeShikigami/sk13/sk13_sou_check_in_13.png b/tasks/Component/CostumeShikigami/sk13/sk13_sou_check_in_13.png new file mode 100644 index 0000000000..b46c0a8f09 Binary files /dev/null and b/tasks/Component/CostumeShikigami/sk13/sk13_sou_check_in_13.png differ diff --git a/tasks/Component/CostumeShikigami/sk13/sk13_sou_click_present_13.png b/tasks/Component/CostumeShikigami/sk13/sk13_sou_click_present_13.png new file mode 100644 index 0000000000..d89ac9e4be Binary files /dev/null and b/tasks/Component/CostumeShikigami/sk13/sk13_sou_click_present_13.png differ diff --git a/tasks/Component/CostumeShikigami/sk13/sk13_sou_switch_1_13.png b/tasks/Component/CostumeShikigami/sk13/sk13_sou_switch_1_13.png new file mode 100644 index 0000000000..a6da551b4e Binary files /dev/null and b/tasks/Component/CostumeShikigami/sk13/sk13_sou_switch_1_13.png differ diff --git a/tasks/Component/CostumeShikigami/sk13/sk13_sou_switch_2_13.png b/tasks/Component/CostumeShikigami/sk13/sk13_sou_switch_2_13.png new file mode 100644 index 0000000000..d89ac9e4be Binary files /dev/null and b/tasks/Component/CostumeShikigami/sk13/sk13_sou_switch_2_13.png differ diff --git a/tasks/Component/CostumeShikigami/sk13/sk13_sou_switch_3_13.png b/tasks/Component/CostumeShikigami/sk13/sk13_sou_switch_3_13.png new file mode 100644 index 0000000000..2d4ded5d36 Binary files /dev/null and b/tasks/Component/CostumeShikigami/sk13/sk13_sou_switch_3_13.png differ diff --git a/tasks/Component/CostumeShikigami/sk13/sk13_sou_switch_4_13.png b/tasks/Component/CostumeShikigami/sk13/sk13_sou_switch_4_13.png new file mode 100644 index 0000000000..0243a23186 Binary files /dev/null and b/tasks/Component/CostumeShikigami/sk13/sk13_sou_switch_4_13.png differ diff --git a/tasks/Component/CostumeShikigami/sk13/sk13_sou_team_present_13.png b/tasks/Component/CostumeShikigami/sk13/sk13_sou_team_present_13.png new file mode 100644 index 0000000000..76c70e90ad Binary files /dev/null and b/tasks/Component/CostumeShikigami/sk13/sk13_sou_team_present_13.png differ diff --git a/tasks/Component/CostumeShikigami/sk13/sk13_soul_preset_13.png b/tasks/Component/CostumeShikigami/sk13/sk13_soul_preset_13.png new file mode 100644 index 0000000000..e3f0811c11 Binary files /dev/null and b/tasks/Component/CostumeShikigami/sk13/sk13_soul_preset_13.png differ diff --git a/tasks/Component/CostumeShikigami/sk13/sk13_st_replace_13.png b/tasks/Component/CostumeShikigami/sk13/sk13_st_replace_13.png new file mode 100644 index 0000000000..9f94f72b6b Binary files /dev/null and b/tasks/Component/CostumeShikigami/sk13/sk13_st_replace_13.png differ diff --git a/tasks/Component/CostumeShikigami/sk13/sk13_st_souls_13.png b/tasks/Component/CostumeShikigami/sk13/sk13_st_souls_13.png new file mode 100644 index 0000000000..bdc490982f Binary files /dev/null and b/tasks/Component/CostumeShikigami/sk13/sk13_st_souls_13.png differ