Преглед на файлове

Revert "modified RyouToppa code, fixed attack without check chance remains. And will attack till there is no target."

This reverts commit ea7023fdf345bc4add95258ee169452f040442ef.
TripleEarth преди 3 години
родител
ревизия
4093957062
променени са 5 файла, в които са добавени 28 реда и са изтрити 118 реда
  1. 0 7
      tasks/RyouToppa/assets.py
  2. 0 9
      tasks/RyouToppa/res/image.json
  3. 0 11
      tasks/RyouToppa/res/ocr.json
  4. BIN
      tasks/RyouToppa/res/res_real_raid_refresh.png
  5. 28 91
      tasks/RyouToppa/script_task.py

+ 0 - 7
tasks/RyouToppa/assets.py

@@ -28,12 +28,5 @@ class RyouToppaAssets:
 	I_GUILD_ORDERS_REWARDS = RuleImage(roi_front=(1123,31,115,56), roi_back=(1123,31,115,56), threshold=0.8, method="Template matching", file="./tasks/RyouToppa/res/res_guild_orders_rewards.png")
 	I_GUILD_ORDERS_REWARDS = RuleImage(roi_front=(1123,31,115,56), roi_back=(1123,31,115,56), threshold=0.8, method="Template matching", file="./tasks/RyouToppa/res/res_guild_orders_rewards.png")
 	# 攻破阴阳寮 
 	# 攻破阴阳寮 
 	I_SUCCESS_PENETRATION = RuleImage(roi_front=(206,149,100,100), roi_back=(206,149,100,100), threshold=0.8, method="Template matching", file="./tasks/RyouToppa/res/res_success_penetration.png")
 	I_SUCCESS_PENETRATION = RuleImage(roi_front=(206,149,100,100), roi_back=(206,149,100,100), threshold=0.8, method="Template matching", file="./tasks/RyouToppa/res/res_success_penetration.png")
-	# 个人突破刷新按钮 
-	I_REAL_RAID_REFRESH = RuleImage(roi_front=(963,569,174,60), roi_back=(963,569,174,60), threshold=0.8, method="Template matching", file="./tasks/RyouToppa/res/res_real_raid_refresh.png")
-
-
-	# Ocr Rule Assets
-	# 寮突破进攻机会数 
-	O_NUMBER = RuleOcr(roi=(271,560,48,31), area=(271,560,48,31), mode="DigitCounter", method="Default", keyword="", name="number")
 
 
 
 

+ 0 - 9
tasks/RyouToppa/res/image.json

@@ -52,14 +52,5 @@
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "攻破阴阳寮"
     "description": "攻破阴阳寮"
-  },
-  {
-    "itemName": "real_raid_refresh",
-    "imageName": "res_real_raid_refresh.png",
-    "roiFront": "963,569,174,60",
-    "roiBack": "963,569,174,60",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "个人突破刷新按钮"
   }
   }
 ]
 ]

+ 0 - 11
tasks/RyouToppa/res/ocr.json

@@ -1,11 +0,0 @@
-[
-  {
-    "itemName": "number",
-    "roiFront": "271,560,48,31",
-    "roiBack": "271,560,48,31",
-    "mode": "DigitCounter",
-    "method": "Default",
-    "keyword": "",
-    "description": "寮突破进攻机会数"
-  }
-]

BIN
tasks/RyouToppa/res/res_real_raid_refresh.png


+ 28 - 91
tasks/RyouToppa/script_task.py

@@ -6,14 +6,12 @@ import time
 from tasks.RyouToppa.assets import RyouToppaAssets
 from tasks.RyouToppa.assets import RyouToppaAssets
 from tasks.Component.GeneralBattle.general_battle import GeneralBattle
 from tasks.Component.GeneralBattle.general_battle import GeneralBattle
 from tasks.GameUi.game_ui import GameUi
 from tasks.GameUi.game_ui import GameUi
