From f606ef5dbf9770ba297393fb3fa72f11182456e8 Mon Sep 17 00:00:00 2001 From: Zichao Lin Date: Mon, 20 Jul 2026 16:16:51 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E6=94=AF=E6=8C=81=E5=9B=BD?= =?UTF-8?q?=E9=99=85=E6=9C=8D=E7=99=BB=E5=BD=95=E4=B8=8E=E5=88=87=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/game_data/screen_info/_od_merged.yml | 130 ++++++++++++++++++ src/sr_od/operations/enter_game/enter_game.py | 74 ++++++++++ 2 files changed, 204 insertions(+) diff --git a/assets/game_data/screen_info/_od_merged.yml b/assets/game_data/screen_info/_od_merged.yml index 940240fc..5c668740 100644 --- a/assets/game_data/screen_info/_od_merged.yml +++ b/assets/game_data/screen_info/_od_merged.yml @@ -4704,3 +4704,133 @@ template_match_threshold: 0.7 color_range: null goto_list: [] +- screen_id: enter_game_oversea + screen_name: 进入游戏-国际服选服 + pc_alt: false + area_list: + - area_name: 文本-开始游戏 + id_mark: true + pc_rect: + - 781 + - 789 + - 1141 + - 878 + text: 开始游戏 + lcs_percent: 0.5 + template_sub_dir: '' + template_id: '' + template_match_threshold: 0.7 + color_range: null + goto_list: [] + - area_name: 按钮-登出 + id_mark: false + pc_rect: + - 1794 + - 234 + - 1854 + - 294 + text: '' + lcs_percent: 0.5 + template_sub_dir: '' + template_id: '' + template_match_threshold: 0.7 + color_range: null + goto_list: [] + - area_name: 按钮-登出确认 + id_mark: false + pc_rect: + - 1053 + - 538 + - 1113 + - 598 + text: '' + lcs_percent: 0.5 + template_sub_dir: '' + template_id: '' + template_match_threshold: 0.7 + color_range: null + goto_list: [] + - area_name: 按钮-选服 + id_mark: false + pc_rect: + - 916 + - 876 + - 989 + - 949 + text: '' + lcs_percent: 0.5 + template_sub_dir: '' + template_id: '' + template_match_threshold: 0.7 + color_range: null + goto_list: [] + - area_name: 选项-亚服 + id_mark: false + pc_rect: + - 557 + - 418 + - 637 + - 478 + text: '' + lcs_percent: 0.5 + template_sub_dir: '' + template_id: '' + template_match_threshold: 0.7 + color_range: null + goto_list: [] + - area_name: 选项-欧服 + id_mark: false + pc_rect: + - 1143 + - 418 + - 1223 + - 478 + text: '' + lcs_percent: 0.5 + template_sub_dir: '' + template_id: '' + template_match_threshold: 0.7 + color_range: null + goto_list: [] + - area_name: 选项-美服 + id_mark: false + pc_rect: + - 557 + - 481 + - 637 + - 541 + text: '' + lcs_percent: 0.5 + template_sub_dir: '' + template_id: '' + template_match_threshold: 0.7 + color_range: null + goto_list: [] + - area_name: 选项-港澳台 + id_mark: false + pc_rect: + - 1143 + - 481 + - 1223 + - 541 + text: '' + lcs_percent: 0.5 + template_sub_dir: '' + template_id: '' + template_match_threshold: 0.7 + color_range: null + goto_list: [] + - area_name: 按钮-确认 + id_mark: false + pc_rect: + - 1192 + - 686 + - 1272 + - 746 + text: '' + lcs_percent: 0.5 + template_sub_dir: '' + template_id: '' + template_match_threshold: 0.7 + color_range: null + goto_list: [] diff --git a/src/sr_od/operations/enter_game/enter_game.py b/src/sr_od/operations/enter_game/enter_game.py index 918d0b5a..c05f9aea 100644 --- a/src/sr_od/operations/enter_game/enter_game.py +++ b/src/sr_od/operations/enter_game/enter_game.py @@ -36,10 +36,13 @@ def __init__(self, ctx: SrContext, switch: bool = False): self.force_login = True self.already_login: bool = False # 是否已经登录了 + self._is_switch: bool = switch # 是否是切号场景 + self._saw_oversea_server_page: bool = False # 是否见过国际服选服页面 self.use_clipboard: bool = self.ctx.game_config.type_input_way == TypeInputWay.CLIPBOARD.value.value # 使用剪切板输入 @node_from(from_name='国服-输入账号密码') @node_from(from_name='登陆其他账号') + @node_from(from_name='选择服务器') @operation_node(name='画面识别', node_max_retry_times=60, is_start_node=True) def check_screen(self) -> OperationRoundResult: screen = self.last_screenshot @@ -90,6 +93,26 @@ def check_login_related(self, screen: MatLike) -> OperationRoundResult: result2 = self.round_by_find_and_click_area(screen, '进入游戏-选择账号', '按钮-登陆其他账号') if result2.is_success: return self.round_wait(result2.status, wait=1) + + # 国际服切号 + if self._is_oversea_server() and self._is_switch: + # 已点过登出 现在点确认 + if self._saw_oversea_server_page: + result3 = self.round_by_find_and_click_area(screen, '进入游戏-国际服选服', '按钮-登出确认') + if result3.is_success: + self._saw_oversea_server_page = False + return self.round_wait(result3.status, wait=2) + + result2 = self.round_by_find_area(screen, '进入游戏-国际服选服', '文本-开始游戏') + if result2.is_success: + self._saw_oversea_server_page = True + result3 = self.round_by_find_and_click_area(screen, '进入游戏-国际服选服', '按钮-登出') + if result3.is_success: + return self.round_wait(result3.status, wait=1) + + result2 = self.round_by_find_area(screen, '进入游戏', '国服-账号输入区域') + if result2.is_success: + return self.round_success('国服-账号密码') else: result = self.round_by_find_and_click_area(screen, '进入游戏', '文本-点击进入') if result.is_success: @@ -104,6 +127,16 @@ def check_login_related(self, screen: MatLike) -> OperationRoundResult: if result.is_success: return self.round_success(result.status, wait=1) + if self._is_oversea_server(): + result = self.round_by_find_area(screen, '进入游戏', '国服-账号输入区域') + if result.is_success: + return self.round_success('国服-账号密码') + + if self._is_oversea_server(): + result = self.round_by_find_area(screen, '进入游戏-国际服选服', '文本-开始游戏') + if result.is_success: + return self.round_success('国际服-选服') + result = self.round_by_find_and_click_area(screen, '进入游戏', '文本-开始游戏') if result.is_success: return self.round_wait(result.status, wait=1) @@ -229,6 +262,47 @@ def wait_game(self) -> OperationRoundResult: op = BackToNormalWorldPlus(self.ctx) return self.round_by_op_result(op.execute()) + @node_from(from_name='画面识别', status='国际服-选服') + @operation_node(name='选择服务器', node_max_retry_times=5) + def choose_server(self) -> OperationRoundResult: + """ + 国际服选服流程：点击选服按钮 → 选择服务器 → 确认 → 点击开始游戏 + """ + region = self.ctx.game_account_config.game_region + + server_area_map: dict[str, str] = { + 'asia': '选项-亚服', + 'eu': '选项-欧服', + 'us': '选项-美服', + 'twhkmo': '选项-港澳台', + } + area_name = server_area_map.get(region) + if area_name is None: + return self.round_fail(f'未支持的服务器区域: {region}') + result = self.round_by_click_area('进入游戏-国际服选服', '按钮-选服', + success_wait=1, retry_wait=1) + if not result.is_success: + return result + result = self.round_by_click_area('进入游戏-国际服选服', area_name, + success_wait=0.5, retry_wait=1) + if not result.is_success: + return result + result = self.round_by_click_area('进入游戏-国际服选服', '按钮-确认', + success_wait=0.5, retry_wait=1) + if not result.is_success: + return result + screen = self.screenshot() + result = self.round_by_find_and_click_area(screen, '进入游戏-国际服选服', '文本-开始游戏', + success_wait=2, retry_wait=1) + if not result.is_success: + return result + + return self.round_success() + + def _is_oversea_server(self) -> bool: + """判断当前配置是否为国际服""" + return self.ctx.game_account_config.game_region not in ('cn', 'cn_b') + def __debug(): ctx = SrContext() From f65b1ae5c08d882def3ca04493ebe81d521ac2f5 Mon Sep 17 00:00:00 2001 From: Zichao Lin Date: Mon, 20 Jul 2026 16:30:48 +0800 Subject: [PATCH 2/2] coderabbitai --- src/sr_od/operations/enter_game/enter_game.py | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/src/sr_od/operations/enter_game/enter_game.py b/src/sr_od/operations/enter_game/enter_game.py index c05f9aea..14511e07 100644 --- a/src/sr_od/operations/enter_game/enter_game.py +++ b/src/sr_od/operations/enter_game/enter_game.py @@ -98,7 +98,7 @@ def check_login_related(self, screen: MatLike) -> OperationRoundResult: if self._is_oversea_server() and self._is_switch: # 已点过登出 现在点确认 if self._saw_oversea_server_page: - result3 = self.round_by_find_and_click_area(screen, '进入游戏-国际服选服', '按钮-登出确认') + result3 = self.round_by_click_area('进入游戏-国际服选服', '按钮-登出确认') if result3.is_success: self._saw_oversea_server_page = False return self.round_wait(result3.status, wait=2) @@ -106,7 +106,7 @@ def check_login_related(self, screen: MatLike) -> OperationRoundResult: result2 = self.round_by_find_area(screen, '进入游戏-国际服选服', '文本-开始游戏') if result2.is_success: self._saw_oversea_server_page = True - result3 = self.round_by_find_and_click_area(screen, '进入游戏-国际服选服', '按钮-登出') + result3 = self.round_by_click_area('进入游戏-国际服选服', '按钮-登出') if result3.is_success: return self.round_wait(result3.status, wait=1) @@ -131,8 +131,6 @@ def check_login_related(self, screen: MatLike) -> OperationRoundResult: result = self.round_by_find_area(screen, '进入游戏', '国服-账号输入区域') if result.is_success: return self.round_success('国服-账号密码') - - if self._is_oversea_server(): result = self.round_by_find_area(screen, '进入游戏-国际服选服', '文本-开始游戏') if result.is_success: return self.round_success('国际服-选服') @@ -279,21 +277,20 @@ def choose_server(self) -> OperationRoundResult: area_name = server_area_map.get(region) if area_name is None: return self.round_fail(f'未支持的服务器区域: {region}') - result = self.round_by_click_area('进入游戏-国际服选服', '按钮-选服', - success_wait=1, retry_wait=1) + result = self.round_by_click_area('进入游戏-国际服选服', '按钮-选服') if not result.is_success: return result - result = self.round_by_click_area('进入游戏-国际服选服', area_name, - success_wait=0.5, retry_wait=1) + time.sleep(1) + result = self.round_by_click_area('进入游戏-国际服选服', area_name) if not result.is_success: return result - result = self.round_by_click_area('进入游戏-国际服选服', '按钮-确认', - success_wait=0.5, retry_wait=1) + time.sleep(0.5) + result = self.round_by_click_area('进入游戏-国际服选服', '按钮-确认') if not result.is_success: return result + time.sleep(0.5) screen = self.screenshot() - result = self.round_by_find_and_click_area(screen, '进入游戏-国际服选服', '文本-开始游戏', - success_wait=2, retry_wait=1) + result = self.round_by_find_and_click_area(screen, '进入游戏-国际服选服', '文本-开始游戏') if not result.is_success: return result