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

fix(ActivityShikigami): Update

neptine 2 месяцев назад
Родитель
Сommit
faca04069b

BIN
tasks/ActivityShikigami/as/as_climb_mode_pass.png


BIN
tasks/ActivityShikigami/as/as_climb_mode_switch.png


BIN
tasks/ActivityShikigami/as/as_shi.png


BIN
tasks/ActivityShikigami/as/as_to_battle_main.png


+ 3 - 3
tasks/ActivityShikigami/as/pages.json

@@ -38,8 +38,8 @@
   {
     "itemName": "to_battle_main",
     "imageName": "as_to_battle_main.png",
-    "roiFront": "600,418,38,152",
-    "roiBack": "499,347,238,269",
+    "roiFront": "302,178,98,111",
+    "roiBack": "223,110,238,269",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "进入主要的战斗界面"
@@ -48,7 +48,7 @@
     "itemName": "to_battle_boss",
     "imageName": "as_to_battle_boss.png",
     "roiFront": "1111,248,37,136",
-    "roiBack": "973,174,234,327",
+    "roiBack": "979,142,234,327",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "点击进入boss战斗页面"

+ 4 - 4
tasks/ActivityShikigami/assets.py

@@ -46,9 +46,9 @@ class ActivityShikigamiAssets:
 	# 红色退出 
 	I_RED_EXIT = RuleImage(roi_front=(1162,96,39,38), roi_back=(1120,49,110,135), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_red_exit.png")
 	# 进入主要的战斗界面 
-	I_TO_BATTLE_MAIN = RuleImage(roi_front=(600,418,38,152), roi_back=(499,347,238,269), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_to_battle_main.png")
+	I_TO_BATTLE_MAIN = RuleImage(roi_front=(302,178,98,111), roi_back=(223,110,238,269), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_to_battle_main.png")
 	# 点击进入boss战斗页面 
-	I_TO_BATTLE_BOSS = RuleImage(roi_front=(1111,248,37,136), roi_back=(973,174,234,327), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_to_battle_boss.png")
+	I_TO_BATTLE_BOSS = RuleImage(roi_front=(1111,248,37,136), roi_back=(979,142,234,327), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_to_battle_boss.png")
 	# description 
 	I_CHECK_BATTLE_MAIN = RuleImage(roi_front=(50,642,62,58), roi_back=(1,510,415,203), threshold=0.65, method="Template matching", file="./tasks/ActivityShikigami/as/as_check_battle_main.png")
 	# description 
@@ -94,9 +94,9 @@ class ActivityShikigamiAssets:
 	# 挑战 
 	O_FIRE = RuleOcr(roi=(1135,599,85,49), area=(1123,570,106,100), mode="Single", method="Default", keyword="挑战", name="fire")
 	# 体力的数量检测 
-	O_REMAIN_AP = RuleOcr(roi=(944,28,63,27), area=(943,26,63,30), mode="DigitCounter", method="Default", keyword="", name="remain_ap")
+	O_REMAIN_AP = RuleOcr(roi=(584,17,63,27), area=(583,16,63,30), mode="DigitCounter", method="Default", keyword="", name="remain_ap")
 	# 活动体力的剩余检测 
-	O_REMAIN_PASS = RuleOcr(roi=(563,26,50,29), area=(563,26,49,28), mode="DigitCounter", method="Default", keyword="", name="remain_pass")
+	O_REMAIN_PASS = RuleOcr(roi=(791,18,50,29), area=(791,18,49,28), mode="DigitCounter", method="Default", keyword="", name="remain_pass")
 	# 还有多少次购买体力的机会 
 	O_REMAIN_BUY = RuleOcr(roi=(808,531,39,42), area=(808,531,39,42), mode="DigitCounter", method="Default", keyword="", name="remain_buy")
 	# 活动票数(没有百分比) 

+ 4 - 4
tasks/ActivityShikigami/fire/ocr.json

@@ -10,8 +10,8 @@
   },
   {
     "itemName": "remain_ap",
-    "roiFront": "944,28,63,27",
-    "roiBack": "943,26,63,30",
+    "roiFront": "584,17,63,27",
+    "roiBack": "583,16,63,30",
     "mode": "DigitCounter",
     "method": "Default",
     "keyword": "",
@@ -19,8 +19,8 @@
   },
   {
     "itemName": "remain_pass",
-    "roiFront": "563,26,50,29",
-    "roiBack": "563,26,49,28",
+    "roiFront": "791,18,50,29",
+    "roiBack": "791,18,49,28",
     "mode": "DigitCounter",
     "method": "Default",
     "keyword": "",

+ 1 - 44
tasks/ActivityShikigami/script_task.py

@@ -297,50 +297,7 @@ class ScriptTask(StateMachine, GameUi, BaseActivity, SwitchSoul, ActivityShikiga
         # 运行战斗
         self.run_general_battle(config=self.get_general_battle_conf())
 
-    # def battle_wait(self, random_click_swipt_enable: bool) -> bool:
-    #     # 通用战斗结束判断
-    #     self.device.stuck_record_add("BATTLE_STATUS_S")
-    #     self.device.click_record_clear()
-    #     logger.info(f"Start {self.climb_type} battle process")
-    #     self.count_map[self.climb_type] = self.current_count
-    #     for btn in (self.C_RANDOM_LEFT, self.C_RANDOM_RIGHT, self.C_RANDOM_TOP, self.C_RANDOM_BOTTOM):
-    #         btn.name = "BATTLE_RANDOM"
-    #     ok_cnt, max_retry = 0, 8
-    #     while 1:
-    #         sleep(random.uniform(0.5, 1.5))
-    #         self.screenshot()
-    #         # 达到最大重试次数则直接交给上层处理
-    #         if ok_cnt > max_retry:
-    #             break
-    #         # 识别到挑战说明已经退出战斗
-    #         if ok_cnt > 0 and self.ocr_appear(self.O_FIRE):
-    #             return True
-    #         # 战斗失败
-    #         if self.appear(self.I_FALSE):
-    #             logger.warning("Battle failed")
-    #             self.ui_click_until_smt_disappear(self.random_reward_click(click_now=False), self.I_FALSE, interval=1.5)
-    #             return False
-    #         # 战斗成功
-    #         if self.appear_then_click(self.I_WIN, interval=2):
-    #             continue
-    #         #  出现 “魂” 和 紫蛇皮
-    #         if self.appear(self.I_REWARD) or self.appear(self.I_REWARD_PURPLE_SNAKE_SKIN) or \
-    #                 self.appear(self.I_REWARD_GOLD) or self.appear(self.I_REWARD_GOLD_SNAKE_SKIN):
-    #             self.random_reward_click(exclude_click=[self.C_RANDOM_TOP, self.C_RANDOM_LEFT])
-    #             ok_cnt += 1
-    #             continue
-    #         # 已经不在战斗中了, 且奖励也识别过了, 则随机点击
-    #         if ok_cnt > 3 and not self.is_in_battle(False):
-    #             self.random_reward_click(exclude_click=[self.C_RANDOM_TOP, self.C_RANDOM_LEFT])
-    #             self.device.stuck_record_clear()
-    #             ok_cnt += 1
-    #             continue
-    #         # 战斗中随机滑动
-    #         if ok_cnt == 0 and random_click_swipt_enable:
-    #             self.random_click_swipt()
-    #     return True
-
-    @battle_wait_strategy('reserve_default', 'idle_default', failure='default', success='soul')
+    @battle_wait_strategy(success='activity')
     def battle_wait(self, *args, **kwargs):
         return self.battle_wait_with_strategy(*args, **kwargs)
 

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

@@ -236,6 +236,11 @@ class GeneralBattleAssets:
 	C_END_GREED = RuleClick(roi_front=(138,16,512,93), roi_back=(138,16,512,93), name="end_greed")
 
 
+	# Click Rule Assets
+	# 获得奖励中间的区域 
+	C_END_ACTIVITY_REWARD = RuleClick(roi_front=(400,250,493,226), roi_back=(401,252,494,230), name="end_activity_reward")
+
+
 	# Image Rule Assets
 	# description 
 	I_END_FIX_1 = RuleImage(roi_front=(896,251,218,64), roi_back=(119,66,1136,620), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/gw/gw_end_fix_1.png")

+ 44 - 1
tasks/Component/GeneralBattle/battle_wait.py

@@ -409,7 +409,6 @@ class BattleWait(BaseTask, GeneralBattleAssets):
                     self.device.click(x=x, y=y, control_name='reward_item')
                     continue
                 self.click(self._reward_exclude_click_2, interval=1.5)
-                pass
             else:
                 logger.info('Get all reward')
                 bw_ctx.success = True
@@ -495,6 +494,50 @@ class BattleWait(BaseTask, GeneralBattleAssets):
                 break
         return HookSignal.CONTINUE
 
+    @cached_property
+    def exclude_click_activity(self, areas: list[str] = None) -> RuleClickExclude:
+        inputs = []
+        for area in ['C_END_MESSAGE_RIGHT_TOP', 'C_END_ACTIVITY_REWARD']:
+            click = getattr(self, area, None)
+            if click is None:
+                raise ValueError(f'Unknown success exclusion click: {area!r}')
+            inputs.append(click)
+        return RuleClickExclude(inputs, name='exclude_click_activity')
+
+    def _bw_success_activity(self, bw_ctx: BattleWaitContext) -> HookSignal:
+        if not self.appear(self.I_UI_REWARD):
+            return HookSignal.CONTINUE
+        self.screenshot()
+        if not self.appear(self.I_UI_REWARD):
+            return HookSignal.CONTINUE
+
+        logger.info('Win battle')
+        timer = Timer(20).start()
+        while 1:
+            self.screenshot()
+
+            # 不小心点到了具体的奖励,他会弹出这个物品的详细描述 里面必定包含有“获取途径”
+            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)
+
+            if self.appear(self.I_UI_REWARD):
+                if random.random() < 0.02:
+                    # 有一定的概率专门点击具体的奖励物品
+                    x, y = self.exclude_click_activity.coord_in_excluded(None)
+                    self.device.click(x=x, y=y, control_name='reward_item')
+                    continue
+                self.click(self.exclude_click_activity, interval=1.5)
+            else:
+                logger.info('Get all reward')
+                bw_ctx.success = True
+                bw_ctx.completion = True
+                return HookSignal.DONE
+
+            if timer.reached_and_reset():
+                logger.warning('battle ')
+                break
+        return HookSignal.CONTINUE
+
 
     # ------------------------------------------------------------------------------------------------------------------
     def battle_wait_with_strategy(self, *args, **kwargs) -> bool:

+ 8 - 0
tasks/Component/GeneralBattle/gw/click_activity.json

@@ -0,0 +1,8 @@
+[
+  {
+    "itemName": "end_activity_reward",
+    "roiFront": "400,250,493,226",
+    "roiBack": "401,252,494,230",
+    "description": "获得奖励中间的区域"
+  }
+]