Просмотр исходного кода

Merge pull request #1251 from runhey/dev

Automated PR 2025.11.13
huangrunheng 1 год назад
Родитель
Сommit
e89c36b0ef

+ 17 - 12
tasks/AreaBoss/script_task.py

@@ -7,6 +7,7 @@ import cv2
 import numpy as np
 import numpy as np
 import random
 import random
 import re
 import re
+from module.atom.click import RuleClick
 from tasks.base_task import BaseTask
 from tasks.base_task import BaseTask
 from tasks.Component.GeneralBattle.general_battle import GeneralBattle
 from tasks.Component.GeneralBattle.general_battle import GeneralBattle
 from tasks.GameUi.game_ui import GameUi
 from tasks.GameUi.game_ui import GameUi
@@ -262,36 +263,35 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
         need_open_filter, boss_name, photo = self.get_hot_in_reward()  # 获取挑战人数最多的Boss的名字
         need_open_filter, boss_name, photo = self.get_hot_in_reward()  # 获取挑战人数最多的Boss的名字
         if photo is None or boss_name == '声望不够':
         if photo is None or boss_name == '声望不够':
             return False
             return False
-        logger.info(f'Select reward boss:{boss_name}')
         # 不需要打开筛选界面说明直接找到了目标boss, 直接挑战
         # 不需要打开筛选界面说明直接找到了目标boss, 直接挑战
         if not need_open_filter:
         if not need_open_filter:
             return self.boss_fight(photo, True, fileter_open=False)
             return self.boss_fight(photo, True, fileter_open=False)
-        self.open_filter()
         # 滑动到最顶层
         # 滑动到最顶层
         logger.info("Swipe to top")
         logger.info("Swipe to top")
         for i in range(random.randint(1, 3)):
         for i in range(random.randint(1, 3)):
             self.swipe(self.S_AB_FILTER_DOWN)
             self.swipe(self.S_AB_FILTER_DOWN)
+        # 遍历所有boss找到名称一致的即目前挑战人数最多的
         for PHOTO in BOSS_REWARD_PHOTO1:
         for PHOTO in BOSS_REWARD_PHOTO1:
-            if photo.name != PHOTO.name:
-                continue
+            self.open_filter()
             name = self.get_bossName(PHOTO)
             name = self.get_bossName(PHOTO)
             if self.check_common_chars(str(name), boss_name):
             if self.check_common_chars(str(name), boss_name):
                 return self.boss_fight(PHOTO, True, fileter_open=False)
                 return self.boss_fight(PHOTO, True, fileter_open=False)
+            self.ui_click_until_disappear(self.I_AB_CLOSE_RED)
         # 倒数一和二
         # 倒数一和二
         for i in range(random.randint(1, 3)):
         for i in range(random.randint(1, 3)):
             self.swipe(self.S_AB_FILTER_UP)
             self.swipe(self.S_AB_FILTER_UP)
         for PHOTO in BOSS_REWARD_PHOTO2:
         for PHOTO in BOSS_REWARD_PHOTO2:
-            if photo.name != PHOTO.name:
-                continue
+            self.open_filter()
             name = self.get_bossName(PHOTO)
             name = self.get_bossName(PHOTO)
             if self.check_common_chars(str(name), boss_name):
             if self.check_common_chars(str(name), boss_name):
                 return self.boss_fight(PHOTO, True, fileter_open=False)
                 return self.boss_fight(PHOTO, True, fileter_open=False)
+            self.ui_click_until_disappear(self.I_AB_CLOSE_RED)
         self.ui_click_until_disappear(self.I_AB_CLOSE_RED)
         self.ui_click_until_disappear(self.I_AB_CLOSE_RED)
 
 
     def get_hot_in_reward(self):
     def get_hot_in_reward(self):
         """
         """
             返回挑战人数最多的悬赏鬼王
             返回挑战人数最多的悬赏鬼王
-        @return: 是否打开筛选界面, boss名称
+        @return: 是否打开筛选界面, boss名称, boss图片的click
         @rtype:
         @rtype:
         """
         """
         self.switch_to_reward()
         self.switch_to_reward()
@@ -303,8 +303,12 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
             {"photo": self.C_AB_BOSS_REWARD_PHOTO_MINUS_1, "need_swipe": True},
             {"photo": self.C_AB_BOSS_REWARD_PHOTO_MINUS_1, "need_swipe": True},
         ]
         ]
 
 
-        def check_boss(photo):
-            """检查boss是否满足条件"""
+        def check_boss(photo: RuleClick):
+            """
+            检查boss是否满足条件
+            :param photo:
+            :return: 是否满足条件, 挑战数量, boss名称
+            """
             self.open_filter()
             self.open_filter()
             num = self.get_num_challenge(photo) or 0
             num = self.get_num_challenge(photo) or 0
             if not num:
             if not num:
@@ -321,7 +325,7 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
         mx_challenge_boss_name = None
         mx_challenge_boss_name = None
         mx_challenge_num = 0
         mx_challenge_num = 0
         photo = None
         photo = None
-        # 遍历所有boss配置
+        # 遍历所有boss配置, 找挑战人数最多的boss
         for cfg in boss_configs:
         for cfg in boss_configs:
             if cfg["need_swipe"]:
             if cfg["need_swipe"]:
                 self.open_filter()
                 self.open_filter()
@@ -329,13 +333,13 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
                     self.swipe(self.S_AB_FILTER_UP)
                     self.swipe(self.S_AB_FILTER_UP)
                 self.wait_until_appear(cfg["photo"], wait_time=1)
                 self.wait_until_appear(cfg["photo"], wait_time=1)
             ret, challenge_num, boss_name = check_boss(cfg["photo"])
             ret, challenge_num, boss_name = check_boss(cfg["photo"])
-            if ret:
+            if ret:  # 直接找到满足条件的, 则不需要打开筛选界面直接挑战即可
                 return False, boss_name, cfg["photo"]
                 return False, boss_name, cfg["photo"]
             if challenge_num > mx_challenge_num:
             if challenge_num > mx_challenge_num:
                 mx_challenge_num = challenge_num
                 mx_challenge_num = challenge_num
                 mx_challenge_boss_name = boss_name
                 mx_challenge_boss_name = boss_name
                 photo = cfg['photo']
                 photo = cfg['photo']
-        # 没有最优boss则找挑战人数最多的boss
+                logger.attr(mx_challenge_num, f'Select:{boss_name},{photo.name}')
         return True, mx_challenge_boss_name if mx_challenge_boss_name else '声望不够', photo if mx_challenge_boss_name else None
         return True, mx_challenge_boss_name if mx_challenge_boss_name else '声望不够', photo if mx_challenge_boss_name else None
 
 
     def get_num_challenge(self, click_area):
     def get_num_challenge(self, click_area):
@@ -423,6 +427,7 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
                 continue
                 continue
 
 
     def switch_to_reward(self):
     def switch_to_reward(self):
+        self.open_filter()
         while 1:
         while 1:
             self.screenshot()
             self.screenshot()
             if self.appear(self.I_AB_FILTER_TITLE_REWARD):
             if self.appear(self.I_AB_FILTER_TITLE_REWARD):

