Skip to content
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.

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

Upd: map_fleet_preparation.py asst.py #4278

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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 module/map/map_fleet_preparation.py
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ def bar_opened(self):
# Check the brightness of the rightest column of the bar area.
luma = rgb2gray(self.main.image_crop(self._bar.button, copy=False))[:, -1]
# FLEET_PREPARATION is about 146~155
return np.sum(luma > 168) / luma.size > 0.5
return np.sum(luma > 168) / luma.size > 0.1

def ensure_to_be(self, index):
"""
Expand Down
4 changes: 2 additions & 2 deletions submodule/AlasMaaBridge/module/asst/asst.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@ def load(path: Union[pathlib.Path, str], incremental_path: Optional[Union[pathli
if platform_type == 'windows':
lib_import_func = ctypes.WinDLL
# Todo: MAA v4.12.0正式版更新之后删除
# 手动加载onnxruntime.dll以避免部分版本的python错误地从System32加载旧版本
# 手动加载onnxruntime_maa.dll以避免部分版本的python错误地从System32加载旧版本
try:
lib_import_func(str(pathlib.Path(path) / 'onnxruntime.dll'))
lib_import_func(str(pathlib.Path(path) / 'onnxruntime_maa.dll'))
except Exception as e:
print(e)
pass
Expand Down