ソースを参照

feat(scheduler): auto start or stop game

runhey 3 年 前
親
コミット
5b60eef711

+ 42 - 33
config/template.json

@@ -18,17 +18,25 @@
       "screenshot_interval": 0.3,
       "combat_screenshot_interval": 1.0,
       "task_hoarding_duration": 0,
-      "when_task_queue_empty": "goto_home"
+      "when_task_queue_empty": "goto_main"
     }
   },
   "restart": {
     "scheduler": {
-      "enable": false,
+      "enable": true,
       "next_run": "2023-01-01 00:00:00",
-      "priority": 5,
+      "priority": 0,
       "success_interval": "01 00:00:00",
       "failure_interval": "01 00:00:00",
-      "server_update": "09:00:00"
+      "server_update": "09:05:00"
+    },
+    "harvest_config": {
+      "enable": true,
+      "enable_jade": true,
+      "enable_sign": true,
+      "enable_sign_999": true,
+      "enable_mail": true,
+      "enable_soul": true
     }
   },
   "global_game": {
@@ -54,13 +62,6 @@
       "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
@@ -103,7 +104,7 @@
     "scheduler": {
       "enable": false,
       "next_run": "2023-01-01 00:00:00",
-      "priority": 6,
+      "priority": 5,
       "success_interval": "01 00:00:00",
       "failure_interval": "01 00:00:00",
       "server_update": "09:00:00"
@@ -117,13 +118,6 @@
       "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
@@ -158,13 +152,6 @@
       "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
@@ -231,13 +218,35 @@
       "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
+    }
+  },
+  "bondling_fairyland": {
+    "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"
+    },
+    "bondling_config": {
+      "bondling_mode": "mode_1",
+      "limit_time": "00:30:00",
+      "limit_count": 30,
+      "bondling_stone_enable": false,
+      "bondling_stone_class": "镇墓兽"
+    },
+    "bondling_switch_soul": {
+      "auto_switch_soul": false,
+      "tomb_guard_switch": "-1,-1",
+      "snowball_switch": "-1,-1",
+      "little_kuro_switch": "-1,-1",
+      "azure_basan_switch": "-1,-1"
+    },
+    "battle_config": {
       "green_enable": false,
       "green_mark": "green_left1",
       "random_click_swipt_enable": false

+ 75 - 0
module/config/config.py

@@ -230,6 +230,81 @@ class Config(ConfigState, ConfigManual, ConfigWatcher, ConfigMenu):
             logger.info(f"Task call: {task} (skipped because disabled by user)")
             return False
 
+    def task_delay(self, task: str, start_time: datetime = None,
+                   success: bool=None, server: bool=True, target: timedelta=None) -> None:
+        """
+        设置下次运行时间  当然这个也是可以重写的
+        :param target: 可以自定义的下次运行时间
+        :param server: True
+        :param success: 判断是成功的还是失败的时间间隔
+        :param task: 任务名称,大驼峰的
+        :param finish: 是完成任务后的时间为基准还是开始任务的时间为基准
+        :return:
+        """
+        # 任务预处理
+        if not task:
+            task = self.task.command
+        task = convert_to_underscore(task)
+        task_object = getattr(self.model, task, None)
+        if not task_object:
+            logger.warning(f'No task named {task}')
+            return
+        scheduler = getattr(task_object, 'scheduler', None)
+        if not scheduler:
+            logger.warning(f'No scheduler in {task}')
+            return
+
+        # 任务开始时间
+        if not start_time:
+            start_time = datetime.now().replace(microsecond=0)
+
+        # 依次判断是否有自定义的下次运行时间
+        run = []
+        if success is not None:
+            interval = (
+                scheduler.success_interval
+                if success
+                else scheduler.failure_interval
+            )
+            run.append(start_time + interval)
+        # if server is not None:
+        #     if server:
+        #         server = scheduler.server_update
+        #         run.append(get_server_next_update(server))
+        if target is not None:
+            target = [target] if not isinstance(target, list) else target
+            target = nearest_future(target)
+            run.append(target)
+
+        next_run = None
+        # 排序
+        if not len(run):
+            raise ScriptError(
+                "Missing argument in delay_next_run, should set at least one"
+            )
+
+        run = min(run).replace(microsecond=0)
+        next_run = run
+        # 将这些连接起来,方便日志输出
+        kv = dict_to_kv(
+            {
+                "success": success,
+                "server_update": server,
+                "target": target,
+            },
+            allow_none=False,
+        )
+        logger.info(f"Delay task `{task}` to {next_run} ({kv})")
+
+        # 强制设定下一次的运行时间
+        if server and scheduler.server_update != time(hour=9):
+            next_run = parse_tomorrow_server(scheduler.server_update)
+
+        # 设置
+        logger.attr(f'{task}.scheduler.next_run', next_run)
+        scheduler.next_run = next_run
+        self.save()
+
 if __name__ == '__main__':
     # config = Config(config_name='oas1')
     # print(config.get_next())

+ 1 - 1
module/daemon/benchmark.py

@@ -199,7 +199,7 @@ class Benchmark(DaemonBase):
 
     def run(self):
         try:
-            self.config.override(Emulator_ScreenshotMethod='ADB')
+            self.config.override(script.device.screenshot_method='ADB')
             self.device.uninstall_minicap()
 
         except RequestHumanTakeover:

+ 6 - 6
module/device/connection_attr.py

@@ -88,14 +88,14 @@ class ConnectionAttr:
             raise RequestHumanTakeover
         if self.is_wsa:
             self.serial = '127.0.0.1:58526'
-            if self.config.Emulator_ScreenshotMethod != 'uiautomator2' \
-                    or self.config.Emulator_ControlMethod != 'uiautomator2':
+            if self.config.script.device.screenshot_method != 'uiautomator2' \
+                    or self.config.script.device.control_method != 'uiautomator2':
                 with self.config.multi_set():
-                    self.config.Emulator_ScreenshotMethod = 'uiautomator2'
-                    self.config.Emulator_ControlMethod = 'uiautomator2'
+                    self.config.script.device.screenshot_method = 'uiautomator2'
+                    self.config.script.device.control_method = 'uiautomator2'
         if self.is_over_http:
-            if self.config.Emulator_ScreenshotMethod not in ["ADB", "uiautomator2", "aScreenCap"] \
-                    or self.config.Emulator_ControlMethod not in ["ADB", "uiautomator2", "minitouch"]:
+            if self.config.script.device.screenshot_method not in ["ADB", "uiautomator2", "aScreenCap"] \
+                    or self.config.script.device.control_method not in ["ADB", "uiautomator2", "minitouch"]:
                 logger.warning(
                     f'When connecting to a device over http: {self.serial} '
                     f'ScreenshotMethod can only use ["ADB", "uiautomator2", "aScreenCap"], '

+ 2 - 1
module/device/device.py

@@ -101,7 +101,8 @@ class Device(Screenshot, Control, AppControl, EmulatorManager):
     def release_during_wait(self):
         # Scrcpy server is still sending video stream,
         # stop it during wait
-        if self.config.Emulator_ScreenshotMethod == 'scrcpy':
+        # self.config.script.device.screenshot_method = 'scrcpy'
+        if self.config.script.device.screenshot_method == 'scrcpy':
             self._scrcpy_server_stop()
 
     def stuck_record_add(self, button):

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

@@ -144,7 +144,7 @@ class Window(Handle):
         # print(f"我点击的x:{x}, y:{y}")
         emulator_type = len(self.control_handle_list)
         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
             time.sleep((random.randint(100, 200)) / 1000.0)  # 点击弹起改为随机,时间100ms-200ms

+ 1 - 1
module/device/screenshot.py

@@ -168,7 +168,7 @@ class Screenshot(Adb, DroidCast, Scrcpy, Window):
             raise ScriptError(f'Unknown screenshot interval: {interval}')
         # Screenshot interval in scrcpy is meaningless,
         # video stream is received continuously no matter you use it or not.
-        # if self.config.Emulator_ScreenshotMethod == 'scrcpy':
+        # if self.config.script.device.screenshot_method == 'scrcpy':
         if self.config.script.device.screenshot_method == 'scrcpy':
             interval = 0.1
 

+ 4 - 4
script.py

@@ -282,7 +282,7 @@ class Script:
                     self.run('start')
                 elif method == 'goto_main':
                     logger.info('Goto main page during wait')
-                    self.run('goto_main')
+                    self.run('GotoMain')
                     self.device.release_during_wait()
                     if not self.wait_until(task.next_run):
                         del_cached_property(self, 'config')
@@ -300,10 +300,10 @@ class Script:
     def run(self, command: str) -> bool:
         """
 
-        :param command:
+        :param command:  大写驼峰命名的任务名字
         :return:
         """
-        if command == 'start' and command == 'goto_main':
+        if command == 'start' or command == 'goto_main':
             logger.error(f'Invalid command `{command}`')
 
         try:
@@ -392,7 +392,7 @@ class Script:
             # Skip first restart
             if self.is_first_task and task == 'Restart':
                 logger.info('Skip task `Restart` at scheduler start')
-                self.config.task_delay(server_update=True)
+                self.config.task_delay(task='Restart', finish=True, success=True, server=True)
                 del_cached_property(self, 'config')
                 continue
 

+ 15 - 0
tasks/GotoMain/script_task.py

@@ -0,0 +1,15 @@
+# This Python file uses the following encoding: utf-8
+# @author runhey
+# github https://github.com/runhey
+
+from tasks.GameUi.game_ui import GameUi
+from tasks.GameUi.page import page_main
+from module.exception import TaskEnd
+
+
+class ScriptTask(GameUi):
+
+    def run(self) -> None:
+        self.ui_get_current_page()
+        self.ui_goto(page_main)
+        raise TaskEnd('Goto main end')

+ 1 - 0
tasks/Restart/config_scheduler.py

@@ -9,6 +9,7 @@ from tasks.Component.config_scheduler import Scheduler
 from module.logger import logger
 
 class RestartScheduler(Scheduler):
+    enable: bool = Field(default=True, description='enable_help')
     priority: int = Field(default=0, description='priority_help')
     server_update: time = Field(default=time(hour=9, minute=5, second=0), description='server_update_help')
 

+ 3 - 1
tasks/Restart/login.py

@@ -69,9 +69,11 @@ class LoginHandler(BaseTask, RestartAssets):
             if self.ocr_appear_click(self.O_LOGIN_ENTER_GAME, interval=2.5):
                 continue
 
+        return login_success
+
 
     def app_handle_login(self) -> bool:
-        for _ in range(3):
+        for _ in range(2):
             self.device.stuck_record_clear()
             self.device.click_record_clear()
             try:

+ 1 - 1
tasks/Restart/script_task.py

@@ -21,7 +21,7 @@ class ScriptTask(LoginHandler):
         主要就是登录的模块
         :return:
         """
-        self.app_start()
+        self.app_restart()
         raise TaskEnd('ScriptTask end')
 
 

+ 2 - 63
tasks/base_task.py

@@ -421,72 +421,11 @@ class BaseTask(GlobalGameAssets):
         :param finish: 是完成任务后的时间为基准还是开始任务的时间为基准
         :return:
         """
-
-        # 任务预处理
-        if not task:
-            task = self.config.task.command
-        task = convert_to_underscore(task)
-        task_object = getattr(self.config.model, task, None)
-        if not task_object:
-            logger.warning(f'No task named {task}')
-            return
-        scheduler = getattr(task_object, 'scheduler', None)
-        if not scheduler:
-            logger.warning(f'No scheduler in {task}')
-            return
-
-        # 任务开始时间
         if finish:
-            start_time = datetime.now()
+            start_time = datetime.now().replace(microsecond=0)
         else:
             start_time = self.start_time
-
-        # 依次判断是否有自定义的下次运行时间
-        run = []
-        if success is not None:
-            interval = (
-                scheduler.success_interval
-                if success
-                else scheduler.failure_interval
-            )
-            run.append(start_time + interval)
-        # if server is not None:
-        #     if server:
-        #         server = scheduler.server_update
-        #         run.append(get_server_next_update(server))
-        if target is not None:
-            target = [target] if not isinstance(target, list) else target
-            target = nearest_future(target)
-            run.append(target)
-
-
-        next_run = None
-        # 排序
-        if not len(run):
-            raise ScriptError(
-                "Missing argument in delay_next_run, should set at least one"
-            )
-
-        run = min(run).replace(microsecond=0)
-        next_run = run
-        # 将这些连接起来,方便日志输出
-        kv = dict_to_kv(
-            {
-                "success": success,
-                "server_update": server,
-                "target": target,
-            },
-            allow_none=False,
-        )
-        logger.info(f"Delay task `{task}` to {next_run} ({kv})")
-
-        # 强制设定下一次的运行时间
-        if server and scheduler.server_update != time(hour=9):
-            next_run = parse_tomorrow_server(scheduler.server_update)
-
-        # 设置
-        scheduler.next_run = next_run
-        self.config.save()
+        self.config.task_delay(task, start_time=start_time, success=success, server=server, target=target)
 
     def ui_reward_appear_click(self, screenshot=False) -> bool:
         """