Przeglądaj źródła

Merge pull request #20 from runhey/dev

Dev
huangrunheng 3 lat temu
rodzic
commit
58fc5b4da0
100 zmienionych plików z 1947 dodań i 153 usunięć
  1. 97 33
      config/template.json
  2. 8 0
      module/atom/image.py
  3. 27 0
      module/atom/image_grid.py
  4. 11 3
      module/atom/list.py
  5. 75 1
      module/base/decorator.py
  6. 1 0
      module/config/config_manual.py
  7. 2 2
      module/config/config_model.py
  8. BIN
      module/config/i18n/zh_CN.qm
  9. 44 5
      module/config/i18n/zh_CN.ts
  10. 16 1
      module/config/utils.py
  11. 8 1
      module/device/control.py
  12. 13 3
      module/device/handle.py
  13. 1 1
      module/device/method/minitouch.py
  14. 12 7
      module/device/method/window.py
  15. 1 1
      module/ocr/base_ocr.py
  16. 14 9
      module/ocr/models.py
  17. 10 9
      module/ocr/sub_ocr.py
  18. 3 3
      script.py
  19. BIN
      tasks/ActivityShikigami/as/as_add_max.png
  20. BIN
      tasks/ActivityShikigami/as/as_ap.png
  21. BIN
      tasks/ActivityShikigami/as/as_ap_activity.png
  22. BIN
      tasks/ActivityShikigami/as/as_buy_jade.png
  23. BIN
      tasks/ActivityShikigami/as/as_new.png
  24. BIN
      tasks/ActivityShikigami/as/as_switch.png
  25. 54 0
      tasks/ActivityShikigami/as/image.json
  26. 21 3
      tasks/ActivityShikigami/as/ocr.json
  27. 18 2
      tasks/ActivityShikigami/assets.py
  28. 3 1
      tasks/ActivityShikigami/config.py
  29. 70 5
      tasks/ActivityShikigami/script_task.py
  30. 23 18
      tasks/AreaBoss/script_task.py
  31. 30 0
      tasks/Component/BaseActivity/config_activity.py
  32. BIN
      tasks/Component/GeneralBattle/GeneralBattle_greed_ghost.png
  33. BIN
      tasks/Component/GeneralBattle/GeneralBattle_win.png
  34. 23 18
      tasks/Component/GeneralBattle/assets.py
  35. 0 0
      tasks/Component/GeneralBattle/gb/click.json
  36. BIN
      tasks/Component/GeneralBattle/gb/gb_buff.png
  37. BIN
      tasks/Component/GeneralBattle/gb/gb_exit.png
  38. BIN
      tasks/Component/GeneralBattle/gb/gb_exit_ensure.png
  39. BIN
      tasks/Component/GeneralBattle/gb/gb_false.png
  40. BIN
      tasks/Component/GeneralBattle/gb/gb_greed_ghost.png
  41. BIN
      tasks/Component/GeneralBattle/gb/gb_local.png
  42. BIN
      tasks/Component/GeneralBattle/gb/gb_prepare_dark.png
  43. BIN
      tasks/Component/GeneralBattle/gb/gb_prepare_highlight.png
  44. BIN
      tasks/Component/GeneralBattle/gb/gb_preset.png
  45. BIN
      tasks/Component/GeneralBattle/gb/gb_preset_ensure.png
  46. BIN
      tasks/Component/GeneralBattle/gb/gb_reward.png
  47. BIN
      tasks/Component/GeneralBattle/gb/gb_statistics.png
  48. BIN
      tasks/Component/GeneralBattle/gb/gb_win.png
  49. 20 20
      tasks/Component/GeneralBattle/gb/image.json
  50. 11 0
      tasks/Component/GeneralBattle/gb/img_supplement.json
  51. BIN
      tasks/Component/GeneralBattle/gb/res_win.png
  52. 0 0
      tasks/Component/GeneralBattle/gb/swipe.json
  53. 51 6
      tasks/Component/GeneralBattle/general_battle.py
  54. 46 0
      tasks/Component/GeneralBuff/assets.py
  55. 27 0
      tasks/Component/GeneralBuff/config_buff.py
  56. BIN
      tasks/Component/GeneralBuff/gb/gb_awake.png
  57. BIN
      tasks/Component/GeneralBuff/gb/gb_buff_1.png
  58. BIN
      tasks/Component/GeneralBuff/gb/gb_close_red.png
  59. BIN
      tasks/Component/GeneralBuff/gb/gb_cloud.png
  60. BIN
      tasks/Component/GeneralBuff/gb/gb_exp_100.png
  61. BIN
      tasks/Component/GeneralBuff/gb/gb_exp_50.png
  62. BIN
      tasks/Component/GeneralBuff/gb/gb_gold_100.png
  63. BIN
      tasks/Component/GeneralBuff/gb/gb_gold_50.png
  64. BIN
      tasks/Component/GeneralBuff/gb/gb_open_yellow.png
  65. BIN
      tasks/Component/GeneralBuff/gb/gb_soul.png
  66. 92 0
      tasks/Component/GeneralBuff/gb/image.json
  67. 38 0
      tasks/Component/GeneralBuff/gb/ocr.json
  68. 291 0
      tasks/Component/GeneralBuff/general_buff.py
  69. 108 1
      tasks/Component/GeneralInvite/assets.py
  70. 26 0
      tasks/Component/GeneralInvite/config_invite.py
  71. 652 0
      tasks/Component/GeneralInvite/general_invite.py
  72. BIN
      tasks/Component/GeneralInvite/gi/gi_add_1.png
  73. BIN
      tasks/Component/GeneralInvite/gi/gi_add_2.png
  74. BIN
      tasks/Component/GeneralInvite/gi/gi_add_5_1.png
  75. BIN
      tasks/Component/GeneralInvite/gi/gi_add_5_2.png
  76. BIN
      tasks/Component/GeneralInvite/gi/gi_add_5_3.png
  77. BIN
      tasks/Component/GeneralInvite/gi/gi_add_5_4.png
  78. BIN
      tasks/Component/GeneralInvite/gi/gi_add_sea.png
  79. BIN
      tasks/Component/GeneralInvite/gi/gi_back_yellow.png
  80. BIN
      tasks/Component/GeneralInvite/gi/gi_buff.png
  81. BIN
      tasks/Component/GeneralInvite/gi/gi_cancel.png
  82. BIN
      tasks/Component/GeneralInvite/gi/gi_default_invite.png
  83. BIN
      tasks/Component/GeneralInvite/gi/gi_default_no.png
  84. BIN
      tasks/Component/GeneralInvite/gi/gi_fire.png
  85. BIN
      tasks/Component/GeneralInvite/gi/gi_fire_fail.png
  86. BIN
      tasks/Component/GeneralInvite/gi/gi_fire_fail_sea.png
  87. BIN
      tasks/Component/GeneralInvite/gi/gi_fire_sea.png
  88. BIN
      tasks/Component/GeneralInvite/gi/gi_flag_1_off.png
  89. BIN
      tasks/Component/GeneralInvite/gi/gi_flag_1_on.png
  90. BIN
      tasks/Component/GeneralInvite/gi/gi_flag_2_off.png
  91. BIN
      tasks/Component/GeneralInvite/gi/gi_flag_2_on.png
  92. BIN
      tasks/Component/GeneralInvite/gi/gi_flag_3_off.png
  93. BIN
      tasks/Component/GeneralInvite/gi/gi_flag_3_on.png
  94. BIN
      tasks/Component/GeneralInvite/gi/gi_flag_4_off.png
  95. BIN
      tasks/Component/GeneralInvite/gi/gi_flag_4_on.png
  96. BIN
      tasks/Component/GeneralInvite/gi/gi_gi_emoji_1.png
  97. BIN
      tasks/Component/GeneralInvite/gi/gi_gi_emoji_2.png
  98. BIN
      tasks/Component/GeneralInvite/gi/gi_gi_explore.png
  99. BIN
      tasks/Component/GeneralInvite/gi/gi_gi_home.png
  100. BIN
      tasks/Component/GeneralInvite/gi/gi_gi_sure.png

+ 97 - 33
config/template.json

@@ -26,9 +26,9 @@
       "enable": false,
       "enable": false,
       "next_run": "2023-01-01 00:00:00",
       "next_run": "2023-01-01 00:00:00",
       "priority": 5,
       "priority": 5,
-      "success_interval": "1 day, 0:00:00",
-      "failure_interval": "1 day, 0:00:00",
-      "server_update": "06:00:00"
+      "success_interval": "01 00:00:00",
+      "failure_interval": "01 00:00:00",
+      "server_update": "09:00:00"
     }
     }
   },
   },
   "global_game": {
   "global_game": {
@@ -45,9 +45,9 @@
       "enable": false,
       "enable": false,
       "next_run": "2023-01-01 00:00:00",
       "next_run": "2023-01-01 00:00:00",
       "priority": 5,
       "priority": 5,
-      "success_interval": "1 day, 0:00:00",
-      "failure_interval": "1 day, 0:00:00",
-      "server_update": "06:00:00"
+      "success_interval": "01 00:00:00",
+      "failure_interval": "01 00:00:00",
+      "server_update": "09:00:00"
     },
     },
     "general_battle": {
     "general_battle": {
       "lock_team_enable": false,
       "lock_team_enable": false,
@@ -74,9 +74,9 @@
       "enable": false,
       "enable": false,
       "next_run": "2023-01-01 00:00:00",
       "next_run": "2023-01-01 00:00:00",
       "priority": 5,
       "priority": 5,
-      "success_interval": "1 day, 0:00:00",
-      "failure_interval": "1 day, 0:00:00",
-      "server_update": "06:00:00"
+      "success_interval": "01 00:00:00",
+      "failure_interval": "01 00:00:00",
+      "server_update": "09:00:00"
     }
     }
   },
   },
   "gold_youkai": {
   "gold_youkai": {
@@ -84,9 +84,9 @@
       "enable": false,
       "enable": false,
       "next_run": "2023-01-01 00:00:00",
       "next_run": "2023-01-01 00:00:00",
       "priority": 5,
       "priority": 5,
-      "success_interval": "1 day, 0:00:00",
-      "failure_interval": "1 day, 0:00:00",
-      "server_update": "06:00:00"
+      "success_interval": "01 00:00:00",
+      "failure_interval": "01 00:00:00",
+      "server_update": "09:00:00"
     }
     }
   },
   },
   "nian": {
   "nian": {
@@ -94,9 +94,9 @@
       "enable": false,
       "enable": false,
       "next_run": "2023-01-01 00:00:00",
       "next_run": "2023-01-01 00:00:00",
       "priority": 5,
       "priority": 5,
-      "success_interval": "1 day, 0:00:00",
-      "failure_interval": "1 day, 0:00:00",
-      "server_update": "06:00:00"
+      "success_interval": "01 00:00:00",
+      "failure_interval": "01 00:00:00",
+      "server_update": "09:00:00"
     }
     }
   },
   },
   "realm_raid": {
   "realm_raid": {
@@ -104,9 +104,9 @@
       "enable": false,
       "enable": false,
       "next_run": "2023-01-01 00:00:00",
       "next_run": "2023-01-01 00:00:00",
       "priority": 5,
       "priority": 5,
-      "success_interval": "1 day, 0:00:00",
-      "failure_interval": "1 day, 0:00:00",
-      "server_update": "06:00:00"
+      "success_interval": "01 00:00:00",
+      "failure_interval": "01 00:00:00",
+      "server_update": "09:00:00"
     },
     },
     "raid_config": {
     "raid_config": {
       "raid_mode": "retreat_four_attack_nine",
       "raid_mode": "retreat_four_attack_nine",
@@ -134,9 +134,40 @@
       "enable": false,
       "enable": false,
       "next_run": "2023-01-01 00:00:00",
       "next_run": "2023-01-01 00:00:00",
       "priority": 5,
       "priority": 5,
-      "success_interval": "1 day, 0:00:00",
-      "failure_interval": "1 day, 0:00:00",
-      "server_update": "06:00:00"
+      "success_interval": "01 00:00:00",
+      "failure_interval": "01 00:00:00",
+      "server_update": "09:00:00"
+    },
+    "orochi_config": {
+      "user_status": "leader",
+      "layer": "悲鸣",
+      "limit_time": "00:30:00",
+      "limit_count": 30,
+      "soul_buff_enable": false
+    },
+    "invite_config": {
+      "invite_number": "one",
+      "friend_1": "",
+      "friend_2": "",
+      "find_mode": "auto_find",
+      "wait_time": "00:01:00",
+      "default_invite": true
+    },
+    "general_battle_config": {
+      "lock_team_enable": false,
+      "preset_enable": false,
+      "preset_group": 1,
+      "preset_team": 1,
+      "buff_enable": false,
+      "buff_awake_click": false,
+      "buff_soul_click": false,
+      "buff_gold_50_click": false,
+      "buff_gold_100_click": false,
+      "buff_exp_50_click": false,
+      "buff_exp_100_click": false,
+      "green_enable": false,
+      "green_mark": "green_left1",
+      "random_click_swipt_enable": false
     }
     }
   },
   },
   "orochi_moans": {
   "orochi_moans": {
@@ -144,9 +175,9 @@
       "enable": false,
       "enable": false,
       "next_run": "2023-01-01 00:00:00",
       "next_run": "2023-01-01 00:00:00",
       "priority": 5,
       "priority": 5,
-      "success_interval": "1 day, 0:00:00",
-      "failure_interval": "1 day, 0:00:00",
-      "server_update": "06:00:00"
+      "success_interval": "01 00:00:00",
+      "failure_interval": "01 00:00:00",
+      "server_update": "09:00:00"
     }
     }
   },
   },
   "sougenbi": {
   "sougenbi": {
@@ -154,9 +185,9 @@
       "enable": false,
       "enable": false,
       "next_run": "2023-01-01 00:00:00",
       "next_run": "2023-01-01 00:00:00",
       "priority": 5,
       "priority": 5,
-      "success_interval": "1 day, 0:00:00",
-      "failure_interval": "1 day, 0:00:00",
-      "server_update": "06:00:00"
+      "success_interval": "01 00:00:00",
+      "failure_interval": "01 00:00:00",
+      "server_update": "09:00:00"
     }
     }
   },
   },
   "fallen_sun": {
   "fallen_sun": {
@@ -164,9 +195,9 @@
       "enable": false,
       "enable": false,
       "next_run": "2023-01-01 00:00:00",
       "next_run": "2023-01-01 00:00:00",
       "priority": 5,
       "priority": 5,
-      "success_interval": "1 day, 0:00:00",
-      "failure_interval": "1 day, 0:00:00",
-      "server_update": "06:00:00"
+      "success_interval": "01 00:00:00",
+      "failure_interval": "01 00:00:00",
+      "server_update": "09:00:00"
     }
     }
   },
   },
   "eternity_sea": {
   "eternity_sea": {
@@ -174,9 +205,42 @@
       "enable": false,
       "enable": false,
       "next_run": "2023-01-01 00:00:00",
       "next_run": "2023-01-01 00:00:00",
       "priority": 5,
       "priority": 5,
-      "success_interval": "1 day, 0:00:00",
-      "failure_interval": "1 day, 0:00:00",
-      "server_update": "06:00:00"
+      "success_interval": "01 00:00:00",
+      "failure_interval": "01 00:00:00",
+      "server_update": "09:00:00"
+    }
+  },
+  "activity_shikigami": {
+    "scheduler": {
+      "enable": false,
+      "next_run": "2023-01-01 00:00:00",
+      "priority": 5,
+      "success_interval": "01 00:00:00",
+      "failure_interval": "01 00:00:00",
+      "server_update": "09:00:00"
+    },
+    "general_climb": {
+      "limit_time": "00 01:00:00",
+      "limit_count": 50,
+      "ap_game_max": 300,
+      "ap_mode": "ap_activity",
+      "activity_toggle": false
+    },
+    "general_battle": {
+      "lock_team_enable": false,
+      "preset_enable": false,
+      "preset_group": 1,
+      "preset_team": 1,
+      "buff_enable": false,
+      "buff_awake_click": false,
+      "buff_soul_click": false,
+      "buff_gold_50_click": false,
+      "buff_gold_100_click": false,
+      "buff_exp_50_click": false,
+      "buff_exp_100_click": false,
+      "green_enable": false,
+      "green_mark": "green_left1",
+      "random_click_swipt_enable": false
     }
     }
   }
   }
 }
 }

+ 8 - 0
module/atom/image.py

@@ -141,6 +141,14 @@ class RuleImage:
         x, y, w, h = self.roi_back
         x, y, w, h = self.roi_back
         return x + np.random.randint(0, w), y + np.random.randint(0, h)
         return x + np.random.randint(0, w), y + np.random.randint(0, h)
 
 
