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

perf(component): opt general battle

runhey 3 лет назад
Родитель
Сommit
7aa6b2a5b7
26 измененных файлов с 260 добавлено и 163 удалено
  1. 1 1
      module/atom/image.py
  2. 1 1
      script.py
  3. BIN
      tasks/Component/GeneralBattle/GeneralBattle_greed_ghost.png
  4. BIN
      tasks/Component/GeneralBattle/GeneralBattle_win.png
  5. 15 0
      tasks/Component/GeneralBattle/assets.py
  6. 7 7
      tasks/Component/GeneralBattle/config_general_battle.py
  7. 38 0
      tasks/Component/GeneralBattle/finish_click.json
  8. 198 154
      tasks/Component/GeneralBattle/general_battle.py
  9. BIN
      tasks/Component/GeneralBattle/res_buff.png
  10. BIN
      tasks/Component/GeneralBattle/res_buff_awaken.png
  11. BIN
      tasks/Component/GeneralBattle/res_buff_exp_100.png
  12. BIN
      tasks/Component/GeneralBattle/res_buff_exp_50.png
  13. BIN
      tasks/Component/GeneralBattle/res_buff_gold_100.png
  14. BIN
      tasks/Component/GeneralBattle/res_buff_gold_50.png
  15. BIN
      tasks/Component/GeneralBattle/res_buff_soul.png
  16. BIN
      tasks/Component/GeneralBattle/res_exit.png
  17. BIN
      tasks/Component/GeneralBattle/res_exit_ensure.png
  18. BIN
      tasks/Component/GeneralBattle/res_false.png
  19. BIN
      tasks/Component/GeneralBattle/res_local.png
  20. BIN
      tasks/Component/GeneralBattle/res_prepare_dark.png
  21. BIN
      tasks/Component/GeneralBattle/res_prepare_highlight.png
  22. BIN
      tasks/Component/GeneralBattle/res_preset.png
  23. BIN
      tasks/Component/GeneralBattle/res_preset_ensure.png
  24. BIN
      tasks/Component/GeneralBattle/res_reward.png
  25. BIN
      tasks/Component/GeneralBattle/res_statistics.png
  26. BIN
      tasks/Component/GeneralBattle/res_win.png

+ 1 - 1
module/atom/image.py

