Parcourir la source

Merge pull request #1556 from runhey/dev

Dev
huangrunheng il y a 6 mois
Parent
commit
cfd9d432c1
100 fichiers modifiés avec 485 ajouts et 236 suppressions
  1. 7 8
      assets/i18n/zh-CN.json
  2. 35 29
      script.py
  3. 1 1
      tasks/Component/Costume/assets.py
  4. 1 0
      tasks/Component/Costume/config.py
  5. 1 1
      tasks/Component/Costume/costume_base.py
  6. 2 2
      tasks/Component/Costume/main4/image.json
  7. BIN
      tasks/Component/Costume/main4/main4_check_main_4.png
  8. 83 40
      tasks/Component/CostumeShikigami/assets.py
  9. 6 6
      tasks/Component/CostumeShikigami/sk1/image.json
  10. BIN
      tasks/Component/CostumeShikigami/sk1/sk1_sou_click_present_1.png
  11. BIN
      tasks/Component/CostumeShikigami/sk1/sk1_sou_switch_1_1.png
  12. BIN
      tasks/Component/CostumeShikigami/sk1/sk1_sou_switch_2_1.png
  13. BIN
      tasks/Component/CostumeShikigami/sk1/sk1_sou_switch_3_1.png
  14. BIN
      tasks/Component/CostumeShikigami/sk1/sk1_sou_switch_4_1.png
  15. 6 6
      tasks/Component/CostumeShikigami/sk2/image.json
  16. BIN
      tasks/Component/CostumeShikigami/sk2/sk2_sou_click_present_2.png
  17. BIN
      tasks/Component/CostumeShikigami/sk2/sk2_sou_switch_1_2.png
  18. BIN
      tasks/Component/CostumeShikigami/sk2/sk2_sou_switch_2_2.png
  19. BIN
      tasks/Component/CostumeShikigami/sk2/sk2_sou_switch_3_2.png
  20. BIN
      tasks/Component/CostumeShikigami/sk2/sk2_sou_switch_4_2.png
  21. 6 6
      tasks/Component/CostumeShikigami/sk3/image.json
  22. BIN
      tasks/Component/CostumeShikigami/sk3/sk3_sou_click_present_3.png
  23. BIN
      tasks/Component/CostumeShikigami/sk3/sk3_sou_switch_1_3.png
  24. BIN
      tasks/Component/CostumeShikigami/sk3/sk3_sou_switch_2_3.png
  25. BIN
      tasks/Component/CostumeShikigami/sk3/sk3_sou_switch_3_3.png
  26. BIN
      tasks/Component/CostumeShikigami/sk3/sk3_sou_switch_4_3.png
  27. 6 6
      tasks/Component/CostumeShikigami/sk4/image.json
  28. BIN
      tasks/Component/CostumeShikigami/sk4/sk4_sou_click_present_4.png
  29. BIN
      tasks/Component/CostumeShikigami/sk4/sk4_sou_switch_1_4.png
  30. BIN
      tasks/Component/CostumeShikigami/sk4/sk4_sou_switch_2_4.png
  31. BIN
      tasks/Component/CostumeShikigami/sk4/sk4_sou_switch_3_4.png
  32. BIN
      tasks/Component/CostumeShikigami/sk4/sk4_sou_switch_4_4.png
  33. 7 7
      tasks/Component/CostumeShikigami/sk5/image.json
  34. BIN
      tasks/Component/CostumeShikigami/sk5/sk5_sou_click_present_5.png
  35. BIN
      tasks/Component/CostumeShikigami/sk5/sk5_sou_switch_1_5.png
  36. BIN
      tasks/Component/CostumeShikigami/sk5/sk5_sou_switch_2_5.png
  37. BIN
      tasks/Component/CostumeShikigami/sk5/sk5_sou_switch_3_5.png
  38. BIN
      tasks/Component/CostumeShikigami/sk5/sk5_sou_switch_4_5.png
  39. 6 6
      tasks/Component/CostumeShikigami/sk6/image.json
  40. BIN
      tasks/Component/CostumeShikigami/sk6/sk6_sou_click_present_6.png
  41. BIN
      tasks/Component/CostumeShikigami/sk6/sk6_sou_switch_1_6.png
  42. BIN
      tasks/Component/CostumeShikigami/sk6/sk6_sou_switch_2_6.png
  43. BIN
      tasks/Component/CostumeShikigami/sk6/sk6_sou_switch_3_6.png
  44. BIN
      tasks/Component/CostumeShikigami/sk6/sk6_sou_switch_4_6.png
  45. 10 10
      tasks/Component/CostumeShikigami/sk7/image.json
  46. BIN
      tasks/Component/CostumeShikigami/sk7/sk7_sou_click_present_7.png
  47. BIN
      tasks/Component/CostumeShikigami/sk7/sk7_sou_switch_1_7.png
  48. BIN
      tasks/Component/CostumeShikigami/sk7/sk7_sou_switch_2_7.png
  49. BIN
      tasks/Component/CostumeShikigami/sk7/sk7_sou_switch_3_7.png
  50. BIN
      tasks/Component/CostumeShikigami/sk7/sk7_sou_switch_4_7.png
  51. 6 6
      tasks/Component/CostumeShikigami/sk8/image.json
  52. BIN
      tasks/Component/CostumeShikigami/sk8/sk8_sou_click_present_8.png
  53. BIN
      tasks/Component/CostumeShikigami/sk8/sk8_sou_switch_1_8.png
  54. BIN
      tasks/Component/CostumeShikigami/sk8/sk8_sou_switch_2_8.png
  55. BIN
      tasks/Component/CostumeShikigami/sk8/sk8_sou_switch_3_8.png
  56. BIN
      tasks/Component/CostumeShikigami/sk8/sk8_sou_switch_4_8.png
  57. 182 0
      tasks/Component/CostumeShikigami/sk9/image.json
  58. BIN
      tasks/Component/CostumeShikigami/sk9/sk9_sou_click_present_9.png
  59. BIN
      tasks/Component/CostumeShikigami/sk9/sk9_sou_switch_1_9.png
  60. BIN
      tasks/Component/CostumeShikigami/sk9/sk9_sou_switch_2_9.png
  61. BIN
      tasks/Component/CostumeShikigami/sk9/sk9_sou_switch_3_9.png
  62. BIN
      tasks/Component/CostumeShikigami/sk9/sk9_sou_switch_4_9.png
  63. 3 3
      tasks/Component/GeneralInvite/assets.py
  64. BIN
      tasks/Component/GeneralInvite/gi/gi_gi_explore.png
  65. BIN
      tasks/Component/GeneralInvite/gi/gi_unlock.png
  66. 4 4
      tasks/Component/GeneralInvite/gi/image.json
  67. 2 2
      tasks/Component/GeneralInvite/gi/member.json
  68. 5 5
      tasks/Component/SwitchSoul/assets.py
  69. 6 6
      tasks/Component/SwitchSoul/ss/image.json
  70. BIN
      tasks/Component/SwitchSoul/ss/ss_sou_click_present.png
  71. BIN
      tasks/Component/SwitchSoul/ss/ss_sou_switch_1.png
  72. BIN
      tasks/Component/SwitchSoul/ss/ss_sou_switch_2.png
  73. BIN
      tasks/Component/SwitchSoul/ss/ss_sou_switch_3.png
  74. BIN
      tasks/Component/SwitchSoul/ss/ss_sou_switch_4.png
  75. 6 6
      tasks/EternitySea/assets.py
  76. 10 10
      tasks/EternitySea/res/image.json
  77. 5 5
      tasks/EternitySea/res/list.json
  78. BIN
      tasks/EternitySea/res/res_eternity_sea.png
  79. BIN
      tasks/EternitySea/res/res_eternity_sea_fire.png
  80. BIN
      tasks/EternitySea/res/res_eternitysea_unlock.png
  81. BIN
      tasks/EternitySea/res/res_form_team.png
  82. BIN
      tasks/EternitySea/res/res_neweternitysea_lock.png
  83. 11 11
      tasks/EvoZone/assets.py
  84. 17 17
      tasks/EvoZone/o/image.json
  85. BIN
      tasks/EvoZone/o/o_evozone_fire.png
  86. BIN
      tasks/EvoZone/o/o_evozone_lock.png
  87. BIN
      tasks/EvoZone/o/o_evozone_unlock.png
  88. BIN
      tasks/EvoZone/o/o_fire_kirin.png
  89. BIN
      tasks/EvoZone/o/o_form_team.png
  90. BIN
      tasks/EvoZone/o/o_lightning_kirin.png
  91. BIN
      tasks/EvoZone/o/o_shi_records.png
  92. BIN
      tasks/EvoZone/o/o_water_kirin.png
  93. BIN
      tasks/EvoZone/o/o_wind_kirin.png
  94. 11 11
      tasks/EvoZone/res/list.json
  95. 2 2
      tasks/EvoZone/res/ocr.json
  96. 7 3
      tasks/Exploration/assets.py
  97. 7 11
      tasks/Exploration/base.py
  98. 22 4
      tasks/Exploration/res/image.json
  99. 2 2
      tasks/Exploration/res/ocr.json
  100. BIN
      tasks/Exploration/res/res_e_exploration_click.png

+ 7 - 8
assets/i18n/zh-CN.json

@@ -7,6 +7,8 @@
   "skill_mode": "技能本模式",
   "costume_shikigami_6": "月下火舞",
   "costume_shikigami_7": "赤溟幽界",
+  "costume_shikigami_8": "童梦基地",
+  "costume_shikigami_9": "眠鹿之森",
   "costume_carpbanner_type": "鲤鱼旗皮肤",
   "costume_carpbanner_default": "吉鲤游风",
   "costume_carpbanner_1": "无垢莲台",
@@ -25,16 +27,13 @@
   "Usage": "使用说明",
   "checkin_big_god_usage_help": "自动领取网易大神APP的阴阳师福利礼包。\n\n使用前准备:\n1. 开启模拟器的Root模式\n2. 模拟器中安装并登录「网易大神」APP\n3. 在大神APP中绑定阴阳师角色\n\nFrida Server 会自动推送到模拟器并启动,无需手动操作。",
   "costume_main_14": "雪月华庭",
-  "goto_main": "前往主界面",
+  "goto_main": "前往庭院",
   "close_game": "关闭游戏",
-  "close_emulator_or_goto_main": "关闭模拟器&前往主界面",
-  "close_emulator_or_close_game": "关闭模拟器&关闭游戏",
-  "close_game_limit_time": "关闭游戏等待时间",
-  "close_game_limit_time_help": "此时间内不会关闭游戏, 防止运行间隔时间短的多个任务导致反复开关游戏",
-  "close_emulator_limit_time": "关闭模拟器等待时间",
-  "close_emulator_limit_time_help": "此时间内不会关闭模拟器, 防止运行间隔时间短的多个任务导致反复开关模拟器",
+  "close_game_wait_duration": "关闭游戏的等待时长",
+  "close_game_wait_duration_help": "距离下一个任务超过此分钟数时关闭游戏(上方选项为前往庭院时无效);设为0表示禁用",
+  "close_emulator_wait_duration": "关闭模拟器的等待时长",
+  "close_emulator_wait_duration_help": "距离下一个任务超过此分钟数时关闭模拟器;设为0表示禁用",
   "emulator_startup_lead_time": "模拟器预热时间",
   "emulator_startup_lead_time_help": "在开始运行任务之前提前启动模拟器的时间"
 }
 
-

+ 35 - 29
script.py

@@ -330,8 +330,6 @@ class Script:
         strategy_map = {
             "close_game": self._wait_close_game,
             "goto_main": self._wait_goto_main,
-            "close_emulator_or_goto_main": self._wait_close_emulator_or_goto_main,
-            "close_emulator_or_close_game": self._wait_close_emulator_or_close_game,
         }
         func = strategy_map.get(method)
         if func is None:
@@ -376,9 +374,23 @@ class Script:
             logger.info("Emulator is down, skip close_game/goto_main action and wait with preheat")
             return self._wait_until_with_emulator_preheat(next_run)
 
-        close_game_limit_time = self.config.script.optimization.close_game_limit_time
-        close_game_limit = self._time_to_timedelta(close_game_limit_time)
-        if close_game_limit > timedelta(0) and next_run > datetime.now() + close_game_limit:
+        close_game_wait_duration = self.config.script.optimization.close_game_wait_duration
+        close_game_wait = self._time_to_timedelta(close_game_wait_duration)
+        close_emulator_wait_duration = self.config.script.optimization.close_emulator_wait_duration
+        close_emulator_wait = self._time_to_timedelta(close_emulator_wait_duration)
+
+        if close_emulator_wait > timedelta(0) and next_run > datetime.now() + close_emulator_wait:
+            logger.info("Close emulator during wait")
+            self.device.emulator_stop()
+            self._emulator_down = True
+
+            if not self._wait_until_with_emulator_preheat(next_run):
+                return False
+
+            self.run("Restart")
+            return True
+
+        if close_game_wait <= timedelta(0):
             logger.info("Close game during wait")
             self.device.app_stop()
             self.device.release_during_wait()
@@ -387,7 +399,16 @@ class Script:
             self.run("Restart")
             return True
 
-        logger.info("Wait without closing game (close_game limit time not reached)")
+        if next_run > datetime.now() + close_game_wait:
+            logger.info("Close game during wait")
+            self.device.app_stop()
+            self.device.release_during_wait()
+            if not self.wait_until(next_run):
+                return False
+            self.run("Restart")
+            return True
+
+        logger.info("Wait without closing game (close_game wait duration not reached)")
         self.device.release_during_wait()
         if not self.wait_until(next_run):
             return False
