Merge remote-tracking branch 'origin/dev' into dev

Author: runhey

tasks/Component/GeneralBattle/assets.py

@@ -209,6 +209,8 @@ class GeneralBattleAssets:
 	C_END_FRIENDS_32 = RuleClick(roi_front=(0,0,100,100), roi_back=(0,0,100,100), name="end_friends_32")
 	# description 
 	C_END_FRIENDS_23 = RuleClick(roi_front=(0,0,100,100), roi_back=(0,0,100,100), name="end_friends_23")
+	# 御魂过多的【去清理】按钮
+	C_OVERFLOW_GHOST = RuleClick(roi_front=(456, 381, 160, 82), roi_back=(456, 381, 160, 82), name="overflow_ghost")
 
 
 	# Click Rule Assets

tasks/Component/GeneralBattle/battle_wait.py

@@ -158,7 +158,7 @@ class OptionSuccessDefault:
         'C_END_MESSAGE_RIGHT_TOP', 'C_END_BUFF_AREA_1',
         'C_END_BUFF_AREA_2', 'C_END_SOUL_RECORD', 'C_END_SOUL_DETAILS',
         'C_END_1_1', 'C_END_1_2', 'C_END_1_3', 'C_END_1_4',
-        'C_END_1_5', 'C_END_1_6',
+        'C_END_1_5', 'C_END_1_6', "C_OVERFLOW_GHOST",
     ])
 
 
@@ -1152,6 +1152,10 @@ def _bw_completion_default(self, pub: PublicContext, pri: PrivateContext) -> Hoo
 
     def _bw_interrupt_default(self, pub: PublicContext, pri: PrivateContext) -> HookSignal:
         # 比如 御魂溢出
+
+        # 结算的时候御魂溢出提示，点击【知道了】
+        self.appear_then_click(self.I_OVER_GHOST)
+
         return HookSignal.CONTINUE
 
     def _bw_success_default(self, pub: PublicContext, pri: PrivateContext) -> HookSignal:
@@ -1180,6 +1184,14 @@ def _bw_success_default(self, pub: PublicContext, pri: PrivateContext) -> HookSi
         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)
+
             # 不小心点到了具体的奖励，他会弹出这个物品的详细描述 里面必定包含有“获取途径”
             if self.appear(self.I_END_FIX_1) or self.appear(self.I_END_FIX_2):
                 self.click(self.C_REWARD_2, interval=1.5)

tasks/Delegation/script_task.py

@@ -56,22 +56,44 @@ def ui_click(click, stop):
         if not self.ocr_appear(self.O_D_NAME):
             logger.warning(f'Delegation: {name} not found')
             return False
+        enter_timer = Timer(15).start()
         while 1:
             self.screenshot()
             if self.appear(self.I_D_START):
                 break
+            if enter_timer.reached():
+                logger.warning(f'Delegation: {name} enter timeout')
+                return False
+
+            # 检测到弹出的勾玉确认框，优先点击取消保护勾玉
+            if self.appear_then_click(self.I_UI_CANCEL, interval=1):
+                continue
+
             # 如果出现’召回‘ ’返回‘ 说明这个是现在委派中
             # 需要退出
             if self.appear(self.I_D_BACK):
                 logger.warning(f'Delegation: {name} is in delegation')
-                self.ui_click_until_disappear(self.I_D_BACK)
-                self.wait_until_appear(self.I_REWARDS_MIN)
+                back_timer = Timer(6).start()
+                while 1:
+                    self.screenshot()
+                    if not self.appear(self.I_D_BACK):
+                        break
+                    if back_timer.reached():
+                        logger.warning('Exit delegation detail timeout')
+                        break
+                    # 若此时被取消弹窗遮挡返回，优先点取消
+                    if self.appear_then_click(self.I_UI_CANCEL, interval=1):
+                        continue
+                    if self.appear_then_click(self.I_D_BACK, interval=1.2):
+                        continue
+                self.wait_until_appear(self.I_REWARDS_MIN, wait_time=3)
                 return False
             if self.appear_then_click(self.I_D_SKIP, interval=0.8):
                 continue
             if self.appear_then_click(self.I_D_CONFIRM, interval=0.8):
                 continue
-            if self.ocr_appear_click(self.O_D_NAME, interval=1):
+            # 点击委派任务名：防抖由 1s 提升至 3s，杜绝跨页面过渡时误触右上角"完成(30勾玉)"
+            if self.ocr_appear_click(self.O_D_NAME, interval=3):
                 continue
         # 进入委派  fefe e  fe
         logger.info(f'Enter Delegation: {name}')
@@ -81,10 +103,14 @@ def ui_click(click, stop):
         ui_click(self.C_D_4, self.I_D_SELECT_4)
         # 委派开始
         logger.info(f'Delegation: {name} start')
+        start_timer = Timer(10).start()
         while 1:
             self.screenshot()
             if not self.appear(self.I_D_START):
                 break
+            if start_timer.reached():
+                logger.warning(f'Delegation: {name} start timeout')
+                break
             if self.click(self.C_D_5, interval=0.8):
                 continue
             if self.appear_then_click(self.I_D_START, interval=1.8):

tasks/Orochi/script_task.py

@@ -433,6 +433,10 @@ def battle_wait(self, random_click_swipt_enable: bool) -> bool:
                     continue
                 while 1:
                     self.screenshot()
+                    # 处理御魂溢出
+                    if self.appear_then_click(self.I_OVER_GHOST):
+                        continue
+
                     action_click = random.choice([self.C_REWARD_1, self.C_REWARD_2, self.C_REWARD_3])
                     if not self.appear(self.I_GREED_GHOST):
                         break
@@ -445,6 +449,10 @@ def battle_wait(self, random_click_swipt_enable: bool) -> bool:
                 appear_greed_ghost = self.appear(self.I_GREED_GHOST)
                 while 1:
                     self.screenshot()
+                    # 处理御魂溢出
+                    if self.appear_then_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):
                         continue