Просмотр исходного кода

Merge pull request #1304 from FLAG12321/dev_pr

日蚀副本战斗结算卡住&结界挂卡任务运行时间不符预期
huangrunheng 11 месяцев назад
Родитель
Сommit
34a1d5476c
2 измененных файлов с 99 добавлено и 3 удалено
  1. 96 0
      tasks/FallenSun/script_task.py
  2. 3 3
      tasks/KekkaiActivation/script_task.py

+ 96 - 0
tasks/FallenSun/script_task.py

@@ -309,6 +309,7 @@ class ScriptTask(GeneralBattle, GeneralInvite, GeneralBuff, GeneralRoom, GameUi,
         :param random_click_swipt_enable:
         :param random_click_swipt_enable:
         :return:
         :return:
         """
         """
+        """
         # 重写
         # 重写
         self.device.stuck_record_add('BATTLE_STATUS_S')
         self.device.stuck_record_add('BATTLE_STATUS_S')
         self.device.click_record_clear()
         self.device.click_record_clear()
@@ -359,6 +360,101 @@ class ScriptTask(GeneralBattle, GeneralInvite, GeneralBuff, GeneralRoom, GameUi,
             # 如果开启战斗过程随机滑动
             # 如果开启战斗过程随机滑动
             if random_click_swipt_enable:
             if random_click_swipt_enable:
                 self.random_click_swipt()
                 self.random_click_swipt()
+                """
+        """
+        等待战斗结束 !!!
+        很重要 这个函数是原先写的, 优化版本在tasks/Secret/script_task下。本着不改动原先的代码的原则,所以就不改了
+        :param random_click_swipt_enable:
+        :return:
+        """
+        # 有的时候是长战斗,需要在设置stuck检测为长战斗
+        # 但是无需取消设置,因为如果有点击或者滑动的话 handle_control_check会自行取消掉
+        self.device.stuck_record_add('BATTLE_STATUS_S')
+        self.device.click_record_clear()
+        # 战斗过程 随机点击和滑动 防封
+        logger.info("Start battle process")
+        win: bool = False
+        while 1:
+            self.screenshot()
+            # 如果出现赢 就点击, 第二个是针对封魔的图片
+            if self.appear(self.I_WIN, threshold=0.8) or self.appear(self.I_DE_WIN):
+                logger.info("Battle result is win")
+                if self.appear(self.I_DE_WIN):
+                    self.ui_click_until_disappear(self.I_DE_WIN)
+                win = True
+                break
+
+            # 如果出现失败 就点击,返回False
+            if self.appear(self.I_FALSE, threshold=0.8):
+                logger.info("Battle result is false")
+                win = False
+                break
+
+            # 如果领奖励
+            if self.appear(self.I_REWARD, threshold=0.6):
+                win = True
+                break
+
+            # 如果领奖励出现金币
+            if self.appear(self.I_REWARD_GOLD, threshold=0.8):
+                win = True
+                break
+            if self.appear(self.I_REWARD_PURPLE_SNAKE_SKIN, threshold=0.8):
+                win = True
+                break
+            # 如果开启战斗过程随机滑动
+            if random_click_swipt_enable:
+                self.random_click_swipt()
+
+        # 再次确认战斗结果
+        logger.info("Reconfirm the results of the battle")
+        while 1:
+            self.screenshot()
+            if win:
+                # 点击赢了
+                action_click = random.choice([self.C_WIN_1, self.C_WIN_2, self.C_WIN_3])
+                if self.appear_then_click(self.I_WIN, action=action_click, interval=0.5):
+                    continue
+                if not self.appear(self.I_WIN):
+                    break
+            else:
+                # 如果失败且 点击失败后
+                if self.appear_then_click(self.I_FALSE, threshold=0.6):
+                    continue
+                if not self.appear(self.I_FALSE, threshold=0.6):
+                    return False
+        # 最后保证能点击 获得奖励
+        if not self.wait_until_appear(self.I_REWARD):
+            # 有些的战斗没有下面的奖励,所以直接返回
+            logger.info("There is no reward, Exit battle")
+            return win
+        logger.info("Get reward")
+        while 1:
+            self.screenshot()
+            # 如果出现领奖励
+            action_click = random.choice([self.C_REWARD_1, self.C_REWARD_2, self.C_REWARD_3])
+            if (self.appear_then_click(self.I_REWARD, action=action_click, interval=1.5) or
+                self.appear_then_click(self.I_REWARD_GOLD, action=action_click, interval=1.5)  or
+                # self.appear_then_click(self.I_REWARD_STATISTICS, action=action_click, interval=1.5) or
+                self.appear_then_click(self.I_REWARD_PURPLE_SNAKE_SKIN, action=action_click, interval=1.5) #or
+                # self.appear_then_click(self.I_REWARD_GOLD_SNAKE_SKIN, action=action_click, interval=1.5) or
+                # self.appear_then_click(self.I_REWARD_EXP_SOUL_4, action=action_click, interval=1.5) or
+                # self.appear_then_click(self.I_REWARD_SOUL_5, action=action_click, interval=1.5) or
+                # self.appear_then_click(self.I_REWARD_SOUL_6, action=action_click, interval=1.5)
+                ):
+                continue
+            if (not self.appear(self.I_REWARD) and
+                not self.appear(self.I_REWARD_GOLD)  and
+                # not self.appear(self.I_REWARD_STATISTICS) and
+                not self.appear(self.I_REWARD_PURPLE_SNAKE_SKIN) #and
+                # not self.appear(self.I_REWARD_GOLD_SNAKE_SKIN) and
+                # not self.appear(self.I_REWARD_EXP_SOUL_4) and
+                # not self.appear(self.I_REWARD_SOUL_5) and
+                # not self.appear(self.I_REWARD_SOUL_6)
+                ):
+                break
+
+        return win
 
 
 
 
 if __name__ == '__main__':
 if __name__ == '__main__':

+ 3 - 3
tasks/KekkaiActivation/script_task.py

@@ -128,7 +128,7 @@ class ScriptTask(KU, KekkaiActivationAssets):
             if card_status and card_effect:
             if card_status and card_effect:
                 logger.info('Card is using')
                 logger.info('Card is using')
                 interval = self.ocr_time()
                 interval = self.ocr_time()
-                self.set_next_run("KekkaiActivation", success=False, finish=True, target=interval+datetime.now())
+                self.set_next_run("KekkaiActivation", target=interval+datetime.now())
                 return False
                 return False
             # 如果已经选中这张卡了, 那就激活这张卡
             # 如果已经选中这张卡了, 那就激活这张卡
             if card_status and not card_effect:
             if card_status and not card_effect:
@@ -143,7 +143,7 @@ class ScriptTask(KU, KekkaiActivationAssets):
                     if self.appear_then_click(self.I_A_ACTIVATE_YELLOW, interval=1):
                     if self.appear_then_click(self.I_A_ACTIVATE_YELLOW, interval=1):
                         continue
                         continue
                 interval = self.ocr_time(True)
                 interval = self.ocr_time(True)
-                self.set_next_run("KekkaiActivation", success=True, finish=True, target=interval + datetime.now())
+                self.set_next_run("KekkaiActivation", target=interval + datetime.now())
                 return True
                 return True
             # 如果是什么都没有,那就是可以开始挂卡了
             # 如果是什么都没有,那就是可以开始挂卡了
             if not card_status and not card_effect:
             if not card_status and not card_effect:
@@ -358,7 +358,7 @@ class ScriptTask(KU, KekkaiActivationAssets):
 
 
         # 保存配置并设置下次执行
         # 保存配置并设置下次执行
         self.config.save()
         self.config.save()
-        self.set_next_run("KekkaiActivation", success=True, finish=True, target=next_run)
+        self.set_next_run("KekkaiActivation", target=next_run)
         raise TaskEnd
         raise TaskEnd
 
 
     def check_max_lv(self, shikigami_class: ShikigamiClass = ShikigamiClass.N):
     def check_max_lv(self, shikigami_class: ShikigamiClass = ShikigamiClass.N):