Kaynağa Gözat

Merge pull request #1970 from davidyangkunlong/SoulOverflowOnOldGeneralBattle

御魂溢出处理升级
huangrunheng 3 hafta önce
ebeveyn
işleme
629576545a

+ 0 - 4
tasks/Component/GeneralBattle/battle_wait.py

@@ -1187,10 +1187,6 @@ class BattleWait(BaseTask, GeneralBattleAssets):
         while 1:
             self.screenshot()
 
-            # 发现御魂溢出,直接跳出,在interupt里面处理
-            if self.appear(self.I_OVER_GHOST):
-                return HookSignal.CONTINUE
-
             # 结算的时候御魂溢出提示,点击【知道了】
             if self.appear(self.I_OVER_GHOST):
                 self.click(self.I_OVER_GHOST)

+ 5 - 0
tasks/Component/GeneralBattle/general_battle.py

@@ -228,6 +228,11 @@ class GeneralBattle(BattleWait, GeneralBuff):
         logger.info("Get reward")
         while 1:
             self.screenshot()
+
+            if self.appear(self.I_OVER_GHOST):
+                self.click(self.I_OVER_GHOST)
+                continue
+
             # 如果出现领奖励
             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