Преглед изворни кода

Merge branch 'dev' into dev-o

yuyuyuyuyu пре 5 месеци
родитељ
комит
34b5e205f4
82 измењених фајлова са 166 додато и 212 уклоњено
  1. 22 15
      module/device/handle.py
  2. 1 1
      tasks/Component/Costume/assets.py
  3. 2 2
      tasks/Component/Costume/main4/image.json
  4. BIN
      tasks/Component/Costume/main4/main4_check_main_4.png
  5. 40 40
      tasks/Component/CostumeShikigami/assets.py
  6. 6 6
      tasks/Component/CostumeShikigami/sk1/image.json
  7. BIN
      tasks/Component/CostumeShikigami/sk1/sk1_sou_click_present_1.png
  8. BIN
      tasks/Component/CostumeShikigami/sk1/sk1_sou_switch_1_1.png
  9. BIN
      tasks/Component/CostumeShikigami/sk1/sk1_sou_switch_2_1.png
  10. BIN
      tasks/Component/CostumeShikigami/sk1/sk1_sou_switch_3_1.png
  11. BIN
      tasks/Component/CostumeShikigami/sk1/sk1_sou_switch_4_1.png
  12. 6 6
      tasks/Component/CostumeShikigami/sk2/image.json
  13. BIN
      tasks/Component/CostumeShikigami/sk2/sk2_sou_click_present_2.png
  14. BIN
      tasks/Component/CostumeShikigami/sk2/sk2_sou_switch_1_2.png
  15. BIN
      tasks/Component/CostumeShikigami/sk2/sk2_sou_switch_2_2.png
  16. BIN
      tasks/Component/CostumeShikigami/sk2/sk2_sou_switch_3_2.png
  17. BIN
      tasks/Component/CostumeShikigami/sk2/sk2_sou_switch_4_2.png
  18. 6 6
      tasks/Component/CostumeShikigami/sk3/image.json
  19. BIN
      tasks/Component/CostumeShikigami/sk3/sk3_sou_click_present_3.png
  20. BIN
      tasks/Component/CostumeShikigami/sk3/sk3_sou_switch_1_3.png
  21. BIN
      tasks/Component/CostumeShikigami/sk3/sk3_sou_switch_2_3.png
  22. BIN
      tasks/Component/CostumeShikigami/sk3/sk3_sou_switch_3_3.png
  23. BIN
      tasks/Component/CostumeShikigami/sk3/sk3_sou_switch_4_3.png
  24. 6 6
      tasks/Component/CostumeShikigami/sk4/image.json
  25. BIN
      tasks/Component/CostumeShikigami/sk4/sk4_sou_click_present_4.png
  26. BIN
      tasks/Component/CostumeShikigami/sk4/sk4_sou_switch_1_4.png
  27. BIN
      tasks/Component/CostumeShikigami/sk4/sk4_sou_switch_2_4.png
  28. BIN
      tasks/Component/CostumeShikigami/sk4/sk4_sou_switch_3_4.png
  29. BIN
      tasks/Component/CostumeShikigami/sk4/sk4_sou_switch_4_4.png
  30. 7 7
      tasks/Component/CostumeShikigami/sk5/image.json
  31. BIN
      tasks/Component/CostumeShikigami/sk5/sk5_sou_click_present_5.png
  32. BIN
      tasks/Component/CostumeShikigami/sk5/sk5_sou_switch_1_5.png
  33. BIN
      tasks/Component/CostumeShikigami/sk5/sk5_sou_switch_2_5.png
  34. BIN
      tasks/Component/CostumeShikigami/sk5/sk5_sou_switch_3_5.png
  35. BIN
      tasks/Component/CostumeShikigami/sk5/sk5_sou_switch_4_5.png
  36. 6 6
      tasks/Component/CostumeShikigami/sk6/image.json
  37. BIN
      tasks/Component/CostumeShikigami/sk6/sk6_sou_click_present_6.png
  38. BIN
      tasks/Component/CostumeShikigami/sk6/sk6_sou_switch_1_6.png
  39. BIN
      tasks/Component/CostumeShikigami/sk6/sk6_sou_switch_2_6.png
  40. BIN
      tasks/Component/CostumeShikigami/sk6/sk6_sou_switch_3_6.png
  41. BIN
      tasks/Component/CostumeShikigami/sk6/sk6_sou_switch_4_6.png
  42. 10 10
      tasks/Component/CostumeShikigami/sk7/image.json
  43. BIN
      tasks/Component/CostumeShikigami/sk7/sk7_sou_click_present_7.png
  44. BIN
      tasks/Component/CostumeShikigami/sk7/sk7_sou_switch_1_7.png
  45. BIN
      tasks/Component/CostumeShikigami/sk7/sk7_sou_switch_2_7.png
  46. BIN
      tasks/Component/CostumeShikigami/sk7/sk7_sou_switch_3_7.png
  47. BIN
      tasks/Component/CostumeShikigami/sk7/sk7_sou_switch_4_7.png
  48. 6 6
      tasks/Component/CostumeShikigami/sk8/image.json
  49. BIN
      tasks/Component/CostumeShikigami/sk8/sk8_sou_click_present_8.png
  50. BIN
      tasks/Component/CostumeShikigami/sk8/sk8_sou_switch_1_8.png
  51. BIN
      tasks/Component/CostumeShikigami/sk8/sk8_sou_switch_2_8.png
  52. BIN
      tasks/Component/CostumeShikigami/sk8/sk8_sou_switch_3_8.png
  53. BIN
      tasks/Component/CostumeShikigami/sk8/sk8_sou_switch_4_8.png
  54. 3 3
      tasks/Component/GeneralInvite/assets.py
  55. BIN
      tasks/Component/GeneralInvite/gi/gi_gi_explore.png
  56. BIN
      tasks/Component/GeneralInvite/gi/gi_unlock.png
  57. 4 4
      tasks/Component/GeneralInvite/gi/image.json
  58. 2 2
      tasks/Component/GeneralInvite/gi/member.json
  59. 5 5
      tasks/Component/SwitchSoul/assets.py
  60. 6 6
      tasks/Component/SwitchSoul/ss/image.json
  61. BIN
      tasks/Component/SwitchSoul/ss/ss_sou_click_present.png
  62. BIN
      tasks/Component/SwitchSoul/ss/ss_sou_switch_1.png
  63. BIN
      tasks/Component/SwitchSoul/ss/ss_sou_switch_2.png
  64. BIN
      tasks/Component/SwitchSoul/ss/ss_sou_switch_3.png
  65. BIN
      tasks/Component/SwitchSoul/ss/ss_sou_switch_4.png
  66. 4 6
      tasks/DemonEncounter/config.py
  67. 2 6
      tasks/DemonEncounter/script_task.py
  68. 1 1
      tasks/Exploration/assets.py
  69. 2 2
      tasks/Exploration/res/image.json
  70. BIN
      tasks/Exploration/res/res_exp_create_team.png
  71. 1 1
      tasks/Orochi/script_task.py
  72. 1 2
      tasks/SixRealms/config.py
  73. 4 18
      tasks/SixRealms/script_task.py
  74. 4 9
      tasks/Sougenbi/assets.py
  75. 0 27
      tasks/Sougenbi/s/image.json
  76. 6 6
      tasks/Sougenbi/s/ocr.json
  77. BIN
      tasks/Sougenbi/s/s_s_anger.png
  78. BIN
      tasks/Sougenbi/s/s_s_foolery.png
  79. BIN
      tasks/Sougenbi/s/s_s_greed.png
  80. 1 1
      tasks/TrueOrochi/assets.py
  81. 2 2
      tasks/TrueOrochi/st/image.json
  82. BIN
      tasks/TrueOrochi/st/st_find_ts.png