+ 2 - 2
tasks/Component/ReplaceShikigami/replace_shikigami.py

@@ -52,10 +52,10 @@ class ReplaceShikigami(BaseTask, ReplaceShikigamiAssets):
             if self.appear(check_selected):
             if self.appear(check_selected):
                 break
                 break
             if self.appear(check_click, interval=1):
             if self.appear(check_click, interval=1):
-                if self.wait_until_pos_stable(check_click, stable_time=0.8, timeout=3):
+                if self.wait_until_pos_stable(check_click, stable_time=0.8, timeout=2.5):
                     self.click(check_click)
                     self.click(check_click)
                 continue
                 continue
-            if self.click(self.C_SHIKIGAMI_SWITCH_1, interval=3):
+            if self.click(self.C_SHIKIGAMI_SWITCH_1, interval=3.5):
                 continue
                 continue
         logger.info('Select shikigami class: %s' % shikigami_class)
         logger.info('Select shikigami class: %s' % shikigami_class)
 
 

+ 29 - 0
tasks/Component/SwitchOnmyoji/assets.py

@@ -0,0 +1,29 @@
+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 SwitchOnmyojiAssets: 
+
+
+	# Image Rule Assets
+	# 晴明战标志 
+	I_SEIMI_BATTLE = RuleImage(roi_front=(253,429,79,78), roi_back=(147,388,222,153), threshold=0.8, method="Template matching", file="./tasks/Component/SwitchOnmyoji/so/so_seimi_battle.png")
+	# 神乐战标志 
+	I_KAGURA_BATTLE = RuleImage(roi_front=(509,428,79,78), roi_back=(401,394,222,153), threshold=0.8, method="Template matching", file="./tasks/Component/SwitchOnmyoji/so/so_kagura_battle.png")
+	# 源博雅战标志 
+	I_HIROMASA_BATTLE = RuleImage(roi_front=(761,427,79,78), roi_back=(657,396,222,153), threshold=0.8, method="Template matching", file="./tasks/Component/SwitchOnmyoji/so/so_hiromasa_battle.png")
+	# 八百比丘尼战标志 
+	I_YAO_BIKUNI_BATTLE = RuleImage(roi_front=(1017,428,79,78), roi_back=(910,387,222,153), threshold=0.8, method="Template matching", file="./tasks/Component/SwitchOnmyoji/so/so_yao_bikuni_battle.png")
+	# 阴阳师交替按钮 
+	I_ONMYOJI_SWITCH = RuleImage(roi_front=(39,385,40,33), roi_back=(19,362,80,91), threshold=0.8, method="Template matching", file="./tasks/Component/SwitchOnmyoji/so/so_onmyoji_switch.png")
+	# 阴阳术阴阳师页面标志 
+	I_ONMYOJI_CHECK = RuleImage(roi_front=(67,622,82,58), roi_back=(58,608,100,88), threshold=0.8, method="Template matching", file="./tasks/Component/SwitchOnmyoji/so/so_onmyoji_check.png")
+	# 阴阳术英杰页面标志 
+	I_HERO_CHECK = RuleImage(roi_front=(70,624,75,55), roi_back=(60,602,100,100), threshold=0.8, method="Template matching", file="./tasks/Component/SwitchOnmyoji/so/so_hero_check.png")
+
+

+ 9 - 0
tasks/Component/SwitchOnmyoji/config.py

@@ -0,0 +1,9 @@
+from enum import Enum
+
+
+class Onmyoji(str, Enum):
+    YORIMITSU = '源赖光'
+    SEIMI = '晴明'
+    KAGURA = '神乐'
+    HIROMASA = '源博雅'
+    YAO_BIKUNI = '八百比丘尼'

+ 65 - 0
tasks/Component/SwitchOnmyoji/so/image.json

@@ -0,0 +1,65 @@
+[
+  {
+    "itemName": "seimi_battle",
+    "imageName": "so_seimi_battle.png",
+    "roiFront": "253,429,79,78",
+    "roiBack": "147,388,222,153",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "晴明战标志"
+  },
+  {
+    "itemName": "kagura_battle",
+    "imageName": "so_kagura_battle.png",
+    "roiFront": "509,428,79,78",
+    "roiBack": "401,394,222,153",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "神乐战标志"
+  },
+  {
+    "itemName": "hiromasa_battle",
+    "imageName": "so_hiromasa_battle.png",
+    "roiFront": "761,427,79,78",
+    "roiBack": "657,396,222,153",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "源博雅战标志"
+  },
+  {
+    "itemName": "yao_bikuni_battle",
+    "imageName": "so_yao_bikuni_battle.png",
+    "roiFront": "1017,428,79,78",
+    "roiBack": "910,387,222,153",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "八百比丘尼战标志"
+  },
+  {
+    "itemName": "onmyoji_switch",
+    "imageName": "so_onmyoji_switch.png",
+    "roiFront": "39,385,40,33",
+    "roiBack": "19,362,80,91",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "阴阳师交替按钮"
+  },
+  {
+    "itemName": "onmyoji_check",
+    "imageName": "so_onmyoji_check.png",
+    "roiFront": "67,622,82,58",
+    "roiBack": "58,608,100,88",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "阴阳术阴阳师页面标志"
+  },
+  {
+    "itemName": "hero_check",
+    "imageName": "so_hero_check.png",
+    "roiFront": "70,624,75,55",
+    "roiBack": "60,602,100,100",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "阴阳术英杰页面标志"
+  }
+]

BIN
tasks/Component/SwitchOnmyoji/so/so_hero_check.png


BIN
tasks/Component/SwitchOnmyoji/so/so_hiromasa_battle.png


BIN
tasks/Component/SwitchOnmyoji/so/so_kagura_battle.png


BIN
tasks/Component/SwitchOnmyoji/so/so_onmyoji_check.png


BIN
tasks/Component/SwitchOnmyoji/so/so_onmyoji_switch.png


BIN
tasks/Component/SwitchOnmyoji/so/so_seimi_battle.png


BIN
tasks/Component/SwitchOnmyoji/so/so_yao_bikuni_battle.png


+ 63 - 0
tasks/Component/SwitchOnmyoji/switch_onmyoji.py

