Merge pull request #78 from sanmusen214/dev

Fix global recg 'S' icon
sanmusen214 · Jul 24, 2024 · 429d568 · 429d568
2 parents a5e8866 + eb3d8c1
commit 429d568
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/modules/AllTask/InQuest/PushQuest.py b/modules/AllTask/InQuest/PushQuest.py
@@ -143,7 +143,7 @@ def on_run(self) -> None:
                     return
             # ===========正式开始推图===================
             # 看到弹窗，ocr是否有S
-            ocr_s = ocr_area((327 + offsetx, 257 + offsety), (353 + offsetx, 288 + offsety))
+            ocr_s = ocr_area((327 + offsetx, 257 + offsety), (370 + offsetx, 288 + offsety))
             # 如果有简易攻略
             if has_easy_tab:
                 if self.is_normal:

diff --git a/modules/configs/MyConfig.py b/modules/configs/MyConfig.py
@@ -10,7 +10,7 @@ class MyConfigger:
     """
     维护config字典，包含软件config，用户任务config，语言包
     """
-    NOWVERSION="1.5.3"
+    NOWVERSION="1.5.4"
     USER_CONFIG_FOLDER="./BAAH_CONFIGS"
     SOFTWARE_CONFIG_FOLDER="./DATA/CONFIGS"
     LANGUAGE_PACKAGE_FOLDER="./DATA/i18n"

diff --git a/package.py b/package.py
@@ -130,7 +130,9 @@ def package_remove_folder(path):
     break
 
 package_copyfolder('./tools/adb', './dist/BAAH/tools/adb')
-package_copyfolder('./tools/pponnxcr', './dist/BAAH/_internal/pponnxcr')
+
+# pytinstall的时候已经把pponnxcr和nicegui文件拷贝进去了
+# package_copyfolder('./tools/pponnxcr', './dist/BAAH/_internal/pponnxcr')
 
 # 挪i18n进去创建下DATA文件夹
 package_copyfolder("./DATA/i18n", "./dist/BAAH/DATA/i18n")