ok-script 0.0.35__tar.gz → 0.0.36__tar.gz

{ok-script-0.0.35 → ok-script-0.0.36}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ok-script
-Version: 0.0.35
+Version: 0.0.36
 Summary: Automation with Computer Vision for Python
 Home-page: https://github.com/ok-oldking/ok-script
 Author: ok-oldking
@@ -33,37 +33,14 @@ Requires-Dist: opencv-python==4.9.0.80
 5. 支持Python3.7以上版本
 6. 学习成本低, 自定义函数少, 也可以直接使用opencv, RapidOCR等api
 
-## Example Usage
 
-Basically you only need to write the Tasks and Scenes, the autoui framework will do all the heavy lifting.
-[genshin/main.py](genshin/main.py)
+## 目前有两个已完成项目：
+基于OCR，白荆回廊自动凹技能，可以连续跑几个小时的自动脚本[https://github.com/ok-oldking/ok-baijing](https://github.com/ok-oldking/ok-baijing)
 
-```python
-# Defining game scenes to handle different in-game situations through automated tasks
-task_executor.scenes.extend([
-    WorldScene(interaction, feature_set),
-    StartScene(interaction, feature_set),
-    MonthlyCardScene(interaction, feature_set),
-    DialogCloseButtonScene(interaction, feature_set),
-    DialogChoicesScene(interaction, feature_set),
-    DialogPlayingScene(interaction, feature_set),
-    BlackDialogScene(interaction, feature_set),
-])
+触发式任务，原神自动拾取， 跳过剧情等[https://github.com/ok-oldking/ok-genshin](https://github.com/ok-oldking/ok-genshin)
 
-# Adding automated tasks for gameplay, such as dialog navigation and item collection
-task_executor.tasks.extend([
-    AutoPlayDialogTask(interaction, feature_set),  # speeding up the dialogs
-    AutoChooseDialogTask(interaction, feature_set),  # choose dialog options
-    AutoPickTask(interaction, feature_set),  # pickup items in world scene
-    AutoLoginTask(interaction, feature_set),  # auto login and claim rewards
-])
-```
 
 ## Scenes
 
 ## Tasks
 
-## Project Structure
-
-- `autoui`: Framework code.
-- `genshin`: Example Genshin Impact automation project

ok-script-0.0.36/README.md

@@ -0,0 +1,24 @@
+# ok-script
+
+类似于AirScript, 使用Python
+
+## 优势
+
+1. 开源免费, 依赖库均为开源方案, 支持pip install任何第三方库
+2. 代码和打包流程完全由开发者控制, 不会上传服务器, 没有安全性隐患, 不容易被侦测和识别
+3. 一套代码即可支持Windows安卓模拟器/ADB连接的虚拟机, Windows客户端游戏, 安卓系统直接运行(开发中)
+4. 支持GUI以及Console运行, 也可以完全自己开发GUI
+5. 支持Python3.7以上版本
+6. 学习成本低, 自定义函数少, 也可以直接使用opencv, RapidOCR等api
+
+
+## 目前有两个已完成项目：
+基于OCR，白荆回廊自动凹技能，可以连续跑几个小时的自动脚本[https://github.com/ok-oldking/ok-baijing](https://github.com/ok-oldking/ok-baijing)
+
+触发式任务，原神自动拾取， 跳过剧情等[https://github.com/ok-oldking/ok-genshin](https://github.com/ok-oldking/ok-genshin)
+
+
+## Scenes
+
+## Tasks
+

{ok-script-0.0.35 → ok-script-0.0.36}/ok/capture/HwndWindow.py

@@ -1,5 +1,6 @@
 # original https://github.com/dantmnf & https://github.com/hakaboom/winAuto
 import ctypes
+import os
 import re
 import threading
 import time
@@ -194,7 +195,10 @@ def get_exe_name_by_hwnd(hwnd):
         exe_name = ctypes.create_unicode_buffer(1024)
         GetModuleFileNameExW(h_process, None, exe_name, 1024)
 
+        # Extract the executable name from the full path
+        exe_only_name = os.path.basename(exe_name.value)
+
         # Close the process handle
         CloseHandle(h_process)
 
-        return exe_name.value
+        return exe_only_name

{ok-script-0.0.35 → ok-script-0.0.36}/ok/capture/adb/DeviceManager.py

@@ -54,7 +54,7 @@ class DeviceManager:
                     except Exception as e:
                         logger.error("adb connect error", e)
             self._connect_all = True
-            logger.debug(f'connect_all {self.adb.device_list()}')
+            logger.debug(f'connect_all')
 
     def get_devices(self):
         return list(self.device_dict.values())

{ok-script-0.0.35 → ok-script-0.0.36}/ok/gui/start/StartCard.py

@@ -80,12 +80,12 @@ class StartCard(SettingCard):
             if not ok.gui.executor.connected():
                 self.status_bar.setTitle(self.tr("Game Window Disconnected"))
                 self.status_bar.setState(True)
-            elif task := ok.gui.executor.current_task:
-                self.status_bar.setTitle(self.tr("Running") + ": " + task.name)
-                self.status_bar.setState(False)
             elif active_trigger_task_count := ok.gui.executor.active_trigger_task_count():
                 self.status_bar.setTitle(
-                    self.tr("Running") + ": " + str(active_trigger_task_count) + self.tr("triggers"))
+                    self.tr("Running") + ": " + str(active_trigger_task_count) + ' ' + self.tr("Trigger Tasks"))
+                self.status_bar.setState(False)
+            elif task := ok.gui.executor.current_task:
+                self.status_bar.setTitle(self.tr("Running") + ": " + task.name)
                 self.status_bar.setState(False)
             else:
                 self.status_bar.setTitle(self.tr("Waiting for task to be enabled"))

{ok-script-0.0.35 → ok-script-0.0.36}/ok/task/BaseTask.py

@@ -93,6 +93,9 @@ class BaseTask(ExecutorOperation):
     def info_set(self, key, value):
         self.info[key] = value
 
+    def info_add(self, key, count=1):
+        self.info[key] = self.info.get(key, 0) + count
+
     def load_config(self, folder):
         self.config = Config(self.default_config, folder, self.__class__.__name__)
 

{ok-script-0.0.35 → ok-script-0.0.36}/ok_script.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ok-script
-Version: 0.0.35
+Version: 0.0.36
 Summary: Automation with Computer Vision for Python
 Home-page: https://github.com/ok-oldking/ok-script
 Author: ok-oldking
@@ -33,37 +33,14 @@ Requires-Dist: opencv-python==4.9.0.80
 5. 支持Python3.7以上版本
 6. 学习成本低, 自定义函数少, 也可以直接使用opencv, RapidOCR等api
 
-## Example Usage
 
-Basically you only need to write the Tasks and Scenes, the autoui framework will do all the heavy lifting.
-[genshin/main.py](genshin/main.py)
+## 目前有两个已完成项目：
+基于OCR，白荆回廊自动凹技能，可以连续跑几个小时的自动脚本[https://github.com/ok-oldking/ok-baijing](https://github.com/ok-oldking/ok-baijing)
 
-```python
-# Defining game scenes to handle different in-game situations through automated tasks
-task_executor.scenes.extend([
-    WorldScene(interaction, feature_set),
-    StartScene(interaction, feature_set),
-    MonthlyCardScene(interaction, feature_set),
-    DialogCloseButtonScene(interaction, feature_set),
-    DialogChoicesScene(interaction, feature_set),
-    DialogPlayingScene(interaction, feature_set),
-    BlackDialogScene(interaction, feature_set),
-])
+触发式任务，原神自动拾取， 跳过剧情等[https://github.com/ok-oldking/ok-genshin](https://github.com/ok-oldking/ok-genshin)
 
-# Adding automated tasks for gameplay, such as dialog navigation and item collection
-task_executor.tasks.extend([
-    AutoPlayDialogTask(interaction, feature_set),  # speeding up the dialogs
-    AutoChooseDialogTask(interaction, feature_set),  # choose dialog options
-    AutoPickTask(interaction, feature_set),  # pickup items in world scene
-    AutoLoginTask(interaction, feature_set),  # auto login and claim rewards
-])
-```
 
 ## Scenes
 
 ## Tasks
 
-## Project Structure
-
-- `autoui`: Framework code.
-- `genshin`: Example Genshin Impact automation project

{ok-script-0.0.35 → ok-script-0.0.36}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setuptools.setup(
     name="ok-script",
-    version="0.0.35",
+    version="0.0.36",
     author="ok-oldking",
     author_email="firedcto@gmail.com",
     description="Automation with Computer Vision for Python",

ok-script-0.0.35/README.md

@@ -1,47 +0,0 @@
-# ok-script
-
-类似于AirScript, 使用Python
-
-## 优势
-
-1. 开源免费, 依赖库均为开源方案, 支持pip install任何第三方库
-2. 代码和打包流程完全由开发者控制, 不会上传服务器, 没有安全性隐患, 不容易被侦测和识别
-3. 一套代码即可支持Windows安卓模拟器/ADB连接的虚拟机, Windows客户端游戏, 安卓系统直接运行(开发中)
-4. 支持GUI以及Console运行, 也可以完全自己开发GUI
-5. 支持Python3.7以上版本
-6. 学习成本低, 自定义函数少, 也可以直接使用opencv, RapidOCR等api
-
-## Example Usage
-
-Basically you only need to write the Tasks and Scenes, the autoui framework will do all the heavy lifting.
-[genshin/main.py](genshin/main.py)
-
-```python
-# Defining game scenes to handle different in-game situations through automated tasks
-task_executor.scenes.extend([
-    WorldScene(interaction, feature_set),
-    StartScene(interaction, feature_set),
-    MonthlyCardScene(interaction, feature_set),
-    DialogCloseButtonScene(interaction, feature_set),
-    DialogChoicesScene(interaction, feature_set),
-    DialogPlayingScene(interaction, feature_set),
-    BlackDialogScene(interaction, feature_set),
-])
-
-# Adding automated tasks for gameplay, such as dialog navigation and item collection
-task_executor.tasks.extend([
-    AutoPlayDialogTask(interaction, feature_set),  # speeding up the dialogs
-    AutoChooseDialogTask(interaction, feature_set),  # choose dialog options
-    AutoPickTask(interaction, feature_set),  # pickup items in world scene
-    AutoLoginTask(interaction, feature_set),  # auto login and claim rewards
-])
-```
-
-## Scenes
-
-## Tasks
-
-## Project Structure
-
-- `autoui`: Framework code.
-- `genshin`: Example Genshin Impact automation project