ソースを参照

feat(task): add delegation

runhey 3 年 前
親
コミット
4622d68fd9

BIN
module/config/i18n/zh_CN.qm


+ 16 - 0
module/config/i18n/zh_CN.ts

@@ -704,4 +704,20 @@ Refresh:直接刷新,如果刷新操作进入CD,将标记为失败并退
 	<message><source>Greed Maneki</source><translation>贪吃鬼喂食+未升级的御魂奉纳</translation></message>	
 	<message><source>greed_maneki_help</source><translation>建议四星及一下的吃掉,五星的留给贪吃鬼</translation></message>
 </context>
+<context>
+    <name>Args</name>
+	<message><source>DelegationConfig</source><translation>委派</translation></message>	
+	<message><source>Bird Feather</source><translation>鸟之羽</translation></message>	
+	<message><source>bird_feather_help</source><translation>50体力->20片大蛇的逆鳞</translation></message>
+	<message><source>Find Earring</source><translation>寻找耳环</translation></message>	
+	<message><source>find_earring_help</source><translation>300体力->金币28万</translation></message>
+	<message><source>Cat Boss</source><translation>猫老大</translation></message>	
+	<message><source>cat_boss_help</source><translation>300体力->四星白蛋</translation></message>
+	<message><source>Miyoshino</source><translation>接送弥助</translation></message>	
+	<message><source>miyoshino_help</source><translation>100体力->三星结界卡</translation></message>
+	<message><source>Strange Trace</source><translation>奇怪的痕迹</translation></message>	
+	<message><source>strange_trace_help</source><translation>100体力->金币九万八</translation></message>
+	<message><source>Miyoshino Painting</source><translation>弥助的画</translation></message>	
+	<message><source>miyoshino_painting_help</source><translation>300体力->六星变异卡</translation></message>
+</context>
 </TS>

+ 40 - 1
tasks/Delegation/assets.py

@@ -8,5 +8,44 @@ from module.atom.list import RuleList
 # This file was automatically generated by ./dev_tools/assets_extract.py.
 # Don't modify it manually.
 class DelegationAssets: 
-	pass
+
+
+	# Click Rule Assets
+	# description 
+	C_D_1 = RuleClick(roi_front=(162,496,100,166), roi_back=(162,496,100,166), name="d_1")
+	# description 
+	C_D_2 = RuleClick(roi_front=(293,493,100,170), roi_back=(293,493,100,170), name="d_2")
+	# description 
+	C_D_3 = RuleClick(roi_front=(427,492,100,170), roi_back=(427,492,100,170), name="d_3")
+	# description 
+	C_D_4 = RuleClick(roi_front=(563,493,100,174), roi_back=(563,493,100,174), name="d_4")
+	# description 
+	C_D_5 = RuleClick(roi_front=(695,491,100,178), roi_back=(695,491,100,178), name="d_5")
+
+
+	# Image Rule Assets
+	# 委派式神 
+	I_D_CONFIRM = RuleImage(roi_front=(979,302,152,62), roi_back=(979,302,152,62), threshold=0.8, method="Template matching", file="./tasks/Delegation/d/d_d_confirm.png")
+	# 再考虑下 
+	I_D_CANCEL = RuleImage(roi_front=(945,413,130,56), roi_back=(945,413,130,56), threshold=0.8, method="Template matching", file="./tasks/Delegation/d/d_d_cancel.png")
+	# 出发 
+	I_D_START = RuleImage(roi_front=(1101,534,120,129), roi_back=(1101,534,120,129), threshold=0.8, method="Template matching", file="./tasks/Delegation/d/d_d_start.png")
+	# 跳过 
+	I_D_SKIP = RuleImage(roi_front=(661,518,70,39), roi_back=(661,518,70,39), threshold=0.67, method="Template matching", file="./tasks/Delegation/d/d_d_skip.png")
+	# description 
+	I_D_SELECT_1 = RuleImage(roi_front=(230,593,44,41), roi_back=(216,578,71,81), threshold=0.7, method="Template matching", file="./tasks/Delegation/d/d_d_select_1.png")
+	# description 
+	I_D_SELECT_2 = RuleImage(roi_front=(363,595,40,41), roi_back=(327,585,97,60), threshold=0.7, method="Template matching", file="./tasks/Delegation/d/d_d_select_2.png")
+	# description 
+	I_D_SELECT_3 = RuleImage(roi_front=(497,595,38,41), roi_back=(456,584,105,66), threshold=0.7, method="Template matching", file="./tasks/Delegation/d/d_d_select_3.png")
+	# description 
+	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 
+	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")
+
+
+	# Ocr Rule Assets
+	# 委派的名字 
+	O_D_NAME = RuleOcr(roi=(766,127,509,529), area=(766,127,509,529), mode="Full", method="Default", keyword="弥助的画", name="d_name")
+
 