@@ -0,0 +1,63 @@
+from tasks.Component.SwitchOnmyoji.assets import SwitchOnmyojiAssets
+from tasks.Component.SwitchOnmyoji.config import Onmyoji
+from tasks.base_task import BaseTask
+from module.logger import logger
+
+
+class SwitchOnmyoji(BaseTask, SwitchOnmyojiAssets):
+
+    def switch_onmyoji(self, onmyoji: Onmyoji):
+        """
+        切换阴阳师, 要求已经进入阴阳术界面, 最后会留在阴阳术界面
+        :param onmyoji: 阴阳师
+        """
+        logger.hr('Switch onmyoji', 2)
+        hero = [Onmyoji.YORIMITSU]
+        if onmyoji in hero:
+            self._switch_hero(onmyoji)
+        else:
+            self._switch_onmyoji(onmyoji)
+        logger.info(f'Switch onmyoji: {onmyoji.name}[{onmyoji.value}]')
+
+    def _switch_onmyoji(self, onmyoji: Onmyoji):
+        """切换阴阳师"""
+        onmyoji_battle_dict = {
+            Onmyoji.SEIMI: self.I_SEIMI_BATTLE,
+            Onmyoji.KAGURA: self.I_KAGURA_BATTLE,
+            Onmyoji.HIROMASA: self.I_HIROMASA_BATTLE,
+            Onmyoji.YAO_BIKUNI: self.I_YAO_BIKUNI_BATTLE,
+        }
+        self.ui_click(self.I_HERO_CHECK, self.I_ONMYOJI_CHECK, interval=0.8)
+        # 进入阴阳师替换页面
+        while not (self.appear(self.I_SEIMI_BATTLE) or self.appear(self.I_KAGURA_BATTLE)
+                   or self.appear(self.I_HIROMASA_BATTLE) or self.appear(self.I_YAO_BIKUNI_BATTLE)):
+            self.appear_then_click(self.I_ONMYOJI_SWITCH, interval=0.8)
+            self.screenshot()
+        onmyoji_battle = onmyoji_battle_dict.get(onmyoji, None)
+        if not onmyoji_battle:
+            raise ValueError('Incorrect onmyoji type')
+        while True:
+            self.screenshot()
+            # 回到阴阳术页面则退出
+            if self.appear(self.I_ONMYOJI_CHECK, interval=0.8):
+                break
+            if self.appear(onmyoji_battle, interval=0.8):
+                self.ui_click(self.I_UI_BACK_BLUE, self.I_ONMYOJI_CHECK, interval=1.2)
+                break
+            # 出战对应阴阳师
+            self.click(onmyoji_battle, interval=1.2)
+
+    def _switch_hero(self, onmyoji: Onmyoji):
+        """切换英杰"""
+        self.ui_click(self.I_ONMYOJI_CHECK, self.I_HERO_CHECK, interval=0.8)
+
+
+if __name__ == '__main__':
+    from module.config.config import Config
+    from module.device.device import Device
+
+    c = Config('oas3')
+    d = Device(c)
+    t = SwitchOnmyoji(c, d)
+
+    t.switch_onmyoji(Onmyoji.YORIMITSU)

+ 8 - 0
tasks/DailyTrifles/page.py

@@ -0,0 +1,8 @@
+from tasks.DailyTrifles.assets import DailyTriflesAssets
+from tasks.GameUi.assets import GameUiAssets
+from tasks.GameUi.page import Page, page_mall
+
+# 商店礼包屋页面
+page_store_gift_room = Page(DailyTriflesAssets.I_GIFT_RECOMMEND)
+page_store_gift_room.link(button=GameUiAssets.I_BACK_Y, destination=page_mall)
+page_mall.link(button=DailyTriflesAssets.I_ROOM_GIFT, destination=page_store_gift_room)

+ 2 - 6
tasks/DailyTrifles/script_task.py

@@ -6,6 +6,7 @@ from time import sleep
 from datetime import time, datetime, timedelta
 from datetime import time, datetime, timedelta
 
 
 from exceptiongroup import catch
 from exceptiongroup import catch
+from tasks.DailyTrifles.page import page_store_gift_room
 from winerror import NOERROR
 from winerror import NOERROR
 
 
 from tasks.GameUi.game_ui import GameUi
 from tasks.GameUi.game_ui import GameUi
@@ -225,12 +226,7 @@ class ScriptTask(GameUi, Summon, DailyTriflesAssets):
 
 
     def run_store_sign(self):
     def run_store_sign(self):
 
 
-        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.ui_goto_page(page_store_gift_room)
         self.screenshot()
         self.screenshot()
         self.appear_then_click(self.I_GIFT_RECOMMEND, interval=1)
         self.appear_then_click(self.I_GIFT_RECOMMEND, interval=1)
         logger.info('Enter store sign')
         logger.info('Enter store sign')

+ 81 - 21
tasks/DemonEncounter/config.py

@@ -2,29 +2,41 @@
 # @author runhey
 # @author runhey
 # github https://github.com/runhey
 # github https://github.com/runhey
 from pydantic import BaseModel, Field
 from pydantic import BaseModel, Field
-from enum import Enum
-from datetime import datetime, time
+from enum import Enum, IntEnum
+from tasks.Component.GeneralBattle.config_general_battle import GeneralBattleConfig
 
 
 from tasks.Component.config_scheduler import Scheduler
 from tasks.Component.config_scheduler import Scheduler
-from tasks.Component.config_base import ConfigBase, TimeDelta
-from tasks.Component.GeneralBattle.config_general_battle import GeneralBattleConfig
-from tasks.Utils.config_enum import ShikigamiClass
+from tasks.Component.config_base import ConfigBase, TimeDelta, dynamic_hide
+
+
+class BossType(IntEnum):
+    kiryou_utahime = 0  # 鬼灵歌姬
+    shinkirou = 1  # 蜃气楼
+    tsuchigumo = 2  # 土蜘蛛
+    gashadokuro = 3  # 荒骷髅
+    namazu = 4  # 地震鲶
+    oboroguruma = 5  # 胧车
+    nightly_aramitama = 6  # 夜荒魂
+
 
 
 # 宝箱购买项目
 # 宝箱购买项目
 class BoxBuyConfig(BaseModel):
 class BoxBuyConfig(BaseModel):
     # 默认购买蓝票,未添加选项,没人会不买吧!
     # 默认购买蓝票,未添加选项,没人会不买吧!
     box_buy_sushi: bool = Field(default=False, description='逢魔宝箱是否购买体力')
     box_buy_sushi: bool = Field(default=False, description='逢魔宝箱是否购买体力')
 
 
+
 class BestDemonBossSelect(BaseModel):
 class BestDemonBossSelect(BaseModel):
-    enable: bool = Field(
-        default=False,
-        description="是否开启极封魔",
-    )
-    best_demon_kiryou_select: bool = Field(title='Best Kiryou Select', default=False, description='极鬼灵歌姬是否开启')
+    best_demon_kiryou_utahime_select: bool = Field(title='Best Kiryou Utahime Select', default=False, description='极鬼灵歌姬是否开启')
     best_demon_shinkirou_select: bool = Field(title='Best Shinkirou Select', default=False, description='极蜃气楼是否开启')
     best_demon_shinkirou_select: bool = Field(title='Best Shinkirou Select', default=False, description='极蜃气楼是否开启')
     best_demon_tsuchigumo_select: bool = Field(title='Best Tsuchigumo Select', default=False, description='极土蜘蛛是否开启')
     best_demon_tsuchigumo_select: bool = Field(title='Best Tsuchigumo Select', default=False, description='极土蜘蛛是否开启')
     best_demon_gashadokuro_select: bool = Field(title='Best Gashadokuro Select', default=False, description='极荒骷髅是否开启')
     best_demon_gashadokuro_select: bool = Field(title='Best Gashadokuro Select', default=False, description='极荒骷髅是否开启')
     best_demon_namazu_select: bool = Field(title='Best Namazu Select', default=False, description='极地震鲇是否开启')
     best_demon_namazu_select: bool = Field(title='Best Namazu Select', default=False, description='极地震鲇是否开启')
