瀏覽代碼

feat(Restart): 重启添加庭院事务
-添加庭院事务
-为ui_click方法添加超时时间参数
-添加ui_click_multi_scalef方法

yuyuyuyuyu 9 月之前
父節點
當前提交
13cf430343

+ 2 - 1
assets/i18n/zh-CN.json

@@ -12,7 +12,8 @@
   "costume_carpbanner_1": "无垢莲台",
   "costume_carpbanner_type_help": "多数结界通用",
   "costume_battle_10": "流焰蝶舞",
-  "costume_battle_11": "辰烁奇夜"
+  "costume_battle_11": "辰烁奇夜",
+  "enable_courtyard_affairs": "庭院事务"
 }
 
 

+ 19 - 0
tasks/Restart/assets.py

@@ -10,6 +10,25 @@ from module.atom.list import RuleList
 class RestartAssets: 
 
 
+	# Image Rule Assets
+	# 庭院事务按钮 
+	I_NOTE = RuleImage(roi_front=(782,415,27,31), roi_back=(134,363,968,189), threshold=0.8, method="Template matching", file="./tasks/Restart/courtyard_affairs/courtyard_affairs_note.png")
+	# 庭院事务主页 
+	I_PAGE = RuleImage(roi_front=(264,41,182,51), roi_back=(243,14,260,99), threshold=0.8, method="Template matching", file="./tasks/Restart/courtyard_affairs/courtyard_affairs_page.png")
+	# 一键完成 
+	I_COMPLETE_TASKS = RuleImage(roi_front=(1124,599,75,78), roi_back=(1116,588,93,98), threshold=0.8, method="Template matching", file="./tasks/Restart/courtyard_affairs/courtyard_affairs_complete_tasks.png")
+	# 领取成功 
+	I_SUCCESS_CLAIMED = RuleImage(roi_front=(302,27,184,51), roi_back=(257,10,272,84), threshold=0.8, method="Template matching", file="./tasks/Restart/courtyard_affairs/courtyard_affairs_success_claimed.png")
+	# 日常 
+	I_DAILY = RuleImage(roi_front=(1138,139,63,45), roi_back=(1126,90,125,249), threshold=0.8, method="Template matching", file="./tasks/Restart/courtyard_affairs/courtyard_affairs_daily.png")
+	# 暂无可完成的任务 
+	I_NO_TASKS = RuleImage(roi_front=(538,225,205,32), roi_back=(492,214,291,51), threshold=0.8, method="Template matching", file="./tasks/Restart/courtyard_affairs/courtyard_affairs_no_tasks.png")
+	# description 
+	I_CONFIRM = RuleImage(roi_front=(674,391,131,63), roi_back=(400,199,485,320), threshold=0.8, method="Template matching", file="./tasks/Restart/courtyard_affairs/courtyard_affairs_confirm.png")
+	# description 
+	I_SKIP = RuleImage(roi_front=(1170,36,56,28), roi_back=(1144,0,109,99), threshold=0.8, method="Template matching", file="./tasks/Restart/courtyard_affairs/courtyard_affairs_skip.png")
+
+
 	# Image Rule Assets
 	# 点击勾玉 
 	I_HARVEST_JADE = RuleImage(roi_front=(732,489,34,33), roi_back=(177,451,973,141), threshold=0.8, method="Template matching", file="./tasks/Restart/harvest/harvest_harvest_jade.png")

+ 3 - 1
tasks/Restart/config.py

@@ -12,6 +12,8 @@ from tasks.Component.config_base import ConfigBase, DateTime, MultiLine
 class HarvestConfig(BaseModel):
     # 默认启用
     enable: bool = Field(default=True, description='harvest_enable_help')
+    # 庭院事务
+    enable_courtyard_affairs: bool = Field(default=True)
     # 永久勾玉卡
     enable_jade: bool = Field(default=True)
     # 签到
@@ -40,4 +42,4 @@ class Restart(ConfigBase):
     scheduler: RestartScheduler = Field(default_factory=RestartScheduler)
     tasks_config_reset: TasksReset = Field(default_factory=TasksReset)
     harvest_config: HarvestConfig = Field(default_factory=HarvestConfig)
-    login_character_config: LoginCharacterConfig = Field(default_factory=LoginCharacterConfig)
+    login_character_config: LoginCharacterConfig = Field(default_factory=LoginCharacterConfig)

二進制
tasks/Restart/courtyard_affairs/courtyard_affairs_complete_tasks.png


二進制
tasks/Restart/courtyard_affairs/courtyard_affairs_confirm.png


二進制
tasks/Restart/courtyard_affairs/courtyard_affairs_daily.png


二進制
tasks/Restart/courtyard_affairs/courtyard_affairs_no_tasks.png


二進制
tasks/Restart/courtyard_affairs/courtyard_affairs_note.png


二進制
tasks/Restart/courtyard_affairs/courtyard_affairs_page.png


二進制
tasks/Restart/courtyard_affairs/courtyard_affairs_skip.png


二進制
tasks/Restart/courtyard_affairs/courtyard_affairs_success_claimed.png


+ 74 - 0
tasks/Restart/courtyard_affairs/image.json