+ 2 - 0
tasks/Delegation/config.py

@@ -7,6 +7,8 @@ from tasks.Component.config_scheduler import Scheduler
 from tasks.Component.config_base import ConfigBase, TimeDelta
 
 class DelegationConfig(ConfigBase):
+    # 弥助的画-300-六星变异卡
+    miyoshino_painting: bool = Field(default=False, description='miyoshino_painting_help')
     # 鸟之羽-50-20片大蛇的逆鳞
     bird_feather: bool = Field(default=False, description='bird_feather_help')
     # 寻找耳环-300-金币28万

+ 32 - 0
tasks/Delegation/d/click.json

@@ -0,0 +1,32 @@
+[
+  {
+    "itemName": "d_1",
+    "roiFront": "162,496,100,166",
+    "roiBack": "162,496,100,166",
+    "description": "description"
+  },
+  {
+    "itemName": "d_2",
+    "roiFront": "293,493,100,170",
+    "roiBack": "293,493,100,170",
+    "description": "description"
+  },
+  {
+    "itemName": "d_3",
+    "roiFront": "427,492,100,170",
+    "roiBack": "427,492,100,170",
+    "description": "description"
+  },
+  {
+    "itemName": "d_4",
+    "roiFront": "563,493,100,174",
+    "roiBack": "563,493,100,174",
+    "description": "description"
+  },
+  {
+    "itemName": "d_5",
+    "roiFront": "695,491,100,178",
+    "roiBack": "695,491,100,178",
+    "description": "description"
+  }
+]

BIN
tasks/Delegation/d/d_d_cancel.png


BIN
tasks/Delegation/d/d_d_confirm.png


BIN
tasks/Delegation/d/d_d_select_1.png


BIN
tasks/Delegation/d/d_d_select_2.png


BIN
tasks/Delegation/d/d_d_select_3.png


BIN
tasks/Delegation/d/d_d_select_4.png


BIN
tasks/Delegation/d/d_d_select_5.png


BIN
tasks/Delegation/d/d_d_skip.png


BIN
tasks/Delegation/d/d_d_start.png


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

@@ -0,0 +1,83 @@
+[
+  {
+    "itemName": "d_confirm",
+    "imageName": "d_d_confirm.png",
+    "roiFront": "979,302,152,62",
+    "roiBack": "979,302,152,62",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "委派式神"
+  },
+  {
+    "itemName": "d_cancel",
+    "imageName": "d_d_cancel.png",
+    "roiFront": "945,413,130,56",
+    "roiBack": "945,413,130,56",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "再考虑下"
+  },
+  {
+    "itemName": "d_start",
+    "imageName": "d_d_start.png",
+    "roiFront": "1101,534,120,129",
+    "roiBack": "1101,534,120,129",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "出发"
+  },
+  {
+    "itemName": "d_skip",
+    "imageName": "d_d_skip.png",
+    "roiFront": "661,518,70,39",
+    "roiBack": "661,518,70,39",
+    "method": "Template matching",
+    "threshold": 0.67,
+    "description": "跳过"
+  },
+  {
+    "itemName": "d_select_1",
+    "imageName": "d_d_select_1.png",
+    "roiFront": "230,593,44,41",
+    "roiBack": "216,578,71,81",
+    "method": "Template matching",
+    "threshold": 0.7,
+    "description": "description"
+  },
+  {
+    "itemName": "d_select_2",
+    "imageName": "d_d_select_2.png",
+    "roiFront": "363,595,40,41",
+    "roiBack": "327,585,97,60",
+    "method": "Template matching",
+    "threshold": 0.7,
+    "description": "description"
+  },
+  {
+    "itemName": "d_select_3",
+    "imageName": "d_d_select_3.png",
+    "roiFront": "497,595,38,41",
+    "roiBack": "456,584,105,66",
+    "method": "Template matching",
+    "threshold": 0.7,
+    "description": "description"
+  },
+  {
+    "itemName": "d_select_4",
+    "imageName": "d_d_select_4.png",
+    "roiFront": "632,595,42,40",
+    "roiBack": "579,584,111,57",
+    "method": "Template matching",
+    "threshold": 0.7,
+    "description": "description"
+  },
+  {
+    "itemName": "d_select_5",
+    "imageName": "d_d_select_5.png",
+    "roiFront": "767,593,41,40",
+    "roiBack": "721,582,103,60",
+    "method": "Template matching",
+    "threshold": 0.7,
+    "description": "description"
+  }
+]

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