+    best_demon_oboroguruma_select: bool = Field(title='Best Oboroguruma Select', default=False, description='极胧车是否开启')
+    best_demon_nightly_aramitama_select: bool = Field(title='Best Nightly Aramitama Select', default=False, description='极夜荒魂是否开启')
+
+    hide_fields = dynamic_hide('best_demon_kiryou_utahime_select', 'best_demon_oboroguruma_select',
+                               'best_demon_nightly_aramitama_select')
+
 
 
 # 不同封魔boss的御魂配置
 # 不同封魔boss的御魂配置
 class DemonConfig(BaseModel):
 class DemonConfig(BaseModel):
@@ -34,9 +46,7 @@ class DemonConfig(BaseModel):
     )
     )
     # 周一
     # 周一
     demon_kiryou_utahime: str = Field(default="group,team", description="鬼灵歌姬御魂1")
     demon_kiryou_utahime: str = Field(default="group,team", description="鬼灵歌姬御魂1")
-    demon_kiryou_utahime_supplementary: str = Field(
-        default="group,team", description="鬼灵歌姬御魂补充"
-    )
+    demon_kiryou_utahime_supplementary: str = Field(default="group,team", description="鬼灵歌姬御魂补充")
     # 周二
     # 周二
     demon_shinkirou: str = Field(default="group,team", description="蜃气楼御魂")
     demon_shinkirou: str = Field(default="group,team", description="蜃气楼御魂")
     # 周三 土蜘蛛
     # 周三 土蜘蛛
@@ -50,32 +60,82 @@ class DemonConfig(BaseModel):
     # 周日 夜荒魂
     # 周日 夜荒魂
     demon_nightly_aramitama: str = Field(default="group,team", description="夜荒魂御魂")
     demon_nightly_aramitama: str = Field(default="group,team", description="夜荒魂御魂")
 
 
+
 # 不同极封魔boss的御魂配置
 # 不同极封魔boss的御魂配置
 class BestDemonConfig(BaseModel):
 class BestDemonConfig(BaseModel):
     enable: bool = Field(
     enable: bool = Field(
         default=False,
         default=False,
         description="通过预设名称来匹配极封魔御魂分组\n例如=> 逢魔之时,歌(中间的是英文逗号)",
         description="通过预设名称来匹配极封魔御魂分组\n例如=> 逢魔之时,歌(中间的是英文逗号)",
     )
     )
-    # 周一 鬼灵歌姬
     best_demon_kiryou_utahime: str = Field(default="group,team", description="极鬼灵歌姬御魂1")
     best_demon_kiryou_utahime: str = Field(default="group,team", description="极鬼灵歌姬御魂1")
-    best_demon_kiryou_utahime_supplementary: str = Field(
-        default="group,team", description="极鬼灵歌姬御魂补充"
-    )
-    # 周二 极蜃气楼
+    best_demon_kiryou_utahime_supplementary: str = Field(default="group,team", description="极鬼灵歌姬御魂补充")
     best_demon_shinkirou: str = Field(default="group,team", description="极蜃气楼御魂")
     best_demon_shinkirou: str = Field(default="group,team", description="极蜃气楼御魂")
-    # 周三 极土蜘蛛
     best_demon_tsuchigumo: str = Field(default="group,team", description="极土蜘蛛御魂")
     best_demon_tsuchigumo: str = Field(default="group,team", description="极土蜘蛛御魂")
-    # 周四 极荒骷髅
     best_demon_gashadokuro: str = Field(default="group,team", description="极荒骷髅御魂")
     best_demon_gashadokuro: str = Field(default="group,team", description="极荒骷髅御魂")
-    # 周五 极地震鲇
     best_demon_namazu: str = Field(default="group,team", description="极地震鲇御魂")
     best_demon_namazu: str = Field(default="group,team", description="极地震鲇御魂")
+    best_demon_oboroguruma: str = Field(default="group,team", description="极胧车御魂")
+    best_demon_nightly_aramitamau: str = Field(default="group,team", description="极夜荒魂御魂")
+
+    hide_fields = dynamic_hide('best_demon_kiryou_utahime', 'best_demon_kiryou_utahime_supplementary',
+                               'best_demon_oboroguruma', 'best_demon_nightly_aramitamau')
+
+
+def convert_to_general_battle_config(boss_type: str, demon_battle_conf: 'DemonBattleConfig' = None,
+                                     best_demon_battle_conf: 'BestDemonBattleConfig' = None) -> GeneralBattleConfig:
+    if demon_battle_conf:
+        enable = getattr(demon_battle_conf, f'{boss_type}_enable', False)
+        group, team = getattr(demon_battle_conf, boss_type, '1,1').split(',')
+    elif best_demon_battle_conf:
+        enable = getattr(best_demon_battle_conf, f'{boss_type}_enable', False)
+        group, team = getattr(best_demon_battle_conf, boss_type, '1,1').split(',')
+    else:
+        enable = False
+        group, team = (1, 1)
+    return GeneralBattleConfig(preset_enable=enable, preset_group=group if enable else 1, preset_team=team if enable else 1)
+
+
+class DemonBattleConfig(BaseModel):
+    demon_shinkirou_enable: bool = Field(default=False, description='是否切换蜃气楼预设')
+    demon_shinkirou: str = Field(default="-1,-1", description="蜃气楼预设")
+    demon_tsuchigumo_enable: bool = Field(default=False, description='是否切换土蜘蛛预设')
+    demon_tsuchigumo: str = Field(default="-1,-1", description="土蜘蛛预设")
+    demon_gashadokuro_enable: bool = Field(default=False, description='是否切换荒骷髅预设')
+    demon_gashadokuro: str = Field(default="-1,-1", description="荒骷髅预设")
+    demon_namazu_enable: bool = Field(default=False, description='是否切换地震鲶预设')
+    demon_namazu: str = Field(default="-1,-1", description="地震鲶预设")
+    demon_oboroguruma_enable: bool = Field(default=False, description='是否切换胧车预设')
+    demon_oboroguruma: str = Field(default="-1,-1", description="胧车预设")
+    demon_nightly_aramitama_enable: bool = Field(default=False, description='是否切换夜荒魂预设')
+    demon_nightly_aramitama: str = Field(default="-1,-1", description="夜荒魂预设")
+
+
+class BestDemonBattleConfig(BaseModel):
+    best_demon_shinkirou_enable: bool = Field(default=False, description='是否切换极蜃气楼预设')
+    best_demon_shinkirou: str = Field(default="-1,-1", description="极蜃气楼预设")
+    best_demon_tsuchigumo_enable: bool = Field(default=False, description='是否切换极土蜘蛛预设')
+    best_demon_tsuchigumo: str = Field(default="-1,-1", description="极土蜘蛛预设")
+    best_demon_gashadokuro_enable: bool = Field(default=False, description='是否切换极荒骷髅预设')
+    best_demon_gashadokuro: str = Field(default="-1,-1", description="极荒骷髅预设")
+    best_demon_namazu_enable: bool = Field(default=False, description='是否切换极地震鲶预设')
+    best_demon_namazu: str = Field(default="-1,-1", description="极地震鲶预设")
+    best_demon_oboroguruma_enable: bool = Field(default=False, description='是否切换极胧车预设')
+    best_demon_oboroguruma: str = Field(default="-1,-1", description="极胧车预设")
+    best_demon_nightly_aramitama_enable: bool = Field(default=False, description='是否切换极夜荒魂预设')
+    best_demon_nightly_aramitamau: str = Field(default="-1,-1", description="极夜荒魂预设")
+
+    hide_fields = dynamic_hide('best_demon_oboroguruma_enable', 'best_demon_oboroguruma',
+                               'best_demon_nightly_aramitama_enable', 'best_demon_nightly_aramitamau')
+
 
 
 class UtilizeScheduler(Scheduler):
 class UtilizeScheduler(Scheduler):
     priority: int = Field(default=2, description='priority_help')
     priority: int = Field(default=2, description='priority_help')
 
 