-from tasks.GameUi.page import page_realm_raid, page_main
+from tasks.GameUi.page import page_realm_raid, page_main, page_ryou_toppa
 from tasks.RealmRaid.assets import RealmRaidAssets
 from tasks.RealmRaid.assets import RealmRaidAssets
 from module.logger import logger
 from module.logger import logger
 from module.exception import TaskEnd
 from module.exception import TaskEnd
 from module.atom.image_grid import ImageGrid
 from module.atom.image_grid import ImageGrid
-from module.base.timer import Timer
-from module.exception import GamePageUnknownError
-from tasks.RyouToppa.config import RaidMode, AttackNumber, HaveManageAccess, RaidConfig, RyouToppa
+
 
 
 class ScriptTask(GeneralBattle, GameUi, RyouToppaAssets):
 class ScriptTask(GeneralBattle, GameUi, RyouToppaAssets):
     medal_grid: ImageGrid = None
     medal_grid: ImageGrid = None
@@ -28,44 +26,53 @@ class ScriptTask(GeneralBattle, GameUi, RyouToppaAssets):
                                      RealmRaidAssets.I_MEDAL_2, RealmRaidAssets.I_MEDAL_1, RealmRaidAssets.I_MEDAL_0])
                                      RealmRaidAssets.I_MEDAL_2, RealmRaidAssets.I_MEDAL_1, RealmRaidAssets.I_MEDAL_0])
         self.ui_get_current_page()
         self.ui_get_current_page()
         self.ui_goto(page_realm_raid)
         self.ui_goto(page_realm_raid)
-        ryou_toppa_start_flag = True
+
         # 点击突破
         # 点击突破
         while 1:
         while 1:
             self.screenshot()
             self.screenshot()
             if self.appear_then_click(RealmRaidAssets.I_REALM_RAID, interval=1):
             if self.appear_then_click(RealmRaidAssets.I_REALM_RAID, interval=1):
-                logger.info(f'Click {RealmRaidAssets.I_REALM_RAID.name}')
                 continue
                 continue
-            if self.appear(self.I_REAL_RAID_REFRESH, threshold=0.8):
-                if self.appear_then_click(self.I_RYOU_TOPPA, interval=1):
-                    logger.info(f'Click {self.I_RYOU_TOPPA.name}')
-                    continue
-            # 攻破阴阳寮,说明寮突已开,则退出
-            elif self.appear(self.I_SUCCESS_PENETRATION, threshold=0.8):
-                ryou_toppa_start_flag = True
+            if self.appear(RealmRaidAssets.I_BACK_RED, threshold=0.6):
                 break
                 break
+        logger.info(f'Click {RealmRaidAssets.I_REALM_RAID.name}')
+
+        ryou_toppa_start_flag = True
+
+        # 点击寮突
+        while 1:
+            self.screenshot()
+            if self.appear_then_click(self.I_RYOU_TOPPA, interval=1):
+                continue
             # 出现选择寮突说明寮突未开
             # 出现选择寮突说明寮突未开
-            elif self.appear(self.I_SELECT_RYOU_BUTTON, threshold=0.8):
+            if self.appear(self.I_SELECT_RYOU_BUTTON, threshold=0.8):
                 ryou_toppa_start_flag = False
                 ryou_toppa_start_flag = False
                 break
                 break
             # 出现寮奖励, 说明寮突已开
             # 出现寮奖励, 说明寮突已开
-            elif self.appear(self.I_RYOU_REWARD, threshold=0.8):
+            if self.appear(self.I_RYOU_REWARD, threshold=0.8):
                 ryou_toppa_start_flag = True
                 ryou_toppa_start_flag = True
                 break
                 break
+            # 攻破阴阳寮,说明寮突已开,则退出
+            if self.appear(self.I_SUCCESS_PENETRATION, threshold=0.8):
+                ryou_toppa_start_flag = True
+                break
+        logger.info(f'Click {self.I_RYOU_TOPPA.name}')
 
 
         # 寮突未开 并且有权限, 开开寮突
         # 寮突未开 并且有权限, 开开寮突
         if not ryou_toppa_start_flag and config.raid_config.ryou_access == 'yes':
         if not ryou_toppa_start_flag and config.raid_config.ryou_access == 'yes':
             # 开寮突
             # 开寮突
             self.start_ryou_toppa()
             self.start_ryou_toppa()
 
 
