runhey 3 лет назад
Родитель
Сommit
8711a481f0

+ 16 - 0
tasks/Delegation/assets.py

@@ -49,3 +49,19 @@ class DelegationAssets:
 	O_D_NAME = RuleOcr(roi=(766,127,509,529), area=(766,127,509,529), mode="Full", method="Default", keyword="弥助的画", name="d_name")
 
 
+	# Image Rule Assets
+	# description 
+	I_REWARDS_DONE = RuleImage(roi_front=(982,303,149,60), roi_back=(982,303,149,60), threshold=0.8, method="Template matching", file="./tasks/Delegation/rewards/rewards_rewards_done.png")
+	# description 
+	I_REWARDS_CHAT = RuleImage(roi_front=(1171,124,48,65), roi_back=(1171,124,48,65), threshold=0.8, method="Template matching", file="./tasks/Delegation/rewards/rewards_rewards_chat.png")
+	# 完美达成 
+	I_REWARDS_GET = RuleImage(roi_front=(444,78,100,100), roi_back=(444,78,100,100), threshold=0.8, method="Template matching", file="./tasks/Delegation/rewards/rewards_rewards_get.png")
+	# description 
+	I_REWARDS_MIN = RuleImage(roi_front=(840,131,44,58), roi_back=(840,131,44,58), threshold=0.8, method="Template matching", file="./tasks/Delegation/rewards/rewards_rewards_min.png")
+
+
+	# Ocr Rule Assets
+	# 完成 
+	O_D_DONE = RuleOcr(roi=(675,129,441,517), area=(675,129,441,517), mode="Full", method="Default", keyword="完成", name="d_done")
+
+

+ 38 - 0
tasks/Delegation/rewards/image.json

@@ -0,0 +1,38 @@
+[
+  {
+    "itemName": "rewards_done",
+    "imageName": "rewards_rewards_done.png",
+    "roiFront": "982,303,149,60",
+    "roiBack": "982,303,149,60",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "rewards_chat",
+    "imageName": "rewards_rewards_chat.png",
+    "roiFront": "1171,124,48,65",
+    "roiBack": "1171,124,48,65",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "rewards_get",
+    "imageName": "rewards_rewards_get.png",
+    "roiFront": "444,78,100,100",
+    "roiBack": "444,78,100,100",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "完美达成"
+  },
+  {
+    "itemName": "rewards_min",
+    "imageName": "rewards_rewards_min.png",
+    "roiFront": "840,131,44,58",
+    "roiBack": "840,131,44,58",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  }
+]

+ 11 - 0
tasks/Delegation/rewards/ocr.json

@@ -0,0 +1,11 @@
+[
+  {
+    "itemName": "d_done",
+    "roiFront": "675,129,441,517",
+    "roiBack": "675,129,441,517",
+    "mode": "Full",
+    "method": "Default",
+    "keyword": "完成",
+    "description": "完成"
+  }
+]

BIN
tasks/Delegation/rewards/rewards_rewards_chat.png


BIN
tasks/Delegation/rewards/rewards_rewards_done.png


BIN
tasks/Delegation/rewards/rewards_rewards_get.png


BIN
tasks/Delegation/rewards/rewards_rewards_min.png


+ 25 - 0
tasks/Delegation/script_task.py

@@ -6,6 +6,7 @@ from datetime import time, datetime, timedelta
 
 from module.logger import logger
 from module.exception import TaskEnd
+from module.base.timer import Timer
 
 from tasks.GameUi.game_ui import GameUi
 from tasks.GameUi.page import page_main, page_delegation
@@ -18,6 +19,7 @@ class ScriptTask(GameUi, DelegationAssets):
     def run(self):
         self.ui_get_current_page()
         self.ui_goto(page_delegation)
+        self.check_reward()
         con: DelegationConfig = self.config.delegation.delegation_config
         if con.miyoshino_painting:
             self.delegate_one('弥助的画')
@@ -76,6 +78,29 @@ class ScriptTask(GameUi, DelegationAssets):
         logger.info(f'Delegation: {name} start')
         self.ui_click_until_disappear(self.I_D_START)
 
+    def check_reward(self):
+        check_timer = Timer(3)
+        check_timer.start()
+        while 1:
+            self.screenshot()
+            if self.appear_then_click(self.I_REWARDS_GET, interval=1):
+                check_timer.reset()
+                continue
+            if self.appear_then_click(self.I_REWARDS_CHAT, interval=1):
+                check_timer.reset()
+                continue
+            if self.appear_then_click(self.I_REWARDS_DONE, interval=1):
+                check_timer.reset()
+                continue
+
+
+            if not self.appear(self.I_REWARDS_MIN):
+                continue
+            if check_timer.reached():
+                break
+            if self.ocr_appear_click(self.O_D_DONE, interval=1):
+                check_timer.reset()
+                continue
 
 
 if __name__ == '__main__':

+ 2 - 2
tasks/GameUi/page/page_img_3.json

@@ -20,8 +20,8 @@
   {
     "itemName": "main_goto_friends",
     "imageName": "page_main_goto_friends.png",
-    "roiFront": "878,623,55,55",
-    "roiBack": "878,623,55,55",
+    "roiFront": "879,623,55,55",
+    "roiBack": "867,606,79,77",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"