+
 class DemonEncounter(ConfigBase):
 class DemonEncounter(ConfigBase):
     scheduler: UtilizeScheduler = Field(default_factory=UtilizeScheduler)
     scheduler: UtilizeScheduler = Field(default_factory=UtilizeScheduler)
     box_buy_config: BoxBuyConfig = Field(default_factory=BoxBuyConfig)
     box_buy_config: BoxBuyConfig = Field(default_factory=BoxBuyConfig)
     best_demon_boss_config: BestDemonBossSelect = Field(default_factory=BestDemonBossSelect)
     best_demon_boss_config: BestDemonBossSelect = Field(default_factory=BestDemonBossSelect)
     demon_soul_config: DemonConfig = Field(default_factory=DemonConfig)
     demon_soul_config: DemonConfig = Field(default_factory=DemonConfig)
     best_demon_soul_config: BestDemonConfig = Field(default_factory=BestDemonConfig)
     best_demon_soul_config: BestDemonConfig = Field(default_factory=BestDemonConfig)
+    demon_battle_config: DemonBattleConfig = Field(default_factory=DemonBattleConfig)
+    best_demon_battle_config: BestDemonBattleConfig = Field(default_factory=BestDemonBattleConfig)

+ 44 - 95
tasks/DemonEncounter/script_task.py

@@ -13,6 +13,7 @@ from module.exception import TaskEnd
 from module.base.timer import Timer
 from module.base.timer import Timer
 
 
 from tasks.Component.SwitchSoul.switch_soul import SwitchSoul
 from tasks.Component.SwitchSoul.switch_soul import SwitchSoul
+from tasks.DemonEncounter.config import BossType, DemonEncounter, convert_to_general_battle_config
 from tasks.GameUi.game_ui import GameUi
 from tasks.GameUi.game_ui import GameUi
 from tasks.GameUi.page import page_demon_encounter, page_shikigami_records
 from tasks.GameUi.page import page_demon_encounter, page_shikigami_records
 from tasks.DemonEncounter.assets import DemonEncounterAssets
 from tasks.DemonEncounter.assets import DemonEncounterAssets
@@ -32,9 +33,10 @@ class LanternClass(Enum):
 
 
 
 
 class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets, SwitchSoul):
 class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets, SwitchSoul):
-    best_boss_enable = False
+    conf: DemonEncounter = None
 
 
     def run(self):
     def run(self):
+        self.conf = self.config.demon_encounter
         if not self.check_time():
         if not self.check_time():
             logger.warning('Time is not right')
             logger.warning('Time is not right')
             raise TaskEnd('DemonEncounter')
             raise TaskEnd('DemonEncounter')
@@ -52,79 +54,23 @@ class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets, SwitchSoul):
         self.set_next_run(task='DemonEncounter', success=True, finish=False)
         self.set_next_run(task='DemonEncounter', success=True, finish=False)
         raise TaskEnd('DemonEncounter')
         raise TaskEnd('DemonEncounter')
 
 
-    def init_best_boss_enable(self):
-        today = datetime.now().weekday()
-        if today == 0:
-            # 鬼灵歌姬
-            self.best_boss_enable = self.config.model.demon_encounter.best_demon_boss_config.best_demon_kiryou_select
-        elif today == 1:
-            # 蜃气楼
-            self.best_boss_enable = self.config.model.demon_encounter.best_demon_boss_config.best_demon_shinkirou_select
-        elif today == 2:
-            # 土蜘蛛
-            self.best_boss_enable = self.config.model.demon_encounter.best_demon_boss_config.best_demon_tsuchigumo_select
-        elif today == 3:
-            # 荒骷髅
-            self.best_boss_enable = self.config.model.demon_encounter.best_demon_boss_config.best_demon_gashadokuro_select
-        elif today == 4:
-            # 地震鲶
-            self.best_boss_enable = self.config.model.demon_encounter.best_demon_boss_config.best_demon_namazu_select
-
     def checkout_soul(self):
     def checkout_soul(self):
         """
         """
         切换御魂
         切换御魂
         """
         """
-        # 判断今天是周几
-        today = datetime.now().weekday()
-
-        # 普通逢魔御魂
-        soul_config = self.config.demon_encounter.demon_soul_config
-        # 极逢魔御魂
-        best_soul_config = self.config.demon_encounter.best_demon_soul_config
-
-        # 极逢魔选择
-        best_demon_boss_config = self.config.demon_encounter.best_demon_boss_config
-
-        group, team = None, None
-        if today == 0:
-            # 获取group,team
-            if best_soul_config.enable and best_demon_boss_config.best_demon_kiryou_select:
-                group, team = best_soul_config.best_demon_kiryou_utahime.split(",")
-            else:
-                group, team = soul_config.demon_kiryou_utahime.split(",")
-        elif today == 1:
-            if best_soul_config.enable and best_demon_boss_config.best_demon_shinkirou_select:
-                group, team = best_soul_config.best_demon_shinkirou.split(",")
-            else:
-                group, team = soul_config.demon_shinkirou.split(",")
-        elif today == 2:
-            if best_soul_config.enable and best_demon_boss_config.best_demon_tsuchigumo_select:
-                group, team = best_soul_config.best_demon_tsuchigumo.split(",")
-            else:
-                group, team = soul_config.demon_tsuchigumo.split(",")
-        elif today == 3:
-            if best_soul_config.enable and best_demon_boss_config.best_demon_gashadokuro_select:
-                group, team = best_soul_config.best_demon_gashadokuro.split(",")
-            else:
-                group, team = soul_config.demon_gashadokuro.split(",")
-        elif today == 4:
-            if best_soul_config.enable and best_demon_boss_config.best_demon_namazu_select:
-                group, team = best_soul_config.best_demon_namazu.split(",")
-            else:
-                group, team = soul_config.demon_namazu.split(",")
-        elif today == 5:
-            group, team = soul_config.demon_oboroguruma.split(",")
-        elif today == 6:
-            group, team = soul_config.demon_nightly_aramitama.split(",")
+        select_best_demon = getattr(self.conf.best_demon_boss_config, f'{self.boss_type}_select', False)
+        if select_best_demon:
+            group, team = getattr(self.conf.best_demon_soul_config, self.boss_type).split(",")
+        else:
+            group, team = getattr(self.conf.demon_soul_config, self.boss_type).split(",")
         if group and team:
         if group and team:
             self.run_switch_soul_by_name(group, team)
             self.run_switch_soul_by_name(group, team)
