Quellcode durchsuchen

feat(ActivityShikigami): #430 Add switch souls before start task

ryland vor 2 Jahren
Ursprung
Commit
10ecb84ca0
2 geänderte Dateien mit 17 neuen und 2 gelöschten Zeilen
  1. 2 0
      tasks/ActivityShikigami/config.py
  2. 15 2
      tasks/ActivityShikigami/script_task.py

+ 2 - 0
tasks/ActivityShikigami/config.py

@@ -5,6 +5,7 @@ from datetime import time, timedelta
 from pydantic import BaseModel, Field
 from pydantic import BaseModel, Field
 
 
 from tasks.Component.GeneralBattle.config_general_battle import GeneralBattleConfig
 from tasks.Component.GeneralBattle.config_general_battle import GeneralBattleConfig
+from tasks.Component.SwitchSoul.switch_soul_config import SwitchSoulConfig
 from tasks.Component.config_scheduler import Scheduler
 from tasks.Component.config_scheduler import Scheduler
 from tasks.Component.config_base import ConfigBase, TimeDelta
 from tasks.Component.config_base import ConfigBase, TimeDelta
 from tasks.Component.BaseActivity.config_activity import GeneralClimb
 from tasks.Component.BaseActivity.config_activity import GeneralClimb
@@ -19,6 +20,7 @@ class ActivityShikigami(ConfigBase):
     # shikigami: ShikigamiConfig = Field(default_factory=ShikigamiConfig)
     # shikigami: ShikigamiConfig = Field(default_factory=ShikigamiConfig)
     general_climb: GeneralClimb = Field(default_factory=GeneralClimb)
     general_climb: GeneralClimb = Field(default_factory=GeneralClimb)
     general_battle: GeneralBattleConfig = Field(default_factory=GeneralBattleConfig)
     general_battle: GeneralBattleConfig = Field(default_factory=GeneralBattleConfig)
+    switch_soul_config: SwitchSoulConfig = Field(default_factory=SwitchSoulConfig)
 
 
 
 
 
 

+ 15 - 2
tasks/ActivityShikigami/script_task.py

@@ -7,17 +7,18 @@ from datetime import datetime, timedelta, time
 from tasks.base_task import BaseTask
 from tasks.base_task import BaseTask
 from tasks.Component.GeneralBattle.general_battle import GeneralBattle
 from tasks.Component.GeneralBattle.general_battle import GeneralBattle
 from tasks.AreaBoss.assets import AreaBossAssets
 from tasks.AreaBoss.assets import AreaBossAssets
+from tasks.Component.SwitchSoul.switch_soul import SwitchSoul
 from tasks.Component.BaseActivity.base_activity import BaseActivity
 from tasks.Component.BaseActivity.base_activity import BaseActivity
 from tasks.Component.BaseActivity.config_activity import ApMode
 from tasks.Component.BaseActivity.config_activity import ApMode
 from tasks.ActivityShikigami.assets import ActivityShikigamiAssets
 from tasks.ActivityShikigami.assets import ActivityShikigamiAssets
-from tasks.GameUi.page import page_main
+from tasks.GameUi.page import page_main, page_shikigami_records
 from tasks.GameUi.game_ui import GameUi
 from tasks.GameUi.game_ui import GameUi
 
 
 from module.logger import logger
 from module.logger import logger
 from module.exception import TaskEnd
 from module.exception import TaskEnd
 
 
 
 
-class ScriptTask(GameUi, BaseActivity, ActivityShikigamiAssets):
+class ScriptTask(GameUi, BaseActivity, SwitchSoul, ActivityShikigamiAssets):
 
 
     def run(self) -> None:
     def run(self) -> None:
 
 
@@ -28,6 +29,18 @@ class ScriptTask(GameUi, BaseActivity, ActivityShikigamiAssets):
                                         seconds=self.limit_time.second)
                                         seconds=self.limit_time.second)
         self.limit_count = config.general_climb.limit_count
         self.limit_count = config.general_climb.limit_count
 
 
+        if config.switch_soul_config.enable:
+            self.ui_get_current_page()
+            self.ui_goto(page_shikigami_records)
+            self.run_switch_soul(config.switch_soul_config.switch_group_team)
+        if config.switch_soul_config.enable_switch_by_name:
+            self.ui_get_current_page()
+            self.ui_goto(page_shikigami_records)
+            self.run_switch_soul_by_name(
+                config.switch_soul_config.group_name,
+                config.switch_soul_config.team_name
+            )
+
         self.ui_get_current_page()
         self.ui_get_current_page()
         self.ui_goto(page_main)
         self.ui_goto(page_main)
         self.home_main()
         self.home_main()