@@ -0,0 +1,11 @@
+[
+  {
+    "itemName": "d_name",
+    "roiFront": "766,127,509,529",
+    "roiBack": "766,127,509,529",
+    "mode": "Full",
+    "method": "Default",
+    "keyword": "弥助的画",
+    "description": "委派的名字"
+  }
+]

+ 58 - 2
tasks/Delegation/script_task.py

@@ -9,17 +9,73 @@ from module.exception import TaskEnd
 
 from tasks.GameUi.game_ui import GameUi
 from tasks.GameUi.page import page_main, page_delegation
+from tasks.Delegation.config import DelegationConfig
+from tasks.Delegation.assets import DelegationAssets
 
 
-class ScriptTask(GameUi):
+class ScriptTask(GameUi, DelegationAssets):
 
     def run(self):
         self.ui_get_current_page()
         self.ui_goto(page_delegation)
+        con: DelegationConfig = self.config.delegation.delegation_config
+        if con.miyoshino_painting:
+            self.delegate_one('弥助的画')
+        if con.bird_feather:
+            self.delegate_one('鸟之羽')
+        if con.find_earring:
+            self.delegate_one('寻找耳环')
+        if con.cat_boss:
+            self.delegate_one('猫老大')
+        if con.miyoshino:
+            self.delegate_one('接送弥助')
+        if con.strange_trace:
+            self.delegate_one('奇怪的痕迹')
+
 
         self.set_next_run(task='Delegation', success=True, finish=True)
         raise TaskEnd
 
+    def delegate_one(self, name: str) -> bool:
+        """
+        委派一个任务
+        :param name:
+        :return:
+        """
+        def ui_click(click, stop):
+            while 1:
+                self.screenshot()
+                if self.appear(stop):
+                    break
+                if self.click(click, interval=1.5):
+                    continue
+        logger.hr('Delegation one', 2)
+        self.O_D_NAME.keyword = name
+        self.screenshot()
+        if not self.ocr_appear(self.O_D_NAME):
+            logger.warning(f'Delegation: {name} not found')
+            return False
+        while 1:
+            self.screenshot()
+            if self.appear(self.I_D_START):
+                break
+            if self.appear_then_click(self.I_D_SKIP, interval=0.8):
+                continue
+            if self.appear_then_click(self.I_D_CONFIRM, interval=0.8):
+                continue
+            if self.ocr_appear_click(self.O_D_NAME, interval=1):
+                continue
+        # 进入委派  fefe e  fe
+        logger.info(f'Enter Delegation: {name}')
+        ui_click(self.C_D_1, self.I_D_SELECT_1)
+        ui_click(self.C_D_2, self.I_D_SELECT_2)
+        ui_click(self.C_D_3, self.I_D_SELECT_3)
+        ui_click(self.C_D_4, self.I_D_SELECT_4)
+        ui_click(self.C_D_5, self.I_D_SELECT_5)
+        # 委派开始
+        logger.info(f'Delegation: {name} start')
+        self.ui_click_until_disappear(self.I_D_START)
+
 
 
 if __name__ == '__main__':
@@ -30,7 +86,7 @@ if __name__ == '__main__':
     d = Device(c)
     t = ScriptTask(c, d)
 
-    t.run()
+    t.delegate_one('弥助的画')