-        if today == 0:
-            # 获取group,team
-            if best_soul_config.enable and best_demon_boss_config.best_demon_kiryou_select:
-                group, team = best_soul_config.best_demon_kiryou_utahime_supplementary.split(",")
-            else:
-                group, team = soul_config.demon_kiryou_utahime_supplementary.split(",")
-            self.run_switch_soul_by_name(group, team)
+            if datetime.now().weekday() == 0:
+                if select_best_demon:
+                    group, team = getattr(self.conf.best_demon_soul_config, f'{self.boss_type}_supplementary').split(",")
+                else:
+                    group, team = getattr(self.conf.demon_soul_config, f'{self.boss_type}_supplementary').split(",")
+                self.run_switch_soul_by_name(group, team)
 
 
     def execute_boss(self):
     def execute_boss(self):
         """
         """
@@ -132,7 +78,6 @@ class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets, SwitchSoul):
         :return:
         :return:
         """
         """
         logger.hr('Start boss battle', 1)
         logger.hr('Start boss battle', 1)
-        self.init_best_boss_enable()
 
 
         def find_boss():
         def find_boss():
             find_btn_clicked = False
             find_btn_clicked = False
@@ -150,22 +95,10 @@ class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets, SwitchSoul):
                     # 没找到boss但地图中央出现宝箱,导致点击宝箱出现50勾玉购买界面
                     # 没找到boss但地图中央出现宝箱,导致点击宝箱出现50勾玉购买界面
                     self.ui_click_until_smt_disappear(self.I_DE_FIND, self.I_JADE_50, interval=1)
                     self.ui_click_until_smt_disappear(self.I_DE_FIND, self.I_JADE_50, interval=1)
                     continue
                     continue
-                # if self.appear_then_click(self.I_BOSS_NAMAZU, interval=1):
-                #     continue
-                # if self.appear_then_click(self.I_BOSS_SHINKIRO, interval=1):
-                #     continue
-                # if self.appear_then_click(self.I_BOSS_ODOKURO, interval=1):
-                #     continue
-                # if self.appear_then_click(self.I_BOSS_OBOROGURUMA, interval=1):
-                #     continue
-                # if self.appear_then_click(self.I_BOSS_TSUCHIGUMO, interval=1):
-                #     continue
-                # if self.appear_then_click(self.I_BOSS_SONGSTRESS, interval=1):
-                #     continue
                 if find_btn_clicked and self.click(self.C_DM_BOSS_CLICK, interval=5):
                 if find_btn_clicked and self.click(self.C_DM_BOSS_CLICK, interval=5):
                     find_btn_clicked = False
                     find_btn_clicked = False
                     continue
                     continue
-                if self.best_boss_enable:
+                if self.best_demon_enable:
                     self.device.click_record_clear()
                     self.device.click_record_clear()
                     if self.appear(self.I_DE_BOSS_BEST) and (not find_btn_clicked):
                     if self.appear(self.I_DE_BOSS_BEST) and (not find_btn_clicked):
                         self.device.click_record_remove(self.I_DE_BOSS_BEST)
                         self.device.click_record_remove(self.I_DE_BOSS_BEST)
@@ -186,7 +119,7 @@ class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets, SwitchSoul):
             logger.info('trying to enter boss...')
             logger.info('trying to enter boss...')
             # 点击集结挑战
             # 点击集结挑战
             boss_fire_count = 0  # 五次没点到就意味着今天已经挑战过了
             boss_fire_count = 0  # 五次没点到就意味着今天已经挑战过了
-            ocr_people_item = self.O_DE_BEST_BOSS_PEOPLE if self.best_boss_enable else self.O_DE_BOSS_PEOPLE
+            ocr_people_item = self.O_DE_BEST_BOSS_PEOPLE if self.best_demon_enable else self.O_DE_BOSS_PEOPLE
             while 1:
             while 1:
                 self.screenshot()
                 self.screenshot()
 
 
@@ -237,8 +170,7 @@ class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets, SwitchSoul):
         time.sleep(5)
         time.sleep(5)
         # 延长时间并在战斗结束后改回来
         # 延长时间并在战斗结束后改回来
         self.device.stuck_timer_long = Timer(480, count=480).start()
         self.device.stuck_timer_long = Timer(480, count=480).start()
-        #
-        config = self.con
+        preset_switched = False
         while True:
         while True:
             self.screenshot()
             self.screenshot()
             if self.appear(self.I_BOSS_DONE_CHECK):
             if self.appear(self.I_BOSS_DONE_CHECK):
@@ -254,7 +186,19 @@ class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets, SwitchSoul):
                 sleep(2)
                 sleep(2)
                 continue
                 continue
             if self.appear(self.I_PREPARE_HIGHLIGHT):
             if self.appear(self.I_PREPARE_HIGHLIGHT):
-                self.run_general_battle(config)
+                if preset_switched:
+                    self.run_general_battle()
+                    continue
+                preset_switched = True
+                # 逢魔其他战斗会影响current_count导致大于0
+                self.current_count = 0
+                if self.best_demon_enable:
+                    general_battle_config = convert_to_general_battle_config(self.boss_type,
+                                                                             best_demon_battle_conf=self.conf.best_demon_battle_config)
+                else:
+                    general_battle_config = convert_to_general_battle_config(self.boss_type,
+                                                                             demon_battle_conf=self.conf.demon_battle_config)
+                self.run_general_battle(config=general_battle_config)
                 continue
                 continue
             logger.info('Unknown scene Or Boss fight failed.waiting for Prepare_Button appear...')
             logger.info('Unknown scene Or Boss fight failed.waiting for Prepare_Button appear...')
             self.wait_until_appear(self.I_PREPARE_HIGHLIGHT, wait_time=2)
             self.wait_until_appear(self.I_PREPARE_HIGHLIGHT, wait_time=2)
@@ -329,10 +273,6 @@ class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets, SwitchSoul):
                     self._boss(match_click[i])
                     self._boss(match_click[i])
             time.sleep(1)
             time.sleep(1)
 
 
-    @cached_property
-    def con(self) -> GeneralBattleConfig:
-        return GeneralBattleConfig()
-
     def check_lantern(self, index: int = 1):
     def check_lantern(self, index: int = 1):
         """
         """
         检查灯笼的类型
         检查灯笼的类型
@@ -411,7 +351,6 @@ class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets, SwitchSoul):
                 logger.info('Buy one hundred sushi for 50 jade')
                 logger.info('Buy one hundred sushi for 50 jade')
                 self.click(self.I_JADE_50)
                 self.click(self.I_JADE_50)
                 continue
                 continue
-            
 
 
     def _mail(self, target_click):
     def _mail(self, target_click):
         # 答题
         # 答题
@@ -480,7 +419,6 @@ class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets, SwitchSoul):
             time.sleep(0.5)
             time.sleep(0.5)
 
 
     def _battle(self, target_click):
     def _battle(self, target_click):
-        config = self.con
         while 1:
         while 1:
             self.screenshot()
             self.screenshot()
             if not self.appear(self.I_DE_LOCATION):
             if not self.appear(self.I_DE_LOCATION):