+ 22 - 15
module/device/handle.py

@@ -4,6 +4,7 @@
 import re
 
 from enum import Enum
+from time import sleep
 from cached_property import cached_property
 from anytree import NodeMixin, RenderTree, PreOrderIter
 from win32api import GetSystemMetrics, SendMessage, MAKELONG, PostMessage
@@ -168,11 +169,8 @@ class Handle:
                 self.config = Config(config, task=None)
             else:
                 self.config = config
-        if not self.config.script.device.handle:
-            logger.info('Handle is empty. oas not use handle')
-            return
-        if self.config.script.device.handle == '':
-            logger.info('Handle is empty. oas not use handle')
+        if not self.config.script.device.handle or self.config.script.device.handle == '':
+            logger.info('Handle is empty, oas not use handle')
             return
 
         # 获取根的句柄
@@ -187,20 +185,32 @@ class Handle:
         if isinstance(self.root_handle, str):
             try:
                 self.root_handle_num = int(self.root_handle)
-                logger.info('Handle is handle num. oas use it as root handle num')
+                logger.info('Handle is a number, using it as root handle num')
                 if is_handle_valid(self.root_handle_num):
                     logger.info(f'Handle number {self.root_handle_num} is valid')
                     self.root_handle_title = handle_num2title(self.root_handle_num)
             except ValueError:
-                logger.info('Handle is handle string. oas use it as root handle title')
+                logger.info('Handle is a string, looking up window by title')
                 if handle_title2num(self.root_handle) != 0:
                     self.root_handle_num = handle_title2num(self.root_handle)
                     self.root_handle_title = self.root_handle
         logger.info(f'The root handle title is {self.root_handle_title} and num is {self.root_handle_num}')
 
-        # 获取句柄树
+        # 获取句柄树(加重试,等待子窗口渲染就绪)
         self.root_node = WindowNode(name=self.root_handle_title, num=self.root_handle_num)
         Handle.handle_tree(self.root_handle_num, self.root_node)
+        if not self.root_node.children:
+            logger.info('Window child tree not ready, waiting for emulator to finish initializing')
+            for i in range(9):
+                sleep(1)
+                self.root_node = WindowNode(name=self.root_handle_title, num=self.root_handle_num)
+                Handle.handle_tree(self.root_handle_num, self.root_node)
+                if self.root_node.children:
+                    logger.info(f'Window child tree ready after {i + 2} attempts')
+                    break
+            else:
+                logger.warning('Window child tree still not ready after 10 attempts, will use title-based fallback')
+
         logger.info('Emulator handle structure:')
         for pre, fill, node in RenderTree(self.root_node):
             logger.info("%s%s" % (pre, node.name))
@@ -209,12 +219,9 @@ class Handle:
 
         # 判断是哪一个模拟器 通过句柄树结构
         logger.info(f'Emulator family: {self.emulator_family}')
-
         # window系统的缩放
-        logger.info(f'Your window screen scale rate: {window_scale_rate()}')
-        _ = self.screenshot_handle_num
-        logger.info(f'Screenshot handle num: {self.screenshot_handle_num}')
-        logger.info(f'Emulator screenshot size: {self.screenshot_size}')
+        logger.info(f'Window screen scale rate: {window_scale_rate()}')
+        # screenshot_handle_num 和 screenshot_size 延迟到首次截屏时按需求值,不在初始化时预计算
 
     @staticmethod
     def all_windows() -> list:
