Преглед изворни кода

花合战可直接收获1500签御魂

yEs1do пре 1 година
родитељ
комит
3fd54a010e
3 измењених фајлова са 41 додато и 4 уклоњено
  1. 2 2
      tasks/Restart/login.py
  2. 1 0
      tasks/TalismanPass/config.py
  3. 38 2
      tasks/TalismanPass/script_task.py

+ 2 - 2
tasks/Restart/login.py

@@ -148,7 +148,7 @@ class LoginHandler(BaseTask, RestartAssets):
         :return: 如果没有发现任何奖励后退出
         :return: 如果没有发现任何奖励后退出
         """
         """
         logger.hr('Harvest')
         logger.hr('Harvest')
-        timer_harvest = Timer(5)  # 如果连续3秒没有发现任何奖励,退出
+        timer_harvest = Timer(5)  # 如果连续5秒没有发现任何奖励,退出
         while 1:
         while 1:
             self.screenshot()
             self.screenshot()
 
 
@@ -285,7 +285,7 @@ class LoginHandler(BaseTask, RestartAssets):
                 timer_harvest.reset()
                 timer_harvest.reset()
                 continue
                 continue
 
 
-            # 三秒内没有发现任何奖励,退出
+            # 五秒内没有发现任何奖励,退出
             if not timer_harvest.started():
             if not timer_harvest.started():
                 timer_harvest.start()
                 timer_harvest.start()
             else:
             else:

+ 1 - 0
tasks/TalismanPass/config.py

@@ -19,6 +19,7 @@ class LevelReward(str, Enum):
 
 
 class TalismanConfig(BaseModel):
 class TalismanConfig(BaseModel):
     level_reward: LevelReward = Field(default=LevelReward.TWO)
     level_reward: LevelReward = Field(default=LevelReward.TWO)
+    harvest_soul: bool = Field(default=False, description='收获1500签御魂')
 
 
 class TalismanPass(ConfigBase):
 class TalismanPass(ConfigBase):
     scheduler: Scheduler = Field(default_factory=Scheduler)
     scheduler: Scheduler = Field(default_factory=Scheduler)

+ 38 - 2
tasks/TalismanPass/script_task.py

@@ -5,6 +5,7 @@ import time
 
 
 from tasks.GameUi.game_ui import GameUi
 from tasks.GameUi.game_ui import GameUi
 from tasks.GameUi.page import page_main, page_daily
 from tasks.GameUi.page import page_main, page_daily
+from tasks.Restart.assets import RestartAssets
 from tasks.TalismanPass.assets import TalismanPassAssets
 from tasks.TalismanPass.assets import TalismanPassAssets
 from tasks.TalismanPass.config import TalismanConfig, LevelReward
 from tasks.TalismanPass.config import TalismanConfig, LevelReward
 
 
@@ -12,7 +13,7 @@ from module.logger import logger
 from module.exception import TaskEnd
 from module.exception import TaskEnd
 from module.base.timer import Timer
 from module.base.timer import Timer
 
 
-class ScriptTask(GameUi, TalismanPassAssets):
+class ScriptTask(GameUi, TalismanPassAssets, RestartAssets):
 
 
     def run(self):
     def run(self):
         self.ui_get_current_page()
         self.ui_get_current_page()
@@ -25,7 +26,10 @@ class ScriptTask(GameUi, TalismanPassAssets):
             self.get_all()
             self.get_all()
         # 收取花合战等级奖励
         # 收取花合战等级奖励
         self.get_flower(con.level_reward)
         self.get_flower(con.level_reward)
-
+        # 收取1500签御魂
+        if con.harvest_soul:
+            self.ui_goto(page_main)
+            self.harvest_soul()
         self.set_next_run(task='TalismanPass', success=True, finish=True)
         self.set_next_run(task='TalismanPass', success=True, finish=True)
         raise TaskEnd('TalismanPass')
         raise TaskEnd('TalismanPass')
 
 
@@ -91,6 +95,38 @@ class ScriptTask(GameUi, TalismanPassAssets):
         if self.appear(self.I_TP_GOTO) or self.appear(self.I_TP_EXP):
         if self.appear(self.I_TP_GOTO) or self.appear(self.I_TP_EXP):
             return True
             return True
         return False
         return False
+    
+    def harvest_soul(self):
+        """
+        获得1500签御魂奖励
+        :return: 如果没有发现御魂奖励则退出
+        """
+        logger.hr('Harvest soul')
+        timer_harvest = Timer(5)  # 如果连续5秒没有发现任何奖励,退出
+        while 1:
+            self.screenshot()
+            # 点击'获得奖励'
+            if self.ui_reward_appear_click():
+                timer_harvest.reset()
+                continue
+            # 获得奖励
+            if self.appear_then_click(self.I_UI_AWARD, interval=0.2):
+                timer_harvest.reset()
+                continue            
+            # 自选御魂
+            if self.appear(self.I_HARVEST_SOUL_1):
+                logger.info('Select soul 1')
+                self.ui_click(self.I_HARVEST_SOUL_1, stop=self.I_HARVEST_SOUL_2)
+                self.ui_click(self.I_HARVEST_SOUL_2, stop=self.I_HARVEST_SOUL_3, interval=3)
+                self.ui_click_until_disappear(click=self.I_HARVEST_SOUL_3)
+                timer_harvest.reset()
+            # 五秒内没有发现任何奖励,退出
+            if not timer_harvest.started():
+                timer_harvest.start()
+            else:
+                if timer_harvest.reached():
+                    logger.info('No more reward')
+                    return