@@ -499,12 +437,11 @@ class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets, SwitchSoul):
 
 
             if self.click(target_click, interval=1):
             if self.click(target_click, interval=1):
                 continue
                 continue
-        if self.run_general_battle(config):
+        if self.run_general_battle():
             logger.info('Battle End')
             logger.info('Battle End')
 
 
     def _realm(self, target_click):
     def _realm(self, target_click):
         # 结界
         # 结界
-        config = self.con
         while 1:
         while 1:
             self.screenshot()
             self.screenshot()
             if not self.appear(self.I_DE_LOCATION):
             if not self.appear(self.I_DE_LOCATION):
@@ -515,7 +452,7 @@ class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets, SwitchSoul):
 
 
             if self.click(target_click, interval=1):
             if self.click(target_click, interval=1):
                 continue
                 continue
-        if self.run_general_battle(config):
+        if self.run_general_battle():
             logger.info('Battle End')
             logger.info('Battle End')
 
 
     def _mystery(self, target_click):
     def _mystery(self, target_click):
@@ -595,6 +532,18 @@ class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets, SwitchSoul):
                 logger.warning('Obtain battle timeout')
                 logger.warning('Obtain battle timeout')
                 return True
                 return True
 
 
+    @property
+    def boss_type(self) -> str:
+        boss_name = BossType(datetime.now().weekday()).name
+        if self.best_demon_enable:
+            return f'best_demon_{boss_name}'
+        return f'demon_{boss_name}'
+
+    @property
+    def best_demon_enable(self) -> bool:
+        boss_name = BossType(datetime.now().weekday()).name
+        return getattr(self.conf.best_demon_boss_config, f'best_demon_{boss_name}_select', False)
+
 
 
 if __name__ == '__main__':
 if __name__ == '__main__':
     from module.config.config import Config
     from module.config.config import Config

+ 1 - 0
tasks/Dokan/script_task.py

@@ -384,6 +384,7 @@ class ScriptTask(ExtendGreenMark, GameUi, SwitchSoul, DokanSceneDetector):
             if battle_config.random_click_swipt_enable:
             if battle_config.random_click_swipt_enable:
                 logger.info("random swipt ...")
                 logger.info("random swipt ...")
                 self.random_click_swipt()
                 self.random_click_swipt()
+                self.device.stuck_record_add('BATTLE_STATUS_S')
 
 
             # 打完一个小朋友,自动进入下一个小朋友
             # 打完一个小朋友,自动进入下一个小朋友
             if self.appear(self.I_RYOU_DOKAN_IN_FIELD):
             if self.appear(self.I_RYOU_DOKAN_IN_FIELD):

+ 0 - 68
tasks/GameUi/game_ui.py

@@ -64,34 +64,6 @@ class GameUi(BaseTask, GameUiAssets):
     def ui_pages(self) -> list[Page]:
     def ui_pages(self) -> list[Page]:
         return PageRegistry.all()
         return PageRegistry.all()
 
 
-    def home_explore(self) -> bool:
-        """
-        使用ocr识别到探索按钮并点击
-        :return:
-        """
-        while 1:
-            self.screenshot()
-            if self.ocr_appear_click(self.O_HOME_EXPLORE, interval=2):
-                continue
-            if self.appear(self.I_BACK_BLUE, threshold=0.6):
-                break
-        logger.info(f'Click {self.O_HOME_EXPLORE.name}')
-        return True
-
-    def explore_home(self) -> bool:
-        """
-
-        :return:
-        """
-        while 1:
-            self.screenshot()
-            if self.appear_then_click(self.I_BACK_BLUE, threshold=0.6, interval=2):
-                continue
-            if self.appear(self.I_HOME_SHIKIKAMI, threshold=0.6):
-                break
-        logger.info(f'Click {self.I_HOME_SHIKIKAMI.name}')
-        return True
-
     def ui_page_appear(self, page: Page, skip_first_screenshot: bool = True, interval: float = None):
     def ui_page_appear(self, page: Page, skip_first_screenshot: bool = True, interval: float = None):
         """
         """
         判断当前页面是否为page
         判断当前页面是否为page
@@ -122,23 +94,6 @@ class GameUi(BaseTask, GameUiAssets):
             skip_first_screenshot = False
             skip_first_screenshot = False
         return False
         return False
 
 
-    def ensure_scroll_open(self):
-        """
-        判断庭院界面卷轴是否打开
-        """
-        return self.appear(RestartAssets.I_LOGIN_SCROOLL_CLOSE)
-
-    def ensure_button_execute(self, button):
-        """
-        确保button执行
-        """
-        if isinstance(button, RuleImage) and self.appear(button):
-            return True
-        elif callable(button) and button():
-            return True
-        else:
-            return False
-
     def ui_get_current_page(self, skip_first_screenshot=True) -> Page:
     def ui_get_current_page(self, skip_first_screenshot=True) -> Page:
         """
         """
         获取当前页面
         获取当前页面
@@ -382,29 +337,6 @@ class GameUi(BaseTask, GameUiAssets):
             operated = self.click(target, interval=interval)
             operated = self.click(target, interval=interval)
         return operated
         return operated
 
 
-    # ------------------------------------------------------------------------------------------------------------------
-    # 下面的这些是一些特殊的页面,需要额外处理
-    # ------------------------------------------------------------------------------------------------------------------
-
-    def main_goto_daily(self):
-        """
-        无法直接一步到花合战,需要先到主页,然后再到花合战
-        :return:
-        """
-        while 1:
-            self.screenshot()
-            if self.appear(self.I_CHECK_DAILY):
-                break
-            if self.appear_then_click(self.I_MAIN_GOTO_DAILY, interval=1):
-                continue
-            if self.ocr_appear_click(self.O_CLICK_CLOSE_1, interval=1):
-                continue
-            if self.ocr_appear_click(self.O_CLICK_CLOSE_2, interval=1):
-                continue
-        logger.info('Page arrive: Daily')
-        time.sleep(1)
-        return
-
 
 
 if __name__ == '__main__':
 if __name__ == '__main__':
     from module.config.config import Config
     from module.config.config import Config

+ 5 - 2
tasks/GameUi/page.py

@@ -1,3 +1,5 @@
+from itertools import compress
+
 import random
 import random
 
 
 import traceback
 import traceback
@@ -212,12 +214,13 @@ page_act_list_climb_act.link(button=G.I_BACK_ACT_LIST, destination=page_main)
 page_battle = Page(GeneralBattleAssets.I_BATTLE_INFO)
 page_battle = Page(GeneralBattleAssets.I_BATTLE_INFO)
 
 
 
 
-def random_click(low: int = None, high: int = None) -> RuleClick | list[RuleClick]:
+def random_click(low: int = None, high: int = None, ltrb: tuple = (True, False, True, False)) -> RuleClick | list[RuleClick]:
     """
     """
     随机生成RuleClick, 不传入参数则返回1个RuleClick, 传入参数则生成范围内的click数组
     随机生成RuleClick, 不传入参数则返回1个RuleClick, 传入参数则生成范围内的click数组
     :return: RuleClick或者RuleClick的数组
     :return: RuleClick或者RuleClick的数组
     """
     """