@@ -0,0 +1,74 @@
+[
+  {
+    "itemName": "note",
+    "imageName": "courtyard_affairs_note.png",
+    "roiFront": "782,415,27,31",
+    "roiBack": "134,363,968,189",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "庭院事务按钮"
+  },
+  {
+    "itemName": "page",
+    "imageName": "courtyard_affairs_page.png",
+    "roiFront": "264,41,182,51",
+    "roiBack": "243,14,260,99",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "庭院事务主页"
+  },
+  {
+    "itemName": "complete_tasks",
+    "imageName": "courtyard_affairs_complete_tasks.png",
+    "roiFront": "1124,599,75,78",
+    "roiBack": "1116,588,93,98",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "一键完成"
+  },
+  {
+    "itemName": "success_claimed",
+    "imageName": "courtyard_affairs_success_claimed.png",
+    "roiFront": "302,27,184,51",
+    "roiBack": "257,10,272,84",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "领取成功"
+  },
+  {
+    "itemName": "daily",
+    "imageName": "courtyard_affairs_daily.png",
+    "roiFront": "1138,139,63,45",
+    "roiBack": "1126,90,125,249",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "日常"
+  },
+  {
+    "itemName": "no_tasks",
+    "imageName": "courtyard_affairs_no_tasks.png",
+    "roiFront": "538,225,205,32",
+    "roiBack": "492,214,291,51",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "暂无可完成的任务"
+  },
+  {
+    "itemName": "confirm",
+    "imageName": "courtyard_affairs_confirm.png",
+    "roiFront": "674,391,131,63",
+    "roiBack": "400,199,485,320",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "skip",
+    "imageName": "courtyard_affairs_skip.png",
+    "roiFront": "1170,36,56,28",
+    "roiBack": "1144,0,109,99",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  }
+]

+ 29 - 1
tasks/Restart/login.py

@@ -174,6 +174,7 @@ class LoginHandler(BaseTask, RestartAssets, GameUiAssets):
         logger.hr('Harvest')
         timer_harvest = Timer(5)  # 如果连续5秒没有发现任何奖励,退出
         skip_default = False
+        courtyard_affairs_done = False  # 庭院事务只执行一次
         while 1:
             self.screenshot()
 
@@ -215,6 +216,12 @@ class LoginHandler(BaseTask, RestartAssets, GameUiAssets):
                     logger.info('Close zidu')
                 continue
 
+            # 庭院事务
+            if self.config.restart.harvest_config.enable_courtyard_affairs and not courtyard_affairs_done:
+                self.harvest_courtyard_affairs()
+                timer_harvest.reset()
+                courtyard_affairs_done = True
+                continue
             # 勾玉
             if self.appear_then_click(self.I_HARVEST_JADE, interval=1.5):
                 timer_harvest.reset()
@@ -311,4 +318,25 @@ class LoginHandler(BaseTask, RestartAssets, GameUiAssets):
                 continue
         self.ui_click_until_disappear(self.I_LOGIN_RED_CLOSE)
         return True
-
+    
+    def harvest_courtyard_affairs(self) -> bool:
+        if not self.ui_click_multi_scale(self.I_NOTE, self.I_PAGE, timeout=3, scale_range=(0.8, 1.2)):
+            logger.warning('courtyard affairs timeout!')
+            return False
+        while 1:
+            self.screenshot()
+            if self.appear(self.I_NO_TASKS):
+                logger.info('courtyard affairs completed!')
+                return True
+            if self.appear_then_click(self.I_COMPLETE_TASKS, interval=1):
+                continue
+            if self.appear_then_click(self.I_DAILY, interval=1):
+                continue
+            if self.appear_then_click(self.I_CONFIRM): #式神满级,是否提取物经验?确定
+                continue
+            if self.appear_then_click(self.I_SUCCESS_CLAIMED):
+                continue
+            if self.appear_then_click(self.I_SKIP):# 万花牌跳过
+                continue
+            if self.appear_then_click(self.I_LOGIN_RED_CLOSE):# 万花牌X
+                continue

+ 33 - 3
tasks/base_task.py

@@ -727,18 +727,23 @@ class BaseTask(GlobalGameAssets, CostumeBase):
 
         return True
 
-    def ui_click(self, click, stop, interval=1):
+    def ui_click(self, click, stop, interval=1, timeout=None):
         """
         循环的一个操作,直到出现stop
         :param click:
         :param stop:
-        :parm interval
+        :param interval: 点击间隔
+        :param timeout: 超时时间(秒),None表示不超时
         :return:
         """
+        timer = Timer(timeout).start() if timeout else None
         while 1:
             self.screenshot()
             if self.appear(stop):
-                break
+                return True
+            if timer and timer.reached():
+                logger.warning(f'ui_click timeout after {timeout}s')
+                return False
             if isinstance(click, RuleImage) and self.appear_then_click(click, interval=interval):
                 continue
             if isinstance(click, RuleClick) and self.click(click, interval=interval):
@@ -792,6 +797,31 @@ class BaseTask(GlobalGameAssets, CostumeBase):
                 self.click(click)
                 continue
 
+    def ui_click_multi_scale(self, click, stop, interval=1, scale_range=None, timeout=None):
+        """
+        循环的一个操作,直到出现stop(支持多尺度图片识别)
+        :param click:
+        :param stop:
+        :param interval:
+        :param scale_range: 多尺度缩放范围 (start, end, step)
+        :param timeout: 超时时间(秒),None表示不超时
+        :return: True-找到stop条件, False-超时
+        """
+        timer = Timer(timeout).start() if timeout else None
+        while 1:
+            self.screenshot()
+            if self.appear(stop):
+                return True
+            if timer and timer.reached():
+                logger.warning(f'ui_click_multi_scale timeout after {timeout}s')
+                return False
+            if isinstance(click, RuleImage) and self.appear_then_click_multi_scale(click, scale_range=scale_range, interval=interval):
+                continue
+            if isinstance(click, RuleClick) and self.click(click, interval=interval):
+                continue
+            elif isinstance(click, RuleOcr) and self.ocr_appear_click(click, interval=interval):
+                continue
+
     def push_notify(self, content='', title=None, level=3):
         logger.info(f'Push notify: {content}')