Bladeren bron

feat(Hyakkiyakou): #697

Neptine 1 jaar geleden
bovenliggende
commit
ed2577656e

+ 7 - 0
tasks/Hyakkiyakou/config.py

@@ -17,6 +17,10 @@ class ScreenshotMethod(str, Enum):
     WINDOW_BACKGROUND = 'window_background'
     NEMU_IPC = 'nemu_ipc'
 
+class ControlMethod(str, Enum):
+    MINITOUCH = 'minitouch'
+    WINDOW_MESSAGE = 'window_message'
+
 
 class HyakkiyakouConfig(ConfigBase):
     hya_limit_time: Time = Field(default=Time(minute=20), description='hya_limit_time_help')
@@ -59,6 +63,9 @@ class DebugConfig(ConfigBase):
     # 单独的截屏设置
     hya_screenshot_method: ScreenshotMethod = Field(default=ScreenshotMethod.WINDOW_BACKGROUND,
                                                     description='hya_screenshot')
+    # 单独的点击
+    hya_control_method: ControlMethod = Field(default=ControlMethod.WINDOW_MESSAGE,
+                                              description='hya_control_method')
 
     @field_validator('continuous_learning', mode='after')
     @classmethod

+ 1 - 1
tasks/Hyakkiyakou/script_task.py

@@ -224,7 +224,7 @@ class ScriptTask(GameUi, HyaSlave):
             return
         if state[0] <= 0:
             return
-        self.fast_click(x=x, y=y)
+        self.fast_click(x=x, y=y, control_method=self._config.debug_config.hya_control_method)
 
 
 if __name__ == '__main__':

+ 6 - 3
tasks/Hyakkiyakou/slave/hya_device.py

@@ -7,7 +7,7 @@ from module.base.utils import point2str
 from module.exception import RequestHumanTakeover, GameStuckError
 from tasks.base_task import BaseTask
 
-from tasks.Hyakkiyakou.config import ScreenshotMethod
+from tasks.Hyakkiyakou.config import ScreenshotMethod, ControlMethod
 
 def image_black(img) -> bool:
     for y, x in [(0, 0), (719, 1279), (719, 0), (0, 1279)]:
@@ -40,11 +40,14 @@ class HyaDevice(BaseTask):
             raise GameStuckError
         return self.device.image
 
-    def fast_click(self, x: int, y: int) -> None:
+    def fast_click(self, x: int, y: int, control_method: ControlMethod = ControlMethod.WINDOW_MESSAGE) -> None:
         logger.info(
             'Click %s @ %s' % (point2str(x, y), 'Click')
         )
-        self.device.click_window_message(x=x, y=y, fast=True)
+        if control_method == ControlMethod.MINITOUCH:
+            self.device.click_minitouch(x=x, y=y)
+        else:
+            self.device.click_window_message(x=x, y=y, fast=True)
 
     def set_fast_screenshot_interval(self, interval: float):
         """

+ 1 - 1
tasks/Script/config_device.py

@@ -3,7 +3,7 @@
 # github https://github.com/runhey
 from enum import Enum
 from typing import Union
-from pydantic import BaseModel, ValidationError, validator, Field
+from pydantic import BaseModel, ValidationError, Field
 
 from module.logger import logger