diff --git a/README.md b/README.md index a30cca0286..2fb1a1db53 100644 --- a/README.md +++ b/README.md @@ -144,10 +144,10 @@ MAA 的意思是 MAA Assistant Arknights ### API -- [C 接口](include/AsstCaller.h)：[集成示例](src/CppSample/main.cpp) -- [Python 接口](src/Python/asst.py)：[集成示例](src/Python/sample.py) +- [C 接口](include/AsstCaller.h)：[集成示例](src/Cpp/main.cpp) +- [Python 接口](src/Python/asst/asst.py)：[集成示例](src/Python/sample.py) - [Golang 接口](src/Golang/)：[集成示例](src/Golang/maa/maa.go) -- [Dart 接口](src/dart/) +- [Dart 接口](src/Dart/) - [Java 接口](src/Java/src/main/java/com/iguigui/maaj/easySample/MaaCore.java)：[集成示例](src/Java/src/main/java/com/iguigui/maaj/easySample/MaaJavaSample.java) - [Java HTTP 接口](src/Java/Readme.md) - [Rust 接口](src/Rust/src/maa_sys/)：[HTTP 接口](src/Rust) diff --git a/README_en-US.md b/README_en-US.md index 0bc363cebd..8d74928c72 100644 --- a/README_en-US.md +++ b/README_en-US.md @@ -143,10 +143,10 @@ Please refer to [Linux Tutorial](docs/en-us/2.1-LINUX_TUTORIAL.md) ### API -- [C interface](include/AsstCaller.h): [Integration Example](src/CppSample/main.cpp) -- [Python interface](src/Python/asst.py): [Integration Example](src/Python/sample.py) +- [C interface](include/AsstCaller.h): [Integration Example](src/Cpp/main.cpp) +- [Python interface](src/Python/asst/asst.py): [Integration Example](src/Python/sample.py) - [Golang interface](src/Golang/): [Integration Example](src/Golang/maa/maa.go) -- [Dart interface](src/dart/) +- [Dart interface](src/Dart/) - [Java interface](src/Java): [Integration Example](src/Java/src/main/java/com/iguigui/maaj/MaaJavaSample.java) - [Rust interface](src/Rust/src/maa_sys/): [HTTP API](src/Rust) - [HTTP interface](src/Java/Readme.md) diff --git a/README_ja-JP.md b/README_ja-JP.md index dad2e96ce6..65d81b874f 100644 --- a/README_ja-JP.md +++ b/README_ja-JP.md @@ -144,10 +144,10 @@ MAAをより良くするために開発・テストに貢献してくれたす ### API -- [Cインターフェース](include/AsstCaller.h)：[統合例](src/CppSample/main.cpp) -- [Pythonインターフェース](src/Python/asst.py)：[統合例](src/Python/sample.py) +- [Cインターフェース](include/AsstCaller.h)：[統合例](src/Cpp/main.cpp) +- [Pythonインターフェース](src/Python/asst/asst.py)：[統合例](src/Python/sample.py) - [Golangインターフェース](src/Golang/)：[統合例](src/Golang/maa/maa.go) -- [Dartインターフェース](src/dart/) +- [Dartインターフェース](src/Dart/) - [Javaインターフェース](src/Java/src/main/java/com/iguigui/maaj/easySample/MaaCore.java)：[統合例](src/Java/src/main/java/com/iguigui/maaj/easySample/MaaJavaSample.java) - [Rustインターフェース](src/Rust/src/maa_sys/)：[HTTPインターフェース](src/Rust) - [HTTPインターフェース](src/Java/Readme.md) diff --git a/README_ko-KR.md b/README_ko-KR.md index 97650f086c..41acb4e31a 100644 --- a/README_ko-KR.md +++ b/README_ko-KR.md @@ -145,10 +145,10 @@ MAA의 개선을 위한 개발/테스트에 기여해준 모든 친구들에게 ### API -- [C 인터페이스](include/AsstCaller.h): [통합 예시](src/CppSample/main.cpp) -- [Python 인터페이스](src/Python/asst.py): [통합 예시](src/Python/sample.py) +- [C 인터페이스](include/AsstCaller.h): [통합 예시](src/Cpp/main.cpp) +- [Python 인터페이스](src/Python/asst/asst.py): [통합 예시](src/Python/sample.py) - [Golang 인터페이스](src/Golang/): [통합 예시](src/Golang/maa/maa.go) -- [Dart 인터페이스](src/dart/) +- [Dart 인터페이스](src/Dart/) - [Java 인터페이스](src/Java): [통합 예시](src/Java/src/main/java/com/iguigui/maaj/MaaJavaSample.java) - [Rust 인터페이스](src/Rust/src/maa_sys/): [HTTP 인터페이스](src/Rust) - [HTTP 인터페이스](src/Java/Readme.md) diff --git a/README_zh-TW.md b/README_zh-TW.md index a17e9cef54..e41a5938b6 100644 --- a/README_zh-TW.md +++ b/README_zh-TW.md @@ -142,10 +142,10 @@ MAA 的意思是 MAA Assistant Arknights ### API -- [C 介面](include/AsstCaller.h)：[整合示例](src/CppSample/main.cpp) -- [Python 介面](src/Python/asst.py)：[整合示例](src/Python/sample.py) +- [C 介面](include/AsstCaller.h)：[整合示例](src/Cpp/main.cpp) +- [Python 介面](src/Python/asst/asst.py)：[整合示例](src/Python/sample.py) - [Golang 介面](src/Golang/)：[整合示例](src/Golang/maa/maa.go) -- [Dart 介面](src/dart/) +- [Dart 介面](src/Dart/) - [Java 介面](src/Java/src/main/java/com/iguigui/maaj/easySample/MaaCore.java)：[整合示例](src/Java/src/main/java/com/iguigui/maaj/easySample/MaaJavaSample.java) - [Rust 介面](src/Rust/src/maa_sys/)：[HTTP 介面](src/Rust) - [HTTP 介面](src/Java/Readme.md) diff --git a/src/Python/timed_start/requirements.txt b/src/Python/timed_start/requirements.txt deleted file mode 100644 index b397e36222..0000000000 --- a/src/Python/timed_start/requirements.txt +++ /dev/null @@ -1 +0,0 @@ -schedule diff --git a/src/Python/timed_start/timed_sample.py b/src/Python/timed_start/timed_sample.py deleted file mode 100644 index d296d0d378..0000000000 --- a/src/Python/timed_start/timed_sample.py +++ /dev/null @@ -1,157 +0,0 @@ -""" -function: 定时启动 maa -author: Black Cat Bon -version: v2.1 -""" - -from importlib.resources import path -import threading -import time -import schedule - -import datetime -import json -import pathlib -import sys -import re - -from asst import Asst, Message - - -def get_now_time(): - return datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S") - - -def job(): - # print("I'm running on thread %s" % threading.current_thread()) - print("现在时间：" + datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")) - - # 任务及参数请参考 docs/集成文档.md - - # asst.append_task('StartUp') - asst.append_task('Fight', { - 'report_to_penguin': True, - 'stage': '', - # 'penguin_id': '1234567' - }) - asst.append_task('Recruit', { - 'select': [4], - 'confirm': [3, 4], - 'times': 4 - }) - asst.append_task('Infrast', { - 'facility': [ - "Mfg", "Trade", "Control", "Power", "Reception", "Office", "Dorm" - ], - 'drones': "Money" - }) - asst.append_task('Visit') - asst.append_task('Mall', { - 'shopping': True, - 'buy_first': ['招聘许可', '龙门币'], - 'blacklist': ['家具', '碳'], - }) - asst.append_task('Award') - - asst.start() - - -def run_threaded(job_func): - job_thread = threading.Thread(target=job_func) - job_thread.start() - - -def get_target_time(input_time): - matchObj = re.match('\d\d:\d\d', input_time) - if matchObj: - target_time = input_time - else: - while True: - input_str = input( - 'Invalid time format, please input again!\n For example, 20:00 \n> ') - if (input_str == 'exit()'): - sys.exit() - - matchObj = re.match('\d\d:\d\d', input_str) - - if matchObj: - break - else: - print('Please input a valid time!') - - target_time = input_str - - return target_time - - -def get_target_port(input_port): - matchObj = re.match('\d\d\d\d', input_port) - if matchObj: - target_time = input_port - else: - while True: - input_str = input( - 'Invalid port format, please input again!\n For example, 5565 \n> ') - if (input_str == 'exit()'): - sys.exit() - - matchObj = re.match('\d\d\d\d', input_str) - - if matchObj: - break - else: - print('Please input a valid time!') - - target_time = input_str - - return target_time - - -if __name__ == "__main__": - global target_time - global asst - - if (len(sys.argv) == 1): - target_time = '20:00' - port = '5555' - elif len(sys.argv) == 2: - target_time = get_target_time(sys.argv[1]) - port = '5555' - elif len(sys.argv) == 3: - target_time = get_target_time(sys.argv[1]) - port = get_target_port(sys.argv[2]) - - # asst 的回调 - @Asst.CallBackType - def my_callback(msg, details, arg): - m = Message(msg) - d = json.loads(details.decode('utf-8')) - - print(m, d, arg) - - # 请设置为存放 dll 文件及资源的路径 - path = pathlib.Path.cwd().parent - Asst.load(path) - - # 若需要获取详细执行信息，请传入 callback 参数 - # 例如 asst = Asst(callback=my_callback) - asst = Asst() - - print('version', asst.get_version()) - - # 请自行配置 adb 环境变量，或修改为 adb 可执行程序的路径 - if asst.connect('adb.exe', '127.0.0.1:' + port): - print('连接成功') - else: - print('连接失败') - exit() - - schedule.every().day.at(target_time).do(run_threaded, job) - # schedule.every(30).seconds.do(run_threaded, job) - print("定时任务已设置，将于每天 " + target_time + " 运行") - - # print('下次定时任务开始于：' + target_time) - - while True: - schedule.run_pending() - time.sleep(1)