Browse Source

add(hunt): switch kirin and netherworld preset

Azure 1 year ago
parent
commit
01df91dea3
2 changed files with 14 additions and 11 deletions
  1. 10 1
      tasks/Hunt/config.py
  2. 4 10
      tasks/Hunt/script_task.py

+ 10 - 1
tasks/Hunt/config.py

@@ -3,21 +3,30 @@
 # github https://github.com/runhey
 from datetime import timedelta
 from pydantic import BaseModel, Field
+from tasks.Component.GeneralBattle.config_general_battle import GeneralBattleConfig
 
 from tasks.Component.config_scheduler import Scheduler
-from tasks.Component.config_base import ConfigBase, Time
+from tasks.Component.config_base import ConfigBase, Time, dynamic_hide
+
 
 class HuntTime(ConfigBase):
     # 自定义运行时间
     kirin_time: Time = Field(default=Time(hour=19, minute=0, second=0))
     netherworld_time: Time = Field(default=Time(hour=19, minute=0, second=0))
 
+
 class HuntConfig(BaseModel):
     kirin_group_team: str = Field(default='-1,-1', description='switch_group_team_help')
     netherworld_group_team: str = Field(default='-1,-1')
 
 
+class HuntGeneralBattleConfig(GeneralBattleConfig):
+    hide_fields = dynamic_hide('lock_team_enable', 'green_enable', 'green_mark')
+
+
 class Hunt(ConfigBase):
     scheduler: Scheduler = Field(default_factory=Scheduler)
     hunt_time: HuntTime = Field(default_factory=HuntTime)
     hunt_config: HuntConfig = Field(default_factory=HuntConfig)
+    kirin_battle_config: HuntGeneralBattleConfig = Field(default_factory=HuntGeneralBattleConfig)
+    netherworld_battle_config: HuntGeneralBattleConfig = Field(default_factory=HuntGeneralBattleConfig)

+ 4 - 10
tasks/Hunt/script_task.py

@@ -17,6 +17,7 @@ from tasks.Component.GeneralInvite.general_invite import GeneralInvite
 from tasks.Component.SwitchSoul.switch_soul import SwitchSoul
 from tasks.Hunt.assets import HuntAssets
 
+
 class ScriptTask(GameUi, GeneralBattle, GeneralInvite, SwitchSoul, HuntAssets):
     kirin_day = True  # 不是麒麟就是阴界之门
     tomorrow_kirin_day = True  # 明天是麒麟还是阴界之门
@@ -117,8 +118,7 @@ class ScriptTask(GameUi, GeneralBattle, GeneralInvite, SwitchSoul, HuntAssets):
                 self.ui_click_until_disappear(self.I_UI_BACK_YELLOW)
                 return
         logger.info('Start battle')
-        self.run_general_battle()        
-
+        self.run_general_battle(self.config.hunt.kirin_battle_config)
 
     def netherworld(self):
         logger.hr('netherworld', 2)
@@ -143,8 +143,7 @@ class ScriptTask(GameUi, GeneralBattle, GeneralInvite, SwitchSoul, HuntAssets):
                 self.ui_click_until_disappear(self.I_UI_BACK_RED)
                 return
         logger.info('Start battle')
-        self.run_general_battle()
-
+        self.run_general_battle(self.config.hunt.netherworld_battle_config)
 
     def battle_wait(self, random_click_swipt_enable: bool) -> bool:
         """
@@ -177,6 +176,7 @@ class ScriptTask(GameUi, GeneralBattle, GeneralInvite, SwitchSoul, HuntAssets):
                 return False
             if self.appear_then_click(self.I_PREPARE_HIGHLIGHT, interval=1.5):
                 logger.info('Netherworld click prepare after maybe failed')
+                self.device.stuck_record_add('BATTLE_STATUS_S')
                 continue
             # 如果三分钟还没打完,再延长五分钟
             if stuck_timer and stuck_timer.reached():
@@ -185,12 +185,6 @@ class ScriptTask(GameUi, GeneralBattle, GeneralInvite, SwitchSoul, HuntAssets):
                 self.device.stuck_record_add('BATTLE_STATUS_S')
 
 
-
-
-
-
-
-
 if __name__ == '__main__':
     from module.config.config import Config
     from module.device.device import Device