@@ -37,7 +37,7 @@ class RuleImage:
 
         :return:
         """
-        return Path(self.file).stem
+        return Path(self.file).stem.upper()
 
     def __str__(self):
         return self.name

+ 1 - 1
script.py

@@ -445,4 +445,4 @@ if __name__ == "__main__":
     script = Script("oas1")
     # print(script.get_next_task())
     # script.run("ActivityShikigami")
-    script.run('RealmRaid')
+    script.run('AreaBoss')

BIN
tasks/Component/GeneralBattle/GeneralBattle_greed_ghost.png


BIN
tasks/Component/GeneralBattle/GeneralBattle_win.png


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

@@ -10,6 +10,21 @@ from module.atom.list import RuleList
 class GeneralBattleAssets: 
 
 
+	# Click Rule Assets
+	# description 
+	C_WIN_1 = RuleClick(roi_front=(175,40,1054,161), roi_back=(175,40,1054,161), name="win_1")
+	# description 
+	C_WIN_2 = RuleClick(roi_front=(22,112,210,496), roi_back=(22,112,210,496), name="win_2")
+	# description 
+	C_WIN_3 = RuleClick(roi_front=(1059,114,206,468), roi_back=(1059,114,206,468), name="win_3")
+	# description 
+	C_REWARD_1 = RuleClick(roi_front=(546,546,385,144), roi_back=(546,546,385,144), name="reward_1")
+	# description 
+	C_REWARD_2 = RuleClick(roi_front=(25,134,224,472), roi_back=(25,134,224,472), name="reward_2")
+	# description 
+	C_REWARD_3 = RuleClick(roi_front=(1092,156,168,437), roi_back=(1092,156,168,437), name="reward_3")
+
+
 	# Click Rule Assets
 	# 预设队伍1 
 	C_PRESET_TEAM_1 = RuleClick(roi_front=(196,234,464,114), roi_back=(196,234,464,114), name="preset_team_1")

+ 7 - 7
tasks/Component/GeneralBattle/config_general_battle.py

@@ -25,19 +25,19 @@ class GeneralBattleConfig(BaseModel):
     # 选哪一个队伍
     preset_team: int = Field(default=1, description='preset_team_help', ge=1, le=5)
     # 是否启动开启buff
-    buff_enable: bool = Field(default=False, description='buff_enable_help')
+    # buff_enable: bool = Field(default=False, description='buff_enable_help')
     # 是否点击觉醒Buff
-    buff_awake_click: bool = Field(default=False, description='')
+    # buff_awake_click: bool = Field(default=False, description='')
     # 是否点击御魂buff
-    buff_soul_click: bool = Field(default=False, description='')
+    # buff_soul_click: bool = Field(default=False, description='')
     # 是否点击金币50buff
-    buff_gold_50_click: bool = Field(default=False, description='')
+    # buff_gold_50_click: bool = Field(default=False, description='')
     # 是否点击金币100buff
-    buff_gold_100_click: bool = Field(default=False, description='')
+    # buff_gold_100_click: bool = Field(default=False, description='')
     # 是否点击经验50buff
-    buff_exp_50_click: bool = Field(default=False, description='')
+    # buff_exp_50_click: bool = Field(default=False, description='')
     # 是否点击经验100buff
-    buff_exp_100_click: bool = Field(default=False, description='')
+    # buff_exp_100_click: bool = Field(default=False, description='')
 
     # 是否开启绿标
     green_enable: bool = Field(default=False, description='green_enable_help')

+ 38 - 0
tasks/Component/GeneralBattle/finish_click.json

@@ -0,0 +1,38 @@
+[
+  {
+    "itemName": "win_1",
+    "roiFront": "175,40,1054,161",
+    "roiBack": "175,40,1054,161",
+    "description": "description"
+  },
+  {
+    "itemName": "win_2",
+    "roiFront": "22,112,210,496",
+    "roiBack": "22,112,210,496",
+    "description": "description"
+  },
+  {
+    "itemName": "win_3",
+    "roiFront": "1059,114,206,468",
+    "roiBack": "1059,114,206,468",
+    "description": "description"
+  },
+  {
+    "itemName": "reward_1",
+    "roiFront": "546,546,385,144",
+    "roiBack": "546,546,385,144",
+    "description": "description"
+  },
+  {
+    "itemName": "reward_2",
+    "roiFront": "25,134,224,472",
+    "roiBack": "25,134,224,472",
+    "description": "description"
+  },
+  {
+    "itemName": "reward_3",
+    "roiFront": "1092,156,168,437",
+    "roiBack": "1092,156,168,437",
+    "description": "description"
+  }
+]

+ 198 - 154
tasks/Component/GeneralBattle/general_battle.py

@@ -28,69 +28,13 @@ class GeneralBattle(BaseTask, GeneralBattleAssets):
         if config is None:
             config = GeneralBattleConfig().dict()
 
-        # if isinstance(config, GeneralBattle):
-        #     logger.error(f"config is not GeneralBattle type, config: {config}")
-        #     config = GeneralBattle().dict()
 
         # 如果没有锁定队伍。那么可以根据配置设定队伍
         if not config.lock_team_enable:
             logger.info("Lock team is not enable")
-            # 如果启动更换队伍
-            if config.preset_enable and self.current_count == 1:
-                logger.info("Preset is enable")
-                # 点击预设按钮
-                logger.info("Click preset button")
-                while 1:
-                    self.screenshot()
-                    if self.appear_then_click(self.I_PRESET, threshold=0.8):
-                        continue
-                    if self.appear(self.I_PRESET_ENSURE):
-                        break
-                # 选择预设组
-                logger.info("Select preset group")
-                x, y = None, None
-                match config.preset_group:
-                    case 1: x, y = self.C_PRESET_GROUP_1.coord()
-                    case 2: x, y = self.C_PRESET_GROUP_2.coord()
-                    case 3: x, y = self.C_PRESET_GROUP_3.coord()
-                    case 4: x, y = self.C_PRESET_GROUP_4.coord()
-                    case 5: x, y = self.C_PRESET_GROUP_5.coord()
-                    case 6: x, y = self.C_PRESET_GROUP_6.coord()
-                    case 7: x, y = self.C_PRESET_GROUP_7.coord()
-                    case _: x, y = self.C_PRESET_GROUP_1.coord()
-                self.device.click(x, y)
-
-                # 选择预设的队伍
-                logger.info("Select preset team")
-                time.sleep(0.5)
-                match config.preset_team:
-                    case 1: x, y = self.C_PRESET_TEAM_1.coord()
-                    case 2: x, y = self.C_PRESET_TEAM_2.coord()
-                    case 3: x, y = self.C_PRESET_TEAM_3.coord()
-                    case 4: x, y = self.C_PRESET_TEAM_4.coord()
-                    case _: x, y = self.C_PRESET_TEAM_1.coord()
-                self.device.click(x, y)
-
-                # 点击预设确认
-                logger.info("Click preset ensure")
-                while 1:
-                    self.screenshot()
-                    if self.appear_then_click(self.I_PRESET_ENSURE, threshold=0.8):
-                        continue
-                    if not self.appear(self.I_PRESET_ENSURE):
-                        break
-
-            # 点击buff按钮
-            if config.buff_enable and self.current_count == 1:
-                logger.info("Buff is enable")
-                logger.info("Click buff button")
-                while 1:
-                    self.screenshot()
-                    if self.appear_then_click(self.I_BUFF, interval=1.5):
-                        continue
-                    if self.appear(self.I_BUFF_AWAKEN) or self.appear(self.I_BUFF_SOUL):
-                        break
-
+            # 如果更换队伍
+            if self.current_count == 1:
+                self.switch_preset_team(config.preset_enable, config.preset_group, config.preset_team)
 
             # 点击准备按钮
             self.wait_until_appear(self.I_PREPARE_HIGHLIGHT)
@@ -106,102 +50,9 @@ class GeneralBattle(BaseTask, GeneralBattleAssets):
             time.sleep(0.1)
 
         # 绿标
-        if config.green_enable:
-            logger.info("Green is enable")
-            x, y = None, None
-            match config.green_mark:
-                case GreenMarkType.GREEN_LEFT1:
-                    x, y = self.C_GREEN_LEFT_1.coord()
-                    logger.info("Green left 1")
-                case GreenMarkType.GREEN_LEFT2:
-                    x, y = self.C_GREEN_LEFT_2.coord()
-                    logger.info("Green left 2")
-                case GreenMarkType.GREEN_LEFT3:
-                    x, y = self.C_GREEN_LEFT_3.coord()
-                    logger.info("Green left 3")
-                case GreenMarkType.GREEN_LEFT4:
-                    x, y = self.C_GREEN_LEFT_4.coord()
-                    logger.info("Green left 4")
-                case GreenMarkType.GREEN_LEFT5:
-                    x, y = self.C_GREEN_LEFT_5.coord()
-                    logger.info("Green left 5")
-                case GreenMarkType.GREEN_MAIN:
-                    x, y = self.C_GREEN_MAIN.coord()
-                    logger.info("Green main")
-
-            # 判断有无坐标的偏移
-            self.appear_then_click(self.I_LOCAL)
-            time.sleep(0.3)
-            # 点击绿标
-            self.device.click(x, y)
-
-        # 有的时候是长战斗,需要在设置stuck检测为长战斗
-        # 但是无需取消设置,因为如果有点击或者滑动的话 handle_control_check会自行取消掉
-        self.device.stuck_record_add('BATTLE_STATUS_S')
-
-        # 战斗过程 随机点击和滑动 防封
-        logger.info("Start battle process")
-        win: bool = False
-        while 1:
-            self.screenshot()
-            # 如果出现赢 就点击
-            if self.appear(self.I_WIN, threshold=0.6):
-                logger.info("Battle result is win")
-                win = True
-                break
-
-            # 如果出现失败 就点击,返回False
-            if self.appear(self.I_FALSE, threshold=0.6):
-                logger.info("Battle result is false")
-                win = False
-                break
-
-            # 如果领奖励
-            if self.appear(self.I_REWARD, threshold=0.6):
-                win = True
-                break
-            # 如果开启战斗过程随机滑动
-            if config.random_click_swipt_enable:
-                time.sleep(0.4)  # 这样的好像不对
-                if 0 <= random.randint(0, 500) <= 3:  # 百分之4的概率
-                    rand_type = random.randint(0, 2)
-                    match rand_type:
-                        case 0:
-                            self.click(self.C_RANDOM_CLICK, interval=20)
-                        case 1:
-                            self.swipe(self.S_BATTLE_RANDOM_LEFT, interval=20)
-                        case 2:
-                            self.swipe(self.S_BATTLE_RANDOM_RIGHT, interval=20)
-                    # 重新设置为长战斗
-                    self.device.stuck_record_add('BATTLE_STATUS_S')
-
-        # 再次确认战斗结果
-        logger.info("Reconfirm the results of the battle")
-        while 1:
-            self.screenshot()
-            if win:
-                # 点击赢了
-                if self.appear_then_click(self.I_WIN):
-                    continue
-                if not self.appear(self.I_WIN):
-                    break
-            else:
-                # 如果失败且 点击失败后
-                if self.appear_then_click(self.I_FALSE, threshold=0.6):
-                    continue
-                if not self.appear(self.I_FALSE, threshold=0.6):
-                    return False
-        # 最后保证能点击 获得奖励
-        self.wait_until_appear(self.I_REWARD)
-        logger.info("Get reward")
-        while 1:
-            self.screenshot()
-            # 如果出现领奖励
-            if self.appear_then_click(self.I_REWARD, interval=1.5):
-                continue
-            if not self.appear(self.I_REWARD):
-                break
+        self.green_mark(config.green_enable, config.green_mark)
 
+        win = self.battle_wait(config.random_click_swipt_enable)
         if win:
             return True
         else:
@@ -290,3 +141,196 @@ class GeneralBattle(BaseTask, GeneralBattleAssets):
         return True
 
 
+    def battle_wait(self, random_click_swipt_enable: bool) -> bool:
+        """
+        等待战斗结束
+        :param random_click_swipt_enable:
+        :return:
+        """
+        # 有的时候是长战斗,需要在设置stuck检测为长战斗
+        # 但是无需取消设置,因为如果有点击或者滑动的话 handle_control_check会自行取消掉
+        self.device.stuck_record_add('BATTLE_STATUS_S')
+        # 战斗过程 随机点击和滑动 防封
+        logger.info("Start battle process")
+        win: bool = False
+        while 1:
+            self.screenshot()
+            # 如果出现赢 就点击
+            if self.appear(self.I_WIN, threshold=0.6):
+                logger.info("Battle result is win")
+                win = True
+                break
+
+            # 如果出现失败 就点击,返回False
+            if self.appear(self.I_FALSE, threshold=0.6):
+                logger.info("Battle result is false")
+                win = False
+                break
+
+            # 如果领奖励
+            if self.appear(self.I_REWARD, threshold=0.6):
+                win = True
+                break
+            # 如果开启战斗过程随机滑动
+            if random_click_swipt_enable:
+                time.sleep(0.4)  # 这样的好像不对
+                if 0 <= random.randint(0, 500) <= 3:  # 百分之4的概率
+                    rand_type = random.randint(0, 2)
+                    match rand_type:
+                        case 0:
+                            self.click(self.C_RANDOM_CLICK, interval=20)
+                        case 1:
+                            self.swipe(self.S_BATTLE_RANDOM_LEFT, interval=20)
+                        case 2:
+                            self.swipe(self.S_BATTLE_RANDOM_RIGHT, interval=20)
+                    # 重新设置为长战斗
+                    self.device.stuck_record_add('BATTLE_STATUS_S')
+
+        # 再次确认战斗结果
+        logger.info("Reconfirm the results of the battle")
+        while 1:
+            self.screenshot()
+            if win:
+                # 点击赢了
+                action_click = random.choice([self.C_WIN_1, self.C_WIN_2, self.C_WIN_3])
+                if self.appear_then_click(self.I_WIN, action=action_click, interval=0.5):
+                    continue
+                if not self.appear(self.I_WIN):
+                    break
+            else:
+                # 如果失败且 点击失败后
+                if self.appear_then_click(self.I_FALSE, threshold=0.6):
+                    continue
+                if not self.appear(self.I_FALSE, threshold=0.6):
+                    return False
+        # 最后保证能点击 获得奖励
+        self.wait_until_appear(self.I_REWARD)
+        logger.info("Get reward")
+        while 1:
+            self.screenshot()
+            # 如果出现领奖励
+            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
+            if not self.appear(self.I_REWARD):
+                break
+
+        return win
+
+    def green_mark(self, enable: bool=False, mark_mode: GreenMarkType=GreenMarkType.GREEN_MAIN):
+        """
+        绿标, 如果不使能就直接返回
+        :param enable:
+        :param mark_mode:
+        :return:
+        """
+        if enable:
+            logger.info("Green is enable")
+            x, y = None, None
+            match mark_mode:
+                case GreenMarkType.GREEN_LEFT1:
+                    x, y = self.C_GREEN_LEFT_1.coord()
+                    logger.info("Green left 1")
+                case GreenMarkType.GREEN_LEFT2:
+                    x, y = self.C_GREEN_LEFT_2.coord()
+                    logger.info("Green left 2")
+                case GreenMarkType.GREEN_LEFT3:
+                    x, y = self.C_GREEN_LEFT_3.coord()
+                    logger.info("Green left 3")
+                case GreenMarkType.GREEN_LEFT4:
+                    x, y = self.C_GREEN_LEFT_4.coord()
+                    logger.info("Green left 4")
+                case GreenMarkType.GREEN_LEFT5:
+                    x, y = self.C_GREEN_LEFT_5.coord()
+                    logger.info("Green left 5")
+                case GreenMarkType.GREEN_MAIN:
+                    x, y = self.C_GREEN_MAIN.coord()
+                    logger.info("Green main")
+
+            # 等待那个准备的消失
+            while 1:
+                self.screenshot()
+                if not self.appear(self.I_PREPARE_HIGHLIGHT):
+                    break
+
+            # 判断有无坐标的偏移
+            self.appear_then_click(self.I_LOCAL)
+            time.sleep(0.3)
+            # 点击绿标
+            self.device.click(x, y)
+
+    def switch_preset_team(self, enable: bool=False, preset_group: int=1, preset_team: int=1):
+        """
+        切换预设的队伍, 要求是在不锁定队伍时的情况下
+        :param enable:
+        :param preset_group:
+        :param preset_team:
+        :return:
+        """
+        if not enable:
+            logger.info("Preset is disable")
+            return None
+
+        logger.info("Preset is enable")
+        # 点击预设按钮
+        while 1:
+            self.screenshot()
+            if self.appear_then_click(self.I_PRESET, threshold=0.8):
+                continue
+            if self.appear(self.I_PRESET_ENSURE):
+                break
+        logger.info("Click preset button")
+
+        # 选择预设组
+        x, y = None, None
+        match preset_group:
+            case 1:
+                x, y = self.C_PRESET_GROUP_1.coord()
+            case 2:
+                x, y = self.C_PRESET_GROUP_2.coord()
+            case 3:
+                x, y = self.C_PRESET_GROUP_3.coord()
+            case 4:
+                x, y = self.C_PRESET_GROUP_4.coord()
+            case 5:
+                x, y = self.C_PRESET_GROUP_5.coord()
+            case 6:
+                x, y = self.C_PRESET_GROUP_6.coord()
+            case 7:
+                x, y = self.C_PRESET_GROUP_7.coord()
+            case _:
+                x, y = self.C_PRESET_GROUP_1.coord()
+        self.device.click(x, y)
+        logger.info("Select preset group")
+
+        # 选择预设的队伍
+        time.sleep(0.5)
+        match preset_team:
+            case 1:
+                x, y = self.C_PRESET_TEAM_1.coord()
+            case 2:
+                x, y = self.C_PRESET_TEAM_2.coord()
+            case 3:
+                x, y = self.C_PRESET_TEAM_3.coord()
+            case 4:
+                x, y = self.C_PRESET_TEAM_4.coord()
+            case _:
+                x, y = self.C_PRESET_TEAM_1.coord()
+        self.device.click(x, y)
+        logger.info("Select preset team")
+
+        # 点击预设确认
+        while 1:
+            self.screenshot()
+            if self.appear_then_click(self.I_PRESET_ENSURE, threshold=0.8):
+                continue
+            if not self.appear(self.I_PRESET_ENSURE):
+                break
+        logger.info("Click preset ensure")
+
+
+
+
+
+
+

BIN
tasks/Component/GeneralBattle/res_buff.png


BIN
tasks/Component/GeneralBattle/res_buff_awaken.png


BIN
tasks/Component/GeneralBattle/res_buff_exp_100.png


BIN
tasks/Component/GeneralBattle/res_buff_exp_50.png


BIN
tasks/Component/GeneralBattle/res_buff_gold_100.png


BIN
tasks/Component/GeneralBattle/res_buff_gold_50.png


BIN
tasks/Component/GeneralBattle/res_buff_soul.png


BIN
tasks/Component/GeneralBattle/res_exit.png


BIN
tasks/Component/GeneralBattle/res_exit_ensure.png


BIN
tasks/Component/GeneralBattle/res_false.png


BIN
tasks/Component/GeneralBattle/res_local.png


BIN
tasks/Component/GeneralBattle/res_prepare_dark.png


BIN
tasks/Component/GeneralBattle/res_prepare_highlight.png


BIN
tasks/Component/GeneralBattle/res_preset.png


BIN
tasks/Component/GeneralBattle/res_preset_ensure.png


BIN
tasks/Component/GeneralBattle/res_reward.png


BIN
tasks/Component/GeneralBattle/res_statistics.png


BIN
tasks/Component/GeneralBattle/res_win.png