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

fix(ocochi): quit as captain when you're done

runhey 3 лет назад
Родитель
Сommit
1403ccf357
3 измененных файлов с 11 добавлено и 7 удалено
  1. 1 1
      script.py
  2. 6 6
      tasks/Component/GeneralInvite/general_invite.py
  3. 4 0
      tasks/Orochi/script_task.py

+ 1 - 1
script.py

@@ -423,7 +423,7 @@ class Script:
             if success:
                 del_cached_property(self, 'config')
                 continue
-            elif self.config.error.handle.error:
+            elif self.config.script.error.handle_error:
                 # self.config.task_delay(success=False)
                 del_cached_property(self, 'config')
                 self.checker.check_now()

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

@@ -1,7 +1,7 @@
 # This Python file uses the following encoding: utf-8
 # @author runhey
 # github https://github.com/runhey
-import time
+from time import sleep
 import numpy as np
 
 from enum import Enum
@@ -397,11 +397,11 @@ class GeneralInvite(BaseTask, GeneralInviteAssets):
                     continue
 
             logger.info(f'Now find friend in ”最近“')
-            time.sleep(1)
+            sleep(1)
             if not is_select:
                 if self.detect_select(name):
                     is_select = True
-            time.sleep(1)
+            sleep(1)
             if not is_select:
                 if self.detect_select(name):
                     is_select = True
@@ -442,11 +442,11 @@ class GeneralInvite(BaseTask, GeneralInviteAssets):
             # 选中好友, 在这里游戏获取在线的好友并不是很快,根据不同的设备会有不同的时间,而且没有什么元素提供我们来判断
             # 所以这里就直接等待一段时间
             logger.info(f'Now find friend in {friend_class[index]}')
-            time.sleep(1)
+            sleep(1)
             if not is_select:
                 if self.detect_select(name):
                     is_select = True
-            time.sleep(1)
+            sleep(1)
             if not is_select:
                 if self.detect_select(name):
                     is_select = True
@@ -483,7 +483,7 @@ class GeneralInvite(BaseTask, GeneralInviteAssets):
             success = self.invite_friend(config.friend_2, config.find_mode)
             if not success:
                 logger.warning('Invite friend 2 failed')
-        time.sleep(0.5)
+        sleep(0.5)
 
     def invite_again(self, default_invite: bool=True) -> bool:
         """

+ 4 - 0
tasks/Orochi/script_task.py

@@ -13,6 +13,7 @@ from tasks.GameUi.page import page_main, page_soul_zones
 from tasks.Orochi.assets import OrochiAssets
 from tasks.Orochi.config import Orochi, UserStatus
 from module.logger import logger
+from module.exception import TaskEnd
 
 class ScriptTask(GeneralBattle, GeneralInvite, GeneralBuff, GeneralRoom, GameUi, OrochiAssets):
 
@@ -51,6 +52,8 @@ class ScriptTask(GeneralBattle, GeneralInvite, GeneralBuff, GeneralRoom, GameUi,
         else:
             self.set_next_run('Orochi', finish=False, success=False)
 
+        raise TaskEnd
+
 
 
     def orochi_enter(self) -> bool:
@@ -137,6 +140,7 @@ class ScriptTask(GeneralBattle, GeneralInvite, GeneralBuff, GeneralRoom, GameUi,
         is_first = True
         # 这个时候我已经进入房间了哦
         while 1:
+            self.screenshot()
             # 无论胜利与否, 都会出现是否邀请一次队友
             # 区别在于,失败的话不会出现那个勾选默认邀请的框
             if self.check_and_invite(self.config.orochi.invite_config.default_invite):