diff --git a/module/map/map_fleet_preparation.py b/module/map/map_fleet_preparation.py index d8cfcae9b4..7b74e13e2f 100644 --- a/module/map/map_fleet_preparation.py +++ b/module/map/map_fleet_preparation.py @@ -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): """ diff --git a/submodule/AlasMaaBridge/module/asst/asst.py b/submodule/AlasMaaBridge/module/asst/asst.py index b5eafeb81a..d9fbe54f9c 100644 --- a/submodule/AlasMaaBridge/module/asst/asst.py +++ b/submodule/AlasMaaBridge/module/asst/asst.py @@ -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