Przeglądaj źródła

add(DemonEncounter): switch preset

Azure 1 rok temu
rodzic
commit
67ca49af30

+ 50 - 3
tasks/DemonEncounter/config.py

@@ -3,12 +3,10 @@
 # github https://github.com/runhey
 from pydantic import BaseModel, Field
 from enum import Enum, IntEnum
-from datetime import datetime, time
+from tasks.Component.GeneralBattle.config_general_battle import GeneralBattleConfig
 
 from tasks.Component.config_scheduler import Scheduler
 from tasks.Component.config_base import ConfigBase, TimeDelta, dynamic_hide
-from tasks.Component.GeneralBattle.config_general_battle import GeneralBattleConfig
-from tasks.Utils.config_enum import ShikigamiClass
 
 
 class BossType(IntEnum):
@@ -82,6 +80,53 @@ class BestDemonConfig(BaseModel):
                                'best_demon_oboroguruma', 'best_demon_nightly_aramitamau')
 
 
+def convert_to_general_battle_config(boss_type: str, demon_battle_conf: 'DemonBattleConfig' = None,
+                                     best_demon_battle_conf: 'BestDemonBattleConfig' = None) -> GeneralBattleConfig:
+    if demon_battle_conf:
+        enable = getattr(demon_battle_conf, f'{boss_type}_enable')
+        group, team = getattr(demon_battle_conf, boss_type).split(',')
+    elif best_demon_battle_conf:
+        enable = getattr(best_demon_battle_conf, f'{boss_type}_enable')
+        group, team = getattr(best_demon_battle_conf, boss_type).split(',')
+    else:
+        enable = False
+        group, team = (1, 1)
+    return GeneralBattleConfig(preset_enable=enable, preset_group=group if enable else 1, preset_team=team if enable else 1)
+
+
+class DemonBattleConfig(BaseModel):
+    demon_shinkirou_enable: bool = Field(default=False, description='是否切换蜃气楼预设')
+    demon_shinkirou: str = Field(default="-1,-1", description="蜃气楼预设")
+    demon_tsuchigumo_enable: bool = Field(default=False, description='是否切换土蜘蛛预设')
+    demon_tsuchigumo: str = Field(default="-1,-1", description="土蜘蛛预设")
+    demon_gashadokuro_enable: bool = Field(default=False, description='是否切换荒骷髅预设')
+    demon_gashadokuro: str = Field(default="-1,-1", description="荒骷髅预设")
+    demon_namazu_enable: bool = Field(default=False, description='是否切换地震鲶预设')
+    demon_namazu: str = Field(default="-1,-1", description="地震鲶预设")
+    demon_oboroguruma_enable: bool = Field(default=False, description='是否切换胧车预设')
+    demon_oboroguruma: str = Field(default="-1,-1", description="胧车预设")
+    demon_nightly_aramitama_enable: bool = Field(default=False, description='是否切换夜荒魂预设')
+    demon_nightly_aramitama: str = Field(default="-1,-1", description="夜荒魂预设")
+
+
+class BestDemonBattleConfig(BaseModel):
+    best_demon_shinkirou_enable: bool = Field(default=False, description='是否切换极蜃气楼预设')
+    best_demon_shinkirou: str = Field(default="-1,-1", description="极蜃气楼预设")
+    best_demon_tsuchigumo_enable: bool = Field(default=False, description='是否切换极土蜘蛛预设')
+    best_demon_tsuchigumo: str = Field(default="-1,-1", description="极土蜘蛛预设")
+    best_demon_gashadokuro_enable: bool = Field(default=False, description='是否切换极荒骷髅预设')
+    best_demon_gashadokuro: str = Field(default="-1,-1", description="极荒骷髅预设")
+    best_demon_namazu_enable: bool = Field(default=False, description='是否切换极地震鲶预设')
+    best_demon_namazu: str = Field(default="-1,-1", description="极地震鲶预设")
+    best_demon_oboroguruma_enable: bool = Field(default=False, description='是否切换极胧车预设')
+    best_demon_oboroguruma: str = Field(default="-1,-1", description="极胧车预设")
+    best_demon_nightly_aramitama_enable: bool = Field(default=False, description='是否切换极夜荒魂预设')
+    best_demon_nightly_aramitamau: str = Field(default="-1,-1", description="极夜荒魂预设")
+
+    hide_fields = dynamic_hide('best_demon_oboroguruma_enable', 'best_demon_oboroguruma',
+                               'best_demon_nightly_aramitama_enable', 'best_demon_nightly_aramitamau')
+
+
 class UtilizeScheduler(Scheduler):
     priority: int = Field(default=2, description='priority_help')
 
@@ -92,3 +137,5 @@ class DemonEncounter(ConfigBase):
     best_demon_boss_config: BestDemonBossSelect = Field(default_factory=BestDemonBossSelect)
     demon_soul_config: DemonConfig = Field(default_factory=DemonConfig)
     best_demon_soul_config: BestDemonConfig = Field(default_factory=BestDemonConfig)
+    demon_battle_config: DemonBattleConfig = Field(default_factory=DemonBattleConfig)
+    best_demon_battle_config: BestDemonBattleConfig = Field(default_factory=BestDemonBattleConfig)

+ 13 - 2
tasks/DemonEncounter/script_task.py

@@ -13,7 +13,7 @@ from module.exception import TaskEnd
 from module.base.timer import Timer
 
 from tasks.Component.SwitchSoul.switch_soul import SwitchSoul
-from tasks.DemonEncounter.config import BossType, DemonEncounter
+from tasks.DemonEncounter.config import BossType, DemonEncounter, convert_to_general_battle_config
 from tasks.GameUi.game_ui import GameUi
 from tasks.GameUi.page import page_demon_encounter, page_shikigami_records
 from tasks.DemonEncounter.assets import DemonEncounterAssets
@@ -170,6 +170,7 @@ class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets, SwitchSoul):
         time.sleep(5)
         # 延长时间并在战斗结束后改回来
         self.device.stuck_timer_long = Timer(480, count=480).start()
+        preset_switched = False
         while True:
             self.screenshot()
             if self.appear(self.I_BOSS_DONE_CHECK):
@@ -185,7 +186,17 @@ class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets, SwitchSoul):
                 sleep(2)
                 continue
             if self.appear(self.I_PREPARE_HIGHLIGHT):
-                self.run_general_battle()
+                if preset_switched:
+                    self.run_general_battle()
+                    continue
+                preset_switched = True
+                if self.best_demon_enable:
+                    general_battle_config = convert_to_general_battle_config(self.boss_type,
+                                                                             best_demon_battle_conf=self.conf.best_demon_battle_config)
+                else:
+                    general_battle_config = convert_to_general_battle_config(self.boss_type,
+                                                                             demon_battle_conf=self.conf.demon_battle_config)
+                self.run_general_battle(config=general_battle_config)
                 continue
             logger.info('Unknown scene Or Boss fight failed.waiting for Prepare_Button appear...')
             self.wait_until_appear(self.I_PREPARE_HIGHLIGHT, wait_time=2)