Explorar o código

feat(task): save daily task[TailsmanPass]

runhey %!s(int64=3) %!d(string=hai) anos
pai
achega
0cd74fb442

+ 20 - 0
tasks/GameUi/additional/daily.json

@@ -0,0 +1,20 @@
+[
+  {
+    "itemName": "click_close_1",
+    "roiFront": "521,659,232,32",
+    "roiBack": "521,659,232,32",
+    "mode": "Single",
+    "method": "Default",
+    "keyword": "点击空白处关闭此界面",
+    "description": "点击空白处关闭此界面"
+  },
+  {
+    "itemName": "click_close_2",
+    "roiFront": "508,584,214,40",
+    "roiBack": "508,584,214,40",
+    "mode": "Single",
+    "method": "Default",
+    "keyword": "点击空白处关闭弹窗",
+    "description": "点击空白处关闭弹窗"
+  }
+]

+ 7 - 0
tasks/GameUi/assets.py

@@ -10,6 +10,13 @@ from module.atom.list import RuleList
 class GameUiAssets: 
 
 
+	# Ocr Rule Assets
+	# 点击空白处关闭此界面 
+	O_CLICK_CLOSE_1 = RuleOcr(roi=(521,659,232,32), area=(521,659,232,32), mode="Single", method="Default", keyword="点击空白处关闭此界面", name="click_close_1")
+	# 点击空白处关闭弹窗 
+	O_CLICK_CLOSE_2 = RuleOcr(roi=(508,584,214,40), area=(508,584,214,40), mode="Single", method="Default", keyword="点击空白处关闭弹窗", name="click_close_2")
+
+
 	# Image Rule Assets
 	# 商店弹窗红色关闭 
 	I_AD_CLOSE_RED = RuleImage(roi_front=(994,128,33,36), roi_back=(994,128,33,36), threshold=0.8, method="Template matching", file="./tasks/GameUi/additional/additional_ad_close_red.png")

+ 1 - 0
tasks/GameUi/page.py

@@ -133,6 +133,7 @@ page_friends.link(button=G.I_BACK_Y, destination=page_main)
 page_main.link(button=G.I_MAIN_GOTO_FRIENDS, destination=page_friends)
 # 花合战 daily
 page_daily = Page(G.I_CHECK_DAILY)
+page_daily.additional = [G.O_CLICK_CLOSE_1, G.O_CLICK_CLOSE_2]
 page_daily.link(button=G.I_BACK_Y, destination=page_main)
 page_main.link(button=G.I_MAIN_GOTO_DAILY, destination=page_daily)
 # 商店 mall

+ 12 - 1
tasks/TalismanPass/assets.py

@@ -8,5 +8,16 @@ from module.atom.list import RuleList
 # This file was automatically generated by ./dev_tools/assets_extract.py.
 # Don't modify it manually.
 class TalismanPassAssets: 
-	pass
+
+
+	# Image Rule Assets
+	# 领取全部 
+	I_TP_GET_ALL = RuleImage(roi_front=(903,599,70,71), roi_back=(903,599,70,71), threshold=0.8, method="Template matching", file="./tasks/TalismanPass/tp/tp_tp_get_all.png")
+	# 任务 的右上方红点 
+	I_RED_POINT_TASK = RuleImage(roi_front=(1226,312,23,24), roi_back=(1226,312,23,24), threshold=0.8, method="Template matching", file="./tasks/TalismanPass/tp/tp_red_point_task.png")
+	# 今日 的右上方红点 
+	I_RED_POINT_DAY = RuleImage(roi_front=(632,157,23,26), roi_back=(632,157,23,26), threshold=0.8, method="Template matching", file="./tasks/TalismanPass/tp/tp_red_point_day.png")
+	# 本周 的右上方红点 
+	I_RED_POINT_WEEK = RuleImage(roi_front=(795,156,24,25), roi_back=(795,156,24,25), threshold=0.8, method="Template matching", file="./tasks/TalismanPass/tp/tp_red_point_week.png")
+
 

+ 7 - 2
tasks/TalismanPass/config.py

