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

Merge pull request #1109 from ljxun/dev_1

feat(BondlingFairyland): 更新契灵之境 单人组队都支持,不支持探查和首领
huangrunheng 1 год назад
Родитель
Сommit
6f2b4d1cc9

+ 15 - 9
tasks/BondlingFairyland/assets.py

@@ -12,13 +12,13 @@ class BondlingFairylandAssets:
 
 	# Click Rule Assets
 	# description 
-	C_STONE_1 = RuleClick(roi_front=(239,536,26,24), roi_back=(0,0,100,100), name="stone_1")
+	C_STONE_1 = RuleClick(roi_front=(230,533,23,20), roi_back=(0,0,100,100), name="stone_1")
 	# description 
-	C_STONE_2 = RuleClick(roi_front=(417,490,26,23), roi_back=(0,0,100,100), name="stone_2")
+	C_STONE_2 = RuleClick(roi_front=(441,569,23,20), roi_back=(0,0,100,100), name="stone_2")
 	# description 
-	C_STONE_3 = RuleClick(roi_front=(705,511,28,26), roi_back=(0,0,100,100), name="stone_3")
+	C_STONE_3 = RuleClick(roi_front=(692,537,23,20), roi_back=(0,0,100,100), name="stone_3")
 	# description 
-	C_STONE_4 = RuleClick(roi_front=(911,487,27,24), roi_back=(0,0,100,100), name="stone_4")
+	C_STONE_4 = RuleClick(roi_front=(944,529,23,20), roi_back=(0,0,100,100), name="stone_4")
 	# description 
 	C_STONE_5 = RuleClick(roi_front=(1041,494,25,25), roi_back=(0,0,100,100), name="stone_5")
 	# description 
@@ -29,17 +29,17 @@ class BondlingFairylandAssets:
 	# Ocr-description 
 	O_B_BONDLING_CLASS = RuleOcr(roi=(266,271,79,112), area=(287,271,36,112), mode="Single", method="Default", keyword="", name="b_bondling_class")
 	# 小盘子 
-	O_B_LOW_NUMBER = RuleOcr(roi=(490,24,98,36), area=(490,24,98,36), mode="DigitCounter", method="Default", keyword="", name="b_low_number")
+	O_B_LOW_NUMBER = RuleOcr(roi=(543,14,96,33), area=(543,14,96,33), mode="DigitCounter", method="Default", keyword="", name="b_low_number")
 	# 中盘子 
-	O_B_MEDIUM_NUMBER = RuleOcr(roi=(687,21,101,36), area=(687,21,101,36), mode="DigitCounter", method="Default", keyword="", name="b_medium_number")
+	O_B_MEDIUM_NUMBER = RuleOcr(roi=(734,19,99,25), area=(734,19,99,25), mode="DigitCounter", method="Default", keyword="", name="b_medium_number")
 	# 大盘子 
-	O_B_HIGH_NUMBER = RuleOcr(roi=(883,23,100,32), area=(883,23,100,32), mode="DigitCounter", method="Default", keyword="", name="b_high_number")
+	O_B_HIGH_NUMBER = RuleOcr(roi=(928,17,94,30), area=(928,17,94,30), mode="DigitCounter", method="Default", keyword="", name="b_high_number")
 	# 鸣契石 
-	O_B_STONE_NUMBER = RuleOcr(roi=(858,22,82,40), area=(858,22,82,40), mode="DigitCounter", method="Default", keyword="", name="b_stone_number")
+	O_B_STONE_NUMBER = RuleOcr(roi=(1135,16,78,32), area=(1135,16,78,32), mode="DigitCounter", method="Default", keyword="", name="b_stone_number")
 	# 召唤契灵数量 
 	O_B_SUMMON_BALL_NUMBER = RuleOcr(roi=(546,540,100,45), area=(546,540,100,45), mode="Single", method="Default", keyword="", name="b_summon_ball_number")
 	# 抓捕契灵剩余数量 
-	O_B_BALL_NUMBER = RuleOcr(roi=(1190,532,70,30), area=(1190,532,70,30), mode="DigitCounter", method="Default", keyword="", name="b_ball_number")
+	O_B_BALL_NUMBER = RuleOcr(roi=(1186,666,65,26), area=(1186,666,65,26), mode="DigitCounter", method="Default", keyword="", name="b_ball_number")
 	# 好友邀请 
 	O_FRIEND = RuleOcr(roi=(357,89,100,54), area=(357,89,100,54), mode="Single", method="Default", keyword="", name="friend")
 	# 跨区邀请 
