Merge pull request #1205 from BluettDream/dev_fix_duel

fix(Duel): attribute error

Author: runhey

tasks/Component/GeneralBattle/general_battle.py

@@ -422,6 +422,7 @@ def random_click_swipt(self):
     def is_in_battle(self, is_screenshot: bool = True) -> bool:
         """
         判断是否在战斗中
+        tip: 因为有friends判别, 所以即使在准备界面也会识别在战斗中
         :return:
         """
         if is_screenshot:
@@ -435,6 +436,16 @@ def is_in_battle(self, is_screenshot: bool = True) -> bool:
         else:
             return False
 
+    def is_in_real_battle(self, is_screenshot: bool = True):
+        """
+        判断是否在真正的战斗中(不是战斗准备界面也不是战斗结束界面)
+        :param is_screenshot:
+        :return:
+        """
+        if is_screenshot:
+            self.screenshot()
+        return self.appear(self.I_BATTLE_INFO)
+
     def is_in_prepare(self, is_screenshot: bool = True) -> bool:
         """
         判断是否在准备中

tasks/Duel/script_task.py

@@ -364,7 +364,6 @@ def duel_one(self, current_score: int, enable: bool = False,
             if self.appear(self.I_D_PREPARE):
                 # 低段位有的准备
                 self.ui_click_until_disappear(self.I_D_PREPARE)
-                self.wait_until_disappear(self.I_D_PREPARE_DONE)
                 logger.info('Duel prepare')
                 break
             # 如果对方直接秒退，那自己就是赢的
@@ -373,12 +372,13 @@ def duel_one(self, current_score: int, enable: bool = False,
                 self.battle_win_copy = self.battle_win_count
                 self.battle_win_count += 1
                 return
-        timer = Timer(10)
+        timer = Timer(15)
         timer.start()
         while 1:
             if timer.reached():
                 break
-            if self.is_in_battle():
+            # 此处必须是真正战斗界面,否则低段位进去就是战斗界面会直接跳过该循环
+            if self.is_in_real_battle():
                 break
         while 1:
             self.screenshot()