Skip to content

fix: IIIA and format #500

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kuainx merged 1 commit into from
Jun 30, 2026
Merged

fix: IIIA and format #500

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion autowsgr/combat/actions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ def click_speed_up(device: AndroidController, *, battle_mode: bool = False) -> N
coords = Coords.SPEED_UP_BATTLE if battle_mode else Coords.SPEED_UP_NORMAL

# 由于这个点击之后，马上就会进行画面识别，为了保证画面被正确识别，这里不加延迟
device.click(*coords,delay=False)
device.click(*coords, delay=False)


def click_skip_missile_animation(device: AndroidController) -> None:
Expand Down
64 changes: 38 additions & 26 deletions autowsgr/emulator/controller/scrcpy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
from typing import TYPE_CHECKING

from autowsgr.infra import EmulatorConfig, EmulatorConnectionError
from autowsgr.infra.config import OPERATION_DELAY_MIN, OPERATION_DELAY_MAX
from autowsgr.infra.config import OPERATION_DELAY_MAX, OPERATION_DELAY_MIN
from autowsgr.infra.logger import caller_info, get_logger

from ..detector import _find_adb, detect_emulators, prompt_user_select, resolve_serial
Expand Down Expand Up @@ -430,10 +430,12 @@ def click(self, x: float, y: float, *, delay: bool = True) -> None:
)
dev.shell(f'input tap {px} {py}')
if delay: # True 才走延迟
time.sleep(random.uniform(
min(OPERATION_DELAY_MIN, OPERATION_DELAY_MAX),
max(OPERATION_DELAY_MIN, OPERATION_DELAY_MAX),
))
time.sleep(
random.uniform(
min(OPERATION_DELAY_MIN, OPERATION_DELAY_MAX),
max(OPERATION_DELAY_MIN, OPERATION_DELAY_MAX),
)
)

def swipe(
self,
Expand All @@ -443,7 +445,7 @@ def swipe(
y2: float,
duration: float = 0.5,
*,
delay: bool = True
delay: bool = True,
) -> None:
dev = self._require_device()
w, h = self._resolution
Expand All @@ -467,10 +469,12 @@ def swipe(

# 增加延迟，改动同 click_delay
if delay: # True 才走延迟
time.sleep(random.uniform(
min(OPERATION_DELAY_MIN, OPERATION_DELAY_MAX),
max(OPERATION_DELAY_MIN, OPERATION_DELAY_MAX),
))
time.sleep(
random.uniform(
min(OPERATION_DELAY_MIN, OPERATION_DELAY_MAX),
max(OPERATION_DELAY_MIN, OPERATION_DELAY_MAX),
)
)

def long_tap(self, x: float, y: float, duration: float = 1.0) -> None:
self.swipe(x, y, x, y, duration=duration)
Expand All @@ -483,10 +487,12 @@ def key_event(self, key_code: int, *, delay: bool = True) -> None:

# 增加延迟，改动同 click_delay
if delay: # True 才走延迟
time.sleep(random.uniform(
min(OPERATION_DELAY_MIN, OPERATION_DELAY_MAX),
max(OPERATION_DELAY_MIN, OPERATION_DELAY_MAX),
))
time.sleep(
random.uniform(
min(OPERATION_DELAY_MIN, OPERATION_DELAY_MAX),
max(OPERATION_DELAY_MIN, OPERATION_DELAY_MAX),
)
)

def text(self, content: str, *, delay: bool = True) -> None:
dev = self._require_device()
Expand All @@ -495,10 +501,12 @@ def text(self, content: str, *, delay: bool = True) -> None:

# 增加延迟，改动同 click_delay
if delay: # True 才走延迟
time.sleep(random.uniform(
min(OPERATION_DELAY_MIN, OPERATION_DELAY_MAX),
max(OPERATION_DELAY_MIN, OPERATION_DELAY_MAX),
))
time.sleep(
random.uniform(
min(OPERATION_DELAY_MIN, OPERATION_DELAY_MAX),
max(OPERATION_DELAY_MIN, OPERATION_DELAY_MAX),
)
)

# ── 应用管理 ──

Expand All @@ -509,10 +517,12 @@ def start_app(self, package: str, *, delay: bool = True) -> None:

# 增加延迟，改动同 click_delay
if delay: # True 才走延迟
time.sleep(random.uniform(
min(OPERATION_DELAY_MIN, OPERATION_DELAY_MAX),
max(OPERATION_DELAY_MIN, OPERATION_DELAY_MAX),
))
time.sleep(
random.uniform(
min(OPERATION_DELAY_MIN, OPERATION_DELAY_MAX),
max(OPERATION_DELAY_MIN, OPERATION_DELAY_MAX),
)
)

def stop_app(self, package: str, *, delay: bool = True) -> None:
dev = self._require_device()
Expand All @@ -521,10 +531,12 @@ def stop_app(self, package: str, *, delay: bool = True) -> None:

# 增加延迟，改动同 click_delay
if delay: # True 才走延迟
time.sleep(random.uniform(
min(OPERATION_DELAY_MIN, OPERATION_DELAY_MAX),
max(OPERATION_DELAY_MIN, OPERATION_DELAY_MAX),
))
time.sleep(
random.uniform(
min(OPERATION_DELAY_MIN, OPERATION_DELAY_MAX),
max(OPERATION_DELAY_MIN, OPERATION_DELAY_MAX),
)
)

def is_app_running(self, package: str) -> bool:
try:
Expand Down
7 changes: 6 additions & 1 deletion autowsgr/vision/ocr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,12 @@

# ── 结果数据类 ──

REPLACE_RULE: dict[str, str] = {'鲍鱼': '鲃鱼', '296': 'M-296', '维内托': '维托里奥·维内托'}
REPLACE_RULE: dict[str, str] = {
'鲍鱼': '鲃鱼',
'296': 'M-296',
'维内托': '维托里奥·维内托',
'IA': 'IIIA',
}


# ── 舰船名文本补丁管线 ──
Expand Down
Loading