Browse Source

Merge pull request #1983 from Maratrain/feat-costume-shikigami-13

feat(Costume): 新增幕间主题梦隙闲花
huangrunheng 2 weeks ago
parent
commit
6f85146b96
24 changed files with 217 additions and 1 deletions
  1. 1 0
      assets/i18n/zh-CN.json
  2. 1 0
      tasks/Component/Costume/config.py
  3. 1 1
      tasks/Component/Costume/costume_base.py
  4. 41 0
      tasks/Component/CostumeShikigami/assets.py
  5. 173 0
      tasks/Component/CostumeShikigami/sk13/image.json
  6. BIN
      tasks/Component/CostumeShikigami/sk13/sk13_check_records_13.png
  7. BIN
      tasks/Component/CostumeShikigami/sk13/sk13_record_soul_back_13.png
  8. BIN
      tasks/Component/CostumeShikigami/sk13/sk13_sou_check_group_1_13.png
  9. BIN
      tasks/Component/CostumeShikigami/sk13/sk13_sou_check_group_2_13.png
  10. BIN
      tasks/Component/CostumeShikigami/sk13/sk13_sou_check_group_3_13.png
  11. BIN
      tasks/Component/CostumeShikigami/sk13/sk13_sou_check_group_4_13.png
  12. BIN
      tasks/Component/CostumeShikigami/sk13/sk13_sou_check_group_5_13.png
  13. BIN
      tasks/Component/CostumeShikigami/sk13/sk13_sou_check_group_6_13.png
  14. BIN
      tasks/Component/CostumeShikigami/sk13/sk13_sou_check_group_7_13.png
  15. BIN
      tasks/Component/CostumeShikigami/sk13/sk13_sou_check_in_13.png
  16. BIN
      tasks/Component/CostumeShikigami/sk13/sk13_sou_click_present_13.png
  17. BIN
      tasks/Component/CostumeShikigami/sk13/sk13_sou_switch_1_13.png
  18. BIN
      tasks/Component/CostumeShikigami/sk13/sk13_sou_switch_2_13.png
  19. BIN
      tasks/Component/CostumeShikigami/sk13/sk13_sou_switch_3_13.png
  20. BIN
      tasks/Component/CostumeShikigami/sk13/sk13_sou_switch_4_13.png
  21. BIN
      tasks/Component/CostumeShikigami/sk13/sk13_sou_team_present_13.png
  22. BIN
      tasks/Component/CostumeShikigami/sk13/sk13_soul_preset_13.png
  23. BIN
      tasks/Component/CostumeShikigami/sk13/sk13_st_replace_13.png
  24. BIN
      tasks/Component/CostumeShikigami/sk13/sk13_st_souls_13.png

+ 1 - 0
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": "绿标匹配方式",

+ 1 - 0
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):

+ 1 - 1
tasks/Component/Costume/costume_base.py

@@ -97,7 +97,7 @@ shikigami_costume_model = {
         '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:

+ 41 - 0
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")

+ 173 - 0
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": "更换按钮"
+  }
+]

BIN
tasks/Component/CostumeShikigami/sk13/sk13_check_records_13.png


BIN
tasks/Component/CostumeShikigami/sk13/sk13_record_soul_back_13.png


BIN
tasks/Component/CostumeShikigami/sk13/sk13_sou_check_group_1_13.png


BIN
tasks/Component/CostumeShikigami/sk13/sk13_sou_check_group_2_13.png


BIN
tasks/Component/CostumeShikigami/sk13/sk13_sou_check_group_3_13.png


BIN
tasks/Component/CostumeShikigami/sk13/sk13_sou_check_group_4_13.png


BIN
tasks/Component/CostumeShikigami/sk13/sk13_sou_check_group_5_13.png


BIN
tasks/Component/CostumeShikigami/sk13/sk13_sou_check_group_6_13.png


BIN
tasks/Component/CostumeShikigami/sk13/sk13_sou_check_group_7_13.png


BIN
tasks/Component/CostumeShikigami/sk13/sk13_sou_check_in_13.png


BIN
tasks/Component/CostumeShikigami/sk13/sk13_sou_click_present_13.png


BIN
tasks/Component/CostumeShikigami/sk13/sk13_sou_switch_1_13.png


BIN
tasks/Component/CostumeShikigami/sk13/sk13_sou_switch_2_13.png


BIN
tasks/Component/CostumeShikigami/sk13/sk13_sou_switch_3_13.png


BIN
tasks/Component/CostumeShikigami/sk13/sk13_sou_switch_4_13.png


BIN
tasks/Component/CostumeShikigami/sk13/sk13_sou_team_present_13.png


BIN
tasks/Component/CostumeShikigami/sk13/sk13_soul_preset_13.png


BIN
tasks/Component/CostumeShikigami/sk13/sk13_st_replace_13.png


BIN
tasks/Component/CostumeShikigami/sk13/sk13_st_souls_13.png