Prechádzať zdrojové kódy

perf: I already don't know what I changed, just to save

runhey 3 rokov pred
rodič
commit
988fab28dd

+ 3 - 1
module/gui/context/process_manager.py

@@ -77,7 +77,9 @@ class ProcessManager(QObject):
         self.update_thread: Thread = None  # 更新线程
         self.start_update_tasks()  # 启动更新线程
 
-        self.event_loop = asyncio.get_event_loop()  # 事件循环
+        # self.event_loop = asyncio.get_event_loop()  # 事件循环
+
+
 
     @Slot()
     def create_all(self) -> None:

+ 9 - 0
script.py

@@ -155,9 +155,18 @@ class Script:
         设置给gui显示的任务 的参数的具体值
         :return:
         """
+        # 验证参数
         task = convert_to_underscore(task)
         group = convert_to_underscore(group)
         argument = convert_to_underscore(argument)
+        # pandtic验证
+        if isinstance(value, str):
+            if len(value) == 8:
+                try:
+                    value = datetime.strptime(value, '%H:%M:%S').time()
+                except ValueError:
+                    pass
+
 
         path = f'{task}.{group}.{argument}'
         task_object = getattr(self.config.model, task, None)

+ 26 - 1
tasks/Component/GeneralBattle/general_battle.py

@@ -30,7 +30,7 @@ class GeneralBattle(BaseTask, GeneralBattleAssets):
 
 
         # 如果没有锁定队伍。那么可以根据配置设定队伍
-        if not config.lock_team_enable and self.is_in_prepare():
+        if not config.lock_team_enable:
             logger.info("Lock team is not enable")
             # 如果更换队伍
             if self.current_count == 1:
@@ -370,6 +370,31 @@ class GeneralBattle(BaseTask, GeneralBattleAssets):
         else:
             return False
 
+    def check_take_over_battle(self, is_screenshot: bool, config: GeneralBattleConfig) -> bool or None:
+        """
+        中途接入战斗,并且接管
+        :return:  赢了返回True, 输了返回False, 不是在战斗中返回None
+        """
+        if is_screenshot:
+            self.screenshot()
+        if not self.is_in_battle():
+            return None
+
+        if self.is_in_prepare(False):
+            while 1:
+                self.screenshot()
+                if self.appear_then_click(self.I_PREPARE_HIGHLIGHT, interval=1.5):
+                    continue
+                if not self.appear(self.I_BUFF):
+                    break
+
+            # 被接管的战斗,只有准备阶段才可以点绿标。
+            # 因为如果是战斗中,无法保证点击的时候是否出现动画
+            self.wait_until_disappear(self.I_BUFF)
+            self.green_mark(config.green_enable, config.green_mark)
+
+        return self.battle_wait(config.random_click_swipt_enable)
+
 
 
 

+ 19 - 2
tasks/Component/GeneralInvite/config_invite.py

@@ -5,6 +5,8 @@ from enum import Enum
 from datetime import datetime, time
 from pydantic import BaseModel, ValidationError, validator, Field
 
+from tasks.Component.config_base import Time
+
 class InviteNumber(str, Enum):
     ONE = 'one'
     TWO = 'two'
@@ -19,8 +21,23 @@ class InviteConfig(BaseModel):
     friend_1: str = Field(default='', description='friend_name_help')
     friend_2: str = Field(default='', description='friend_2_name_help')
     find_mode: FindMode = Field(default=FindMode.AUTO_FIND, description='find_mode_help')
-    wait_time: time = Field(default=time(minute=1), description='wait_time_help')
+    wait_time: time = Field(default=time(minute=2), description='wait_time_help')
     default_invite: bool = Field(default=True, description='default_invite_help')
 
-    # recent_friend, guild_friend, friend, other_friend
+    # @validator('wait_time', pre=False, always=False)
+    # def parse_time(cls, value):
+    #     print('parse_time', value)
+    #     if isinstance(value, str):
+    #         try:
+    #             return datetime.strptime(value, '%H:%M:%S').time()
+    #         except ValueError:
+    #             raise ValueError('Invalid time value. Expected format: HH:MM:SS')
+    #     return value
+
+if __name__ == "__main__":
+    i = InviteConfig()
+    print(isinstance(i.wait_time, time))
+    i.wait_time = "00:05:00"
+    print(i.wait_time)
+    print(isinstance(i.wait_time, time))
 

+ 18 - 1
tasks/Component/config_base.py

@@ -3,7 +3,7 @@
 # github https://github.com/runhey
 from typing import Any
 from collections.abc import Callable, Generator
-from datetime import timedelta
+from datetime import timedelta, time
 
 from pydantic import BaseModel, datetime_parse
 from pydantic.fields import ModelField
@@ -47,4 +47,21 @@ class MultiLine(str):
         if field:
             field_schema['type'] = 'multi_line'
 
+class Time(time):
+    """
+    尝试将字符串转换为time对象, 但是不生效
+    """
+    @classmethod
+    def __get_validators__(cls):
+        yield cls.validate
 
+    @classmethod
+    def validate(cls, value):
+        print('validate', value)
+        if isinstance(value, str):
+            hour, minute, second = map(int, value.split(":"))
+            return cls(hour, minute, second)
+        elif isinstance(value, time):
+            return value
+        else:
+            raise ValueError("Invalid time format")

+ 1 - 1
tasks/KekkaiActivation/script_task.py

@@ -117,7 +117,7 @@ class ScriptTask(KU, KekkaiActivationAssets):
                 logger.info('Card is selected but not using')
                 while 1:
                     self.screenshot()
-                    if self.appear(self.I_A_INVITE):
+                    if self.appear(self.I_A_INVITE, threshold=0.7):
                         logger.info('Card is activated')
                         break
                     if self.appear_then_click(self.I_UI_CONFIRM, interval=0.6):

+ 4 - 2
tasks/Orochi/script_task.py

@@ -217,6 +217,7 @@ class ScriptTask(GeneralBattle, GeneralInvite, GeneralBuff, GeneralRoom, GameUi,
         # self.check_lock(self.config.orochi.general_battle_config.lock_team_enable)
 
         # 进入战斗流程
+        self.device.stuck_record_add('BATTLE_STATUS_S')
         while 1:
             self.screenshot()
 
@@ -235,13 +236,14 @@ class ScriptTask(GeneralBattle, GeneralInvite, GeneralBuff, GeneralRoom, GameUi,
                 continue
 
             if self.is_in_room():
+                self.device.stuck_record_clear()
                 if self.wait_battle(wait_time=self.config.orochi.invite_config.wait_time):
                     self.run_general_battle(config=self.config.orochi.general_battle_config)
                 else:
                     break
             # 队长秒开的时候,检测是否进入到战斗中
-            elif self.is_in_battle():
-                self.run_general_battle(config=self.config.orochi.general_battle_config)
+            elif self.check_take_over_battle(False, config=self.config.orochi.general_battle_config):
+                continue
 
         while 1:
             # 有一种情况是本来要退出的,但是队长邀请了进入的战斗的加载界面

+ 1 - 1
tasks/Restart/login.py

@@ -141,7 +141,7 @@ class LoginHandler(BaseTask, RestartAssets):
                 timer_harvest.reset()
                 continue
             # 邮件
-            if self.appear_then_click(self.I_HARVEST_MAIL, interval=1):
+            if self.appear_then_click(self.I_HARVEST_MAIL, interval=1.5):
                 timer_harvest.reset()
                 continue
             if self.appear(self.I_HARVEST_MAIL_TITLE, interval=0.2):

+ 5 - 2
tasks/base_task.py

@@ -449,13 +449,16 @@ class BaseTask(GlobalGameAssets):
             self.screenshot()
 
             if self.ui_reward_appear_click():
-                self.wait_until_stable(self.I_UI_REWARD)
                 while 1:
                     self.screenshot()
                     # 等待动画结束
-                    if not self.appear(self.I_UI_REWARD):
+                    if not self.appear(self.I_UI_REWARD, threshold=0.6):
                         logger.info('Get reward success')
                         break
+
+                    # 一直点击
+                    if self.ui_reward_appear_click():
+                        continue
                 break
 
             if self.appear_then_click(click_image, interval=0.8):