@@ -240,7 +247,7 @@ class Handle:
         :return:
         """
         if windows is None:
-            logger.error("handle_auto not get all wnidow")
+            logger.error("auto_handle_title: windows list is None")
 
         emu_list = []
         for window_title in windows:
@@ -270,7 +277,7 @@ class Handle:
         if len(emu_list) == 1:
             emulator_title = emu_list[0]
 
-        logger.info(f'Handle auto seclect to find {emulator_title} and use it as root_title')
+        logger.info(f'Auto-detected emulator window: {emulator_title}')
         return emulator_title
 
     @staticmethod

+ 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")
 	#  

+ 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


+ 40 - 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")
 	# 更换 
@@ -104,13 +104,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")
 	# 用于判断是否在式神录里面 
@@ -132,7 +132,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")
 	# 更换 
@@ -147,13 +147,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")
 	# 用于判断是否在式神录里面 
@@ -175,7 +175,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")
 	# 更换 
@@ -190,13 +190,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")
 	# 用于判断是否在式神录里面 
@@ -218,7 +218,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")
 	# 更换 
@@ -233,13 +233,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")
 	# 用于判断是否在式神录里面 
@@ -261,7 +261,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")
 	# 更换 
@@ -276,13 +276,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")
 	# 用于判断是否在式神录里面 
@@ -304,7 +304,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")
 	# 更换 
@@ -319,13 +319,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")
 	# 用于判断是否在式神录里面 
@@ -347,7 +347,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")
 	# 更换 
@@ -362,13 +362,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")
 	# 用于判断是否在式神录里面 
@@ -390,7 +390,7 @@ 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")
 	# 更换 

+ 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


+ 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


+ 4 - 6
tasks/DemonEncounter/config.py

@@ -45,8 +45,7 @@ class DemonConfig(BaseModel):
         description="通过预设名称来匹配普通封魔御魂分组\n例如=> 逢魔之时,歌(中间的是英文逗号)",
     )
     # 周一
-    demon_kiryou_utahime: str = Field(default="group,team", description="鬼灵歌姬御魂1")
-    demon_kiryou_utahime_supplementary: str = Field(default="group,team", description="鬼灵歌姬御魂补充")
+    demon_kiryou_utahime: str = Field(default="group,team", description="鬼灵歌姬御魂")
     # 周二
     demon_shinkirou: str = Field(default="group,team", description="蜃气楼御魂")
     # 周三 土蜘蛛
@@ -67,8 +66,7 @@ class BestDemonConfig(BaseModel):
         default=False,
         description="通过预设名称来匹配极封魔御魂分组\n例如=> 逢魔之时,歌(中间的是英文逗号)",
     )
-    best_demon_kiryou_utahime: str = Field(default="group,team", description="极鬼灵歌姬御魂1")
-    best_demon_kiryou_utahime_supplementary: str = Field(default="group,team", description="极鬼灵歌姬御魂补充")
+    best_demon_kiryou_utahime: str = Field(default="group,team", description="极鬼灵歌姬御魂")
     best_demon_shinkirou: str = Field(default="group,team", description="极蜃气楼御魂")
     best_demon_tsuchigumo: str = Field(default="group,team", description="极土蜘蛛御魂")
     best_demon_gashadokuro: str = Field(default="group,team", description="极荒骷髅御魂")
@@ -76,8 +74,8 @@ class BestDemonConfig(BaseModel):
     best_demon_oboroguruma: str = Field(default="group,team", description="极胧车御魂")
     best_demon_nightly_aramitamau: str = Field(default="group,team", description="极夜荒魂御魂")
 
-    hide_fields = dynamic_hide('best_demon_kiryou_utahime', 'best_demon_kiryou_utahime_supplementary',
-                               'best_demon_oboroguruma', 'best_demon_nightly_aramitamau')
+    hide_fields = dynamic_hide('best_demon_kiryou_utahime', 'best_demon_oboroguruma',
+                               'best_demon_nightly_aramitamau')
 
 
 def convert_to_general_battle_config(boss_type: str, demon_battle_conf: 'DemonBattleConfig' = None,

+ 2 - 6
tasks/DemonEncounter/script_task.py

@@ -65,12 +65,8 @@ class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets, SwitchSoul):
             group, team = getattr(self.conf.demon_soul_config, self.boss_type).split(",")
         if group and team:
             self.run_switch_soul_by_name(group, team)
-            if datetime.now().weekday() == 0:
-                if select_best_demon:
-                    group, team = getattr(self.conf.best_demon_soul_config, f'{self.boss_type}_supplementary').split(",")
-                else:
-                    group, team = getattr(self.conf.demon_soul_config, f'{self.boss_type}_supplementary').split(",")
-                self.run_switch_soul_by_name(group, team)
+            return
+        logger.error(f'Unknown switch soul conf: group[{group}], team[{team}]')
 
     def execute_boss(self):
         """

+ 1 - 1
tasks/Exploration/assets.py

@@ -116,7 +116,7 @@ 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")
 	# 箭头,收纳 

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

@@ -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": "组队按钮"

BIN
tasks/Exploration/res/res_exp_create_team.png


+ 1 - 1
tasks/Orochi/script_task.py

