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

add(BondlingFairyland): four mode and fix capture setting

Azure 1 год назад
Родитель
Сommit
11d08ff4d0

+ 32 - 26
tasks/BondlingFairyland/assets.py

@@ -70,8 +70,8 @@ class BondlingFairylandAssets:
 
 
 	# Image Rule Assets
-	# description 
-	I_BF_SEARSH = RuleImage(roi_front=(1133,577,100,100), roi_back=(1133,577,100,100), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/bf/bf_bf_searsh.png")
+	# 探查按钮 
+	I_BF_SEARSH = RuleImage(roi_front=(1144,580,88,85), roi_back=(1102,531,176,188), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/bf/bf_bf_searsh.png")
 	# description 
 	I_BF_LOCK = RuleImage(roi_front=(826,653,24,26), roi_back=(826,653,24,26), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/bf/bf_bf_lock.png")
 	# description 
@@ -114,30 +114,34 @@ class BondlingFairylandAssets:
 
 
 	# Image Rule Assets
-	# description 
-	I_C_AUTO_TRUE = RuleImage(roi_front=(524,175,38,35), roi_back=(524,175,38,35), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/capture/capture_c_auto_true.png")
-	# description 
-	I_C_AUTO_FALSE = RuleImage(roi_front=(524,174,38,37), roi_back=(524,174,38,37), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/capture/capture_c_auto_false.png")
-	# description 
-	I_C_LOW_TRUE = RuleImage(roi_front=(543,271,30,32), roi_back=(543,271,30,32), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/capture/capture_c_low_true.png")
-	# description 
-	I_C_LOW_FALSE = RuleImage(roi_front=(539,269,37,35), roi_back=(539,269,37,35), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/capture/capture_c_low_false.png")
-	# description 
-	I_C_MIDUM_TRUE = RuleImage(roi_front=(680,277,35,27), roi_back=(680,277,35,27), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/capture/capture_c_midum_true.png")
-	# description 
-	I_C_MIDUM_FALSE = RuleImage(roi_front=(681,272,31,32), roi_back=(681,272,31,32), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/capture/capture_c_midum_false.png")
-	# description 
-	I_C_HIGH_TRUE = RuleImage(roi_front=(819,272,37,31), roi_back=(819,272,37,31), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/capture/capture_c_high_true.png")
-	# description 
-	I_C_HIGH_FALSE = RuleImage(roi_front=(818,272,36,34), roi_back=(818,272,36,34), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/capture/capture_c_high_false.png")
-	# description 
-	I_C_FIRST_ENABLE = RuleImage(roi_front=(524,472,33,31), roi_back=(524,472,33,31), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/capture/capture_c_first_enable.png")
-	# description 
-	I_C_FIRST_DISABLE = RuleImage(roi_front=(713,469,38,34), roi_back=(713,469,38,34), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/capture/capture_c_first_disable.png")
-	# description 
-	I_CAPTION_ENSURE = RuleImage(roi_front=(690,532,129,56), roi_back=(690,532,129,56), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/capture/capture_caption_ensure.png")
-	# 结契设置 
-	I_CLICK_CAPTION = RuleImage(roi_front=(177,625,59,51), roi_back=(177,625,59,51), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/capture/capture_click_caption.png")
+	# 启用自动结契 
+	I_C_AUTO_TRUE = RuleImage(roi_front=(765,157,50,24), roi_back=(752,145,79,51), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/capture/capture_c_auto_true.png")
+	# 关闭自动结契 
+	I_C_AUTO_FALSE = RuleImage(roi_front=(768,156,43,25), roi_back=(745,146,88,44), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/capture/capture_c_auto_false.png")
+	# 启用低级盘子 
+	I_C_LOW_TRUE = RuleImage(roi_front=(524,242,30,32), roi_back=(512,233,51,50), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/capture/capture_c_low_true.png")
+	# 禁用低级盘子 
+	I_C_LOW_FALSE = RuleImage(roi_front=(521,238,33,35), roi_back=(513,231,48,47), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/capture/capture_c_low_false.png")
+	# 启用中级盘子 
+	I_C_MIDUM_TRUE = RuleImage(roi_front=(663,241,31,31), roi_back=(657,238,41,38), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/capture/capture_c_midum_true.png")
+	# 禁用中级盘子 
+	I_C_MIDUM_FALSE = RuleImage(roi_front=(662,241,31,32), roi_back=(654,234,49,45), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/capture/capture_c_midum_false.png")
+	# 启用高级盘子 
+	I_C_HIGH_TRUE = RuleImage(roi_front=(800,239,33,36), roi_back=(796,236,42,44), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/capture/capture_c_high_true.png")
+	# 禁用高级盘子 
+	I_C_HIGH_FALSE = RuleImage(roi_front=(801,241,32,34), roi_back=(792,232,51,50), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/capture/capture_c_high_false.png")
+	# 启用优先连接羁绊式神 
+	I_C_FIRST_ENABLE = RuleImage(roi_front=(507,517,33,31), roi_back=(499,510,49,47), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/capture/capture_c_first_enable.png")
+	# 禁用优先连接羁绊式神 
+	I_C_FIRST_DISABLE = RuleImage(roi_front=(708,518,38,34), roi_back=(703,513,46,44), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/capture/capture_c_first_disable.png")
+	# 结契设置确定 
+	I_CAPTION_ENSURE = RuleImage(roi_front=(668,567,129,56), roi_back=(655,557,153,77), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/capture/capture_caption_ensure.png")
+	# 结契设置按钮 
+	I_CLICK_CAPTION = RuleImage(roi_front=(68,414,54,42), roi_back=(48,398,97,81), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/capture/capture_click_caption.png")
+	# 禁用连续使用盘子 
+	I_C_CONTINUOUS_DISABLE = RuleImage(roi_front=(710,424,33,36), roi_back=(700,417,50,52), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/capture/capture_c_continuous_disable.png")
+	# 启用连续使用盘子 
+	I_C_CONTINUOUS_ENABLE = RuleImage(roi_front=(508,424,32,34), roi_back=(501,417,47,48), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/capture/capture_c_continuous_enable.png")
 
 
 	# Image Rule Assets
@@ -173,5 +177,7 @@ class BondlingFairylandAssets:
 	I_BUY_ADD = RuleImage(roi_front=(678,540,43,40), roi_back=(678,540,43,40), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/stone/buy_add.png")
 	# description 
 	I_BUY_SUB = RuleImage(roi_front=(468,540,43,40), roi_back=(468,540,43,40), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/stone/buy_sub.png")
+	# 关闭购买契灵页面 
+	I_STONE_CLOSE = RuleImage(roi_front=(911,56,42,38), roi_back=(888,49,100,100), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/stone/stone_stone_close.png")
 
 

BIN
tasks/BondlingFairyland/bf/bf_bf_searsh.png


+ 3 - 3
tasks/BondlingFairyland/bf/image.json

@@ -2,11 +2,11 @@
   {
     "itemName": "bf_searsh",
     "imageName": "bf_bf_searsh.png",
-    "roiFront": "1133,577,100,100",
-    "roiBack": "1133,577,100,100",
+    "roiFront": "1144,580,88,85",
+    "roiBack": "1102,531,176,188",
     "method": "Template matching",
     "threshold": 0.8,
-    "description": "description"
+    "description": "探查按钮"
   },
   {
     "itemName": "bf_lock",

BIN
tasks/BondlingFairyland/capture/capture_c_auto_false.png


BIN
tasks/BondlingFairyland/capture/capture_c_auto_true.png


BIN
tasks/BondlingFairyland/capture/capture_c_continuous_disable.png


BIN
tasks/BondlingFairyland/capture/capture_c_continuous_enable.png


BIN
tasks/BondlingFairyland/capture/capture_c_first_disable.png


BIN
tasks/BondlingFairyland/capture/capture_c_first_enable.png


BIN
tasks/BondlingFairyland/capture/capture_c_high_false.png


BIN
tasks/BondlingFairyland/capture/capture_c_high_true.png


BIN
tasks/BondlingFairyland/capture/capture_c_low_false.png


BIN
tasks/BondlingFairyland/capture/capture_c_low_true.png


BIN
tasks/BondlingFairyland/capture/capture_c_midum_false.png


BIN
tasks/BondlingFairyland/capture/capture_c_midum_true.png


BIN
tasks/BondlingFairyland/capture/capture_caption_ensure.png


BIN
tasks/BondlingFairyland/capture/capture_click_caption.png


+ 54 - 36
tasks/BondlingFairyland/capture/image.json

@@ -2,109 +2,127 @@
   {
     "itemName": "c_auto_true",
     "imageName": "capture_c_auto_true.png",
-    "roiFront": "524,175,38,35",
-    "roiBack": "524,175,38,35",
+    "roiFront": "765,157,50,24",
+    "roiBack": "752,145,79,51",
     "method": "Template matching",
     "threshold": 0.8,
-    "description": "description"
+    "description": "启用自动结契"
   },
   {
     "itemName": "c_auto_false",
     "imageName": "capture_c_auto_false.png",
-    "roiFront": "524,174,38,37",
-    "roiBack": "524,174,38,37",
+    "roiFront": "768,156,43,25",
+    "roiBack": "745,146,88,44",
     "method": "Template matching",
     "threshold": 0.8,
-    "description": "description"
+    "description": "关闭自动结契"
   },
   {
     "itemName": "c_low_true",
     "imageName": "capture_c_low_true.png",
-    "roiFront": "543,271,30,32",
-    "roiBack": "543,271,30,32",
+    "roiFront": "524,242,30,32",
+    "roiBack": "512,233,51,50",
     "method": "Template matching",
     "threshold": 0.8,
-    "description": "description"
+    "description": "启用低级盘子"
   },
   {
     "itemName": "c_low_false",
     "imageName": "capture_c_low_false.png",
-    "roiFront": "539,269,37,35",
-    "roiBack": "539,269,37,35",
+    "roiFront": "521,238,33,35",
+    "roiBack": "513,231,48,47",
     "method": "Template matching",
     "threshold": 0.8,
-    "description": "description"
+    "description": "禁用低级盘子"
   },
   {
     "itemName": "c_midum_true",
     "imageName": "capture_c_midum_true.png",
-    "roiFront": "680,277,35,27",
-    "roiBack": "680,277,35,27",
+    "roiFront": "663,241,31,31",
+    "roiBack": "657,238,41,38",
     "method": "Template matching",
     "threshold": 0.8,
-    "description": "description"
+    "description": "启用中级盘子"
   },
   {
     "itemName": "c_midum_false",
     "imageName": "capture_c_midum_false.png",
-    "roiFront": "681,272,31,32",
-    "roiBack": "681,272,31,32",
+    "roiFront": "662,241,31,32",
+    "roiBack": "654,234,49,45",
     "method": "Template matching",
     "threshold": 0.8,
-    "description": "description"
+    "description": "禁用中级盘子"
   },
   {
     "itemName": "c_high_true",
     "imageName": "capture_c_high_true.png",
-    "roiFront": "819,272,37,31",
-    "roiBack": "819,272,37,31",
+    "roiFront": "800,239,33,36",
+    "roiBack": "796,236,42,44",
     "method": "Template matching",
     "threshold": 0.8,
-    "description": "description"
+    "description": "启用高级盘子"
   },
   {
     "itemName": "c_high_false",
     "imageName": "capture_c_high_false.png",
-    "roiFront": "818,272,36,34",
-    "roiBack": "818,272,36,34",
+    "roiFront": "801,241,32,34",
+    "roiBack": "792,232,51,50",
     "method": "Template matching",
     "threshold": 0.8,
-    "description": "description"
+    "description": "禁用高级盘子"
   },
   {
     "itemName": "c_first_enable",
     "imageName": "capture_c_first_enable.png",
-    "roiFront": "524,472,33,31",
-    "roiBack": "524,472,33,31",
+    "roiFront": "507,517,33,31",
+    "roiBack": "499,510,49,47",
     "method": "Template matching",
     "threshold": 0.8,
-    "description": "description"
+    "description": "启用优先连接羁绊式神"
   },
   {
     "itemName": "c_first_disable",
     "imageName": "capture_c_first_disable.png",
-    "roiFront": "713,469,38,34",
-    "roiBack": "713,469,38,34",
+    "roiFront": "708,518,38,34",
+    "roiBack": "703,513,46,44",
     "method": "Template matching",
     "threshold": 0.8,
-    "description": "description"
+    "description": "禁用优先连接羁绊式神"
   },
   {
     "itemName": "caption_ensure",
     "imageName": "capture_caption_ensure.png",
-    "roiFront": "690,532,129,56",
-    "roiBack": "690,532,129,56",
+    "roiFront": "668,567,129,56",
+    "roiBack": "655,557,153,77",
     "method": "Template matching",
     "threshold": 0.8,
-    "description": "description"
+    "description": "结契设置确定"
   },
   {
     "itemName": "click_caption",
     "imageName": "capture_click_caption.png",
-    "roiFront": "177,625,59,51",
-    "roiBack": "177,625,59,51",
+    "roiFront": "68,414,54,42",
+    "roiBack": "48,398,97,81",
     "method": "Template matching",
     "threshold": 0.8,
-    "description": "结契设置"
+    "description": "结契设置按钮"
+  },
+  {
+    "itemName": "c_continuous_disable",
+    "imageName": "capture_c_continuous_disable.png",
+    "roiFront": "710,424,33,36",
+    "roiBack": "700,417,50,52",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "禁用连续使用盘子"
+  },
+  {
+    "itemName": "c_continuous_enable",
+    "imageName": "capture_c_continuous_enable.png",
+    "roiFront": "508,424,32,34",
+    "roiBack": "501,417,47,48",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "启用连续使用盘子"
   }
 ]

+ 33 - 19
tasks/BondlingFairyland/config.py

@@ -1,22 +1,21 @@
 # This Python file uses the following encoding: utf-8
 # @author runhey
 # github https://github.com/runhey
-from pydantic import BaseModel, Field
+from pydantic import BaseModel, Field, field_validator
 from enum import Enum
 from datetime import datetime, time
 
-from tasks.Component.SwitchSoul.switch_soul_config import SwitchSoulConfig
 from tasks.Component.config_scheduler import Scheduler
 from tasks.Component.config_base import ConfigBase, DateTime, TimeDelta, Time
 from tasks.BondlingFairyland.config_battle import BattleConfig
 from tasks.Component.GeneralInvite.config_invite import InviteConfig
-from tasks.Component.GeneralBattle.config_general_battle import GeneralBattleConfig
 
 
 class BondlingMode(str, Enum):
-    MODE1 = 'mode_1'
-    MODE2 = 'mode_2'
-    MODE3 = 'mode_3'
+    MODE1 = '只刷探查(仅限单刷)'
+    MODE2 = '只刷契灵(低级式盘)'
+    MODE3 = '只刷契灵(中级式盘)'
+    MODE4 = '只刷契灵(高级式盘)'
 
 
 class BondlingClass(str, Enum):
@@ -55,15 +54,33 @@ class UserStatus(str, Enum):
 class BondlingConfig(ConfigBase):
     # 身份
     user_status: UserStatus = Field(default=UserStatus.ALONE, description='user_status_help')
-    bondling_mode: BondlingMode = Field(default=BondlingMode.MODE1, description='目前没用但需要切换到mode2,结契设置需要提前配置好')
+    bondling_mode: BondlingMode = Field(default=BondlingMode.MODE1,
+                                        description='只刷探查:自动切换契灵对应地域\n低级式盘:自动切换非连续,非羁绊\n中级式盘:自动切换连续,羁绊')
     limit_time: Time = Field(default=Time(minute=30), description='limit_time_help')
     limit_count: int = Field(default=30, description='limit_count_help')
-    bondling_stone_enable: bool = Field(default=False, description='bondling_stone_enable_help')
-    bondling_stone_class: BondlingClass = Field(default=BondlingClass.TOMB_GUARD, description='bondling_stone_class_help')
+    bondling_stone_class: BondlingClass = Field(default=BondlingClass.TOMB_GUARD, description='设置需要刷的契灵')
+    bondling_stone_enable: bool = Field(default=False, description='没有契灵了是否使用鸣契石购买契灵')
+    bondling_search_enable: bool = Field(default=False, description='没有契灵了是否自动探查(要求身份必须是alone,否则此项无效)\n'
+                                                                    '若启用了购买契灵则优先购买契灵,购买失败则进行探查\n'
+                                                                    '若启用了切换御魂则切换契灵御魂的同时也会切换探查御魂\n'
+                                                                    '注:探查耗费的时间与次数也计入总时间和次数中')
+    check_enable: bool = Field(default=True, description='是否检查契忆数量')
+    limit_num: int = Field(default=2000, description='契忆数量限制,到达此限制将自动结束任务(仅在任务开始时判断)')
+
+    @field_validator("bondling_mode", mode="before")
+    def convert_old_value(cls, v):
+        old_new_map = {
+            "mode_1": "只刷探查(仅限单刷)",
+            'mode_2': '只刷契灵(低级式盘)',
+            'mode_3': '只刷契灵(中级式盘)'
+        }
+        return old_new_map.get(v, v)
 
 
 class BondlingSwitchSoul(ConfigBase):
-    enable: bool = Field(default=False, description='若是数字分隔,则自动以编号方式切换御魂(组号,队伍号),限制组号1-7,队伍号1-4\n若非数字,则自动以ocr方式切换御魂(组名,队伍名)')
+    enable: bool = Field(default=False,
+                         description='若是数字,则以编号方式切换御魂(组号,队伍号),组号1-7,队伍号1-4\n若非数字,则自动以ocr方式切换御魂(组名,队伍名)')
+    search_switch: str = Field(default='', description='设置探查御魂装配分组')
     tomb_guard_switch: str = Field(default='', description='tomb_guard_switch_help')
     snowball_switch: str = Field(default='', description='snowball_switch_help')
     little_kuro_switch: str = Field(default='', description='little_kuro_switch_help')
@@ -75,7 +92,11 @@ class BondlingSwitchSoul(ConfigBase):
 
     def get_switch_by_enum(self, bondling_enum: BondlingClass) -> tuple[str, tuple[str | int, str | int]]:
         """根据枚举获取对应的 切换类型, (group,team)"""
-        group_team = getattr(self, f"{bondling_enum.name.lower()}_switch", None)
+        return self.get_switch_by_name(f"{bondling_enum.name.lower()}_switch")
+
+    def get_switch_by_name(self, switch_name: str) -> tuple[str, tuple[str | int, str | int]]:
+        """根据名称获取对应的御魂预设"""
+        group_team = getattr(self, switch_name, None)
         if group_team is None or group_team.strip() == '' or ',' not in group_team or len(group_team.split(',')) != 2:
             return None, (None, None)
         group, team = group_team.split(',')
@@ -84,16 +105,9 @@ class BondlingSwitchSoul(ConfigBase):
         return 'str', (group, team)
 
 
-class BondlingCheck(ConfigBase):
-    check_enable: bool = Field(default=True, description='是否检查契忆数量')
-    limit_num: int = Field(default=2000, description='契忆数量限制')
-
-
 class BondlingFairyland(ConfigBase):
     scheduler: Scheduler = Field(default_factory=Scheduler)
-    bondling_check: BondlingCheck = Field(default_factory=BondlingCheck)
     bondling_config: BondlingConfig = Field(default_factory=BondlingConfig)
     invite_config: InviteConfig = Field(default_factory=InviteConfig)
-    battle_config: BattleConfig = Field(default_factory=BattleConfig)
-    # battle_config: GeneralBattleConfig = Field(default_factory=GeneralBattleConfig)
     bondling_switch_soul: BondlingSwitchSoul = Field(default_factory=BondlingSwitchSoul)
+    battle_config: BattleConfig = Field(default_factory=BattleConfig)

+ 121 - 73
tasks/BondlingFairyland/script_task.py

@@ -4,6 +4,7 @@
 
 from time import sleep
 
+import random
 from cached_property import cached_property
 from datetime import datetime
 from datetime import timedelta, time
@@ -36,47 +37,40 @@ class ScriptTask(GameUi, GeneralInvite, GeneralRoom, BondlingBattle, SwitchSoul,
     first_catch = True  # 用于记录是否是第一次捕捉
 
     def run(self):
-        # 引用配置
         cong = self.config.bondling_fairyland
 
-        if cong.bondling_check.check_enable:
+        if cong.bondling_config.check_enable:
             logger.hr('第一步, 检查契忆数量', 2)
             self.ui_get_current_page()
             self.ui_goto(page_mall, confirm_wait=2.5)
             self.ui_click(self.I_MALL_SCCALES, self.I_MALL_SCCALES_CHECK)
             self.ui_click(self.I_MALL_BONDLINGS_SURE, self.I_MALL_BONDLINGS_ON)
-
-            MAX_COUNT = cong.bondling_check.limit_num
+            MAX_COUNT = cong.bondling_config.limit_num
             cu, re, total = self.O_BL_CHECK_MONEY.ocr(self.device.image)
-
             if cu >= MAX_COUNT:
                 logger.info(f'契忆数量: {cu} 大于 {MAX_COUNT}')
                 self.ui_get_current_page()
                 self.ui_goto(page_main)
                 self.set_next_run(task='BondlingFairyland', finish=True, success=True)
                 raise TaskEnd
-
             logger.info(f'契忆数量: {cu} 小于 {MAX_COUNT}, 继续任务')
-
         logger.hr('第二步, 切换御魂', 2)
-        if cong.bondling_switch_soul.enable:
-            type_str, (group, team) = cong.bondling_switch_soul.get_switch_by_enum(cong.bondling_config.bondling_stone_class)
-            if type_str is None:
-                logger.warning(f'Invalid switch soul config on {cong.bondling_config.bondling_stone_class.value}, not switch')
-            else:
-                self.ui_goto_page(page_shikigami_records)
-                if type_str == 'int':
-                    self.run_switch_soul((group, team))
-                if type_str == 'str':
-                    self.run_switch_soul_by_name(group, team)
-
+        self.switch_soul()
         logger.hr('第三步, 前往契灵主界面', 2)
         self.ui_goto_page(page_bondling_fairyland)
-
         logger.hr('第四步, 开始战斗准备', 2)
         self.current_count = 0
         self.limit_count = cong.bondling_config.limit_count  # 默认limit_count值
-
+        logger.hr('Goto bondling area')
+        self.goto_ball_area(BondlingClass.get_index(cong.bondling_config.bondling_stone_class))
+
+        if cong.bondling_config.bondling_mode == BondlingMode.MODE1:  # model1只刷探查
+            if cong.bondling_config.user_status != UserStatus.ALONE:
+                raise ValueError(f'Now is model1, but user status is not alone, current: {cong.bondling_config.user_status.value}')
+            self.run_search(cong.bondling_config)
+            self.ui_goto_page(page_main)
+            self.set_next_run(task='BondlingFairyland', finish=True, success=True)
+            raise TaskEnd
         match cong.bondling_config.user_status:
             case UserStatus.handoff1:
                 self.limit_count //= 2
@@ -266,32 +260,39 @@ class ScriptTask(GameUi, GeneralInvite, GeneralRoom, BondlingBattle, SwitchSoul,
         cong = self.config.bondling_fairyland
 
         bondling_config = cong.bondling_config
-        bondling_switch_soul = cong.bondling_switch_soul
         battle_config = cong.battle_config
 
         logger.info(f'抓捕契灵: [{bondling_config.bondling_stone_class}] ')
         idx = BondlingClass.get_index(bondling_config.bondling_stone_class)
         current_ball_index = idx if idx is not None else 1
-
+        capture_setting_checked = False
         while 1:
-
             if not self.in_search_ui(screenshot=True):
                 self.ui_get_current_page()
                 self.ui_goto(page_bondling_fairyland)
                 continue
-
             if bondling_config.bondling_mode != BondlingMode.MODE1:
                 if self.ball_click(current_ball_index):
-                    logger.info(f'Current ball number: {current_ball_index} ')
+                    logger.info(f'Current ball index: {current_ball_index} ')
                 else:
-                    if self.run_stone(bondling_config.bondling_stone_enable, bondling_config.bondling_stone_class):
+                    if self.run_stone(bondling_config.bondling_stone_enable):
                         continue
+                    elif bondling_config.bondling_search_enable and bondling_config.user_status == UserStatus.ALONE:
+                        if self.run_search(bondling_config, limit_cnt=random.randint(5, 20)):
+                            logger.info('Bondling search finish, try to run catch')
+                            continue
+                        else:
+                            break  # 时间到了或次数到了直接退出
                     else:
                         logger.info('No bondling stone, exit')
                         break
+                # 检查结契设置
+                if not capture_setting_checked:
+                    self.capture_setting(bondling_config.bondling_mode)
+                    capture_setting_checked = True
                 try:
                     # 执行捕捉
-                    if self.run_catch(bondling_config, bondling_switch_soul, battle_config):
+                    if self.run_catch(bondling_config, battle_config):
                         logger.info(f'Catch successful and current ball number: {current_ball_index} ')
                     else:
                         break
@@ -316,51 +317,53 @@ class ScriptTask(GameUi, GeneralInvite, GeneralRoom, BondlingBattle, SwitchSoul,
         self.set_next_run(task='BondlingFairyland', finish=True, success=True)
         raise TaskEnd
 
-    def run_stone(self, bondling_stone_enable: bool, bondling_stone_class: BondlingClass):
+    def run_stone(self, bondling_stone_enable: bool):
         """
         使用结契石 进行召唤 契灵
-        :param bondling_stone_class:
         :param bondling_stone_enable:
         :return:
         (0) 不开启使用结契石,(探查界面)返回False
         (1) 没有结契石了,(探查界面)返回False
         """
-        if not bondling_stone_enable:
+        # 没有启用使用石头购买契灵或者当前不在购买界面则直接退出
+        if not bondling_stone_enable or not self.appear(self.I_STONE_SURE):
+            self.ui_click_until_disappear(self.I_STONE_CLOSE, interval=1.2)
+            return False
+        cu, res, total = self.O_B_STONE_NUMBER.ocr(self.device.image)
+        # 如果没有石头了
+        if cu == 0 and cu + res == total:
+            self.ui_click_until_disappear(self.I_STONE_CLOSE, interval=1.2)
+            logger.warning(f'已经没有鸣契石召唤契灵了')
             return False
         while 1:
             self.screenshot()
             if not self.appear(self.I_STONE_SURE):
-                return False
-            # 如果没有石头了
-            cu, res, total = self.O_B_STONE_NUMBER.ocr(self.device.image)
-            if cu == 0 and cu + res == total:
-                logger.warning(f'已经没有鸣契石召唤契灵了')
-                return False
-            while 1:
-                self.screenshot()
-                if not self.appear(self.I_STONE_SURE):
-                    return True
-                for i in range(3):
-                    if self.appear_then_click(self.I_BUY_PLUS, interval=1):
-                        sleep(0.5)
-                if self.appear_then_click(self.I_GI_SURE, interval=1):
-                    continue
-                if self.appear_then_click(self.I_STONE_SURE, interval=1):
-                    continue
+                return True
+            for i in range(3):
+                if self.appear_then_click(self.I_BUY_PLUS, interval=1):
+                    sleep(0.5)
+            if self.appear_then_click(self.I_GI_SURE, interval=1):
+                continue
+            if self.appear_then_click(self.I_STONE_SURE, interval=1):
+                continue
 
-    def run_search(self, bondling_config: BondlingConfig):
+    def run_search(self, bondling_config: BondlingConfig, limit_cnt: int = None):
         """
         运行探查
         :return:
         (1) 超出战斗的次数的了,(探查页面)返回False
         (2) 超过时间限制了,(探查页面)返回False
         (3) 打满五只球了,(探查界面)返回True
+        (4) 打满对应limit_cnt次, (探查界面)返回True
         """
         self.lock_team()
         while 1:
             # 检查是不是在探查界面,
             if not self.in_search_ui(screenshot=True):
                 continue
+            # 检查是否打满limit_cnt次
+            if limit_cnt is not None and limit_cnt <= 0:
+                return True
             # 检查是否有挑战次数
             if self.current_count >= bondling_config.limit_count:
                 logger.warning(f'No challenge count, exit')
@@ -369,16 +372,16 @@ class ScriptTask(GameUi, GeneralInvite, GeneralRoom, BondlingBattle, SwitchSoul,
             if datetime.now() - self.start_time >= self.limit_time:
                 logger.warning(f'No time, exit')
                 return False
-
             if self.click_search():
                 self.run_general_battle(self.general_battle_config)
+                if limit_cnt is not None:
+                    limit_cnt = limit_cnt - 1
+                    logger.info(f'Remain search battle: {limit_cnt}')
             else:
                 logger.warning(f'Full five ball')
                 return True
 
-    def run_catch(self, bondling_config: BondlingConfig,
-                  bondling_switch_soul: BondlingSwitchSoul,
-                  battle_config: BattleConfig):
+    def run_catch(self, bondling_config: BondlingConfig, battle_config: BattleConfig):
         """
         执行捕捉的(确保进入了结契界面)
         :return:
@@ -396,6 +399,8 @@ class ScriptTask(GameUi, GeneralInvite, GeneralRoom, BondlingBattle, SwitchSoul,
                     target_plate = self.O_B_LOW_NUMBER
                 case BondlingMode.MODE3:
                     target_plate = self.O_B_MEDIUM_NUMBER
+                case BondlingMode.MODE4:
+                    target_plate = self.O_B_HIGH_NUMBER
                 case _:
                     logger.error('Invalid bondling mode')
                     return False
@@ -427,7 +432,7 @@ class ScriptTask(GameUi, GeneralInvite, GeneralRoom, BondlingBattle, SwitchSoul,
         while 1:
             self.screenshot()
 
-            if self.appear(self.I_CHECK_BONDLING_FAIRYLAND):
+            if self.appear(self.I_BALL_AREA):
                 return True
 
             # 如果不在结契界面,就等待
@@ -472,14 +477,6 @@ class ScriptTask(GameUi, GeneralInvite, GeneralRoom, BondlingBattle, SwitchSoul,
         :param index:
         :return:
         """
-        def get_click_area(ind: int):
-            """获取对应契灵地域点击位置"""
-            if 1 <= ind <= 4:  # 平安京
-                return self.C_AREA_1
-            if 5 <= ind <= 8:  # 逢魔之原
-                return self.C_AREA_2
-            return None
-
         def get_click_target(ind: int):
             """获取对应契灵点击位置"""
             match = {
@@ -491,15 +488,6 @@ class ScriptTask(GameUi, GeneralInvite, GeneralRoom, BondlingBattle, SwitchSoul,
             }
             return match[(ind - 1) % 4 + 1]
 
-        # 进入地域页面
-        while True:
-            self.screenshot()
-            if self.appear(self.I_CHECK_AREA, interval=0.8):
-                break
-            if self.appear_then_click(self.I_BALL_AREA, interval=1.2):
-                continue
-        # 点击对应地域并返回契灵主界面
-        self.ui_click(get_click_area(index), self.I_BALL_AREA, interval=0.8)
         click_target = get_click_target(index)
         click_count = 0
         logger.info(f'Click ball index: {index}')
@@ -513,6 +501,25 @@ class ScriptTask(GameUi, GeneralInvite, GeneralRoom, BondlingBattle, SwitchSoul,
             if self.click(click_target, interval=1):
                 click_count += 1
 
+    def goto_ball_area(self, index: int):
+        """进入契灵对应地域,最终在探查界面"""
+        def get_click_area(ind: int):
+            """获取对应契灵地域点击位置"""
+            if 1 <= ind <= 4:  # 平安京
+                return self.C_AREA_1
+            if 5 <= ind <= 8:  # 逢魔之原
+                return self.C_AREA_2
+            return None
+        # 进入地域页面
+        while True:
+            self.screenshot()
+            if self.appear(self.I_CHECK_AREA, interval=0.6):
+                break
+            if self.appear_then_click(self.I_BALL_AREA, interval=1.2):
+                continue
+        # 点击对应地域并返回契灵主界面
+        self.ui_click(get_click_area(index), self.I_BALL_AREA, interval=0.8)
+
     def capture_setting(self, mode: BondlingMode) -> None:
         """
         第一次进入任务的时候触发这一项方法:为了确保用户的选择默认是正确的
@@ -540,27 +547,41 @@ class ScriptTask(GameUi, GeneralInvite, GeneralRoom, BondlingBattle, SwitchSoul,
         target_true = None
         target_false = None
         target_first = None
+        target_continuous = None
         if mode == BondlingMode.MODE3:
             target_true = self.I_C_MIDUM_TRUE
             target_false = self.I_C_MIDUM_FALSE
             target_first = self.I_C_FIRST_ENABLE
+            target_continuous = self.I_C_CONTINUOUS_ENABLE
         elif mode == BondlingMode.MODE2:
             target_true = self.I_C_LOW_TRUE
             target_false = self.I_C_LOW_FALSE
             target_first = self.I_C_FIRST_DISABLE
-        while 1:
+            target_continuous = self.I_C_CONTINUOUS_DISABLE
+        elif mode == BondlingMode.MODE4:  # 高级盘子不需要设置连续结契和羁绊式神
+            target_true = self.I_C_HIGH_TRUE
+            target_false = self.I_C_HIGH_FALSE
+        # 切换盘子
+        while target_true is not None:
             self.screenshot()
             if self.appear(target_true):
                 break
             if self.appear_then_click(target_false, interval=1):
                 continue
-        while 1:
+        # 是否连续结契
+        while target_continuous is not None:
+            self.screenshot()
+            if not self.appear(target_continuous):
+                break
+            if self.appear_then_click(target_continuous, interval=1):
+                continue
+        # 是否使用羁绊式神
+        while target_first is not None:
             self.screenshot()
             if not self.appear(target_first):
                 break
             if self.appear_then_click(target_first, interval=1):
                 continue
-
         # 点击确定退出
         while 1:
             self.screenshot()
@@ -786,6 +807,33 @@ class ScriptTask(GameUi, GeneralInvite, GeneralRoom, BondlingBattle, SwitchSoul,
         gbc.random_click_swipt_enable = False
         return gbc
 
+    def switch_soul(self):
+        def do_switch_soul(ts: str, g: str | int, te: str | int):
+            if ts is None:
+                raise ValueError(f'Invalid switch soul config on {bondling_config.bondling_stone_class.value}')
+            if ts == 'int':
+                self.run_switch_soul((g, te))
+            if ts == 'str':
+                self.run_switch_soul_by_name(g, te)
+        cong = self.config.bondling_fairyland
+        if not cong.bondling_switch_soul.enable:
+            return
+        bondling_config = cong.bondling_config
+        bondling_switch_soul = cong.bondling_switch_soul
+        self.ui_goto_page(page_shikigami_records)
+        # 单刷探查配置
+        if bondling_config.bondling_mode == BondlingMode.MODE1:
+            type_str, (group, team) = bondling_switch_soul.get_switch_by_name('search_switch')
+            do_switch_soul(type_str, group, team)
+            return
+        # 刷契灵配置
+        type_str, (group, team) = bondling_switch_soul.get_switch_by_enum(bondling_config.bondling_stone_class)
+        do_switch_soul(type_str, group, team)
+        # 启用了刷契灵时开启探查且是单人模式
+        if bondling_config.bondling_search_enable and bondling_config.user_status == UserStatus.ALONE:
+            type_str, (group, team) = bondling_switch_soul.get_switch_by_name('search_switch')
+            do_switch_soul(type_str, group, team)
+
 
 if __name__ == '__main__':
     from module.config.config import Config

+ 9 - 0
tasks/BondlingFairyland/stone/image.json

@@ -43,5 +43,14 @@
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
+  },
+  {
+    "itemName": "stone_close",
+    "imageName": "stone_stone_close.png",
+    "roiFront": "911,56,42,38",
+    "roiBack": "888,49,100,100",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "关闭购买契灵页面"
   }
 ]

BIN
tasks/BondlingFairyland/stone/stone_stone_close.png