-        # 切换阵容 待实现
+        # 切换阵容 再说
 
 
         # 开始突破
         # 开始突破
         while 1:
         while 1:
-            if self.execute_round(config):
-                continue
-            else:
+            # 攻破阴阳寮,则退出
+            if self.appear(self.I_SUCCESS_PENETRATION, threshold=0.8):
                 break
                 break
-
+            # 点击结界, 并挑战
+            self.medal_fire()
+            self.run_general_battle(config.general_battle_config)
+            self.wait_until_appear(RealmRaidAssets.I_BACK_RED)
 
 
         # 回 page_main 失败
         # 回 page_main 失败
         # self.ui_current = page_ryou_toppa
         # self.ui_current = page_ryou_toppa
@@ -110,20 +117,6 @@ class ScriptTask(GeneralBattle, GameUi, RyouToppaAssets):
                 break
                 break
         logger.info(f'Click {self.I_START_TOPPA_BUTTON.name}')
         logger.info(f'Click {self.I_START_TOPPA_BUTTON.name}')
 
 
-    def is_ticket(self) -> bool:
-        """
-        如果没有票了,那么就返回False
-        :return:
-        """
-        self.wait_until_appear(RealmRaidAssets.I_BACK_RED)
-        self.screenshot()
-        cu, res, total = self.O_NUMBER.ocr(self.device.image)
-        logger.info(f"cu = {cu}, res = {res}, total = {total}")
-        if cu == 0 and cu+res == total:
-            logger.warning(f'Execute round failed, no chance to attack')
-            return False
-        return True
-
     def medal_fire(self) -> bool:
     def medal_fire(self) -> bool:
         """
         """
         点击勋章
         点击勋章
@@ -163,60 +156,4 @@ class ScriptTask(GeneralBattle, GameUi, RyouToppaAssets):
                 continue
                 continue
             if not self.appear(RealmRaidAssets.I_FIRE, threshold=0.8):
             if not self.appear(RealmRaidAssets.I_FIRE, threshold=0.8):
                 break
                 break
-        logger.info(f'Click {RealmRaidAssets.I_FIRE.name}')
-
-    def execute_round(self, config: RaidMode) -> bool:
-        """
-        执行一轮 除非票不够,一直到到九次
-        :return:
-        """
-        # 如果没有票了,就退出
-        if not self.is_ticket():
-            return False
-        if not self.is_target_available():
-            return False
-        # # 判断是退四打九还是全部打
-        # if config.raid_config.raid_mode == RaidMode.NORMAL:
-        #     logger.info(f'Execute round, retreat four attack nine')
-        #     self.medal_fire()
-        #     self.run_general_battle_back(config.general_battle_config)
-        #
-        #     self.medal_fire()
-        #     self.run_general_battle_back(config.general_battle_config)
-        #
-        #     self.medal_fire()
-        #     self.run_general_battle_back(config.general_battle_config)
-        #
-        #     self.medal_fire()
-        #     self.run_general_battle_back(config.general_battle_config)
-
-        # 打20次
-        for i in range(20):
-            if not self.is_ticket():
-                return False
-            if not self.is_target_available():
-                return False
-            self.medal_fire()
-            self.run_general_battle(config.general_battle_config)
-            self.wait_until_appear(RealmRaidAssets.I_BACK_RED)
-
-        return True
-
-    # 判断是否还有可进攻的目标
-    def is_target_available(self) -> bool:
-        """
-            如果没有可进攻目标了,那么就返回False
-            :return:
-            """
-        self.wait_until_appear(RealmRaidAssets.I_BACK_RED)
-        self.screenshot()
-        # 有徽章被检测到
-        if self.medal_grid.find_anyone(self.device.image):
-            return True
-        # 没有徽章被检测到,且目标寮已被攻破
-        elif self.appear(self.I_SUCCESS_PENETRATION, threshold=0.8):
-            logger.info(f'Execute round failed, no target')
-            return False
-        else:
-            raise GamePageUnknownError
-
+        logger.info(f'Click {RealmRaidAssets.I_FIRE.name}')