@@ -254,7 +254,7 @@ class ScriptTask(GeneralBattle, GeneralInvite, GeneralBuff, GeneralRoom, GameUi,
 
         while 1:
             # 有一种情况是本来要退出的,但是队长邀请了进入的战斗的加载界面
-            if self.appear(self.I_GI_HOME) or self.appear(self.I_GI_EXPLORE):
+            if self.appear(self.I_CHECK_MAIN) or self.appear(self.I_CHECK_EXPLORATION):
                 break
             # 如果可能在房间就退出
             if self.exit_room():

+ 1 - 2
tasks/SixRealms/config.py

@@ -17,8 +17,7 @@ class SixRealmsGate(BaseModel):
 
 class SixRealms(ConfigBase):
     scheduler: Scheduler = Field(default_factory=Scheduler)
-    switch_soul_config_1: SwitchSoulConfig = Field(default_factory=SwitchSoulConfig)
-    switch_soul_config_2: SwitchSoulConfig = Field(default_factory=SwitchSoulConfig)
+    switch_soul_config: SwitchSoulConfig = Field(default_factory=SwitchSoulConfig)
     six_realms_gate: SixRealmsGate = Field(default_factory=SixRealmsGate)
 
 

+ 4 - 18
tasks/SixRealms/script_task.py

@@ -31,28 +31,14 @@ class ScriptTask(GameUi, SwitchSoul, MoonSea):
         return self.config.model.six_realms
 
     def run(self):
-        if self._config.switch_soul_config_1.enable:
+        if self._config.switch_soul_config.enable:
             self.ui_get_current_page()
             self.ui_goto(page_shikigami_records)
-            self.run_switch_soul(self._config.switch_soul_config_1.switch_group_team)
-        if self._config.switch_soul_config_1.enable_switch_by_name:
+            self.run_switch_soul(self._config.switch_soul_config.switch_group_team)
+        if self._config.switch_soul_config.enable_switch_by_name:
             self.ui_get_current_page()
             self.ui_goto(page_shikigami_records)
-            self.run_switch_soul_by_name(
-                self._config.switch_soul_config_1.group_name,
-                self._config.switch_soul_config_1.team_name
-            )
-        if self._config.switch_soul_config_2.enable:
-            self.ui_get_current_page()
-            self.ui_goto(page_shikigami_records)
-            self.run_switch_soul(self._config.switch_soul_config_2.switch_group_team)
-        if self._config.switch_soul_config_2.enable_switch_by_name:
-            self.ui_get_current_page()
-            self.ui_goto(page_shikigami_records)
-            self.run_switch_soul_by_name(
-                self._config.switch_soul_config_2.group_name,
-                self._config.switch_soul_config_2.team_name
-            )
+            self.run_switch_soul_by_name(self._config.switch_soul_config.group_name, self._config.switch_soul_config.team_name)
         self.ui_get_current_page()
         self.ui_goto(page_six_gates)
 

+ 4 - 9
tasks/Sougenbi/assets.py

@@ -22,12 +22,6 @@ class SougenbiAssets:
 	# Image Rule Assets
 	# 进入业原火 
 	I_S_SOUGENBI = RuleImage(roi_front=(560,139,57,61), roi_back=(412,68,231,359), threshold=0.8, method="Template matching", file="./tasks/Sougenbi/s/s_s_sougenbi.png")
-	# 贪 
-	I_S_GREED = RuleImage(roi_front=(118,121,307,100), roi_back=(167,143,307,100), threshold=0.8, method="Template matching", file="./tasks/Sougenbi/s/s_s_greed.png")
-	#  
-	I_S_ANGER = RuleImage(roi_front=(164,291,307,100), roi_back=(164,291,307,100), threshold=0.8, method="Template matching", file="./tasks/Sougenbi/s/s_s_anger.png")
-	# 痴 
-	I_S_FOOLERY = RuleImage(roi_front=(164,436,307,100), roi_back=(164,436,307,100), threshold=0.8, method="Template matching", file="./tasks/Sougenbi/s/s_s_foolery.png")
 	# description 
 	I_S_TEAM_LOCK = RuleImage(roi_front=(700,652,31,36), roi_back=(667,649,167,56), threshold=0.8, method="Template matching", file="./tasks/Sougenbi/s/s_s_team_lock.png")
 	# description 
@@ -46,10 +40,11 @@ class SougenbiAssets:
 
 	# Ocr Rule Assets
 	# Ocr-description 
-	O_S_GREED = RuleOcr(roi=(388,20,63,42), area=(388,20,63,42), mode="Single", method="Default", keyword="", name="s_greed")
+	O_S_GREED = RuleOcr(roi=(585,7,63,42), area=(585,7,63,42), mode="Single", method="Default", keyword="", name="s_greed")
 	# Ocr-description 
-	O_S_ANGER = RuleOcr(roi=(571,18,79,43), area=(571,18,79,43), mode="Digit", method="Default", keyword="", name="s_anger")
+	O_S_ANGER = RuleOcr(roi=(759,9,79,43), area=(759,9,79,43), mode="Digit", method="Default", keyword="", name="s_anger")
 	# Ocr-description 
-	O_S_FOOLERY = RuleOcr(roi=(755,23,68,36), area=(755,23,68,36), mode="Digit", method="Default", keyword="", name="s_foolery")
+	O_S_FOOLERY = RuleOcr(roi=(955,10,68,36), area=(955,10,68,36), mode="Digit", method="Default", keyword="", name="s_foolery")
+
 
 

+ 0 - 27
tasks/Sougenbi/s/image.json

@@ -8,33 +8,6 @@
     "threshold": 0.8,
     "description": "进入业原火"
   },
