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

refactor(FindJade):重构找协作任务配置和逻辑- 更新 FindJade 配置模型,增加邀请信息和小号列表
- 重构邀请历史记录存储方式,使用字段替代列表- 优化登录流程,调整服务器选择和进入游戏的逻辑
- 改进悬赏封印协作类型获取方法
- 更新时间格式化处理,统一为 '%Y-%m-%d %H:%M:%S'

ChengRanORZ 1 год назад
Родитель
Сommit
d64a719fa7

+ 6 - 2
tasks/Component/SwitchAccount/switch_account_config.py

@@ -1,6 +1,7 @@
-from datetime import datetime
 from pydantic import Field, BaseModel
 
+from tasks.Component.config_base import DateTime
+
 
 class AccountInfo(BaseModel):
     """
@@ -18,7 +19,7 @@ class AccountInfo(BaseModel):
     accountAlias: str = Field(default="", description="")
     appleOrAndroid: bool = Field(default=True, description="apple_or_android_help")
     # 上一次执行成功的时间 ,防止出错时重复登录浪费时间
-    last_complete_time: datetime = Field(default=datetime(1970, 1, 1, 1, 1, 1), description="last_complete_time_help")
+    last_complete_time: DateTime = Field(default=DateTime.fromisoformat("2023-01-01 00:00:00"), description="last_complete_time_help")
 
     def is_account_alias(self, ocr_account):
         tmp_account = AccountInfo.preprocessAccount(self.account)
@@ -43,3 +44,6 @@ class AccountInfo(BaseModel):
         @rtype:
         """
         return account.split('@')[0]
+
+    def is_valid(self):
+        return self.character!="" and self.character is not None

+ 6 - 8
tasks/Component/config_base.py

@@ -2,16 +2,14 @@
 # @author runhey
 # github https://github.com/runhey
 import re
-from typing import Any
-from collections.abc import Callable, Generator
 from datetime import timedelta, time, datetime
+from typing import Any
 
-from typing_extensions import Annotated
+from pydantic import BaseModel
 from pydantic import (BeforeValidator,
                       PlainSerializer,
-                      WithJsonSchema,
-                      TypeAdapter)
-from pydantic import BaseModel
+                      WithJsonSchema)
+from typing_extensions import Annotated
 
 
 def format_timedelta(tdelta: timedelta):