@@ -97,6 +97,12 @@ class BondlingFairylandAssets:
 	I_CAP_SUCCESS = RuleImage(roi_front=(210,445,22,21), roi_back=(210,445,22,21), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/capture/capture_cap_success.png")
 	# description 
 	I_CAP_FAILURE = RuleImage(roi_front=(1192,608,30,39), roi_back=(1192,608,30,39), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/capture/capture_cap_failure.png")
+	# description 
+	I_BATTLE_FAIL = RuleImage(roi_front=(740,267,79,84), roi_back=(740,267,79,84), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/capture/battle_fail.png")
+	# 放弃结契 
+	I_BATTLE_FAIL_ABANDON = RuleImage(roi_front=(436,606,115,36), roi_back=(436,606,115,36), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/capture/battle_fail_abandon.png")
+	# description 
+	I_BATTLE_SUCCESS = RuleImage(roi_front=(651,203,70,81), roi_back=(651,203,70,81), threshold=0.8, method="Template matching", file="./tasks/BondlingFairyland/capture/battle_success.png")
 
 
 	# Image Rule Assets

BIN
tasks/BondlingFairyland/ball/ball_ball_fire.png


+ 25 - 4
tasks/BondlingFairyland/battle.py

@@ -1,8 +1,11 @@
 # This Python file uses the following encoding: utf-8
 # @author runhey
 # github https://github.com/runhey
+from datetime import timedelta, datetime
+
 import random
 
+from module.server.i18n import I18n
 from tasks.Component.GeneralBattle.general_battle import GeneralBattle
 from tasks.BondlingFairyland.assets import BondlingFairylandAssets
 from tasks.BondlingFairyland.config_battle import BattleConfig
@@ -20,7 +23,13 @@ class BondlingBattle(GeneralBattle, BondlingFairylandAssets):
         """
         logger.hr("General battle start", 2)
         self.current_count += 1
-        logger.info(f"Current count: {self.current_count} / " + str(limit_count))
+        logger.info(f'Current tasks: {I18n.trans_zh_cn(self.config.task.command)}')
+        logger.info(f'Current count: {self.current_count} / {limit_count}')
+
+        task_run_time = datetime.now() - self.start_time
+        # 格式化时间,只保留整数部分的秒
+        task_run_time_seconds = timedelta(seconds=int(task_run_time.total_seconds()))
+        logger.info(f'Current times: {task_run_time_seconds} / {self.limit_time}')
 
         if self.check_load():
             # 首先要判断进入战斗的界面
@@ -67,8 +76,14 @@ class BondlingBattle(GeneralBattle, BondlingFairylandAssets):
             # 如果领奖励
             if self.appear(self.I_REWARD, threshold=0.6):
                 break
-            if self.appear(self.I_WIN, threshold=0.6):
-                break
+            if self.appear_then_click(self.I_WIN, threshold=0.6):
+                continue
+            if self.appear_then_click(self.I_BATTLE_SUCCESS, threshold=0.6, interval=1):
+                continue
+            if self.appear_then_click(self.I_BATTLE_FAIL_ABANDON, interval=1):
+                continue
+            if self.appear_then_click(self.I_BATTLE_FAIL, threshold=0.6, interval=1):
+                continue
             # 如果开启战斗过程随机滑动
             if random_click_swipt_enable:
                 self.random_click_swipt()
@@ -85,7 +100,13 @@ class BondlingBattle(GeneralBattle, BondlingFairylandAssets):
             if self.appear_then_click(self.I_REWARD, action=action_click, interval=1.5):
                 continue
             if self.appear_then_click(self.I_WIN, threshold=0.6):
-                break
+                continue
+            if self.appear_then_click(self.I_BATTLE_SUCCESS, threshold=0.6, interval=1):
+                continue
+            if self.appear_then_click(self.I_BATTLE_FAIL_ABANDON, interval=1):
+                continue
+            if self.appear_then_click(self.I_BATTLE_FAIL, threshold=0.6, interval=1):
+                continue
             if not self.appear(self.I_REWARD):
                 break
         logger.info("Get reward")

BIN
tasks/BondlingFairyland/capture/battle_fail.png


BIN
tasks/BondlingFairyland/capture/battle_fail_abandon.png


BIN
tasks/BondlingFairyland/capture/battle_success.png


+ 27 - 0
tasks/BondlingFairyland/capture/capture.json

@@ -52,5 +52,32 @@
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
+  },
+  {
+    "itemName": "battle_fail",
+    "imageName": "battle_fail.png",
+    "roiFront": "740,267,79,84",
+    "roiBack": "740,267,79,84",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "battle_fail_abandon",
+    "imageName": "battle_fail_abandon.png",
+    "roiFront": "436,606,115,36",
+    "roiBack": "436,606,115,36",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "放弃结契"
+  },
+  {
+    "itemName": "battle_success",
+    "imageName": "battle_success.png",
+    "roiFront": "651,203,70,81",
+    "roiBack": "651,203,70,81",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
   }
 ]

+ 4 - 4
tasks/BondlingFairyland/click.json

@@ -1,25 +1,25 @@
 [
   {
     "itemName": "stone_1",
-    "roiFront": "239,536,26,24",
+    "roiFront": "230,533,23,20",
     "roiBack": "0,0,100,100",
     "description": "description"
   },
   {
     "itemName": "stone_2",
-    "roiFront": "417,490,26,23",
+    "roiFront": "441,569,23,20",
     "roiBack": "0,0,100,100",
     "description": "description"
   },
   {
     "itemName": "stone_3",
-    "roiFront": "705,511,28,26",
+    "roiFront": "692,537,23,20",
     "roiBack": "0,0,100,100",
     "description": "description"
   },
   {
     "itemName": "stone_4",
-    "roiFront": "911,487,27,24",
+    "roiFront": "944,529,23,20",
     "roiBack": "0,0,100,100",
     "description": "description"
   },

+ 15 - 8
tasks/BondlingFairyland/config.py

@@ -12,24 +12,21 @@ 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'
-# 镇墓兽 Tomb Guard  tomb_guard
-# 茨球 Snowball       snowball
-# 小黑 Little Kuro  little_kuro
-# 火灵 Azure Basan azure_basan
+
+
 class BondlingClass(str, Enum):
     TOMB_GUARD = '镇墓兽'
     SNOWBALL = '茨球'
     LITTLE_KURO = '小黑'
     AZURE_BASAN = '火灵'
 
-# 契石 Bondling Stone
-# 低级契灵盘 Low Bondling Discs
-# 中级契灵盘 Medium Bondling Discs
-# 高级契灵盘 High Bondling Discs
+
 class UserStatus(str, Enum):
     LEADER = 'leader'
     MEMBER = 'member'
@@ -37,6 +34,8 @@ class UserStatus(str, Enum):
     handoff1 = 'handoff1'
     handoff2 = 'handoff2'
     # WILD = 'wild'  # 还不打算实现
+
+
 class BondlingConfig(ConfigBase):
     # 身份
     user_status: UserStatus = Field(default=UserStatus.ALONE, description='user_status_help')
@@ -46,6 +45,7 @@ class BondlingConfig(ConfigBase):
     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')
 
+
 class BondlingSwitchSoul(ConfigBase):
     auto_switch_soul: bool = Field(default=False, description='auto_switch_soul_help')
     # 镇墓兽 config
@@ -57,8 +57,15 @@ class BondlingSwitchSoul(ConfigBase):
     # 火灵 config
     azure_basan_switch: str = Field(default='-1,-1', description='azure_basan_switch_help')
 
+
+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)
     bondling_switch_soul: BondlingSwitchSoul = Field(default_factory=BondlingSwitchSoul)
     invite_config: InviteConfig = Field(default_factory=InviteConfig)

+ 3 - 147
tasks/BondlingFairyland/general_invite.py

@@ -40,10 +40,6 @@ class GeneralInvite(BaseTask, BondlingFairylandAssets, GeneralInviteAssets):
     timer_invite = None
     timer_wait = None
 
-    """
-
-    """
-
     def run_invite(self, config: InviteConfig, is_first: bool = False, is_over: bool = True) -> bool:
         """
         队长!!身份。。。在组队界面邀请好友( 如果开启is_first) 等待队员进入开启挑战
@@ -53,7 +49,7 @@ class GeneralInvite(BaseTask, BondlingFairylandAssets, GeneralInviteAssets):
         :param is_first: 如果是第一次开房间的那就要邀请队员,其他情况等待队员进入
         :return:
         """
-        logger.hr('Invite friend', 2)
+        logger.hr('Invite friend')
         if not self.ensure_enter():
             logger.warning('Not enter invite page')
             return False
@@ -72,7 +68,7 @@ class GeneralInvite(BaseTask, BondlingFairylandAssets, GeneralInviteAssets):
         while 1:
             self.screenshot()
             if self.timer_wait.reached():
-                logger.warning('Wait timeout')
+                logger.warning('队长等待超时...')
                 return False
             if self.appear(self.I_MATCHING):
                 logger.warning('Timeout, now is no room')
@@ -86,29 +82,6 @@ class GeneralInvite(BaseTask, BondlingFairylandAssets, GeneralInviteAssets):
             if self.room_type == RoomType.NORMAL_2 and not self.appear(self.I_ADD_1):
                 logger.info('Start challenge and this room can only invite one friend')
                 fire = True
-            # 如果这个房间最多容纳三个人(意思是可以邀请两个人),且设定邀请一个就开启挑战,那就开启挑战
-            elif self.room_type == RoomType.NORMAL_3 and config.invite_number == InviteNumber.ONE and not self.appear(self.I_ADD_1):
-                logger.info('Start challenge and user only invite one friend')
-                fire = True
-            # 如果这个房间最多容纳三个人(意思是可以邀请两个人),且设定邀请两个就开启挑战,那就开启挑战
-            elif self.room_type == RoomType.NORMAL_3 \
-                    and config.invite_number == InviteNumber.TWO and not self.appear(self.I_ADD_2):
-                logger.info('Start challenge and user invite two friends')
-                fire = True
-            # 如果这个房间是五人的,且设定邀请一个就开启挑战,那就开启挑战
-            elif self.room_type == RoomType.NORMAL_5 \
-                    and config.invite_number == InviteNumber.ONE and not self.appear(self.I_ADD_5_1):
-                logger.info('Start challenge and user only invite one friend')
-                fire = True
-            # 如果这个房间是五人的,且设定邀请两个就开启挑战,那就开启挑战
-            elif self.room_type == RoomType.NORMAL_5 \
-                    and config.invite_number == InviteNumber.TWO and not self.appear(self.I_ADD_5_2):
-                logger.info('Start challenge and user invite two friends')
-                fire = True
-            # 如果是永生之海
-            elif self.room_type == RoomType.ETERNITY_SEA and not self.appear(self.I_ADD_SEA):
-                logger.info('Start challenge and this is lock sea')
-                fire = True
 
             # 点击挑战
             if fire:
@@ -457,45 +430,6 @@ class GeneralInvite(BaseTask, BondlingFairylandAssets, GeneralInviteAssets):
                 logger.warning('Invite friend 2 failed')
         sleep(0.5)
 
-    def invite_again(self, default_invite: bool=True) -> bool:
-        """
-        作为队长战斗胜利后再次邀请队友,
-        :param default_invite:  是否勾选默认
-        :return:
-        """
-        logger.info('Invite again')
-        # 判断是否进入界面
-        while 1:
-            self.screenshot()
-            if self.appear(self.I_GI_SURE):
-                break
-        # 如果勾选了默认邀请
-        if default_invite:
-            logger.info('Click default invite')
-            while 1:
-                self.screenshot()
-                if self.appear(self.I_I_DEFAULT):
-                    break
-                if self.appear_then_click(self.I_I_NO_DEFAULT, interval=1):
-                    continue
-        else:
-            logger.info('Click no default invite')
-            while 1:
-                self.screenshot()
-                if self.appear(self.I_I_NO_DEFAULT):
-                    break
-                if self.appear_then_click(self.I_I_DEFAULT, interval=1):
-                    continue
-
-        # 点击确认
-        logger.info('Click invite ensure')
-        while 1:
-            self.screenshot()
-            if not self.appear(self.I_GI_SURE):
-                break
-            if self.appear_then_click(self.I_GI_SURE):
-                continue
-
     def check_and_invite(self, default_invite: bool=True) -> bool:
         """
         队长战斗后 邀请队友
@@ -525,91 +459,13 @@ class GeneralInvite(BaseTask, BondlingFairylandAssets, GeneralInviteAssets):
 
         return True
 
-    def check_then_accept(self) -> bool:
-        """
-        队员接受邀请
-        :return:
-        """
-        if not self.appear(self.I_I_ACCEPT):
-            return False
-        logger.info('Click accept')
-        while 1:
-            self.screenshot()
-            if self.is_in_room():
-                return True
-            # 被秒开
-            # https://github.com/runhey/OnmyojiAutoScript/issues/230
-            if self.appear(GeneralBattleAssets.I_EXIT):
-                return False
-            if self.appear_then_click(self.I_I_NO_DEFAULT, interval=1):
-                continue
-            if self.appear_then_click(self.I_GI_SURE, interval=1):
-                continue
-            if self.appear_then_click(self.I_I_ACCEPT_DEFAULT, interval=1):
-                continue
-            if self.appear_then_click(self.I_I_ACCEPT, interval=1):
-                continue
-        return True
-
-    def wait_battle(self, wait_time: time) -> bool:
-        """
-        在房间等待,(要求保证在房间里面) 队长开启战斗
-        如果队长跑路了,或者的等待了很久还没开始
-        :return: 如果成功进入战斗(反正就是不在房间 )返回 True
-                 如果失败了,(退出房间)返回 False
-        """
-        wait_second = wait_time.second + wait_time.minute * 60
-        self.timer_wait = Timer(wait_second)
-        self.timer_wait.start()
-        logger.info(f'Wait battle {wait_second} seconds')
-        success = True
-        while 1:
-            self.screenshot()
-
-            # 如果自己在探索界面或者是庭院,那就是房间已经被销毁了
-            if self.appear(self.I_GI_HOME) or self.appear(self.I_GI_EXPLORE):
-                logger.warning('Room destroyed')
-                success = False
-                break
-
-
-            if self.timer_wait.reached():
-                logger.warning('Wait battle time out')
-                success = False
-                break
-
-            # 如果队长跑路了,自己变成了队长: 自己也要跑路
-            if self.appear(self.I_FIRE) or self.appear(self.I_FIRE_SEA):
-                logger.warning('Leader run away while wait battle and become leader now')
-                success = False
-                break
-
-            # 判断是否进入战斗
-            if self.is_in_room(is_screenshot=False):
-                pass
-            else:
-                break
-
-        # 调出循环只有这些可能性:
-        # 1. 进入战斗(ui是战斗)
-        # 2. 队长跑路(自己还是在房间里面)
-        # 3. 等待时间到没有开始(还是在房间里面)
-        # 4. 房间的时间到了被迫提出房间(这个时候来到了探索界面)
-        if not success:
-            logger.info('Leave room')
-            self.exit_room()
-
-        return success
-
-
-
 
 if __name__ == '__main__':
     from module.config.config import Config
     from module.device.device import Device
     import cv2
 
-    c = Config('oas1')
+    c = Config('du')
     d = Device(c)
     t = GeneralInvite(c, d)
 

+ 10 - 10
tasks/BondlingFairyland/ocr.json

@@ -10,8 +10,8 @@
   },
   {
     "itemName": "b_low_number",
-    "roiFront": "490,24,98,36",
-    "roiBack": "490,24,98,36",
+    "roiFront": "543,14,96,33",
+    "roiBack": "543,14,96,33",
     "mode": "DigitCounter",
     "method": "Default",
     "keyword": "",
@@ -19,8 +19,8 @@
   },
   {
     "itemName": "b_medium_number",
-    "roiFront": "687,21,101,36",
-    "roiBack": "687,21,101,36",
+    "roiFront": "734,19,99,25",
+    "roiBack": "734,19,99,25",
     "mode": "DigitCounter",
     "method": "Default",
     "keyword": "",
@@ -28,8 +28,8 @@
   },
   {
     "itemName": "b_high_number",
-    "roiFront": "883,23,100,32",
-    "roiBack": "883,23,100,32",
+    "roiFront": "928,17,94,30",
+    "roiBack": "928,17,94,30",
     "mode": "DigitCounter",
     "method": "Default",
     "keyword": "",
@@ -37,8 +37,8 @@
   },
   {
     "itemName": "b_stone_number",
-    "roiFront": "858,22,82,40",
-    "roiBack": "858,22,82,40",
+    "roiFront": "1135,16,78,32",
+    "roiBack": "1135,16,78,32",
     "mode": "DigitCounter",
     "method": "Default",
     "keyword": "",
@@ -55,8 +55,8 @@
   },
   {
     "itemName": "b_ball_number",
-    "roiFront": "1190,532,70,30",
-    "roiBack": "1190,532,70,30",
+    "roiFront": "1186,666,65,26",
+    "roiBack": "1186,666,65,26",
     "mode": "DigitCounter",
     "method": "Default",
     "keyword": "",

+ 136 - 251
tasks/BondlingFairyland/script_task.py

@@ -2,33 +2,26 @@
 # @author runhey
 # github https://github.com/runhey
 
-from tasks.Component.GeneralRoom.general_room import GeneralRoom
-
-import numpy as np
 from time import sleep
-from cached_property import cached_property
-from datetime import datetime, timedelta
-from tasks.BondlingFairyland.general_invite import GeneralInvite
-from tasks.Component.GeneralBattle.assets import GeneralBattleAssets
 
-from tasks.base_task import BaseTask
-from tasks.GameUi.game_ui import GameUi
-from tasks.BondlingFairyland.config import (BondlingFairyland, BondlingMode,
-                                            BondlingClass,
-                                            BondlingSwitchSoul, BondlingConfig, UserStatus)
+from cached_property import cached_property
+from datetime import datetime
+from datetime import timedelta, time
+from module.base.timer import Timer
+from module.exception import TaskEnd
+from module.logger import logger
 from tasks.BondlingFairyland.assets import BondlingFairylandAssets
 from tasks.BondlingFairyland.battle import BondlingBattle
+from tasks.BondlingFairyland.config import BondlingMode, BondlingClass, BondlingSwitchSoul, BondlingConfig, UserStatus
 from tasks.BondlingFairyland.config_battle import BattleConfig
-from tasks.Component.SwitchSoul.switch_soul import SwitchSoul, switch_parser
+from tasks.BondlingFairyland.general_invite import GeneralInvite
+from tasks.Component.GeneralBattle.assets import GeneralBattleAssets
 from tasks.Component.GeneralBattle.config_general_battle import GeneralBattleConfig
-from tasks.GameUi.page import page_main, page_bondling_fairyland, page_shikigami_records
-
-from module.atom.image import RuleImage
-from module.logger import logger
-from module.exception import TaskEnd
-from tasks.Component.GeneralRoom.assets import GeneralRoomAssets
-from module.base.timer import Timer
-from datetime import timedelta, time
+from tasks.Component.GeneralRoom.general_room import GeneralRoom
+from tasks.Component.SwitchSoul.switch_soul import SwitchSoul, switch_parser
+from tasks.GameUi.game_ui import GameUi
+from tasks.GameUi.page import page_main, page_bondling_fairyland, page_shikigami_records, page_mall
+from tasks.RichMan.assets import RichManAssets
 
 
 class BondlingNumberMax(Exception):
@@ -38,15 +31,34 @@ class BondlingNumberMax(Exception):
 """ 契灵 """
 
 
-class ScriptTask(GameUi, GeneralInvite, GeneralRoom, BondlingBattle, SwitchSoul, BondlingFairylandAssets):
+class ScriptTask(GameUi, GeneralInvite, GeneralRoom, BondlingBattle, SwitchSoul, BondlingFairylandAssets, RichManAssets):
     ball_pos_list = [None, None, None, None, None]  # 用于记录每一个位置的球是否出现
     first_catch = True  # 用于记录是否是第一次捕捉
-    first_win = False  # 用于记录是不是第一次捕获成功
-    current_ball_index = 5
+
     def run(self):
         # 引用配置
         cong = self.config.bondling_fairyland
 
+        if cong.bondling_check.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
+            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.switch_soul_config.enable:
             self.ui_get_current_page()
@@ -58,6 +70,7 @@ class ScriptTask(GameUi, GeneralInvite, GeneralRoom, BondlingBattle, SwitchSoul,
             self.ui_goto(page_shikigami_records)
             self.run_switch_soul_by_name(cong.switch_soul_config.group_name, cong.switch_soul_config.team_name)
 
+        logger.hr('第三步, 前往契灵主界面', 2)
         self.ui_get_current_page()
         self.ui_goto(page_bondling_fairyland)
 
@@ -70,37 +83,31 @@ class ScriptTask(GameUi, GeneralInvite, GeneralRoom, BondlingBattle, SwitchSoul,
                 self.ui_goto(page_bondling_fairyland)
                 continue
 
-        limit_count = cong.bondling_config.limit_count
+        logger.hr('第四步, 开始战斗准备', 2)
         self.current_count = 0
-        self.limit_count: int = limit_count
-
-        if UserStatus.handoff1 == cong.bondling_config.user_status:
-            self.limit_count: int = limit_count // 2
-            self.switch_ball()
-        if UserStatus.handoff2 == cong.bondling_config.user_status:
-            self.limit_count: int = limit_count // 2
-            self.run_member()
-            self.current_count = 0
-            self.ui_get_current_page()
-            self.ui_goto(page_bondling_fairyland)
-            self.switch_ball()
+        self.limit_count = cong.bondling_config.limit_count  # 默认limit_count值
 
         match cong.bondling_config.user_status:
-            case UserStatus.LEADER:
+            case UserStatus.handoff1:
+                self.limit_count //= 2
                 self.switch_ball()
-            case UserStatus.MEMBER:
+            case UserStatus.handoff2:
+                self.limit_count //= 2
                 self.run_member()
-            case UserStatus.ALONE:
+                self.current_count = 0
+                self.ui_get_current_page()
+                self.ui_goto(page_bondling_fairyland)
                 self.switch_ball()
+            case UserStatus.LEADER | UserStatus.ALONE:
+                self.switch_ball()
+            case UserStatus.MEMBER:
+                self.run_member()
             case _:
-                logger.error('Unknown user status')
+                logger.error(f'Unknown user status: {cong.bondling_config.user_status}')
 
     def run_leader(self):
-
-        """
-        点击 求援, 组队模式
-        """
-
+        """  点击 求援, 组队模式  """
+        logger.hr('Start run leader', 2)
         success = True
         is_first = True
         while 1:
@@ -125,6 +132,8 @@ class ScriptTask(GameUi, GeneralInvite, GeneralRoom, BondlingBattle, SwitchSoul,
                         self.appear_then_click(self.I_CREATE_TEAM, interval=2)
                         continue
                     # 求援
+                    if self.appear(self.I_CHECK_BONDLING_FAIRYLAND, interval=1):
+                        return False
                     if self.appear(self.I_BALL_HELP, interval=1):
                         cu, res, total = self.O_B_BALL_NUMBER.ocr(self.device.image)
                         logger.info(f'ball is cu {cu}, total {total}')
@@ -148,7 +157,7 @@ class ScriptTask(GameUi, GeneralInvite, GeneralRoom, BondlingBattle, SwitchSoul,
             if self.current_count >= self.limit_count:
                 if self.appear(self.I_GI_IN_ROOM):
                     # 次数达到也要邀请好友进房间,然后退出,不然队员无法判断是否完成契灵,出现异常
-                    self.run_invite(config=self.config.bondling_fairyland.invite_config, is_over=False)
+                    self.run_invite(config=self.config.bondling_fairyland.invite_config, is_first=is_first, is_over=False)
                     # 等待三秒让队员进房间,避免队员没进房间出现异常
                     sleep(3)
                     logger.info(f'契灵次数:{self.current_count}已完成,退出')
@@ -200,7 +209,7 @@ class ScriptTask(GameUi, GeneralInvite, GeneralRoom, BondlingBattle, SwitchSoul,
         raise TaskEnd
 
     def run_member(self):
-        logger.info('Start run member')
+        logger.hr('Start run member', 2)
         self.ui_get_current_page()
         # 开始等待队长拉人
         wait_time = self.config.bondling_fairyland.invite_config.wait_time
@@ -215,15 +224,13 @@ class ScriptTask(GameUi, GeneralInvite, GeneralRoom, BondlingBattle, SwitchSoul,
 
             self.screenshot()
 
-            # 等待超时
-            logger.info("开始等待队长拉人:" + str(wait_timer.current()))
             if wait_timer.reached():
-                logger.warning('wait_timer timeout')
+                logger.info(f"队员等待超时:{wait_timer.current()}, 退出")
                 break
 
             # if self.current_count >= self.limit_count:
             #     logger.info('Orochi count limit out')
-            #     break
+            #     breakpush_n
             if datetime.now() - self.start_time >= self.limit_time:
                 logger.info('BondlingFairyland time limit out')
                 break
@@ -232,7 +239,7 @@ class ScriptTask(GameUi, GeneralInvite, GeneralRoom, BondlingBattle, SwitchSoul,
                 continue
 
             if self.is_in_room():
-                logger.info("契灵:进入组队房间!")
+                logger.info("契灵:已经在组队房间中")
                 if self.wait_battle(wait_time=self.config.bondling_fairyland.invite_config.wait_time):
                     self.run_battle(self.config.bondling_fairyland.battle_config, limit_count=self.limit_count)
                     wait_timer.reset()
@@ -249,8 +256,7 @@ class ScriptTask(GameUi, GeneralInvite, GeneralRoom, BondlingBattle, SwitchSoul,
 
         while 1:
             # 有一种情况是本来要退出的,但是队长邀请了进入的战斗的加载界面
-            if self.appear(self.I_GI_HOME) or self.appear(self.I_GI_EXPLORE) or self.appear(
-                    self.I_CHECK_BONDLING_FAIRYLAND):
+            if self.appear(self.I_GI_HOME) or self.appear(self.I_GI_EXPLORE) or self.appear(self.I_CHECK_BONDLING_FAIRYLAND) or self.appear(self.I_BALL_HELP) :
                 break
             # 如果可能在房间就退出
             if self.exit_room():
@@ -266,47 +272,50 @@ class ScriptTask(GameUi, GeneralInvite, GeneralRoom, BondlingBattle, SwitchSoul,
             raise TaskEnd
 
     def switch_ball(self):
+        logger.hr('Start switch ball', 2)
         cong = self.config.bondling_fairyland
 
         bondling_config = cong.bondling_config
         bondling_switch_soul = cong.bondling_switch_soul
         battle_config = cong.battle_config
 
-        success = True
+        logger.info(f'抓捕契灵: [{bondling_config.bondling_stone_class}] ')
+        match bondling_config.bondling_stone_class:
+            case BondlingClass.TOMB_GUARD:
+                current_ball_index = 1
+            case BondlingClass.AZURE_BASAN:
+                current_ball_index = 2
+            case BondlingClass.SNOWBALL:
+                current_ball_index = 3
+            case BondlingClass.LITTLE_KURO:
+                current_ball_index = 4
+            case _:
+                current_ball_index = 1
+
         while 1:
-            if not self.first_win:
-                if not self.in_search_ui(screenshot=True):
-                    self.ui_get_current_page()
-                    self.ui_goto(page_bondling_fairyland)
-                    continue
+
+            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(self.current_ball_index):
-                    logger.info(f'Current ball number: {self.current_ball_index} ')
+                if self.ball_click(current_ball_index):
+                    logger.info(f'Current ball number: {current_ball_index} ')
                 else:
-                    # 如果点击了3次还是没有进去,那可能说明这个位置没有球
-                    if self.current_ball_index == 1:
-                        if self.run_stone(bondling_config.bondling_stone_enable, bondling_config.bondling_stone_class):
-                            self.current_ball_index = 5
-                            continue
-                        else:
-                            break
+                    if self.run_stone(bondling_config.bondling_stone_enable, bondling_config.bondling_stone_class):
+                        continue
                     else:
-                        self.current_ball_index -= 1
-                    logger.info(f'Current ball number: {self.current_ball_index} ')
-                    continue
-
+                        logger.info('No bondling stone, exit')
+                        break
                 try:
                     # 执行捕捉
                     if self.run_catch(bondling_config, bondling_switch_soul, battle_config):
-                        logger.info(f'Catch successful and current ball number: {self.current_ball_index} ')
-                        self.first_win = True
+                        logger.info(f'Catch successful and current ball number: {current_ball_index} ')
                     else:
                         break
                 except BondlingNumberMax:
                     logger.error('Bondling number max, exit')
-                    self.config.notifier.push(title='契灵之境', content='契灵数量已达上限500,请及时处理')
-                    success = False
                     break
             else:
                 # 否则就是模式1
@@ -330,75 +339,33 @@ class ScriptTask(GameUi, GeneralInvite, GeneralRoom, BondlingBattle, SwitchSoul,
         """
         使用结契石 进行召唤 契灵
         :param bondling_stone_class:
+        :param bondling_stone_enable:
         :return:
         (0) 不开启使用结契石,(探查界面)返回False
-        (1) 五个球满了,(探查界面)返回True
-        (2) 没有结契石了,(探查界面)返回False
+        (1) 没有结契石了,(探查界面)返回False
         """
         if not bondling_stone_enable:
             return False
-        self.ui_get_current_page()
-        self.ui_goto(page_bondling_fairyland)
         while 1:
             self.screenshot()
-            # 检查是不是在探查界面,
-            if not self.in_search_ui(screenshot=False):
-                continue
+            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'No bondling stone')
+                logger.warning(f'已经没有鸣契石召唤契灵了')
                 return False
-            # 如果五个球满了
-            click_count = 0
             while 1:
                 self.screenshot()
-                if click_count >= 2:
-                    logger.info(f'Ball is full')
+                if not self.appear(self.I_STONE_SURE):
                     return True
-                if not self.appear(self.I_STONE_ENTER):
-                    # 这时进入到了召唤的界面
-                    self.wait_until_appear(self.I_STONE_SURE)
-                    action_click = None
-                    match bondling_stone_class:
-                        case BondlingClass.LITTLE_KURO:
-                            action_click = self.C_LEFT_1
-                        case BondlingClass.SNOWBALL:
-                            action_click = self.C_LEFT_2
-                        case BondlingClass.AZURE_BASAN:
-                            action_click = self.C_LEFT_3
-                        case BondlingClass.TOMB_GUARD:
-                            action_click = self.C_LEFT_4
-                    sleep(0.5)
-                    self.click(action_click)
-
-                    # 点击召唤
-                    while 1:
-                        self.screenshot()
-                        if not self.appear(self.I_STONE_SURE):
-                            break
-                        for i in range(0, 5):
-                            if self.appear_then_click(self.I_BUY_ADD, interval=1):
-                                sleep(0.5)
-                                continue
-                        if self.appear_then_click(self.I_GI_SURE, interval=1):
-                            continue
-                        # current = self.O_B_SUMMON_BALL_NUMBER.ocr(self.device.image)
-                        # try:
-                        #     if int(current) >= 1:
-                        #         if self.appear_then_click(self.I_STONE_SURE, interval=1):
-                        #             continue
-                        # except ValueError:
-                        #     logger.warning(f'No challenge count, exit')
-                        if self.appear_then_click(self.I_STONE_SURE, interval=1):
-                            continue
-
-                    break
-
-                if self.appear_then_click(self.I_STONE_ENTER, interval=1):
-                    click_count += 1
+                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
 
     def run_search(self, bondling_config: BondlingConfig):
         """
@@ -439,20 +406,18 @@ class ScriptTask(GameUi, GeneralInvite, GeneralRoom, BondlingBattle, SwitchSoul,
         (3) 挑战次数到了,返回False (退出页面是结契界面)
         (4) 捕获成功,返回True (退出页面是捕获的页面)
         """
-
+        logger.hr('Start run catch', 2)
         self.lock_team()
-        if self.first_catch:
-            self.first_catch = False
-            # self.capture_setting(bondling_config.bondling_mode)
-
-        target_plate = None
-        match bondling_config.bondling_mode:
-            case BondlingMode.MODE2:
-                target_plate = self.O_B_LOW_NUMBER
-            case BondlingMode.MODE3:
-                target_plate = self.O_B_MEDIUM_NUMBER
-
-        def check_plate_number(target_plate):
+
+        def check_plate_number():
+            match bondling_config.bondling_mode:
+                case BondlingMode.MODE2:
+                    target_plate = self.O_B_LOW_NUMBER
+                case BondlingMode.MODE3:
+                    target_plate = self.O_B_MEDIUM_NUMBER
+                case _:
+                    logger.error('Invalid bondling mode')
+                    return False
             self.screenshot()
             cu, res, total = target_plate.ocr(self.device.image)
             if cu == 0 and cu + res == total:
@@ -462,56 +427,34 @@ class ScriptTask(GameUi, GeneralInvite, GeneralRoom, BondlingBattle, SwitchSoul,
 
         def check_ball_number():
             self.screenshot()
-            cu, res, total =  self.O_B_BALL_NUMBER.ocr(self.device.image)
+            cu, res, total = self.O_B_BALL_NUMBER.ocr(self.device.image)
             if cu == 0 and cu + res == total and total == 99:
                 logger.warning(f'No ball number, exit')
                 return False
             return True
 
-        if not check_plate_number(target_plate):
+        # 检查盘子
+        if not check_plate_number():
             return False
-
+        # 检查抓捕契灵剩余数量
         if not check_ball_number():
             return False
 
-        def switch_soul(bondling_class: BondlingClass):
-            # 按照结契的来切换御魂
-            group_team: str = None
-            match bondling_class:
-                case BondlingClass.AZURE_BASAN:
-                    group_team = bondling_switch_soul.azure_basan_switch
-                case BondlingClass.SNOWBALL:
-                    group_team = bondling_switch_soul.snowball_switch
-                case BondlingClass.LITTLE_KURO:
-                    group_team = bondling_switch_soul.little_kuro_switch
-                case BondlingClass.TOMB_GUARD:
-                    group_team = bondling_switch_soul.tomb_guard_switch
-            group_team = switch_parser(group_team)
-            if group_team == [-1, -1]:
-                logger.info(f'{bondling_class.name} switch soul is not set, skip')
-                return False
-            self.enter_shikigami_records()
-            self.run_switch_soul(tuple(group_team))
-            # 返回的时候可能会多点一次导致 返回到探查界面
-            self.exit_shikigami_records()
-
-        bondling_class = self.get_bondling_class()
-        first_switch_soul = True
-        if bondling_switch_soul.auto_switch_soul:
-            first_switch_soul = False
-            switch_soul(bondling_class)
-
         # 开始执行循环
         success = True
+        logger.hr(f'开始执行战斗循环', 2)
         while 1:
             self.screenshot()
 
+            if self.appear(self.I_CHECK_BONDLING_FAIRYLAND):
+                return True
+
             # 如果不在结契界面,就等待
             if not self.in_catch_ui():
                 continue
 
             # 检查是否有盘子
-            if not check_plate_number(target_plate):
+            if not check_plate_number():
                 logger.warning(f'No plate number, exit')
                 return False
             # 检查是否有挑战次数
@@ -528,8 +471,7 @@ class ScriptTask(GameUi, GeneralInvite, GeneralRoom, BondlingBattle, SwitchSoul,
             match cong.bondling_config.user_status:
                 case UserStatus.ALONE:
                     self.run_alone()
-                    if self.run_battle(battle_config, limit_count=self.limit_count):
-                        return success
+                    self.run_battle(battle_config, limit_count=self.limit_count)
                 case _:
                     if self.run_leader():
                         return success
@@ -543,46 +485,6 @@ class ScriptTask(GameUi, GeneralInvite, GeneralRoom, BondlingBattle, SwitchSoul,
                 return True
         return False
 
-    @cached_property
-    def balls_target(self) -> list[RuleImage]:
-        """
-        获取所有的球的图片
-        :return:
-        """
-        result = [self.I_BF_LOCAL_1_AZURE_BASAN,
-                  self.I_BF_LOCAL_2_SNOWBALL,
-                  self.I_BF_LOCAL_3_LITTLE_KURO,
-                  self.I_BF_LOCAL_5_TOMB_GUARD]
-        return result
-
-    @cached_property
-    def balls_roi(self) -> list[tuple]:
-        """
-        获取球的五个位置是识别区域
-        :return:
-        """
-        result = [self.I_BF_LOCAL_1_AZURE_BASAN.roi_back,
-                  self.I_BF_LOCAL_2_SNOWBALL.roi_back,
-                  self.I_BF_LOCAL_3_LITTLE_KURO.roi_back,
-                  self.I_BF_LOCAL_4_NONE.roi_back,
-                  self.I_BF_LOCAL_5_TOMB_GUARD.roi_back]
-        return result
-
-    def roi_appear_ball(self, roi: tuple, image: np.ndarray) -> tuple | None:
-        """
-        判断某个固定的区域是否出现了球
-        :param roi:
-        :param image:
-        :return: 如果出现了,那就返回可以点击的区域,如果没有出现,那就返回None
-        """
-        for ball in self.balls_target:
-            ball.roi_back = list(roi)
-            if ball.match(image, threshold=0.8):
-                logger.info(f'Find ball {ball.name}')
-                logger.info(f'Ball roi {ball.roi_front}')
-                return ball.roi_front
-        return None
-
     def ball_click(self, index: int) -> bool:
         """
         点击球, 进去结契战斗的界面
@@ -604,10 +506,10 @@ class ScriptTask(GameUi, GeneralInvite, GeneralRoom, BondlingBattle, SwitchSoul,
 
         click_target = get_click_target(index)
         click_count = 0
-        logger.info(f'Click ball {index}')
+        logger.info(f'Click ball index: {index}')
         while 1:
             self.screenshot()
-            if self.appear(self.I_CLICK_CAPTION):
+            if self.appear(self.I_BALL_HELP):
                 return True
             if click_count >= 3:
                 return False
@@ -731,7 +633,7 @@ class ScriptTask(GameUi, GeneralInvite, GeneralRoom, BondlingBattle, SwitchSoul,
         click_count = 0
         while 1:
             self.screenshot()
-            if not self.appear(self.I_CLICK_CAPTION, threshold=0.7):
+            if not self.appear(self.I_BALL_FIRE, threshold=0.7):
                 break
             if self.appear_then_click(self.I_BALL_FIRE, interval=1):
                 click_count += 1
@@ -751,8 +653,6 @@ class ScriptTask(GameUi, GeneralInvite, GeneralRoom, BondlingBattle, SwitchSoul,
         :return: 如果成功进入战斗(反正就是不在房间 )返回 True
                  如果失败了,(退出房间)返回 False
         """
-        self.timer_emoji = Timer(15)
-        self.timer_emoji.start()
         wait_second = wait_time.second + wait_time.minute * 60
         self.timer_wait = Timer(wait_second)
         self.timer_wait.start()
@@ -774,25 +674,9 @@ class ScriptTask(GameUi, GeneralInvite, GeneralRoom, BondlingBattle, SwitchSoul,
 
             if self.appear(self.I_EXIT):
                 success = True
-                logger.info("契灵:进入战斗页面!")
+                logger.info("契灵:已经在战斗场景中")
                 break
 
-            # # 判断是否进入战斗
-            # if self.is_in_room(is_screenshot=False):
-            #     logger.info("契灵:进入组队房间!")
-            #     if self.timer_emoji.reached():
-            #         self.timer_emoji.reset()
-            #         self.appear_then_click(self.I_GI_EMOJI_1)
-            #         self.appear_then_click(self.I_GI_EMOJI_2)
-            # else:
-            #     if self.appear(self.I_EXIT):
-            #         logger.info("契灵:进入战斗页面!")
-            #         break
-            #     if self.appear(self.I_CHECK_BONDLING_FAIRYLAND):
-            #         logger.info("契灵:探查页面!")
-            #         success = False
-            #         break
-
         # 调出循环只有这些可能性:
         # 1. 进入战斗(ui是战斗)
         # 2. 队长跑路(自己还是在房间里面)
@@ -864,27 +748,28 @@ class ScriptTask(GameUi, GeneralInvite, GeneralRoom, BondlingBattle, SwitchSoul,
         """
         if not self.appear(self.I_I_ACCEPT):
             return False
+        if self.appear(self.I_I_ACCEPT_JY):
+            logger.info('appear accept_jy')
+            return False
         logger.info('Click accept')
 
         accept_timer = Timer(5)
         accept_timer.start()
-        logger.info("识别到队长邀请,准备点击接受")
+        logger.info("识别到队长邀请,准备点击接受....")
         while 1:
             self.screenshot()
 
-            # 等待超时
-            logger.info(str(accept_timer.current()))
             if accept_timer.reached():
-                logger.warning('accept_timer timeout')
+                logger.info(f"队员点击接受超时:{accept_timer.current()}, 退出")
                 break
 
             if self.is_in_room():
-                logger.info("进入到组队房间!is_in_room")
+                logger.info("契灵:已经在组队房间中")
                 return True
             # 被秒开
             # https://github.com/runhey/OnmyojiAutoScript/issues/230
             if self.appear(GeneralBattleAssets.I_EXIT):
-                logger.info("进入到组队房间!")
+                logger.info("已经在战斗场景中")
                 return False
             if self.appear_then_click(self.I_I_NO_DEFAULT, interval=1):
                 continue
@@ -909,15 +794,15 @@ class ScriptTask(GameUi, GeneralInvite, GeneralRoom, BondlingBattle, SwitchSoul,
 if __name__ == '__main__':
     from module.config.config import Config
     from module.device.device import Device
-    import cv2
 
-    config = Config('oas1')
+    config = Config('SWITCH')
     device = Device(config)
-    task = ScriptTask(config, device)
+    t = ScriptTask(config, device)
+    t.run()
     # image = task.screenshot()
 
     # con = config.bondling_fairyland
     # task.lock_team()
-    task.run()
-    # task.run_stone(True,BondlingClass.TOMB_GUARD)
+    # t.switch_ball()
+    # t.run_stone(True,BondlingClass.TOMB_GUARD)
     # task.run_invite(config=config.bondling_fairyland.invite_config, is_over=False, is_first=True)

+ 2 - 0
tasks/Component/GeneralInvite/assets.py

@@ -93,6 +93,8 @@ class GeneralInviteAssets:
 	I_GI_IN_ROOM = RuleImage(roi_front=(92,17,213,64), roi_back=(92,17,213,64), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_gi_in_room.png")
 	# description 
 	I_BACK_YELLOW_SEA = RuleImage(roi_front=(31,16,42,42), roi_back=(31,16,42,42), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_back_yellow_sea.png")
+	# 识别到寄养邀请 
+	I_I_ACCEPT_JY = RuleImage(roi_front=(248,258,46,25), roi_back=(231,205,75,326), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_i_accept_jy.png")
 
 
 	# Image Rule Assets

+ 9 - 0
tasks/Component/GeneralInvite/gi/image.json

@@ -367,5 +367,14 @@
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
+  },
+  {
+    "itemName": "i_accept_jy",
+    "imageName": "gi_i_accept_jy.png",
+    "roiFront": "248,258,46,25",
+    "roiBack": "231,205,75,326",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "识别到寄养邀请"
   }
 ]