-  {
-    "itemName": "s_greed",
-    "imageName": "s_s_greed.png",
-    "roiFront": "118,121,307,100",
-    "roiBack": "167,143,307,100",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "贪"
-  },
-  {
-    "itemName": "s_anger",
-    "imageName": "s_s_anger.png",
-    "roiFront": "164,291,307,100",
-    "roiBack": "164,291,307,100",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": ""
-  },
-  {
-    "itemName": "s_foolery",
-    "imageName": "s_s_foolery.png",
-    "roiFront": "164,436,307,100",
-    "roiBack": "164,436,307,100",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "痴"
-  },
   {
     "itemName": "s_team_lock",
     "imageName": "s_s_team_lock.png",

+ 6 - 6
tasks/Sougenbi/s/ocr.json

@@ -1,8 +1,8 @@
 [
   {
     "itemName": "s_greed",
-    "roiFront": "388,20,63,42",
-    "roiBack": "388,20,63,42",
+    "roiFront": "585,7,63,42",
+    "roiBack": "585,7,63,42",
     "mode": "Single",
     "method": "Default",
     "keyword": "",
@@ -10,8 +10,8 @@
   },
   {
     "itemName": "s_anger",
-    "roiFront": "571,18,79,43",
-    "roiBack": "571,18,79,43",
+    "roiFront": "759,9,79,43",
+    "roiBack": "759,9,79,43",
     "mode": "Digit",
     "method": "Default",
     "keyword": "",
@@ -19,8 +19,8 @@
   },
   {
     "itemName": "s_foolery",
-    "roiFront": "755,23,68,36",
-    "roiBack": "755,23,68,36",
+    "roiFront": "955,10,68,36",
+    "roiBack": "955,10,68,36",
     "mode": "Digit",
     "method": "Default",
     "keyword": "",

BIN
tasks/Sougenbi/s/s_s_anger.png


BIN
tasks/Sougenbi/s/s_s_foolery.png


BIN
tasks/Sougenbi/s/s_s_greed.png


+ 1 - 1
tasks/TrueOrochi/assets.py

@@ -31,7 +31,7 @@ class TrueOrochiAssets:
 
 	# Image Rule Assets
 	# 出现真蛇 
-	I_FIND_TS = RuleImage(roi_front=(1,613,100,93), roi_back=(1,613,100,93), threshold=0.8, method="Template matching", file="./tasks/TrueOrochi/st/st_find_ts.png")
+	I_FIND_TS = RuleImage(roi_front=(259,635,96,79), roi_back=(183,585,331,135), threshold=0.8, method="Template matching", file="./tasks/TrueOrochi/st/st_find_ts.png")
 	# 点击挑战60体力 
 	I_ST_FIRE = RuleImage(roi_front=(960,485,100,100), roi_back=(960,485,100,100), threshold=0.8, method="Template matching", file="./tasks/TrueOrochi/st/st_st_fire.png")
 	# 确认挑战 

+ 2 - 2
tasks/TrueOrochi/st/image.json

@@ -2,8 +2,8 @@
   {
     "itemName": "find_ts",
     "imageName": "st_find_ts.png",
-    "roiFront": "1,613,100,93",
-    "roiBack": "1,613,100,93",
+    "roiFront": "259,635,96,79",
+    "roiBack": "183,585,331,135",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "出现真蛇"

BIN
tasks/TrueOrochi/st/st_find_ts.png