+    def front_center(self) -> tuple:
+        """
+        获取roi_front的中心坐标
+        :return:
+        """
+        x, y, w, h = self.roi_front
+        return int(x + w//2), int(y + h//2)
+
 
 
 if __name__ == "__main__":
 if __name__ == "__main__":
     image = cv2.imread("D:/4713.jpg")
     image = cv2.imread("D:/4713.jpg")

+ 27 - 0
module/atom/image_grid.py

@@ -0,0 +1,27 @@
+# This Python file uses the following encoding: utf-8
+# @author runhey
+# github https://github.com/runhey
+import numpy as np
+
+from module.atom.image import RuleImage
+
+
+
+class ImageGrid:
+
+    def __init__(self, images: list[RuleImage]):
+        self.images = images
+
+
+    def find_anyone(self, img: np.array) -> RuleImage or None:
+        """
+        在这些图片中找到其中一个
+        :param img:
+        :return: 如果没有找到返回None
+        """
+        for image in self.images:
+            if image.match(img):
+                return image
+        return None
+
+

+ 11 - 3
module/atom/list.py

@@ -77,7 +77,7 @@ class RuleList:
 
 
         if x1 is None or y1 is None or x2 is None or y2 is None:
         if x1 is None or y1 is None or x2 is None or y2 is None:
             raise Exception("滑动位置计算错误")
             raise Exception("滑动位置计算错误")
-        return x1, y1, x2, y2
+        return int(x1), int(y1), int(x2), int(y2)
 
 
     def target_check(self, name: str) -> bool:
     def target_check(self, name: str) -> bool:
         """
         """
@@ -184,8 +184,9 @@ class RuleList:
                 break
                 break
         if box is not None:
         if box is not None:
             rec_x, rec_y, rec_w, rec_h = box[0, 0], box[0, 1], box[1, 0] - box[0, 0], box[2, 1] - box[0, 1]
             rec_x, rec_y, rec_w, rec_h = box[0, 0], box[0, 1], box[1, 0] - box[0, 0], box[2, 1] - box[0, 1]
-            x = rec_x + rec_w // 2
-            y = rec_y + rec_h // 2
+            x = rec_x + rec_w // 2 + self.roi_back[0]
+            y = rec_y + rec_h // 2 + self.roi_back[1]
+            logger.info(f'Ocr {name} appear in current screen, do not need to scroll')
             return x, y
             return x, y
 
 
         # if index_list and len(index_list) >= 1:
         # if index_list and len(index_list) >= 1:
@@ -197,6 +198,13 @@ class RuleList:
         else:
         else:
             keyword_list: list = [item.ocr_text for item in boxed_results if item.score > RuleOcr.score]
             keyword_list: list = [item.ocr_text for item in boxed_results if item.score > RuleOcr.score]
 
 
+            # 判断识别处理的文字是否属于要验证识别的文字(array)
+            keyword_list = [keyword for keyword in keyword_list if keyword in self.array]
+            logger.info(f'After list: {keyword_list}')
+            if not keyword_list:
+                logger.warning(f'Not found {name} in {self.array}')
+                return 2
+
             start_index = self.array.index(keyword_list[0])
             start_index = self.array.index(keyword_list[0])
             end_index = self.array.index(keyword_list[-1])
             end_index = self.array.index(keyword_list[-1])
             if name in keyword_list:
             if name in keyword_list:

+ 75 - 1
module/base/decorator.py

@@ -124,4 +124,78 @@ def has_cached_property(obj, name):
         obj:
         obj:
         name (str):
         name (str):
     """
     """
-    return name in obj.__dict__
+    return name in obj.__dict__
+
+
+
+def function_drop(rate=0.5, default=None):
+    """
+    Drop function calls to simulate random emulator stuck, for testing purpose.
+
+    Args:
+        rate (float): 0 to 1. Drop rate.
+        default: Default value to return if dropped.
+
+    Examples:
+        @function_drop(0.3)
+        def click(self, button, record_check=True):
+            pass
+
+        30% possibility:
+        INFO | Dropped: module.device.device.Device.click(REWARD_GOTO_MAIN, record_check=True)
+        70% possibility:
+        INFO | Click (1091,  628) @ REWARD_GOTO_MAIN
+    """
+    from module.logger import logger
+
+    def decorate(func):
+        @wraps(func)
+        def wrapper(*args, **kwargs):
+            if random.uniform(0, 1) > rate:
+                return func(*args, **kwargs)
+            else:
+                cls = ''
+                arguments = [str(arg) for arg in args]
+                if len(arguments):
+                    matched = re.search('<(.*?) object at', arguments[0])
+                    if matched:
+                        cls = matched.group(1) + '.'
+                        arguments.pop(0)
+                arguments += [f'{k}={v}' for k, v in kwargs.items()]
+                arguments = ', '.join(arguments)
+                logger.info(f'Dropped: {cls}{func.__name__}({arguments})')
+                return default
+
+        return wrapper
+
+    return decorate
+
+
+def run_once(f):
+    """
+    Run a function only once, no matter how many times it has been called.
+
+    Examples:
+        @run_once
+        def my_function(foo, bar):
+            return foo + bar
+
+        while 1:
+            my_function()
+
+    Examples:
+        def my_function(foo, bar):
+            return foo + bar
+
+        action = run_once(my_function)
+        while 1:
+            action()
+    """
+
+    def wrapper(*args, **kwargs):
+        if not wrapper.has_run:
+            wrapper.has_run = True
+            return f(*args, **kwargs)
+
+    wrapper.has_run = False
+    return wrapper

+ 1 - 0
module/config/config_manual.py

@@ -11,6 +11,7 @@ class ConfigManual:
         Restart
         Restart
         > AreaBoss > GoldYoukai > ExperienceYoukai > Nian > RealmRaid
         > AreaBoss > GoldYoukai > ExperienceYoukai > Nian > RealmRaid
         > Orochi > OrochiMoans > OrochiJudgement > Sougenbi > FallenSun > EternitySea
         > Orochi > OrochiMoans > OrochiJudgement > Sougenbi > FallenSun > EternitySea
+        > ActivityShikigami
         """
         """
 
 
     DEVICE_OVER_HTTP = False
     DEVICE_OVER_HTTP = False

+ 2 - 2
module/config/config_model.py

@@ -115,7 +115,7 @@ class ConfigModel(ConfigBase):
         task = convert_to_underscore(task)
         task = convert_to_underscore(task)
         task_gui = getattr(self, task, None)
         task_gui = getattr(self, task, None)
         if task_gui is None:
         if task_gui is None:
-            logger.error(f'{task} is no inexistence')
+            logger.warning(f'{task} is no inexistence')
             return ''
             return ''
 
 
         schema2 = task_gui.schema()
         schema2 = task_gui.schema()
@@ -139,7 +139,7 @@ class ConfigModel(ConfigBase):
         task_name = convert_to_underscore(task)
         task_name = convert_to_underscore(task)
         task = getattr(self, task_name, None)
         task = getattr(self, task_name, None)
         if task is None:
         if task is None:
-            logger.error(f'{task_name} is no inexistence')
+            logger.warning(f'{task_name} is no inexistence')
             return ''
             return ''
         return task.json()
         return task.json()
 
 

BIN
module/config/i18n/zh_CN.qm


+ 44 - 5
module/config/i18n/zh_CN.ts

@@ -313,7 +313,7 @@
 	<message><source>Priority</source><translation>任务优先级</translation></message>
 	<message><source>Priority</source><translation>任务优先级</translation></message>
 	<message><source>Success Interval</source><translation>执行任务成功后设定下次执行的间隔时间</translation></message>
 	<message><source>Success Interval</source><translation>执行任务成功后设定下次执行的间隔时间</translation></message>
 	<message><source>Failure Interval</source><translation>执行任务失败后设定下次执行的间隔时间</translation></message>
 	<message><source>Failure Interval</source><translation>执行任务失败后设定下次执行的间隔时间</translation></message>
-	<message><source>Server Update</source><translation>服务器更新时间</translation></message>
+	<message><source>Server Update</source><translation>强制设定服务时间</translation></message>
 	<message><source>enable_help</source><translation>将这个任务加入调度器</translation></message>
 	<message><source>enable_help</source><translation>将这个任务加入调度器</translation></message>
 	<message><source>next_run_help</source><translation>会根据下面的间隔时间自动计算时间,清空后回车即可设置为当前</translation></message>
 	<message><source>next_run_help</source><translation>会根据下面的间隔时间自动计算时间,清空后回车即可设置为当前</translation></message>
 	<message><source>priority_help</source><translation>如果设置调度规则为基于优先级,则该选项有效
 	<message><source>priority_help</source><translation>如果设置调度规则为基于优先级,则该选项有效
@@ -323,7 +323,8 @@
 	<message><source>interval_minutes_help</source><translation>可取[0~60]</translation></message>
 	<message><source>interval_minutes_help</source><translation>可取[0~60]</translation></message>
 	<message><source>success_interval_help</source><translation>一般默认,时间格式:"[days] [hours]:[minutes]:[seconds]"</translation></message>
 	<message><source>success_interval_help</source><translation>一般默认,时间格式:"[days] [hours]:[minutes]:[seconds]"</translation></message>
 	<message><source>failure_interval_help</source><translation>一般默认即可,时间格式同上,不按照格式输入会无法正确设置</translation></message>
 	<message><source>failure_interval_help</source><translation>一般默认即可,时间格式同上,不按照格式输入会无法正确设置</translation></message>
-	<message><source>server_update_help</source><translation>服务器更新时间,占位符,还没想好怎么用</translation></message>
+	<message><source>server_update_help</source><translation>如果设定不是默认的 "09:00:00",该任务每次执行完毕后会强制设定下次运行时间为第二天的设定值
+格式 hh:mm:ss </translation></message>
 </context>
 </context>
 <context>
 <context>
     <name>Args</name>
     <name>Args</name>
@@ -344,7 +345,7 @@
 	<message><source>Random Click Swipt Enable</source><translation>战斗时随机点击或者随机滑动</translation></message>
 	<message><source>Random Click Swipt Enable</source><translation>战斗时随机点击或者随机滑动</translation></message>
 	
 	
 	<message><source>lock_team_enable_help</source><translation>如果锁定阵容将无法启用预设队伍、加成功能</translation></message>
 	<message><source>lock_team_enable_help</source><translation>如果锁定阵容将无法启用预设队伍、加成功能</translation></message>
-	<message><source>preset_enable_help</source><translation> </translation></message>
+	<message><source>preset_enable_help</source><translation>将会在第一次战斗的时候切换队伍预设</translation></message>
 	<message><source>preset_group_help</source><translation>可选[1~7]</translation></message>
 	<message><source>preset_group_help</source><translation>可选[1~7]</translation></message>
 	<message><source>preset_team_help</source><translation>可选[1~5]</translation></message>
 	<message><source>preset_team_help</source><translation>可选[1~5]</translation></message>
 	<message><source>buff_enable_help</source><translation>在准备阶段开启加成不太符合直觉,暂时还未实现,而且挺多的战斗是不允许准备阶段开启加成的</translation></message>
 	<message><source>buff_enable_help</source><translation>在准备阶段开启加成不太符合直觉,暂时还未实现,而且挺多的战斗是不允许准备阶段开启加成的</translation></message>
@@ -379,7 +380,45 @@
 	<message><source>ShikigamiConfig</source><translation>活动</translation></message>
 	<message><source>ShikigamiConfig</source><translation>活动</translation></message>
 	<message><source>Limit Time</source><translation>限制运行时间</translation></message>
 	<message><source>Limit Time</source><translation>限制运行时间</translation></message>
 	<message><source>Limit Count</source><translation>限制挑战次数</translation></message>
 	<message><source>Limit Count</source><translation>限制挑战次数</translation></message>
-	<message><source>limit_time_help</source><translation>单位秒</translation></message>
-	<message><source>limit_count_help</source><translation>两个限制需要同时设置,最先达到就会退出</translation></message>
+	<message><source>limit_time_help</source><translation>时间格式:"[hours]:[minutes]:[seconds]"
+注意没有空格,使用英文的冒号 : 不按照格式输入会无法正确设置</translation></message>
+	<message><source>limit_count_help</source><translation>两个限制需要同时设置,最先达到就会退出。
+建议执行时间设置成一个小时足够长,此时基于次数来判定设置为100次</translation></message>
+	<message><source>GeneralClimb</source><translation>通用爬塔</translation></message>
+	<message><source>Ap Game Max</source><translation>活动每日使用体力挑战的最大次数</translation></message>
+	<message><source>ap_game_max_help</source><translation>保持默认300即可</translation></message>
+	<message><source>ApMode</source><translation>挂体力模式</translation></message>
+	<message><source>ap_mode_help</source><translation>设置是挂活动的次数(ap_activity)还是游戏的体力(ap_game)</translation></message>
+	<message><source>Activity Toggle</source><translation>挂完活动次数后切换到体力模式</translation></message>
+	<message><source>Buy Ap Activity</source><translation>游戏体力不足是否需要话勾玉购买</translation></message>
+	<message><source>buy_ap_activity_help</source><translation>该设置只有是设定为活动次数时有效</translation></message>
+	<message><source>activity_toggle_help</source><translation>该设置只有是设定为活动次数时有效</translation></message>
 </context>
 </context>
+<context>
+    <name>Args</name>
+	<message><source>InviteConfig</source><translation>邀请</translation></message>
+	<message><source>InviteNumber</source><translation>邀请人数</translation></message>
+	<message><source>Friend 1</source><translation>第一个队友名字</translation></message>
+	<message><source>Friend 2</source><translation>第二个队友名字</translation></message>
+	<message><source>FindMode</source><translation>寻找队友模式</translation></message>
+	<message><source>Wait Time</source><translation>等待时间</translation></message>
+	<message><source>invite_number_help</source><translation>可选1或者2,为1时只会邀请第一个队友</translation></message>
+	<message><source>friend_name_help</source><translation>输入队友的名字必须是全称,这一项是基于OCR来识别,如果名字过于离谱建议画200勾玉改一个正常点的名字</translation></message>
+	<message><source>friend_2_name_help</source><translation>同上</translation></message>
+	<message><source>find_mode_help</source><translation>默认会从上方列表自动寻找
+顺序是'好友' -> '最近' -> '聊友' -> '跨区',当然建议选择‘recent_friend’这样会快点</translation></message>
+	<message><source>wait_time_help</source><translation>保持默认一分钟就好,期间每隔20s邀请一次</translation></message>
+	<message><source>Default Invite</source><translation>战斗结束后勾选默认邀请</translation></message>
+	<message><source>default_invite_help</source><translation> </translation></message>
+</context>
+<context>
+    <name>Args</name>
+	<message><source>OrochiConfig</source><translation>副本</translation></message>
+	<message><source>UserStatus</source><translation>身份</translation></message>
+	<message><source>Layer</source><translation>挑战层数</translation></message>
+	<message><source>Soul Buff Enable</source><translation>开启御魂加成</translation></message>
+	<message><source>user_status_help</source><translation>可选队长、队员、单独刷(野队还不打算实现)</translation></message>
+	<message><source>layer_help</source><translation> </translation></message>
+	<message><source>soul_buff_enable_help</source><translation>会在庭院开始的时候设置加成</translation></message>
+</context>	
 </TS>
 </TS>

+ 16 - 1
module/config/utils.py

@@ -6,7 +6,7 @@ import json
 import yaml
 import yaml
 
 
 from filelock import FileLock
 from filelock import FileLock
-from datetime import datetime, timedelta, timezone
+from datetime import datetime, timedelta, timezone, time
 
 
 from module.config.atomicwrites import atomic_write
 from module.config.atomicwrites import atomic_write
 
 
@@ -242,3 +242,18 @@ def dict_to_kv(dictionary, allow_none=True):
     """
     """
     return ', '.join([f'{k}={repr(v)}' for k, v in dictionary.items() if allow_none or v is not None])
     return ', '.join([f'{k}={repr(v)}' for k, v in dictionary.items() if allow_none or v is not None])
 
 
+
+def parse_tomorrow_server(server_update: time) -> datetime:
+    """
+    获取明天的日期,给这个日期加上server_update的时间,返回datetime
+    :param server_update:
+    :return:
+    """
+    if isinstance(server_update, str):
+        server_update = time.fromisoformat(server_update)
+    now = datetime.now()
+    tomorrow = now + timedelta(days=1)
+    return datetime.combine(tomorrow, server_update)
+
+if __name__ == '__main__':
+    print(parse_tomorrow_server("09:01:00"))

+ 8 - 1
module/device/control.py

@@ -167,9 +167,16 @@ class Control(Minitouch, Adb, Scrcpy, Window):
         else:
         else:
             # ADB needs to be slow, or swipe doesn't work
             # ADB needs to be slow, or swipe doesn't work
             duration *= 2.5
             duration *= 2.5
-            logger.info('Swipe %s -> %s, %s' % (point2str(*p1), point2str(*p2), duration))
+            logger.info('Swipe %s -> %s, %s ' % (point2str(*p1), point2str(*p2), duration))
 
 
         if distance_check:
         if distance_check:
+            if p1[0] == p2[0]:
+                logger.info('Swipe x distance is 0')
+                p1[0] += 1
+            if p1[1] == p2[1]:
+                logger.info('Swipe y distance is 0')
+                p1[1] += 1
+
             if np.linalg.norm(np.subtract(p1, p2)) < 10:
             if np.linalg.norm(np.subtract(p1, p2)) < 10:
                 # Should swipe a certain distance, otherwise AL will treat it as click.
                 # Should swipe a certain distance, otherwise AL will treat it as click.
                 # uiautomator2 should >= 6px, minitouch should >= 5px
                 # uiautomator2 should >= 6px, minitouch should >= 5px

+ 13 - 3
module/device/handle.py

@@ -295,14 +295,24 @@ class Handle:
         return None
         return None
 
 
     @cached_property
     @cached_property
-    def screenshot_size(self) -> tuple:
+    def screenshot_size(self) -> tuple or None:
         """
         """
         第一个是width 第二个是heigth
         第一个是width 第二个是heigth
+        2023.7.1 在高缩放的设备上应该输出1280X720
         :return:
         :return:
         """
         """
         winRect = GetWindowRect(self.screenshot_handle_num)
         winRect = GetWindowRect(self.screenshot_handle_num)
-        width: int = winRect[2] - winRect[0]  # 右x-左x
-        height: int = winRect[3] - winRect[1]  # 下y - 上y 计算高度
+        scale_rate = window_scale_rate()
+        width_before: int = winRect[2] - winRect[0]  # 右x-左x
+        height_before: int = winRect[3] - winRect[1]  # 下y - 上y 计算高度
+        width, height = None, None
+        if abs((width_before * scale_rate) - 1280) < 5:
+            width = 1280
+        if abs((height_before * scale_rate) - 720) < 5:
+            height = 720
+        if width is None or height is None:
+            logger.error(f'Get screenshot size error, width={width}, height={height}')
+            return None
         return width, height
         return width, height
 
 
     @cached_property
     @cached_property

+ 1 - 1
module/device/method/minitouch.py

@@ -75,7 +75,7 @@ def insert_swipe(p0, p3, speed=15, min_distance=10):
     prev = (-100, -100)
     prev = (-100, -100)
     for t in ts:
     for t in ts:
         point = p0 * (1 - t) ** 3 + 3 * p1 * t * (1 - t) ** 2 + 3 * p2 * t ** 2 * (1 - t) + p3 * t ** 3
         point = p0 * (1 - t) ** 3 + 3 * p1 * t * (1 - t) ** 2 + 3 * p2 * t ** 2 * (1 - t) + p3 * t ** 3
-        point = point.astype(np.int).tolist()
+        point = point.astype(int).tolist()
         if np.linalg.norm(np.subtract(point, prev)) < min_distance:
         if np.linalg.norm(np.subtract(point, prev)) < min_distance:
             continue
             continue
 
 

+ 12 - 7
module/device/method/window.py

@@ -38,10 +38,7 @@ class Window(Handle):
         后台截屏
         后台截屏
         :return:
         :return:
         """
         """
-        win_size = self.screenshot_size
-        scale_rate = window_scale_rate()
-        widthScreen = int(win_size[0] * scale_rate)
-        heightScreen = int(win_size[1] * scale_rate)
+        widthScreen, heightScreen = self.screenshot_size
         # 返回句柄窗口的设备环境,覆盖整个窗口,包括非客户区,标题栏,菜单,边框
         # 返回句柄窗口的设备环境,覆盖整个窗口,包括非客户区,标题栏,菜单,边框
         hwndDc = GetWindowDC(self.screenshot_handle_num)
         hwndDc = GetWindowDC(self.screenshot_handle_num)
         # 创建设备描述表
         # 创建设备描述表
@@ -148,6 +145,7 @@ class Window(Handle):
         emulator_type = len(self.control_handle_list)
         emulator_type = len(self.control_handle_list)
         if emulator_type == 2:  # mumu模拟器
         if emulator_type == 2:  # mumu模拟器
             SendMessage(self.control_handle_list[0], WM_ACTIVATE, WA_ACTIVE, 0)  # 激活窗口
             SendMessage(self.control_handle_list[0], WM_ACTIVATE, WA_ACTIVE, 0)  # 激活窗口
+            SendMessage(self.control_handle_list[1], WM_ACTIVATE, WA_ACTIVE, 0)  # 激活窗口
             SendMessage(self.control_handle_list[0], WM_LBUTTONDOWN, 0, MAKELONG(x, y+self.mumu_head_height))  # 模拟鼠标按下 先是父窗口 上面的框高度是57
             SendMessage(self.control_handle_list[0], WM_LBUTTONDOWN, 0, MAKELONG(x, y+self.mumu_head_height))  # 模拟鼠标按下 先是父窗口 上面的框高度是57
             time.sleep((random.randint(100, 200)) / 1000.0)  # 点击弹起改为随机,时间100ms-200ms
             time.sleep((random.randint(100, 200)) / 1000.0)  # 点击弹起改为随机,时间100ms-200ms
             SendMessage(self.control_handle_list[1], WM_LBUTTONUP, 0, MAKELONG(x, y))  # 模拟鼠标弹起 后是子窗口
             SendMessage(self.control_handle_list[1], WM_LBUTTONUP, 0, MAKELONG(x, y))  # 模拟鼠标弹起 后是子窗口
@@ -234,13 +232,20 @@ class Window(Handle):
         SendMessage(handleNum, WM_SETCURSOR, handleNum, MAKELONG(HTCLIENT, WM_LBUTTONDOWN))
         SendMessage(handleNum, WM_SETCURSOR, handleNum, MAKELONG(HTCLIENT, WM_LBUTTONDOWN))
         PostMessage(handleNum, WM_LBUTTONDOWN, MK_LBUTTON, tmpPos)
         PostMessage(handleNum, WM_LBUTTONDOWN, MK_LBUTTON, tmpPos)
         # 一点一点移动鼠标
         # 一点一点移动鼠标
-        for pos in trace:
+        for pos in trace[:-3]:
             tmpPos = MAKELONG(pos[0], pos[1])
             tmpPos = MAKELONG(pos[0], pos[1])
             PostMessage(handleNum, WM_MOUSEMOVE, MK_LBUTTON, tmpPos)
             PostMessage(handleNum, WM_MOUSEMOVE, MK_LBUTTON, tmpPos)
             time.sleep((interval + random.randint(-2, 2)) / 1000.0)
             time.sleep((interval + random.randint(-2, 2)) / 1000.0)
         # 最后释放鼠标
         # 最后释放鼠标
-        tmpPos = MAKELONG(trace[-1][0], trace[-1][1])
-        PostMessage(handleNum, WM_LBUTTONUP, 0, tmpPos)
+        end_pos_3 = MAKELONG(trace[-3][0], trace[-3][1])
+        end_pos_2 = MAKELONG(trace[-2][0], trace[-2][1])
+        end_pos_1 = MAKELONG(trace[-1][0], trace[-1][1])
+        PostMessage(handleNum, WM_MOUSEMOVE, MK_LBUTTON, end_pos_3)
+        time.sleep(0.08)
+        PostMessage(handleNum, WM_MOUSEMOVE, MK_LBUTTON, end_pos_2)
+        time.sleep(0.08)
+        PostMessage(handleNum, WM_MOUSEMOVE, MK_LBUTTON, end_pos_1)
+        PostMessage(handleNum, WM_LBUTTONUP, 0, end_pos_1)
 
 
     def swipe_vector_window_message2(self, startPos: list, endPos: list) -> None:
     def swipe_vector_window_message2(self, startPos: list, endPos: list) -> None:
         """
         """

+ 1 - 1
module/ocr/base_ocr.py

@@ -195,7 +195,7 @@ class BaseCor:
         if keyword is None:
         if keyword is None:
             keyword = self.keyword
             keyword = self.keyword
         if keyword in concatenated_string:
         if keyword in concatenated_string:
-            result = [index for index, _ in enumerate(strings)]
+            result = [index for index, word in enumerate(strings) if keyword in word]
         else:
         else:
             result = None
             result = None
 
 

+ 14 - 9
module/ocr/models.py

@@ -16,12 +16,17 @@ if __name__ == "__main__":
     model = OCR_MODEL.ch
     model = OCR_MODEL.ch
     import cv2
     import cv2
     import time
     import time
-    image = cv2.imread(r"D:\ocr_test_5.png")
-
-    for i in range(10):
-        start_time = time.time()
-        result = model.detect_and_ocr(image)
-        print(result)
-        end_time = time.time()
-        print(f'耗时:{end_time-start_time}')
-
+    from memory_profiler import profile
+    image = cv2.imread(r"E:\Project\OnmyojiAutoScript-assets\jade.png")
+
+    # 引入ocr 会导致非常巨大的内存开销
+    @profile
+    def test_memory():
+        for i in range(10):
+            start_time = time.time()
+            result = model.detect_and_ocr(image)
+            print(result)
+            end_time = time.time()
+            print(f'耗时:{end_time-start_time}')
+
+    test_memory()

+ 10 - 9
module/ocr/sub_ocr.py

@@ -37,6 +37,7 @@ class Full(BaseCor):
             return 0, 0, 0, 0
             return 0, 0, 0, 0
 
 
         index_list = self.filter(boxed_results, keyword)
         index_list = self.filter(boxed_results, keyword)
+        logger.info(f"OCR [{self.name}] detected in {index_list}")
         # 如果一个都没有匹配到
         # 如果一个都没有匹配到
         if not index_list:
         if not index_list:
             return 0, 0, 0, 0
             return 0, 0, 0, 0
@@ -49,13 +50,13 @@ class Full(BaseCor):
                 boxed_results[index].box[1, 0] - boxed_results[index].box[0, 0],     # width
                 boxed_results[index].box[1, 0] - boxed_results[index].box[0, 0],     # width
                 boxed_results[index].box[2, 1] - boxed_results[index].box[0, 1],     # height
                 boxed_results[index].box[2, 1] - boxed_results[index].box[0, 1],     # height
             ) for index in index_list]
             ) for index in index_list]
