Parcourir la source

feat(task): add daily trifles

runhey il y a 3 ans
Parent
commit
fcd0b64f09

+ 1 - 1
module/config/config_manual.py

@@ -10,7 +10,7 @@ class ConfigManual:
     SCHEDULER_PRIORITY = """
         Restart
         >KekkaiUtilize > KekkaiActivation > DemonEncounter
-        > AreaBoss > GoldYoukai > ExperienceYoukai > Nian > RealmRaid > RyouToppa
+        > AreaBoss > GoldYoukai > ExperienceYoukai > Nian > RealmRaid > RyouToppa > DailyTrifles
         > Orochi > OrochiMoans > OrochiJudgement > Sougenbi > FallenSun > EternitySea
         > ActivityShikigami
         > BondlingFairyland

+ 1 - 1
module/config/config_menu.py

@@ -21,7 +21,7 @@ class ConfigMenu:
         self.menu["Soul Zones"] = ['Orochi', 'Sougenbi', 'FallenSun', 'EternitySea']
         # 日常的任务
         self.menu["Daily Task"] = ['AreaBoss', 'GoldYoukai', 'ExperienceYoukai', 'Nian', 'RealmRaid', 'RyouToppa',
-                                   'KekkaiUtilize', 'KekkaiActivation', 'DemonEncounter']
+                                   'KekkaiUtilize', 'KekkaiActivation', 'DemonEncounter', 'DailyTrifles']
         # 活动的任务
         self.menu["Activity Task"] = ['ActivityShikigami']
         # 很肝的任务

+ 2 - 0
module/config/config_model.py

@@ -23,6 +23,7 @@ from tasks.Nian.config import Nian
 from tasks.KekkaiUtilize.config import KekkaiUtilize
 from tasks.KekkaiActivation.config import KekkaiActivation
 from tasks.DemonEncounter.config import DemonEncounter
+from tasks.DailyTrifles.config import DailyTrifles
 # ----------------------------------------------------------------------------------------------------------------------
 from tasks.Orochi.config import Orochi
 from tasks.OrochiMoans.config import OrochiMoans
@@ -59,6 +60,7 @@ class ConfigModel(ConfigBase):
     kekkai_utilize: KekkaiUtilize = Field(default_factory=KekkaiUtilize)
     kekkai_activation: KekkaiActivation = Field(default_factory=KekkaiActivation)
     demon_encounter: DemonEncounter = Field(default_factory=DemonEncounter)
+    daily_trifles: DailyTrifles = Field(default_factory=DailyTrifles)
 
     # 这些是刷御魂的
     orochi: Orochi = Field(default_factory=Orochi)

BIN
module/config/i18n/zh_CN.qm


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

@@ -542,4 +542,13 @@ Refresh:直接刷新,如果刷新操作进入CD,将标记为失败并退
 	<message><source>SougenbiConfig</source><translation>业原火</translation></message>	
 	<message><source>SougenbiClass</source><translation>挑战类型</translation></message>	
 </context>	
+<context>
+    <name>Args</name>
+	<message><source>DailyTriflesConfig</source><translation>琐事</translation></message>	
+	<message><source>One Summon</source><translation>每日召唤</translation></message>	
+	<message><source>Guild Wish</source><translation>寮祈愿(还不知道可以写什么)</translation></message>	
+	<message><source>Friend Love</source><translation>友情点</translation></message>	
+	<message><source>Store Sign</source><translation>商店签到</translation></message>	
+	<message><source>store_sign_help</source><translation>就那个签到50次得黑蛋的</translation></message>	
+</context>	
 </TS>

+ 1 - 1
tasks/Component/GeneralInvite/general_invite.py

@@ -189,7 +189,7 @@ class GeneralInvite(BaseTask, GeneralInviteAssets):
             self.screenshot()
             if not self.is_in_room(False):
                 break
-            if self.appear_then_click(self.I_FIRE, interval=1):
+            if self.appear_then_click(self.I_FIRE, interval=1, threshold=0.7):
                 continue
 
     @cached_property

BIN
tasks/Component/GeneralInvite/gi/gi_fire.png


+ 39 - 0
tasks/Component/Summon/assets.py

@@ -0,0 +1,39 @@
+from module.atom.image import RuleImage
+from module.atom.click import RuleClick
+from module.atom.long_click import RuleLongClick
+from module.atom.swipe import RuleSwipe
+from module.atom.ocr import RuleOcr
+from module.atom.list import RuleList
+
+# This file was automatically generated by ./dev_tools/assets_extract.py.
+# Don't modify it manually.
+class SummonAssets: 
+
+
+	# Image Rule Assets
+	# 点击蓝票 
+	I_BLUE_TICKET = RuleImage(roi_front=(533,594,65,76), roi_back=(533,594,65,76), threshold=0.8, method="Template matching", file="./tasks/Component/Summon/sm/sm_blue_ticket.png")
+	# 点击厕所票 
+	I_LOW_TICKET = RuleImage(roi_front=(403,600,63,65), roi_back=(403,600,63,65), threshold=0.8, method="Template matching", file="./tasks/Component/Summon/sm/sm_low_ticket.png")
+	# 单抽 
+	I_ONE_TICKET = RuleImage(roi_front=(396,599,76,76), roi_back=(396,599,76,76), threshold=0.8, method="Template matching", file="./tasks/Component/Summon/sm/sm_one_ticket.png")
+	# description 
+	I_SM_CONFIRM = RuleImage(roi_front=(419,617,174,61), roi_back=(419,617,174,61), threshold=0.8, method="Template matching", file="./tasks/Component/Summon/sm/sm_sm_confirm.png")
+
+
+	# Ocr Rule Assets
+	# Ocr-description 
+	O_ONE_TICKET = RuleOcr(roi=(514,682,100,32), area=(514,682,100,32), mode="Single", method="Default", keyword="", name="one_ticket")
+
+
+	# Swipe Rule Assets
+	# description 
+	S_RANDOM_SWIPE_1 = RuleSwipe(roi_front=(459,136,369,100), roi_back=(456,448,400,100), mode="default", name="random_swipe_1")
+	# description 
+	S_RANDOM_SWIPE_2 = RuleSwipe(roi_front=(433,451,447,100), roi_back=(411,122,479,100), mode="default", name="random_swipe_2")
+	# description 
+	S_RANDOM_SWIPE_3 = RuleSwipe(roi_front=(401,123,100,440), roi_back=(762,122,100,434), mode="default", name="random_swipe_3")
+	# description 
+	S_RANDOM_SWIPE_4 = RuleSwipe(roi_front=(777,128,100,412), roi_back=(431,120,100,444), mode="default", name="random_swipe_4")
+
+

+ 38 - 0
tasks/Component/Summon/sm/image.json

@@ -0,0 +1,38 @@
+[
+  {
+    "itemName": "blue_ticket",
+    "imageName": "sm_blue_ticket.png",
+    "roiFront": "533,594,65,76",
+    "roiBack": "533,594,65,76",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "点击蓝票"
+  },
+  {
+    "itemName": "low_ticket",
+    "imageName": "sm_low_ticket.png",
+    "roiFront": "403,600,63,65",
+    "roiBack": "403,600,63,65",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "点击厕所票"
+  },
+  {
+    "itemName": "one_ticket",
+    "imageName": "sm_one_ticket.png",
+    "roiFront": "396,599,76,76",
+    "roiBack": "396,599,76,76",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "单抽"
+  },
+  {
+    "itemName": "sm_confirm",
+    "imageName": "sm_sm_confirm.png",
+    "roiFront": "419,617,174,61",
+    "roiBack": "419,617,174,61",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  }
+]

+ 11 - 0
tasks/Component/Summon/sm/ocr.json

@@ -0,0 +1,11 @@
+[
+  {
+    "itemName": "one_ticket",
+    "roiFront": "514,682,100,32",
+    "roiBack": "514,682,100,32",
+    "mode": "Single",
+    "method": "Default",
+    "keyword": "",
+    "description": "Ocr-description"
+  }
+]

BIN
tasks/Component/Summon/sm/sm_blue_ticket.png


BIN
tasks/Component/Summon/sm/sm_low_ticket.png


BIN
tasks/Component/Summon/sm/sm_one_ticket.png


BIN
tasks/Component/Summon/sm/sm_sm_confirm.png


+ 30 - 0
tasks/Component/Summon/sm/swipe.json

@@ -0,0 +1,30 @@
+[
+  {
+    "itemName": "random_swipe_1",
+    "roiFront": "459,136,369,100",
+    "roiBack": "456,448,400,100",
+    "mode": "default",
+    "description": "description"
+  },
+  {
+    "itemName": "random_swipe_2",
+    "roiFront": "433,451,447,100",
+    "roiBack": "411,122,479,100",
+    "mode": "default",
+    "description": "description"
+  },
+  {
+    "itemName": "random_swipe_3",
+    "roiFront": "401,123,100,440",
+    "roiBack": "762,122,100,434",
+    "mode": "default",
+    "description": "description"
+  },
+  {
+    "itemName": "random_swipe_4",
+    "roiFront": "777,128,100,412",
+    "roiBack": "431,120,100,444",
+    "mode": "default",
+    "description": "description"
+  }
+]

+ 77 - 0
tasks/Component/Summon/summon.py

@@ -0,0 +1,77 @@
+# This Python file uses the following encoding: utf-8
+# @author runhey
+# github https://github.com/runhey
+import time
+
+import random
+
+from tasks.Component.Summon.assets import SummonAssets
+from tasks.base_task import BaseTask
+from module.logger import logger
+
+
+class Summon(BaseTask, SummonAssets):
+
+
+    def summon(self):
+        """
+        召唤, 就是随机画一个, 划线
+        :return:
+        """
+        self.screenshot()
+        random_swipe = random.randint(0, 3)
+        target_swipe = None
+        match random_swipe:
+            case 0: target_swipe = self.S_RANDOM_SWIPE_1
+            case 1: target_swipe = self.S_RANDOM_SWIPE_2
+            case 2: target_swipe = self.S_RANDOM_SWIPE_3
+            case 3: target_swipe = self.S_RANDOM_SWIPE_4
+            case _: target_swipe = self.S_RANDOM_SWIPE_1
+        self.swipe(target_swipe, interval=0.5)
+
+
+
+    def summon_one(self):
+        """
+        确保在召唤界面,每日召唤一次
+        召唤结束后回到 召唤主界面
+        :return:
+        """
+        logger.info('Summon one')
+        self.wait_until_appear(self.I_BLUE_TICKET)
+        ticket_info = self.O_ONE_TICKET.ocr(self.device.image)
+        if '1' not in ticket_info:
+            logger.warning('There is no any one blue ticket')
+            return
+        while 1:
+            self.screenshot()
+
+            if self.appear_then_click(self.I_ONE_TICKET):
+                break
+            if self.appear_then_click(self.I_BLUE_TICKET, interval=1):
+                continue
+        time.sleep(0.5)
+        self.summon()
+        self.wait_until_appear(self.I_SM_CONFIRM)
+        while 1:
+            self.screenshot()
+            if not self.appear(self.I_SM_CONFIRM):
+                break
+            if self.appear_then_click(self.I_SM_CONFIRM):
+                continue
+
+
+    def back_summon_main(self):
+        """
+        返回召唤主界面
+        :return:
+        """
+        while 1:
+            self.screenshot()
+            if self.appear(self.I_BLUE_TICKET):
+                break
+            if self.appear_then_click(self.I_UI_BACK_BLUE):
+                continue
+            if self.appear_then_click(self.I_UI_BACK_YELLOW):
+                continue
+

+ 30 - 0
tasks/DailyTrifles/assets.py

@@ -0,0 +1,30 @@
+from module.atom.image import RuleImage
+from module.atom.click import RuleClick
+from module.atom.long_click import RuleLongClick
+from module.atom.swipe import RuleSwipe
+from module.atom.ocr import RuleOcr
+from module.atom.list import RuleList
+
+# This file was automatically generated by ./dev_tools/assets_extract.py.
+# Don't modify it manually.
+class DailyTriflesAssets: 
+
+
+	# Image Rule Assets
+	# description 
+	I_L_FRIENDS = RuleImage(roi_front=(67,625,70,72), roi_back=(67,625,70,72), threshold=0.9, method="Template matching", file="./tasks/DailyTrifles/love/love_l_friends.png")
+	# description 
+	I_L_LOVE = RuleImage(roi_front=(123,625,67,72), roi_back=(123,625,67,72), threshold=0.9, method="Template matching", file="./tasks/DailyTrifles/love/love_l_love.png")
+	# 一键收取 
+	I_L_COLLECT = RuleImage(roi_front=(47,537,129,56), roi_back=(47,537,129,56), threshold=0.8, method="Template matching", file="./tasks/DailyTrifles/love/love_l_collect.png")
+
+
+	# Image Rule Assets
+	# 礼包屋 
+	I_ROOM_GIFT = RuleImage(roi_front=(1143,636,69,64), roi_back=(1143,636,69,64), threshold=0.8, method="Template matching", file="./tasks/DailyTrifles/store/store_room_gift.png")
+	# description 
+	I_GIFT_RECOMMEND = RuleImage(roi_front=(1186,98,53,64), roi_back=(1172,83,83,214), threshold=0.8, method="Template matching", file="./tasks/DailyTrifles/store/store_gift_recommend.png")
+	# 免费一抽 
+	I_GIFT_SIGN = RuleImage(roi_front=(201,207,100,143), roi_back=(201,207,100,143), threshold=0.8, method="Template matching", file="./tasks/DailyTrifles/store/store_gift_sign.png")
+
+

+ 21 - 0
tasks/DailyTrifles/config.py

@@ -0,0 +1,21 @@
+# This Python file uses the following encoding: utf-8
+# @author runhey
+# github https://github.com/runhey
+from datetime import timedelta
+from pydantic import BaseModel, Field
+
+from tasks.Component.config_scheduler import Scheduler
+from tasks.Component.config_base import ConfigBase
+
+
+class DailyTriflesConfig(BaseModel):
+    one_summon: bool = Field(title='One Summon', default=False)
+    guild_wish: bool = Field(title='Guild Wish', default=False)
+    friend_love: bool = Field(title='Friend Love', default=False)
+    store_sign: bool = Field(title='Store Sign', default=False, description='store_sign_help')
+
+
+class DailyTrifles(ConfigBase):
+    scheduler: Scheduler = Field(default_factory=Scheduler)
+    trifles_config: DailyTriflesConfig = Field(default_factory=DailyTriflesConfig)
+

+ 29 - 0
tasks/DailyTrifles/love/image.json

@@ -0,0 +1,29 @@
+[
+  {
+    "itemName": "l_friends",
+    "imageName": "love_l_friends.png",
+    "roiFront": "67,625,70,72",
+    "roiBack": "67,625,70,72",
+    "method": "Template matching",
+    "threshold": 0.9,
+    "description": "description"
+  },
+  {
+    "itemName": "l_love",
+    "imageName": "love_l_love.png",
+    "roiFront": "123,625,67,72",
+    "roiBack": "123,625,67,72",
+    "method": "Template matching",
+    "threshold": 0.9,
+    "description": "description"
+  },
+  {
+    "itemName": "l_collect",
+    "imageName": "love_l_collect.png",
+    "roiFront": "47,537,129,56",
+    "roiBack": "47,537,129,56",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "一键收取"
+  }
+]

BIN
tasks/DailyTrifles/love/love_l_collect.png


BIN
tasks/DailyTrifles/love/love_l_friends.png


BIN
tasks/DailyTrifles/love/love_l_love.png


+ 109 - 0
tasks/DailyTrifles/script_task.py

@@ -0,0 +1,109 @@
+# This Python file uses the following encoding: utf-8
+# @author runhey
+# github https://github.com/runhey
+from time import sleep
+from datetime import time, datetime, timedelta
+
+from tasks.GameUi.game_ui import GameUi
+from tasks.GameUi.page import page_main, page_summon, page_guild, page_mall, page_friends
+from tasks.DailyTrifles.config import DailyTriflesConfig
+from tasks.DailyTrifles.assets import DailyTriflesAssets
+from tasks.Component.Summon.summon import Summon
+
+
+from module.logger import logger
+from module.exception import TaskEnd
+
+
+
+class ScriptTask(GameUi, Summon, DailyTriflesAssets):
+
+    def run(self):
+        con = self.config.daily_trifles.trifles_config
+        if con.one_summon:
+            self.run_one_summon()
+        if con.guild_wish:
+            pass
+        if con.friend_love:
+            self.run_friend_love()
+        if con.store_sign:
+            self.run_store_sign()
+        raise TaskEnd('DailyTrifles')
+
+    def run_one_summon(self):
+        self.ui_get_current_page()
+        self.ui_goto(page_summon)
+        self.summon_one()
+        self.back_summon_main()
+
+    def run_guild_wish(self):
+        pass
+
+    def run_friend_love(self):
+        self.ui_get_current_page()
+        self.ui_goto(page_friends)
+        while 1:
+            self.screenshot()
+            if self.appear(self.I_L_LOVE):
+                break
+            if self.appear_then_click(self.I_L_FRIENDS, interval=1):
+                continue
+        logger.info('Friend love')
+        sleep(0.5)
+        self.screenshot()
+        if not self.appear(self.I_L_COLLECT):
+            logger.warning('There is no any love')
+            return
+        while 1:
+            self.screenshot()
+            if self.ui_get_reward():
+                logger.info('Get reward of friend love')
+                break
+            if self.appear_then_click(self.I_L_COLLECT):
+                continue
+
+    def run_store_sign(self):
+        self.ui_get_current_page()
+        self.ui_goto(page_mall)
+
+        while 1:
+            self.screenshot()
+            if self.appear(self.I_GIFT_RECOMMEND):
+                break
+            if self.appear_then_click(self.I_ROOM_GIFT, interval=1):
+                continue
+        self.screenshot()
+        self.appear_then_click(self.I_GIFT_RECOMMEND, interval=1)
+        logger.info('Enter store sign')
+        sleep(1)  # 等个动画
+        self.screenshot()
+        if not self.appear(self.I_GIFT_SIGN):
+            logger.warning('There is no gift sign')
+            self.ui_get_current_page()
+            self.ui_goto(page_main)
+            return
+        while 1:
+            self.screenshot()
+            if self.ui_get_reward():
+                logger.info('Get reward of gift sign')
+                break
+            if self.appear_then_click(self.I_GIFT_SIGN, interval=1):
+                continue
+        self.ui_get_current_page()
+        self.ui_goto(page_main)
+
+
+
+
+
+if __name__ == '__main__':
+    from module.config.config import Config
+    from module.device.device import Device
+    from memory_profiler import profile
+
+    c = Config('oas1')
+    d = Device(c)
+    t = ScriptTask(c, d)
+
+    t.run_store_sign()
+

+ 29 - 0
tasks/DailyTrifles/store/image.json

@@ -0,0 +1,29 @@
+[
+  {
+    "itemName": "room_gift",
+    "imageName": "store_room_gift.png",
+    "roiFront": "1143,636,69,64",
+    "roiBack": "1143,636,69,64",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "礼包屋"
+  },
+  {
+    "itemName": "gift_recommend",
+    "imageName": "store_gift_recommend.png",
+    "roiFront": "1186,98,53,64",
+    "roiBack": "1172,83,83,214",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "gift_sign",
+    "imageName": "store_gift_sign.png",
+    "roiFront": "201,207,100,143",
+    "roiBack": "201,207,100,143",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "免费一抽"
+  }
+]

BIN
tasks/DailyTrifles/store/store_gift_recommend.png


BIN
tasks/DailyTrifles/store/store_gift_sign.png


BIN
tasks/DailyTrifles/store/store_room_gift.png