-    click = random.choice([asa.C_RANDOM_LEFT, asa.C_RANDOM_RIGHT, asa.C_RANDOM_TOP])
+    click_area_list = [asa.C_RANDOM_LEFT, asa.C_RANDOM_TOP, asa.C_RANDOM_RIGHT, asa.C_RANDOM_BOTTOM]
+    click = random.choice(list(compress(click_area_list, ltrb)))
     click.name = "SAFE_RANDOM_CLICK"
     click.name = "SAFE_RANDOM_CLICK"
     if low is None or high is None:
     if low is None or high is None:
         return click
         return click

+ 2 - 0
tasks/Hyakkiyakou/config.py

@@ -1,5 +1,6 @@
 from pydantic import BaseModel, Field, field_validator
 from pydantic import BaseModel, Field, field_validator
 from enum import Enum
 from enum import Enum
+from tasks.Component.SwitchOnmyoji.config import Onmyoji
 
 
 from tasks.Component.config_scheduler import Scheduler
 from tasks.Component.config_scheduler import Scheduler
 from tasks.Component.config_base import ConfigBase, Time, dynamic_hide
 from tasks.Component.config_base import ConfigBase, Time, dynamic_hide
@@ -26,6 +27,7 @@ class HyakkiyakouConfig(ConfigBase):
     hya_limit_time: Time = Field(default=Time(minute=20), description='hya_limit_time_help')
     hya_limit_time: Time = Field(default=Time(minute=20), description='hya_limit_time_help')
     hya_limit_count: int = Field(default=10, description='hya_limit_count_help')
     hya_limit_count: int = Field(default=10, description='hya_limit_count_help')
     hya_invite_friend: bool = Field(default=False, description='hya_invite_friend_help')
     hya_invite_friend: bool = Field(default=False, description='hya_invite_friend_help')
+    hya_onmyoji: Onmyoji = Field(default=Onmyoji.KAGURA, description='切换阴阳师')
     # 自动调整豆子数量
     # 自动调整豆子数量
     hya_auto_bean: bool = Field(default=False, description='hya_auto_bean_help')
     hya_auto_bean: bool = Field(default=False, description='hya_auto_bean_help')
     hya_priorities: str = Field(default='', description='hya_priorities_help')
     hya_priorities: str = Field(default='', description='hya_priorities_help')

+ 8 - 7
tasks/Hyakkiyakou/script_task.py

@@ -19,11 +19,10 @@ from oashya.utils import draw_tracks
 from module.exception import TaskEnd
 from module.exception import TaskEnd
 from module.logger import logger
 from module.logger import logger
 from module.exception import RequestHumanTakeover
 from module.exception import RequestHumanTakeover
+from tasks.Component.SwitchOnmyoji.switch_onmyoji import SwitchOnmyoji
 from tasks.GameUi.game_ui import GameUi
 from tasks.GameUi.game_ui import GameUi
-from tasks.GameUi.page import page_hyakkiyakou
-from tasks.Hyakkiyakou.config import Hyakkiyakou as HyakkiyakouConfig
+from tasks.GameUi.page import page_hyakkiyakou, page_main, page_onmyodo
 from tasks.Hyakkiyakou.config import InferenceEngine, ModelPrecision
 from tasks.Hyakkiyakou.config import InferenceEngine, ModelPrecision
-from tasks.Hyakkiyakou.assets import HyakkiyakouAssets
 from tasks.Hyakkiyakou.agent.agent import Agent
 from tasks.Hyakkiyakou.agent.agent import Agent
 from tasks.Hyakkiyakou.slave.hya_slave import HyaSlave
 from tasks.Hyakkiyakou.slave.hya_slave import HyaSlave
 from tasks.Hyakkiyakou.debugger import Debugger
 from tasks.Hyakkiyakou.debugger import Debugger
@@ -47,7 +46,7 @@ def plot_save(image, boxes):
     cv2.imwrite(save_file, image)
     cv2.imwrite(save_file, image)
 
 
 
 
-class ScriptTask(GameUi, HyaSlave):
+class ScriptTask(GameUi, HyaSlave, SwitchOnmyoji):
 
 
     @property
     @property
     def _config(self):
     def _config(self):
@@ -124,9 +123,9 @@ class ScriptTask(GameUi, HyaSlave):
         limit_time = self._config.hyakkiyakou_config.hya_limit_time
         limit_time = self._config.hyakkiyakou_config.hya_limit_time
         self.limit_time: timedelta = timedelta(hours=limit_time.hour, minutes=limit_time.minute,
         self.limit_time: timedelta = timedelta(hours=limit_time.hour, minutes=limit_time.minute,
                                                seconds=limit_time.second)
                                                seconds=limit_time.second)
-        self.ui_get_current_page()
-        self.ui_goto(page_hyakkiyakou)
-
+        self.ui_goto_page(page_onmyodo)
+        self.switch_onmyoji(self._config.hyakkiyakou_config.hya_onmyoji)
+        self.ui_goto_page(page_hyakkiyakou)
 
 
         while 1:
         while 1:
             if hya_count >= self.limit_count:
             if hya_count >= self.limit_count:
@@ -138,6 +137,8 @@ class ScriptTask(GameUi, HyaSlave):
 
 
             self.one()
             self.one()
             hya_count += 1
             hya_count += 1
+            logger.info(f'count: {hya_count}/{self.limit_count}')
+            logger.info(f'time: {(datetime.now() - self.start_time).total_seconds():.1f}s/{self.limit_time.total_seconds()}s')
 
 
         while 1:
         while 1:
             self.screenshot()
             self.screenshot()

+ 3 - 5
tasks/TalismanPass/script_task.py

@@ -12,12 +12,11 @@ from module.logger import logger
 from module.exception import TaskEnd
 from module.exception import TaskEnd
 from module.base.timer import Timer
 from module.base.timer import Timer
 
 
+
 class ScriptTask(GameUi, TalismanPassAssets):
 class ScriptTask(GameUi, TalismanPassAssets):
 
 
     def run(self):
     def run(self):
-        self.ui_get_current_page()
-        self.ui_goto(page_main)
-        self.main_goto_daily()
+        self.ui_goto_page(page_daily)
         con: TalismanConfig = self.config.talisman_pass.talisman
         con: TalismanConfig = self.config.talisman_pass.talisman
 
 
         # 收取全部奖励
         # 收取全部奖励
@@ -27,12 +26,11 @@ class ScriptTask(GameUi, TalismanPassAssets):
         self.get_flower(con.level_reward)
         self.get_flower(con.level_reward)
         # 收取1500签御魂
         # 收取1500签御魂
         if con.harvest_soul:
         if con.harvest_soul:
-            self.ui_goto(page_main)
+            self.ui_goto_page(page_main)
             self.harvest_soul()
             self.harvest_soul()
         self.set_next_run(task='TalismanPass', success=True, finish=True)
         self.set_next_run(task='TalismanPass', success=True, finish=True)
         raise TaskEnd('TalismanPass')
         raise TaskEnd('TalismanPass')
 
 
-
     def get_all(self):
     def get_all(self):
         """
         """
         一键收取所有的
         一键收取所有的