runhey 3 жил өмнө
parent
commit
68d81a91ff

+ 2 - 0
tasks/Delegation/assets.py

@@ -42,6 +42,8 @@ class DelegationAssets:
 	I_D_SELECT_4 = RuleImage(roi_front=(632,595,42,40), roi_back=(579,584,111,57), threshold=0.7, method="Template matching", file="./tasks/Delegation/d/d_d_select_4.png")
 	I_D_SELECT_4 = RuleImage(roi_front=(632,595,42,40), roi_back=(579,584,111,57), threshold=0.7, method="Template matching", file="./tasks/Delegation/d/d_d_select_4.png")
 	# description 
 	# description 
 	I_D_SELECT_5 = RuleImage(roi_front=(767,593,41,40), roi_back=(721,582,103,60), threshold=0.7, method="Template matching", file="./tasks/Delegation/d/d_d_select_5.png")
 	I_D_SELECT_5 = RuleImage(roi_front=(767,593,41,40), roi_back=(721,582,103,60), threshold=0.7, method="Template matching", file="./tasks/Delegation/d/d_d_select_5.png")
+	# 返回 
+	I_D_BACK = RuleImage(roi_front=(940,415,138,51), roi_back=(940,415,138,51), threshold=0.8, method="Template matching", file="./tasks/Delegation/d/d_d_back.png")
 
 
 
 
 	# Ocr Rule Assets
 	# Ocr Rule Assets

BIN
tasks/Delegation/d/d_d_back.png


+ 9 - 0
tasks/Delegation/d/image.json

@@ -79,5 +79,14 @@
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.7,
     "threshold": 0.7,
     "description": "description"
     "description": "description"
+  },
+  {
+    "itemName": "d_back",
+    "imageName": "d_d_back.png",
+    "roiFront": "940,415,138,51",
+    "roiBack": "940,415,138,51",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "返回"
   }
   }
 ]
 ]

+ 6 - 1
tasks/Delegation/script_task.py

@@ -22,7 +22,7 @@ class ScriptTask(GameUi, DelegationAssets):
         self.check_reward()
         self.check_reward()
         con: DelegationConfig = self.config.delegation.delegation_config
         con: DelegationConfig = self.config.delegation.delegation_config
         if con.miyoshino_painting:
         if con.miyoshino_painting:
-            self.delegate_one('弥助')
+            self.delegate_one('弥助画')
         if con.bird_feather:
         if con.bird_feather:
             self.delegate_one('鸟羽')
             self.delegate_one('鸟羽')
         if con.find_earring:
         if con.find_earring:
@@ -61,6 +61,11 @@ class ScriptTask(GameUi, DelegationAssets):
             self.screenshot()
             self.screenshot()
             if self.appear(self.I_D_START):
             if self.appear(self.I_D_START):
                 break
                 break
+            # 如果出现’召回‘ ’返回‘ 说明这个是现在委派中
+            # 需要退出
+            if self.appear(self.I_D_BACK):
+                logger.warning(f'Delegation: {name} is in delegation')
+                return False
             if self.appear_then_click(self.I_D_SKIP, interval=0.8):
             if self.appear_then_click(self.I_D_SKIP, interval=0.8):
                 continue
                 continue
             if self.appear_then_click(self.I_D_CONFIRM, interval=0.8):
             if self.appear_then_click(self.I_D_CONFIRM, interval=0.8):