-            box = merge_area(area_list)
-            self.area = box[0]+self.roi[0], box[1]+self.roi[1], box[2], box[3]
+            area = merge_area(area_list)
+            self.area = area[0]+self.roi[0], area[1]+self.roi[1], area[2], area[3]
         else:
         else:
             box = boxed_results[index_list[0]].box
             box = boxed_results[index_list[0]].box
             self.area = box[0, 0]+self.roi[0], box[0, 1]+self.roi[1], box[1, 0] - box[0, 0], box[2, 1] - box[0, 1]
             self.area = box[0, 0]+self.roi[0], box[0, 1]+self.roi[1], box[1, 0] - box[0, 0], box[2, 1] - box[0, 1]
 
 
-        logger.info(f"OCR [{self.name}: {keyword}] detected in {self.area}")
+        logger.info(f"OCR [{self.name}] detected in {self.area}")
         return self.area
         return self.area
 
 
 class Single(BaseCor):
 class Single(BaseCor):
@@ -69,7 +70,7 @@ class Single(BaseCor):
         """
         """
         检测某个固定位置的roi的文本。可以是横方向也可以是竖方向
         检测某个固定位置的roi的文本。可以是横方向也可以是竖方向
         :param image:
         :param image:
-        :return:
+        :return: 返回到识别的文字
         """
         """
         if self.roi:
         if self.roi:
             result = self.ocr_single_line(image)
             result = self.ocr_single_line(image)
@@ -79,6 +80,9 @@ class Single(BaseCor):
             # 如果没有识别到,这个时候考虑到可能是竖方向的文本, 使用detect_and_ocr来进行识别
             # 如果没有识别到,这个时候考虑到可能是竖方向的文本, 使用detect_and_ocr来进行识别
             logger.info(f"OCR {self.name}: No text detected in ROI, try to detect vertically")
             logger.info(f"OCR {self.name}: No text detected in ROI, try to detect vertically")
             result = self.detect_and_ocr(image)
             result = self.detect_and_ocr(image)
+            if not result:
+                logger.info(f"OCR {self.name}: No text detected in ROI")
+                return ""
             if result[0].ocr_text != "" and result[0].score > self.score:
             if result[0].ocr_text != "" and result[0].score > self.score:
                 return result[0].ocr_text
                 return result[0].ocr_text
 
 
@@ -184,9 +188,6 @@ class Duration(Single):
 
 
 
 
 if __name__ == '__main__':
 if __name__ == '__main__':
-    d = DigitCounter.ocr_str_digit_counter('14/77')
-    print(d)
-
-    u = Duration.parse_time('01:30:00')
-    print(u)
+    import cv2
+    image = cv2.imread(r'E:\Project\OnmyojiAutoScript-assets\jade.png')
 
 

+ 3 - 3
script.py

@@ -423,7 +423,7 @@ class Script:
             if success:
             if success:
                 del_cached_property(self, 'config')
                 del_cached_property(self, 'config')
                 continue
                 continue
-            elif self.config.error.handle.error:
+            elif self.config.script.error.handle_error:
                 # self.config.task_delay(success=False)
                 # self.config.task_delay(success=False)
                 del_cached_property(self, 'config')
                 del_cached_property(self, 'config')
                 self.checker.check_now()
                 self.checker.check_now()
@@ -444,5 +444,5 @@ class Script:
 if __name__ == "__main__":
 if __name__ == "__main__":
     script = Script("oas1")
     script = Script("oas1")
     # print(script.get_next_task())
     # print(script.get_next_task())
-    script.run("ActivityShikigami")
-    # script.run('RealmRaid')
+    # script.run("ActivityShikigami")
+    script.run('RealmRaid')

BIN
tasks/ActivityShikigami/as/as_add_max.png


BIN
tasks/ActivityShikigami/as/as_ap.png


BIN
tasks/ActivityShikigami/as/as_ap_activity.png


BIN
tasks/ActivityShikigami/as/as_buy_jade.png


BIN
tasks/ActivityShikigami/as/as_new.png


BIN
tasks/ActivityShikigami/as/as_switch.png


+ 54 - 0
tasks/ActivityShikigami/as/image.json

@@ -61,5 +61,59 @@
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "点击战斗"
     "description": "点击战斗"
+  },
+  {
+    "itemName": "ap",
+    "imageName": "as_ap.png",
+    "roiFront": "1126,510,27,37",
+    "roiBack": "1126,510,27,37",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "体力按钮"
+  },
+  {
+    "itemName": "ap_activity",
+    "imageName": "as_ap_activity.png",
+    "roiFront": "1125,516,27,27",
+    "roiBack": "1125,516,27,27",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "活动体力"
+  },
+  {
+    "itemName": "switch",
+    "imageName": "as_switch.png",
+    "roiFront": "1207,514,33,30",
+    "roiBack": "1207,514,33,30",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "切换按键"
+  },
+  {
+    "itemName": "buy_jade",
+    "imageName": "as_buy_jade.png",
+    "roiFront": "836,619,38,42",
+    "roiBack": "789,614,143,52",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "购买活动的体力"
+  },
+  {
+    "itemName": "add_max",
+    "imageName": "as_add_max.png",
+    "roiFront": "974,524,57,54",
+    "roiBack": "974,524,57,54",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "增加到最大"
+  },
+  {
+    "itemName": "new",
+    "imageName": "as_new.png",
+    "roiFront": "0,0,100,100",
+    "roiBack": "0,0,100,100",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
   }
   }
 ]
 ]

+ 21 - 3
tasks/ActivityShikigami/as/ocr.json

@@ -1,11 +1,29 @@
 [
 [
   {
   {
-    "itemName": "number",
-    "roiFront": "1180,678,86,30",
+    "itemName": "remain_ap",
+    "roiFront": "1180,678,82,30",
     "roiBack": "1180,678,86,30",
     "roiBack": "1180,678,86,30",
     "mode": "DigitCounter",
     "mode": "DigitCounter",
     "method": "Default",
     "method": "Default",
     "keyword": "",
     "keyword": "",
-    "description": "Ocr-description"
+    "description": "体力的数量检测"
+  },
+  {
+    "itemName": "remain_ap_activity",
+    "roiFront": "722,23,87,34",
+    "roiBack": "722,23,96,34",
+    "mode": "DigitCounter",
+    "method": "Default",
+    "keyword": "",
+    "description": "活动体力的剩余检测"
+  },
+  {
+    "itemName": "remain_buy",
+    "roiFront": "808,531,39,42",
+    "roiBack": "808,531,39,42",
+    "mode": "DigitCounter",
+    "method": "Default",
+    "keyword": "",
+    "description": "还有多少次购买体力的机会"
   }
   }
 ]
 ]

+ 18 - 2
tasks/ActivityShikigami/assets.py

