From 14d6d1289d25c106a757aaf1ecfe1ee6be26c785 Mon Sep 17 00:00:00 2001 From: vcfch843875 <151947163+vcfch843875@users.noreply.github.com> Date: Sat, 12 Oct 2024 23:00:48 +0800 Subject: [PATCH 1/2] Update map_fleet_preparation.py MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修改以解决新号开荒时的编队识别问题 --- module/map/map_fleet_preparation.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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): """ From 6c7f9c91b3cc6371e7880373786aaac51bec9839 Mon Sep 17 00:00:00 2001 From: vcfch843875 <151947163+vcfch843875@users.noreply.github.com> Date: Sat, 12 Oct 2024 23:17:20 +0800 Subject: [PATCH 2/2] Update asst.py MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 解决与MAA的连接问题 --- submodule/AlasMaaBridge/module/asst/asst.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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