@@ -58,12 +56,12 @@ TimeDelta = Annotated[timedelta,
 
 DateTime = Annotated[datetime,
                      BeforeValidator(datetime_validator),
-                     PlainSerializer(lambda v: v.isoformat(), return_type=str),
+                     PlainSerializer(lambda v: v.strftime('%Y-%m-%d %H:%M:%S'), return_type=str),
                      WithJsonSchema({'type': 'date_time'}),]
 
 Time = Annotated[time,
                  BeforeValidator(time_validator),
-                 PlainSerializer(lambda v: v.isoformat(), return_type=str),
+                 PlainSerializer(lambda v: v.strftime('%H:%M:%S'), return_type=str),
                  WithJsonSchema({'type': 'time'}),]
 
 # ---------------------------------------------------------------------------------------------------------------------

+ 2 - 2
tasks/FindJade/WantedQuestsEx.py

@@ -1,5 +1,4 @@
-import importlib
-from tasks.WantedQuests.config import WantedQuests, CooperationType, WantedQuestsConfig
+from tasks.WantedQuests.config import CooperationType, WantedQuestsConfig
 
 
 def need_invite_vip(self):
@@ -20,6 +19,7 @@ def invite_success_callback(self, ctype: CooperationType, name: str):
     if not self.fade_conf:
         return
     self.fade_conf.update_invite_history(ctype, name)
+    self.config.save()
 
 
 def get_config(self):

+ 99 - 45
tasks/FindJade/config.py

@@ -1,65 +1,72 @@
-import json
 from datetime import datetime, timedelta
-from enum import IntEnum
-from pydantic import Field, BaseModel
+from typing import Any, Dict
+
+from pydantic import Field, BaseModel, model_validator, model_serializer, ValidationError
+
+from deploy.logger import logger
 from tasks.Component.SwitchAccount.switch_account_config import AccountInfo
-from tasks.Component.config_base import ConfigBase
+from tasks.Component.config_base import ConfigBase, DateTime
 from tasks.Component.config_scheduler import Scheduler
-from module.config.utils import write_file
 from tasks.WantedQuests.config import CooperationSelectMaskDescription, CooperationSelectMask, CooperationType
-from typing import List, Any
-
-
-class FindJadeConfig(BaseModel):
-    find_jade_json_path: str = Field(default='./config/findjade/find_jade.json', description='json conf file path')
-    # extra: str = Field(default='')
-
-
-class FindJade(ConfigBase):
-    scheduler: Scheduler = Field(default_factory=Scheduler)
-    find_jade_config: FindJadeConfig = Field(default_factory=FindJadeConfig)
 
 
 class InviteHistoryItem(BaseModel):
     cooperation_type: CooperationType
-    time: datetime
+    time: DateTime
 
 
 class InviteInfo(BaseModel):
     # 被邀请人员昵称
-    name: str = "defaultName"
-    default_invite_type: CooperationSelectMaskDescription
+    name: str = Field(default="")
+    default_invite_type: CooperationSelectMaskDescription = Field(default=CooperationSelectMaskDescription.JadeAndFood)
 
     # 协作任务类型   上次邀请时间
-    invite_history: list[InviteHistoryItem]
+    invite_history_1: DateTime = Field(default=DateTime.fromisoformat("2023-01-01 00:00:00"),
+                                       description='invite_history_1_help')
+    invite_history_2: DateTime = Field(default=DateTime.fromisoformat("2023-01-01 00:00:00"),
+                                       description='invite_history_2_help')
+    invite_history_4: DateTime = Field(default=DateTime.fromisoformat("2023-01-01 00:00:00"),
+                                       description='invite_history_4_help')
+    invite_history_8: DateTime = Field(default=DateTime.fromisoformat("2023-01-01 00:00:00"),
+                                       description='invite_history_8_help')
 
     def need_invite(self, ctype: CooperationType):
         if not ctype & CooperationSelectMask[self.default_invite_type.value]:
             return False
-        # 判断是否邀请过
-        lastTime = max([filtered.time for filtered in
-                        filter(lambda x: x.cooperation_type == ctype, self.invite_history)],
-                       default=datetime(1970, 2, 2))
+        last_time = self.__getattribute__("invite_history_" + str(ctype))
 
         now = datetime.now()
-        if now - lastTime > timedelta(hours=13):
+        if now - last_time > timedelta(hours=13):
             return True
-        if (lastTime.hour >= 18 or lastTime.hour < 5) and (18 > now.hour >= 5):
+        if (last_time.hour >= 18 or last_time.hour < 5) and (18 > now.hour >= 5):
             return True
-        if (5 <= lastTime.hour < 18) and now.hour >= 18:
+        if (5 <= last_time.hour < 18) and now.hour >= 18:
             return True
         return False
 
-    def add_invite_history(self, ctype: CooperationType, name=None):
+    def update_invite_history(self, ctype: CooperationType, name=None):
         if name != self.name:
             return
-        self.invite_history.append(InviteHistoryItem(cooperation_type=ctype, time=datetime.now()))
-        pass
+        self.__setattr__("invite_history_" + str(ctype), datetime.now())
 
+    def is_valid(self):
+        return self.name != "" and self.name is not None
 
-class FindJadeJSON(BaseModel, extra='allow'):
-    find_jade_accounts_info: list[AccountInfo]
-    invite_info_list: list[InviteInfo]
+
+class FindJadeConfig(ConfigBase, extra='allow'):
+    # 被邀请人数
+    invite_info_count: int = Field(default=1, ge=1, description='invite_info_count_help')
+    # 小号数
+    sup_account_count: int = Field(default=1, ge=1, description='sup_account_count_help')
+
+
+class FindJade(ConfigBase):
+    scheduler: Scheduler = Field(default_factory=Scheduler)
+    find_jade_config: FindJadeConfig = Field(default_factory=FindJadeConfig)
+    # 邀请人员信息
+    invite_info_list: list[InviteInfo] = None
+    # 小号信息
+    sup_account_list: list[AccountInfo] = None
 
     def get_invite_name(self, ctype: CooperationType):
         for info in self.invite_info_list:
@@ -72,16 +79,15 @@ class FindJadeJSON(BaseModel, extra='allow'):
         for info in self.invite_info_list:
             if info.name != name:
                 continue
-            info.add_invite_history(ctype, name)
-        self.updateHandle()
+            info.update_invite_history(ctype, name)
 
     def update_account_login_history(self, account: AccountInfo):
-        accountInfoList = self.find_jade_accounts_info
+        accountInfoList = self.sup_account_list
         for info in accountInfoList:
             if info.character != account.character or info.svr != account.svr:
                 continue
             info.last_complete_time = datetime.now()
-        self.updateHandle()
+            break
 
     def get_cooperation_type_mask(self) -> CooperationSelectMaskDescription:
         """
@@ -94,11 +100,59 @@ class FindJadeJSON(BaseModel, extra='allow'):
         name = CooperationSelectMask(result).name
         return CooperationSelectMaskDescription(name)
 
-    def save2file(self, conf_path):
-        write_file(conf_path, self.dict())
-
-    def updateHandle(self):
-        """
-            需要刷新配置到磁盘时调用
-        """
-        pass
+    @model_validator(mode='before')
+    @classmethod
+    def validator_all(cls, v: dict) -> Any:
+        invite_info_count = v.get('find_jade_config', {}).get('invite_info_count', 1)
+        sup_account_count = v.get('find_jade_config', {}).get('sup_account_count', 1)
+
+        def validator_list(list_name, data, item_type=None, list_size=1):
+            if list_name not in data:
+                data[list_name] = []
+
+            remove_keys = []
+            for key, value in data.items():
+                if list_name == key or list_name not in key:
+                    continue
+                try:
+                    item = item_type(**value)
+                    if item.is_valid():
+                        data[list_name].append(item)
+                    remove_keys.append(key)
+                except ValidationError as e:
+                    pass
+                except TypeError as e:
+                    pass
+
+            for key in remove_keys:
+                del data[key]
+
+            if item_type is not None:
+                if len(data[list_name]) < list_size:
+                    for i in range(list_size - len(data[list_name])):
+                        data[list_name].append(item_type())
+
+        validator_list('invite_info_list', v, InviteInfo, invite_info_count)
+        validator_list('sup_account_list', v, AccountInfo, sup_account_count)
+
+        return v
+
+    @model_serializer()
+    def serializer_model(self, value: Any) -> Dict[str, Any]:
+        properties = self.__dict__
+        data = {}
+
+        def v_dump(v):
+            try:
+                return v.model_dump()
+            except AttributeError as e:
+                logger.error(e)
+                return v
+
+        for key, value in properties.items():
+            if isinstance(value, list):
+                for index, v in enumerate(value):
+                    data[f'{key}_{index + 1}'] = v_dump(v)
+            else:
+                data[key] = v_dump(value)
+        return data

+ 15 - 24
tasks/FindJade/script_task.py

@@ -1,25 +1,22 @@
 import importlib
 from datetime import datetime, timedelta
 
-from module.config.utils import read_file
 from module.exception import TaskEnd, RequestHumanTakeover
+from module.logger import logger
 from tasks.Component.SwitchAccount.switch_account import SwitchAccount
 from tasks.FindJade import WantedQuestsEx
 from tasks.FindJade.assets import FindJadeAssets
-from tasks.FindJade.config import AccountInfo, FindJadeJSON
+from tasks.FindJade.config import AccountInfo, FindJade
 from tasks.GameUi.game_ui import GameUi
-from tasks.WantedQuests.config import CooperationSelectMaskDescription
-from module.logger import logger
 
 
 class ScriptTask(GameUi, FindJadeAssets):
-    fade_conf: FindJadeJSON = None
+    fade_conf: FindJade= None
 
     def run(self):
-        self.fade_conf = self.parse()
+        self.fade_conf = self.config.find_jade
 
-        self.fade_conf.updateHandle = self.save_jade_json
-        for accountInfo in self.fade_conf.find_jade_accounts_info:
+        for accountInfo in self.fade_conf.sup_account_list:
             logger.info("start %s-%s ", accountInfo.character, accountInfo.svr)
             if not self.is_need_login(accountInfo):
                 logger.warning("%s Skipped last Login Time:%s", accountInfo.character, accountInfo.last_complete_time)
@@ -38,22 +35,17 @@ class ScriptTask(GameUi, FindJadeAssets):
                 logger.warning("%s-%s TaskEnd", accountInfo.character, accountInfo.svr)
                 # 更新配置文件中的时间
                 self.fade_conf.update_account_login_history(accountInfo)
-                self.fade_conf.save2file(self.config.find_jade.find_jade_config.find_jade_json_path)
+                self.save_config()
                 continue
             except RequestHumanTakeover as e:
                 raise
             except Exception as e:
+                logger.error(e)
                 self.next_run("FindJade", success=False)
-        self.next_run("FindJade",success=True)
+        self.next_run("FindJade", success=True)
         raise TaskEnd("FindJade")
         pass
 
-    def parse(self) -> FindJadeJSON:
-
-        conf_path = self.config.find_jade.find_jade_config.find_jade_json_path
-        jsonData = read_file(conf_path)
-        fjconf = FindJadeJSON(**jsonData)
-        return fjconf
 
     def is_need_login(self, item: AccountInfo):
         """
@@ -90,30 +82,29 @@ class ScriptTask(GameUi, FindJadeAssets):
         wq = WQEX(**kwargs)
         return wq
 
-    def save_jade_json(self):
-        conf_path = self.config.find_jade.find_jade_config.find_jade_json_path
-        self.fade_conf.save2file(conf_path)
+    def save_config(self):
+        self.config.save()
 
     def next_run(self, task: str, finish: bool = False,
                  success: bool = None, server: bool = True, target: datetime = None) -> None:
         now = datetime.now()
         if success:
-            if (5 <= now.hour < 18):
+            if 5 <= now.hour < 18:
                 self.set_next_run(task, target=now.replace(hour=18, minute=5))
-            elif (now.hour < 5):
+            elif now.hour < 5:
                 self.set_next_run(task, target=now.replace(hour=5, minute=5))
             else:
                 self.set_next_run(task, target=now.replace(hour=18, minute=5) + timedelta(days=1))
         else:
-            self.set_next_run(task, target=now+timedelta(minutes=10))
+            self.set_next_run(task, target=now + timedelta(minutes=10))
 
 
 if __name__ == '__main__':
     from module.config.config import Config
     from module.device.device import Device
-    from mypatch import SimplePatch
+    # from mypatch import SimplePatch
 
-    SimplePatch.patch()
+    # SimplePatch.patch()
 
     c = Config('oas1')
     d = Device(c)

+ 3 - 5
tasks/Restart/assets.py

@@ -1,9 +1,7 @@
-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.image import RuleImage
 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.
@@ -72,7 +70,7 @@ class RestartAssets:
 	# 登录时候不观看CG视频 
 	I_WATCH_VIDEO_CANCEL = RuleImage(roi_front=(466,396,130,61), roi_back=(466,396,130,61), threshold=0.8, method="Template matching", file="./tasks/Restart/login/login_watch_video_cancel.png")
 	# 指定角色进入游戏,默认第一个 
-	I_LOGIN_SPECIFIC_SERVE = RuleImage(roi_front=(24,33,52,47), roi_back=(24,33,52,47), threshold=0.8, method="Template matching", file="./tasks/Restart/login/login_login_specific_serve.png")
+	I_LOGIN_SPECIFIC_SERVE = RuleImage(roi_front=(0,0,120,120), roi_back=(0,0,120,120), threshold=0.8, method="Template matching", file="./tasks/Restart/login/login_login_specific_serve.png")
 	# 下载插画 
 	I_LOGIN_LOAD_DOWN = RuleImage(roi_front=(711,450,153,58), roi_back=(711,450,153,58), threshold=0.8, method="Template matching", file="./tasks/Restart/login/login_login_load_down.png")
 	# 登录界面 弹出框 前往绑定 手机 

+ 7 - 3
tasks/Restart/login.py

@@ -98,15 +98,19 @@ class LoginHandler(BaseTask, RestartAssets):
             # 点击屏幕进入游戏
             if self.appear(self.I_LOGIN_SPECIFIC_SERVE, interval=0.6) \
                     and self.ocr_appear_click(self.O_LOGIN_SPECIFIC_SERVE, interval=0.6):
-                self.ui_click(self.C_LOGIN_ENSURE_LOGIN_CHARACTER_IN_SAME_SVR,
-                              stop=self.I_LOGIN_SCROOLL_CLOSE, interval=2)
+                while True:
+                    self.screenshot()
+                    if self.appear(self.I_LOGIN_SPECIFIC_SERVE):
+                        self.click(self.C_LOGIN_ENSURE_LOGIN_CHARACTER_IN_SAME_SVR,interval=2)
+                        continue
+                    break
                 logger.info('login specific user')
                 continue
             # 点击’进入游戏‘
             if not self.appear(self.I_LOGIN_8):
                 continue
             if self.ocr_appear_click(self.O_LOGIN_ENTER_GAME, interval=3):
-                self.wait_until_appear(self.I_LOGIN_SPECIFIC_SERVE, False, wait_time=2)
+                self.wait_until_appear(self.I_LOGIN_SPECIFIC_SERVE, True, wait_time=5)
                 continue
 
         return login_success

+ 2 - 2
tasks/Restart/login/image.json

@@ -56,8 +56,8 @@
   {
     "itemName": "login_specific_serve",
     "imageName": "login_login_specific_serve.png",
-    "roiFront": "24,33,52,47",
-    "roiBack": "24,33,52,47",
+    "roiFront": "0,0,120,120",
+    "roiBack": "0,0,120,120",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "指定角色进入游戏,默认第一个"

+ 23 - 20
tasks/WantedQuests/config.py

@@ -1,49 +1,51 @@
 # This Python file uses the following encoding: utf-8
 # @author runhey
 # github https://github.com/runhey
-from datetime import timedelta, time
 from enum import Enum
-from pydantic import BaseModel, Field, validator
 
-from tasks.Component.config_scheduler import Scheduler
-from tasks.Component.config_base import ConfigBase, Time
-from tasks.Component.GeneralBattle.config_general_battle import GeneralBattleConfig
+from pydantic import BaseModel, Field
+
 from tasks.Component.SwitchSoul.switch_soul_config import SwitchSoulConfig
+from tasks.Component.config_base import ConfigBase, Time
+from tasks.Component.config_scheduler import Scheduler
 
 
 class CooperationType(int, Enum):
     """
         用于区分悬赏封印协作类型
     """
-    Gold = 1     #金币协作
-    Jade = 2     #勾玉协作
-    Food = 4     #狗/猫粮协作   
-    Sushi = 8    #体力协作
+    Gold = 1  # 金币协作
+    Jade = 2  # 勾玉协作
+    Food = 4  # 狗/猫粮协作
+    Sushi = 8  # 体力协作
 
     def __hash__(self):
         return self.value
 
+    def __str__(self):
+        return str(self.value)
+
 
 class CooperationSelectMask(int, Enum):
     """
         掩码,对协作任务进行筛选
     """
-    NoInvite = 0                #不自动邀请
-    GoldOnly = 1                #仅 金币 协作进行邀请
-    JadeOnly = 2                #仅 勾玉 协作进行邀请
+    NoInvite = 0  # 不自动邀请
+    GoldOnly = 1  # 仅 金币 协作进行邀请
+    JadeOnly = 2  # 仅 勾玉 协作进行邀请
     GoldAndJade = 3
-    FoodOnly = 4                #仅 狗/猫粮 协作进行邀请
-    GoldAndFood = 5    
+    FoodOnly = 4  # 仅 狗/猫粮 协作进行邀请
+    GoldAndFood = 5
     JadeAndFood = 6
     GoldAndJadeAndFood = 7
-    SushiOnly = 8               #仅 体力 协作进行邀请
-    GoldAndSushi = 9            
+    SushiOnly = 8  # 仅 体力 协作进行邀请
+    GoldAndSushi = 9
     JadeAndSushi = 10
     GoldAndJadeAndSushi = 11
     FoodAndSushi = 12
     GoldAndFoodAndSushi = 13
     JadeAndFoodAndSushi = 14
-    Any = 15                    #所有协作任务都邀请
+    Any = 15  # 所有协作任务都邀请
 
 
 class CooperationSelectMaskDescription(str, Enum):
@@ -84,14 +86,15 @@ class CooperationSelectMaskDescription(str, Enum):
 class WantedQuestsConfig(BaseModel):
     before_end: Time = Field(default=Time(0, 0, 0), description='before_end_help')
     invite_friend_name: str = Field(default=str(""), description="invite_friend_name_help")
-    cooperation_type: CooperationSelectMaskDescription = Field(default=CooperationSelectMaskDescription.Any, description="cooperation_type_help")
+    cooperation_type: CooperationSelectMaskDescription = Field(default=CooperationSelectMaskDescription.Any,
+                                                               description="cooperation_type_help")
     # 找怪优先级  挑战 > 秘闻 > 探索
     battle_priority: str = Field(default='挑战 > 秘闻 > 探索', description='battle_priority_help')
-	# 只完成协作任务
+    # 只完成协作任务
     cooperation_only: bool = Field(default=False, description="cooperation_only_help")
 
 
 class WantedQuests(ConfigBase):
     scheduler: Scheduler = Field(default_factory=Scheduler)
     wanted_quests_config: WantedQuestsConfig = Field(default_factory=WantedQuestsConfig)
-    switch_soul_config: SwitchSoulConfig = Field(default_factory=SwitchSoulConfig)
+    switch_soul_config: SwitchSoulConfig = Field(default_factory=SwitchSoulConfig)

+ 8 - 3
tasks/WantedQuests/explore.py

@@ -1,10 +1,9 @@
 from cached_property import cached_property
 
-from module.atom.image import RuleImage
 from module.atom.animate import RuleAnimate
+from module.atom.image import RuleImage
 from module.base.timer import Timer
 from module.logger import logger
-
 from tasks.Exploration.base import BaseExploration, Scene
 from tasks.Exploration.version import HighLight
 
@@ -61,7 +60,13 @@ class WQExplore(BaseExploration, HighLight):
             # 探索里面
             elif scene == Scene.MAIN:
                 if not explore_init:
-                    self.ui_click(self.I_E_AUTO_ROTATE_OFF, stop=self.I_E_AUTO_ROTATE_ON)
+                    count=0
+                    while count<5:
+                        if self.appear(self.I_E_AUTO_ROTATE_ON):
+                            break
+                        if self.appear(self.I_E_AUTO_ROTATE_OFF, interval=1.5):
+                            self.click(self.I_E_AUTO_ROTATE_OFF)
+                            count+=1
                     explore_init = True
                     continue
                 # 小纸人

+ 10 - 17
tasks/WantedQuests/script_task.py

@@ -2,30 +2,23 @@
 # @author runhey
 # github https://github.com/runhey
 import re
-import copy
-from time import sleep
 from datetime import timedelta, time, datetime
+from time import sleep
+from typing import List
+
 from cached_property import cached_property
-from enum import Enum
-from module.atom.image import RuleImage
 
+from module.atom.image import RuleImage
+from module.base.timer import Timer
 from module.exception import TaskEnd
 from module.logger import logger
-from module.base.timer import Timer
-
-from tasks.GameUi.game_ui import GameUi
-from tasks.GameUi.page import page_main, page_exploration, page_shikigami_records
-from tasks.Component.GeneralBattle.general_battle import GeneralBattle
+from tasks.Component.Costume.config import MainType
 from tasks.Component.GeneralBattle.config_general_battle import GeneralBattleConfig
-from tasks.Component.GeneralInvite.general_invite import GeneralInvite
+from tasks.GameUi.page import page_main, page_exploration, page_shikigami_records
 from tasks.Secret.script_task import ScriptTask as SecretScriptTask
-from tasks.WantedQuests.config import WantedQuestsConfig, CooperationType, CooperationSelectMask, \
-    CooperationSelectMaskDescription
 from tasks.WantedQuests.assets import WantedQuestsAssets
+from tasks.WantedQuests.config import CooperationType, CooperationSelectMask
 from tasks.WantedQuests.explore import WQExplore, ExploreWantedBoss
-from tasks.Component.Costume.config import MainType
-from typing import List
-from tasks.Component.SwitchSoul.switch_soul import SwitchSoul
 
 
 class ScriptTask(WQExplore, SecretScriptTask, WantedQuestsAssets):
@@ -493,7 +486,7 @@ class ScriptTask(WQExplore, SecretScriptTask, WantedQuestsAssets):
         # 没有找到需要邀请的人,点击取消 返回悬赏封印界面
         if not find:
             self.screenshot()
-            self.ui_click_until_disappear(self.I_WQ_INVITE_CANCEL, interval=0.5)
+            self.ui_click_until_disappear(self.I_WQ_INVITE_CANCEL, interval=1.5)
             return False
         #
         self.ui_click_until_disappear(self.I_WQ_INVITE_ENSURE, interval=1)
@@ -527,7 +520,7 @@ class ScriptTask(WQExplore, SecretScriptTask, WantedQuestsAssets):
             if self.appear(self.__getattribute__("I_WQ_COOPERATION_TYPE_GOLD_" + str(index + 1))):
                 retList.append({'type': CooperationType.Gold, 'inviteBtn': btn})
                 continue
-
+        logger.info(f"get cooperation size {len(retList)}")
         return retList
 
     @cached_property