@@ -398,29 +419,11 @@ class Script:
             logger.info("Emulator is down, skip goto_main and wait with preheat")
             return self._wait_until_with_emulator_preheat(next_run)
 
-        logger.info("Goto main page during wait")
-        self.run("GotoMain")
-        self.device.release_during_wait()
-        return self.wait_until(next_run)
-
-    def _wait_close_emulator_or_goto_main(self, next_run: datetime) -> bool:
-        return self._wait_close_emulator_or(next_run, self._wait_goto_main)
-
-    def _wait_close_emulator_or_close_game(self, next_run: datetime) -> bool:
-        return self._wait_close_emulator_or(next_run, self._wait_close_game)
-
-    def _wait_close_emulator_or(self, next_run: datetime, fallback_waiter: Callable[[datetime], bool]) -> bool:
-        close_emulator_limit_time = self.config.script.optimization.close_emulator_limit_time
-        close_emulator_limit = self._time_to_timedelta(close_emulator_limit_time)
-
-        now = datetime.now()
-        if close_emulator_limit > timedelta(0) and next_run > now + close_emulator_limit:
+        close_emulator_wait_duration = self.config.script.optimization.close_emulator_wait_duration
+        close_emulator_wait = self._time_to_timedelta(close_emulator_wait_duration)
+        if close_emulator_wait > timedelta(0) and next_run > datetime.now() + close_emulator_wait:
             logger.info("Close emulator during wait")
-            if not self._emulator_down:
-                self.device.emulator_stop()
-            else:
-                logger.info("Emulator already closed")
-
+            self.device.emulator_stop()
             self._emulator_down = True
 
             if not self._wait_until_with_emulator_preheat(next_run):
@@ -429,7 +432,10 @@ class Script:
             self.run("Restart")
             return True
 
-        return fallback_waiter(next_run)
+        logger.info("Goto main page during wait")
+        self.run("GotoMain")
+        self.device.release_during_wait()
+        return self.wait_until(next_run)
 
     def _wait_stay_there(self, next_run: datetime) -> bool:
         if self._emulator_down:

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

@@ -116,7 +116,7 @@ class CostumeAssets:
 
 	# Image Rule Assets
 	# description 
-	I_CHECK_MAIN_4 = RuleImage(roi_front=(513,139,48,55), roi_back=(149,108,1068,100), threshold=0.8, method="Template matching", file="./tasks/Component/Costume/main4/main4_check_main_4.png")
+	I_CHECK_MAIN_4 = RuleImage(roi_front=(885,192,37,32), roi_back=(149,108,1005,144), threshold=0.8, method="Template matching", file="./tasks/Component/Costume/main4/main4_check_main_4.png")
 	# description 
 	I_MAIN_GOTO_EXPLORATION_4 = RuleImage(roi_front=(439,234,32,48), roi_back=(150,201,847,100), threshold=0.8, method="Template matching", file="./tasks/Component/Costume/main4/main4_main_goto_exploration_4.png")
 	#  

+ 1 - 0
tasks/Component/Costume/config.py

@@ -48,6 +48,7 @@ class ShikigamiType(str, Enum):
     COSTUME_SHIKIGAMI_6 = 'costume_shikigami_6'  # 月下火舞
     COSTUME_SHIKIGAMI_7 = 'costume_shikigami_7'  # 赤溟幽界
     COSTUME_SHIKIGAMI_8 = 'costume_shikigami_8'  # 童梦基地
+    COSTUME_SHIKIGAMI_9 = 'costume_shikigami_9'  # 眠鹿之森
 
 # 签到主题
 class SignType(str, Enum):

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

@@ -77,7 +77,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, 9)  # 目前支持 COSTUME_SHIKIGAMI_1 到 COSTUME_SHIKIGAMI_8
+    for i in range(1, 10)  # 目前支持 COSTUME_SHIKIGAMI_1 到 COSTUME_SHIKIGAMI_9
 }
 
 class CostumeBase:

+ 2 - 2
tasks/Component/Costume/main4/image.json

