Przeglądaj źródła

fix(GeneralBattle): Avoid reward popup during completion fallback #1913

- Restrict completion fallback clicks to safe reward screen areas
- Detect the ActivityShikigami battle main screen and bound fallback retries
- Add a stable reward exclusion area for variable reward layouts
neptine 1 miesiąc temu
rodzic
commit
2724188698

+ 8 - 0
tasks/ActivityShikigami/script_task.py

@@ -190,11 +190,14 @@ class ScriptTask(StateMachine, GameUi, Battle, BaseActivity, SwitchSoul, Activit
         # self.ui_clicks([self.I_TO_BATTLE_MAIN_2],
         # self.ui_clicks([self.I_TO_BATTLE_MAIN_2],
         #                stop=self.I_CHECK_BATTLE_MAIN, interval=1)
         #                stop=self.I_CHECK_BATTLE_MAIN, interval=1)
         #
         #
+        center_click_cnt = 0
         while 1:
         while 1:
             self.screenshot()
             self.screenshot()
 
 
             if self.appear(self.I_UI_BACK_RED) and self.appear(self.I_PASS_4):
             if self.appear(self.I_UI_BACK_RED) and self.appear(self.I_PASS_4):
                 break
                 break
+            if self.appear(self.I_CHECK_BATTLE_MAIN):
+                break
             if self.appear_then_click(self.I_UI_CONFIRM, interval=0.5):
             if self.appear_then_click(self.I_UI_CONFIRM, interval=0.5):
                 continue
                 continue
             if self.appear_then_click(self.I_UI_CONFIRM_SAMLL, interval=0.5):
             if self.appear_then_click(self.I_UI_CONFIRM_SAMLL, interval=0.5):
@@ -207,6 +210,10 @@ class ScriptTask(StateMachine, GameUi, Battle, BaseActivity, SwitchSoul, Activit
                 continue
                 continue
             if self.appear_then_click(self.I_PASS_2, interval=1.5):
             if self.appear_then_click(self.I_PASS_2, interval=1.5):
                 continue
                 continue
+            center = RuleClick(roi_front=(630,360,10,10), roi_back=(630,360,10,10), name="random_all")
+            if center_click_cnt <= 5 and self.click(center, interval=3.5):
+                center_click_cnt += 1
+                continue
         logger.info('Enter occupation reward screen')  # 进入到占领奖励
         logger.info('Enter occupation reward screen')  # 进入到占领奖励
         index = 0
         index = 0
         clicks = [self.I_PASS_5, self.I_PASS_6, self.I_PASS_7, self.I_PASS_8, self.I_PASS_9]
         clicks = [self.I_PASS_5, self.I_PASS_6, self.I_PASS_7, self.I_PASS_8, self.I_PASS_9]
@@ -355,6 +362,7 @@ class ScriptTask(StateMachine, GameUi, Battle, BaseActivity, SwitchSoul, Activit
         # 运行战斗
         # 运行战斗
         strategies, options = self.loadout_from_config(self.get_general_battle_conf())
         strategies, options = self.loadout_from_config(self.get_general_battle_conf())
         # strategies['success'] = 'activity'
         # strategies['success'] = 'activity'
+        options['completion'].check_imgs = [self.I_CHECK_BATTLE_MAIN]
         self.loadout_show((strategies, options))
         self.loadout_show((strategies, options))
         self.state_show()
         self.state_show()
         with battle_wait_strategy(**strategies), battle_wait_options(**options):
         with battle_wait_strategy(**strategies), battle_wait_options(**options):

+ 2 - 0
tasks/Component/GeneralBattle/assets.py

@@ -250,6 +250,8 @@ class GeneralBattleAssets:
 	C_END_3_6 = RuleClick(roi_front=(0,0,100,100), roi_back=(0,0,100,100), name="end_3_6")
 	C_END_3_6 = RuleClick(roi_front=(0,0,100,100), roi_back=(0,0,100,100), name="end_3_6")
 	# 其实贪吃鬼这个点了也是没事儿 
 	# 其实贪吃鬼这个点了也是没事儿 
 	C_END_GREED = RuleClick(roi_front=(138,16,512,93), roi_back=(138,16,512,93), name="end_greed")
 	C_END_GREED = RuleClick(roi_front=(138,16,512,93), roi_back=(138,16,512,93), name="end_greed")
+	# 中间的一堆奖励直接忽略。上面的end_1_1到end_3_6会容易UI变化失效 
+	C_END_MASTER = RuleClick(roi_front=(251,145,811,530), roi_back=(248,143,815,535), name="end_master")
 
 
 
 
 	# Click Rule Assets
 	# Click Rule Assets

+ 30 - 19
tasks/Component/GeneralBattle/battle_wait.py

@@ -141,14 +141,6 @@ class OptionSetupDefault:
     excludes: list | None = None
     excludes: list | None = None
 
 
 
 
-@dataclass
-class OptionCompletionDefault:
-    # 这里是为了, 确认结束战斗后退回到 “fire” 的界面
-    check_imgs: list[RuleImage] = None
-    # 兜底:check_imgs 都检测不到时,间隔点击的排除位
-    excludes: list[str] = field(default_factory=list)
-
-
 @dataclass
 @dataclass
 class OptionInterruptDefault:
 class OptionInterruptDefault:
     pass
     pass
@@ -170,6 +162,18 @@ class OptionSuccessDefault:
     ])
     ])
 
 
 
 
+@dataclass
+class OptionCompletionDefault:
+    # 这里是为了, 确认结束战斗后退回到 “fire” 的界面
+    check_imgs: list[RuleImage] | None = None
+    # 兜底:check_imgs 都检测不到时,间隔点击的排除位
+    excludes: list[str] = field(default_factory=lambda:
+    [
+        '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_MASTER',
+    ])
+
 @dataclass
 @dataclass
 class OptionFailureDefault:
 class OptionFailureDefault:
     pass
     pass
@@ -367,8 +371,9 @@ class PerBattleSetup:
 @dataclass
 @dataclass
 class PerBattleCompletion:
 class PerBattleCompletion:
     click_stage_2: RuleClickExclude | None = None
     click_stage_2: RuleClickExclude | None = None
-    # 兜底点击节拍器:进入 completion 起算,满 8s 才首次点击,之后每 8s 一次
+    # 兜底点击节拍器:进入 completion 起算,满 3s 才首次点击,之后每 3s 一次
     fallback_timer: Timer | None = None
     fallback_timer: Timer | None = None
+    fallback_cnt: int = 0
 
 
 
 
 @dataclass
 @dataclass
@@ -948,8 +953,8 @@ def randomclick_gate(func: Callable) -> Callable:
     @wraps(func)
     @wraps(func)
     def wrapper(self, pub: PublicContext, pri: PrivateContext) -> HookSignal:
     def wrapper(self, pub: PublicContext, pri: PrivateContext) -> HookSignal:
         options = pub.options.get('randomclick')
         options = pub.options.get('randomclick')
-        state_battle = pri.per_battle
-        state_task = pri.per_task
+        state_battle: PerBattleRandomclick = pri.per_battle
+        state_task: PerTaskRandomclick = pri.per_task
         if not isinstance(options, OptionRandomclickDefault):
         if not isinstance(options, OptionRandomclickDefault):
             raise TypeError(f"randomclick options must be OptionRandomclickDefault, got {type(options)!r}")
             raise TypeError(f"randomclick options must be OptionRandomclickDefault, got {type(options)!r}")
         if not isinstance(state_battle, PerBattleRandomclick):
         if not isinstance(state_battle, PerBattleRandomclick):
@@ -1109,8 +1114,8 @@ class BattleWait(BaseTask, GeneralBattleAssets):
 
 
     def _bw_completion_default(self, pub: PublicContext, pri: PrivateContext) -> HookSignal:
     def _bw_completion_default(self, pub: PublicContext, pri: PrivateContext) -> HookSignal:
         logger.info('Battle completion process')
         logger.info('Battle completion process')
-        state = pri.per_battle
-        options = pri.options
+        state: PerBattleCompletion = pri.per_battle
+        options: OptionCompletionDefault = pri.options
         if not isinstance(state, PerBattleCompletion) or not isinstance(options, OptionCompletionDefault):
         if not isinstance(state, PerBattleCompletion) or not isinstance(options, OptionCompletionDefault):
             raise
             raise
         if options.check_imgs is None:
         if options.check_imgs is None:
@@ -1125,9 +1130,13 @@ class BattleWait(BaseTask, GeneralBattleAssets):
             pub.per_task.count += 1
             pub.per_task.count += 1
             # self.current_count += 1  # 兼容旧的计数
             # self.current_count += 1  # 兼容旧的计数
             return HookSignal.DONE
             return HookSignal.DONE
-        # check_imgs 全没出现 → 兜底点击回退界面:进入 completion 满 8s 才首次点击,之后每 8s 一次
+        # check_imgs 全没出现 → 兜底点击回退界面:进入 completion 满 3s 才首次点击,之后每 3s 一次
         if state.fallback_timer is None:
         if state.fallback_timer is None:
-            state.fallback_timer = Timer(8).start()
+            state.fallback_timer = Timer(3).start()
+        if state.fallback_cnt >= 5:
+            pub.per_task.count += 1
+            logger.info('Fallback timer expired')
+            return HookSignal.DONE
         if not isinstance(state.fallback_timer, Timer):
         if not isinstance(state.fallback_timer, Timer):
             raise
             raise
         if not state.fallback_timer.reached():
         if not state.fallback_timer.reached():
@@ -1135,8 +1144,10 @@ class BattleWait(BaseTask, GeneralBattleAssets):
         state.fallback_timer.reset()
         state.fallback_timer.reset()
         if state.click_stage_2 is None:
         if state.click_stage_2 is None:
             state.click_stage_2 = PerBattleSuccess.reward_exclude_click(self, options.excludes, name='completion_exclude_click')
             state.click_stage_2 = PerBattleSuccess.reward_exclude_click(self, options.excludes, name='completion_exclude_click')
-        x, y = state.click_stage_2.coord()
-        self.device.click(x=x, y=y, control_name='completion_exclude_click')
+        if self.click(state.click_stage_2, interval=1.5):
+            state.fallback_cnt += 1
+        # x, y = state.click_stage_2.coord()
+        # self.device.click(x=x, y=y, control_name='completion_exclude_click')
         return HookSignal.CONTINUE
         return HookSignal.CONTINUE
 
 
     def _bw_interrupt_default(self, pub: PublicContext, pri: PrivateContext) -> HookSignal:
     def _bw_interrupt_default(self, pub: PublicContext, pri: PrivateContext) -> HookSignal:
@@ -1144,8 +1155,8 @@ class BattleWait(BaseTask, GeneralBattleAssets):
         return HookSignal.CONTINUE
         return HookSignal.CONTINUE
 
 
     def _bw_success_default(self, pub: PublicContext, pri: PrivateContext) -> HookSignal:
     def _bw_success_default(self, pub: PublicContext, pri: PrivateContext) -> HookSignal:
-        state = pri.per_battle
-        options = pri.options
+        state: PerBattleSuccess = pri.per_battle
+        options: OptionSuccessDefault = pri.options
         if not isinstance(state, PerBattleSuccess) or not isinstance(options, OptionSuccessDefault):
         if not isinstance(state, PerBattleSuccess) or not isinstance(options, OptionSuccessDefault):
             raise
             raise
         if state.click_stage_1 is None:
         if state.click_stage_1 is None:

+ 6 - 0
tasks/Component/GeneralBattle/gw/click2.json

@@ -112,5 +112,11 @@
     "roiFront": "138,16,512,93",
     "roiFront": "138,16,512,93",
     "roiBack": "138,16,512,93",
     "roiBack": "138,16,512,93",
     "description": "其实贪吃鬼这个点了也是没事儿"
     "description": "其实贪吃鬼这个点了也是没事儿"
+  },
+  {
+    "itemName": "end_master",
+    "roiFront": "251,145,811,530",
+    "roiBack": "248,143,815,535",
+    "description": "中间的一堆奖励直接忽略。上面的end_1_1到end_3_6会容易UI变化失效"
   }
   }
 ]
 ]