@@ -4,8 +4,13 @@
 from datetime import timedelta
 from pydantic import BaseModel, Field
 
-from tasks.Component.config_scheduler import Scheduler
-from tasks.Component.config_base import ConfigBase
+from tasks.Component.config_scheduler import Scheduler as BaseScheduler
+from tasks.Component.config_base import ConfigBase, TimeDelta
+
+class Scheduler(BaseScheduler):
+    success_interval: TimeDelta = Field(default=TimeDelta(hours=6), description='success_interval_help')
+    failure_interval: TimeDelta = Field(default=TimeDelta(hours=6), description='failure_interval_help')
+
 
 class TailsmanPass(ConfigBase):
     scheduler: Scheduler = Field(default_factory=Scheduler)

+ 55 - 0
tasks/TalismanPass/script_task.py

@@ -0,0 +1,55 @@
+# This Python file uses the following encoding: utf-8
+# @author runhey
+# github https://github.com/runhey
+import time
+
+from tasks.GameUi.game_ui import GameUi
+from tasks.GameUi.page import page_main, page_daily
+from tasks.TalismanPass.assets import TalismanPassAssets
+
+from module.logger import logger
+from module.exception import TaskEnd
+
+class ScriptTask(GameUi, TalismanPassAssets):
+
+    def run(self):
+        self.ui_get_current_page()
+        self.ui_goto(page_daily)
+
+        # 收取全部奖励
+        self.get_all()
+        # 收取花合战等级奖励
+        self.get_flower()
+
+        self.set_next_run(task='TalismanPass', success=True, finish=True)
+        raise TaskEnd('TalismanPass')
+
+
+    def get_all(self):
+        """
+        一键收取所有的
+        :return:
+        """
+        self.screenshot()
+        if not self.appear(self.I_TP_GET_ALL):
+            logger.info('No appear get all button')
+        self.ui_get_reward(self.I_TP_GET_ALL)
+        logger.info('Get all reward')
+
+    def get_flower(self):
+        """
+        收取花合战等级奖励
+        :return:
+        """
+        pass
+
+if __name__ == '__main__':
+    from module.config.config import Config
+    from module.device.device import Device
+    c = Config('oas1')
+    d = Device(c)
+    t = ScriptTask(c, d)
+    t.screenshot()
+
+    t.get_all()
+

+ 38 - 0
tasks/TalismanPass/tp/image.json

@@ -0,0 +1,38 @@
+[
+  {
+    "itemName": "tp_get_all",
+    "imageName": "tp_tp_get_all.png",
+    "roiFront": "903,599,70,71",
+    "roiBack": "903,599,70,71",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "领取全部"
+  },
+  {
+    "itemName": "red_point_task",
+    "imageName": "tp_red_point_task.png",
+    "roiFront": "1226,312,23,24",
+    "roiBack": "1226,312,23,24",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "任务 的右上方红点"
+  },
+  {
+    "itemName": "red_point_day",
+    "imageName": "tp_red_point_day.png",
+    "roiFront": "632,157,23,26",
+    "roiBack": "632,157,23,26",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "今日 的右上方红点"
+  },
+  {
+    "itemName": "red_point_week",
+    "imageName": "tp_red_point_week.png",
+    "roiFront": "795,156,24,25",
+    "roiBack": "795,156,24,25",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "本周 的右上方红点"
+  }
+]

BIN=BIN
tasks/TalismanPass/tp/tp_red_point_day.png


BIN=BIN
tasks/TalismanPass/tp/tp_red_point_task.png


BIN=BIN
tasks/TalismanPass/tp/tp_red_point_week.png


BIN=BIN
tasks/TalismanPass/tp/tp_tp_get_all.png


+ 1 - 1
tasks/base_task.py

@@ -455,7 +455,7 @@ class BaseTask(GlobalGameAssets):
                 while 1:
                     self.screenshot()
                     # 等待动画结束
-                    if not self.appear(self.I_UI_REWARD, threshold=1):
+                    if not self.appear(self.I_UI_REWARD, threshold=0.7):
                         logger.info('Get reward success')
                         break