@@ -2,8 +2,8 @@
   {
     "itemName": "check_main_4",
     "imageName": "main4_check_main_4.png",
-    "roiFront": "513,139,48,55",
-    "roiBack": "149,108,1068,100",
+    "roiFront": "885,192,37,32",
+    "roiBack": "149,108,1005,144",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"

BIN
tasks/Component/Costume/main4/main4_check_main_4.png


+ 83 - 40
tasks/Component/CostumeShikigami/assets.py

@@ -18,13 +18,13 @@ class CostumeShikigamiAssets:
 	# 预设 
 	I_SOUL_PRESET_1 = RuleImage(roi_front=(335,73,90,51), roi_back=(310,57,169,72), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk1/sk1_soul_preset_1.png")
 	# 第一组切换 
-	I_SOU_SWITCH_1_1 = RuleImage(roi_front=(973,140,34,32), roi_back=(967,131,51,48), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk1/sk1_sou_switch_1_1.png")
+	I_SOU_SWITCH_1_1 = RuleImage(roi_front=(978,140,31,31), roi_back=(967,131,51,48), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk1/sk1_sou_switch_1_1.png")
 	# 第二组切换 
-	I_SOU_SWITCH_2_1 = RuleImage(roi_front=(971,293,33,33), roi_back=(960,284,58,49), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk1/sk1_sou_switch_2_1.png")
+	I_SOU_SWITCH_2_1 = RuleImage(roi_front=(980,293,26,30), roi_back=(960,284,58,49), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk1/sk1_sou_switch_2_1.png")
 	# description 
-	I_SOU_SWITCH_3_1 = RuleImage(roi_front=(968,448,41,38), roi_back=(962,442,52,48), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk1/sk1_sou_switch_3_1.png")
+	I_SOU_SWITCH_3_1 = RuleImage(roi_front=(977,448,32,32), roi_back=(962,442,52,48), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk1/sk1_sou_switch_3_1.png")
 	# description 
-	I_SOU_SWITCH_4_1 = RuleImage(roi_front=(967,597,42,25), roi_back=(962,592,53,34), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk1/sk1_sou_switch_4_1.png")
+	I_SOU_SWITCH_4_1 = RuleImage(roi_front=(977,603,33,20), roi_back=(962,592,53,34), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk1/sk1_sou_switch_4_1.png")
 	# description 
 	I_SOU_SWITCH_SURE_1 = RuleImage(roi_front=(668,401,180,61), roi_back=(668,401,180,61), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk1/sk1_sou_switch_sure_1.png")
 	# 用于判断是否在式神录里面 
@@ -46,7 +46,7 @@ class CostumeShikigamiAssets:
 	# 匹配队伍预设 
 	I_SOU_TEAM_PRESENT_1 = RuleImage(roi_front=(720,76,136,43), roi_back=(706,68,175,63), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk1/sk1_sou_team_present_1.png")
 	# 需要切换的预设按钮(颜色深一点) 
-	I_SOU_CLICK_PRESENT_1 = RuleImage(roi_front=(967,305,43,22), roi_back=(965,142,48,480), threshold=0.9, method="Template matching", file="./tasks/Component/CostumeShikigami/sk1/sk1_sou_click_present_1.png")
+	I_SOU_CLICK_PRESENT_1 = RuleImage(roi_front=(976,305,34,19), roi_back=(965,142,52,488), threshold=0.9, method="Template matching", file="./tasks/Component/CostumeShikigami/sk1/sk1_sou_click_present_1.png")
 	# 选中的御魂 
 	I_ST_SOULS_1 = RuleImage(roi_front=(1180,236,62,66), roi_back=(1176,230,70,80), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk1/sk1_st_souls_1.png")
 	# 更换 
@@ -61,13 +61,13 @@ class CostumeShikigamiAssets:
 	# 预设 
 	I_SOUL_PRESET_2 = RuleImage(roi_front=(335,73,90,51), roi_back=(310,57,169,72), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk2/sk2_soul_preset_2.png")
 	# 第一组切换 
-	I_SOU_SWITCH_1_2 = RuleImage(roi_front=(973,140,34,32), roi_back=(967,131,51,48), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk2/sk2_sou_switch_1_2.png")
+	I_SOU_SWITCH_1_2 = RuleImage(roi_front=(977,140,30,31), roi_back=(967,131,51,48), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk2/sk2_sou_switch_1_2.png")
 	# 第二组切换 
-	I_SOU_SWITCH_2_2 = RuleImage(roi_front=(973,293,33,33), roi_back=(960,284,58,49), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk2/sk2_sou_switch_2_2.png")
+	I_SOU_SWITCH_2_2 = RuleImage(roi_front=(978,293,28,30), roi_back=(960,284,58,49), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk2/sk2_sou_switch_2_2.png")
 	# description 
-	I_SOU_SWITCH_3_2 = RuleImage(roi_front=(968,448,41,38), roi_back=(962,442,52,48), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk2/sk2_sou_switch_3_2.png")
+	I_SOU_SWITCH_3_2 = RuleImage(roi_front=(977,448,32,30), roi_back=(962,442,52,48), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk2/sk2_sou_switch_3_2.png")
 	# description 
-	I_SOU_SWITCH_4_2 = RuleImage(roi_front=(967,597,42,25), roi_back=(962,592,53,34), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk2/sk2_sou_switch_4_2.png")
+	I_SOU_SWITCH_4_2 = RuleImage(roi_front=(977,603,32,21), roi_back=(962,592,56,40), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk2/sk2_sou_switch_4_2.png")
 	# description 
 	I_SOU_SWITCH_SURE_2 = RuleImage(roi_front=(668,401,180,61), roi_back=(668,401,180,61), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk2/sk2_sou_switch_sure_2.png")
 	# 用于判断是否在式神录里面 
@@ -89,7 +89,7 @@ class CostumeShikigamiAssets:
 	# 匹配队伍预设 
 	I_SOU_TEAM_PRESENT_2 = RuleImage(roi_front=(720,76,136,43), roi_back=(706,68,175,63), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk2/sk2_sou_team_present_2.png")
 	# 需要切换的预设按钮(颜色深一点) 
-	I_SOU_CLICK_PRESENT_2 = RuleImage(roi_front=(967,305,43,22), roi_back=(965,142,48,480), threshold=0.9, method="Template matching", file="./tasks/Component/CostumeShikigami/sk2/sk2_sou_click_present_2.png")
+	I_SOU_CLICK_PRESENT_2 = RuleImage(roi_front=(976,304,34,20), roi_back=(965,142,48,480), threshold=0.9, method="Template matching", file="./tasks/Component/CostumeShikigami/sk2/sk2_sou_click_present_2.png")
 	# 点击御魂 
 	I_ST_SOULS_2 = RuleImage(roi_front=(1176,227,70,80), roi_back=(1181,234,58,69), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk2/sk2_st_souls_2.png")
 	# 更换 
@@ -104,13 +104,13 @@ class CostumeShikigamiAssets:
 	# 预设 
 	I_SOUL_PRESET_3 = RuleImage(roi_front=(335,73,90,51), roi_back=(310,57,169,72), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk3/sk3_soul_preset_3.png")
 	# 第一组切换 
-	I_SOU_SWITCH_1_3 = RuleImage(roi_front=(973,140,34,32), roi_back=(967,131,51,48), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk3/sk3_sou_switch_1_3.png")
+	I_SOU_SWITCH_1_3 = RuleImage(roi_front=(980,142,27,27), roi_back=(967,131,51,48), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk3/sk3_sou_switch_1_3.png")
 	# 第二组切换 
-	I_SOU_SWITCH_2_3 = RuleImage(roi_front=(973,293,33,33), roi_back=(960,284,58,49), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk3/sk3_sou_switch_2_3.png")
+	I_SOU_SWITCH_2_3 = RuleImage(roi_front=(979,294,27,30), roi_back=(960,284,58,49), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk3/sk3_sou_switch_2_3.png")
 	# description 
-	I_SOU_SWITCH_3_3 = RuleImage(roi_front=(968,448,41,38), roi_back=(962,442,52,48), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk3/sk3_sou_switch_3_3.png")
+	I_SOU_SWITCH_3_3 = RuleImage(roi_front=(979,448,29,30), roi_back=(962,442,52,48), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk3/sk3_sou_switch_3_3.png")
 	# description 
-	I_SOU_SWITCH_4_3 = RuleImage(roi_front=(967,597,42,25), roi_back=(962,592,53,34), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk3/sk3_sou_switch_4_3.png")
+	I_SOU_SWITCH_4_3 = RuleImage(roi_front=(978,603,31,19), roi_back=(962,592,53,34), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk3/sk3_sou_switch_4_3.png")
 	# description 
 	I_SOU_SWITCH_SURE_3 = RuleImage(roi_front=(668,401,180,61), roi_back=(668,401,180,61), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk3/sk3_sou_switch_sure_3.png")
 	# 用于判断是否在式神录里面 
@@ -132,7 +132,7 @@ class CostumeShikigamiAssets:
 	# 匹配队伍预设 
 	I_SOU_TEAM_PRESENT_3 = RuleImage(roi_front=(720,76,136,43), roi_back=(706,68,175,63), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk3/sk3_sou_team_present_3.png")
 	# 需要切换的预设按钮(颜色深一点) 
-	I_SOU_CLICK_PRESENT_3 = RuleImage(roi_front=(967,305,43,22), roi_back=(965,142,48,480), threshold=0.9, method="Template matching", file="./tasks/Component/CostumeShikigami/sk3/sk3_sou_click_present_3.png")
+	I_SOU_CLICK_PRESENT_3 = RuleImage(roi_front=(976,305,34,18), roi_back=(965,142,48,490), threshold=0.9, method="Template matching", file="./tasks/Component/CostumeShikigami/sk3/sk3_sou_click_present_3.png")
 	# 点击御魂 
 	I_ST_SOULS_3 = RuleImage(roi_front=(1176,227,70,80), roi_back=(1181,234,58,69), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk3/sk3_st_souls_3.png")
 	# 更换 
@@ -147,13 +147,13 @@ class CostumeShikigamiAssets:
 	# 预设 
 	I_SOUL_PRESET_4 = RuleImage(roi_front=(335,73,90,51), roi_back=(310,57,169,72), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk4/sk4_soul_preset_4.png")
 	# 第一组切换 
-	I_SOU_SWITCH_1_4 = RuleImage(roi_front=(973,140,34,32), roi_back=(967,131,51,48), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk4/sk4_sou_switch_1_4.png")
+	I_SOU_SWITCH_1_4 = RuleImage(roi_front=(979,140,28,28), roi_back=(967,131,51,48), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk4/sk4_sou_switch_1_4.png")
 	# 第二组切换 
-	I_SOU_SWITCH_2_4 = RuleImage(roi_front=(973,293,33,33), roi_back=(960,284,58,49), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk4/sk4_sou_switch_2_4.png")
+	I_SOU_SWITCH_2_4 = RuleImage(roi_front=(978,293,28,32), roi_back=(960,284,58,49), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk4/sk4_sou_switch_2_4.png")
 	# description 
-	I_SOU_SWITCH_3_4 = RuleImage(roi_front=(968,448,41,38), roi_back=(962,442,52,48), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk4/sk4_sou_switch_3_4.png")
+	I_SOU_SWITCH_3_4 = RuleImage(roi_front=(978,449,28,29), roi_back=(962,442,52,48), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk4/sk4_sou_switch_3_4.png")
 	# description 
-	I_SOU_SWITCH_4_4 = RuleImage(roi_front=(967,597,42,25), roi_back=(962,592,53,34), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk4/sk4_sou_switch_4_4.png")
+	I_SOU_SWITCH_4_4 = RuleImage(roi_front=(978,602,31,20), roi_back=(962,592,53,34), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk4/sk4_sou_switch_4_4.png")
 	# description 
 	I_SOU_SWITCH_SURE_4 = RuleImage(roi_front=(668,401,180,61), roi_back=(668,401,180,61), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk4/sk4_sou_switch_sure_4.png")
 	# 用于判断是否在式神录里面 
@@ -175,7 +175,7 @@ class CostumeShikigamiAssets:
 	# 匹配队伍预设 
 	I_SOU_TEAM_PRESENT_4 = RuleImage(roi_front=(720,76,136,43), roi_back=(706,68,175,63), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk4/sk4_sou_team_present_4.png")
 	# 需要切换的预设按钮(颜色深一点) 
-	I_SOU_CLICK_PRESENT_4 = RuleImage(roi_front=(967,305,43,22), roi_back=(965,142,48,480), threshold=0.9, method="Template matching", file="./tasks/Component/CostumeShikigami/sk4/sk4_sou_click_present_4.png")
+	I_SOU_CLICK_PRESENT_4 = RuleImage(roi_front=(976,301,34,20), roi_back=(965,142,48,490), threshold=0.9, method="Template matching", file="./tasks/Component/CostumeShikigami/sk4/sk4_sou_click_present_4.png")
 	# 点击御魂 
 	I_ST_SOULS_4 = RuleImage(roi_front=(1176,227,70,80), roi_back=(1181,234,58,69), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk4/sk4_st_souls_4.png")
 	# 更换 
@@ -190,13 +190,13 @@ class CostumeShikigamiAssets:
 	# 预设 
 	I_SOUL_PRESET_5 = RuleImage(roi_front=(335,73,90,51), roi_back=(310,57,169,72), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk5/sk5_soul_preset_5.png")
 	# 第一组切换 
-	I_SOU_SWITCH_1_5 = RuleImage(roi_front=(973,140,34,32), roi_back=(967,131,51,48), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk5/sk5_sou_switch_1_5.png")
+	I_SOU_SWITCH_1_5 = RuleImage(roi_front=(982,149,27,29), roi_back=(969,137,50,47), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk5/sk5_sou_switch_1_5.png")
 	# 第二组切换 
-	I_SOU_SWITCH_2_5 = RuleImage(roi_front=(973,293,33,33), roi_back=(960,284,58,49), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk5/sk5_sou_switch_2_5.png")
+	I_SOU_SWITCH_2_5 = RuleImage(roi_front=(981,303,26,26), roi_back=(960,284,58,57), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk5/sk5_sou_switch_2_5.png")
 	# description 
-	I_SOU_SWITCH_3_5 = RuleImage(roi_front=(968,448,41,38), roi_back=(962,442,52,48), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk5/sk5_sou_switch_3_5.png")
+	I_SOU_SWITCH_3_5 = RuleImage(roi_front=(980,453,29,29), roi_back=(962,442,52,48), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk5/sk5_sou_switch_3_5.png")
 	# description 
-	I_SOU_SWITCH_4_5 = RuleImage(roi_front=(967,597,42,25), roi_back=(962,592,53,34), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk5/sk5_sou_switch_4_5.png")
+	I_SOU_SWITCH_4_5 = RuleImage(roi_front=(978,602,31,20), roi_back=(962,592,53,34), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk5/sk5_sou_switch_4_5.png")
 	# description 
 	I_SOU_SWITCH_SURE_5 = RuleImage(roi_front=(668,401,180,61), roi_back=(668,401,180,61), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk5/sk5_sou_switch_sure_5.png")
 	# 用于判断是否在式神录里面 
@@ -218,7 +218,7 @@ class CostumeShikigamiAssets:
 	# 匹配队伍预设 
 	I_SOU_TEAM_PRESENT_5 = RuleImage(roi_front=(720,76,136,43), roi_back=(706,68,175,63), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk5/sk5_sou_team_present_5.png")
 	# 需要切换的预设按钮(颜色深一点) 
-	I_SOU_CLICK_PRESENT_5 = RuleImage(roi_front=(967,305,43,22), roi_back=(965,142,48,480), threshold=0.9, method="Template matching", file="./tasks/Component/CostumeShikigami/sk5/sk5_sou_click_present_5.png")
+	I_SOU_CLICK_PRESENT_5 = RuleImage(roi_front=(980,306,30,20), roi_back=(965,142,48,480), threshold=0.9, method="Template matching", file="./tasks/Component/CostumeShikigami/sk5/sk5_sou_click_present_5.png")
 	# 点击御魂 
 	I_ST_SOULS_5 = RuleImage(roi_front=(1176,227,70,80), roi_back=(1181,234,58,69), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk5/sk5_st_souls_5.png")
 	# 更换 
@@ -233,13 +233,13 @@ class CostumeShikigamiAssets:
 	# 预设 
 	I_SOUL_PRESET_6 = RuleImage(roi_front=(335,73,90,51), roi_back=(310,57,169,72), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk6/sk6_soul_preset_6.png")
 	# 第一组切换 
-	I_SOU_SWITCH_1_6 = RuleImage(roi_front=(973,140,34,32), roi_back=(967,131,51,48), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk6/sk6_sou_switch_1_6.png")
+	I_SOU_SWITCH_1_6 = RuleImage(roi_front=(980,141,28,27), roi_back=(967,131,51,48), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk6/sk6_sou_switch_1_6.png")
 	# 第二组切换 
-	I_SOU_SWITCH_2_6 = RuleImage(roi_front=(971,293,33,33), roi_back=(960,284,58,49), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk6/sk6_sou_switch_2_6.png")
+	I_SOU_SWITCH_2_6 = RuleImage(roi_front=(979,294,29,31), roi_back=(964,285,58,49), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk6/sk6_sou_switch_2_6.png")
 	# description 
-	I_SOU_SWITCH_3_6 = RuleImage(roi_front=(968,448,41,38), roi_back=(962,442,52,48), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk6/sk6_sou_switch_3_6.png")
+	I_SOU_SWITCH_3_6 = RuleImage(roi_front=(978,448,31,30), roi_back=(962,442,52,48), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk6/sk6_sou_switch_3_6.png")
 	# description 
-	I_SOU_SWITCH_4_6 = RuleImage(roi_front=(967,597,42,25), roi_back=(962,592,53,34), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk6/sk6_sou_switch_4_6.png")
+	I_SOU_SWITCH_4_6 = RuleImage(roi_front=(977,601,32,21), roi_back=(962,592,53,34), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk6/sk6_sou_switch_4_6.png")
 	# description 
 	I_SOU_SWITCH_SURE_6 = RuleImage(roi_front=(668,401,180,61), roi_back=(668,401,180,61), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk6/sk6_sou_switch_sure_6.png")
 	# 用于判断是否在式神录里面 
@@ -261,7 +261,7 @@ class CostumeShikigamiAssets:
 	# 匹配队伍预设 
 	I_SOU_TEAM_PRESENT_6 = RuleImage(roi_front=(720,76,136,43), roi_back=(706,68,175,63), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk6/sk6_sou_team_present_6.png")
 	# 需要切换的预设按钮(颜色深一点) 
-	I_SOU_CLICK_PRESENT_6 = RuleImage(roi_front=(967,305,43,22), roi_back=(965,142,48,480), threshold=0.9, method="Template matching", file="./tasks/Component/CostumeShikigami/sk6/sk6_sou_click_present_6.png")
+	I_SOU_CLICK_PRESENT_6 = RuleImage(roi_front=(976,303,35,18), roi_back=(965,142,48,480), threshold=0.9, method="Template matching", file="./tasks/Component/CostumeShikigami/sk6/sk6_sou_click_present_6.png")
 	# 选中的御魂 
 	I_ST_SOULS_6 = RuleImage(roi_front=(1180,236,62,66), roi_back=(1176,230,70,80), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk6/sk6_st_souls_6.png")
 	# 更换 
@@ -276,13 +276,13 @@ class CostumeShikigamiAssets:
 	# 预设 
 	I_SOUL_PRESET_7 = RuleImage(roi_front=(341,76,78,42), roi_back=(341,76,78,42), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk7/sk7_soul_preset_7.png")
 	# 第一组切换 
-	I_SOU_SWITCH_1_7 = RuleImage(roi_front=(973,140,34,32), roi_back=(973,140,34,32), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk7/sk7_sou_switch_1_7.png")
+	I_SOU_SWITCH_1_7 = RuleImage(roi_front=(977,142,30,27), roi_back=(969,131,56,51), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk7/sk7_sou_switch_1_7.png")
 	# 第二组切换 
-	I_SOU_SWITCH_2_7 = RuleImage(roi_front=(973,293,33,33), roi_back=(973,293,33,33), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk7/sk7_sou_switch_2_7.png")
+	I_SOU_SWITCH_2_7 = RuleImage(roi_front=(979,295,28,28), roi_back=(966,280,57,56), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk7/sk7_sou_switch_2_7.png")
 	# description 
-	I_SOU_SWITCH_3_7 = RuleImage(roi_front=(968,448,41,38), roi_back=(968,448,41,38), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk7/sk7_sou_switch_3_7.png")
+	I_SOU_SWITCH_3_7 = RuleImage(roi_front=(977,448,32,29), roi_back=(959,430,69,63), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk7/sk7_sou_switch_3_7.png")
 	# description 
-	I_SOU_SWITCH_4_7 = RuleImage(roi_front=(967,597,42,25), roi_back=(967,597,42,25), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk7/sk7_sou_switch_4_7.png")
+	I_SOU_SWITCH_4_7 = RuleImage(roi_front=(975,604,37,23), roi_back=(963,589,61,48), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk7/sk7_sou_switch_4_7.png")
 	# description 
 	I_SOU_SWITCH_SURE_7 = RuleImage(roi_front=(668,401,180,61), roi_back=(668,401,180,61), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk7/sk7_sou_switch_sure_7.png")
 	# 用于判断是否在式神录里面 
@@ -304,7 +304,7 @@ class CostumeShikigamiAssets:
 	# 匹配队伍预设 
 	I_SOU_TEAM_PRESENT_7 = RuleImage(roi_front=(720,76,136,43), roi_back=(720,76,136,43), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk7/sk7_sou_team_present_7.png")
 	# 需要切换的预设按钮(颜色深一点) 
-	I_SOU_CLICK_PRESENT_7 = RuleImage(roi_front=(967,305,43,22), roi_back=(967,305,43,22), threshold=0.9, method="Template matching", file="./tasks/Component/CostumeShikigami/sk7/sk7_sou_click_present_7.png")
+	I_SOU_CLICK_PRESENT_7 = RuleImage(roi_front=(977,299,35,20), roi_back=(969,128,51,508), threshold=0.9, method="Template matching", file="./tasks/Component/CostumeShikigami/sk7/sk7_sou_click_present_7.png")
 	# 点击御魂 
 	I_ST_SOULS_7 = RuleImage(roi_front=(1176,227,70,80), roi_back=(1176,227,70,80), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk7/sk7_st_souls_7.png")
 	# 更换 
@@ -319,13 +319,13 @@ class CostumeShikigamiAssets:
 	# 预设 
 	I_SOUL_PRESET_8 = RuleImage(roi_front=(335,73,73,36), roi_back=(310,57,169,72), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk8/sk8_soul_preset_8.png")
 	# 第一组切换 
-	I_SOU_SWITCH_1_8 = RuleImage(roi_front=(973,140,25,27), roi_back=(960,131,60,50), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk8/sk8_sou_switch_1_8.png")
+	I_SOU_SWITCH_1_8 = RuleImage(roi_front=(978,141,28,27), roi_back=(960,131,60,50), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk8/sk8_sou_switch_1_8.png")
 	# 第二组切换 
-	I_SOU_SWITCH_2_8 = RuleImage(roi_front=(971,293,25,27), roi_back=(960,284,60,50), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk8/sk8_sou_switch_2_8.png")
+	I_SOU_SWITCH_2_8 = RuleImage(roi_front=(979,295,25,27), roi_back=(960,284,60,50), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk8/sk8_sou_switch_2_8.png")
 	# 第三组切换 
-	I_SOU_SWITCH_3_8 = RuleImage(roi_front=(968,448,25,27), roi_back=(960,442,60,50), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk8/sk8_sou_switch_3_8.png")
+	I_SOU_SWITCH_3_8 = RuleImage(roi_front=(980,449,25,27), roi_back=(960,442,60,50), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk8/sk8_sou_switch_3_8.png")
 	# 第四组切换 
-	I_SOU_SWITCH_4_8 = RuleImage(roi_front=(967,597,25,27), roi_back=(960,592,60,50), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk8/sk8_sou_switch_4_8.png")
+	I_SOU_SWITCH_4_8 = RuleImage(roi_front=(981,603,25,27), roi_back=(960,592,60,50), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk8/sk8_sou_switch_4_8.png")
 	# 确认切换 
 	I_SOU_SWITCH_SURE_8 = RuleImage(roi_front=(668,401,180,61), roi_back=(668,401,180,61), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk8/sk8_sou_switch_sure_8.png")
 	# 用于判断是否在式神录里面 
@@ -347,10 +347,53 @@ class CostumeShikigamiAssets:
 	# 匹配队伍预设 
 	I_SOU_TEAM_PRESENT_8 = RuleImage(roi_front=(720,76,112,35), roi_back=(706,68,175,63), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk8/sk8_sou_team_preset_8.png")
 	# 需要切换的预设按钮(颜色深一点) 
-	I_SOU_CLICK_PRESENT_8 = RuleImage(roi_front=(967,305,25,27), roi_back=(965,142,48,480), threshold=0.9, method="Template matching", file="./tasks/Component/CostumeShikigami/sk8/sk8_sou_click_present_8.png")
+	I_SOU_CLICK_PRESENT_8 = RuleImage(roi_front=(982,295,25,27), roi_back=(965,142,48,480), threshold=0.9, method="Template matching", file="./tasks/Component/CostumeShikigami/sk8/sk8_sou_click_present_8.png")
 	# 选中的御魂 
 	I_ST_SOULS_8 = RuleImage(roi_front=(1170,220,33,65), roi_back=(1170,220,70,90), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk8/sk8_st_souls_8.png")
 	# 更换 
 	I_ST_REPLACE_8 = RuleImage(roi_front=(856,150,49,73), roi_back=(856,150,110,130), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk8/sk8_st_replace_8.png")
 
 
+	# Image Rule Assets
+	# 用于判断在式神录 
+	I_CHECK_RECORDS_9 = RuleImage(roi_front=(276,79,34,36), roi_back=(265,71,60,50), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk9/sk9_check_records_9.png")
+	# 退出式神录 
+	I_RECORD_SOUL_BACK_9 = RuleImage(roi_front=(19,9,51,44), roi_back=(19,9,51,44), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk9/sk9_record_soul_back_9.png")
+	# 预设 
+	I_SOUL_PRESET_9 = RuleImage(roi_front=(342,82,73,36), roi_back=(310,57,169,72), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk9/sk9_soul_preset_9.png")
+	# 第一组切换 
+	I_SOU_SWITCH_1_9 = RuleImage(roi_front=(979,141,25,27), roi_back=(960,131,60,50), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk9/sk9_sou_switch_1_9.png")
+	# 第二组切换 
+	I_SOU_SWITCH_2_9 = RuleImage(roi_front=(980,296,25,27), roi_back=(960,285,60,50), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk9/sk9_sou_switch_2_9.png")
+	# 第三组切换 
+	I_SOU_SWITCH_3_9 = RuleImage(roi_front=(980,450,25,27), roi_back=(960,442,60,50), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk9/sk9_sou_switch_3_9.png")
+	# 第四组切换 
+	I_SOU_SWITCH_4_9 = RuleImage(roi_front=(979,602,25,27), roi_back=(960,592,60,50), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk9/sk9_sou_switch_4_9.png")
+	# 确认切换 
+	I_SOU_SWITCH_SURE_9 = RuleImage(roi_front=(669,401,190,61), roi_back=(669,401,190,61), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk9/sk9_sou_switch_sure_9.png")
+	# 用于判断是否在式神录里面 
+	I_SOU_CHECK_IN_9 = RuleImage(roi_front=(277,79,34,36), roi_back=(265,71,60,50), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk9/sk9_sou_check_in_9.png")
+	# 检查是否为第一组 
+	I_SOU_CHECK_GROUP_1_9 = RuleImage(roi_front=(1096,80,25,56), roi_back=(1096,80,25,56), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk9/sk9_sou_check_group_1_9.png")
+	# 检查是否为第二组 
+	I_SOU_CHECK_GROUP_2_9 = RuleImage(roi_front=(1098,150,25,60), roi_back=(1098,150,25,60), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk9/sk9_sou_check_group_2_9.png")
+	# 检查是否为第三组 
+	I_SOU_CHECK_GROUP_3_9 = RuleImage(roi_front=(1096,219,25,60), roi_back=(1096,219,25,60), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk9/sk9_sou_check_group_3_9.png")
+	# 检查是否为第四组 
+	I_SOU_CHECK_GROUP_4_9 = RuleImage(roi_front=(1096,288,25,60), roi_back=(1096,288,25,60), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk9/sk9_sou_check_group_4_9.png")
+	# 检查是否为第五组 
+	I_SOU_CHECK_GROUP_5_9 = RuleImage(roi_front=(1096,356,25,60), roi_back=(1096,356,25,60), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk9/sk9_sou_check_group_5_9.png")
+	# 检查是否为第六组 
+	I_SOU_CHECK_GROUP_6_9 = RuleImage(roi_front=(1094,428,25,60), roi_back=(1094,428,25,60), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk9/sk9_sou_check_group_6_9.png")
+	# 检查是否为第七组 
+	I_SOU_CHECK_GROUP_7_9 = RuleImage(roi_front=(1095,496,25,60), roi_back=(1095,496,25,60), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk9/sk9_sou_check_group_7_9.png")
+	# 匹配队伍预设 
+	I_SOU_TEAM_PRESENT_9 = RuleImage(roi_front=(720,76,112,35), roi_back=(706,69,175,63), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk9/sk9_sou_team_preset_9.png")
+	# 需要切换的预设按钮(颜色深一点) 
+	I_SOU_CLICK_PRESENT_9 = RuleImage(roi_front=(980,294,25,27), roi_back=(965,132,49,500), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk9/sk9_sou_click_present_9.png")
+	# 选中的御魂 
+	I_ST_SOULS_9 = RuleImage(roi_front=(1196,234,33,65), roi_back=(1170,220,70,90), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk9/sk9_st_souls_9.png")
+	# 更换 
+	I_ST_REPLACE_9 = RuleImage(roi_front=(878,224,63,39), roi_back=(855,175,110,130), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk9/sk9_st_replace_9.png")
+
+

+ 6 - 6
tasks/Component/CostumeShikigami/sk1/image.json

@@ -29,7 +29,7 @@
   {
     "itemName": "sou_switch_1_1",
     "imageName": "sk1_sou_switch_1_1.png",
-    "roiFront": "973,140,34,32",
+    "roiFront": "978,140,31,31",
     "roiBack": "967,131,51,48",
     "method": "Template matching",
     "threshold": 0.8,
@@ -38,7 +38,7 @@
   {
     "itemName": "sou_switch_2_1",
     "imageName": "sk1_sou_switch_2_1.png",
-    "roiFront": "971,293,33,33",
+    "roiFront": "980,293,26,30",
     "roiBack": "960,284,58,49",
     "method": "Template matching",
     "threshold": 0.8,
@@ -47,7 +47,7 @@
   {
     "itemName": "sou_switch_3_1",
     "imageName": "sk1_sou_switch_3_1.png",
-    "roiFront": "968,448,41,38",
+    "roiFront": "977,448,32,32",
     "roiBack": "962,442,52,48",
     "method": "Template matching",
     "threshold": 0.8,
@@ -56,7 +56,7 @@
   {
     "itemName": "sou_switch_4_1",
     "imageName": "sk1_sou_switch_4_1.png",
-    "roiFront": "967,597,42,25",
+    "roiFront": "977,603,33,20",
     "roiBack": "962,592,53,34",
     "method": "Template matching",
     "threshold": 0.8,
@@ -155,8 +155,8 @@
   {
     "itemName": "sou_click_present_1",
     "imageName": "sk1_sou_click_present_1.png",
-    "roiFront": "967,305,43,22",
-    "roiBack": "965,142,48,480",
+    "roiFront": "976,305,34,19",
+    "roiBack": "965,142,52,488",
     "method": "Template matching",
     "threshold": 0.9,
     "description": "需要切换的预设按钮(颜色深一点)"

BIN
tasks/Component/CostumeShikigami/sk1/sk1_sou_click_present_1.png


BIN
tasks/Component/CostumeShikigami/sk1/sk1_sou_switch_1_1.png


BIN
tasks/Component/CostumeShikigami/sk1/sk1_sou_switch_2_1.png


BIN
tasks/Component/CostumeShikigami/sk1/sk1_sou_switch_3_1.png


BIN
tasks/Component/CostumeShikigami/sk1/sk1_sou_switch_4_1.png


+ 6 - 6
tasks/Component/CostumeShikigami/sk2/image.json

@@ -29,7 +29,7 @@
   {
     "itemName": "sou_switch_1_2",
     "imageName": "sk2_sou_switch_1_2.png",
-    "roiFront": "973,140,34,32",
+    "roiFront": "977,140,30,31",
     "roiBack": "967,131,51,48",
     "method": "Template matching",
     "threshold": 0.8,
@@ -38,7 +38,7 @@
   {
     "itemName": "sou_switch_2_2",
     "imageName": "sk2_sou_switch_2_2.png",
-    "roiFront": "973,293,33,33",
+    "roiFront": "978,293,28,30",
     "roiBack": "960,284,58,49",
     "method": "Template matching",
     "threshold": 0.8,
@@ -47,7 +47,7 @@
   {
     "itemName": "sou_switch_3_2",
     "imageName": "sk2_sou_switch_3_2.png",
-    "roiFront": "968,448,41,38",
+    "roiFront": "977,448,32,30",
     "roiBack": "962,442,52,48",
     "method": "Template matching",
     "threshold": 0.8,
@@ -56,8 +56,8 @@
   {
     "itemName": "sou_switch_4_2",
     "imageName": "sk2_sou_switch_4_2.png",
-    "roiFront": "967,597,42,25",
-    "roiBack": "962,592,53,34",
+    "roiFront": "977,603,32,21",
+    "roiBack": "962,592,56,40",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
@@ -155,7 +155,7 @@
   {
     "itemName": "sou_click_present_2",
     "imageName": "sk2_sou_click_present_2.png",
-    "roiFront": "967,305,43,22",
+    "roiFront": "976,304,34,20",
     "roiBack": "965,142,48,480",
     "method": "Template matching",
     "threshold": 0.9,

BIN
tasks/Component/CostumeShikigami/sk2/sk2_sou_click_present_2.png


BIN
tasks/Component/CostumeShikigami/sk2/sk2_sou_switch_1_2.png


BIN
tasks/Component/CostumeShikigami/sk2/sk2_sou_switch_2_2.png


BIN
tasks/Component/CostumeShikigami/sk2/sk2_sou_switch_3_2.png


BIN
tasks/Component/CostumeShikigami/sk2/sk2_sou_switch_4_2.png


+ 6 - 6
tasks/Component/CostumeShikigami/sk3/image.json

@@ -29,7 +29,7 @@
   {
     "itemName": "sou_switch_1_3",
     "imageName": "sk3_sou_switch_1_3.png",
-    "roiFront": "973,140,34,32",
+    "roiFront": "980,142,27,27",
     "roiBack": "967,131,51,48",
     "method": "Template matching",
     "threshold": 0.8,
@@ -38,7 +38,7 @@
   {
     "itemName": "sou_switch_2_3",
     "imageName": "sk3_sou_switch_2_3.png",
-    "roiFront": "973,293,33,33",
+    "roiFront": "979,294,27,30",
     "roiBack": "960,284,58,49",
     "method": "Template matching",
     "threshold": 0.8,
@@ -47,7 +47,7 @@
   {
     "itemName": "sou_switch_3_3",
     "imageName": "sk3_sou_switch_3_3.png",
-    "roiFront": "968,448,41,38",
+    "roiFront": "979,448,29,30",
     "roiBack": "962,442,52,48",
     "method": "Template matching",
     "threshold": 0.8,
@@ -56,7 +56,7 @@
   {
     "itemName": "sou_switch_4_3",
     "imageName": "sk3_sou_switch_4_3.png",
-    "roiFront": "967,597,42,25",
+    "roiFront": "978,603,31,19",
     "roiBack": "962,592,53,34",
     "method": "Template matching",
     "threshold": 0.8,
@@ -155,8 +155,8 @@
   {
     "itemName": "sou_click_present_3",
     "imageName": "sk3_sou_click_present_3.png",
-    "roiFront": "967,305,43,22",
-    "roiBack": "965,142,48,480",
+    "roiFront": "976,305,34,18",
+    "roiBack": "965,142,48,490",
     "method": "Template matching",
     "threshold": 0.9,
     "description": "需要切换的预设按钮(颜色深一点)"

BIN
tasks/Component/CostumeShikigami/sk3/sk3_sou_click_present_3.png


BIN
tasks/Component/CostumeShikigami/sk3/sk3_sou_switch_1_3.png


BIN
tasks/Component/CostumeShikigami/sk3/sk3_sou_switch_2_3.png


BIN
tasks/Component/CostumeShikigami/sk3/sk3_sou_switch_3_3.png


BIN
tasks/Component/CostumeShikigami/sk3/sk3_sou_switch_4_3.png


+ 6 - 6
tasks/Component/CostumeShikigami/sk4/image.json

@@ -29,7 +29,7 @@
   {
     "itemName": "sou_switch_1_4",
     "imageName": "sk4_sou_switch_1_4.png",
-    "roiFront": "973,140,34,32",
+    "roiFront": "979,140,28,28",
     "roiBack": "967,131,51,48",
     "method": "Template matching",
     "threshold": 0.8,
@@ -38,7 +38,7 @@
   {
     "itemName": "sou_switch_2_4",
     "imageName": "sk4_sou_switch_2_4.png",
-    "roiFront": "973,293,33,33",
+    "roiFront": "978,293,28,32",
     "roiBack": "960,284,58,49",
     "method": "Template matching",
     "threshold": 0.8,
@@ -47,7 +47,7 @@
   {
     "itemName": "sou_switch_3_4",
     "imageName": "sk4_sou_switch_3_4.png",
-    "roiFront": "968,448,41,38",
+    "roiFront": "978,449,28,29",
     "roiBack": "962,442,52,48",
     "method": "Template matching",
     "threshold": 0.8,
@@ -56,7 +56,7 @@
   {
     "itemName": "sou_switch_4_4",
     "imageName": "sk4_sou_switch_4_4.png",
-    "roiFront": "967,597,42,25",
+    "roiFront": "978,602,31,20",
     "roiBack": "962,592,53,34",
     "method": "Template matching",
     "threshold": 0.8,
@@ -155,8 +155,8 @@
   {
     "itemName": "sou_click_present_4",
     "imageName": "sk4_sou_click_present_4.png",
-    "roiFront": "967,305,43,22",
-    "roiBack": "965,142,48,480",
+    "roiFront": "976,301,34,20",
+    "roiBack": "965,142,48,490",
     "method": "Template matching",
     "threshold": 0.9,
     "description": "需要切换的预设按钮(颜色深一点)"

BIN
tasks/Component/CostumeShikigami/sk4/sk4_sou_click_present_4.png


BIN
tasks/Component/CostumeShikigami/sk4/sk4_sou_switch_1_4.png


BIN
tasks/Component/CostumeShikigami/sk4/sk4_sou_switch_2_4.png


BIN
tasks/Component/CostumeShikigami/sk4/sk4_sou_switch_3_4.png


BIN
tasks/Component/CostumeShikigami/sk4/sk4_sou_switch_4_4.png


+ 7 - 7
tasks/Component/CostumeShikigami/sk5/image.json

@@ -29,8 +29,8 @@
   {
     "itemName": "sou_switch_1_5",
     "imageName": "sk5_sou_switch_1_5.png",
-    "roiFront": "973,140,34,32",
-    "roiBack": "967,131,51,48",
+    "roiFront": "982,149,27,29",
+    "roiBack": "969,137,50,47",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "第一组切换"
@@ -38,8 +38,8 @@
   {
     "itemName": "sou_switch_2_5",
     "imageName": "sk5_sou_switch_2_5.png",
-    "roiFront": "973,293,33,33",
-    "roiBack": "960,284,58,49",
+    "roiFront": "981,303,26,26",
+    "roiBack": "960,284,58,57",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "第二组切换"
@@ -47,7 +47,7 @@
   {
     "itemName": "sou_switch_3_5",
     "imageName": "sk5_sou_switch_3_5.png",
-    "roiFront": "968,448,41,38",
+    "roiFront": "980,453,29,29",
     "roiBack": "962,442,52,48",
     "method": "Template matching",
     "threshold": 0.8,
@@ -56,7 +56,7 @@
   {
     "itemName": "sou_switch_4_5",
     "imageName": "sk5_sou_switch_4_5.png",
-    "roiFront": "967,597,42,25",
+    "roiFront": "978,602,31,20",
     "roiBack": "962,592,53,34",
     "method": "Template matching",
     "threshold": 0.8,
@@ -155,7 +155,7 @@
   {
     "itemName": "sou_click_present_5",
     "imageName": "sk5_sou_click_present_5.png",
-    "roiFront": "967,305,43,22",
+    "roiFront": "980,306,30,20",
     "roiBack": "965,142,48,480",
     "method": "Template matching",
     "threshold": 0.9,

BIN
tasks/Component/CostumeShikigami/sk5/sk5_sou_click_present_5.png


BIN
tasks/Component/CostumeShikigami/sk5/sk5_sou_switch_1_5.png


BIN
tasks/Component/CostumeShikigami/sk5/sk5_sou_switch_2_5.png


BIN
tasks/Component/CostumeShikigami/sk5/sk5_sou_switch_3_5.png


BIN
tasks/Component/CostumeShikigami/sk5/sk5_sou_switch_4_5.png


+ 6 - 6
tasks/Component/CostumeShikigami/sk6/image.json

@@ -29,7 +29,7 @@
   {
     "itemName": "sou_switch_1_6",
     "imageName": "sk6_sou_switch_1_6.png",
-    "roiFront": "973,140,34,32",
+    "roiFront": "980,141,28,27",
     "roiBack": "967,131,51,48",
     "method": "Template matching",
     "threshold": 0.8,
@@ -38,8 +38,8 @@
   {
     "itemName": "sou_switch_2_6",
     "imageName": "sk6_sou_switch_2_6.png",
-    "roiFront": "971,293,33,33",
-    "roiBack": "960,284,58,49",
+    "roiFront": "979,294,29,31",
+    "roiBack": "964,285,58,49",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "第二组切换"
@@ -47,7 +47,7 @@
   {
     "itemName": "sou_switch_3_6",
     "imageName": "sk6_sou_switch_3_6.png",
-    "roiFront": "968,448,41,38",
+    "roiFront": "978,448,31,30",
     "roiBack": "962,442,52,48",
     "method": "Template matching",
     "threshold": 0.8,
@@ -56,7 +56,7 @@
   {
     "itemName": "sou_switch_4_6",
     "imageName": "sk6_sou_switch_4_6.png",
-    "roiFront": "967,597,42,25",
+    "roiFront": "977,601,32,21",
     "roiBack": "962,592,53,34",
     "method": "Template matching",
     "threshold": 0.8,
@@ -155,7 +155,7 @@
   {
     "itemName": "sou_click_present_6",
     "imageName": "sk6_sou_click_present_6.png",
-    "roiFront": "967,305,43,22",
+    "roiFront": "976,303,35,18",
     "roiBack": "965,142,48,480",
     "method": "Template matching",
     "threshold": 0.9,

BIN
tasks/Component/CostumeShikigami/sk6/sk6_sou_click_present_6.png


BIN
tasks/Component/CostumeShikigami/sk6/sk6_sou_switch_1_6.png


BIN
tasks/Component/CostumeShikigami/sk6/sk6_sou_switch_2_6.png


BIN
tasks/Component/CostumeShikigami/sk6/sk6_sou_switch_3_6.png


BIN
tasks/Component/CostumeShikigami/sk6/sk6_sou_switch_4_6.png


+ 10 - 10
tasks/Component/CostumeShikigami/sk7/image.json

@@ -29,8 +29,8 @@
   {
     "itemName": "sou_switch_1_7",
     "imageName": "sk7_sou_switch_1_7.png",
-    "roiFront": "973,140,34,32",
-    "roiBack": "973,140,34,32",
+    "roiFront": "977,142,30,27",
+    "roiBack": "969,131,56,51",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "第一组切换"
@@ -38,8 +38,8 @@
   {
     "itemName": "sou_switch_2_7",
     "imageName": "sk7_sou_switch_2_7.png",
-    "roiFront": "973,293,33,33",
-    "roiBack": "973,293,33,33",
+    "roiFront": "979,295,28,28",
+    "roiBack": "966,280,57,56",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "第二组切换"
@@ -47,8 +47,8 @@
   {
     "itemName": "sou_switch_3_7",
     "imageName": "sk7_sou_switch_3_7.png",
-    "roiFront": "968,448,41,38",
-    "roiBack": "968,448,41,38",
+    "roiFront": "977,448,32,29",
+    "roiBack": "959,430,69,63",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
@@ -56,8 +56,8 @@
   {
     "itemName": "sou_switch_4_7",
     "imageName": "sk7_sou_switch_4_7.png",
-    "roiFront": "967,597,42,25",
-    "roiBack": "967,597,42,25",
+    "roiFront": "975,604,37,23",
+    "roiBack": "963,589,61,48",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
@@ -155,8 +155,8 @@
   {
     "itemName": "sou_click_present_7",
     "imageName": "sk7_sou_click_present_7.png",
-    "roiFront": "967,305,43,22",
-    "roiBack": "967,305,43,22",
+    "roiFront": "977,299,35,20",
+    "roiBack": "969,128,51,508",
     "method": "Template matching",
     "threshold": 0.9,
     "description": "需要切换的预设按钮(颜色深一点)"

BIN
tasks/Component/CostumeShikigami/sk7/sk7_sou_click_present_7.png


BIN
tasks/Component/CostumeShikigami/sk7/sk7_sou_switch_1_7.png


BIN
tasks/Component/CostumeShikigami/sk7/sk7_sou_switch_2_7.png


BIN
tasks/Component/CostumeShikigami/sk7/sk7_sou_switch_3_7.png


BIN
tasks/Component/CostumeShikigami/sk7/sk7_sou_switch_4_7.png


+ 6 - 6
tasks/Component/CostumeShikigami/sk8/image.json

@@ -29,7 +29,7 @@
   {
     "itemName": "sou_switch_1_8",
     "imageName": "sk8_sou_switch_1_8.png",
-    "roiFront": "973,140,25,27",
+    "roiFront": "978,141,28,27",
     "roiBack": "960,131,60,50",
     "method": "Template matching",
     "threshold": 0.8,
@@ -38,7 +38,7 @@
   {
     "itemName": "sou_switch_2_8",
     "imageName": "sk8_sou_switch_2_8.png",
-    "roiFront": "971,293,25,27",
+    "roiFront": "979,295,25,27",
     "roiBack": "960,284,60,50",
     "method": "Template matching",
     "threshold": 0.8,
@@ -47,7 +47,7 @@
   {
     "itemName": "sou_switch_3_8",
     "imageName": "sk8_sou_switch_3_8.png",
-    "roiFront": "968,448,25,27",
+    "roiFront": "980,449,25,27",
     "roiBack": "960,442,60,50",
     "method": "Template matching",
     "threshold": 0.8,
@@ -56,7 +56,7 @@
   {
     "itemName": "sou_switch_4_8",
     "imageName": "sk8_sou_switch_4_8.png",
-    "roiFront": "967,597,25,27",
+    "roiFront": "981,603,25,27",
     "roiBack": "960,592,60,50",
     "method": "Template matching",
     "threshold": 0.8,
@@ -155,7 +155,7 @@
   {
     "itemName": "sou_click_present_8",
     "imageName": "sk8_sou_click_present_8.png",
-    "roiFront": "967,305,25,27",
+    "roiFront": "982,295,25,27",
     "roiBack": "965,142,48,480",
     "method": "Template matching",
     "threshold": 0.9,
@@ -179,4 +179,4 @@
     "threshold": 0.8,
     "description": "更换"
   }
-]
+]

BIN
tasks/Component/CostumeShikigami/sk8/sk8_sou_click_present_8.png


BIN
tasks/Component/CostumeShikigami/sk8/sk8_sou_switch_1_8.png


BIN
tasks/Component/CostumeShikigami/sk8/sk8_sou_switch_2_8.png


BIN
tasks/Component/CostumeShikigami/sk8/sk8_sou_switch_3_8.png


BIN
tasks/Component/CostumeShikigami/sk8/sk8_sou_switch_4_8.png


+ 182 - 0
tasks/Component/CostumeShikigami/sk9/image.json

@@ -0,0 +1,182 @@
+[
+  {
+    "itemName": "check_records_9",
+    "imageName": "sk9_check_records_9.png",
+    "roiFront": "276,79,34,36",
+    "roiBack": "265,71,60,50",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "用于判断在式神录"
+  },
+  {
+    "itemName": "record_soul_back_9",
+    "imageName": "sk9_record_soul_back_9.png",
+    "roiFront": "19,9,51,44",
+    "roiBack": "19,9,51,44",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "退出式神录"
+  },
+  {
+    "itemName": "soul_preset_9",
+    "imageName": "sk9_soul_preset_9.png",
+    "roiFront": "342,82,73,36",
+    "roiBack": "310,57,169,72",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "预设"
+  },
+  {
+    "itemName": "sou_switch_1_9",
+    "imageName": "sk9_sou_switch_1_9.png",
+    "roiFront": "979,141,25,27",
+    "roiBack": "960,131,60,50",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "第一组切换"
+  },
+  {
+    "itemName": "sou_switch_2_9",
+    "imageName": "sk9_sou_switch_2_9.png",
+    "roiFront": "980,296,25,27",
+    "roiBack": "960,285,60,50",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "第二组切换"
+  },
+  {
+    "itemName": "sou_switch_3_9",
+    "imageName": "sk9_sou_switch_3_9.png",
+    "roiFront": "980,450,25,27",
+    "roiBack": "960,442,60,50",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "第三组切换"
+  },
+  {
+    "itemName": "sou_switch_4_9",
+    "imageName": "sk9_sou_switch_4_9.png",
+    "roiFront": "979,602,25,27",
+    "roiBack": "960,592,60,50",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "第四组切换"
+  },
+  {
+    "itemName": "sou_switch_sure_9",
+    "imageName": "sk9_sou_switch_sure_9.png",
+    "roiFront": "669,401,190,61",
+    "roiBack": "669,401,190,61",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "确认切换"
+  },
+  {
+    "itemName": "sou_check_in_9",
+    "imageName": "sk9_sou_check_in_9.png",
+    "roiFront": "277,79,34,36",
+    "roiBack": "265,71,60,50",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "用于判断是否在式神录里面"
+  },
+  {
+    "itemName": "sou_check_group_1_9",
+    "imageName": "sk9_sou_check_group_1_9.png",
+    "roiFront": "1096,80,25,56",
+    "roiBack": "1096,80,25,56",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "检查是否为第一组"
+  },
+  {
+    "itemName": "sou_check_group_2_9",
+    "imageName": "sk9_sou_check_group_2_9.png",
+    "roiFront": "1098,150,25,60",
+    "roiBack": "1098,150,25,60",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "检查是否为第二组"
+  },
+  {
+    "itemName": "sou_check_group_3_9",
+    "imageName": "sk9_sou_check_group_3_9.png",
+    "roiFront": "1096,219,25,60",
+    "roiBack": "1096,219,25,60",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "检查是否为第三组"
+  },
+  {
+    "itemName": "sou_check_group_4_9",
+    "imageName": "sk9_sou_check_group_4_9.png",
+    "roiFront": "1096,288,25,60",
+    "roiBack": "1096,288,25,60",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "检查是否为第四组"
+  },
+  {
+    "itemName": "sou_check_group_5_9",
+    "imageName": "sk9_sou_check_group_5_9.png",
+    "roiFront": "1096,356,25,60",
+    "roiBack": "1096,356,25,60",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "检查是否为第五组"
+  },
+  {
+    "itemName": "sou_check_group_6_9",
+    "imageName": "sk9_sou_check_group_6_9.png",
+    "roiFront": "1094,428,25,60",
+    "roiBack": "1094,428,25,60",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "检查是否为第六组"
+  },
+  {
+    "itemName": "sou_check_group_7_9",
+    "imageName": "sk9_sou_check_group_7_9.png",
+    "roiFront": "1095,496,25,60",
+    "roiBack": "1095,496,25,60",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "检查是否为第七组"
+  },
+  {
+    "itemName": "sou_team_present_9",
+    "imageName": "sk9_sou_team_preset_9.png",
+    "roiFront": "720,76,112,35",
+    "roiBack": "706,69,175,63",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "匹配队伍预设"
+  },
+  {
+    "itemName": "sou_click_present_9",
+    "imageName": "sk9_sou_click_present_9.png",
+    "roiFront": "980,294,25,27",
+    "roiBack": "965,132,49,500",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "需要切换的预设按钮(颜色深一点)"
+  },
+  {
+    "itemName": "st_souls_9",
+    "imageName": "sk9_st_souls_9.png",
+    "roiFront": "1196,234,33,65",
+    "roiBack": "1170,220,70,90",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "选中的御魂"
+  },
+  {
+    "itemName": "st_replace_9",
+    "imageName": "sk9_st_replace_9.png",
+    "roiFront": "878,224,63,39",
+    "roiBack": "855,175,110,130",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "更换"
+  }
+]

BIN
tasks/Component/CostumeShikigami/sk9/sk9_sou_click_present_9.png


BIN
tasks/Component/CostumeShikigami/sk9/sk9_sou_switch_1_9.png


BIN
tasks/Component/CostumeShikigami/sk9/sk9_sou_switch_2_9.png


BIN
tasks/Component/CostumeShikigami/sk9/sk9_sou_switch_3_9.png


BIN
tasks/Component/CostumeShikigami/sk9/sk9_sou_switch_4_9.png


+ 3 - 3
tasks/Component/GeneralInvite/assets.py

@@ -20,9 +20,9 @@ class GeneralInviteAssets:
 	# description 
 	I_FIRE = RuleImage(roi_front=(1179,602,81,74), roi_back=(1179,602,81,74), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_fire.png")
 	# 锁定阵容的图片 
-	I_LOCK = RuleImage(roi_front=(29,644,29,32), roi_back=(29,644,29,32), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_lock.png")
+	I_LOCK = RuleImage(roi_front=(49,645,29,32), roi_back=(29,633,287,61), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_lock.png")
 	# 还没有锁定阵容 
-	I_UNLOCK = RuleImage(roi_front=(30,647,23,30), roi_back=(30,647,23,30), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_unlock.png")
+	I_UNLOCK = RuleImage(roi_front=(31,647,23,27), roi_back=(26,633,285,57), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_unlock.png")
 	# 如果是到时间会退出房间,这个右边显示一个匹配的图片 
 	I_MATCHING = RuleImage(roi_front=(51,574,52,114), roi_back=(51,574,52,114), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_matching.png")
 	# 永生之海挑战(还未有队友的图片) 
@@ -105,7 +105,7 @@ class GeneralInviteAssets:
 	# 判断是不是在庭院界面 
 	I_GI_HOME = RuleImage(roi_front=(361,34,34,46), roi_back=(361,34,34,46), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_gi_home.png")
 	# 判断是不是在探索界面 
-	I_GI_EXPLORE = RuleImage(roi_front=(1138,119,41,48), roi_back=(1138,119,41,48), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_gi_explore.png")
+	I_GI_EXPLORE = RuleImage(roi_front=(677,11,33,46), roi_back=(677,11,33,46), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_gi_explore.png")
 
 
 	# Ocr Rule Assets

BIN
tasks/Component/GeneralInvite/gi/gi_gi_explore.png


BIN
tasks/Component/GeneralInvite/gi/gi_unlock.png


+ 4 - 4
tasks/Component/GeneralInvite/gi/image.json

@@ -38,8 +38,8 @@
   {
     "itemName": "lock",
     "imageName": "gi_lock.png",
-    "roiFront": "29,644,29,32",
-    "roiBack": "29,644,29,32",
+    "roiFront": "49,645,29,32",
+    "roiBack": "29,633,287,61",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "锁定阵容的图片"
@@ -47,8 +47,8 @@
   {
     "itemName": "unlock",
     "imageName": "gi_unlock.png",
-    "roiFront": "30,647,23,30",
-    "roiBack": "30,647,23,30",
+    "roiFront": "31,647,23,27",
+    "roiBack": "26,633,285,57",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "还没有锁定阵容"

+ 2 - 2
tasks/Component/GeneralInvite/gi/member.json

@@ -29,8 +29,8 @@
   {
     "itemName": "gi_explore",
     "imageName": "gi_gi_explore.png",
-    "roiFront": "1138,119,41,48",
-    "roiBack": "1138,119,41,48",
+    "roiFront": "677,11,33,46",
+    "roiBack": "677,11,33,46",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "判断是不是在探索界面"

+ 5 - 5
tasks/Component/SwitchSoul/assets.py

@@ -35,13 +35,13 @@ class SwitchSoulAssets:
 	# 预设 
 	I_SOUL_PRESET = RuleImage(roi_front=(335,73,90,51), roi_back=(310,57,169,72), threshold=0.8, method="Template matching", file="./tasks/Component/SwitchSoul/ss/ss_soul_preset.png")
 	# description 
-	I_SOU_SWITCH_1 = RuleImage(roi_front=(971,149,34,32), roi_back=(962,141,51,48), threshold=0.8, method="Template matching", file="./tasks/Component/SwitchSoul/ss/ss_sou_switch_1.png")
+	I_SOU_SWITCH_1 = RuleImage(roi_front=(978,153,25,26), roi_back=(966,143,51,48), threshold=0.8, method="Template matching", file="./tasks/Component/SwitchSoul/ss/ss_sou_switch_1.png")
 	# description 
-	I_SOU_SWITCH_2 = RuleImage(roi_front=(967,296,42,39), roi_back=(961,292,54,49), threshold=0.8, method="Template matching", file="./tasks/Component/SwitchSoul/ss/ss_sou_switch_2.png")
+	I_SOU_SWITCH_2 = RuleImage(roi_front=(977,303,25,26), roi_back=(961,292,54,49), threshold=0.8, method="Template matching", file="./tasks/Component/SwitchSoul/ss/ss_sou_switch_2.png")
 	# description 
-	I_SOU_SWITCH_3 = RuleImage(roi_front=(968,448,41,38), roi_back=(962,442,52,48), threshold=0.8, method="Template matching", file="./tasks/Component/SwitchSoul/ss/ss_sou_switch_3.png")
+	I_SOU_SWITCH_3 = RuleImage(roi_front=(978,455,25,26), roi_back=(962,442,52,48), threshold=0.8, method="Template matching", file="./tasks/Component/SwitchSoul/ss/ss_sou_switch_3.png")
 	# description 
-	I_SOU_SWITCH_4 = RuleImage(roi_front=(967,597,42,25), roi_back=(962,592,53,34), threshold=0.8, method="Template matching", file="./tasks/Component/SwitchSoul/ss/ss_sou_switch_4.png")
+	I_SOU_SWITCH_4 = RuleImage(roi_front=(978,603,25,22), roi_back=(962,592,53,34), threshold=0.8, method="Template matching", file="./tasks/Component/SwitchSoul/ss/ss_sou_switch_4.png")
 	# description 
 	I_SOU_SWITCH_SURE = RuleImage(roi_front=(668,401,180,61), roi_back=(668,401,180,61), threshold=0.8, method="Template matching", file="./tasks/Component/SwitchSoul/ss/ss_sou_switch_sure.png")
 	# 用于判断是否在式神录里面 
@@ -63,7 +63,7 @@ class SwitchSoulAssets:
 	# 匹配队伍预设 
 	I_SOU_TEAM_PRESENT = RuleImage(roi_front=(737,82,148,43), roi_back=(727,71,165,63), threshold=0.8, method="Template matching", file="./tasks/Component/SwitchSoul/ss/ss_sou_team_present.png")
 	# 需要切换的预设按钮(颜色深一点) 
-	I_SOU_CLICK_PRESENT = RuleImage(roi_front=(967,305,43,22), roi_back=(965,142,48,480), threshold=0.9, method="Template matching", file="./tasks/Component/SwitchSoul/ss/ss_sou_click_present.png")
+	I_SOU_CLICK_PRESENT = RuleImage(roi_front=(978,304,25,26), roi_back=(965,142,48,480), threshold=0.9, method="Template matching", file="./tasks/Component/SwitchSoul/ss/ss_sou_click_present.png")
 	# 误触点到式神检查 
 	I_CHECK_BLOCK = RuleImage(roi_front=(572,408,137,49), roi_back=(572,408,137,49), threshold=0.8, method="Template matching", file="./tasks/Component/SwitchSoul/ss/ss_check_block.png")
 

+ 6 - 6
tasks/Component/SwitchSoul/ss/image.json

@@ -20,8 +20,8 @@
   {
     "itemName": "sou_switch_1",
     "imageName": "ss_sou_switch_1.png",
-    "roiFront": "971,149,34,32",
-    "roiBack": "962,141,51,48",
+    "roiFront": "978,153,25,26",
+    "roiBack": "966,143,51,48",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
@@ -29,7 +29,7 @@
   {
     "itemName": "sou_switch_2",
     "imageName": "ss_sou_switch_2.png",
-    "roiFront": "967,296,42,39",
+    "roiFront": "977,303,25,26",
     "roiBack": "961,292,54,49",
     "method": "Template matching",
     "threshold": 0.8,
@@ -38,7 +38,7 @@
   {
     "itemName": "sou_switch_3",
     "imageName": "ss_sou_switch_3.png",
-    "roiFront": "968,448,41,38",
+    "roiFront": "978,455,25,26",
     "roiBack": "962,442,52,48",
     "method": "Template matching",
     "threshold": 0.8,
@@ -47,7 +47,7 @@
   {
     "itemName": "sou_switch_4",
     "imageName": "ss_sou_switch_4.png",
-    "roiFront": "967,597,42,25",
+    "roiFront": "978,603,25,22",
     "roiBack": "962,592,53,34",
     "method": "Template matching",
     "threshold": 0.8,
@@ -146,7 +146,7 @@
   {
     "itemName": "sou_click_present",
     "imageName": "ss_sou_click_present.png",
-    "roiFront": "967,305,43,22",
+    "roiFront": "978,304,25,26",
     "roiBack": "965,142,48,480",
     "method": "Template matching",
     "threshold": 0.9,

BIN
tasks/Component/SwitchSoul/ss/ss_sou_click_present.png


BIN
tasks/Component/SwitchSoul/ss/ss_sou_switch_1.png


BIN
tasks/Component/SwitchSoul/ss/ss_sou_switch_2.png


BIN
tasks/Component/SwitchSoul/ss/ss_sou_switch_3.png


BIN
tasks/Component/SwitchSoul/ss/ss_sou_switch_4.png


+ 6 - 6
tasks/EternitySea/assets.py

@@ -12,15 +12,15 @@ class EternitySeaAssets:
 
 	# Image Rule Assets
 	# 选择永生之海 
-	I_ETERNITY_SEA = RuleImage(roi_front=(1139,93,127,416), roi_back=(1139,93,127,416), threshold=0.8, method="Template matching", file="./tasks/EternitySea/res/res_eternity_sea.png")
+	I_ETERNITY_SEA = RuleImage(roi_front=(1158,88,70,70), roi_back=(1002,78,233,353), threshold=0.8, method="Template matching", file="./tasks/EternitySea/res/res_eternity_sea.png")
 	# 组队 
-	I_FORM_TEAM = RuleImage(roi_front=(939,594,96,90), roi_back=(939,594,96,90), threshold=0.8, method="Template matching", file="./tasks/EternitySea/res/res_form_team.png")
+	I_FORM_TEAM = RuleImage(roi_front=(962,579,96,90), roi_back=(962,579,96,90), threshold=0.8, method="Template matching", file="./tasks/EternitySea/res/res_form_team.png")
 	# 挑战 
-	I_ETERNITY_SEA_FIRE = RuleImage(roi_front=(1108,592,96,93), roi_back=(1108,592,96,93), threshold=0.8, method="Template matching", file="./tasks/EternitySea/res/res_eternity_sea_fire.png")
+	I_ETERNITY_SEA_FIRE = RuleImage(roi_front=(1146,595,92,49), roi_back=(1142,580,96,93), threshold=0.8, method="Template matching", file="./tasks/EternitySea/res/res_eternity_sea_fire.png")
 	# 开锁 
-	I_ETERNITYSEA_UNLOCK = RuleImage(roi_front=(556,560,35,34), roi_back=(556,560,35,34), threshold=0.8, method="Template matching", file="./tasks/EternitySea/res/res_eternitysea_unlock.png")
+	I_ETERNITYSEA_UNLOCK = RuleImage(roi_front=(700,654,35,34), roi_back=(669,644,167,64), threshold=0.8, method="Template matching", file="./tasks/EternitySea/res/res_eternitysea_unlock.png")
 	# 关锁 
-	I_NEWETERNITYSEA_LOCK = RuleImage(roi_front=(556,560,31,37), roi_back=(556,560,31,37), threshold=0.8, method="Template matching", file="./tasks/EternitySea/res/res_neweternitysea_lock.png")
+	I_NEWETERNITYSEA_LOCK = RuleImage(roi_front=(699,652,31,37), roi_back=(667,652,164,53), threshold=0.8, method="Template matching", file="./tasks/EternitySea/res/res_neweternitysea_lock.png")
 	# 小小宠物,发现宝藏 
 	I_PET_PRESENT = RuleImage(roi_front=(873,184,62,147), roi_back=(873,184,62,147), threshold=0.8, method="Template matching", file="./tasks/EternitySea/res/res_pet_present.png")
 	# description 
@@ -29,7 +29,7 @@ class EternitySeaAssets:
 
 	# List Rule Assets
 	# 永生之海层数列表 
-	L_LAYER_LIST = RuleList(folder="./tasks/EternitySea/res", direction="vertical", mode="ocr", roi_back=(138,127,353,435), size=(56, 68), 
+	L_LAYER_LIST = RuleList(folder="./tasks/EternitySea/res", direction="vertical", mode="ocr", roi_back=(124,101,74,593), size=(71, 84), 
 					 array=["壹", "贰", "叁", "肆"])
 
 

+ 10 - 10
tasks/EternitySea/res/image.json

@@ -2,8 +2,8 @@
   {
     "itemName": "eternity_sea",
     "imageName": "res_eternity_sea.png",
-    "roiFront": "1139,93,127,416",
-    "roiBack": "1139,93,127,416",
+    "roiFront": "1158,88,70,70",
+    "roiBack": "1002,78,233,353",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "选择永生之海"
@@ -11,8 +11,8 @@
   {
     "itemName": "form_team",
     "imageName": "res_form_team.png",
-    "roiFront": "939,594,96,90",
-    "roiBack": "939,594,96,90",
+    "roiFront": "962,579,96,90",
+    "roiBack": "962,579,96,90",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "组队"
@@ -20,8 +20,8 @@
   {
     "itemName": "eternity_sea_fire",
     "imageName": "res_eternity_sea_fire.png",
-    "roiFront": "1108,592,96,93",
-    "roiBack": "1108,592,96,93",
+    "roiFront": "1146,595,92,49",
+    "roiBack": "1142,580,96,93",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "挑战"
@@ -29,8 +29,8 @@
   {
     "itemName": "eternitysea_unlock",
     "imageName": "res_eternitysea_unlock.png",
-    "roiFront": "556,560,35,34",
-    "roiBack": "556,560,35,34",
+    "roiFront": "700,654,35,34",
+    "roiBack": "669,644,167,64",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "开锁"
@@ -38,8 +38,8 @@
   {
     "itemName": "neweternitysea_lock",
     "imageName": "res_neweternitysea_lock.png",
-    "roiFront": "556,560,31,37",
-    "roiBack": "556,560,31,37",
+    "roiFront": "699,652,31,37",
+    "roiBack": "667,652,164,53",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "关锁"

+ 5 - 5
tasks/EternitySea/res/list.json

@@ -2,24 +2,24 @@
   "name": "layer_list",
   "direction": "vertical",
   "type": "ocr",
-  "roiBack": "138,127,353,435",
+  "roiBack": "124,101,74,593",
   "description": "永生之海层数列表",
   "list": [
     {
       "itemName": "壹",
-      "roiFront": "266,148,60,64"
+      "roiFront": "126,104,69,83"
     },
     {
       "itemName": "贰",
-      "roiFront": "270,253,54,74"
+      "roiFront": "125,203,72,81"
     },
     {
       "itemName": "叁",
-      "roiFront": "276,367,50,67"
+      "roiFront": "125,295,72,87"
     },
     {
       "itemName": "肆",
-      "roiFront": "271,479,60,70"
+      "roiFront": "124,396,74,85"
     }
   ]
 }

BIN
tasks/EternitySea/res/res_eternity_sea.png


BIN
tasks/EternitySea/res/res_eternity_sea_fire.png


BIN
tasks/EternitySea/res/res_eternitysea_unlock.png


BIN
tasks/EternitySea/res/res_form_team.png


BIN
tasks/EternitySea/res/res_neweternitysea_lock.png


+ 11 - 11
tasks/EvoZone/assets.py

@@ -12,35 +12,35 @@ class EvoZoneAssets:
 
 	# Image Rule Assets
 	# 火麒麟进入 
-	I_FIRE_KIRIN = RuleImage(roi_front=(84,126,217,406), roi_back=(84,126,217,406), threshold=0.8, method="Template matching", file="./tasks/EvoZone/o/o_fire_kirin.png")
+	I_FIRE_KIRIN = RuleImage(roi_front=(104,120,217,325), roi_back=(104,120,217,325), threshold=0.8, method="Template matching", file="./tasks/EvoZone/o/o_fire_kirin.png")
 	# 组队 
-	I_FORM_TEAM = RuleImage(roi_front=(934,585,100,100), roi_back=(916,572,156,130), threshold=0.8, method="Template matching", file="./tasks/EvoZone/o/o_form_team.png")
+	I_FORM_TEAM = RuleImage(roi_front=(959,580,100,100), roi_back=(916,572,156,130), threshold=0.8, method="Template matching", file="./tasks/EvoZone/o/o_form_team.png")
 	# description 
-	I_EVOZONE_LOCK = RuleImage(roi_front=(558,565,31,32), roi_back=(548,554,53,54), threshold=0.8, method="Template matching", file="./tasks/EvoZone/o/o_evozone_lock.png")
+	I_EVOZONE_LOCK = RuleImage(roi_front=(700,655,31,32), roi_back=(690,648,53,54), threshold=0.8, method="Template matching", file="./tasks/EvoZone/o/o_evozone_lock.png")
 	# description 
-	I_EVOZONE_UNLOCK = RuleImage(roi_front=(560,565,26,29), roi_back=(551,557,43,45), threshold=0.8, method="Template matching", file="./tasks/EvoZone/o/o_evozone_unlock.png")
+	I_EVOZONE_UNLOCK = RuleImage(roi_front=(701,657,26,29), roi_back=(695,650,43,45), threshold=0.8, method="Template matching", file="./tasks/EvoZone/o/o_evozone_unlock.png")
 	# 点击挑战 
-	I_EVOZONE_FIRE = RuleImage(roi_front=(1095,577,131,124), roi_back=(1095,577,131,124), threshold=0.6, method="Template matching", file="./tasks/EvoZone/o/o_evozone_fire.png")
+	I_EVOZONE_FIRE = RuleImage(roi_front=(1127,568,131,124), roi_back=(1127,568,131,124), threshold=0.6, method="Template matching", file="./tasks/EvoZone/o/o_evozone_fire.png")
 	# 式神录 
-	I_SHI_RECORDS = RuleImage(roi_front=(821,638,48,45), roi_back=(821,638,48,45), threshold=0.8, method="Template matching", file="./tasks/EvoZone/o/o_shi_records.png")
+	I_SHI_RECORDS = RuleImage(roi_front=(843,570,48,45), roi_back=(843,570,48,45), threshold=0.8, method="Template matching", file="./tasks/EvoZone/o/o_shi_records.png")
 	# 小小宠物,发现宝藏 
 	I_PET_PRESENT = RuleImage(roi_front=(873,184,62,147), roi_back=(873,184,62,147), threshold=0.8, method="Template matching", file="./tasks/EvoZone/o/o_pet_present.png")
 	# 风麒麟进入 
-	I_WIND_KIRIN = RuleImage(roi_front=(377,126,232,420), roi_back=(377,126,232,420), threshold=0.8, method="Template matching", file="./tasks/EvoZone/o/o_wind_kirin.png")
+	I_WIND_KIRIN = RuleImage(roi_front=(423,116,201,250), roi_back=(423,116,201,250), threshold=0.8, method="Template matching", file="./tasks/EvoZone/o/o_wind_kirin.png")
 	# 水麒麟进入 
-	I_WATER_KIRIN = RuleImage(roi_front=(671,122,236,420), roi_back=(671,122,236,420), threshold=0.8, method="Template matching", file="./tasks/EvoZone/o/o_water_kirin.png")
+	I_WATER_KIRIN = RuleImage(roi_front=(728,115,201,342), roi_back=(728,115,201,342), threshold=0.8, method="Template matching", file="./tasks/EvoZone/o/o_water_kirin.png")
 	# 雷麒麟进入 
-	I_LIGHTNING_KIRIN = RuleImage(roi_front=(967,121,239,419), roi_back=(967,121,239,419), threshold=0.8, method="Template matching", file="./tasks/EvoZone/o/o_lightning_kirin.png")
+	I_LIGHTNING_KIRIN = RuleImage(roi_front=(1016,99,218,270), roi_back=(1016,99,218,270), threshold=0.8, method="Template matching", file="./tasks/EvoZone/o/o_lightning_kirin.png")
 
 
 	# List Rule Assets
 	# 这个是觉醒界面选择不同层数的 
-	L_LAYER_LIST = RuleList(folder="./tasks/EvoZone/res", direction="vertical", mode="ocr", roi_back=(138,130,359,500), size=(44, 88), 
+	L_LAYER_LIST = RuleList(folder="./tasks/EvoZone/res", direction="vertical", mode="ocr", roi_back=(124,84,77,632), size=(75, 83), 
 					 array=["壹", "贰", "叁", "肆", "伍", "陆", "柒", "捌", "玖", "拾"])
 
 
 	# Ocr Rule Assets
 	# Ocr-description 
-	O_O_TEST_OCR = RuleOcr(roi=(126,136,360,491), area=(126,136,360,491), mode="Full", method="Default", keyword="", name="o_test_ocr")
+	O_O_TEST_OCR = RuleOcr(roi=(128,114,349,564), area=(128,114,349,564), mode="Full", method="Default", keyword="", name="o_test_ocr")
 
 

+ 17 - 17
tasks/EvoZone/o/image.json

@@ -2,8 +2,8 @@
   {
     "itemName": "fire_kirin",
     "imageName": "o_fire_kirin.png",
-    "roiFront": "84,126,217,406",
-    "roiBack": "84,126,217,406",
+    "roiFront": "104,120,217,325",
+    "roiBack": "104,120,217,325",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "火麒麟进入"
@@ -11,7 +11,7 @@
   {
     "itemName": "form_team",
     "imageName": "o_form_team.png",
-    "roiFront": "934,585,100,100",
+    "roiFront": "959,580,100,100",
     "roiBack": "916,572,156,130",
     "method": "Template matching",
     "threshold": 0.8,
@@ -20,8 +20,8 @@
   {
     "itemName": "evozone_lock",
     "imageName": "o_evozone_lock.png",
-    "roiFront": "558,565,31,32",
-    "roiBack": "548,554,53,54",
+    "roiFront": "700,655,31,32",
+    "roiBack": "690,648,53,54",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
@@ -29,8 +29,8 @@
   {
     "itemName": "evozone_unlock",
     "imageName": "o_evozone_unlock.png",
-    "roiFront": "560,565,26,29",
-    "roiBack": "551,557,43,45",
+    "roiFront": "701,657,26,29",
+    "roiBack": "695,650,43,45",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
@@ -38,8 +38,8 @@
   {
     "itemName": "evozone_fire",
     "imageName": "o_evozone_fire.png",
-    "roiFront": "1095,577,131,124",
-    "roiBack": "1095,577,131,124",
+    "roiFront": "1127,568,131,124",
+    "roiBack": "1127,568,131,124",
     "method": "Template matching",
     "threshold": 0.6,
     "description": "点击挑战"
@@ -47,8 +47,8 @@
   {
     "itemName": "shi_records",
     "imageName": "o_shi_records.png",
-    "roiFront": "821,638,48,45",
-    "roiBack": "821,638,48,45",
+    "roiFront": "843,570,48,45",
+    "roiBack": "843,570,48,45",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "式神录"
@@ -65,8 +65,8 @@
   {
     "itemName": "wind_kirin",
     "imageName": "o_wind_kirin.png",
-    "roiFront": "377,126,232,420",
-    "roiBack": "377,126,232,420",
+    "roiFront": "423,116,201,250",
+    "roiBack": "423,116,201,250",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "风麒麟进入"
@@ -74,8 +74,8 @@
   {
     "itemName": "water_kirin",
     "imageName": "o_water_kirin.png",
-    "roiFront": "671,122,236,420",
-    "roiBack": "671,122,236,420",
+    "roiFront": "728,115,201,342",
+    "roiBack": "728,115,201,342",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "水麒麟进入"
@@ -83,8 +83,8 @@
   {
     "itemName": "lightning_kirin",
     "imageName": "o_lightning_kirin.png",
-    "roiFront": "967,121,239,419",
-    "roiBack": "967,121,239,419",
+    "roiFront": "1016,99,218,270",
+    "roiBack": "1016,99,218,270",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "雷麒麟进入"

BIN
tasks/EvoZone/o/o_evozone_fire.png


BIN
tasks/EvoZone/o/o_evozone_lock.png


BIN
tasks/EvoZone/o/o_evozone_unlock.png


BIN
tasks/EvoZone/o/o_fire_kirin.png


BIN
tasks/EvoZone/o/o_form_team.png


BIN
tasks/EvoZone/o/o_lightning_kirin.png


BIN
tasks/EvoZone/o/o_shi_records.png


BIN
tasks/EvoZone/o/o_water_kirin.png


BIN
tasks/EvoZone/o/o_wind_kirin.png


+ 11 - 11
tasks/EvoZone/res/list.json

@@ -2,48 +2,48 @@
   "name": "layer_list",
   "direction": "vertical",
   "type": "ocr",
-  "roiBack": "138,130,359,500",
+  "roiBack": "124,84,77,632",
   "description": "这个是觉醒界面选择不同层数的",
   "list": [
     {
       "itemName": "壹",
-      "roiFront": "281,135,39,102"
+      "roiFront": "124,92,76,70"
     },
     {
       "itemName": "贰",
-      "roiFront": "280,253,39,85"
+      "roiFront": "124,194,75,75"
     },
     {
       "itemName": "叁",
-      "roiFront": "283,422,43,93"
+      "roiFront": "124,289,77,90"
     },
     {
       "itemName": "肆",
-      "roiFront": "280,312,44,90"
+      "roiFront": "124,392,77,92"
     },
     {
       "itemName": "伍",
-      "roiFront": "282,425,43,82"
+      "roiFront": "124,502,77,82"
     },
     {
       "itemName": "陆",
-      "roiFront": "275,316,47,89"
+      "roiFront": "124,605,75,82"
     },
     {
       "itemName": "柒",
-      "roiFront": "279,312,48,93"
+      "roiFront": "125,293,75,97"
     },
     {
       "itemName": "捌",
-      "roiFront": "275,203,51,89"
+      "roiFront": "125,406,76,85"
     },
     {
       "itemName": "玖",
-      "roiFront": "278,206,48,81"
+      "roiFront": "124,507,77,84"
     },
     {
       "itemName": "拾",
-      "roiFront": "282,315,45,84"
+      "roiFront": "125,613,74,77"
     }
   ]
 }

+ 2 - 2
tasks/EvoZone/res/ocr.json

@@ -1,8 +1,8 @@
 [
   {
     "itemName": "o_test_ocr",
-    "roiFront": "126,136,360,491",
-    "roiBack": "126,136,360,491",
+    "roiFront": "128,114,349,564",
+    "roiBack": "128,114,349,564",
     "mode": "Full",
     "method": "Default",
     "keyword": "",

+ 7 - 3
tasks/Exploration/assets.py

@@ -74,7 +74,7 @@ class ExplorationAssets:
 	# 进入难度选择界面 
 	I_E_EXPLORATION_OPEN = RuleImage(roi_front=(1077,248,37,80), roi_back=(1072,242,47,92), threshold=0.8, method="Template matching", file="./tasks/Exploration/res/res_e_exploration_open.png")
 	# 探索按钮 
-	I_E_EXPLORATION_CLICK = RuleImage(roi_front=(898,518,96,42), roi_back=(898,518,96,42), threshold=0.8, method="Template matching", file="./tasks/Exploration/res/res_e_exploration_click.png")
+	I_E_EXPLORATION_CLICK = RuleImage(roi_front=(1076,601,96,42), roi_back=(939,555,307,127), threshold=0.8, method="Template matching", file="./tasks/Exploration/res/res_e_exploration_click.png")
 	# 自动轮换开着 
 	I_E_AUTO_ROTATE_ON = RuleImage(roi_front=(104,649,153,44), roi_back=(104,649,153,44), threshold=0.9, method="Template matching", file="./tasks/Exploration/res/res_e_auto_rotate_on.png")
 	# 自动轮换关闭 
@@ -116,9 +116,13 @@ class ExplorationAssets:
 	# 队伍的表情标志 
 	I_TEAM_EMOJI = RuleImage(roi_front=(36,437,44,46), roi_back=(4,407,100,100), threshold=0.8, method="Template matching", file="./tasks/Exploration/res/res_team_emoji.png")
 	# 组队按钮 
-	I_EXP_CREATE_TEAM = RuleImage(roi_front=(590,514,122,52), roi_back=(543,490,192,100), threshold=0.8, method="Template matching", file="./tasks/Exploration/res/res_exp_create_team.png")
+	I_EXP_CREATE_TEAM = RuleImage(roi_front=(894,599,96,50), roi_back=(855,546,189,151), threshold=0.8, method="Template matching", file="./tasks/Exploration/res/res_exp_create_team.png")
 	# 创建确认 
 	I_EXP_CREATE_ENSURE = RuleImage(roi_front=(534,486,218,59), roi_back=(516,475,244,85), threshold=0.8, method="Template matching", file="./tasks/Exploration/res/res_exp_create_ensure.png")
+	# 箭头,收纳 
+	I_EXP_ARROW_RIGHT = RuleImage(roi_front=(1240,117,24,21), roi_back=(1178,74,100,100), threshold=0.8, method="Template matching", file="./tasks/Exploration/res/res_exp_arrow_right.png")
+	# 箭头,打开 
+	I_EXP_ARROW_LEFT = RuleImage(roi_front=(1244,115,18,26), roi_back=(1178,78,100,100), threshold=0.8, method="Template matching", file="./tasks/Exploration/res/res_exp_arrow_left.png")
 
 
 	# Long Click Rule Assets
@@ -134,7 +138,7 @@ class ExplorationAssets:
 
 	# Ocr Rule Assets
 	# 识别当前显示的章节 
-	O_E_EXPLORATION_LEVEL_NUMBER = RuleOcr(roi=(1079,193,147,467), area=(1079,193,147,467), mode="Full", method="Default", keyword="", name="e_exploration_level_number")
+	O_E_EXPLORATION_LEVEL_NUMBER = RuleOcr(roi=(1064,206,121,337), area=(1064,206,121,337), mode="Full", method="Default", keyword="", name="e_exploration_level_number")
 	# 候补出战的数量 
 	O_E_ALTERNATE_NUMBER = RuleOcr(roi=(1092,122,69,32), area=(1092,122,69,32), mode="DigitCounter", method="Default", keyword="", name="e_alternate_number")
 	# 探索右上角 突破卷的数量 

+ 7 - 11
tasks/Exploration/base.py

@@ -63,7 +63,7 @@ class BaseExploration(GameUi, GeneralBattle, GeneralRoom, GeneralInvite, Replace
 
         if self.appear(self.I_CHECK_EXPLORATION) and not self.appear(self.I_E_SETTINGS_BUTTON):
             return Scene.WORLD
-        elif self.appear(self.I_UI_BACK_RED) and self.appear(self.I_E_EXPLORATION_CLICK):
+        elif self.appear(self.I_E_EXPLORATION_CLICK):
             return Scene.ENTRANCE
         elif self.appear(self.I_E_SETTINGS_BUTTON) or self.appear(self.I_E_AUTO_ROTATE_ON) or self.appear(self.I_E_AUTO_ROTATE_OFF):
             return Scene.MAIN
@@ -153,7 +153,7 @@ class BaseExploration(GameUi, GeneralBattle, GeneralRoom, GeneralInvite, Replace
             swipeCount += 1
             debug_info = f"Swiped {swipeCount} times, current exploration level: {text1}"
             logger.info(debug_info)
-            if swipeCount >= 25:
+            if swipeCount >= 15:
                 raise GameStuckError(
                     f"Swiped too many times ({swipeCount}), seems stuck in exploration level selection"
                 )
@@ -376,16 +376,15 @@ class BaseExploration(GameUi, GeneralBattle, GeneralRoom, GeneralInvite, Replace
         logger.info('Quit explore')
         boss_timer = Timer(15)
         boss_timer.start()
-        click_yellow_button = 0 #用于保证只点一次左上返回按钮,不要直接触发连点回到主界面
+        # click_yellow_button = 0 #用于保证只点一次左上返回按钮,不要直接触发连点回到主界面
         
         while 1:
             self.screenshot()
             
-            #探索章节标题界面
+            # 探索章节标题界面
             if self.appear(self.I_UI_BACK_RED) and self.appear(self.I_E_EXPLORATION_CLICK):
                 break
-            
-            #探索大世界界面
+            # 探索大世界界面
             if self.appear(self.I_CHECK_EXPLORATION) and not self.appear(self.I_E_SETTINGS_BUTTON):
                 break
   
@@ -403,11 +402,8 @@ class BaseExploration(GameUi, GeneralBattle, GeneralRoom, GeneralInvite, Replace
 
             if self.appear_then_click(self.I_E_EXIT_CONFIRM, interval=0.8):
                 continue
-            
-            if click_yellow_button == 0:
-                if self.appear_then_click(self.I_BACK_YOLLOW, interval=3.5):
-                    click_yellow_button = 1
-                    continue
+            if self.appear_then_click(self.I_BACK_YOLLOW, interval=3.5):
+                continue
             
             if self.appear(self.I_EXPLORATION_TITLE) or self.appear(self.I_CHECK_EXPLORATION):
                 continue

+ 22 - 4
tasks/Exploration/res/image.json

@@ -11,8 +11,8 @@
   {
     "itemName": "e_exploration_click",
     "imageName": "res_e_exploration_click.png",
-    "roiFront": "898,518,96,42",
-    "roiBack": "898,518,96,42",
+    "roiFront": "1076,601,96,42",
+    "roiBack": "939,555,307,127",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "探索按钮"
@@ -200,8 +200,8 @@
   {
     "itemName": "exp_create_team",
     "imageName": "res_exp_create_team.png",
-    "roiFront": "590,514,122,52",
-    "roiBack": "543,490,192,100",
+    "roiFront": "894,599,96,50",
+    "roiBack": "855,546,189,151",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "组队按钮"
@@ -214,5 +214,23 @@
     "method": "Template matching",
     "threshold": 0.8,
     "description": "创建确认"
+  },
+  {
+    "itemName": "exp_arrow_right",
+    "imageName": "res_exp_arrow_right.png",
+    "roiFront": "1240,117,24,21",
+    "roiBack": "1178,74,100,100",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "箭头,收纳"
+  },
+  {
+    "itemName": "exp_arrow_left",
+    "imageName": "res_exp_arrow_left.png",
+    "roiFront": "1244,115,18,26",
+    "roiBack": "1178,78,100,100",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "箭头,打开"
   }
 ]

+ 2 - 2
tasks/Exploration/res/ocr.json

@@ -1,8 +1,8 @@
 [
   {
     "itemName": "e_exploration_level_number",
-    "roiFront": "1079,193,147,467",
-    "roiBack": "1079,193,147,467",
+    "roiFront": "1064,206,121,337",
+    "roiBack": "1064,206,121,337",
     "mode": "Full",
     "method": "Default",
     "keyword": "",

BIN
tasks/Exploration/res/res_e_exploration_click.png


Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff