Przeglądaj źródła

Merge remote-tracking branch 'origin/exploration' into exploration

ljxun 2 lat temu
rodzic
commit
5532a187c7
2 zmienionych plików z 33 dodań i 25 usunięć
  1. 3 3
      tasks/Exploration/config.py
  2. 30 22
      tasks/Exploration/script_task.py

+ 3 - 3
tasks/Exploration/config.py

@@ -62,9 +62,9 @@ class ChooseRarity(str, Enum):
 
 class Scrolls(BaseModel):
     # 绘卷模式
-    scrolls_enable: bool = Field(title='绘卷模式', default=False, description='绘卷模式(探索->突破)循环')
-    scrolls_cd: TimeDelta = Field(title='探索间隔时间', default=TimeDelta(hours=0, minutes=30, seconds=0), description='探索间隔时间')
-    scrolls_threshold: int = Field(title='突破票数量', default='25', description='设置突破票数量,超过去打突破')
+    scrolls_enable: bool = Field(title='绘卷模式', default=False, description='绘卷模式')
+    scrolls_cd: TimeDelta = Field(title='间隔时间', default=TimeDelta(hours=0, minutes=30, seconds=0), description='间隔时间')
+    scrolls_threshold: int = Field(title='突破票数量', default='25', description='突破票数量,超过打突破')
 
 
 class ExplorationConfig(BaseModel):

+ 30 - 22
tasks/Exploration/script_task.py

@@ -79,28 +79,8 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, ExplorationAssets):
             count = 0
             while count < exploration_count:
                 if self.wait_until_appear(self.I_E_EXPLORATION_CLICK, wait_time=1):
-                    # 如果打开绘卷模式
-                    if con_scrolls.scrolls_enable:
-                        self.screenshot()
-                        cu, res, total = self.O_REALM_RAID_NUMBER1.ocr(self.device.image)
-                        # 如果突破卷超出设定数量,去打个突
-                        if cu >= con_scrolls.scrolls_threshold:
-                            # 设定下次探索时间
-                            next_run = datetime.now() + con_scrolls.scrolls_cd
-                            self.set_next_run(task='Exploration', success=False, finish=False, target=next_run)
-                            self.set_next_run(task='RealmRaid', success=False, finish=False, target=datetime.now())
-
-                            self.appear_then_click(self.I_RED_CLOSE)
-                            self.ui_goto(page_main)
-                            # 关闭 buff
-                            if con.buff_gold_50_click or con.buff_gold_100_click or con.buff_exp_50_click or con.buff_exp_100_click:
-                                self.open_buff()
-                                self.gold_50(is_open=False)
-                                self.gold_100(is_open=False)
-                                self.exp_50(is_open=False)
-                                self.exp_100(is_open=False)
-                                self.close_buff()
-                            raise TaskEnd
+                    # 绘卷模式
+                    self.activate_realm_raid(con_scrolls,con)
 
                     self.click(self.I_E_EXPLORATION_CLICK)
                     count += 1
@@ -290,6 +270,34 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, ExplorationAssets):
         # 进入战斗环节
         self.do_battle()
 
+    def activate_realm_raid(self, con_scrolls, con) -> None:
+        # 判断是否开启突破票检测
+        if not con_scrolls.scrolls_enable:
+            return
+        self.screenshot()
+        cu, res, total = self.O_REALM_RAID_NUMBER1.ocr(self.device.image)
+        # 判断突破票数量
+        if cu < con_scrolls.scrolls_threshold:
+            return
+
+        # 关闭加成
+        self.appear_then_click(self.I_RED_CLOSE)
+        self.ui_goto(page_main)
+        if con.buff_gold_50_click or con.buff_gold_100_click or con.buff_exp_50_click or con.buff_exp_100_click:
+            self.open_buff()
+            self.gold_50(is_open=False)
+            self.gold_100(is_open=False)
+            self.exp_50(is_open=False)
+            self.exp_100(is_open=False)
+            self.close_buff()
+
+        # 设置下次执行行时间
+        logger.info("RealmRaid and Exploration  set_next_run !")
+        next_run = datetime.now() + con_scrolls.scrolls_cd
+        self.set_next_run(task='Exploration', success=False, finish=False, target=next_run)
+        self.set_next_run(task='RealmRaid', success=False, finish=False, target=datetime.now())
+        raise TaskEnd
+
 
 if __name__ == "__main__":
     from module.config.config import Config