@@ -25,10 +25,26 @@ class ActivityShikigamiAssets:
 	I_UNLOCK = RuleImage(roi_front=(796,653,27,35), roi_back=(796,653,27,35), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_unlock.png")
 	I_UNLOCK = RuleImage(roi_front=(796,653,27,35), roi_back=(796,653,27,35), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_unlock.png")
 	# 点击战斗 
 	# 点击战斗 
 	I_FIRE = RuleImage(roi_front=(1140,585,75,73), roi_back=(1140,585,75,73), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_fire.png")
 	I_FIRE = RuleImage(roi_front=(1140,585,75,73), roi_back=(1140,585,75,73), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_fire.png")
+	# 体力按钮 
+	I_AP = RuleImage(roi_front=(1126,510,27,37), roi_back=(1126,510,27,37), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_ap.png")
+	# 活动体力 
+	I_AP_ACTIVITY = RuleImage(roi_front=(1125,516,27,27), roi_back=(1125,516,27,27), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_ap_activity.png")
+	# 切换按键 
+	I_SWITCH = RuleImage(roi_front=(1207,514,33,30), roi_back=(1207,514,33,30), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_switch.png")
+	# 购买活动的体力 
+	I_BUY_JADE = RuleImage(roi_front=(836,619,38,42), roi_back=(789,614,143,52), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_buy_jade.png")
+	# 增加到最大 
+	I_ADD_MAX = RuleImage(roi_front=(974,524,57,54), roi_back=(974,524,57,54), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_add_max.png")
+	# description 
+	I_NEW = RuleImage(roi_front=(0,0,100,100), roi_back=(0,0,100,100), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_new.png")
 
 
 
 
 	# Ocr Rule Assets
 	# Ocr Rule Assets
-	# Ocr-description 
-	O_NUMBER = RuleOcr(roi=(1180,678,86,30), area=(1180,678,86,30), mode="DigitCounter", method="Default", keyword="", name="number")
+	# 体力的数量检测 
+	O_REMAIN_AP = RuleOcr(roi=(1180,678,82,30), area=(1180,678,86,30), mode="DigitCounter", method="Default", keyword="", name="remain_ap")
+	# 活动体力的剩余检测 
+	O_REMAIN_AP_ACTIVITY = RuleOcr(roi=(722,23,87,34), area=(722,23,96,34), mode="DigitCounter", method="Default", keyword="", name="remain_ap_activity")
+	# 还有多少次购买体力的机会 
+	O_REMAIN_BUY = RuleOcr(roi=(808,531,39,42), area=(808,531,39,42), mode="DigitCounter", method="Default", keyword="", name="remain_buy")
 
 
 
 

+ 3 - 1
tasks/ActivityShikigami/config.py

@@ -7,6 +7,7 @@ from pydantic import BaseModel, Field
 from tasks.Component.GeneralBattle.config_general_battle import GeneralBattleConfig
 from tasks.Component.GeneralBattle.config_general_battle import GeneralBattleConfig
 from tasks.Component.config_scheduler import Scheduler
 from tasks.Component.config_scheduler import Scheduler
 from tasks.Component.config_base import ConfigBase, TimeDelta
 from tasks.Component.config_base import ConfigBase, TimeDelta
+from tasks.Component.BaseActivity.config_activity import GeneralClimb
 
 
 class ShikigamiConfig(BaseModel):
 class ShikigamiConfig(BaseModel):
     limit_time: timedelta = Field(default=timedelta(hours=0, minutes=30, seconds=0), description='limit_time_help')
     limit_time: timedelta = Field(default=timedelta(hours=0, minutes=30, seconds=0), description='limit_time_help')
@@ -15,7 +16,8 @@ class ShikigamiConfig(BaseModel):
 
 
 class ActivityShikigami(ConfigBase):
 class ActivityShikigami(ConfigBase):
     scheduler: Scheduler = Field(default_factory=Scheduler)
     scheduler: Scheduler = Field(default_factory=Scheduler)
-    shikigami: ShikigamiConfig = Field(default_factory=ShikigamiConfig)
+    # shikigami: ShikigamiConfig = Field(default_factory=ShikigamiConfig)
+    general_climb: GeneralClimb = Field(default_factory=GeneralClimb)
     general_battle: GeneralBattleConfig = Field(default_factory=GeneralBattleConfig)
     general_battle: GeneralBattleConfig = Field(default_factory=GeneralBattleConfig)
 
 
 
 

+ 70 - 5
tasks/ActivityShikigami/script_task.py

@@ -8,6 +8,7 @@ from tasks.base_task import BaseTask
 from tasks.Component.GeneralBattle.general_battle import GeneralBattle
 from tasks.Component.GeneralBattle.general_battle import GeneralBattle
 from tasks.AreaBoss.assets import AreaBossAssets
 from tasks.AreaBoss.assets import AreaBossAssets
 from tasks.Component.BaseActivity.base_activity import BaseActivity
 from tasks.Component.BaseActivity.base_activity import BaseActivity
+from tasks.Component.BaseActivity.config_activity import ApMode
 from tasks.ActivityShikigami.assets import ActivityShikigamiAssets
 from tasks.ActivityShikigami.assets import ActivityShikigamiAssets
 from module.logger import logger
 from module.logger import logger
 from module.exception import TaskEnd
 from module.exception import TaskEnd
@@ -18,10 +19,12 @@ class ScriptTask(BaseActivity, ActivityShikigamiAssets):
     def run(self) -> None:
     def run(self) -> None:
 
 
         config = self.config.activity_shikigami
         config = self.config.activity_shikigami
-        self.limit_time: timedelta = config.shikigami.limit_time
-        self.limit_count = config.shikigami.limit_count
+        self.limit_time: timedelta = config.general_climb.limit_time
+        self.limit_count = config.general_climb.limit_count
 
 
         self.home_main()
         self.home_main()
+
+        # 设定是否锁定阵容
         self.wait_until_appear(self.I_BACK_GREEN)
         self.wait_until_appear(self.I_BACK_GREEN)
         if config.general_battle.lock_team_enable:
         if config.general_battle.lock_team_enable:
             logger.info("Lock team")
             logger.info("Lock team")
@@ -40,19 +43,39 @@ class ScriptTask(BaseActivity, ActivityShikigamiAssets):
                 if self.appear(self.I_UNLOCK):
                 if self.appear(self.I_UNLOCK):
                     break
                     break
 
 
+        # 选择是游戏的体力还是活动的体力
+        current_ap = config.general_climb.ap_mode
+        self.switch(current_ap)
 
 
-
-
+        # 流程应该是 在页面处:
+        # 1. 判定计数是否超了,时间是否超了
+        # 2. 如果是消耗活动体力,判定活动体力是否足够 如果是消耗一般的体力,判定一般体力是否足够
+        # 3. 如果开启买体力,就买体力
+        # 4. 如果开启了切换到游戏体力,就切换
         while 1:
         while 1:
+            # 1
             if self.limit_time is not None and self.limit_time + self.start_time < datetime.now():
             if self.limit_time is not None and self.limit_time + self.start_time < datetime.now():
                 logger.info("Time out")
                 logger.info("Time out")
                 break
                 break
             if self.current_count >= self.limit_count:
             if self.current_count >= self.limit_count:
                 logger.info("Count out")
                 logger.info("Count out")
                 break
                 break
+            # 2
+            self.wait_until_appear(self.I_FIRE)
+            is_remain = self.check_ap_remain(current_ap)
+            # 如果没有剩余了且这个时候是体力,就退出活动
+            if not is_remain and current_ap == ApMode.AP_GAME:
+                logger.info("Game ap out")
+                break
+            # 如果不是那就切换到体力
+            elif not is_remain and current_ap == ApMode.AP_ACTIVITY:
+                logger.info("Activity ap out and switch to game ap")
+                current_ap = ApMode.AP_GAME
+                self.switch(current_ap)
+
 
 
             # 点击战斗
             # 点击战斗
-            self.wait_until_appear(self.I_FIRE)
+
             logger.info("Click battle")
             logger.info("Click battle")
             while 1:
             while 1:
                 self.screenshot()
                 self.screenshot()
@@ -100,3 +123,45 @@ class ScriptTask(BaseActivity, ActivityShikigamiAssets):
             if self.appear(self.I_SHI):
             if self.appear(self.I_SHI):
                 break
                 break
 
 
+    def check_ap_remain(self, current_ap: ApMode) -> bool:
+        """
+        检查体力是否足够
+        :return: 如何还有体力,返回True,否则返回False
+        """
+        self.screenshot()
+        if current_ap == ApMode.AP_ACTIVITY:
+            cu, res, total = self.O_REMAIN_AP_ACTIVITY.ocr(image=self.device.image)
+            if cu == 0 and cu + res == total:
+                logger.warning("Activity ap not enough")
+                return False
+            return True
+
+        elif current_ap == ApMode.AP_GAME:
+            cu, res, total = self.O_REMAIN_AP.ocr(image=self.device.image)
+            if cu == total and cu + res == total:
+                logger.warning("Game ap not enough")
+                return False
+            return True
+
+    def switch(self, current_ap: ApMode) -> None:
+        """
+        切换体力
+        :param current_ap:
+        :return:
+        """
+        if current_ap == ApMode.AP_ACTIVITY:
+            logger.info("Select activity ap")
+            while 1:
+                self.screenshot()
+                if self.appear(self.I_AP_ACTIVITY):
+                    break
+                if self.appear(self.I_AP, interval=1):
+                    self.appear_then_click(self.I_SWITCH, interval=2)  # 点击切换
+        else:
+            logger.info("Select game ap")
+            while 1:
+                self.screenshot()
+                if self.appear(self.I_AP):
+                    break
+                if self.appear(self.I_AP_ACTIVITY, interval=1):
+                    self.appear_then_click(self.I_SWITCH, interval=2)

+ 23 - 18
tasks/AreaBoss/script_task.py

@@ -5,12 +5,14 @@ import time
 
 
 from tasks.base_task import BaseTask
 from tasks.base_task import BaseTask
 from tasks.Component.GeneralBattle.general_battle import GeneralBattle
 from tasks.Component.GeneralBattle.general_battle import GeneralBattle
+from tasks.GameUi.game_ui import GameUi
+from tasks.GameUi.page import page_area_boss
 from tasks.AreaBoss.assets import AreaBossAssets
 from tasks.AreaBoss.assets import AreaBossAssets
 from module.logger import logger
 from module.logger import logger
 from module.exception import TaskEnd
 from module.exception import TaskEnd
 
 
 
 
-class ScriptTask(GeneralBattle, AreaBossAssets):
+class ScriptTask(GeneralBattle, GameUi, AreaBossAssets):
 
 
     def run(self) -> bool:
     def run(self) -> bool:
         """
         """
@@ -20,23 +22,26 @@ class ScriptTask(GeneralBattle, AreaBossAssets):
         # 直接手动关闭这个锁定阵容的设置
         # 直接手动关闭这个锁定阵容的设置
         self.config.area_boss.general_battle.lock_team_enable = False
         self.config.area_boss.general_battle.lock_team_enable = False
 
 
-        # 点击探索
-        logger.info("Click explore")
-        while 1:
-            self.screenshot()
-            if self.appear_then_click(self.I_EXPLORE, threshold=0.6, interval=2):
-                continue
-            if self.appear(self.I_AREA_BOSS, threshold=0.6):
-                break
-
-        # 点击地狱鬼王
-        logger.info("Click area boss")
-        while 1:
-            self.screenshot()
-            if self.appear_then_click(self.I_AREA_BOSS, threshold=0.6, interval=2):
-                continue
-            if self.appear(self.I_FILTER, threshold=0.6):
-                break
+        self.ui_get_current_page()
+        self.ui_goto(page_area_boss)
+
+        # # 点击探索
+        # logger.info("Click explore")
+        # while 1:
+        #     self.screenshot()
+        #     if self.appear_then_click(self.I_EXPLORE, threshold=0.6, interval=2):
+        #         continue
+        #     if self.appear(self.I_AREA_BOSS, threshold=0.6):
+        #         break
+        #
+        # # 点击地狱鬼王
+        # logger.info("Click area boss")
+        # while 1:
+        #     self.screenshot()
+        #     if self.appear_then_click(self.I_AREA_BOSS, threshold=0.6, interval=2):
+        #         continue
+        #     if self.appear(self.I_FILTER, threshold=0.6):
+        #         break
 
 
         # 点击右上角的鬼王选择
         # 点击右上角的鬼王选择
         logger.info("Click filter")
         logger.info("Click filter")

+ 30 - 0
tasks/Component/BaseActivity/config_activity.py

@@ -0,0 +1,30 @@
+# This Python file uses the following encoding: utf-8
+# @author runhey
+# github https://github.com/runhey
+from datetime import time, timedelta
+from pydantic import BaseModel, Field
+from enum import Enum
+
+from tasks.Component.config_base import ConfigBase, TimeDelta
+
+class ApMode(str, Enum):
+    AP_ACTIVITY = 'ap_activity'
+    AP_GAME = 'ap_game'
+
+
+class GeneralClimb(ConfigBase):
+    # 限制执行的时间
+    limit_time: TimeDelta = Field(default=TimeDelta(hours=1), description='limit_time_help')
+    # 限制执行的次数
+    limit_count: int = Field(default=50, description='limit_count_help')
+    # 每日使用体力挑战的最大次数,默认是300
+    ap_game_max: int = Field(default=300, description='ap_game_max_help')
+    # 爬塔活动挂活动的体力还是游戏的体力
+    ap_mode: ApMode = Field(default=ApMode.AP_ACTIVITY, description='ap_mode_help')
+    # 游戏体力不足是否需要话勾玉购买
+    # buy_ap_activity: bool = Field(default=False, description='buy_ap_activity_help')  # 该功能已经废弃
+    # 如果挂完的活动的体力,是不是需要挂游戏的体力
+    # 在我的设计理念中:活动体力>游戏体力。所以不提供从300挂满然后才到挂活动币
+    activity_toggle: bool = Field(default=False, description='activity_toggle_help')
+
+

BIN
tasks/Component/GeneralBattle/GeneralBattle_greed_ghost.png


BIN
tasks/Component/GeneralBattle/GeneralBattle_win.png


+ 23 - 18
tasks/Component/GeneralBattle/assets.py

@@ -51,41 +51,46 @@ class GeneralBattleAssets:
 
 
 	# Image Rule Assets
 	# Image Rule Assets
 	# 奖励,就是那个魂 
 	# 奖励,就是那个魂 
-	I_REWARD = RuleImage(roi_front=(547,518,172,96), roi_back=(547,518,172,96), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/res_reward.png")
+	I_REWARD = RuleImage(roi_front=(547,518,172,96), roi_back=(547,518,172,96), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/gb/gb_reward.png")
 	# 预设的小图标 
 	# 预设的小图标 
-	I_PRESET = RuleImage(roi_front=(32,650,47,45), roi_back=(32,650,47,45), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/res_preset.png")
+	I_PRESET = RuleImage(roi_front=(32,650,47,45), roi_back=(32,650,47,45), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/gb/gb_preset.png")
 	# 准备 
 	# 准备 
-	I_PREPARE_HIGHLIGHT = RuleImage(roi_front=(1128,536,100,100), roi_back=(1128,536,100,100), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/res_prepare_highlight.png")
+	I_PREPARE_HIGHLIGHT = RuleImage(roi_front=(1128,536,100,100), roi_back=(1128,536,100,100), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/gb/gb_prepare_highlight.png")
 	# 战斗胜利 
 	# 战斗胜利 
-	I_WIN = RuleImage(roi_front=(427,135,100,100), roi_back=(427,135,100,100), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/res_win.png")
+	I_WIN = RuleImage(roi_front=(425,141,100,100), roi_back=(296,41,414,216), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/gb/gb_win.png")
 	# 准备但是界面还未加载这个时候是黑色的 
 	# 准备但是界面还未加载这个时候是黑色的 
-	I_PREPARE_DARK = RuleImage(roi_front=(1131,538,100,100), roi_back=(1131,538,100,100), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/res_prepare_dark.png")
+	I_PREPARE_DARK = RuleImage(roi_front=(1131,538,100,100), roi_back=(1131,538,100,100), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/gb/gb_prepare_dark.png")
 	# 失败 
 	# 失败 
-	I_FALSE = RuleImage(roi_front=(413,124,100,100), roi_back=(413,124,100,100), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/res_false.png")
+	I_FALSE = RuleImage(roi_front=(413,124,100,100), roi_back=(413,124,100,100), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/gb/gb_false.png")
 	# 确认预设的队伍 
 	# 确认预设的队伍 
-	I_PRESET_ENSURE = RuleImage(roi_front=(354,641,141,50), roi_back=(354,641,141,50), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/res_preset_ensure.png")
+	I_PRESET_ENSURE = RuleImage(roi_front=(354,641,141,50), roi_back=(354,641,141,50), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/gb/gb_preset_ensure.png")
 	# 选择buff 
 	# 选择buff 
-	I_BUFF = RuleImage(roi_front=(113,653,44,62), roi_back=(113,653,44,62), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/res_buff.png")
+	I_BUFF = RuleImage(roi_front=(113,653,44,62), roi_back=(113,653,44,62), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/gb/gb_buff.png")
 	# 觉醒加成 
 	# 觉醒加成 
-	I_BUFF_AWAKEN = RuleImage(roi_front=(373,126,383,53), roi_back=(373,126,383,53), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/res_buff_awaken.png")
+	I_BUFF_AWAKEN = RuleImage(roi_front=(373,126,383,53), roi_back=(373,126,383,53), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/gb/gb_buff_awaken.png")
 	# 御魂加成 
 	# 御魂加成 
-	I_BUFF_SOUL = RuleImage(roi_front=(377,192,371,56), roi_back=(377,192,371,56), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/res_buff_soul.png")
+	I_BUFF_SOUL = RuleImage(roi_front=(377,192,371,56), roi_back=(377,192,371,56), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/gb/gb_buff_soul.png")
 	# 金币加成50 
 	# 金币加成50 
-	I_BUFF_GOLD_50 = RuleImage(roi_front=(375,259,373,56), roi_back=(375,259,373,56), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/res_buff_gold_50.png")
+	I_BUFF_GOLD_50 = RuleImage(roi_front=(375,259,373,56), roi_back=(375,259,373,56), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/gb/gb_buff_gold_50.png")
 	# 金币加成100 
 	# 金币加成100 
-	I_BUFF_GOLD_100 = RuleImage(roi_front=(371,329,389,54), roi_back=(371,329,389,54), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/res_buff_gold_100.png")
+	I_BUFF_GOLD_100 = RuleImage(roi_front=(371,329,389,54), roi_back=(371,329,389,54), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/gb/gb_buff_gold_100.png")
 	# 经验加成50 
 	# 经验加成50 
-	I_BUFF_EXP_50 = RuleImage(roi_front=(378,400,370,50), roi_back=(378,400,370,50), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/res_buff_exp_50.png")
+	I_BUFF_EXP_50 = RuleImage(roi_front=(378,400,370,50), roi_back=(378,400,370,50), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/gb/gb_buff_exp_50.png")
 	# 经验加成100 
 	# 经验加成100 
-	I_BUFF_EXP_100 = RuleImage(roi_front=(372,463,386,50), roi_back=(372,463,386,50), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/res_buff_exp_100.png")
+	I_BUFF_EXP_100 = RuleImage(roi_front=(372,463,386,50), roi_back=(372,463,386,50), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/gb/gb_buff_exp_100.png")
 	# 左下角的位置指针 
 	# 左下角的位置指针 
-	I_LOCAL = RuleImage(roi_front=(25,563,30,34), roi_back=(25,563,30,34), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/res_local.png")
+	I_LOCAL = RuleImage(roi_front=(25,563,30,34), roi_back=(25,563,30,34), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/gb/gb_local.png")
 	# description 
 	# description 
-	I_STATISTICS = RuleImage(roi_front=(61,644,33,28), roi_back=(61,644,33,28), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/res_statistics.png")
+	I_STATISTICS = RuleImage(roi_front=(61,644,33,28), roi_back=(61,644,33,28), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/gb/gb_statistics.png")
 	# 左上角的退出 
 	# 左上角的退出 
-	I_EXIT = RuleImage(roi_front=(14,12,43,41), roi_back=(14,12,43,41), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/res_exit.png")
+	I_EXIT = RuleImage(roi_front=(14,12,43,41), roi_back=(14,12,43,41), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/gb/gb_exit.png")
 	# 退出确认 
 	# 退出确认 
-	I_EXIT_ENSURE = RuleImage(roi_front=(674,388,135,63), roi_back=(674,388,135,63), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/res_exit_ensure.png")
+	I_EXIT_ENSURE = RuleImage(roi_front=(674,388,135,63), roi_back=(674,388,135,63), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/gb/gb_exit_ensure.png")
+
+
+	# Image Rule Assets
+	# description 
+	I_GREED_GHOST = RuleImage(roi_front=(49,29,56,65), roi_back=(49,29,56,65), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/gb/gb_greed_ghost.png")
 
 
 
 
 	# Swipe Rule Assets
 	# Swipe Rule Assets

+ 0 - 0
tasks/Component/GeneralBattle/click.json → tasks/Component/GeneralBattle/gb/click.json


BIN
tasks/Component/GeneralBattle/gb/gb_buff.png


BIN
tasks/Component/GeneralBattle/gb/gb_exit.png


BIN
tasks/Component/GeneralBattle/gb/gb_exit_ensure.png


BIN
tasks/Component/GeneralBattle/gb/gb_false.png


BIN
tasks/Component/GeneralBattle/gb/gb_greed_ghost.png


BIN
tasks/Component/GeneralBattle/gb/gb_local.png


BIN
tasks/Component/GeneralBattle/gb/gb_prepare_dark.png


BIN
tasks/Component/GeneralBattle/gb/gb_prepare_highlight.png


BIN
tasks/Component/GeneralBattle/gb/gb_preset.png


BIN
tasks/Component/GeneralBattle/gb/gb_preset_ensure.png


BIN
tasks/Component/GeneralBattle/gb/gb_reward.png


BIN
tasks/Component/GeneralBattle/gb/gb_statistics.png


BIN
tasks/Component/GeneralBattle/gb/gb_win.png


+ 20 - 20
tasks/Component/GeneralBattle/image.json → tasks/Component/GeneralBattle/gb/image.json

@@ -1,7 +1,7 @@
 [
 [
   {
   {
     "itemName": "reward",
     "itemName": "reward",
-    "imageName": "res_reward.png",
+    "imageName": "gb_reward.png",
     "roiFront": "547,518,172,96",
     "roiFront": "547,518,172,96",
     "roiBack": "547,518,172,96",
     "roiBack": "547,518,172,96",
     "method": "Template matching",
     "method": "Template matching",
@@ -10,7 +10,7 @@
   },
   },
   {
   {
     "itemName": "preset",
     "itemName": "preset",
-    "imageName": "res_preset.png",
+    "imageName": "gb_preset.png",
     "roiFront": "32,650,47,45",
     "roiFront": "32,650,47,45",
     "roiBack": "32,650,47,45",
     "roiBack": "32,650,47,45",
     "method": "Template matching",
     "method": "Template matching",
@@ -19,7 +19,7 @@
   },
   },
   {
   {
     "itemName": "prepare_highlight",
     "itemName": "prepare_highlight",
-    "imageName": "res_prepare_highlight.png",
+    "imageName": "gb_prepare_highlight.png",
     "roiFront": "1128,536,100,100",
     "roiFront": "1128,536,100,100",
     "roiBack": "1128,536,100,100",
     "roiBack": "1128,536,100,100",
     "method": "Template matching",
     "method": "Template matching",
@@ -28,16 +28,16 @@
   },
   },
   {
   {
     "itemName": "win",
     "itemName": "win",
-    "imageName": "res_win.png",
-    "roiFront": "427,135,100,100",
-    "roiBack": "427,135,100,100",
+    "imageName": "gb_win.png",
+    "roiFront": "425,141,100,100",
+    "roiBack": "296,41,414,216",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "战斗胜利"
     "description": "战斗胜利"
   },
   },
   {
   {
     "itemName": "prepare_dark",
     "itemName": "prepare_dark",
-    "imageName": "res_prepare_dark.png",
+    "imageName": "gb_prepare_dark.png",
     "roiFront": "1131,538,100,100",
     "roiFront": "1131,538,100,100",
     "roiBack": "1131,538,100,100",
     "roiBack": "1131,538,100,100",
     "method": "Template matching",
     "method": "Template matching",
@@ -46,7 +46,7 @@
   },
   },
   {
   {
     "itemName": "false",
     "itemName": "false",
-    "imageName": "res_false.png",
+    "imageName": "gb_false.png",
     "roiFront": "413,124,100,100",
     "roiFront": "413,124,100,100",
     "roiBack": "413,124,100,100",
     "roiBack": "413,124,100,100",
     "method": "Template matching",
     "method": "Template matching",
@@ -55,7 +55,7 @@
   },
   },
   {
   {
     "itemName": "preset_ensure",
     "itemName": "preset_ensure",
-    "imageName": "res_preset_ensure.png",
+    "imageName": "gb_preset_ensure.png",
     "roiFront": "354,641,141,50",
     "roiFront": "354,641,141,50",
     "roiBack": "354,641,141,50",
     "roiBack": "354,641,141,50",
     "method": "Template matching",
     "method": "Template matching",
@@ -64,7 +64,7 @@
   },
   },
   {
   {
     "itemName": "buff",
     "itemName": "buff",
-    "imageName": "res_buff.png",
+    "imageName": "gb_buff.png",
     "roiFront": "113,653,44,62",
     "roiFront": "113,653,44,62",
     "roiBack": "113,653,44,62",
     "roiBack": "113,653,44,62",
     "method": "Template matching",
     "method": "Template matching",
@@ -73,7 +73,7 @@
   },
   },
   {
   {
     "itemName": "buff_awaken",
     "itemName": "buff_awaken",
-    "imageName": "res_buff_awaken.png",
+    "imageName": "gb_buff_awaken.png",
     "roiFront": "373,126,383,53",
     "roiFront": "373,126,383,53",
     "roiBack": "373,126,383,53",
     "roiBack": "373,126,383,53",
     "method": "Template matching",
     "method": "Template matching",
@@ -82,7 +82,7 @@
   },
   },
   {
   {
     "itemName": "buff_soul",
     "itemName": "buff_soul",
-    "imageName": "res_buff_soul.png",
+    "imageName": "gb_buff_soul.png",
     "roiFront": "377,192,371,56",
     "roiFront": "377,192,371,56",
     "roiBack": "377,192,371,56",
     "roiBack": "377,192,371,56",
     "method": "Template matching",
     "method": "Template matching",
@@ -91,7 +91,7 @@
   },
   },
   {
   {
     "itemName": "buff_gold_50",
     "itemName": "buff_gold_50",
-    "imageName": "res_buff_gold_50.png",
+    "imageName": "gb_buff_gold_50.png",
     "roiFront": "375,259,373,56",
     "roiFront": "375,259,373,56",
     "roiBack": "375,259,373,56",
     "roiBack": "375,259,373,56",
     "method": "Template matching",
     "method": "Template matching",
@@ -100,7 +100,7 @@
   },
   },
   {
   {
     "itemName": "buff_gold_100",
     "itemName": "buff_gold_100",
-    "imageName": "res_buff_gold_100.png",
+    "imageName": "gb_buff_gold_100.png",
     "roiFront": "371,329,389,54",
     "roiFront": "371,329,389,54",
     "roiBack": "371,329,389,54",
     "roiBack": "371,329,389,54",
     "method": "Template matching",
     "method": "Template matching",
@@ -109,7 +109,7 @@
   },
   },
   {
   {
     "itemName": "buff_exp_50",
     "itemName": "buff_exp_50",
-    "imageName": "res_buff_exp_50.png",
+    "imageName": "gb_buff_exp_50.png",
     "roiFront": "378,400,370,50",
     "roiFront": "378,400,370,50",
     "roiBack": "378,400,370,50",
     "roiBack": "378,400,370,50",
     "method": "Template matching",
     "method": "Template matching",
@@ -118,7 +118,7 @@
   },
   },
   {
   {
     "itemName": "buff_exp_100",
     "itemName": "buff_exp_100",
-    "imageName": "res_buff_exp_100.png",
+    "imageName": "gb_buff_exp_100.png",
     "roiFront": "372,463,386,50",
     "roiFront": "372,463,386,50",
     "roiBack": "372,463,386,50",
     "roiBack": "372,463,386,50",
     "method": "Template matching",
     "method": "Template matching",
@@ -127,7 +127,7 @@
   },
   },
   {
   {
     "itemName": "local",
     "itemName": "local",
-    "imageName": "res_local.png",
+    "imageName": "gb_local.png",
     "roiFront": "25,563,30,34",
     "roiFront": "25,563,30,34",
     "roiBack": "25,563,30,34",
     "roiBack": "25,563,30,34",
     "method": "Template matching",
     "method": "Template matching",
@@ -136,7 +136,7 @@
   },
   },
   {
   {
     "itemName": "statistics",
     "itemName": "statistics",
-    "imageName": "res_statistics.png",
+    "imageName": "gb_statistics.png",
     "roiFront": "61,644,33,28",
     "roiFront": "61,644,33,28",
     "roiBack": "61,644,33,28",
     "roiBack": "61,644,33,28",
     "method": "Template matching",
     "method": "Template matching",
@@ -145,7 +145,7 @@
   },
   },
   {
   {
     "itemName": "exit",
     "itemName": "exit",
-    "imageName": "res_exit.png",
+    "imageName": "gb_exit.png",
     "roiFront": "14,12,43,41",
     "roiFront": "14,12,43,41",
     "roiBack": "14,12,43,41",
     "roiBack": "14,12,43,41",
     "method": "Template matching",
     "method": "Template matching",
@@ -154,7 +154,7 @@
   },
   },
   {
   {
     "itemName": "exit_ensure",
     "itemName": "exit_ensure",
-    "imageName": "res_exit_ensure.png",
+    "imageName": "gb_exit_ensure.png",
     "roiFront": "674,388,135,63",
     "roiFront": "674,388,135,63",
     "roiBack": "674,388,135,63",
     "roiBack": "674,388,135,63",
     "method": "Template matching",
     "method": "Template matching",

+ 11 - 0
tasks/Component/GeneralBattle/gb/img_supplement.json

@@ -0,0 +1,11 @@
+[
+  {
+    "itemName": "greed_ghost",
+    "imageName": "gb_greed_ghost.png",
+    "roiFront": "49,29,56,65",
+    "roiBack": "49,29,56,65",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  }
+]

BIN
tasks/Component/GeneralBattle/gb/res_win.png


+ 0 - 0
tasks/Component/GeneralBattle/swipe.json → tasks/Component/GeneralBattle/gb/swipe.json


+ 51 - 6
tasks/Component/GeneralBattle/general_battle.py

@@ -110,12 +110,24 @@ class GeneralBattle(BaseTask, GeneralBattleAssets):
             logger.info("Green is enable")
             logger.info("Green is enable")
             x, y = None, None
             x, y = None, None
             match config.green_mark:
             match config.green_mark:
-                case GreenMarkType.GREEN_LEFT1: x, y = self.C_GREEN_LEFT_1.coord()
-                case GreenMarkType.GREEN_LEFT2: x, y = self.C_GREEN_LEFT_2.coord()
-                case GreenMarkType.GREEN_LEFT3: x, y = self.C_GREEN_LEFT_3.coord()
-                case GreenMarkType.GREEN_LEFT4: x, y = self.C_GREEN_LEFT_4.coord()
-                case GreenMarkType.GREEN_LEFT5: x, y = self.C_GREEN_LEFT_5.coord()
-                case GreenMarkType.GREEN_MAIN: x, y = self.C_GREEN_MAIN.coord()
+                case GreenMarkType.GREEN_LEFT1:
+                    x, y = self.C_GREEN_LEFT_1.coord()
+                    logger.info("Green left 1")
+                case GreenMarkType.GREEN_LEFT2:
+                    x, y = self.C_GREEN_LEFT_2.coord()
+                    logger.info("Green left 2")
+                case GreenMarkType.GREEN_LEFT3:
+                    x, y = self.C_GREEN_LEFT_3.coord()
+                    logger.info("Green left 3")
+                case GreenMarkType.GREEN_LEFT4:
+                    x, y = self.C_GREEN_LEFT_4.coord()
+                    logger.info("Green left 4")
+                case GreenMarkType.GREEN_LEFT5:
+                    x, y = self.C_GREEN_LEFT_5.coord()
+                    logger.info("Green left 5")
+                case GreenMarkType.GREEN_MAIN:
+                    x, y = self.C_GREEN_MAIN.coord()
+                    logger.info("Green main")
 
 
             # 判断有无坐标的偏移
             # 判断有无坐标的偏移
             self.appear_then_click(self.I_LOCAL)
             self.appear_then_click(self.I_LOCAL)
@@ -245,3 +257,36 @@ class GeneralBattle(BaseTask, GeneralBattleAssets):
         return True
         return True
 
 
 
 
+    def exit_battle(self, skip_first: bool=False) -> bool:
+        """
+        在战斗的时候强制退出战斗
+        :return:
+        """
+        if skip_first:
+            self.screenshot()
+
+        if not self.appear(self.I_EXIT):
+            return False
+
+        # 点击返回
+        logger.info(f"Click {self.I_EXIT.name}")
+        while 1:
+            self.screenshot()
+            if self.appear_then_click(self.I_EXIT, interval=1.5):
+                continue
+            if self.appear(self.I_EXIT_ENSURE):
+                break
+
+        # 点击返回确认
+        while 1:
+            self.screenshot()
+            if self.appear_then_click(self.I_EXIT_ENSURE, interval=1.5):
+                continue
+            if self.appear_then_click(self.I_FALSE, interval=1.5):
+                continue
+            if not self.appear(self.I_EXIT):
+                break
+
+        return True
+
+

+ 46 - 0
tasks/Component/GeneralBuff/assets.py

@@ -0,0 +1,46 @@
+from module.atom.image import RuleImage
+from module.atom.click import RuleClick
+from module.atom.long_click import RuleLongClick
+from module.atom.swipe import RuleSwipe
+from module.atom.ocr import RuleOcr
+from module.atom.list import RuleList
+
+# This file was automatically generated by module/dev_tools/assets_extract.py.
+# Don't modify it manually.
+class GeneralBuffAssets: 
+
+
+	# Image Rule Assets
+	# 庭院左上角的加成 
+	I_BUFF_1 = RuleImage(roi_front=(357,42,45,50), roi_back=(357,42,45,50), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBuff/gb/gb_buff_1.png")
+	# description 
+	I_AWAKE = RuleImage(roi_front=(381,130,35,45), roi_back=(360,107,80,447), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBuff/gb/gb_awake.png")
+	# 御魂加成 
+	I_SOUL = RuleImage(roi_front=(377,203,39,40), roi_back=(361,121,71,388), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBuff/gb/gb_soul.png")
+	# description 
+	I_GOLD_50 = RuleImage(roi_front=(373,269,52,36), roi_back=(367,120,64,391), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBuff/gb/gb_gold_50.png")
+	# description 
+	I_GOLD_100 = RuleImage(roi_front=(378,338,43,39), roi_back=(365,121,74,407), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBuff/gb/gb_gold_100.png")
+	# description 
+	I_EXP_50 = RuleImage(roi_front=(379,406,44,43), roi_back=(365,127,70,393), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBuff/gb/gb_exp_50.png")
+	# description 
+	I_EXP_100 = RuleImage(roi_front=(383,406,30,40), roi_back=(368,126,58,386), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBuff/gb/gb_exp_100.png")
+	# description 
+	I_OPEN_YELLOW = RuleImage(roi_front=(773,143,24,25), roi_back=(766,133,35,366), threshold=0.7, method="Template matching", file="./tasks/Component/GeneralBuff/gb/gb_open_yellow.png")
+	# description 
+	I_CLOSE_RED = RuleImage(roi_front=(772,273,25,29), roi_back=(761,134,41,369), threshold=0.7, method="Template matching", file="./tasks/Component/GeneralBuff/gb/gb_close_red.png")
+	# 用来判定是否点击的那个 
+	I_CLOUD = RuleImage(roi_front=(356,505,65,38), roi_back=(356,505,65,38), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBuff/gb/gb_cloud.png")
+
+
+	# Ocr Rule Assets
+	# Ocr-description 
+	O_GOLD_50 = RuleOcr(roi=(428,120,338,389), area=(0,0,100,100), mode="Full", method="Default", keyword="战斗胜利获得的金币增加50%", name="gold_50")
+	# Ocr-description 
+	O_GOLD_100 = RuleOcr(roi=(425,118,342,397), area=(0,0,100,100), mode="Full", method="Default", keyword="战斗胜利获得的金币增加100%", name="gold_100")
+	# Ocr-description 
+	O_EXP_50 = RuleOcr(roi=(426,119,335,394), area=(0,0,100,100), mode="Full", method="Default", keyword="战斗胜利获得的经验增加50%", name="exp_50")
+	# Ocr-description 
+	O_EXP_100 = RuleOcr(roi=(421,127,342,388), area=(0,0,100,100), mode="Full", method="Default", keyword="战斗胜利获得的经验增加100%", name="exp_100")
+
+

+ 27 - 0
tasks/Component/GeneralBuff/config_buff.py

@@ -0,0 +1,27 @@
+# This Python file uses the following encoding: utf-8
+# @author runhey
+# github https://github.com/runhey
+from enum import Enum
+from datetime import datetime, time
+from pydantic import BaseModel, ValidationError, validator, Field
+
+
+# 这个类是用来 演示的
+
+class BuffConfig(BaseModel):
+    # 是否启动buff
+    buff_enable: bool = Field(default=False, description='buff_enable_help')
+    # 是否点击觉醒Buff
+    buff_awake_click: bool = Field(default=False, description='')
+    # 是否点击御魂buff
+    buff_soul_click: bool = Field(default=False, description='')
+    # 是否点击金币50buff
+    buff_gold_50_click: bool = Field(default=False, description='')
+    # 是否点击金币100buff
+    buff_gold_100_click: bool = Field(default=False, description='')
+    # 是否点击经验50buff
+    buff_exp_50_click: bool = Field(default=False, description='')
+    # 是否点击经验100buff
+    buff_exp_100_click: bool = Field(default=False, description='')
+
+

BIN
tasks/Component/GeneralBuff/gb/gb_awake.png


BIN
tasks/Component/GeneralBuff/gb/gb_buff_1.png


BIN
tasks/Component/GeneralBuff/gb/gb_close_red.png


BIN
tasks/Component/GeneralBuff/gb/gb_cloud.png


BIN
tasks/Component/GeneralBuff/gb/gb_exp_100.png


BIN
tasks/Component/GeneralBuff/gb/gb_exp_50.png


BIN
tasks/Component/GeneralBuff/gb/gb_gold_100.png


BIN
tasks/Component/GeneralBuff/gb/gb_gold_50.png


BIN
tasks/Component/GeneralBuff/gb/gb_open_yellow.png


BIN
tasks/Component/GeneralBuff/gb/gb_soul.png


+ 92 - 0
tasks/Component/GeneralBuff/gb/image.json

@@ -0,0 +1,92 @@
+[
+  {
+    "itemName": "buff_1",
+    "imageName": "gb_buff_1.png",
+    "roiFront": "357,42,45,50",
+    "roiBack": "357,42,45,50",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "庭院左上角的加成"
+  },
+  {
+    "itemName": "awake",
+    "imageName": "gb_awake.png",
+    "roiFront": "381,130,35,45",
+    "roiBack": "360,107,80,447",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "soul",
+    "imageName": "gb_soul.png",
+    "roiFront": "377,203,39,40",
+    "roiBack": "361,121,71,388",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "御魂加成"
+  },
+  {
+    "itemName": "gold_50",
+    "imageName": "gb_gold_50.png",
+    "roiFront": "373,269,52,36",
+    "roiBack": "367,120,64,391",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "gold_100",
+    "imageName": "gb_gold_100.png",
+    "roiFront": "378,338,43,39",
+    "roiBack": "365,121,74,407",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "exp_50",
+    "imageName": "gb_exp_50.png",
+    "roiFront": "379,406,44,43",
+    "roiBack": "365,127,70,393",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "exp_100",
+    "imageName": "gb_exp_100.png",
+    "roiFront": "383,406,30,40",
+    "roiBack": "368,126,58,386",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "open_yellow",
+    "imageName": "gb_open_yellow.png",
+    "roiFront": "773,143,24,25",
+    "roiBack": "766,133,35,366",
+    "method": "Template matching",
+    "threshold": 0.7,
+    "description": "description"
+  },
+  {
+    "itemName": "close_red",
+    "imageName": "gb_close_red.png",
+    "roiFront": "772,273,25,29",
+    "roiBack": "761,134,41,369",
+    "method": "Template matching",
+    "threshold": 0.7,
+    "description": "description"
+  },
+  {
+    "itemName": "cloud",
+    "imageName": "gb_cloud.png",
+    "roiFront": "356,505,65,38",
+    "roiBack": "356,505,65,38",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "用来判定是否点击的那个"
+  }
+]

+ 38 - 0
tasks/Component/GeneralBuff/gb/ocr.json

@@ -0,0 +1,38 @@
+[
+  {
+    "itemName": "gold_50",
+    "roiFront": "428,120,338,389",
+    "roiBack": "0,0,100,100",
+    "mode": "Full",
+    "method": "Default",
+    "keyword": "战斗胜利获得的金币增加50%",
+    "description": "Ocr-description"
+  },
+  {
+    "itemName": "gold_100",
+    "roiFront": "425,118,342,397",
+    "roiBack": "0,0,100,100",
+    "mode": "Full",
+    "method": "Default",
+    "keyword": "战斗胜利获得的金币增加100%",
+    "description": "Ocr-description"
+  },
+  {
+    "itemName": "exp_50",
+    "roiFront": "426,119,335,394",
+    "roiBack": "0,0,100,100",
+    "mode": "Full",
+    "method": "Default",
+    "keyword": "战斗胜利获得的经验增加50%",
+    "description": "Ocr-description"
+  },
+  {
+    "itemName": "exp_100",
+    "roiFront": "421,127,342,388",
+    "roiBack": "0,0,100,100",
+    "mode": "Full",
+    "method": "Default",
+    "keyword": "战斗胜利获得的经验增加100%",
+    "description": "Ocr-description"
+  }
+]

+ 291 - 0
tasks/Component/GeneralBuff/general_buff.py

@@ -0,0 +1,291 @@
+# This Python file uses the following encoding: utf-8
+# @author runhey
+# github https://github.com/runhey
+import time
+
+import cv2
+import numpy as np
+
+from tasks.Component.GeneralBuff.assets import GeneralBuffAssets
+from module.atom.ocr import RuleOcr
+from module.atom.image import RuleImage
+from tasks.base_task import BaseTask
+from module.logger import logger
+
+
+class GeneralBuff(BaseTask, GeneralBuffAssets):
+
+    def open_buff(self):
+        """
+        打开buff的总界面
+        :return:
+        """
+        logger.info('Open buff')
+        while 1:
+            self.screenshot()
+            if self.appear(self.I_CLOUD):
+                break
+            if self.appear_then_click(self.I_BUFF_1, interval=2):
+                continue
+
+    def close_buff(self):
+        """
+        关闭buff的总界面, 但是要确保buff界面已经打开了
+        :return:
+        """
+        logger.info('Close buff')
+        while 1:
+            self.screenshot()
+            if not self.appear(self.I_CLOUD):
+                break
+            if self.appear_then_click(self.I_BUFF_1, interval=2):
+                continue
+
+    @staticmethod
+    def get_area(image: np.array, buff: RuleOcr) -> tuple:
+        """
+        获取要点击的开关buff的区域
+        :param cls:
+        :param image:
+        :param buff:
+        :return:
+        """
+        area = buff.ocr(image)
+        if area == tuple([0, 0, 0, 0]):
+            logger.info('No gold 50 buff')
+            return None
+
+        # 开始的x坐标就是文字的右边
+        start_x = area[0] + area[2] + 10  # 10是文字和开关之间的间隔
+        start_y = area[1] - 10
+        width = 80  # 开关的宽度 80够了
+        height = area[3] + 20
+        return int(start_x), int(start_y), int(width), int(height)
+
+    def set_switch_area(self, area):
+        """
+        设置开关的区域
+        :param area:
+        :return:
+        """
+        self.I_OPEN_YELLOW.roi_back = list(area)  # 动态设置roi
+        self.I_CLOSE_RED.roi_back = list(area)
+
+
+    def gold_50(self, is_open: bool = True):
+        """
+        金币50buff
+        :param is_open: 是否打开
+        :return:
+        """
+        logger.info('Gold 50 buff')
+        self.screenshot()
+        area = self.get_area(self.device.image, self.O_GOLD_50)
+        if not area:
+            logger.warning('No gold 100 buff')
+            return None
+        self.I_OPEN_YELLOW.roi_back = list(area)  # 动态设置roi
+        self.I_CLOSE_RED.roi_back = list(area)
+        if is_open:
+            while 1:
+                self.screenshot()
+                if self.appear(self.I_OPEN_YELLOW):
+                    break
+                if self.appear_then_click(self.I_CLOSE_RED, interval=1):
+                    continue
+        else:
+            while 1:
+                self.screenshot()
+                if self.appear(self.I_CLOSE_RED):
+                    break
+                if self.appear_then_click(self.I_OPEN_YELLOW, interval=1):
+                    continue
+
+    def gold_100(self, is_open: bool = True):
+        """
+        金币100buff
+        :param is_open: 是否打开
+        :return:
+        """
+        logger.info('Gold 100 buff')
+        self.screenshot()
+        area = self.get_area(self.device.image, self.O_GOLD_100)
+        if not area:
+            logger.warning('No gold 100 buff')
+            return None
+        self.I_OPEN_YELLOW.roi_back = list(area)
+        self.I_CLOSE_RED.roi_back = list(area)
+        if is_open:
+            while 1:
+                self.screenshot()
+                if self.appear(self.I_OPEN_YELLOW):
+                    break
+                if self.appear_then_click(self.I_CLOSE_RED, interval=1):
+                    continue
+        else:
+            while 1:
+                self.screenshot()
+                if self.appear(self.I_CLOSE_RED):
+                    break
+                if self.appear_then_click(self.I_OPEN_YELLOW, interval=1):
+                    continue
+
+    def exp_50(self, is_open: bool = True):
+        """
+        经验50buff
+        :param is_open: 是否打开
+        :return:
+        """
+        logger.info('Exp 50 buff')
+        self.screenshot()
+        area = self.get_area(self.device.image, self.O_EXP_50)
+        if not area:
+            logger.warning('No gold 100 buff')
+            return None
+        self.I_OPEN_YELLOW.roi_back = list(area)
+        self.I_CLOSE_RED.roi_back = list(area)
+        if is_open:
+            while 1:
+                self.screenshot()
+                if self.appear(self.I_OPEN_YELLOW):
+                    break
+                if self.appear_then_click(self.I_CLOSE_RED, interval=1):
+                    continue
+        else:
+            while 1:
+                self.screenshot()
+                if self.appear(self.I_CLOSE_RED):
+                    break
+                if self.appear_then_click(self.I_OPEN_YELLOW, interval=1):
+                    continue
+
+    def exp_100(self, is_open: bool = True):
+        """
+        经验100buff
+        :param is_open: 是否打开
+        :return:
+        """
+        logger.info('Exp 100 buff')
+        while 1:
+            self.screenshot()
+            area = self.get_area(self.device.image, self.O_EXP_100)
+            self.set_switch_area(area)
+
+            if not self.appear(self.I_OPEN_YELLOW) and not self.appear(self.I_CLOSE_RED):
+                logger.info('No exp 100 buff')
+                self.device.swipe(p2=(530, 240), p1=(580, 320))
+                time.sleep(1)
+            else:
+                break
+
+        if is_open:
+            while 1:
+                self.screenshot()
+                if self.appear(self.I_OPEN_YELLOW):
+                    break
+                if self.appear_then_click(self.I_CLOSE_RED, interval=1):
+                    continue
+        else:
+            while 1:
+                self.screenshot()
+                if self.appear(self.I_CLOSE_RED):
+                    break
+                if self.appear_then_click(self.I_OPEN_YELLOW, interval=1):
+                    continue
+
+    @staticmethod
+    def get_area_image(image: np.array, target: RuleImage) -> list:
+        """
+        获取觉醒加成或者是御魂加成所要点击的区域
+        因为实在的图片比ocr快
+        :param image:
+        :param target:
+        :return:
+        """
+        if not target.match(image):
+            logger.warning(f'No {target.name} buff')
+            return None
+            # logger.info(f'front area: {target.roi_front}')
+            # logger.info(f'front center: {target.front_center()}')
+        start_x = int(target.front_center()[0] + 364)
+        start_y = int(target.roi_front[1])
+        width = 80
+        height = int(target.roi_front[3])
+        return [start_x, start_y, width, height]
+
+    def awake(self, is_open: bool = True):
+        """
+        觉醒buff
+        :param is_open: 是否打开
+        :return:
+        """
+        logger.info('Awake buff')
+        self.screenshot()
+        area = self.get_area_image(self.device.image, self.I_AWAKE)
+        self.set_switch_area(area)
+        if not area:
+            logger.warning('No awake buff')
+            return None
+        if is_open:
+            while 1:
+                self.screenshot()
+                if self.appear(self.I_OPEN_YELLOW):
+                    break
+                if self.appear_then_click(self.I_CLOSE_RED, interval=1):
+                    continue
+        else:
+            while 1:
+                self.screenshot()
+                if self.appear(self.I_CLOSE_RED):
+                    break
+                if self.appear_then_click(self.I_OPEN_YELLOW, interval=1):
+                    continue
+
+    def soul(self, is_open: bool = True):
+        """
+        御魂buff
+        :param is_open: 是否打开
+        :return:
+        """
+        logger.info('Soul buff')
+        self.screenshot()
+        area = self.get_area_image(self.device.image, self.I_SOUL)
+        self.set_switch_area(area)
+        if not area:
+            logger.warning('No soul buff')
+            return None
+        if is_open:
+            while 1:
+                self.screenshot()
+                if self.appear(self.I_OPEN_YELLOW):
+                    break
+                if self.appear_then_click(self.I_CLOSE_RED, interval=1):
+                    continue
+        else:
+            while 1:
+                self.screenshot()
+                if self.appear(self.I_CLOSE_RED):
+                    break
+                if self.appear_then_click(self.I_OPEN_YELLOW, interval=1):
+                    continue
+
+
+if __name__ == '__main__':
+    from module.config.config import Config
+    from module.device.device import Device
+    c = Config('oas1')
+    d = Device(c)
+    t = GeneralBuff(c, d)
+
+    t.open_buff()
+    t.screenshot()
+
+    t.awake(is_open=True)
+    t.soul(is_open=True)
+    # t.gold_50(is_open=False)
+    # t.gold_100(is_open=False)
+    # t.exp_50(is_open=False)
+    # t.exp_100(is_open=True)
+
+
+

+ 108 - 1
tasks/Component/GeneralInvite/assets.py

@@ -8,5 +8,112 @@ from module.atom.list import RuleList
 # This file was automatically generated by module/dev_tools/assets_extract.py.
 # This file was automatically generated by module/dev_tools/assets_extract.py.
 # Don't modify it manually.
 # Don't modify it manually.
 class GeneralInviteAssets: 
 class GeneralInviteAssets: 
-	pass
+
+
+	# Image Rule Assets
+	# 中间的邀请图片 
+	I_ADD_1 = RuleImage(roi_front=(592,288,114,51), roi_back=(592,288,114,51), threshold=0.9, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_add_1.png")
+	# 最右边的邀请 
+	I_ADD_2 = RuleImage(roi_front=(1039,205,100,100), roi_back=(1039,205,100,100), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_add_2.png")
+	# description 
+	I_FIRE_FAIL = RuleImage(roi_front=(1177,604,81,74), roi_back=(1177,604,81,74), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_fire_fail.png")
+	# description 
+	I_FIRE = RuleImage(roi_front=(1179,602,81,87), roi_back=(1179,602,81,87), 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_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_MATCHING = RuleImage(roi_front=(1200,110,52,114), roi_back=(1200,110,52,114), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_matching.png")
+	# 永生之海挑战(还未有队友的图片) 
+	I_FIRE_FAIL_SEA = RuleImage(roi_front=(1160,585,100,100), roi_back=(1160,585,100,100), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_fire_fail_sea.png")
+	# description 
+	I_FIRE_SEA = RuleImage(roi_front=(1160,586,100,97), roi_back=(1160,586,100,97), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_fire_sea.png")
+	# description 
+	I_LOCK_SEA = RuleImage(roi_front=(781,658,27,28), roi_back=(781,658,27,28), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_lock_sea.png")
+	# 永生之海 没有锁定队伍的图片 
+	I_UNLOCK_SEA = RuleImage(roi_front=(781,656,27,30), roi_back=(781,656,27,30), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_unlock_sea.png")
+	# 五人的队伍的第一个加号 
+	I_ADD_5_1 = RuleImage(roi_front=(370,243,100,100), roi_back=(370,243,100,100), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_add_5_1.png")
+	# description 
+	I_ADD_5_2 = RuleImage(roi_front=(612,263,100,100), roi_back=(612,263,100,100), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_add_5_2.png")
+	# description 
+	I_ADD_5_3 = RuleImage(roi_front=(862,243,100,100), roi_back=(862,243,100,100), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_add_5_3.png")
+	# description 
+	I_ADD_5_4 = RuleImage(roi_front=(1118,228,100,100), roi_back=(1118,228,100,100), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_add_5_4.png")
+	# 游戏服务器获取在线好友时等待的图片 
+	I_LOAD_FRIEND = RuleImage(roi_front=(709,546,134,60), roi_back=(709,546,134,60), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_load_friend.png")
+	# 左上角退出 
+	I_BACK_YELLOW = RuleImage(roi_front=(19,13,58,55), roi_back=(19,13,58,55), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_back_yellow.png")
+	# 点击邀请 
+	I_INVITE_ENSURE = RuleImage(roi_front=(712,544,132,60), roi_back=(712,544,132,60), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_invite_ensure.png")
+	# 判断是否点中好友了 
+	I_SELECTED = RuleImage(roi_front=(895,373,33,32), roi_back=(541,157,407,350), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_selected.png")
+	# 用来判断当前的列表是哪儿的 
+	I_FLAG_1_ON = RuleImage(roi_front=(354,126,62,21), roi_back=(354,126,62,21), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_flag_1_on.png")
+	# description 
+	I_FLAG_1_OFF = RuleImage(roi_front=(353,126,58,22), roi_back=(353,126,58,22), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_flag_1_off.png")
+	# description 
+	I_FLAG_2_ON = RuleImage(roi_front=(465,126,61,24), roi_back=(465,126,61,24), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_flag_2_on.png")
+	# description 
+	I_FLAG_2_OFF = RuleImage(roi_front=(469,127,58,21), roi_back=(469,127,58,21), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_flag_2_off.png")
+	# description 
+	I_FLAG_3_ON = RuleImage(roi_front=(588,126,48,22), roi_back=(588,126,48,22), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_flag_3_on.png")
+	# description 
+	I_FLAG_3_OFF = RuleImage(roi_front=(590,126,41,22), roi_back=(590,126,41,22), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_flag_3_off.png")
+	# description 
+	I_FLAG_4_ON = RuleImage(roi_front=(713,128,34,21), roi_back=(713,128,34,21), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_flag_4_on.png")
+	# description 
+	I_FLAG_4_OFF = RuleImage(roi_front=(703,128,53,21), roi_back=(703,128,53,21), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_flag_4_off.png")
+	# 永生之海添加好友 
+	I_ADD_SEA = RuleImage(roi_front=(836,231,100,100), roi_back=(836,231,100,100), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_add_sea.png")
+	# 队员不接受邀请 
+	I_I_REJECT = RuleImage(roi_front=(12,226,64,61), roi_back=(12,226,64,275), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_i_reject.png")
+	# 队员接受邀请 
+	I_I_ACCEPT = RuleImage(roi_front=(113,225,63,72), roi_back=(113,225,63,280), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_i_accept.png")
+	# 队员默认接受邀请 
+	I_I_ACCEPT_DEFAULT = RuleImage(roi_front=(205,223,61,68), roi_back=(205,223,61,297), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_i_accept_default.png")
+	# 不勾选 默认邀请 
+	I_I_NO_DEFAULT = RuleImage(roi_front=(542,343,36,35), roi_back=(542,343,36,35), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_i_no_default.png")
+	# 勾选 默认邀请 
+	I_I_DEFAULT = RuleImage(roi_front=(541,342,41,39), roi_back=(541,342,41,39), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_i_default.png")
+	# description 
+	I_GI_CANCEL = RuleImage(roi_front=(438,407,171,55), roi_back=(438,407,171,55), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_gi_cancel.png")
+	# 队长邀请 确定 
+	I_GI_SURE = RuleImage(roi_front=(670,402,175,60), roi_back=(670,402,175,60), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_gi_sure.png")
+	# 所有的组队界面都有加成 
+	I_GI_BUFF = RuleImage(roi_front=(794,38,46,42), roi_back=(794,38,46,42), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_gi_buff.png")
+
+
+	# Image Rule Assets
+	# description 
+	I_GI_EMOJI_1 = RuleImage(roi_front=(25,538,50,56), roi_back=(25,538,50,56), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_gi_emoji_1.png")
+	# description 
+	I_GI_EMOJI_2 = RuleImage(roi_front=(21,632,53,64), roi_back=(21,632,53,64), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_gi_emoji_2.png")
+	# 判断是不是在庭院界面 
+	I_GI_HOME = RuleImage(roi_front=(359,44,34,46), roi_back=(359,44,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")
+
+
+	# Ocr Rule Assets
+	# Ocr-description 
+	O_TIME_1 = RuleOcr(roi=(541,12,96,33), area=(541,12,96,33), mode="Single", method="Default", keyword="", name="time_1")
+	# 永生之海判断时间 
+	O_TIME_2 = RuleOcr(roi=(538,70,100,34), area=(538,70,100,34), mode="Single", method="Default", keyword="", name="time_2")
+	# 上方好友列表的左边第一个(一般是好友) 
+	O_F_LIST_1 = RuleOcr(roi=(346,94,98,41), area=(346,94,98,41), mode="Single", method="Default", keyword="", name="f_list_1")
+	# Ocr-description 
+	O_F_LIST_2 = RuleOcr(roi=(463,94,97,43), area=(463,94,97,43), mode="Single", method="Default", keyword="", name="f_list_2")
+	# Ocr-description 
+	O_F_LIST_3 = RuleOcr(roi=(580,87,91,51), area=(580,87,91,51), mode="Single", method="Default", keyword="", name="f_list_3")
+	# Ocr-description 
+	O_F_LIST_4 = RuleOcr(roi=(688,91,74,45), area=(688,91,74,45), mode="Single", method="Default", keyword="", name="f_list_4")
+	# 寻找左侧的好友 
+	O_FRIEND_NAME_1 = RuleOcr(roi=(434,185,189,345), area=(434,185,189,345), mode="Full", method="Default", keyword="", name="friend_name_1")
+	# 寻找右侧的好友 
+	O_FRIEND_NAME_2 = RuleOcr(roi=(729,184,196,346), area=(729,184,196,346), mode="Full", method="Default", keyword="", name="friend_name_2")
+	# Ocr-description 
+	O_ONLINE = RuleOcr(roi=(790,102,124,42), area=(0,0,100,100), mode="Single", method="Default", keyword="", name="online")
+
 
 

+ 26 - 0
tasks/Component/GeneralInvite/config_invite.py

@@ -0,0 +1,26 @@
+# This Python file uses the following encoding: utf-8
+# @author runhey
+# github https://github.com/runhey
+from enum import Enum
+from datetime import datetime, time
+from pydantic import BaseModel, ValidationError, validator, Field
+
+class InviteNumber(str, Enum):
+    ONE = 'one'
+    TWO = 'two'
+
+class FindMode(str, Enum):
+    AUTO_FIND = 'auto_find'
+    RECENT_FRIEND = 'recent_friend'
+
+class InviteConfig(BaseModel):
+
+    invite_number: InviteNumber = Field(default=InviteNumber.ONE, description='invite_number_help')
+    friend_1: str = Field(default='', description='friend_name_help')
+    friend_2: str = Field(default='', description='friend_2_name_help')
+    find_mode: FindMode = Field(default=FindMode.AUTO_FIND, description='find_mode_help')
+    wait_time: time = Field(default=time(minute=1), description='wait_time_help')
+    default_invite: bool = Field(default=True, description='default_invite_help')
+
+    # recent_friend, guild_friend, friend, other_friend
+

+ 652 - 0
tasks/Component/GeneralInvite/general_invite.py

@@ -0,0 +1,652 @@
+# This Python file uses the following encoding: utf-8
+# @author runhey
+# github https://github.com/runhey
+from time import sleep
+import numpy as np
+
+from enum import Enum
+from cached_property import cached_property
+from datetime import timedelta, time
+
+from module.base.timer import Timer
+from tasks.base_task import BaseTask
+from tasks.Component.GeneralInvite.assets import GeneralInviteAssets
+from tasks.Component.GeneralInvite.config_invite import InviteConfig, InviteNumber, FindMode
+from module.logger import logger
+
+
+class FriendList(str, Enum):
+    RECENT_FRIEND = 'recent_friend'
+    GUILD_FRIEND = 'guild_friend'
+    FRIEND = 'friend'
+    OTHER_FRIEND = 'other_friend'
+
+
+class RoomType(str, Enum):
+    # 房间只可以两个人的: 探索
+    NORMAL_2 = 'normal_2'
+    # 房间可以两三个人的: 觉醒、御魂、日轮、石距(石距是单次没有锁定阵容)
+    NORMAL_3 = 'normal_3'
+    # 永生之海不一样
+    ETERNITY_SEA = 'eternity_sea'
+    # 经验妖怪和金币妖怪
+    NORMAL_5 = 'normal_5'
+
+
+class GeneralInvite(BaseTask, GeneralInviteAssets):
+    timer_invite = None
+    timer_wait = None
+    timer_emoji = None  # 等待期间如果没有操作的话,可能会导致长时间无响应报错
+
+    """
+    这个类就三个api
+    1. run_invite
+    2. invite_again
+    3. accept_invite
+    """
+
+    def run_invite(self, config: InviteConfig, is_first: bool = False) -> bool:
+        """
+        队长!!身份。。。在组件界面邀请好友( 如果开启is_first) 等待队员进入开启挑战
+        请注意,返回的时候成功时是进入战斗了!!!
+        如果是失败,那就是没有队友进入,然后会退出房间的界面
+        :param config:
+        :param is_first: 如果是第一次开房间的那就要邀请队员,其他情况等待队员进入
+        :return:
+        """
+        logger.hr('Invite friend', 2)
+        if not self.ensure_enter():
+            logger.warning('Not enter invite page')
+            return False
+        if is_first:
+            _ = self.room_type
+            self.timer_invite = Timer(20)
+            self.timer_invite.start()
+            self.ensure_room_type(config.invite_number)
+            self.invite_friends(config)
+        else:
+            self.timer_invite = None
+            self.timer_emoji = Timer(20)
+            self.timer_emoji.start()
+        wait_second = config.wait_time.second + config.wait_time.minute * 60
+        self.timer_wait = Timer(wait_second)
+        self.timer_wait.start()
+        while 1:
+            self.screenshot()
+            if self.timer_wait.reached():
+                logger.warning('Wait timeout')
+                return False
+            if self.timer_invite and self.timer_invite.reached():
+                logger.info('Invitation is triggered every 20s')
+                self.timer_invite.reset()
+                self.invite_friends(config)
+
+            if self.appear(self.I_MATCHING):
+                logger.warning('Timeout, now is no room')
+                return False
+
+            if self.timer_emoji and self.timer_emoji.reached():
+                self.timer_emoji.reset()
+                self.appear_then_click(self.I_GI_EMOJI_1)
+                self.appear_then_click(self.I_GI_EMOJI_2)
+
+
+            # 如果这个房间最多只容纳两个人(意思是只可以邀请一个人),且已经邀请一个人了,那就开启挑战
+            if self.room_type == RoomType.NORMAL_2 and not self.appear(self.I_ADD_2):
+                logger.info('Start challenge and this room can only invite one friend')
+                while 1:
+                    self.screenshot()
+                    if not self.appear(self.I_FIRE):
+                        break
+                    if self.appear_then_click(self.I_FIRE, interval=1):
+                        continue
+                return True
+            # 如果这个房间最多容纳三个人(意思是可以邀请两个人),且设定邀请一个就开启挑战,那就开启挑战
+            elif self.room_type == RoomType.NORMAL_3 and config.invite_number == InviteNumber.ONE and not self.appear(self.I_ADD_1):
+                logger.info('Start challenge and user only invite one friend')
+                while 1:
+                    self.screenshot()
+                    if not self.appear(self.I_FIRE):
+                        break
+                    if self.appear_then_click(self.I_FIRE, interval=1):
+                        continue
+                return True
+            # 如果这个房间最多容纳三个人(意思是可以邀请两个人),且设定邀请两个就开启挑战,那就开启挑战
+            elif self.room_type == RoomType.NORMAL_3 \
+                    and config.invite_number == InviteNumber.TWO and not self.appear(self.I_ADD_2):
+                logger.info('Start challenge and user invite two friends')
+                while 1:
+                    self.screenshot()
+                    if not self.appear(self.I_FIRE):
+                        break
+                    if self.appear_then_click(self.I_FIRE, interval=1):
+                        continue
+                return True
+            # 如果这个房间是五人的,且设定邀请一个就开启挑战,那就开启挑战
+            elif self.room_type == RoomType.NORMAL_5 \
+                    and config.invite_number == InviteNumber.ONE and not self.appear(self.I_ADD_5_1):
+                logger.info('Start challenge and user only invite one friend')
+                while 1:
+                    self.screenshot()
+                    if not self.appear(self.I_FIRE):
+                        break
+                    if self.appear_then_click(self.I_FIRE, interval=1):
+                        continue
+                return True
+            # 如果这个房间是五人的,且设定邀请两个就开启挑战,那就开启挑战
+            elif self.room_type == RoomType.NORMAL_5 \
+                    and config.invite_number == InviteNumber.TWO and not self.appear(self.I_ADD_5_2):
+                logger.info('Start challenge and user invite two friends')
+                while 1:
+                    self.screenshot()
+                    if not self.appear(self.I_FIRE):
+                        break
+                    if self.appear_then_click(self.I_FIRE, interval=1):
+                        continue
+                return True
+            # 如果是永生之海
+            elif self.room_type == RoomType.ETERNITY_SEA and not self.appear(self.I_ADD_SEA):
+                logger.info('Start challenge and this is lock sea')
+                while 1:
+                    self.screenshot()
+                    if not self.appear(self.I_FIRE_SEA):
+                        break
+                    if self.appear_then_click(self.I_FIRE_SEA, interval=1):
+                        continue
+                return True
+
+    def ensure_enter(self) -> bool:
+        """
+        确认是否进入了组队界面
+        :return:
+        """
+        logger.info('Ensure enter invite page')
+        while 1:
+            self.screenshot()
+            if self.appear(self.I_ADD_2):
+                return True
+            if self.appear(self.I_ADD_5_4):
+                return True
+            if self.appear(self.I_LOCK_SEA):
+                return True
+            if self.appear(self.I_UNLOCK_SEA):
+                return True
+            if self.appear(self.I_MATCHING):
+                return False
+
+    # 判断是否在房间里面
+    def is_in_room(self, is_screenshot: bool = True) -> bool:
+        """
+        判断是否在房间里面
+        :return:
+        """
+        if is_screenshot:
+            self.screenshot()
+        if self.appear(self.I_GI_EMOJI_1):
+            return True
+        if self.appear(self.I_GI_EMOJI_2):
+            return True
+        if self.appear(self.I_MATCHING):
+            return False
+        return False
+
+    def exit_room(self) -> bool:
+        """
+        退出房间
+        :return:
+        """
+        if not self.is_in_room():
+            return False
+        logger.info('Exit room')
+        while 1:
+            self.screenshot()
+            if not self.is_in_room():
+                break
+            if self.appear_then_click(self.I_GI_SURE, interval=0.5):
+                continue
+            if self.appear_then_click(self.I_BACK_YELLOW, interval=0.5):
+                continue
+        return True
+
+
+    @cached_property
+    def room_type(self) -> RoomType:
+        """
+        只需要在队长进入的时候判断一次就可以了,任务后面之间使用
+
+        :return:
+        """
+        self.screenshot()
+        room_type = self.check_room_type(image=self.device.image)
+        logger.info(f'Room type: {room_type}')
+        return room_type
+
+    def check_room_type(self, image: np.array = None, pre_type: RoomType = None) -> RoomType:
+        """
+        检查房间类型
+        :param image:
+        :param pre_type: 可以先指定这个类型,如果不指定,就自动检查
+        :return:
+        """
+
+        def check_3(img) -> bool:
+            appear = False
+            if self.I_ADD_1.match(img) and self.I_ADD_2.match(img):
+                appear = True
+            return appear
+
+        def check_2(img) -> bool:
+            appear = False
+            if not self.I_ADD_1.match(img) and self.I_ADD_2.match(img):
+                appear = True
+            return appear
+
+        def check_5(img) -> bool:
+            appear = False
+            if self.I_ADD_5_1.match(img) and self.I_ADD_5_2.match(img) \
+                    and self.I_ADD_5_3.match(img) and self.I_ADD_5_4.match(img):
+                appear = True
+            return appear
+
+        def check_eternity_sea(img) -> bool:
+            appear = False
+            if self.I_LOCK_SEA.match(img) or self.I_UNLOCK_SEA.match(img):
+                appear = True
+            return appear
+
+        room_type = None
+        if pre_type is not None:
+            match pre_type:
+                case RoomType.NORMAL_2:
+                    room_type = RoomType.NORMAL_2 if check_2(image) else None
+                case RoomType.NORMAL_3:
+                    room_type = RoomType.NORMAL_3 if check_3(image) else None
+                case RoomType.NORMAL_5:
+                    room_type = RoomType.NORMAL_5 if check_5(image) else None
+                case RoomType.ETERNITY_SEA:
+                    room_type = RoomType.ETERNITY_SEA if check_eternity_sea(image) else None
+        if room_type:
+            return room_type
+        if room_type is None and check_2(image):
+            room_type = RoomType.NORMAL_2
+            return room_type
+        if room_type is None and check_3(image):
+            room_type = RoomType.NORMAL_3
+            return room_type
+        if room_type is None and check_5(image):
+            room_type = RoomType.NORMAL_5
+            return room_type
+        if room_type is None and check_eternity_sea(image):
+            room_type = RoomType.ETERNITY_SEA
+            return room_type
+        return room_type
+
+    def ensure_room_type(self, friend_number: int = None) -> bool:
+        """
+        确认设定的邀请人数是否会超出房间的最大
+        :param friend_number: 这个输入的是用户选项中的invite_number
+        :return:  如果超出了,就返回False
+        """
+        if isinstance(friend_number, InviteNumber):
+            if friend_number == InviteNumber.ONE:
+                friend_number = 1
+            elif friend_number == InviteNumber.TWO:
+                friend_number = 2
+
+        if friend_number == 2:
+            if self.room_type == RoomType.NORMAL_2:
+                # 整个房间就可以两个人,还邀请两个 这个是报错的
+                logger.error('Room can only be one people, but invite two people')
+                return False
+            elif self.room_type == RoomType.ETERNITY_SEA:
+                # 永生之海,只能邀请一个人
+                logger.error('Room can only be one people, but invite two people')
+                return False
+            return True
+        return True
+
+    @cached_property
+    def friend_class(self) -> list[str]:
+        return ['好友', '最近', '跨区', '寮友', '蔡友', '路区', '察友', '区']
+
+    def detect_select(self, name: str = None) -> bool:
+        """
+        在当前的页面检测是否有好友, 如果有就选中这个好友
+        :return:
+        """
+        if not name:
+            return False
+
+        self.screenshot()
+        self.O_FRIEND_NAME_1.keyword = name
+        self.O_FRIEND_NAME_2.keyword = name
+        appear_1 = self.ocr_appear_click(self.O_FRIEND_NAME_1, interval=2)
+        appear_2 = self.ocr_appear_click(self.O_FRIEND_NAME_2, interval=2)
+        if not appear_1 and not appear_2:
+            logger.info('Current page no friend')
+            return False
+
+        while appear_1 or appear_2:
+            self.screenshot()
+            if self.appear(self.I_SELECTED):
+                break
+            appear_1 = self.ocr_appear_click(self.O_FRIEND_NAME_1, interval=2)
+            appear_2 = self.ocr_appear_click(self.O_FRIEND_NAME_2, interval=2)
+
+        return True
+
+    def invite_friend(self, name: str = None, find_mode: FindMode = None) -> bool:
+        """
+        邀请好友
+        :param find_mode: 寻找的方式
+        :param name:
+        :return:
+        """
+        logger.info('Click add to invite friend')
+        # 点击+号
+        while 1:
+            self.screenshot()
+            if self.appear(self.I_LOAD_FRIEND):
+                break
+            if self.appear(self.I_INVITE_ENSURE):
+                break
+            if self.appear_then_click(self.I_ADD_2, interval=1):
+                continue
+            if self.appear_then_click(self.I_ADD_5_4, interval=1):
+                continue
+
+        friend_class = []
+        class_ocr = [self.O_F_LIST_1, self.O_F_LIST_2, self.O_F_LIST_3, self.O_F_LIST_4]
+        class_index = 0
+        list_1 = self.O_F_LIST_1.ocr(self.device.image)
+        list_2 = self.O_F_LIST_2.ocr(self.device.image)
+        list_3 = self.O_F_LIST_3.ocr(self.device.image)
+        list_4 = self.O_F_LIST_4.ocr(self.device.image)
+        if list_1 is not None and list_1 != '' and list_1 in self.friend_class:
+            friend_class.append(list_1)
+        if list_2 is not None and list_2 != '' and list_2 in self.friend_class:
+            friend_class.append(list_2)
+        if list_3 is not None and list_3 != '' and list_3 in self.friend_class:
+            friend_class.append(list_3)
+        if list_4 is not None and list_4 != '' and list_4 in self.friend_class:
+            friend_class.append(list_4)
+        for i in range(len(friend_class)):
+            if friend_class[i] == '蔡友':
+                friend_class[i] = '寮友'
+            elif friend_class[i] == '路区':
+                friend_class[i] = '跨区'
+            elif friend_class[i] == '察友':
+                friend_class[i] = '寮友'
+            elif friend_class[i] == '区':
+                friend_class[i] = '跨区'
+        logger.info(f'Friend class: {friend_class}')
+
+        is_select: bool = False  # 是否选中了好友
+        if find_mode == FindMode.RECENT_FRIEND:
+            logger.info('Find recent friend')
+            # 获取’最近‘在friend_class中的index
+            if '最近' not in friend_class:
+                logger.warning('No recent friend')
+                return False
+            recent_index = friend_class.index('最近')
+            while recent_index == 1:
+                self.screenshot()
+                if self.appear(self.I_FLAG_2_ON):
+                    break
+                if self.appear_then_click(self.I_FLAG_2_OFF, interval=1):
+                    continue
+
+            logger.info(f'Now find friend in ”最近“')
+            sleep(1)
+            if not is_select:
+                if self.detect_select(name):
+                    is_select = True
+            sleep(1)
+            if not is_select:
+                if self.detect_select(name):
+                    is_select = True
+
+        for index in range(len(friend_class)):
+            # 如果不是自动寻找,就跳过
+            if find_mode != FindMode.AUTO_FIND:
+                continue
+            # 如果已经选中了好友,就不需要再选中了
+            if is_select:
+                continue
+            # 首先切换到不同的好友列表
+            while index == 0:
+                self.screenshot()
+                if self.appear(self.I_FLAG_1_ON):
+                    break
+                if self.appear_then_click(self.I_FLAG_1_OFF, interval=1):
+                    continue
+            while index == 1:
+                self.screenshot()
+                if self.appear(self.I_FLAG_2_ON):
+                    break
+                if self.appear_then_click(self.I_FLAG_2_OFF, interval=1):
+                    continue
+            while index == 2:
+                self.screenshot()
+                if self.appear(self.I_FLAG_3_ON):
+                    break
+                if self.appear_then_click(self.I_FLAG_3_OFF, interval=1):
+                    continue
+            while index == 3:
+                self.screenshot()
+                if self.appear(self.I_FLAG_4_ON):
+                    break
+                if self.appear_then_click(self.I_FLAG_4_OFF, interval=1):
+                    continue
+
+            # 选中好友, 在这里游戏获取在线的好友并不是很快,根据不同的设备会有不同的时间,而且没有什么元素提供我们来判断
+            # 所以这里就直接等待一段时间
+            logger.info(f'Now find friend in {friend_class[index]}')
+            sleep(1)
+            if not is_select:
+                if self.detect_select(name):
+                    is_select = True
+            sleep(1)
+            if not is_select:
+                if self.detect_select(name):
+                    is_select = True
+
+        # 点击确定
+        logger.info('Click invite ensure')
+        if not self.appear(self.I_INVITE_ENSURE):
+            logger.warning('No appear invite ensure while invite friend')
+        while 1:
+            self.screenshot()
+            if not self.appear(self.I_INVITE_ENSURE):
+                break
+            if self.appear_then_click(self.I_INVITE_ENSURE):
+                continue
+        # 哪怕没有找到好友也有点击 确认 以退出好友列表
+        if not is_select:
+            logger.warning('No find friend')
+            # 这个时候任务运行失败
+            logger.info('Task failed')
+            return False
+
+        return True
+
+    def invite_friends(self, config: InviteConfig) -> bool:
+        """
+        看情况邀请两个好友
+        :return:
+        """
+        success = self.invite_friend(config.friend_1, config.find_mode)
+        if not success:
+            logger.warning('Invite friend 1 failed')
+        # 如果是邀请第二个人
+        if config.invite_number == InviteNumber.TWO:
+            success = self.invite_friend(config.friend_2, config.find_mode)
+            if not success:
+                logger.warning('Invite friend 2 failed')
+        sleep(0.5)
+
+    def invite_again(self, default_invite: bool=True) -> bool:
+        """
+        作为队长战斗胜利后再次邀请队友,
+        :param default_invite:  是否勾选默认
+        :return:
+        """
+        logger.info('Invite again')
+        # 判断是否进入界面
+        while 1:
+            self.screenshot()
+            if self.appear(self.I_GI_SURE):
+                break
+        # 如果勾选了默认邀请
+        if default_invite:
+            logger.info('Click default invite')
+            while 1:
+                self.screenshot()
+                if self.appear(self.I_I_DEFAULT):
+                    break
+                if self.appear_then_click(self.I_I_NO_DEFAULT, interval=1):
+                    continue
+        else:
+            logger.info('Click no default invite')
+            while 1:
+                self.screenshot()
+                if self.appear(self.I_I_NO_DEFAULT):
+                    break
+                if self.appear_then_click(self.I_I_DEFAULT, interval=1):
+                    continue
+
+        # 点击确认
+        logger.info('Click invite ensure')
+        while 1:
+            self.screenshot()
+            if not self.appear(self.I_GI_SURE):
+                break
+            if self.appear_then_click(self.I_GI_SURE):
+                continue
+
+    def check_and_invite(self, default_invite: bool=True) -> bool:
+        """
+        队长战斗后 邀请队友
+        :param default_invite:
+        :return:
+        """
+        if not self.appear(self.I_GI_SURE):
+            return False
+
+        if default_invite:
+            # 有可能是挑战失败的
+            if self.appear(self.I_I_DEFAULT) or self.appear(self.I_I_NO_DEFAULT):
+                logger.info('Click default invite')
+                while 1:
+                    self.screenshot()
+                    if self.appear(self.I_I_DEFAULT):
+                        break
+                    if self.appear_then_click(self.I_I_NO_DEFAULT, interval=1):
+                        continue
+        # 点击确认
+        while 1:
+            self.screenshot()
+            if not self.appear(self.I_GI_SURE):
+                break
+            if self.appear_then_click(self.I_GI_SURE, interval=1):
+                continue
+
+        return True
+
+
+
+
+    def check_then_accept(self) -> bool:
+        """
+        队员接受邀请
+        :return:
+        """
+        if not self.appear(self.I_I_ACCEPT):
+            return False
+        logger.info('Click accept')
+        while 1:
+            self.screenshot()
+            if self.is_in_room():
+                return True
+            if self.appear_then_click(self.I_I_NO_DEFAULT, interval=1):
+                continue
+            if self.appear_then_click(self.I_GI_SURE, interval=1):
+                continue
+            if self.appear_then_click(self.I_I_ACCEPT_DEFAULT, interval=1):
+                continue
+            if self.appear_then_click(self.I_I_ACCEPT, interval=1):
+                continue
+        return True
+
+    def wait_battle(self, wait_time: time) -> bool:
+        """
+        在房间等待,(要求保证在房间里面) 队长开启战斗
+        如果队长跑路了,或者的等待了很久还没开始
+        :return: 如果成功进入战斗(反正就是不在房间 )返回 True
+                 如果失败了,(退出房间)返回 False
+        """
+        self.timer_emoji = Timer(15)
+        self.timer_emoji.start()
+        wait_second = wait_time.second + wait_time.minute * 60
+        self.timer_wait = Timer(wait_second)
+        self.timer_wait.start()
+        logger.info(f'Wait battle {wait_second} seconds')
+        success = True
+        while 1:
+            self.screenshot()
+
+            # 如果自己在探索界面或者是庭院,那就是房间已经被销毁了
+            if self.appear(self.I_GI_HOME) or self.appear(self.I_GI_EXPLORE):
+                logger.warning('Room destroyed')
+                success = False
+                break
+
+
+            if self.timer_wait.reached():
+                logger.warning('Wait battle time out')
+                success = False
+                break
+
+            # 如果队长跑路了,自己变成了队长: 自己也要跑路
+            if self.appear(self.I_FIRE) or self.appear(self.I_FIRE_SEA):
+                logger.warning('Leader run away while wait battle and become leader now')
+                success = False
+                break
+
+            # 判断是否进入战斗
+            if self.is_in_room(is_screenshot=False):
+                if self.timer_emoji.reached():
+                    self.timer_emoji.reset()
+                    self.appear_then_click(self.I_GI_EMOJI_1)
+                    self.appear_then_click(self.I_GI_EMOJI_2)
+            else:
+                break
+
+
+        # 调出循环只有这些可能性:
+        # 1. 进入战斗(ui是战斗)
+        # 2. 队长跑路(自己还是在房间里面)
+        # 3. 等待时间到没有开始(还是在房间里面)
+        # 4. 房间的时间到了被迫提出房间(这个时候来到了探索界面)
+        if not success:
+            logger.info('Leave room')
+            self.exit_room()
+
+        return success
+
+
+
+
+if __name__ == '__main__':
+    from module.config.config import Config
+    from module.device.device import Device
+    import cv2
+
+    c = Config('oas1')
+    d = Device(c)
+    t = GeneralInvite(c, d)
+
+    # t.run_invite(c.orochi.invite_config, is_first=True)
+    t.screenshot()
+    print(t.check_and_invite(True))
+

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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików