diff --git a/.github/workflows/dev-build-mac.yml b/.github/workflows/dev-build-mac.yml index bfb5fac60a..0ca22de420 100644 --- a/.github/workflows/dev-build-mac.yml +++ b/.github/workflows/dev-build-mac.yml @@ -5,8 +5,8 @@ on: branches-ignore: - master paths: - - 'src/MeoAssistant/**' - - 'src/MeoAsstGui/**' + - 'src/MaaCore/**' + - 'src/MaaWpfGui/**' - 'src/MeoAsstMac/**' - '3rdparty/**' - 'include/**' @@ -16,8 +16,8 @@ on: branches: - dev paths: - - 'src/MeoAssistant/**' - - 'src/MeoAsstGui/**' + - 'src/MaaCore/**' + - 'src/MaaWpfGui/**' - 'src/MeoAsstMac/**' - '3rdparty/**' - 'include/**' @@ -41,11 +41,11 @@ jobs: run: | brew update --preinstall brew install ninja range-v3 - - name: Configure MeoAssistant + - name: Configure MaaCore run: | mkdir build && cd build cmake .. -GNinja -DBUILD_XCFRAMEWORK=ON -DBUILD_UNIVERSAL=ON - - name: Build libMeoAssistant + - name: Build libMaaCore run: cmake --build build - name: Build MeoAsstMac working-directory: src/MeoAsstMac diff --git a/.github/workflows/dev-build-win.yml b/.github/workflows/dev-build-win.yml index f6aec80190..134aae8fbe 100644 --- a/.github/workflows/dev-build-win.yml +++ b/.github/workflows/dev-build-win.yml @@ -21,8 +21,8 @@ on: branches-ignore: - master paths: - - 'src/MeoAssistant/**' - - 'src/MeoAsstGui/**' + - 'src/MaaCore/**' + - 'src/MaaWpfGui/**' - '3rdparty/**' - 'tools/MaaBuilder/**' - tools/MaaBuilder.sln @@ -33,8 +33,8 @@ on: branches: - dev paths: - - 'src/MeoAssistant/**' - - 'src/MeoAsstGui/**' + - 'src/MaaCore/**' + - 'src/MaaWpfGui/**' - '3rdparty/**' - 'tools/MaaBuilder/**' - tools/MaaBuilder.sln diff --git a/.github/workflows/release-maa-mac.yml b/.github/workflows/release-maa-mac.yml index 7504760c36..a0815485ba 100644 --- a/.github/workflows/release-maa-mac.yml +++ b/.github/workflows/release-maa-mac.yml @@ -26,11 +26,11 @@ jobs: run: | brew update --preinstall brew install ninja range-v3 create-dmg - - name: Configure MeoAssistant + - name: Configure MaaCore run: | mkdir build && cd build cmake .. -GNinja -DCMAKE_BUILD_TYPE=Release -DBUILD_XCFRAMEWORK=ON -DBUILD_UNIVERSAL=ON - - name: Build libMeoAssistant + - name: Build libMaaCore run: cmake --build build - name: Build MeoAsstMac working-directory: src/MeoAsstMac diff --git a/.gitmodules b/.gitmodules index 198c4a26ee..5379e7a573 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "test"] path = test url = https://github.com/MaaAssistantArknights/MaaTestSet.git -[submodule "src/MeoAsstMac"] - path = src/MeoAsstMac - url = https://github.com/MaaAssistantArknights/MeoAsstMac.git +[submodule "src/MaaMacGui"] + path = src/MaaMacGui + url = https://github.com/MaaAssistantArknights/MaaMacGui.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 80db45af79..8990bc84c3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,32 +39,32 @@ if (MSVC) endif () include_directories(include) -include_directories(src/MeoAssistant) +include_directories(src/MaaCore) -file(GLOB_RECURSE maa_src src/MeoAssistant/*.cpp) +file(GLOB_RECURSE maa_src src/MaaCore/*.cpp) -add_library(MeoAssistant SHARED ${maa_src}) +add_library(MaaCore SHARED ${maa_src}) if (MSVC) find_library(FastDeploy_LIB NAMES fastdeploy PATHS 3rdparty/lib) find_library(OpenCV NAMES opencv_world453 PATHS 3rdparty/lib) find_library(ZLIB NAMES zlibstatic PATHS 3rdparty/lib) - target_link_libraries(MeoAssistant ws2_32 ${OpenCV} ${FastDeploy_LIB} ${ZLIB}) - target_include_directories(MeoAssistant PRIVATE 3rdparty/include) + target_link_libraries(MaaCore ws2_32 ${OpenCV} ${FastDeploy_LIB} ${ZLIB}) + target_include_directories(MaaCore PRIVATE 3rdparty/include) else () find_package(ZLIB REQUIRED) - target_include_directories(MeoAssistant PRIVATE ${ZLIB_INCLUDE_DIRS}) - target_link_libraries(MeoAssistant ${ZLIB_LIBRARY}) + target_include_directories(MaaCore PRIVATE ${ZLIB_INCLUDE_DIRS}) + target_link_libraries(MaaCore ${ZLIB_LIBRARY}) if (CMAKE_CXX_COMPILER_ID MATCHES ".*Clang") find_package(range-v3 REQUIRED) - target_link_libraries(MeoAssistant range-v3::range-v3) + target_link_libraries(MaaCore range-v3::range-v3) endif () if (APPLE) set(CMAKE_OSX_DEPLOYMENT_TARGET 12.0) add_subdirectory(3rdparty/VisionOCR) - target_link_libraries(MeoAssistant + target_link_libraries(MaaCore vnocr "-framework Accelerate" ) @@ -73,18 +73,18 @@ else () set(OpenCV_DIR "/") endif () find_package(OpenCV REQUIRED PATHS ${OpenCV_DIR} NO_DEFAULT_PATH) - target_include_directories(MeoAssistant PRIVATE ${OpenCV_INCLUDE_DIRS}) - target_link_libraries(MeoAssistant ${OpenCV_LIBS}) + target_include_directories(MaaCore PRIVATE ${OpenCV_INCLUDE_DIRS}) + target_link_libraries(MaaCore ${OpenCV_LIBS}) set(OPENCV_DIRECTORY ${OpenCV_DIR}) include(${FASTDEPLOY_INSTALL_DIR}/FastDeploy.cmake) include_directories(${FASTDEPLOY_INCS}) - target_link_libraries(MeoAssistant ${FDLIB}) - target_link_libraries(MeoAssistant ${PADDLE2ONNX_LIB}) - target_link_libraries(MeoAssistant ${ORT_LIB}) + target_link_libraries(MaaCore ${FDLIB}) + target_link_libraries(MaaCore ${PADDLE2ONNX_LIB}) + target_link_libraries(MaaCore ${ORT_LIB}) - install(TARGETS MeoAssistant DESTINATION .) + install(TARGETS MaaCore DESTINATION .) install(DIRECTORY ${FASTDEPLOY_INSTALL_DIR}/lib/ DESTINATION . USE_SOURCE_PERMISSIONS) install(DIRECTORY ${FASTDEPLOY_INSTALL_DIR}/third_libs/install/paddle2onnx/lib/ DESTINATION . USE_SOURCE_PERMISSIONS) install(DIRECTORY ${ORT_LIB_PATH}/ DESTINATION . USE_SOURCE_PERMISSIONS) @@ -101,18 +101,18 @@ endif () if (BUILD_TEST) add_executable(test src/CppSample/main.cpp) - target_link_libraries(test MeoAssistant) + target_link_libraries(test MaaCore) endif (BUILD_TEST) if (BUILD_XCFRAMEWORK) - add_custom_command(OUTPUT MeoAssistant.xcframework - COMMAND rm -rf MeoAssistant.xcframework - COMMAND xcodebuild -create-xcframework -library libMeoAssistant.dylib -headers ${PROJECT_SOURCE_DIR}/include -output MeoAssistant.xcframework - DEPENDS MeoAssistant + add_custom_command(OUTPUT MaaCore.xcframework + COMMAND rm -rf MaaCore.xcframework + COMMAND xcodebuild -create-xcframework -library libMaaCore.dylib -headers ${PROJECT_SOURCE_DIR}/include -output MaaCore.xcframework + DEPENDS MaaCore ) add_custom_target(MaaXCFramework ALL - DEPENDS MeoAssistant MeoAssistant.xcframework + DEPENDS MaaCore MaaCore.xcframework ) endif (BUILD_XCFRAMEWORK) diff --git a/MAA.sln b/MAA.sln index c8764f6b11..8d63c45c25 100644 --- a/MAA.sln +++ b/MAA.sln @@ -5,13 +5,13 @@ VisualStudioVersion = 17.2.32616.157 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{6C4B8D52-51D1-45F8-AAEC-808035443FD6}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MaaWpfGui", "src\MeoAsstGui\MaaWpfGui.csproj", "{FFDC8F49-8EAF-45BE-B0A8-7EF0DB9875A2}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MaaWpfGui", "src\MaaWpfGui\MaaWpfGui.csproj", "{FFDC8F49-8EAF-45BE-B0A8-7EF0DB9875A2}" ProjectSection(ProjectDependencies) = postProject {362D1E30-F5AE-4279-9985-65C27B3BA300} = {362D1E30-F5AE-4279-9985-65C27B3BA300} {F860C043-4D86-41B6-A97E-4A75C9A6C4EC} = {F860C043-4D86-41B6-A97E-4A75C9A6C4EC} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MaaCore", "src\MeoAssistant\MaaCore.vcxproj", "{362D1E30-F5AE-4279-9985-65C27B3BA300}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MaaCore", "src\MaaCore\MaaCore.vcxproj", "{362D1E30-F5AE-4279-9985-65C27B3BA300}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{11F02235-5785-408B-9651-8A4B41FF36F4}" ProjectSection(SolutionItems) = preProject diff --git a/README.md b/README.md index a1396c0095..1328e9af50 100644 --- a/README.md +++ b/README.md @@ -147,7 +147,7 @@ MAA 的意思是 MAA Assistant Arknights - [Python 接口](src/Python/asst.py)：[集成示例](src/Python/sample.py) - [Golang 接口](src/Golang/MaaAssistantArknights/)：[集成示例](src/Golang/MaaAssistantArknights/maa/maa.go) - [Dart 接口](src/dart/) -- [Java 接口](src/Java/Maaj/src/main/java/com/iguigui/maaj/easySample/MeoAssistant.java)：[集成示例](src/Java/Maaj/src/main/java/com/iguigui/maaj/easySample/MaaJavaSample.java) +- [Java 接口](src/Java/Maaj/src/main/java/com/iguigui/maaj/easySample/MaaCore.java)：[集成示例](src/Java/Maaj/src/main/java/com/iguigui/maaj/easySample/MaaJavaSample.java) - [Java HTTP 接口](src/Java/Maaj/Readme.md) - [Rust 接口](src/Rust/src/maa_sys/)：[HTTP 接口](src/Rust) - [集成文档](docs/3.1-集成文档.md) diff --git a/README_ja-JP.md b/README_ja-JP.md index 8408d13667..6d4687d823 100644 --- a/README_ja-JP.md +++ b/README_ja-JP.md @@ -148,7 +148,7 @@ MAAをより良くするために開発・テストに貢献してくれたす - [Pythonインターフェース](src/Python/asst.py)：[統合例](src/Python/sample.py) - [Golangインターフェース](src/Golang/MaaAssistantArknights/)：[統合例](src/Golang/MaaAssistantArknights/maa/maa.go) - [Dartインターフェース](src/dart/) -- [Javaインターフェース](src/Java/Maaj/src/main/java/com/iguigui/maaj/easySample/MeoAssistant.java)：[統合例](src/Java/Maaj/src/main/java/com/iguigui/maaj/easySample/MaaJavaSample.java) +- [Javaインターフェース](src/Java/Maaj/src/main/java/com/iguigui/maaj/easySample/MaaCore.java)：[統合例](src/Java/Maaj/src/main/java/com/iguigui/maaj/easySample/MaaJavaSample.java) - [Rustインターフェース](src/Rust/src/maa_sys/)：[HTTPインターフェース](src/Rust) - [HTTPインターフェース](src/Java/Maaj/Readme.md) - [統合ドキュメント](docs/ja-jp/3.1-統合ドキュメント.md) diff --git a/README_zh-TW.md b/README_zh-TW.md index 56a43981cd..d400d4f798 100644 --- a/README_zh-TW.md +++ b/README_zh-TW.md @@ -146,7 +146,7 @@ MAA 的意思是 MAA Assistant Arknights - [Python 介面](src/Python/asst.py)：[整合示例](src/Python/sample.py) - [Golang 介面](src/Golang/MaaAssistantArknights/)：[整合示例](src/Golang/MaaAssistantArknights/maa/maa.go) - [Dart 介面](src/dart/) -- [Java 介面](src/Java/Maaj/src/main/java/com/iguigui/maaj/easySample/MeoAssistant.java)：[整合示例](src/Java/Maaj/src/main/java/com/iguigui/maaj/easySample/MaaJavaSample.java) +- [Java 介面](src/Java/Maaj/src/main/java/com/iguigui/maaj/easySample/MaaCore.java)：[整合示例](src/Java/Maaj/src/main/java/com/iguigui/maaj/easySample/MaaJavaSample.java) - [Rust 介面](src/Rust/src/maa_sys/)：[HTTP 介面](src/Rust) - [HTTP 介面](src/Java/Maaj/Readme.md) - [整合文件](docs/zh-tw/3.1-集成文件.md) diff --git a/docs/2.1-Linux编译教程.md b/docs/2.1-Linux编译教程.md index 580538e3ee..e121adaf0e 100644 --- a/docs/2.1-Linux编译教程.md +++ b/docs/2.1-Linux编译教程.md @@ -27,12 +27,12 @@ sudo ldconfig 其他发行版若源中没有 zlib, 也可尝试通过 [源码](https://github.com/madler/zlib) 编译 -## MeoAssistant +## MaaCore 1. 直接拷贝上面编译的第三方库到 `3rdparty/lib` 或者 手动修改 `CMakeLists.txt` 指定第三方库路径 2. `3rdparty/include/opencv` 中的头文件是 `4.5.3` 版本的，若是使用其他版本，请注意头文件冲突问题（直接将你的 `opencv` 头文件覆盖过去就好） 3. 安装 `adb` -4. 复制资源文件到 `libMeoAssistant.so` 同一目录下 +4. 复制资源文件到 `libMaaCore.so` 同一目录下 ```sh cd tools @@ -44,7 +44,7 @@ sudo ldconfig ## 集成文档 -[~~或许算不上文档~~](https://github.com/MistEO/MeoAssistantArknights/wiki) +[~~或许算不上文档~~](https://github.com/MistEO/MaaCoreArknights/wiki) ### Python @@ -56,4 +56,4 @@ sudo ldconfig ### C sharp -可参考 [MeoAsstGui](../src/MeoAsstGui/Helper/AsstProxy.cs) 中的实现 +可参考 [MaaWpfGui](../src/MaaWpfGui/Helper/AsstProxy.cs) 中的实现 diff --git a/docs/2.2-开发相关.md b/docs/2.2-开发相关.md index d7a7512fd7..726b26ee32 100644 --- a/docs/2.2-开发相关.md +++ b/docs/2.2-开发相关.md @@ -21,7 +21,7 @@ 1. 下载并安装 `Visual Studio 2022 community`, 安装的时候需要选中 `基于c++的桌面开发` 和 `.NET桌面开发` 5. 双击打开 `MAA.sln` 文件。Visual Studio 会自动加载整个项目。 -6. 测试一下是否成功搭建编程环境，选择参数 `Release`, `x64`, 右键 `MeoAsstGui` 设为启动项目；点击启动，选择继续调试。如果成功打开了 GUI，就说明成功搭建了环境。如果求稳，可以继续连接模拟器跑一下 MAA +6. 测试一下是否成功搭建编程环境，选择参数 `Release`, `x64`, 右键 `MaaWpfGui` 设为启动项目；点击启动，选择继续调试。如果成功打开了 GUI，就说明成功搭建了环境。如果求稳，可以继续连接模拟器跑一下 MAA 7. 到这里，你就可以愉快地 ~~瞎 JB 改~~ 发电了 8. 开发过程中，每一定数量，记得提交一个 commit, 别忘了写上 message 假如你不熟悉 git 的使用，你可能想要新建一个分支进行更改，而不是直接提交在 `dev` 上 @@ -81,4 +81,4 @@ 你也可以使用 `tools\ClangFormatter\clang-formatter.py` 来直接调用你的 clang-format 来进行格式化，只需要在项目根目录下执行： -- `python tools\ClangFormatter\clang-formatter.py --clang-format=PATH\TO\YOUR\clang-format.exe --input=src\MeoAssistant` +- `python tools\ClangFormatter\clang-formatter.py --clang-format=PATH\TO\YOUR\clang-format.exe --input=src\MaaCore` diff --git a/docs/3.4-任务流程协议.md b/docs/3.4-任务流程协议.md index b71c8aee69..06d2600304 100644 --- a/docs/3.4-任务流程协议.md +++ b/docs/3.4-任务流程协议.md @@ -165,8 +165,8 @@ Base task 与 template task 合称**模板任务**。 - 外服 `tasks.json` 中定义的同名任务直接继承国服 `tasks.json` 的参数，相当于 `"A": { "baseTask": "国服的A" }` - 如果国服 `tasks.json` 中定义了任务 "B@A"，外服 `tasks.json` 中也定义了 "B@A"，那么 1. 如果外服 "B@A" 有字段 `"baseTask": ""`，则不继承国服 "B@A" - - 若有定义任务 "A"，则以 template task 的逻辑处理 "B@A" - - 若未定义任务 "A"，则以普通任务的逻辑处理 "B@A" + - 若有定义任务 "A"，则以 template task 的逻辑处理 "B@A" + - 若未定义任务 "A"，则以普通任务的逻辑处理 "B@A" 2. 如果外服 "B@A" 没有 `baseTask`，则直接继承国服 "B@A" 参数 ### Virtual Task（虚任务） @@ -231,7 +231,7 @@ Task.get_raw("B@Loading")->next = { "B#self", "B#next", "B#back" }; ### Visual Studio -在 `MeoAssistant.vcxporj` 中已对其进行配置，开箱即用。提示效果较为晦涩，且有部分信息缺失。 +在 `MaaCore.vcxporj` 中已对其进行配置，开箱即用。提示效果较为晦涩，且有部分信息缺失。 ### Visual Studio Code diff --git a/docs/en-us/2.1-LINUX_TUTORIAL.md b/docs/en-us/2.1-LINUX_TUTORIAL.md index ebe7d7923d..a4c158b9b3 100644 --- a/docs/en-us/2.1-LINUX_TUTORIAL.md +++ b/docs/en-us/2.1-LINUX_TUTORIAL.md @@ -27,12 +27,12 @@ sudo ldconfig If zlib does not exist in other distribution, you can try compiling from [source](https://github.com/madler/zlib). -## MeoAssistant +## MaaCore 1. Copy the compiled 3rd-party library to `3rdparty/lib` or change `CMakeLists.txt` to indicate 3rd-party library path manually. 2. The header files in `3rdparty/include/opencv` is version `4.5.3`. If you are using other versions, please notice there may be conflicts in header files (you can simply replace them with your `opencv` header files). 3. Install `adb` -4. Copy resource files to the same folder of `libMeoAssistant.so`. +4. Copy resource files to the same folder of `libMaaCore.so`. ```sh cd tools @@ -44,7 +44,7 @@ If zlib does not exist in other distribution, you can try compiling from [source ## Integration Documentation -[~~Maybe not a doc~~](https://github.com/MistEO/MeoAssistantArknights/wiki) +[~~Maybe not a doc~~](https://github.com/MistEO/MaaCoreArknights/wiki) ### Python @@ -56,4 +56,4 @@ Refer to the implementation of [CppSample](../src/CppSample/main.cpp) ### C sharp -Refer to the implementation of [MeoAsstGui](../src/MeoAsstGui/Helper/AsstProxy.cs) +Refer to the implementation of [MaaWpfGui](../src/MaaWpfGui/Helper/AsstProxy.cs) diff --git a/docs/en-us/2.2-DEVELOPMENT.md b/docs/en-us/2.2-DEVELOPMENT.md index 22274d7b89..f1fb20c2c6 100644 --- a/docs/en-us/2.2-DEVELOPMENT.md +++ b/docs/en-us/2.2-DEVELOPMENT.md @@ -15,7 +15,7 @@ 1. Download and install `Visual Studio 2022 Community`. Select `Desktop development with C++` and `.NET Desktop Development`. 5. Double-click to open the file `MAA.sln`. Visual Studio will load the project automatically. -6. Run a build to test whether the development environment has been configured correctly. Chosse `Release` & `x64`, right-click `MeoAsstGui` to set it as the startup project, and run it. If the build is successful, the `MeoAsstGui` window will appear. You can connect to the emulator in order to confirm again that the development environment has been configured correctly. +6. Run a build to test whether the development environment has been configured correctly. Chosse `Release` & `x64`, right-click `MaaWpfGui` to set it as the startup project, and run it. If the build is successful, the `MaaWpfGui` window will appear. You can connect to the emulator in order to confirm again that the development environment has been configured correctly. 7. Now you are free to contribute to MAA. 8. Remember to commit once you have proper number of changes. Don't forget to write a commit message. If you are a beginner of git, you might want to make changes on a newly created branch instead of committing to `dev` directly @@ -75,4 +75,4 @@ You are all set with the clang-format integrated in Visual Studio supporting c++ You can also format with `tools\ClangFormatter\clang-formatter.py` directly, by executing in the root folder of the project: -- `python tools\ClangFormatter\clang-formatter.py --clang-format=PATH\TO\YOUR\clang-format.exe --input=src\MeoAssistant` +- `python tools\ClangFormatter\clang-formatter.py --clang-format=PATH\TO\YOUR\clang-format.exe --input=src\MaaCore` diff --git a/docs/en-us/3.4-TASK_SCHEMA.md b/docs/en-us/3.4-TASK_SCHEMA.md index 66cd2e1150..7dedeffd3f 100644 --- a/docs/en-us/3.4-TASK_SCHEMA.md +++ b/docs/en-us/3.4-TASK_SCHEMA.md @@ -155,7 +155,7 @@ This project provides JSON schema check for `tasks.json`. The schema file can be ### Visual Studio -Visual Studio has been configured with `MeoAssistant.vcxporj`. Developers should be able to use it directly after loading the project. +Visual Studio has been configured with `MaaCore.vcxporj`. Developers should be able to use it directly after loading the project. ### Visual Studio Code diff --git a/docs/ja-jp/2.2-プルリクエスト.md b/docs/ja-jp/2.2-プルリクエスト.md index c874feee24..9a75a682ba 100644 --- a/docs/ja-jp/2.2-プルリクエスト.md +++ b/docs/ja-jp/2.2-プルリクエスト.md @@ -15,7 +15,7 @@ 1. `Visual Studio 2022 community` をダウンロードしてインストールします。インストール時に `C++ベースのデスクトップ開発` と `.NETデスクトップ開発` を選択する必要があります。 5. ダブルクリックして `MAA.sln` ファイルを開きます。 Visual Studioは、プロジェクト全体を自動的に読み込みます。 -6. プログラミング環境が正常に構築されているかどうかをテストし、パラメーター `Release`、`x64` を選択し、スタートアッププロジェクトとして `MeoAsstGui` を右クリックして設定してから、`開始` をクリックして、`デバッグを続行` を選択します。 GUIが正常に開かれれば、環境が正常に構築されたことを意味します。もっと安定したい場合は、引き続きシミュレーターに接続してMAAを実行してみます。 +6. プログラミング環境が正常に構築されているかどうかをテストし、パラメーター `Release`、`x64` を選択し、スタートアッププロジェクトとして `MaaWpfGui` を右クリックして設定してから、`開始` をクリックして、`デバッグを続行` を選択します。 GUIが正常に開かれれば、環境が正常に構築されたことを意味します。もっと安定したい場合は、引き続きシミュレーターに接続してMAAを実行してみます。 7. ここまで楽しくコードを変更できます～ 8. 開発中は、一定量修正するたびにcommitを忘れず、コメントを書くことを忘れないでください。 9. 開発が完了したら、ローカルブランチを（自分の）リモートリポジトリにプッシュします。 @@ -60,6 +60,6 @@ `tools\ClangFormatter\clang-formatter.py` を使用して、clang-formatを直接呼び出して書式設定することもできます。プロジェクトのルートディレクトリで -- `python tools\ClangFormatter\clang-formatter.py --clang-format=PATH\TO\YOUR\clang-format.exe --input=src\MeoAssistant` +- `python tools\ClangFormatter\clang-formatter.py --clang-format=PATH\TO\YOUR\clang-format.exe --input=src\MaaCore` を実行するだけです。 diff --git a/docs/zh-tw/2.1-Linux編譯教程.md b/docs/zh-tw/2.1-Linux編譯教程.md index 62476240e6..69dee4f8a9 100644 --- a/docs/zh-tw/2.1-Linux編譯教程.md +++ b/docs/zh-tw/2.1-Linux編譯教程.md @@ -27,12 +27,12 @@ sudo ldconfig 其他發行版若源中沒有 zlib, 也可嘗試透過 [原始碼](https://github.com/madler/zlib) 編譯 -## MeoAssistant +## MaaCore 1. 直接拷貝上面編譯的第三方庫到 `3rdparty/lib` 或者 手動修改 `CMakeLists.txt` 指定第三方庫路徑 2. `3rdparty/include/opencv` 中的標頭檔是 `4.5.3` 版本的，若是使用其他版本，請注意標頭檔衝突問題（直接將你的 `opencv` 標頭檔覆蓋過去就好） 3. 安裝 `adb` -4. 複製資源檔案到 `libMeoAssistant.so` 同一目錄下 +4. 複製資源檔案到 `libMaaCore.so` 同一目錄下 ```sh cd tools @@ -44,7 +44,7 @@ sudo ldconfig ## 集成文件 -[~~或許算不上文件~~](https://github.com/MistEO/MeoAssistantArknights/wiki) +[~~或許算不上文件~~](https://github.com/MistEO/MaaCoreArknights/wiki) ### Python @@ -56,4 +56,4 @@ sudo ldconfig ### C sharp -可參考 [MeoAsstGui](../src/MeoAsstGui/Helper/AsstProxy.cs) 中的實現 +可參考 [MaaWpfGui](../src/MaaWpfGui/Helper/AsstProxy.cs) 中的實現 diff --git a/docs/zh-tw/2.2-開發相關.md b/docs/zh-tw/2.2-開發相關.md index ddfa6ed920..41f76070c5 100644 --- a/docs/zh-tw/2.2-開發相關.md +++ b/docs/zh-tw/2.2-開發相關.md @@ -15,7 +15,7 @@ 1. 下載並安裝 `Visual Studio 2022 community`, 安裝的時候需要選中 `基於c++的桌面開發` 和 `.NET桌面開發` 5. 雙擊打開 `MAA.sln` 檔案。 Visual Studio 會自動加載整個項目。 -6. 測試一下是否成功搭建編程環境，選擇參數 `Release`, `x64`, 右鍵 `MeoAsstGui` 設為啟動項目；點擊啟動，選擇繼續調試。如果成功打開了 GUI，就說明成功搭建了環境。如果求穩，可以繼續連接模擬器跑一下 MAA +6. 測試一下是否成功搭建編程環境，選擇參數 `Release`, `x64`, 右鍵 `MaaWpfGui` 設為啟動項目；點擊啟動，選擇繼續調試。如果成功打開了 GUI，就說明成功搭建了環境。如果求穩，可以繼續連接模擬器跑一下 MAA 7. 到這裡，你就可以愉快地 ~~瞎 ㄐㄅ 改~~ 發電了 8. 開發過程中，每一定數量，記得提交一個 commit, 別忘了寫上 message 假如你不熟悉 git 的使用，你可能想要新增一个分支，而不是直接提交在 `dev` 上 @@ -75,4 +75,4 @@ 你也可以使用 `tools\ClangFormatter\clang-formatter.py` 來直接執行你的 clang-format 來進行格式化，只需要在項目根目錄下執行： -- `python tools\ClangFormatter\clang-formatter.py --clang-format=PATH\TO\YOUR\clang-format.exe --input=src\MeoAssistant` +- `python tools\ClangFormatter\clang-formatter.py --clang-format=PATH\TO\YOUR\clang-format.exe --input=src\MaaCore` diff --git a/docs/zh-tw/3.4-任務流程協定.md b/docs/zh-tw/3.4-任務流程協定.md index 3e87bca48a..7761841b8b 100644 --- a/docs/zh-tw/3.4-任務流程協定.md +++ b/docs/zh-tw/3.4-任務流程協定.md @@ -155,7 +155,7 @@ ### Visual Studio -在 `MeoAssistant.vcxporj` 中已對其進行配置，開箱即用。提示效果較為晦澀，且有部分資訊缺失。 +在 `MaaCore.vcxporj` 中已對其進行配置，開箱即用。提示效果較為晦澀，且有部分資訊缺失。 ### Visual Studio Code diff --git a/include/module.modulemap b/include/module.modulemap index 0fe3104227..c05880a298 100644 --- a/include/module.modulemap +++ b/include/module.modulemap @@ -1,4 +1,4 @@ -module MeoAssistant { +module MaaCore { umbrella header "AsstCaller.h" export * link framework "Accelerate" diff --git a/src/Dart/lib/maa_core.dart b/src/Dart/lib/maa_core.dart index d90503638d..d39d1223f2 100644 --- a/src/Dart/lib/maa_core.dart +++ b/src/Dart/lib/maa_core.dart @@ -9,7 +9,7 @@ import 'package:path/path.dart' as p; class MaaCore implements MaaCoreInterface { // Native Symbols - // MeoAssistant + // MaaCore static late AsstLoadResourceFunc _asstLoadResource; static late AsstCreateExFunc _asstCreateEx; static late AsstConnectFunc _asstConnect; @@ -51,13 +51,13 @@ class MaaCore implements MaaCoreInterface { return []; } - static String get meoAssistantLibName { + static String get MaaCoreLibName { if (Platform.isLinux) { - return 'libMeoAssistant.so'; + return 'libMaaCore.so'; } else if (Platform.isWindows) { return 'MaaCore.dll'; } - return 'libMeoAssistant.dylib'; + return 'libMaaCore.dylib'; } static String get callbackLibName { @@ -125,7 +125,7 @@ class MaaCore implements MaaCoreInterface { } static void _loadNativeSymbols(String libDir) { - _loadMeoAssistant(libDir); + _loadMaaCore(libDir); _loadCallbackLib(libDir); _symbolsLoaded = true; } @@ -137,7 +137,7 @@ class MaaCore implements MaaCoreInterface { _asstCallback = lib.lookup('callback'); } - static void _loadMeoAssistant(String libDir) { + static void _loadMaaCore(String libDir) { if (Platform.isWindows) { for (var dep in _deps) { print("load dep: $dep"); @@ -145,7 +145,7 @@ class MaaCore implements MaaCoreInterface { print("loaded dep: $dep"); } } - final lib = DynamicLibrary.open(p.join(libDir, meoAssistantLibName)); + final lib = DynamicLibrary.open(p.join(libDir, MaaCoreLibName)); _asstLoadResource = lib.lookup('AsstLoadResource').asFunction(); _asstCreateEx = lib.lookup('AsstCreateEx').asFunction(); diff --git a/src/Java/Maaj/Readme.md b/src/Java/Maaj/Readme.md index 090dcca550..3f6f58e879 100644 --- a/src/Java/Maaj/Readme.md +++ b/src/Java/Maaj/Readme.md @@ -32,8 +32,8 @@ 1. 把他丢进 Maa 文件夹下,形成如下文件结构.备注: 启动脚本[Maa-HTTP-Server-startup.bat](Maa-HTTP-Server-startup.bat). ```text - MeoAssistantArknights_v3.9.0-beta.8 - │ MeoAsstGui.exe + MaaCoreArknights_v3.9.0-beta.8 + │ MaaWpfGui.exe │ MaaCore.dll │ ... └───Java-HTTP @@ -108,7 +108,7 @@ ```json { - "adbPath": "C:\\MeoAssistantArknights3\\platform-tools\\adb.exe", + "adbPath": "C:\\MaaCoreArknights3\\platform-tools\\adb.exe", "host": "127.0.0.1:62001", "detailJson": "" } @@ -144,7 +144,6 @@ --- - --- ##### 接口名称 添加任务 @@ -400,7 +399,7 @@ { "id": "ccd76e0c367511158ca774ff951a22e8bb62f5d3", "host": "127.0.0.1:62026", - "adbPath": "C:\\Users\\atmzx\\Desktop\\MeoAssistantArknights3\\platform-tools\\adb.exe", + "adbPath": "C:\\Users\\atmzx\\Desktop\\MaaCoreArknights3\\platform-tools\\adb.exe", "uuid": "", "status": 0 } @@ -441,7 +440,6 @@ ###### 4) 请求返回结果: 图片内容, PNG 格式 - ### WebSocket 部分 请求地址(没错跟HTTP同样是8848钛金端口 @@ -511,7 +509,7 @@ "command": "connect", "msgId": 114514, "data": { - "adbPath": "C:\\Users\\atmzx\\Desktop\\MeoAssistantArknights3\\platform-tools\\adb.exe", + "adbPath": "C:\\Users\\atmzx\\Desktop\\MaaCoreArknights3\\platform-tools\\adb.exe", "host": "127.0.0.1:62001" } } @@ -561,7 +559,7 @@ appendTask setTaskParams start stop等接口不再描述，均可遵循以上规 "details": { "uuid": "", "details": { - "adb": "C:\\MeoAssistantArknights3\\platform-tools\\adb.exe", + "adb": "C:\\MaaCoreArknights3\\platform-tools\\adb.exe", "address": "127.0.0.1:62001", "config": "General", "width": 1280, diff --git a/src/Java/Maaj/src/main/java/com/iguigui/maaj/easySample/MaaJavaSample.java b/src/Java/Maaj/src/main/java/com/iguigui/maaj/easySample/MaaJavaSample.java index 9a8de744a4..d349e79cbe 100644 --- a/src/Java/Maaj/src/main/java/com/iguigui/maaj/easySample/MaaJavaSample.java +++ b/src/Java/Maaj/src/main/java/com/iguigui/maaj/easySample/MaaJavaSample.java @@ -20,13 +20,13 @@ public class MaaJavaSample { */ public static void main(String[] args) { //设定JNA寻找maa的dll的地址，同时也要把这个路径添加到环境变量中的Path中！ - String maaPath = "C:/Users/iguigui/Desktop/MeoAssistantArknights3"; + String maaPath = "C:/Users/iguigui/Desktop/MaaCoreArknights3"; System.setProperty("jna.library.path", maaPath); //adb地址，自己看着办 String adbPath = maaPath + "/platform-tools/adb.exe"; //第一步，加载Maa调用实例，加载失败请检查jna.library.path和path参数 - MeoAssistant instance = Native.load("MeoAssistant", MeoAssistant.class); + MaaCore instance = Native.load("MaaCore", MaaCore.class); System.out.println("获取Maa版本号:" + instance.AsstGetVersion()); //第二步，加载Maa资源初始化 diff --git a/src/Java/Maaj/src/main/java/com/iguigui/maaj/easySample/MeoAssistant.java b/src/Java/Maaj/src/main/java/com/iguigui/maaj/easySample/MeoAssistant.java index 36e71aa754..d27ce32ad2 100644 --- a/src/Java/Maaj/src/main/java/com/iguigui/maaj/easySample/MeoAssistant.java +++ b/src/Java/Maaj/src/main/java/com/iguigui/maaj/easySample/MeoAssistant.java @@ -6,7 +6,7 @@ import com.sun.jna.win32.StdCallLibrary; //本质上是对C接口的抽象层 //请参考C接口 https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/master/include/AsstCaller.h -public interface MeoAssistant extends StdCallLibrary { +public interface MaaCore extends StdCallLibrary { //回调接口定义 interface AsstApiCallback extends StdCallCallback { diff --git a/src/Java/Maaj/src/main/java/com/iguigui/maaj/service/MaaInstance.kt b/src/Java/Maaj/src/main/java/com/iguigui/maaj/service/MaaInstance.kt index 7167ae4b52..f01442fa81 100644 --- a/src/Java/Maaj/src/main/java/com/iguigui/maaj/service/MaaInstance.kt +++ b/src/Java/Maaj/src/main/java/com/iguigui/maaj/service/MaaInstance.kt @@ -2,7 +2,7 @@ package com.iguigui.maaj.service import com.iguigui.maaj.dto.CallBackLog import com.iguigui.maaj.dto.* -import com.iguigui.maaj.easySample.MeoAssistant +import com.iguigui.maaj.easySample.MaaCore import com.iguigui.maaj.logger import com.iguigui.maaj.util.Json import com.sun.jna.Pointer @@ -11,17 +11,17 @@ import java.util.concurrent.atomic.AtomicLong import kotlin.reflect.KFunction1 class MaaInstance( - private val instance: MeoAssistant, + private val instance: MaaCore, val id: String, val adbPath: String, val host: String, private val detailJson: String, val callBackAction: KFunction1 ) : - MeoAssistant.AsstApiCallback { + MaaCore.AsstApiCallback { // constructor( -// instance: MeoAssistant, +// instance: MaaCore, // id: String, // adbPath: String, // host: String, diff --git a/src/Java/Maaj/src/main/java/com/iguigui/maaj/service/MaaService.kt b/src/Java/Maaj/src/main/java/com/iguigui/maaj/service/MaaService.kt index be9696544f..62dafc288a 100644 --- a/src/Java/Maaj/src/main/java/com/iguigui/maaj/service/MaaService.kt +++ b/src/Java/Maaj/src/main/java/com/iguigui/maaj/service/MaaService.kt @@ -1,7 +1,7 @@ package com.iguigui.maaj.service import com.iguigui.maaj.dto.* -import com.iguigui.maaj.easySample.MeoAssistant +import com.iguigui.maaj.easySample.MaaCore import com.iguigui.maaj.logger import com.sun.jna.Native import io.ktor.websocket.* @@ -18,12 +18,12 @@ object MaaService { private val wsConnection = Collections.synchronizedSet(LinkedHashSet()) - val meoAssistant: MeoAssistant by lazy { + val MaaCore: MaaCore by lazy { var maaPath = File(File("").absolutePath).parent logger.info("maaPath $maaPath") -// maaPath = "C:\\Users\\atmzx\\Desktop\\MeoAssistantArknights3" +// maaPath = "C:\\Users\\atmzx\\Desktop\\MaaCoreArknights3" System.setProperty("jna.library.path", maaPath) - val load = Native.load("MeoAssistant", MeoAssistant::class.java) + val load = Native.load("MaaCore", MaaCore::class.java) load.AsstLoadResource(maaPath) load } @@ -33,8 +33,8 @@ object MaaService { // if (instancePool.containsKey(id)) { // return ConnectResponse(id, true) // } - val maaInstance = MaaInstance(meoAssistant, id, adbPath, host, detailJson, ::callBackLog) - maaInstance.pointer = meoAssistant.AsstCreateEx(maaInstance, maaInstance.id) + val maaInstance = MaaInstance(MaaCore, id, adbPath, host, detailJson, ::callBackLog) + maaInstance.pointer = MaaCore.AsstCreateEx(maaInstance, maaInstance.id) val connect = maaInstance.connect() if (!connect) { return ConnectResponse("", false) @@ -54,7 +54,7 @@ object MaaService { fun stop(id: String) = instancePool[id]?.stop() ?: false - fun getVersion(): String = meoAssistant.AsstGetVersion() + fun getVersion(): String = MaaCore.AsstGetVersion() private fun sha1(password: String): String { val messageDigest = MessageDigest.getInstance("SHA") diff --git a/src/MeoAssistant/.editorconfig b/src/MaaCore/.editorconfig similarity index 100% rename from src/MeoAssistant/.editorconfig rename to src/MaaCore/.editorconfig diff --git a/src/MeoAssistant/Assistant.cpp b/src/MaaCore/Assistant.cpp similarity index 100% rename from src/MeoAssistant/Assistant.cpp rename to src/MaaCore/Assistant.cpp diff --git a/src/MeoAssistant/Assistant.h b/src/MaaCore/Assistant.h similarity index 100% rename from src/MeoAssistant/Assistant.h rename to src/MaaCore/Assistant.h diff --git a/src/MeoAssistant/AsstCaller.cpp b/src/MaaCore/AsstCaller.cpp similarity index 100% rename from src/MeoAssistant/AsstCaller.cpp rename to src/MaaCore/AsstCaller.cpp diff --git a/src/MeoAssistant/Common/AsstBattleDef.h b/src/MaaCore/Common/AsstBattleDef.h similarity index 100% rename from src/MeoAssistant/Common/AsstBattleDef.h rename to src/MaaCore/Common/AsstBattleDef.h diff --git a/src/MeoAssistant/Common/AsstConf.h b/src/MaaCore/Common/AsstConf.h similarity index 100% rename from src/MeoAssistant/Common/AsstConf.h rename to src/MaaCore/Common/AsstConf.h diff --git a/src/MeoAssistant/Common/AsstInfrastDef.h b/src/MaaCore/Common/AsstInfrastDef.h similarity index 100% rename from src/MeoAssistant/Common/AsstInfrastDef.h rename to src/MaaCore/Common/AsstInfrastDef.h diff --git a/src/MeoAssistant/Common/AsstMsg.h b/src/MaaCore/Common/AsstMsg.h similarity index 100% rename from src/MeoAssistant/Common/AsstMsg.h rename to src/MaaCore/Common/AsstMsg.h diff --git a/src/MeoAssistant/Common/AsstTypes.h b/src/MaaCore/Common/AsstTypes.h similarity index 100% rename from src/MeoAssistant/Common/AsstTypes.h rename to src/MaaCore/Common/AsstTypes.h diff --git a/src/MeoAssistant/Common/AsstVersion.h b/src/MaaCore/Common/AsstVersion.h similarity index 100% rename from src/MeoAssistant/Common/AsstVersion.h rename to src/MaaCore/Common/AsstVersion.h diff --git a/src/MeoAssistant/Config/AbstractConfig.cpp b/src/MaaCore/Config/AbstractConfig.cpp similarity index 100% rename from src/MeoAssistant/Config/AbstractConfig.cpp rename to src/MaaCore/Config/AbstractConfig.cpp diff --git a/src/MeoAssistant/Config/AbstractConfig.h b/src/MaaCore/Config/AbstractConfig.h similarity index 100% rename from src/MeoAssistant/Config/AbstractConfig.h rename to src/MaaCore/Config/AbstractConfig.h diff --git a/src/MeoAssistant/Config/AbstractConfigWithTempl.h b/src/MaaCore/Config/AbstractConfigWithTempl.h similarity index 100% rename from src/MeoAssistant/Config/AbstractConfigWithTempl.h rename to src/MaaCore/Config/AbstractConfigWithTempl.h diff --git a/src/MeoAssistant/Config/AbstractResource.h b/src/MaaCore/Config/AbstractResource.h similarity index 100% rename from src/MeoAssistant/Config/AbstractResource.h rename to src/MaaCore/Config/AbstractResource.h diff --git a/src/MeoAssistant/Config/GeneralConfig.cpp b/src/MaaCore/Config/GeneralConfig.cpp similarity index 100% rename from src/MeoAssistant/Config/GeneralConfig.cpp rename to src/MaaCore/Config/GeneralConfig.cpp diff --git a/src/MeoAssistant/Config/GeneralConfig.h b/src/MaaCore/Config/GeneralConfig.h similarity index 100% rename from src/MeoAssistant/Config/GeneralConfig.h rename to src/MaaCore/Config/GeneralConfig.h diff --git a/src/MeoAssistant/Config/Miscellaneous/BattleDataConfig.cpp b/src/MaaCore/Config/Miscellaneous/BattleDataConfig.cpp similarity index 100% rename from src/MeoAssistant/Config/Miscellaneous/BattleDataConfig.cpp rename to src/MaaCore/Config/Miscellaneous/BattleDataConfig.cpp diff --git a/src/MeoAssistant/Config/Miscellaneous/BattleDataConfig.h b/src/MaaCore/Config/Miscellaneous/BattleDataConfig.h similarity index 100% rename from src/MeoAssistant/Config/Miscellaneous/BattleDataConfig.h rename to src/MaaCore/Config/Miscellaneous/BattleDataConfig.h diff --git a/src/MeoAssistant/Config/Miscellaneous/CopilotConfig.cpp b/src/MaaCore/Config/Miscellaneous/CopilotConfig.cpp similarity index 100% rename from src/MeoAssistant/Config/Miscellaneous/CopilotConfig.cpp rename to src/MaaCore/Config/Miscellaneous/CopilotConfig.cpp diff --git a/src/MeoAssistant/Config/Miscellaneous/CopilotConfig.h b/src/MaaCore/Config/Miscellaneous/CopilotConfig.h similarity index 100% rename from src/MeoAssistant/Config/Miscellaneous/CopilotConfig.h rename to src/MaaCore/Config/Miscellaneous/CopilotConfig.h diff --git a/src/MeoAssistant/Config/Miscellaneous/InfrastConfig.cpp b/src/MaaCore/Config/Miscellaneous/InfrastConfig.cpp similarity index 100% rename from src/MeoAssistant/Config/Miscellaneous/InfrastConfig.cpp rename to src/MaaCore/Config/Miscellaneous/InfrastConfig.cpp diff --git a/src/MeoAssistant/Config/Miscellaneous/InfrastConfig.h b/src/MaaCore/Config/Miscellaneous/InfrastConfig.h similarity index 100% rename from src/MeoAssistant/Config/Miscellaneous/InfrastConfig.h rename to src/MaaCore/Config/Miscellaneous/InfrastConfig.h diff --git a/src/MeoAssistant/Config/Miscellaneous/ItemConfig.cpp b/src/MaaCore/Config/Miscellaneous/ItemConfig.cpp similarity index 100% rename from src/MeoAssistant/Config/Miscellaneous/ItemConfig.cpp rename to src/MaaCore/Config/Miscellaneous/ItemConfig.cpp diff --git a/src/MeoAssistant/Config/Miscellaneous/ItemConfig.h b/src/MaaCore/Config/Miscellaneous/ItemConfig.h similarity index 100% rename from src/MeoAssistant/Config/Miscellaneous/ItemConfig.h rename to src/MaaCore/Config/Miscellaneous/ItemConfig.h diff --git a/src/MeoAssistant/Config/Miscellaneous/OcrPack.cpp b/src/MaaCore/Config/Miscellaneous/OcrPack.cpp similarity index 100% rename from src/MeoAssistant/Config/Miscellaneous/OcrPack.cpp rename to src/MaaCore/Config/Miscellaneous/OcrPack.cpp diff --git a/src/MeoAssistant/Config/Miscellaneous/OcrPack.h b/src/MaaCore/Config/Miscellaneous/OcrPack.h similarity index 100% rename from src/MeoAssistant/Config/Miscellaneous/OcrPack.h rename to src/MaaCore/Config/Miscellaneous/OcrPack.h diff --git a/src/MeoAssistant/Config/Miscellaneous/RecruitConfig.cpp b/src/MaaCore/Config/Miscellaneous/RecruitConfig.cpp similarity index 100% rename from src/MeoAssistant/Config/Miscellaneous/RecruitConfig.cpp rename to src/MaaCore/Config/Miscellaneous/RecruitConfig.cpp diff --git a/src/MeoAssistant/Config/Miscellaneous/RecruitConfig.h b/src/MaaCore/Config/Miscellaneous/RecruitConfig.h similarity index 100% rename from src/MeoAssistant/Config/Miscellaneous/RecruitConfig.h rename to src/MaaCore/Config/Miscellaneous/RecruitConfig.h diff --git a/src/MeoAssistant/Config/Miscellaneous/StageDropsConfig.cpp b/src/MaaCore/Config/Miscellaneous/StageDropsConfig.cpp similarity index 100% rename from src/MeoAssistant/Config/Miscellaneous/StageDropsConfig.cpp rename to src/MaaCore/Config/Miscellaneous/StageDropsConfig.cpp diff --git a/src/MeoAssistant/Config/Miscellaneous/StageDropsConfig.h b/src/MaaCore/Config/Miscellaneous/StageDropsConfig.h similarity index 100% rename from src/MeoAssistant/Config/Miscellaneous/StageDropsConfig.h rename to src/MaaCore/Config/Miscellaneous/StageDropsConfig.h diff --git a/src/MeoAssistant/Config/Miscellaneous/TilePack.cpp b/src/MaaCore/Config/Miscellaneous/TilePack.cpp similarity index 100% rename from src/MeoAssistant/Config/Miscellaneous/TilePack.cpp rename to src/MaaCore/Config/Miscellaneous/TilePack.cpp diff --git a/src/MeoAssistant/Config/Miscellaneous/TilePack.h b/src/MaaCore/Config/Miscellaneous/TilePack.h similarity index 100% rename from src/MeoAssistant/Config/Miscellaneous/TilePack.h rename to src/MaaCore/Config/Miscellaneous/TilePack.h diff --git a/src/MeoAssistant/Config/ResourceLoader.cpp b/src/MaaCore/Config/ResourceLoader.cpp similarity index 100% rename from src/MeoAssistant/Config/ResourceLoader.cpp rename to src/MaaCore/Config/ResourceLoader.cpp diff --git a/src/MeoAssistant/Config/ResourceLoader.h b/src/MaaCore/Config/ResourceLoader.h similarity index 100% rename from src/MeoAssistant/Config/ResourceLoader.h rename to src/MaaCore/Config/ResourceLoader.h diff --git a/src/MeoAssistant/Config/Roguelike/RoguelikeCopilotConfig.cpp b/src/MaaCore/Config/Roguelike/RoguelikeCopilotConfig.cpp similarity index 100% rename from src/MeoAssistant/Config/Roguelike/RoguelikeCopilotConfig.cpp rename to src/MaaCore/Config/Roguelike/RoguelikeCopilotConfig.cpp diff --git a/src/MeoAssistant/Config/Roguelike/RoguelikeCopilotConfig.h b/src/MaaCore/Config/Roguelike/RoguelikeCopilotConfig.h similarity index 100% rename from src/MeoAssistant/Config/Roguelike/RoguelikeCopilotConfig.h rename to src/MaaCore/Config/Roguelike/RoguelikeCopilotConfig.h diff --git a/src/MeoAssistant/Config/Roguelike/RoguelikeRecruitConfig.cpp b/src/MaaCore/Config/Roguelike/RoguelikeRecruitConfig.cpp similarity index 100% rename from src/MeoAssistant/Config/Roguelike/RoguelikeRecruitConfig.cpp rename to src/MaaCore/Config/Roguelike/RoguelikeRecruitConfig.cpp diff --git a/src/MeoAssistant/Config/Roguelike/RoguelikeRecruitConfig.h b/src/MaaCore/Config/Roguelike/RoguelikeRecruitConfig.h similarity index 100% rename from src/MeoAssistant/Config/Roguelike/RoguelikeRecruitConfig.h rename to src/MaaCore/Config/Roguelike/RoguelikeRecruitConfig.h diff --git a/src/MeoAssistant/Config/Roguelike/RoguelikeShoppingConfig.cpp b/src/MaaCore/Config/Roguelike/RoguelikeShoppingConfig.cpp similarity index 100% rename from src/MeoAssistant/Config/Roguelike/RoguelikeShoppingConfig.cpp rename to src/MaaCore/Config/Roguelike/RoguelikeShoppingConfig.cpp diff --git a/src/MeoAssistant/Config/Roguelike/RoguelikeShoppingConfig.h b/src/MaaCore/Config/Roguelike/RoguelikeShoppingConfig.h similarity index 100% rename from src/MeoAssistant/Config/Roguelike/RoguelikeShoppingConfig.h rename to src/MaaCore/Config/Roguelike/RoguelikeShoppingConfig.h diff --git a/src/MeoAssistant/Config/TaskData.cpp b/src/MaaCore/Config/TaskData.cpp similarity index 100% rename from src/MeoAssistant/Config/TaskData.cpp rename to src/MaaCore/Config/TaskData.cpp diff --git a/src/MeoAssistant/Config/TaskData.h b/src/MaaCore/Config/TaskData.h similarity index 100% rename from src/MeoAssistant/Config/TaskData.h rename to src/MaaCore/Config/TaskData.h diff --git a/src/MeoAssistant/Config/TemplResource.cpp b/src/MaaCore/Config/TemplResource.cpp similarity index 100% rename from src/MeoAssistant/Config/TemplResource.cpp rename to src/MaaCore/Config/TemplResource.cpp diff --git a/src/MeoAssistant/Config/TemplResource.h b/src/MaaCore/Config/TemplResource.h similarity index 100% rename from src/MeoAssistant/Config/TemplResource.h rename to src/MaaCore/Config/TemplResource.h diff --git a/src/MeoAssistant/Controller.cpp b/src/MaaCore/Controller.cpp similarity index 100% rename from src/MeoAssistant/Controller.cpp rename to src/MaaCore/Controller.cpp diff --git a/src/MeoAssistant/Controller.h b/src/MaaCore/Controller.h similarity index 100% rename from src/MeoAssistant/Controller.h rename to src/MaaCore/Controller.h diff --git a/src/MeoAssistant/InstHelper.cpp b/src/MaaCore/InstHelper.cpp similarity index 100% rename from src/MeoAssistant/InstHelper.cpp rename to src/MaaCore/InstHelper.cpp diff --git a/src/MeoAssistant/InstHelper.h b/src/MaaCore/InstHelper.h similarity index 100% rename from src/MeoAssistant/InstHelper.h rename to src/MaaCore/InstHelper.h diff --git a/src/MeoAssistant/MaaCore.vcxproj b/src/MaaCore/MaaCore.vcxproj similarity index 99% rename from src/MeoAssistant/MaaCore.vcxproj rename to src/MaaCore/MaaCore.vcxproj index 6c902a4f0b..8f9bf38e43 100644 --- a/src/MeoAssistant/MaaCore.vcxproj +++ b/src/MaaCore/MaaCore.vcxproj @@ -234,7 +234,7 @@ 16.0 Win32Proj {362d1e30-f5ae-4279-9985-65c27b3ba300} - MeoAssistant + MaaCore 10.0 MaaCore @@ -386,4 +386,4 @@ - \ No newline at end of file + diff --git a/src/MeoAssistant/MaaCore.vcxproj.filters b/src/MaaCore/MaaCore.vcxproj.filters similarity index 100% rename from src/MeoAssistant/MaaCore.vcxproj.filters rename to src/MaaCore/MaaCore.vcxproj.filters diff --git a/src/MeoAssistant/README.md b/src/MaaCore/README.md similarity index 93% rename from src/MeoAssistant/README.md rename to src/MaaCore/README.md index 2edefcb655..c03a838a89 100644 --- a/src/MeoAssistant/README.md +++ b/src/MaaCore/README.md @@ -1,4 +1,4 @@ -# MeoAssistant +# MaaCore MAA 底层 C++ 模块 diff --git a/src/MeoAssistant/Status.cpp b/src/MaaCore/Status.cpp similarity index 100% rename from src/MeoAssistant/Status.cpp rename to src/MaaCore/Status.cpp diff --git a/src/MeoAssistant/Status.h b/src/MaaCore/Status.h similarity index 100% rename from src/MeoAssistant/Status.h rename to src/MaaCore/Status.h diff --git a/src/MeoAssistant/Task/AbstractTask.cpp b/src/MaaCore/Task/AbstractTask.cpp similarity index 100% rename from src/MeoAssistant/Task/AbstractTask.cpp rename to src/MaaCore/Task/AbstractTask.cpp diff --git a/src/MeoAssistant/Task/AbstractTask.h b/src/MaaCore/Task/AbstractTask.h similarity index 100% rename from src/MeoAssistant/Task/AbstractTask.h rename to src/MaaCore/Task/AbstractTask.h diff --git a/src/MeoAssistant/Task/AbstractTaskPlugin.cpp b/src/MaaCore/Task/AbstractTaskPlugin.cpp similarity index 100% rename from src/MeoAssistant/Task/AbstractTaskPlugin.cpp rename to src/MaaCore/Task/AbstractTaskPlugin.cpp diff --git a/src/MeoAssistant/Task/AbstractTaskPlugin.h b/src/MaaCore/Task/AbstractTaskPlugin.h similarity index 100% rename from src/MeoAssistant/Task/AbstractTaskPlugin.h rename to src/MaaCore/Task/AbstractTaskPlugin.h diff --git a/src/MeoAssistant/Task/Fight/DrGrandetTaskPlugin.cpp b/src/MaaCore/Task/Fight/DrGrandetTaskPlugin.cpp similarity index 100% rename from src/MeoAssistant/Task/Fight/DrGrandetTaskPlugin.cpp rename to src/MaaCore/Task/Fight/DrGrandetTaskPlugin.cpp diff --git a/src/MeoAssistant/Task/Fight/DrGrandetTaskPlugin.h b/src/MaaCore/Task/Fight/DrGrandetTaskPlugin.h similarity index 100% rename from src/MeoAssistant/Task/Fight/DrGrandetTaskPlugin.h rename to src/MaaCore/Task/Fight/DrGrandetTaskPlugin.h diff --git a/src/MeoAssistant/Task/Fight/StageDropsTaskPlugin.cpp b/src/MaaCore/Task/Fight/StageDropsTaskPlugin.cpp similarity index 98% rename from src/MeoAssistant/Task/Fight/StageDropsTaskPlugin.cpp rename to src/MaaCore/Task/Fight/StageDropsTaskPlugin.cpp index 9e96470d76..c5c9689316 100644 --- a/src/MeoAssistant/Task/Fight/StageDropsTaskPlugin.cpp +++ b/src/MaaCore/Task/Fight/StageDropsTaskPlugin.cpp @@ -220,7 +220,7 @@ void asst::StageDropsTaskPlugin::upload_to_penguin() std::string stage_id = m_cur_info_json.get("stage", "stageId", std::string()); if (stage_id.empty()) { cb_info["why"] = "未知关卡"; - cb_info["details"] = json::object { { "stage_code", m_stage_code } }; + cb_info["details"] = json::object{ { "stage_code", m_stage_code } }; callback(AsstMsg::SubTaskError, cb_info); return; } @@ -253,7 +253,7 @@ void asst::StageDropsTaskPlugin::upload_to_penguin() format_drop.as_object().erase("itemName"); all_drops.array_emplace(std::move(format_drop)); } - body["source"] = "MeoAssistant"; + body["source"] = "MaaCore"; body["version"] = Version; std::string extra_param; diff --git a/src/MeoAssistant/Task/Fight/StageDropsTaskPlugin.h b/src/MaaCore/Task/Fight/StageDropsTaskPlugin.h similarity index 100% rename from src/MeoAssistant/Task/Fight/StageDropsTaskPlugin.h rename to src/MaaCore/Task/Fight/StageDropsTaskPlugin.h diff --git a/src/MeoAssistant/Task/Fight/StageNavigationTask.cpp b/src/MaaCore/Task/Fight/StageNavigationTask.cpp similarity index 100% rename from src/MeoAssistant/Task/Fight/StageNavigationTask.cpp rename to src/MaaCore/Task/Fight/StageNavigationTask.cpp diff --git a/src/MeoAssistant/Task/Fight/StageNavigationTask.h b/src/MaaCore/Task/Fight/StageNavigationTask.h similarity index 100% rename from src/MeoAssistant/Task/Fight/StageNavigationTask.h rename to src/MaaCore/Task/Fight/StageNavigationTask.h diff --git a/src/MeoAssistant/Task/Infrast/DronesForShamareTaskPlugin.cpp b/src/MaaCore/Task/Infrast/DronesForShamareTaskPlugin.cpp similarity index 100% rename from src/MeoAssistant/Task/Infrast/DronesForShamareTaskPlugin.cpp rename to src/MaaCore/Task/Infrast/DronesForShamareTaskPlugin.cpp diff --git a/src/MeoAssistant/Task/Infrast/DronesForShamareTaskPlugin.h b/src/MaaCore/Task/Infrast/DronesForShamareTaskPlugin.h similarity index 100% rename from src/MeoAssistant/Task/Infrast/DronesForShamareTaskPlugin.h rename to src/MaaCore/Task/Infrast/DronesForShamareTaskPlugin.h diff --git a/src/MeoAssistant/Task/Infrast/InfrastAbstractTask.cpp b/src/MaaCore/Task/Infrast/InfrastAbstractTask.cpp similarity index 100% rename from src/MeoAssistant/Task/Infrast/InfrastAbstractTask.cpp rename to src/MaaCore/Task/Infrast/InfrastAbstractTask.cpp diff --git a/src/MeoAssistant/Task/Infrast/InfrastAbstractTask.h b/src/MaaCore/Task/Infrast/InfrastAbstractTask.h similarity index 100% rename from src/MeoAssistant/Task/Infrast/InfrastAbstractTask.h rename to src/MaaCore/Task/Infrast/InfrastAbstractTask.h diff --git a/src/MeoAssistant/Task/Infrast/InfrastControlTask.cpp b/src/MaaCore/Task/Infrast/InfrastControlTask.cpp similarity index 100% rename from src/MeoAssistant/Task/Infrast/InfrastControlTask.cpp rename to src/MaaCore/Task/Infrast/InfrastControlTask.cpp diff --git a/src/MeoAssistant/Task/Infrast/InfrastControlTask.h b/src/MaaCore/Task/Infrast/InfrastControlTask.h similarity index 100% rename from src/MeoAssistant/Task/Infrast/InfrastControlTask.h rename to src/MaaCore/Task/Infrast/InfrastControlTask.h diff --git a/src/MeoAssistant/Task/Infrast/InfrastDormTask.cpp b/src/MaaCore/Task/Infrast/InfrastDormTask.cpp similarity index 100% rename from src/MeoAssistant/Task/Infrast/InfrastDormTask.cpp rename to src/MaaCore/Task/Infrast/InfrastDormTask.cpp diff --git a/src/MeoAssistant/Task/Infrast/InfrastDormTask.h b/src/MaaCore/Task/Infrast/InfrastDormTask.h similarity index 100% rename from src/MeoAssistant/Task/Infrast/InfrastDormTask.h rename to src/MaaCore/Task/Infrast/InfrastDormTask.h diff --git a/src/MeoAssistant/Task/Infrast/InfrastInfoTask.cpp b/src/MaaCore/Task/Infrast/InfrastInfoTask.cpp similarity index 100% rename from src/MeoAssistant/Task/Infrast/InfrastInfoTask.cpp rename to src/MaaCore/Task/Infrast/InfrastInfoTask.cpp diff --git a/src/MeoAssistant/Task/Infrast/InfrastInfoTask.h b/src/MaaCore/Task/Infrast/InfrastInfoTask.h similarity index 100% rename from src/MeoAssistant/Task/Infrast/InfrastInfoTask.h rename to src/MaaCore/Task/Infrast/InfrastInfoTask.h diff --git a/src/MeoAssistant/Task/Infrast/InfrastMfgTask.cpp b/src/MaaCore/Task/Infrast/InfrastMfgTask.cpp similarity index 100% rename from src/MeoAssistant/Task/Infrast/InfrastMfgTask.cpp rename to src/MaaCore/Task/Infrast/InfrastMfgTask.cpp diff --git a/src/MeoAssistant/Task/Infrast/InfrastMfgTask.h b/src/MaaCore/Task/Infrast/InfrastMfgTask.h similarity index 100% rename from src/MeoAssistant/Task/Infrast/InfrastMfgTask.h rename to src/MaaCore/Task/Infrast/InfrastMfgTask.h diff --git a/src/MeoAssistant/Task/Infrast/InfrastOfficeTask.cpp b/src/MaaCore/Task/Infrast/InfrastOfficeTask.cpp similarity index 100% rename from src/MeoAssistant/Task/Infrast/InfrastOfficeTask.cpp rename to src/MaaCore/Task/Infrast/InfrastOfficeTask.cpp diff --git a/src/MeoAssistant/Task/Infrast/InfrastOfficeTask.h b/src/MaaCore/Task/Infrast/InfrastOfficeTask.h similarity index 100% rename from src/MeoAssistant/Task/Infrast/InfrastOfficeTask.h rename to src/MaaCore/Task/Infrast/InfrastOfficeTask.h diff --git a/src/MeoAssistant/Task/Infrast/InfrastPowerTask.cpp b/src/MaaCore/Task/Infrast/InfrastPowerTask.cpp similarity index 100% rename from src/MeoAssistant/Task/Infrast/InfrastPowerTask.cpp rename to src/MaaCore/Task/Infrast/InfrastPowerTask.cpp diff --git a/src/MeoAssistant/Task/Infrast/InfrastPowerTask.h b/src/MaaCore/Task/Infrast/InfrastPowerTask.h similarity index 100% rename from src/MeoAssistant/Task/Infrast/InfrastPowerTask.h rename to src/MaaCore/Task/Infrast/InfrastPowerTask.h diff --git a/src/MeoAssistant/Task/Infrast/InfrastProductionTask.cpp b/src/MaaCore/Task/Infrast/InfrastProductionTask.cpp similarity index 100% rename from src/MeoAssistant/Task/Infrast/InfrastProductionTask.cpp rename to src/MaaCore/Task/Infrast/InfrastProductionTask.cpp diff --git a/src/MeoAssistant/Task/Infrast/InfrastProductionTask.h b/src/MaaCore/Task/Infrast/InfrastProductionTask.h similarity index 100% rename from src/MeoAssistant/Task/Infrast/InfrastProductionTask.h rename to src/MaaCore/Task/Infrast/InfrastProductionTask.h diff --git a/src/MeoAssistant/Task/Infrast/InfrastReceptionTask.cpp b/src/MaaCore/Task/Infrast/InfrastReceptionTask.cpp similarity index 100% rename from src/MeoAssistant/Task/Infrast/InfrastReceptionTask.cpp rename to src/MaaCore/Task/Infrast/InfrastReceptionTask.cpp diff --git a/src/MeoAssistant/Task/Infrast/InfrastReceptionTask.h b/src/MaaCore/Task/Infrast/InfrastReceptionTask.h similarity index 100% rename from src/MeoAssistant/Task/Infrast/InfrastReceptionTask.h rename to src/MaaCore/Task/Infrast/InfrastReceptionTask.h diff --git a/src/MeoAssistant/Task/Infrast/InfrastTradeTask.cpp b/src/MaaCore/Task/Infrast/InfrastTradeTask.cpp similarity index 100% rename from src/MeoAssistant/Task/Infrast/InfrastTradeTask.cpp rename to src/MaaCore/Task/Infrast/InfrastTradeTask.cpp diff --git a/src/MeoAssistant/Task/Infrast/InfrastTradeTask.h b/src/MaaCore/Task/Infrast/InfrastTradeTask.h similarity index 100% rename from src/MeoAssistant/Task/Infrast/InfrastTradeTask.h rename to src/MaaCore/Task/Infrast/InfrastTradeTask.h diff --git a/src/MeoAssistant/Task/Infrast/ReplenishOriginiumShardTaskPlugin.cpp b/src/MaaCore/Task/Infrast/ReplenishOriginiumShardTaskPlugin.cpp similarity index 100% rename from src/MeoAssistant/Task/Infrast/ReplenishOriginiumShardTaskPlugin.cpp rename to src/MaaCore/Task/Infrast/ReplenishOriginiumShardTaskPlugin.cpp diff --git a/src/MeoAssistant/Task/Infrast/ReplenishOriginiumShardTaskPlugin.h b/src/MaaCore/Task/Infrast/ReplenishOriginiumShardTaskPlugin.h similarity index 100% rename from src/MeoAssistant/Task/Infrast/ReplenishOriginiumShardTaskPlugin.h rename to src/MaaCore/Task/Infrast/ReplenishOriginiumShardTaskPlugin.h diff --git a/src/MeoAssistant/Task/Interface/AwardTask.cpp b/src/MaaCore/Task/Interface/AwardTask.cpp similarity index 100% rename from src/MeoAssistant/Task/Interface/AwardTask.cpp rename to src/MaaCore/Task/Interface/AwardTask.cpp diff --git a/src/MeoAssistant/Task/Interface/AwardTask.h b/src/MaaCore/Task/Interface/AwardTask.h similarity index 100% rename from src/MeoAssistant/Task/Interface/AwardTask.h rename to src/MaaCore/Task/Interface/AwardTask.h diff --git a/src/MeoAssistant/Task/Interface/CloseDownTask.cpp b/src/MaaCore/Task/Interface/CloseDownTask.cpp similarity index 100% rename from src/MeoAssistant/Task/Interface/CloseDownTask.cpp rename to src/MaaCore/Task/Interface/CloseDownTask.cpp diff --git a/src/MeoAssistant/Task/Interface/CloseDownTask.h b/src/MaaCore/Task/Interface/CloseDownTask.h similarity index 100% rename from src/MeoAssistant/Task/Interface/CloseDownTask.h rename to src/MaaCore/Task/Interface/CloseDownTask.h diff --git a/src/MeoAssistant/Task/Interface/CopilotTask.cpp b/src/MaaCore/Task/Interface/CopilotTask.cpp similarity index 100% rename from src/MeoAssistant/Task/Interface/CopilotTask.cpp rename to src/MaaCore/Task/Interface/CopilotTask.cpp diff --git a/src/MeoAssistant/Task/Interface/CopilotTask.h b/src/MaaCore/Task/Interface/CopilotTask.h similarity index 100% rename from src/MeoAssistant/Task/Interface/CopilotTask.h rename to src/MaaCore/Task/Interface/CopilotTask.h diff --git a/src/MeoAssistant/Task/Interface/DebugTask.cpp b/src/MaaCore/Task/Interface/DebugTask.cpp similarity index 100% rename from src/MeoAssistant/Task/Interface/DebugTask.cpp rename to src/MaaCore/Task/Interface/DebugTask.cpp diff --git a/src/MeoAssistant/Task/Interface/DebugTask.h b/src/MaaCore/Task/Interface/DebugTask.h similarity index 100% rename from src/MeoAssistant/Task/Interface/DebugTask.h rename to src/MaaCore/Task/Interface/DebugTask.h diff --git a/src/MeoAssistant/Task/Interface/DepotTask.cpp b/src/MaaCore/Task/Interface/DepotTask.cpp similarity index 100% rename from src/MeoAssistant/Task/Interface/DepotTask.cpp rename to src/MaaCore/Task/Interface/DepotTask.cpp diff --git a/src/MeoAssistant/Task/Interface/DepotTask.h b/src/MaaCore/Task/Interface/DepotTask.h similarity index 100% rename from src/MeoAssistant/Task/Interface/DepotTask.h rename to src/MaaCore/Task/Interface/DepotTask.h diff --git a/src/MeoAssistant/Task/Interface/FightTask.cpp b/src/MaaCore/Task/Interface/FightTask.cpp similarity index 100% rename from src/MeoAssistant/Task/Interface/FightTask.cpp rename to src/MaaCore/Task/Interface/FightTask.cpp diff --git a/src/MeoAssistant/Task/Interface/FightTask.h b/src/MaaCore/Task/Interface/FightTask.h similarity index 100% rename from src/MeoAssistant/Task/Interface/FightTask.h rename to src/MaaCore/Task/Interface/FightTask.h diff --git a/src/MeoAssistant/Task/Interface/InfrastTask.cpp b/src/MaaCore/Task/Interface/InfrastTask.cpp similarity index 100% rename from src/MeoAssistant/Task/Interface/InfrastTask.cpp rename to src/MaaCore/Task/Interface/InfrastTask.cpp diff --git a/src/MeoAssistant/Task/Interface/InfrastTask.h b/src/MaaCore/Task/Interface/InfrastTask.h similarity index 100% rename from src/MeoAssistant/Task/Interface/InfrastTask.h rename to src/MaaCore/Task/Interface/InfrastTask.h diff --git a/src/MeoAssistant/Task/Interface/MallTask.cpp b/src/MaaCore/Task/Interface/MallTask.cpp similarity index 100% rename from src/MeoAssistant/Task/Interface/MallTask.cpp rename to src/MaaCore/Task/Interface/MallTask.cpp diff --git a/src/MeoAssistant/Task/Interface/MallTask.h b/src/MaaCore/Task/Interface/MallTask.h similarity index 100% rename from src/MeoAssistant/Task/Interface/MallTask.h rename to src/MaaCore/Task/Interface/MallTask.h diff --git a/src/MeoAssistant/Task/Interface/RecruitTask.cpp b/src/MaaCore/Task/Interface/RecruitTask.cpp similarity index 100% rename from src/MeoAssistant/Task/Interface/RecruitTask.cpp rename to src/MaaCore/Task/Interface/RecruitTask.cpp diff --git a/src/MeoAssistant/Task/Interface/RecruitTask.h b/src/MaaCore/Task/Interface/RecruitTask.h similarity index 100% rename from src/MeoAssistant/Task/Interface/RecruitTask.h rename to src/MaaCore/Task/Interface/RecruitTask.h diff --git a/src/MeoAssistant/Task/Interface/RoguelikeTask.cpp b/src/MaaCore/Task/Interface/RoguelikeTask.cpp similarity index 100% rename from src/MeoAssistant/Task/Interface/RoguelikeTask.cpp rename to src/MaaCore/Task/Interface/RoguelikeTask.cpp diff --git a/src/MeoAssistant/Task/Interface/RoguelikeTask.h b/src/MaaCore/Task/Interface/RoguelikeTask.h similarity index 100% rename from src/MeoAssistant/Task/Interface/RoguelikeTask.h rename to src/MaaCore/Task/Interface/RoguelikeTask.h diff --git a/src/MeoAssistant/Task/Interface/StartUpTask.cpp b/src/MaaCore/Task/Interface/StartUpTask.cpp similarity index 100% rename from src/MeoAssistant/Task/Interface/StartUpTask.cpp rename to src/MaaCore/Task/Interface/StartUpTask.cpp diff --git a/src/MeoAssistant/Task/Interface/StartUpTask.h b/src/MaaCore/Task/Interface/StartUpTask.h similarity index 100% rename from src/MeoAssistant/Task/Interface/StartUpTask.h rename to src/MaaCore/Task/Interface/StartUpTask.h diff --git a/src/MeoAssistant/Task/InterfaceTask.h b/src/MaaCore/Task/InterfaceTask.h similarity index 100% rename from src/MeoAssistant/Task/InterfaceTask.h rename to src/MaaCore/Task/InterfaceTask.h diff --git a/src/MeoAssistant/Task/Miscellaneous/AutoRecruitTask.cpp b/src/MaaCore/Task/Miscellaneous/AutoRecruitTask.cpp similarity index 95% rename from src/MeoAssistant/Task/Miscellaneous/AutoRecruitTask.cpp rename to src/MaaCore/Task/Miscellaneous/AutoRecruitTask.cpp index cc506783b0..3f9b00929d 100644 --- a/src/MeoAssistant/Task/Miscellaneous/AutoRecruitTask.cpp +++ b/src/MaaCore/Task/Miscellaneous/AutoRecruitTask.cpp @@ -27,11 +27,11 @@ namespace asst::recruit_calc rcs_with_single_tag.reserve(tags.size()); ranges::transform(tags, std::back_inserter(rcs_with_single_tag), [](const RecruitConfig::TagId& t) { RecruitCombs result; - result.tags = { t }; - result.min_level = 6; - result.max_level = 0; - result.avg_level = 0; - return result; + result.tags = { t }; + result.min_level = 6; + result.max_level = 0; + result.avg_level = 0; + return result; }); for (const auto& op : all_ops) { @@ -378,7 +378,7 @@ asst::AutoRecruitTask::calc_task_result_type asst::AutoRecruitTask::recruit_calc callback(AsstMsg::SubTaskExtraInfo, cb_info); } - // robot tags + // robot tags const std::vector RobotTags = { "支援机械" }; if (auto robot_iter = ranges::find_first_of(RobotTags, tag_ids); robot_iter != RobotTags.cend()) [[unlikely]] { has_robot_tag = true; @@ -399,7 +399,7 @@ asst::AutoRecruitTask::calc_task_result_type asst::AutoRecruitTask::recruit_calc rc.min_level = sec->level; rc.avg_level = std::transform_reduce(sec, rc.opers.end(), 0., std::plus {}, std::mem_fn(&RecruitOperInfo::level)) / - static_cast(std::distance(sec, rc.opers.end())); + static_cast(std::distance(sec, rc.opers.end())); } } } @@ -413,14 +413,14 @@ asst::AutoRecruitTask::calc_task_result_type asst::AutoRecruitTask::recruit_calc if (l_has != r_has) return l_has > r_has; } - if (lhs.min_level != rhs.min_level) - return lhs.min_level > rhs.min_level; // 最小等级大的，排前面 - else if (lhs.max_level != rhs.max_level) - return lhs.max_level > rhs.max_level; // 最大等级大的，排前面 - else if (std::fabs(lhs.avg_level - rhs.avg_level) > DoubleDiff) - return lhs.avg_level > rhs.avg_level; // 平均等级高的，排前面 - else - return lhs.tags.size() < rhs.tags.size(); // Tag数量少的，排前面 + if (lhs.min_level != rhs.min_level) + return lhs.min_level > rhs.min_level; // 最小等级大的，排前面 + else if (lhs.max_level != rhs.max_level) + return lhs.max_level > rhs.max_level; // 最大等级大的，排前面 + else if (std::fabs(lhs.avg_level - rhs.avg_level) > DoubleDiff) + return lhs.avg_level > rhs.avg_level; // 平均等级高的，排前面 + else + return lhs.tags.size() < rhs.tags.size(); // Tag数量少的，排前面 }); if (result_vec.empty()) continue; @@ -481,7 +481,7 @@ asst::AutoRecruitTask::calc_task_result_type asst::AutoRecruitTask::recruit_calc json::value cb_info = basic_info(); cb_info["what"] = "RecruitError"; cb_info["why"] = "刷新次数达到上限"; - cb_info["details"] = json::object { { "refresh_limit", refresh_limit } }; + cb_info["details"] = json::object{ { "refresh_limit", refresh_limit } }; callback(AsstMsg::SubTaskError, cb_info); return {}; } @@ -496,7 +496,7 @@ asst::AutoRecruitTask::calc_task_result_type asst::AutoRecruitTask::recruit_calc { json::value cb_info = basic_info(); cb_info["what"] = "RecruitTagsRefreshed"; - cb_info["details"] = json::object { + cb_info["details"] = json::object{ { "count", refresh_count }, { "refresh_limit", refresh_limit }, }; @@ -566,7 +566,7 @@ asst::AutoRecruitTask::calc_task_result_type asst::AutoRecruitTask::recruit_calc { json::value cb_info = basic_info(); cb_info["what"] = "RecruitTagsSelected"; - cb_info["details"] = json::object { { "tags", json::array(get_tag_names(final_combination.tags)) } }; + cb_info["details"] = json::object{ { "tags", json::array(get_tag_names(final_combination.tags)) } }; callback(AsstMsg::SubTaskExtraInfo, cb_info); } @@ -652,7 +652,7 @@ bool asst::AutoRecruitTask::hire_all(const cv::Mat& image) if (hire_searcher.get_result().empty()) return true; } // hire all - return ProcessTask { *this, { "RecruitFinish" } }.run(); + return ProcessTask{ *this, { "RecruitFinish" } }.run(); } /// search for blue *Hire* buttons in the recruit home page, mark those slot clean and do hiring @@ -704,13 +704,13 @@ void asst::AutoRecruitTask::upload_to_penguin(Rng&& tags) body["stageId"] = "recruit"; auto& all_drops = body["drops"]; for (const auto& tag : tags) { - all_drops.array_emplace(json::object { + all_drops.array_emplace(json::object{ { "dropType", "NORMAL_DROP" }, { "itemId", tag }, { "quantity", 1 }, }); } - body["source"] = "MeoAssistant"; + body["source"] = "MaaCore"; body["version"] = Version; std::string extra_param; @@ -735,7 +735,7 @@ void asst::AutoRecruitTask::upload_to_yituliu(const json::value& details) json::value body = details; body["server"] = m_server; - body["source"] = "MeoAssistant"; + body["source"] = "MaaCore"; body["version"] = Version; body["uuid"] = /* m_yituliu_id */ m_penguin_id; diff --git a/src/MeoAssistant/Task/Miscellaneous/AutoRecruitTask.h b/src/MaaCore/Task/Miscellaneous/AutoRecruitTask.h similarity index 100% rename from src/MeoAssistant/Task/Miscellaneous/AutoRecruitTask.h rename to src/MaaCore/Task/Miscellaneous/AutoRecruitTask.h diff --git a/src/MeoAssistant/Task/Miscellaneous/BattleFormationTask.cpp b/src/MaaCore/Task/Miscellaneous/BattleFormationTask.cpp similarity index 100% rename from src/MeoAssistant/Task/Miscellaneous/BattleFormationTask.cpp rename to src/MaaCore/Task/Miscellaneous/BattleFormationTask.cpp diff --git a/src/MeoAssistant/Task/Miscellaneous/BattleFormationTask.h b/src/MaaCore/Task/Miscellaneous/BattleFormationTask.h similarity index 100% rename from src/MeoAssistant/Task/Miscellaneous/BattleFormationTask.h rename to src/MaaCore/Task/Miscellaneous/BattleFormationTask.h diff --git a/src/MeoAssistant/Task/Miscellaneous/BattleProcessTask.cpp b/src/MaaCore/Task/Miscellaneous/BattleProcessTask.cpp similarity index 100% rename from src/MeoAssistant/Task/Miscellaneous/BattleProcessTask.cpp rename to src/MaaCore/Task/Miscellaneous/BattleProcessTask.cpp diff --git a/src/MeoAssistant/Task/Miscellaneous/BattleProcessTask.h b/src/MaaCore/Task/Miscellaneous/BattleProcessTask.h similarity index 100% rename from src/MeoAssistant/Task/Miscellaneous/BattleProcessTask.h rename to src/MaaCore/Task/Miscellaneous/BattleProcessTask.h diff --git a/src/MeoAssistant/Task/Miscellaneous/CreditFightTask.cpp b/src/MaaCore/Task/Miscellaneous/CreditFightTask.cpp similarity index 100% rename from src/MeoAssistant/Task/Miscellaneous/CreditFightTask.cpp rename to src/MaaCore/Task/Miscellaneous/CreditFightTask.cpp diff --git a/src/MeoAssistant/Task/Miscellaneous/CreditFightTask.h b/src/MaaCore/Task/Miscellaneous/CreditFightTask.h similarity index 100% rename from src/MeoAssistant/Task/Miscellaneous/CreditFightTask.h rename to src/MaaCore/Task/Miscellaneous/CreditFightTask.h diff --git a/src/MeoAssistant/Task/Miscellaneous/CreditShoppingTask.cpp b/src/MaaCore/Task/Miscellaneous/CreditShoppingTask.cpp similarity index 100% rename from src/MeoAssistant/Task/Miscellaneous/CreditShoppingTask.cpp rename to src/MaaCore/Task/Miscellaneous/CreditShoppingTask.cpp diff --git a/src/MeoAssistant/Task/Miscellaneous/CreditShoppingTask.h b/src/MaaCore/Task/Miscellaneous/CreditShoppingTask.h similarity index 100% rename from src/MeoAssistant/Task/Miscellaneous/CreditShoppingTask.h rename to src/MaaCore/Task/Miscellaneous/CreditShoppingTask.h diff --git a/src/MeoAssistant/Task/Miscellaneous/DepotRecognitionTask.cpp b/src/MaaCore/Task/Miscellaneous/DepotRecognitionTask.cpp similarity index 100% rename from src/MeoAssistant/Task/Miscellaneous/DepotRecognitionTask.cpp rename to src/MaaCore/Task/Miscellaneous/DepotRecognitionTask.cpp diff --git a/src/MeoAssistant/Task/Miscellaneous/DepotRecognitionTask.h b/src/MaaCore/Task/Miscellaneous/DepotRecognitionTask.h similarity index 100% rename from src/MeoAssistant/Task/Miscellaneous/DepotRecognitionTask.h rename to src/MaaCore/Task/Miscellaneous/DepotRecognitionTask.h diff --git a/src/MeoAssistant/Task/Miscellaneous/GameCrashRestartTaskPlugin.cpp b/src/MaaCore/Task/Miscellaneous/GameCrashRestartTaskPlugin.cpp similarity index 100% rename from src/MeoAssistant/Task/Miscellaneous/GameCrashRestartTaskPlugin.cpp rename to src/MaaCore/Task/Miscellaneous/GameCrashRestartTaskPlugin.cpp diff --git a/src/MeoAssistant/Task/Miscellaneous/GameCrashRestartTaskPlugin.h b/src/MaaCore/Task/Miscellaneous/GameCrashRestartTaskPlugin.h similarity index 100% rename from src/MeoAssistant/Task/Miscellaneous/GameCrashRestartTaskPlugin.h rename to src/MaaCore/Task/Miscellaneous/GameCrashRestartTaskPlugin.h diff --git a/src/MeoAssistant/Task/Miscellaneous/StartGameTaskPlugin.cpp b/src/MaaCore/Task/Miscellaneous/StartGameTaskPlugin.cpp similarity index 100% rename from src/MeoAssistant/Task/Miscellaneous/StartGameTaskPlugin.cpp rename to src/MaaCore/Task/Miscellaneous/StartGameTaskPlugin.cpp diff --git a/src/MeoAssistant/Task/Miscellaneous/StartGameTaskPlugin.h b/src/MaaCore/Task/Miscellaneous/StartGameTaskPlugin.h similarity index 100% rename from src/MeoAssistant/Task/Miscellaneous/StartGameTaskPlugin.h rename to src/MaaCore/Task/Miscellaneous/StartGameTaskPlugin.h diff --git a/src/MeoAssistant/Task/Miscellaneous/StopGameTaskPlugin.cpp b/src/MaaCore/Task/Miscellaneous/StopGameTaskPlugin.cpp similarity index 100% rename from src/MeoAssistant/Task/Miscellaneous/StopGameTaskPlugin.cpp rename to src/MaaCore/Task/Miscellaneous/StopGameTaskPlugin.cpp diff --git a/src/MeoAssistant/Task/Miscellaneous/StopGameTaskPlugin.h b/src/MaaCore/Task/Miscellaneous/StopGameTaskPlugin.h similarity index 100% rename from src/MeoAssistant/Task/Miscellaneous/StopGameTaskPlugin.h rename to src/MaaCore/Task/Miscellaneous/StopGameTaskPlugin.h diff --git a/src/MeoAssistant/Task/PackageTask.cpp b/src/MaaCore/Task/PackageTask.cpp similarity index 100% rename from src/MeoAssistant/Task/PackageTask.cpp rename to src/MaaCore/Task/PackageTask.cpp diff --git a/src/MeoAssistant/Task/PackageTask.h b/src/MaaCore/Task/PackageTask.h similarity index 100% rename from src/MeoAssistant/Task/PackageTask.h rename to src/MaaCore/Task/PackageTask.h diff --git a/src/MeoAssistant/Task/ProcessTask.cpp b/src/MaaCore/Task/ProcessTask.cpp similarity index 100% rename from src/MeoAssistant/Task/ProcessTask.cpp rename to src/MaaCore/Task/ProcessTask.cpp diff --git a/src/MeoAssistant/Task/ProcessTask.h b/src/MaaCore/Task/ProcessTask.h similarity index 100% rename from src/MeoAssistant/Task/ProcessTask.h rename to src/MaaCore/Task/ProcessTask.h diff --git a/src/MeoAssistant/Task/ReportDataTask.cpp b/src/MaaCore/Task/ReportDataTask.cpp similarity index 100% rename from src/MeoAssistant/Task/ReportDataTask.cpp rename to src/MaaCore/Task/ReportDataTask.cpp diff --git a/src/MeoAssistant/Task/ReportDataTask.h b/src/MaaCore/Task/ReportDataTask.h similarity index 100% rename from src/MeoAssistant/Task/ReportDataTask.h rename to src/MaaCore/Task/ReportDataTask.h diff --git a/src/MeoAssistant/Task/Roguelike/RoguelikeBattleTaskPlugin.cpp b/src/MaaCore/Task/Roguelike/RoguelikeBattleTaskPlugin.cpp similarity index 100% rename from src/MeoAssistant/Task/Roguelike/RoguelikeBattleTaskPlugin.cpp rename to src/MaaCore/Task/Roguelike/RoguelikeBattleTaskPlugin.cpp diff --git a/src/MeoAssistant/Task/Roguelike/RoguelikeBattleTaskPlugin.h b/src/MaaCore/Task/Roguelike/RoguelikeBattleTaskPlugin.h similarity index 100% rename from src/MeoAssistant/Task/Roguelike/RoguelikeBattleTaskPlugin.h rename to src/MaaCore/Task/Roguelike/RoguelikeBattleTaskPlugin.h diff --git a/src/MeoAssistant/Task/Roguelike/RoguelikeControlTaskPlugin.cpp b/src/MaaCore/Task/Roguelike/RoguelikeControlTaskPlugin.cpp similarity index 100% rename from src/MeoAssistant/Task/Roguelike/RoguelikeControlTaskPlugin.cpp rename to src/MaaCore/Task/Roguelike/RoguelikeControlTaskPlugin.cpp diff --git a/src/MeoAssistant/Task/Roguelike/RoguelikeControlTaskPlugin.h b/src/MaaCore/Task/Roguelike/RoguelikeControlTaskPlugin.h similarity index 100% rename from src/MeoAssistant/Task/Roguelike/RoguelikeControlTaskPlugin.h rename to src/MaaCore/Task/Roguelike/RoguelikeControlTaskPlugin.h diff --git a/src/MeoAssistant/Task/Roguelike/RoguelikeCustomStartTaskPlugin.cpp b/src/MaaCore/Task/Roguelike/RoguelikeCustomStartTaskPlugin.cpp similarity index 100% rename from src/MeoAssistant/Task/Roguelike/RoguelikeCustomStartTaskPlugin.cpp rename to src/MaaCore/Task/Roguelike/RoguelikeCustomStartTaskPlugin.cpp diff --git a/src/MeoAssistant/Task/Roguelike/RoguelikeCustomStartTaskPlugin.h b/src/MaaCore/Task/Roguelike/RoguelikeCustomStartTaskPlugin.h similarity index 100% rename from src/MeoAssistant/Task/Roguelike/RoguelikeCustomStartTaskPlugin.h rename to src/MaaCore/Task/Roguelike/RoguelikeCustomStartTaskPlugin.h diff --git a/src/MeoAssistant/Task/Roguelike/RoguelikeDebugTaskPlugin.cpp b/src/MaaCore/Task/Roguelike/RoguelikeDebugTaskPlugin.cpp similarity index 100% rename from src/MeoAssistant/Task/Roguelike/RoguelikeDebugTaskPlugin.cpp rename to src/MaaCore/Task/Roguelike/RoguelikeDebugTaskPlugin.cpp diff --git a/src/MeoAssistant/Task/Roguelike/RoguelikeDebugTaskPlugin.h b/src/MaaCore/Task/Roguelike/RoguelikeDebugTaskPlugin.h similarity index 100% rename from src/MeoAssistant/Task/Roguelike/RoguelikeDebugTaskPlugin.h rename to src/MaaCore/Task/Roguelike/RoguelikeDebugTaskPlugin.h diff --git a/src/MeoAssistant/Task/Roguelike/RoguelikeFormationTaskPlugin.cpp b/src/MaaCore/Task/Roguelike/RoguelikeFormationTaskPlugin.cpp similarity index 100% rename from src/MeoAssistant/Task/Roguelike/RoguelikeFormationTaskPlugin.cpp rename to src/MaaCore/Task/Roguelike/RoguelikeFormationTaskPlugin.cpp diff --git a/src/MeoAssistant/Task/Roguelike/RoguelikeFormationTaskPlugin.h b/src/MaaCore/Task/Roguelike/RoguelikeFormationTaskPlugin.h similarity index 100% rename from src/MeoAssistant/Task/Roguelike/RoguelikeFormationTaskPlugin.h rename to src/MaaCore/Task/Roguelike/RoguelikeFormationTaskPlugin.h diff --git a/src/MeoAssistant/Task/Roguelike/RoguelikeRecruitTaskPlugin.cpp b/src/MaaCore/Task/Roguelike/RoguelikeRecruitTaskPlugin.cpp similarity index 100% rename from src/MeoAssistant/Task/Roguelike/RoguelikeRecruitTaskPlugin.cpp rename to src/MaaCore/Task/Roguelike/RoguelikeRecruitTaskPlugin.cpp diff --git a/src/MeoAssistant/Task/Roguelike/RoguelikeRecruitTaskPlugin.h b/src/MaaCore/Task/Roguelike/RoguelikeRecruitTaskPlugin.h similarity index 100% rename from src/MeoAssistant/Task/Roguelike/RoguelikeRecruitTaskPlugin.h rename to src/MaaCore/Task/Roguelike/RoguelikeRecruitTaskPlugin.h diff --git a/src/MeoAssistant/Task/Roguelike/RoguelikeResetTaskPlugin.cpp b/src/MaaCore/Task/Roguelike/RoguelikeResetTaskPlugin.cpp similarity index 100% rename from src/MeoAssistant/Task/Roguelike/RoguelikeResetTaskPlugin.cpp rename to src/MaaCore/Task/Roguelike/RoguelikeResetTaskPlugin.cpp diff --git a/src/MeoAssistant/Task/Roguelike/RoguelikeResetTaskPlugin.h b/src/MaaCore/Task/Roguelike/RoguelikeResetTaskPlugin.h similarity index 100% rename from src/MeoAssistant/Task/Roguelike/RoguelikeResetTaskPlugin.h rename to src/MaaCore/Task/Roguelike/RoguelikeResetTaskPlugin.h diff --git a/src/MeoAssistant/Task/Roguelike/RoguelikeShoppingTaskPlugin.cpp b/src/MaaCore/Task/Roguelike/RoguelikeShoppingTaskPlugin.cpp similarity index 100% rename from src/MeoAssistant/Task/Roguelike/RoguelikeShoppingTaskPlugin.cpp rename to src/MaaCore/Task/Roguelike/RoguelikeShoppingTaskPlugin.cpp diff --git a/src/MeoAssistant/Task/Roguelike/RoguelikeShoppingTaskPlugin.h b/src/MaaCore/Task/Roguelike/RoguelikeShoppingTaskPlugin.h similarity index 100% rename from src/MeoAssistant/Task/Roguelike/RoguelikeShoppingTaskPlugin.h rename to src/MaaCore/Task/Roguelike/RoguelikeShoppingTaskPlugin.h diff --git a/src/MeoAssistant/Task/Roguelike/RoguelikeSkillSelectionTaskPlugin.cpp b/src/MaaCore/Task/Roguelike/RoguelikeSkillSelectionTaskPlugin.cpp similarity index 100% rename from src/MeoAssistant/Task/Roguelike/RoguelikeSkillSelectionTaskPlugin.cpp rename to src/MaaCore/Task/Roguelike/RoguelikeSkillSelectionTaskPlugin.cpp diff --git a/src/MeoAssistant/Task/Roguelike/RoguelikeSkillSelectionTaskPlugin.h b/src/MaaCore/Task/Roguelike/RoguelikeSkillSelectionTaskPlugin.h similarity index 100% rename from src/MeoAssistant/Task/Roguelike/RoguelikeSkillSelectionTaskPlugin.h rename to src/MaaCore/Task/Roguelike/RoguelikeSkillSelectionTaskPlugin.h diff --git a/src/MeoAssistant/Utils/Demangle.hpp b/src/MaaCore/Utils/Demangle.hpp similarity index 100% rename from src/MeoAssistant/Utils/Demangle.hpp rename to src/MaaCore/Utils/Demangle.hpp diff --git a/src/MeoAssistant/Utils/Http.hpp b/src/MaaCore/Utils/Http.hpp similarity index 100% rename from src/MeoAssistant/Utils/Http.hpp rename to src/MaaCore/Utils/Http.hpp diff --git a/src/MeoAssistant/Utils/ImageIo.hpp b/src/MaaCore/Utils/ImageIo.hpp similarity index 100% rename from src/MeoAssistant/Utils/ImageIo.hpp rename to src/MaaCore/Utils/ImageIo.hpp diff --git a/src/MeoAssistant/Utils/Locale.hpp b/src/MaaCore/Utils/Locale.hpp similarity index 100% rename from src/MeoAssistant/Utils/Locale.hpp rename to src/MaaCore/Utils/Locale.hpp diff --git a/src/MeoAssistant/Utils/Logger.hpp b/src/MaaCore/Utils/Logger.hpp similarity index 93% rename from src/MeoAssistant/Utils/Logger.hpp rename to src/MaaCore/Utils/Logger.hpp index 90917bc3b2..1df3665983 100644 --- a/src/MeoAssistant/Utils/Logger.hpp +++ b/src/MaaCore/Utils/Logger.hpp @@ -32,17 +32,21 @@ namespace asst // is_reference_wrapper template - struct is_reference_wrapper : std::false_type - {}; + struct is_reference_wrapper: std::false_type + { + }; template - struct is_reference_wrapper> : std::true_type - {}; + struct is_reference_wrapper>: std::true_type + { + }; template - struct is_reference_wrapper&> : std::true_type - {}; + struct is_reference_wrapper&>: std::true_type + { + }; template - struct is_reference_wrapper&&> : std::true_type - {}; + struct is_reference_wrapper&&>: std::true_type + { + }; template inline constexpr bool is_reference_wrapper_v = is_reference_wrapper::value; @@ -123,12 +127,12 @@ namespace asst toansi_ostream& operator=(toansi_ostream&&) = default; toansi_ostream& operator=(const toansi_ostream&) = default; - toansi_ostream(std::ostream& stream) : m_ofs(stream) {} + toansi_ostream(std::ostream& stream): m_ofs(stream) {} - toansi_ostream(std::reference_wrapper stream) : m_ofs(stream) {} + toansi_ostream(std::reference_wrapper stream): m_ofs(stream) {} template - requires has_stream_insertion_operator + requires has_stream_insertion_operator toansi_ostream& operator<<(T&& v) { if constexpr (std::convertible_to) { @@ -158,10 +162,10 @@ namespace asst ostreams& operator=(ostreams&&) = default; ostreams& operator=(const ostreams&) = default; - ostreams(Args&&... args) : m_ofss(std::forward(args)...) {} + ostreams(Args&&... args): m_ofss(std::forward(args)...) {} template - requires has_stream_insertion_operator + requires has_stream_insertion_operator ostreams& operator<<(T&& x) { streams_put(m_ofss, x, std::index_sequence_for {}); @@ -188,7 +192,7 @@ namespace asst template ostreams(Args&&...) -> ostreams...>; - class Logger : public SingletonHolder + class Logger: public SingletonHolder { public: struct separator @@ -196,7 +200,7 @@ namespace asst constexpr separator() = default; constexpr separator(const separator&) = default; constexpr separator(separator&&) noexcept = default; - constexpr explicit separator(std::string_view s) noexcept : str(s) {} + constexpr explicit separator(std::string_view s) noexcept: str(s) {} constexpr separator& operator=(const separator&) = default; constexpr separator& operator=(separator&&) noexcept = default; constexpr separator& operator=(std::string_view s) noexcept @@ -218,7 +222,7 @@ namespace asst { constexpr level(const level&) = default; constexpr level(level&&) noexcept = default; - constexpr explicit level(std::string_view s) noexcept : str(s) {} + constexpr explicit level(std::string_view s) noexcept: str(s) {} constexpr level& operator=(const level&) = default; constexpr level& operator=(level&&) noexcept = default; constexpr level& operator=(std::string_view s) noexcept @@ -257,7 +261,7 @@ namespace asst } template - LogStream(std::mutex& mtx, _stream_t&& ofs, Logger::level lv) : m_trace_lock(mtx), m_ofs(ofs) + LogStream(std::mutex& mtx, _stream_t&& ofs, Logger::level lv): m_trace_lock(mtx), m_ofs(ofs) { *this << lv; } @@ -309,7 +313,7 @@ namespace asst } else if constexpr (ranges::input_range) { s << "["; - std::string_view comma_space {}; + std::string_view comma_space{}; for (const auto& elem : std::forward(v)) { s << comma_space; stream_put(s, elem); @@ -366,14 +370,14 @@ namespace asst } if constexpr (std::same_as>) { #ifdef ASST_DEBUG - return LogStream(m_trace_mutex, ostreams { toansi_ostream(std::cout), m_ofs }, arg); + return LogStream(m_trace_mutex, ostreams{ toansi_ostream(std::cout), m_ofs }, arg); #else return LogStream(m_trace_mutex, m_ofs, arg); #endif } else { #ifdef ASST_DEBUG - return LogStream(m_trace_mutex, ostreams { toansi_ostream(std::cout), m_ofs }, level::trace, arg); + return LogStream(m_trace_mutex, ostreams{ toansi_ostream(std::cout), m_ofs }, level::trace, arg); #else return LogStream(m_trace_mutex, m_ofs, level::trace, arg); #endif @@ -424,7 +428,7 @@ namespace asst private: friend class SingletonHolder; - Logger() : m_directory(UserDir.get()) + Logger(): m_directory(UserDir.get()) { check_filesize_and_remove(); log_init_info(); @@ -447,7 +451,7 @@ namespace asst void log_init_info() { trace("-----------------------------"); - trace("MeoAssistant Process Start"); + trace("MaaCore Process Start"); trace("Version", asst::Version); trace("Built at", __DATE__, __TIME__); trace("User Dir", m_directory); diff --git a/src/MeoAssistant/Utils/Meta.hpp b/src/MaaCore/Utils/Meta.hpp similarity index 100% rename from src/MeoAssistant/Utils/Meta.hpp rename to src/MaaCore/Utils/Meta.hpp diff --git a/src/MeoAssistant/Utils/NoWarningCV.h b/src/MaaCore/Utils/NoWarningCV.h similarity index 100% rename from src/MeoAssistant/Utils/NoWarningCV.h rename to src/MaaCore/Utils/NoWarningCV.h diff --git a/src/MeoAssistant/Utils/NoWarningCVMat.h b/src/MaaCore/Utils/NoWarningCVMat.h similarity index 100% rename from src/MeoAssistant/Utils/NoWarningCVMat.h rename to src/MaaCore/Utils/NoWarningCVMat.h diff --git a/src/MeoAssistant/Utils/Platform.hpp b/src/MaaCore/Utils/Platform.hpp similarity index 100% rename from src/MeoAssistant/Utils/Platform.hpp rename to src/MaaCore/Utils/Platform.hpp diff --git a/src/MeoAssistant/Utils/Platform/Platform.h b/src/MaaCore/Utils/Platform/Platform.h similarity index 100% rename from src/MeoAssistant/Utils/Platform/Platform.h rename to src/MaaCore/Utils/Platform/Platform.h diff --git a/src/MeoAssistant/Utils/Platform/PlatformPosix.cpp b/src/MaaCore/Utils/Platform/PlatformPosix.cpp similarity index 100% rename from src/MeoAssistant/Utils/Platform/PlatformPosix.cpp rename to src/MaaCore/Utils/Platform/PlatformPosix.cpp diff --git a/src/MeoAssistant/Utils/Platform/PlatformPosix.h b/src/MaaCore/Utils/Platform/PlatformPosix.h similarity index 100% rename from src/MeoAssistant/Utils/Platform/PlatformPosix.h rename to src/MaaCore/Utils/Platform/PlatformPosix.h diff --git a/src/MeoAssistant/Utils/Platform/PlatformWin32.cpp b/src/MaaCore/Utils/Platform/PlatformWin32.cpp similarity index 100% rename from src/MeoAssistant/Utils/Platform/PlatformWin32.cpp rename to src/MaaCore/Utils/Platform/PlatformWin32.cpp diff --git a/src/MeoAssistant/Utils/Platform/PlatformWin32.h b/src/MaaCore/Utils/Platform/PlatformWin32.h similarity index 100% rename from src/MeoAssistant/Utils/Platform/PlatformWin32.h rename to src/MaaCore/Utils/Platform/PlatformWin32.h diff --git a/src/MeoAssistant/Utils/Platform/SafeWindows.h b/src/MaaCore/Utils/Platform/SafeWindows.h similarity index 100% rename from src/MeoAssistant/Utils/Platform/SafeWindows.h rename to src/MaaCore/Utils/Platform/SafeWindows.h diff --git a/src/MeoAssistant/Utils/Ranges.hpp b/src/MaaCore/Utils/Ranges.hpp similarity index 100% rename from src/MeoAssistant/Utils/Ranges.hpp rename to src/MaaCore/Utils/Ranges.hpp diff --git a/src/MeoAssistant/Utils/SingletonHolder.hpp b/src/MaaCore/Utils/SingletonHolder.hpp similarity index 100% rename from src/MeoAssistant/Utils/SingletonHolder.hpp rename to src/MaaCore/Utils/SingletonHolder.hpp diff --git a/src/MeoAssistant/Utils/StringMisc.hpp b/src/MaaCore/Utils/StringMisc.hpp similarity index 100% rename from src/MeoAssistant/Utils/StringMisc.hpp rename to src/MaaCore/Utils/StringMisc.hpp diff --git a/src/MeoAssistant/Utils/Time.hpp b/src/MaaCore/Utils/Time.hpp similarity index 100% rename from src/MeoAssistant/Utils/Time.hpp rename to src/MaaCore/Utils/Time.hpp diff --git a/src/MeoAssistant/Utils/WorkingDir.hpp b/src/MaaCore/Utils/WorkingDir.hpp similarity index 100% rename from src/MeoAssistant/Utils/WorkingDir.hpp rename to src/MaaCore/Utils/WorkingDir.hpp diff --git a/src/MeoAssistant/Vision/AbstractImageAnalyzer.cpp b/src/MaaCore/Vision/AbstractImageAnalyzer.cpp similarity index 100% rename from src/MeoAssistant/Vision/AbstractImageAnalyzer.cpp rename to src/MaaCore/Vision/AbstractImageAnalyzer.cpp diff --git a/src/MeoAssistant/Vision/AbstractImageAnalyzer.h b/src/MaaCore/Vision/AbstractImageAnalyzer.h similarity index 100% rename from src/MeoAssistant/Vision/AbstractImageAnalyzer.h rename to src/MaaCore/Vision/AbstractImageAnalyzer.h diff --git a/src/MeoAssistant/Vision/HashImageAnalyzer.cpp b/src/MaaCore/Vision/HashImageAnalyzer.cpp similarity index 100% rename from src/MeoAssistant/Vision/HashImageAnalyzer.cpp rename to src/MaaCore/Vision/HashImageAnalyzer.cpp diff --git a/src/MeoAssistant/Vision/HashImageAnalyzer.h b/src/MaaCore/Vision/HashImageAnalyzer.h similarity index 100% rename from src/MeoAssistant/Vision/HashImageAnalyzer.h rename to src/MaaCore/Vision/HashImageAnalyzer.h diff --git a/src/MeoAssistant/Vision/Infrast/InfrastClueImageAnalyzer.cpp b/src/MaaCore/Vision/Infrast/InfrastClueImageAnalyzer.cpp similarity index 100% rename from src/MeoAssistant/Vision/Infrast/InfrastClueImageAnalyzer.cpp rename to src/MaaCore/Vision/Infrast/InfrastClueImageAnalyzer.cpp diff --git a/src/MeoAssistant/Vision/Infrast/InfrastClueImageAnalyzer.h b/src/MaaCore/Vision/Infrast/InfrastClueImageAnalyzer.h similarity index 100% rename from src/MeoAssistant/Vision/Infrast/InfrastClueImageAnalyzer.h rename to src/MaaCore/Vision/Infrast/InfrastClueImageAnalyzer.h diff --git a/src/MeoAssistant/Vision/Infrast/InfrastClueVacancyImageAnalyzer.cpp b/src/MaaCore/Vision/Infrast/InfrastClueVacancyImageAnalyzer.cpp similarity index 100% rename from src/MeoAssistant/Vision/Infrast/InfrastClueVacancyImageAnalyzer.cpp rename to src/MaaCore/Vision/Infrast/InfrastClueVacancyImageAnalyzer.cpp diff --git a/src/MeoAssistant/Vision/Infrast/InfrastClueVacancyImageAnalyzer.h b/src/MaaCore/Vision/Infrast/InfrastClueVacancyImageAnalyzer.h similarity index 100% rename from src/MeoAssistant/Vision/Infrast/InfrastClueVacancyImageAnalyzer.h rename to src/MaaCore/Vision/Infrast/InfrastClueVacancyImageAnalyzer.h diff --git a/src/MeoAssistant/Vision/Infrast/InfrastFacilityImageAnalyzer.cpp b/src/MaaCore/Vision/Infrast/InfrastFacilityImageAnalyzer.cpp similarity index 100% rename from src/MeoAssistant/Vision/Infrast/InfrastFacilityImageAnalyzer.cpp rename to src/MaaCore/Vision/Infrast/InfrastFacilityImageAnalyzer.cpp diff --git a/src/MeoAssistant/Vision/Infrast/InfrastFacilityImageAnalyzer.h b/src/MaaCore/Vision/Infrast/InfrastFacilityImageAnalyzer.h similarity index 100% rename from src/MeoAssistant/Vision/Infrast/InfrastFacilityImageAnalyzer.h rename to src/MaaCore/Vision/Infrast/InfrastFacilityImageAnalyzer.h diff --git a/src/MeoAssistant/Vision/Infrast/InfrastOperImageAnalyzer.cpp b/src/MaaCore/Vision/Infrast/InfrastOperImageAnalyzer.cpp similarity index 100% rename from src/MeoAssistant/Vision/Infrast/InfrastOperImageAnalyzer.cpp rename to src/MaaCore/Vision/Infrast/InfrastOperImageAnalyzer.cpp diff --git a/src/MeoAssistant/Vision/Infrast/InfrastOperImageAnalyzer.h b/src/MaaCore/Vision/Infrast/InfrastOperImageAnalyzer.h similarity index 100% rename from src/MeoAssistant/Vision/Infrast/InfrastOperImageAnalyzer.h rename to src/MaaCore/Vision/Infrast/InfrastOperImageAnalyzer.h diff --git a/src/MeoAssistant/Vision/Infrast/InfrastSmileyImageAnalyzer.cpp b/src/MaaCore/Vision/Infrast/InfrastSmileyImageAnalyzer.cpp similarity index 100% rename from src/MeoAssistant/Vision/Infrast/InfrastSmileyImageAnalyzer.cpp rename to src/MaaCore/Vision/Infrast/InfrastSmileyImageAnalyzer.cpp diff --git a/src/MeoAssistant/Vision/Infrast/InfrastSmileyImageAnalyzer.h b/src/MaaCore/Vision/Infrast/InfrastSmileyImageAnalyzer.h similarity index 100% rename from src/MeoAssistant/Vision/Infrast/InfrastSmileyImageAnalyzer.h rename to src/MaaCore/Vision/Infrast/InfrastSmileyImageAnalyzer.h diff --git a/src/MeoAssistant/Vision/MatchImageAnalyzer.cpp b/src/MaaCore/Vision/MatchImageAnalyzer.cpp similarity index 100% rename from src/MeoAssistant/Vision/MatchImageAnalyzer.cpp rename to src/MaaCore/Vision/MatchImageAnalyzer.cpp diff --git a/src/MeoAssistant/Vision/MatchImageAnalyzer.h b/src/MaaCore/Vision/MatchImageAnalyzer.h similarity index 100% rename from src/MeoAssistant/Vision/MatchImageAnalyzer.h rename to src/MaaCore/Vision/MatchImageAnalyzer.h diff --git a/src/MeoAssistant/Vision/Miscellaneous/BattleImageAnalyzer.cpp b/src/MaaCore/Vision/Miscellaneous/BattleImageAnalyzer.cpp similarity index 100% rename from src/MeoAssistant/Vision/Miscellaneous/BattleImageAnalyzer.cpp rename to src/MaaCore/Vision/Miscellaneous/BattleImageAnalyzer.cpp diff --git a/src/MeoAssistant/Vision/Miscellaneous/BattleImageAnalyzer.h b/src/MaaCore/Vision/Miscellaneous/BattleImageAnalyzer.h similarity index 100% rename from src/MeoAssistant/Vision/Miscellaneous/BattleImageAnalyzer.h rename to src/MaaCore/Vision/Miscellaneous/BattleImageAnalyzer.h diff --git a/src/MeoAssistant/Vision/Miscellaneous/CreditShopImageAnalyzer.cpp b/src/MaaCore/Vision/Miscellaneous/CreditShopImageAnalyzer.cpp similarity index 100% rename from src/MeoAssistant/Vision/Miscellaneous/CreditShopImageAnalyzer.cpp rename to src/MaaCore/Vision/Miscellaneous/CreditShopImageAnalyzer.cpp diff --git a/src/MeoAssistant/Vision/Miscellaneous/CreditShopImageAnalyzer.h b/src/MaaCore/Vision/Miscellaneous/CreditShopImageAnalyzer.h similarity index 100% rename from src/MeoAssistant/Vision/Miscellaneous/CreditShopImageAnalyzer.h rename to src/MaaCore/Vision/Miscellaneous/CreditShopImageAnalyzer.h diff --git a/src/MeoAssistant/Vision/Miscellaneous/DepotImageAnalyzer.cpp b/src/MaaCore/Vision/Miscellaneous/DepotImageAnalyzer.cpp similarity index 100% rename from src/MeoAssistant/Vision/Miscellaneous/DepotImageAnalyzer.cpp rename to src/MaaCore/Vision/Miscellaneous/DepotImageAnalyzer.cpp diff --git a/src/MeoAssistant/Vision/Miscellaneous/DepotImageAnalyzer.h b/src/MaaCore/Vision/Miscellaneous/DepotImageAnalyzer.h similarity index 100% rename from src/MeoAssistant/Vision/Miscellaneous/DepotImageAnalyzer.h rename to src/MaaCore/Vision/Miscellaneous/DepotImageAnalyzer.h diff --git a/src/MeoAssistant/Vision/Miscellaneous/ProcessTaskImageAnalyzer.cpp b/src/MaaCore/Vision/Miscellaneous/ProcessTaskImageAnalyzer.cpp similarity index 100% rename from src/MeoAssistant/Vision/Miscellaneous/ProcessTaskImageAnalyzer.cpp rename to src/MaaCore/Vision/Miscellaneous/ProcessTaskImageAnalyzer.cpp diff --git a/src/MeoAssistant/Vision/Miscellaneous/ProcessTaskImageAnalyzer.h b/src/MaaCore/Vision/Miscellaneous/ProcessTaskImageAnalyzer.h similarity index 100% rename from src/MeoAssistant/Vision/Miscellaneous/ProcessTaskImageAnalyzer.h rename to src/MaaCore/Vision/Miscellaneous/ProcessTaskImageAnalyzer.h diff --git a/src/MeoAssistant/Vision/Miscellaneous/RecruitImageAnalyzer.cpp b/src/MaaCore/Vision/Miscellaneous/RecruitImageAnalyzer.cpp similarity index 100% rename from src/MeoAssistant/Vision/Miscellaneous/RecruitImageAnalyzer.cpp rename to src/MaaCore/Vision/Miscellaneous/RecruitImageAnalyzer.cpp diff --git a/src/MeoAssistant/Vision/Miscellaneous/RecruitImageAnalyzer.h b/src/MaaCore/Vision/Miscellaneous/RecruitImageAnalyzer.h similarity index 100% rename from src/MeoAssistant/Vision/Miscellaneous/RecruitImageAnalyzer.h rename to src/MaaCore/Vision/Miscellaneous/RecruitImageAnalyzer.h diff --git a/src/MeoAssistant/Vision/MultiMatchImageAnalyzer.cpp b/src/MaaCore/Vision/MultiMatchImageAnalyzer.cpp similarity index 100% rename from src/MeoAssistant/Vision/MultiMatchImageAnalyzer.cpp rename to src/MaaCore/Vision/MultiMatchImageAnalyzer.cpp diff --git a/src/MeoAssistant/Vision/MultiMatchImageAnalyzer.h b/src/MaaCore/Vision/MultiMatchImageAnalyzer.h similarity index 100% rename from src/MeoAssistant/Vision/MultiMatchImageAnalyzer.h rename to src/MaaCore/Vision/MultiMatchImageAnalyzer.h diff --git a/src/MeoAssistant/Vision/OcrImageAnalyzer.cpp b/src/MaaCore/Vision/OcrImageAnalyzer.cpp similarity index 100% rename from src/MeoAssistant/Vision/OcrImageAnalyzer.cpp rename to src/MaaCore/Vision/OcrImageAnalyzer.cpp diff --git a/src/MeoAssistant/Vision/OcrImageAnalyzer.h b/src/MaaCore/Vision/OcrImageAnalyzer.h similarity index 100% rename from src/MeoAssistant/Vision/OcrImageAnalyzer.h rename to src/MaaCore/Vision/OcrImageAnalyzer.h diff --git a/src/MeoAssistant/Vision/OcrWithFlagTemplImageAnalyzer.cpp b/src/MaaCore/Vision/OcrWithFlagTemplImageAnalyzer.cpp similarity index 100% rename from src/MeoAssistant/Vision/OcrWithFlagTemplImageAnalyzer.cpp rename to src/MaaCore/Vision/OcrWithFlagTemplImageAnalyzer.cpp diff --git a/src/MeoAssistant/Vision/OcrWithFlagTemplImageAnalyzer.h b/src/MaaCore/Vision/OcrWithFlagTemplImageAnalyzer.h similarity index 100% rename from src/MeoAssistant/Vision/OcrWithFlagTemplImageAnalyzer.h rename to src/MaaCore/Vision/OcrWithFlagTemplImageAnalyzer.h diff --git a/src/MeoAssistant/Vision/OcrWithPreprocessImageAnalyzer.cpp b/src/MaaCore/Vision/OcrWithPreprocessImageAnalyzer.cpp similarity index 100% rename from src/MeoAssistant/Vision/OcrWithPreprocessImageAnalyzer.cpp rename to src/MaaCore/Vision/OcrWithPreprocessImageAnalyzer.cpp diff --git a/src/MeoAssistant/Vision/OcrWithPreprocessImageAnalyzer.h b/src/MaaCore/Vision/OcrWithPreprocessImageAnalyzer.h similarity index 100% rename from src/MeoAssistant/Vision/OcrWithPreprocessImageAnalyzer.h rename to src/MaaCore/Vision/OcrWithPreprocessImageAnalyzer.h diff --git a/src/MeoAssistant/Vision/Roguelike/RoguelikeFormationImageAnalyzer.cpp b/src/MaaCore/Vision/Roguelike/RoguelikeFormationImageAnalyzer.cpp similarity index 100% rename from src/MeoAssistant/Vision/Roguelike/RoguelikeFormationImageAnalyzer.cpp rename to src/MaaCore/Vision/Roguelike/RoguelikeFormationImageAnalyzer.cpp diff --git a/src/MeoAssistant/Vision/Roguelike/RoguelikeFormationImageAnalyzer.h b/src/MaaCore/Vision/Roguelike/RoguelikeFormationImageAnalyzer.h similarity index 100% rename from src/MeoAssistant/Vision/Roguelike/RoguelikeFormationImageAnalyzer.h rename to src/MaaCore/Vision/Roguelike/RoguelikeFormationImageAnalyzer.h diff --git a/src/MeoAssistant/Vision/Roguelike/RoguelikeRecruitImageAnalyzer.cpp b/src/MaaCore/Vision/Roguelike/RoguelikeRecruitImageAnalyzer.cpp similarity index 100% rename from src/MeoAssistant/Vision/Roguelike/RoguelikeRecruitImageAnalyzer.cpp rename to src/MaaCore/Vision/Roguelike/RoguelikeRecruitImageAnalyzer.cpp diff --git a/src/MeoAssistant/Vision/Roguelike/RoguelikeRecruitImageAnalyzer.h b/src/MaaCore/Vision/Roguelike/RoguelikeRecruitImageAnalyzer.h similarity index 100% rename from src/MeoAssistant/Vision/Roguelike/RoguelikeRecruitImageAnalyzer.h rename to src/MaaCore/Vision/Roguelike/RoguelikeRecruitImageAnalyzer.h diff --git a/src/MeoAssistant/Vision/Roguelike/RoguelikeSkillSelectionImageAnalyzer.cpp b/src/MaaCore/Vision/Roguelike/RoguelikeSkillSelectionImageAnalyzer.cpp similarity index 100% rename from src/MeoAssistant/Vision/Roguelike/RoguelikeSkillSelectionImageAnalyzer.cpp rename to src/MaaCore/Vision/Roguelike/RoguelikeSkillSelectionImageAnalyzer.cpp diff --git a/src/MeoAssistant/Vision/Roguelike/RoguelikeSkillSelectionImageAnalyzer.h b/src/MaaCore/Vision/Roguelike/RoguelikeSkillSelectionImageAnalyzer.h similarity index 100% rename from src/MeoAssistant/Vision/Roguelike/RoguelikeSkillSelectionImageAnalyzer.h rename to src/MaaCore/Vision/Roguelike/RoguelikeSkillSelectionImageAnalyzer.h diff --git a/src/MeoAssistant/Vision/Roguelike/StageDropsImageAnalyzer.cpp b/src/MaaCore/Vision/Roguelike/StageDropsImageAnalyzer.cpp similarity index 100% rename from src/MeoAssistant/Vision/Roguelike/StageDropsImageAnalyzer.cpp rename to src/MaaCore/Vision/Roguelike/StageDropsImageAnalyzer.cpp diff --git a/src/MeoAssistant/Vision/Roguelike/StageDropsImageAnalyzer.h b/src/MaaCore/Vision/Roguelike/StageDropsImageAnalyzer.h similarity index 100% rename from src/MeoAssistant/Vision/Roguelike/StageDropsImageAnalyzer.h rename to src/MaaCore/Vision/Roguelike/StageDropsImageAnalyzer.h diff --git a/src/MeoAssistant/re-include.py b/src/MaaCore/re-include.py similarity index 100% rename from src/MeoAssistant/re-include.py rename to src/MaaCore/re-include.py diff --git a/src/MeoAsstMac b/src/MaaMacGui similarity index 100% rename from src/MeoAsstMac rename to src/MaaMacGui diff --git a/src/MeoAsstGui/.editorconfig b/src/MaaWpfGui/.editorconfig similarity index 100% rename from src/MeoAsstGui/.editorconfig rename to src/MaaWpfGui/.editorconfig diff --git a/src/MeoAsstGui/App.config b/src/MaaWpfGui/App.config similarity index 97% rename from src/MeoAsstGui/App.config rename to src/MaaWpfGui/App.config index d3b6d9590a..3678fb2756 100644 --- a/src/MeoAsstGui/App.config +++ b/src/MaaWpfGui/App.config @@ -1,18 +1,18 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/MeoAsstGui/App.xaml b/src/MaaWpfGui/App.xaml similarity index 91% rename from src/MeoAsstGui/App.xaml rename to src/MaaWpfGui/App.xaml index 9ecc598efa..d3fe85948e 100644 --- a/src/MeoAsstGui/App.xaml +++ b/src/MaaWpfGui/App.xaml @@ -1,8 +1,8 @@  - + diff --git a/src/MeoAsstGui/App.xaml.cs b/src/MaaWpfGui/App.xaml.cs similarity index 88% rename from src/MeoAsstGui/App.xaml.cs rename to src/MaaWpfGui/App.xaml.cs index bf36c9746b..3942b52c68 100644 --- a/src/MeoAsstGui/App.xaml.cs +++ b/src/MaaWpfGui/App.xaml.cs @@ -1,5 +1,5 @@ // -// MeoAsstGui - A part of the MeoAssistantArknights project +// MaaWpfGui - A part of the MaaCoreArknights project // Copyright (C) 2021 MistEO and Contributors // // This program is free software: you can redistribute it and/or modify @@ -13,7 +13,7 @@ using System.Windows; -namespace MeoAsstGui +namespace MaaWpfGui { /// /// App.xaml 的交互逻辑 diff --git a/src/MeoAsstGui/Doc/MeoAsstGui开发指南.pdf b/src/MaaWpfGui/Doc/MeoAsstGui开发指南.pdf similarity index 100% rename from src/MeoAsstGui/Doc/MeoAsstGui开发指南.pdf rename to src/MaaWpfGui/Doc/MeoAsstGui开发指南.pdf diff --git a/src/MeoAsstGui/FodyWeavers.xml b/src/MaaWpfGui/FodyWeavers.xml similarity index 100% rename from src/MeoAsstGui/FodyWeavers.xml rename to src/MaaWpfGui/FodyWeavers.xml diff --git a/src/MeoAsstGui/GlobalSuppressions.cs b/src/MaaWpfGui/GlobalSuppressions.cs similarity index 98% rename from src/MeoAsstGui/GlobalSuppressions.cs rename to src/MaaWpfGui/GlobalSuppressions.cs index feef3b9f86..72097ba6d0 100644 --- a/src/MeoAsstGui/GlobalSuppressions.cs +++ b/src/MaaWpfGui/GlobalSuppressions.cs @@ -1,5 +1,5 @@ // -// MeoAsstGui - A part of the MeoAssistantArknights project +// MaaWpfGui - A part of the MaaCoreArknights project // Copyright (C) 2021 MistEO and Contributors // // This program is free software: you can redistribute it and/or modify diff --git a/src/MeoAsstGui/Helper/AutoScroll.cs b/src/MaaWpfGui/Helper/AutoScroll.cs similarity index 97% rename from src/MeoAsstGui/Helper/AutoScroll.cs rename to src/MaaWpfGui/Helper/AutoScroll.cs index 9fbebaa445..747dbf5b39 100644 --- a/src/MeoAsstGui/Helper/AutoScroll.cs +++ b/src/MaaWpfGui/Helper/AutoScroll.cs @@ -1,5 +1,5 @@ // -// MeoAsstGui - A part of the MeoAssistantArknights project +// MaaWpfGui - A part of the MaaCoreArknights project // Copyright (C) 2021 MistEO and Contributors // // This program is free software: you can redistribute it and/or modify @@ -15,7 +15,7 @@ using System; using System.Windows; using System.Windows.Controls; -namespace MeoAsstGui +namespace MaaWpfGui { /// /// The auto scroll property. diff --git a/src/MeoAsstGui/Helper/AutoStart.cs b/src/MaaWpfGui/Helper/AutoStart.cs similarity index 96% rename from src/MeoAsstGui/Helper/AutoStart.cs rename to src/MaaWpfGui/Helper/AutoStart.cs index aebdc7c28c..7f9dc31356 100644 --- a/src/MeoAsstGui/Helper/AutoStart.cs +++ b/src/MaaWpfGui/Helper/AutoStart.cs @@ -1,5 +1,5 @@ // -// MeoAsstGui - A part of the MeoAssistantArknights project +// MaaWpfGui - A part of the MaaCoreArknights project // Copyright (C) 2021 MistEO and Contributors // // This program is free software: you can redistribute it and/or modify @@ -14,7 +14,7 @@ using System.Diagnostics; using Microsoft.Win32; -namespace MeoAsstGui +namespace MaaWpfGui { /// /// The model of auto-starting settings. diff --git a/src/MeoAsstGui/Helper/CombData.cs b/src/MaaWpfGui/Helper/CombData.cs similarity index 90% rename from src/MeoAsstGui/Helper/CombData.cs rename to src/MaaWpfGui/Helper/CombData.cs index d06aed8d97..174e87384d 100644 --- a/src/MeoAsstGui/Helper/CombData.cs +++ b/src/MaaWpfGui/Helper/CombData.cs @@ -1,5 +1,5 @@ // -// MeoAsstGui - A part of the MeoAssistantArknights project +// MaaWpfGui - A part of the MaaCoreArknights project // Copyright (C) 2021 MistEO and Contributors // // This program is free software: you can redistribute it and/or modify @@ -11,7 +11,7 @@ // but WITHOUT ANY WARRANTY // -namespace MeoAsstGui +namespace MaaWpfGui { /// /// The with as the value type. diff --git a/src/MeoAsstGui/Helper/ComboBoxExtensions.cs b/src/MaaWpfGui/Helper/ComboBoxExtensions.cs similarity index 97% rename from src/MeoAsstGui/Helper/ComboBoxExtensions.cs rename to src/MaaWpfGui/Helper/ComboBoxExtensions.cs index 2f94445208..30a3af5f05 100644 --- a/src/MeoAsstGui/Helper/ComboBoxExtensions.cs +++ b/src/MaaWpfGui/Helper/ComboBoxExtensions.cs @@ -1,5 +1,5 @@ // -// MeoAsstGui - A part of the MeoAssistantArknights project +// MaaWpfGui - A part of the MaaCoreArknights project // Copyright (C) 2021 MistEO and Contributors // // This program is free software: you can redistribute it and/or modify @@ -14,7 +14,7 @@ using System.Windows.Controls; using System.Windows.Input; -namespace MeoAsstGui.Helper +namespace MaaWpfGui.Helper { /// /// Extensions diff --git a/src/MeoAsstGui/Helper/DragItemViewModel.cs b/src/MaaWpfGui/Helper/DragItemViewModel.cs similarity index 97% rename from src/MeoAsstGui/Helper/DragItemViewModel.cs rename to src/MaaWpfGui/Helper/DragItemViewModel.cs index 18ff2c336b..4baffa606e 100644 --- a/src/MeoAsstGui/Helper/DragItemViewModel.cs +++ b/src/MaaWpfGui/Helper/DragItemViewModel.cs @@ -1,5 +1,5 @@ // -// MeoAsstGui - A part of the MeoAssistantArknights project +// MaaWpfGui - A part of the MaaCoreArknights project // Copyright (C) 2021 MistEO and Contributors // // This program is free software: you can redistribute it and/or modify @@ -13,7 +13,7 @@ using Stylet; -namespace MeoAsstGui +namespace MaaWpfGui { /// /// The view model of drag item. diff --git a/src/MeoAsstGui/Helper/ErrorView.xaml.cs b/src/MaaWpfGui/Helper/ErrorView.xaml.cs similarity index 96% rename from src/MeoAsstGui/Helper/ErrorView.xaml.cs rename to src/MaaWpfGui/Helper/ErrorView.xaml.cs index 655ee639fe..44305940e0 100644 --- a/src/MeoAsstGui/Helper/ErrorView.xaml.cs +++ b/src/MaaWpfGui/Helper/ErrorView.xaml.cs @@ -1,5 +1,5 @@ // -// MeoAsstGui - A part of the MeoAssistantArknights project +// MaaWpfGui - A part of the MaaCoreArknights project // Copyright (C) 2021 MistEO and Contributors // // This program is free software: you can redistribute it and/or modify @@ -16,7 +16,7 @@ using System.Diagnostics; using System.Windows; using System.Windows.Documents; -namespace MeoAsstGui.Views +namespace MaaWpfGui.Views { /// /// ErrorView.xaml 的交互逻辑 diff --git a/src/MeoAsstGui/Helper/FlowDocumentPagePadding.cs b/src/MaaWpfGui/Helper/FlowDocumentPagePadding.cs similarity index 97% rename from src/MeoAsstGui/Helper/FlowDocumentPagePadding.cs rename to src/MaaWpfGui/Helper/FlowDocumentPagePadding.cs index 99e7bad492..00ece7e9ff 100644 --- a/src/MeoAsstGui/Helper/FlowDocumentPagePadding.cs +++ b/src/MaaWpfGui/Helper/FlowDocumentPagePadding.cs @@ -1,5 +1,5 @@ // -// MeoAsstGui - A part of the MeoAssistantArknights project +// MaaWpfGui - A part of the MaaCoreArknights project // Copyright (C) 2021 MistEO and Contributors // // This program is free software: you can redistribute it and/or modify @@ -16,7 +16,7 @@ using System.ComponentModel; using System.Windows; using System.Windows.Documents; -namespace MeoAsstGui +namespace MaaWpfGui { /// /// The flow document page padding property. diff --git a/src/MeoAsstGui/Helper/GenericCombData{TValueType}.cs b/src/MaaWpfGui/Helper/GenericCombData{TValueType}.cs similarity index 92% rename from src/MeoAsstGui/Helper/GenericCombData{TValueType}.cs rename to src/MaaWpfGui/Helper/GenericCombData{TValueType}.cs index 135edabff3..bca5a8e4a8 100644 --- a/src/MeoAsstGui/Helper/GenericCombData{TValueType}.cs +++ b/src/MaaWpfGui/Helper/GenericCombData{TValueType}.cs @@ -1,5 +1,5 @@ // -// MeoAsstGui - A part of the MeoAssistantArknights project +// MaaWpfGui - A part of the MaaCoreArknights project // Copyright (C) 2021 MistEO and Contributors // // This program is free software: you can redistribute it and/or modify @@ -11,7 +11,7 @@ // but WITHOUT ANY WARRANTY // -namespace MeoAsstGui +namespace MaaWpfGui { /// /// Generic combinated data class. diff --git a/src/MeoAsstGui/Helper/IMainWindowManager.cs b/src/MaaWpfGui/Helper/IMainWindowManager.cs similarity index 94% rename from src/MeoAsstGui/Helper/IMainWindowManager.cs rename to src/MaaWpfGui/Helper/IMainWindowManager.cs index 95a13efe83..c037499118 100644 --- a/src/MeoAsstGui/Helper/IMainWindowManager.cs +++ b/src/MaaWpfGui/Helper/IMainWindowManager.cs @@ -1,5 +1,5 @@ // -// MeoAsstGui - A part of the MeoAssistantArknights project +// MaaWpfGui - A part of the MaaCoreArknights project // Copyright (C) 2021 MistEO and Contributors // // This program is free software: you can redistribute it and/or modify @@ -13,7 +13,7 @@ using System.Windows; -namespace MeoAsstGui +namespace MaaWpfGui { /// /// Manager of the MAA main window diff --git a/src/MeoAsstGui/Helper/Localization.cs b/src/MaaWpfGui/Helper/Localization.cs similarity index 97% rename from src/MeoAsstGui/Helper/Localization.cs rename to src/MaaWpfGui/Helper/Localization.cs index bda9958eaa..6235f57fd7 100644 --- a/src/MeoAsstGui/Helper/Localization.cs +++ b/src/MaaWpfGui/Helper/Localization.cs @@ -1,5 +1,5 @@ // -// MeoAsstGui - A part of the MeoAssistantArknights project +// MaaWpfGui - A part of the MaaCoreArknights project // Copyright (C) 2021 MistEO and Contributors // // This program is free software: you can redistribute it and/or modify @@ -18,7 +18,7 @@ using System.Runtime.ConstrainedExecution; using System.Windows; using System.Windows.Input; -namespace MeoAsstGui +namespace MaaWpfGui { /// /// The localization class. diff --git a/src/MeoAsstGui/Helper/LogItemViewModel.cs b/src/MaaWpfGui/Helper/LogItemViewModel.cs similarity index 96% rename from src/MeoAsstGui/Helper/LogItemViewModel.cs rename to src/MaaWpfGui/Helper/LogItemViewModel.cs index e0238c9fb4..dea7bb3092 100644 --- a/src/MeoAsstGui/Helper/LogItemViewModel.cs +++ b/src/MaaWpfGui/Helper/LogItemViewModel.cs @@ -1,5 +1,5 @@ // -// MeoAsstGui - A part of the MeoAssistantArknights project +// MaaWpfGui - A part of the MaaCoreArknights project // Copyright (C) 2021 MistEO and Contributors // // This program is free software: you can redistribute it and/or modify @@ -14,7 +14,7 @@ using System; using Stylet; -namespace MeoAsstGui +namespace MaaWpfGui { /// /// The view model of log item. diff --git a/src/MeoAsstGui/Helper/Logger.cs b/src/MaaWpfGui/Helper/Logger.cs similarity index 93% rename from src/MeoAsstGui/Helper/Logger.cs rename to src/MaaWpfGui/Helper/Logger.cs index a93a7593cc..1f6548a035 100644 --- a/src/MeoAsstGui/Helper/Logger.cs +++ b/src/MaaWpfGui/Helper/Logger.cs @@ -1,5 +1,5 @@ // -// MeoAsstGui - A part of the MeoAssistantArknights project +// MaaWpfGui - A part of the MaaCoreArknights project // Copyright (C) 2021 MistEO and Contributors // // This program is free software: you can redistribute it and/or modify @@ -19,7 +19,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms.VisualStyles; -namespace MeoAsstGui +namespace MaaWpfGui { public class Logger { diff --git a/src/MeoAsstGui/Helper/MaaHotKeys/IMaaHotKeyActionHandler.cs b/src/MaaWpfGui/Helper/MaaHotKeys/IMaaHotKeyActionHandler.cs similarity index 86% rename from src/MeoAsstGui/Helper/MaaHotKeys/IMaaHotKeyActionHandler.cs rename to src/MaaWpfGui/Helper/MaaHotKeys/IMaaHotKeyActionHandler.cs index 63e578fc61..f592ffe4b6 100644 --- a/src/MeoAsstGui/Helper/MaaHotKeys/IMaaHotKeyActionHandler.cs +++ b/src/MaaWpfGui/Helper/MaaHotKeys/IMaaHotKeyActionHandler.cs @@ -1,5 +1,5 @@ // -// MeoAsstGui - A part of the MeoAssistantArknights project +// MaaWpfGui - A part of the MaaCoreArknights project // Copyright (C) 2021 MistEO and Contributors // // This program is free software: you can redistribute it and/or modify @@ -11,7 +11,7 @@ // but WITHOUT ANY WARRANTY // -namespace MeoAsstGui.MaaHotKeys +namespace MaaWpfGui.MaaHotKeys { public interface IMaaHotKeyActionHandler { diff --git a/src/MeoAsstGui/Helper/MaaHotKeys/IMaaHotKeyManager.cs b/src/MaaWpfGui/Helper/MaaHotKeys/IMaaHotKeyManager.cs similarity index 88% rename from src/MeoAsstGui/Helper/MaaHotKeys/IMaaHotKeyManager.cs rename to src/MaaWpfGui/Helper/MaaHotKeys/IMaaHotKeyManager.cs index 221e5bb910..8e9362427f 100644 --- a/src/MeoAsstGui/Helper/MaaHotKeys/IMaaHotKeyManager.cs +++ b/src/MaaWpfGui/Helper/MaaHotKeys/IMaaHotKeyManager.cs @@ -1,5 +1,5 @@ // -// MeoAsstGui - A part of the MeoAssistantArknights project +// MaaWpfGui - A part of the MaaCoreArknights project // Copyright (C) 2021 MistEO and Contributors // // This program is free software: you can redistribute it and/or modify @@ -13,7 +13,7 @@ using GlobalHotKey; -namespace MeoAsstGui.MaaHotKeys +namespace MaaWpfGui.MaaHotKeys { public interface IMaaHotKeyManager { diff --git a/src/MeoAsstGui/Helper/MaaHotKeys/MaaHotKey.cs b/src/MaaWpfGui/Helper/MaaHotKeys/MaaHotKey.cs similarity index 93% rename from src/MeoAsstGui/Helper/MaaHotKeys/MaaHotKey.cs rename to src/MaaWpfGui/Helper/MaaHotKeys/MaaHotKey.cs index 72e46ade1a..79a4495e40 100644 --- a/src/MeoAsstGui/Helper/MaaHotKeys/MaaHotKey.cs +++ b/src/MaaWpfGui/Helper/MaaHotKeys/MaaHotKey.cs @@ -1,5 +1,5 @@ // -// MeoAsstGui - A part of the MeoAssistantArknights project +// MaaWpfGui - A part of the MaaCoreArknights project // Copyright (C) 2021 MistEO and Contributors // // This program is free software: you can redistribute it and/or modify @@ -15,7 +15,7 @@ using System.Text; using System.Windows.Input; using GlobalHotKey; -namespace MeoAsstGui.MaaHotKeys +namespace MaaWpfGui.MaaHotKeys { public class MaaHotKey : HotKey { diff --git a/src/MeoAsstGui/Helper/MaaHotKeys/MaaHotKeyAction.cs b/src/MaaWpfGui/Helper/MaaHotKeys/MaaHotKeyAction.cs similarity index 86% rename from src/MeoAsstGui/Helper/MaaHotKeys/MaaHotKeyAction.cs rename to src/MaaWpfGui/Helper/MaaHotKeys/MaaHotKeyAction.cs index 4b8459cf25..0b9c4632a1 100644 --- a/src/MeoAsstGui/Helper/MaaHotKeys/MaaHotKeyAction.cs +++ b/src/MaaWpfGui/Helper/MaaHotKeys/MaaHotKeyAction.cs @@ -1,5 +1,5 @@ // -// MeoAsstGui - A part of the MeoAssistantArknights project +// MaaWpfGui - A part of the MaaCoreArknights project // Copyright (C) 2021 MistEO and Contributors // // This program is free software: you can redistribute it and/or modify @@ -13,7 +13,7 @@ using System; -namespace MeoAsstGui.MaaHotKeys +namespace MaaWpfGui.MaaHotKeys { [Flags] public enum MaaHotKeyAction diff --git a/src/MeoAsstGui/Helper/MaaHotKeys/MaaHotKeyActionHandler.cs b/src/MaaWpfGui/Helper/MaaHotKeys/MaaHotKeyActionHandler.cs similarity index 96% rename from src/MeoAsstGui/Helper/MaaHotKeys/MaaHotKeyActionHandler.cs rename to src/MaaWpfGui/Helper/MaaHotKeys/MaaHotKeyActionHandler.cs index 2b03dac804..9a18977311 100644 --- a/src/MeoAsstGui/Helper/MaaHotKeys/MaaHotKeyActionHandler.cs +++ b/src/MaaWpfGui/Helper/MaaHotKeys/MaaHotKeyActionHandler.cs @@ -1,5 +1,5 @@ // -// MeoAsstGui - A part of the MeoAssistantArknights project +// MaaWpfGui - A part of the MaaCoreArknights project // Copyright (C) 2021 MistEO and Contributors // // This program is free software: you can redistribute it and/or modify @@ -15,7 +15,7 @@ using System; using System.Windows; using StyletIoC; -namespace MeoAsstGui.MaaHotKeys +namespace MaaWpfGui.MaaHotKeys { public class MaaHotKeyActionHandler : IMaaHotKeyActionHandler { diff --git a/src/MeoAsstGui/Helper/MaaHotKeys/MaaHotKeyManager.cs b/src/MaaWpfGui/Helper/MaaHotKeys/MaaHotKeyManager.cs similarity index 97% rename from src/MeoAsstGui/Helper/MaaHotKeys/MaaHotKeyManager.cs rename to src/MaaWpfGui/Helper/MaaHotKeys/MaaHotKeyManager.cs index 1383e89b5a..1b00270814 100644 --- a/src/MeoAsstGui/Helper/MaaHotKeys/MaaHotKeyManager.cs +++ b/src/MaaWpfGui/Helper/MaaHotKeys/MaaHotKeyManager.cs @@ -1,5 +1,5 @@ // -// MeoAsstGui - A part of the MeoAssistantArknights project +// MaaWpfGui - A part of the MaaCoreArknights project // Copyright (C) 2021 MistEO and Contributors // // This program is free software: you can redistribute it and/or modify @@ -19,7 +19,7 @@ using GlobalHotKey; using Newtonsoft.Json; using StyletIoC; -namespace MeoAsstGui.MaaHotKeys +namespace MaaWpfGui.MaaHotKeys { public class MaaHotKeyManager : IMaaHotKeyManager { diff --git a/src/MeoAsstGui/Helper/MaaUrls.cs b/src/MaaWpfGui/Helper/MaaUrls.cs similarity index 95% rename from src/MeoAsstGui/Helper/MaaUrls.cs rename to src/MaaWpfGui/Helper/MaaUrls.cs index ae18da4d59..1bd29df35c 100644 --- a/src/MeoAsstGui/Helper/MaaUrls.cs +++ b/src/MaaWpfGui/Helper/MaaUrls.cs @@ -1,5 +1,5 @@ // -// MeoAsstGui - A part of the MeoAssistantArknights project +// MaaWpfGui - A part of the MaaCoreArknights project // Copyright (C) 2021 MistEO and Contributors // // This program is free software: you can redistribute it and/or modify @@ -14,7 +14,7 @@ using System.Collections.Generic; using System.Linq; -namespace MeoAsstGui +namespace MaaWpfGui { public static class MaaUrls { diff --git a/src/MeoAsstGui/Helper/MainWindowManager.cs b/src/MaaWpfGui/Helper/MainWindowManager.cs similarity index 97% rename from src/MeoAsstGui/Helper/MainWindowManager.cs rename to src/MaaWpfGui/Helper/MainWindowManager.cs index fc21f75250..859aeec4d4 100644 --- a/src/MeoAsstGui/Helper/MainWindowManager.cs +++ b/src/MaaWpfGui/Helper/MainWindowManager.cs @@ -1,5 +1,5 @@ // -// MeoAsstGui - A part of the MeoAssistantArknights project +// MaaWpfGui - A part of the MaaCoreArknights project // Copyright (C) 2021 MistEO and Contributors // // This program is free software: you can redistribute it and/or modify @@ -14,7 +14,7 @@ using System; using System.Windows; -namespace MeoAsstGui +namespace MaaWpfGui { /// public class MainWindowManager : IMainWindowManager diff --git a/src/MeoAsstGui/Helper/MessageBoxManager.cs b/src/MaaWpfGui/Helper/MessageBoxManager.cs similarity index 99% rename from src/MeoAsstGui/Helper/MessageBoxManager.cs rename to src/MaaWpfGui/Helper/MessageBoxManager.cs index 27eefea5d0..9d7f6a37f1 100644 --- a/src/MeoAsstGui/Helper/MessageBoxManager.cs +++ b/src/MaaWpfGui/Helper/MessageBoxManager.cs @@ -1,5 +1,5 @@ // -// MeoAsstGui - A part of the MeoAssistantArknights project +// MaaWpfGui - A part of the MaaCoreArknights project // Copyright (C) 2021 MistEO and Contributors // // This program is free software: you can redistribute it and/or modify diff --git a/src/MeoAsstGui/Helper/ScrollViewerBinding.cs b/src/MaaWpfGui/Helper/ScrollViewerBinding.cs similarity index 99% rename from src/MeoAsstGui/Helper/ScrollViewerBinding.cs rename to src/MaaWpfGui/Helper/ScrollViewerBinding.cs index e90cb382a5..2a2180bbbb 100644 --- a/src/MeoAsstGui/Helper/ScrollViewerBinding.cs +++ b/src/MaaWpfGui/Helper/ScrollViewerBinding.cs @@ -1,5 +1,5 @@ // -// MeoAsstGui - A part of the MeoAssistantArknights project +// MaaWpfGui - A part of the MaaCoreArknights project // Copyright (C) 2021 MistEO and Contributors // // This program is free software: you can redistribute it and/or modify @@ -16,7 +16,7 @@ using System.Windows; using System.Windows.Controls; using System.Windows.Shapes; -namespace MeoAsstGui +namespace MaaWpfGui { /// /// The scroll viewer properties. diff --git a/src/MeoAsstGui/Helper/StageActivityInfo.cs b/src/MaaWpfGui/Helper/StageActivityInfo.cs similarity index 95% rename from src/MeoAsstGui/Helper/StageActivityInfo.cs rename to src/MaaWpfGui/Helper/StageActivityInfo.cs index 965f5fcf9a..51dcaf61cf 100644 --- a/src/MeoAsstGui/Helper/StageActivityInfo.cs +++ b/src/MaaWpfGui/Helper/StageActivityInfo.cs @@ -1,5 +1,5 @@ // -// MeoAsstGui - A part of the MeoAssistantArknights project +// MaaWpfGui - A part of the MaaCoreArknights project // Copyright (C) 2021 MistEO and Contributors // // This program is free software: you can redistribute it and/or modify @@ -13,7 +13,7 @@ using System; -namespace MeoAsstGui +namespace MaaWpfGui { /// /// Stage activity info diff --git a/src/MeoAsstGui/Helper/StageInfo.cs b/src/MaaWpfGui/Helper/StageInfo.cs similarity index 97% rename from src/MeoAsstGui/Helper/StageInfo.cs rename to src/MaaWpfGui/Helper/StageInfo.cs index 5120d543f3..276475a2c4 100644 --- a/src/MeoAsstGui/Helper/StageInfo.cs +++ b/src/MaaWpfGui/Helper/StageInfo.cs @@ -1,5 +1,5 @@ // -// MeoAsstGui - A part of the MeoAssistantArknights project +// MaaWpfGui - A part of the MaaCoreArknights project // Copyright (C) 2021 MistEO and Contributors // // This program is free software: you can redistribute it and/or modify @@ -15,7 +15,7 @@ using System; using System.Collections.Generic; using System.Linq; -namespace MeoAsstGui +namespace MaaWpfGui { /// /// Stage info diff --git a/src/MeoAsstGui/Helper/StageManager.cs b/src/MaaWpfGui/Helper/StageManager.cs similarity index 98% rename from src/MeoAsstGui/Helper/StageManager.cs rename to src/MaaWpfGui/Helper/StageManager.cs index 44a07061f8..93131bd7c7 100644 --- a/src/MeoAsstGui/Helper/StageManager.cs +++ b/src/MaaWpfGui/Helper/StageManager.cs @@ -1,5 +1,5 @@ // -// MeoAsstGui - A part of the MeoAssistantArknights project +// MaaWpfGui - A part of the MaaCoreArknights project // Copyright (C) 2021 MistEO and Contributors // // This program is free software: you can redistribute it and/or modify @@ -16,7 +16,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; -namespace MeoAsstGui +namespace MaaWpfGui { /// /// Stage manager diff --git a/src/MeoAsstGui/Helper/ToastNotification.cs b/src/MaaWpfGui/Helper/ToastNotification.cs similarity index 99% rename from src/MeoAsstGui/Helper/ToastNotification.cs rename to src/MaaWpfGui/Helper/ToastNotification.cs index c248d73202..63197f995b 100644 --- a/src/MeoAsstGui/Helper/ToastNotification.cs +++ b/src/MaaWpfGui/Helper/ToastNotification.cs @@ -1,5 +1,5 @@ // -// MeoAsstGui - A part of the MeoAssistantArknights project +// MaaWpfGui - A part of the MaaCoreArknights project // Copyright (C) 2021 MistEO and Contributors // // This program is free software: you can redistribute it and/or modify @@ -32,7 +32,7 @@ using Notification.Wpf.Constants; using Notification.Wpf.Controls; using Stylet; -namespace MeoAsstGui +namespace MaaWpfGui { /// /// The toast notification. diff --git a/src/MeoAsstGui/Helper/TrayIcon.cs b/src/MaaWpfGui/Helper/TrayIcon.cs similarity index 98% rename from src/MeoAsstGui/Helper/TrayIcon.cs rename to src/MaaWpfGui/Helper/TrayIcon.cs index 998e0310dc..05aa14206d 100644 --- a/src/MeoAsstGui/Helper/TrayIcon.cs +++ b/src/MaaWpfGui/Helper/TrayIcon.cs @@ -1,5 +1,5 @@ // -// MeoAsstGui - A part of the MeoAssistantArknights project +// MaaWpfGui - A part of the MaaCoreArknights project // Copyright (C) 2021 MistEO and Contributors // // This program is free software: you can redistribute it and/or modify @@ -16,7 +16,7 @@ using System.Windows; using System.Windows.Forms; using StyletIoC; -namespace MeoAsstGui +namespace MaaWpfGui { /// /// 托盘图标。 diff --git a/src/MeoAsstGui/Helper/UILogColor.cs b/src/MaaWpfGui/Helper/UILogColor.cs similarity index 95% rename from src/MeoAsstGui/Helper/UILogColor.cs rename to src/MaaWpfGui/Helper/UILogColor.cs index a9f2b3d3e3..a4dcea6bcf 100644 --- a/src/MeoAsstGui/Helper/UILogColor.cs +++ b/src/MaaWpfGui/Helper/UILogColor.cs @@ -1,5 +1,5 @@ // -// MeoAsstGui - A part of the MeoAssistantArknights project +// MaaWpfGui - A part of the MaaCoreArknights project // Copyright (C) 2021 MistEO and Contributors // // This program is free software: you can redistribute it and/or modify @@ -11,7 +11,7 @@ // but WITHOUT ANY WARRANTY // -namespace MeoAsstGui +namespace MaaWpfGui { /// /// The recommended colors for logs. diff --git a/src/MeoAsstGui/Helper/ViewStatusStorage.cs b/src/MaaWpfGui/Helper/ViewStatusStorage.cs similarity index 98% rename from src/MeoAsstGui/Helper/ViewStatusStorage.cs rename to src/MaaWpfGui/Helper/ViewStatusStorage.cs index 9e46352c81..a7d6f3b3ed 100644 --- a/src/MeoAsstGui/Helper/ViewStatusStorage.cs +++ b/src/MaaWpfGui/Helper/ViewStatusStorage.cs @@ -1,5 +1,5 @@ // -// MeoAsstGui - A part of the MeoAssistantArknights project +// MaaWpfGui - A part of the MaaCoreArknights project // Copyright (C) 2021 MistEO and Contributors // // This program is free software: you can redistribute it and/or modify @@ -17,7 +17,7 @@ using System.Reflection; using Newtonsoft.Json; using Newtonsoft.Json.Linq; -namespace MeoAsstGui +namespace MaaWpfGui { /// /// 界面设置存储（读写json文件） diff --git a/src/MeoAsstGui/Helper/WinAdapter.cs b/src/MaaWpfGui/Helper/WinAdapter.cs similarity index 98% rename from src/MeoAsstGui/Helper/WinAdapter.cs rename to src/MaaWpfGui/Helper/WinAdapter.cs index 22ef34087a..9493edf672 100644 --- a/src/MeoAsstGui/Helper/WinAdapter.cs +++ b/src/MaaWpfGui/Helper/WinAdapter.cs @@ -1,5 +1,5 @@ // -// MeoAsstGui - A part of the MeoAssistantArknights project +// MaaWpfGui - A part of the MaaCoreArknights project // Copyright (C) 2021 MistEO and Contributors // // This program is free software: you can redistribute it and/or modify @@ -16,7 +16,7 @@ using System.Diagnostics; using System.IO; using System.Linq; -namespace MeoAsstGui +namespace MaaWpfGui { /// /// The emulator adapter. diff --git a/src/MeoAsstGui/MaaWpfGui.csproj b/src/MaaWpfGui/MaaWpfGui.csproj similarity index 97% rename from src/MeoAsstGui/MaaWpfGui.csproj rename to src/MaaWpfGui/MaaWpfGui.csproj index d366067eff..f0e095f9bb 100644 --- a/src/MeoAsstGui/MaaWpfGui.csproj +++ b/src/MaaWpfGui/MaaWpfGui.csproj @@ -6,8 +6,8 @@ AnyCPU {FFDC8F49-8EAF-45BE-B0A8-7EF0DB9875A2} WinExe - MeoAsstGui - MeoAsstGui + MaaWpfGui + MaaWpfGui v4.8 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} @@ -28,11 +28,11 @@ false false true - https://github.com/MistEO/MeoAssistantArknights - https://github.com/MistEO/MeoAssistantArknights/issues + https://github.com/MistEO/MaaCoreArknights + https://github.com/MistEO/MaaCoreArknights/issues Meo明日方舟辅助 MistEO - MeoAssistant + MaaCore 0 4.0.0.0 false @@ -45,7 +45,7 @@ newlogo.ico - MeoAsstGui.App + MaaWpfGui.App ..\..\x64\Release\ @@ -55,7 +55,7 @@ x64 8.0 prompt - ..\..\x64\Release\MeoAsstGui.xml + ..\..\x64\Release\MaaWpfGui.xml true diff --git a/src/MeoAsstGui/Main/AsstProxy.cs b/src/MaaWpfGui/Main/AsstProxy.cs similarity index 99% rename from src/MeoAsstGui/Main/AsstProxy.cs rename to src/MaaWpfGui/Main/AsstProxy.cs index e014d0805f..cd998c3e43 100644 --- a/src/MeoAsstGui/Main/AsstProxy.cs +++ b/src/MaaWpfGui/Main/AsstProxy.cs @@ -1,5 +1,5 @@ // -// MeoAsstGui - A part of the MeoAssistantArknights project +// MaaWpfGui - A part of the MaaCoreArknights project // Copyright (C) 2021 MistEO and Contributors // // This program is free software: you can redistribute it and/or modify @@ -23,7 +23,7 @@ using Newtonsoft.Json.Linq; using Stylet; using StyletIoC; -namespace MeoAsstGui +namespace MaaWpfGui { #pragma warning disable SA1135 // Using directives should be qualified @@ -37,7 +37,7 @@ namespace MeoAsstGui #pragma warning disable SA1121 // Use built-in type alias /// - /// MeoAssistant 代理类。 + /// MaaCore 代理类。 /// public class AsstProxy { @@ -1549,7 +1549,7 @@ namespace MeoAsstGui } /// - /// MeoAssistant 消息。 + /// MaaCore 消息。 /// public enum AsstMsg { diff --git a/src/MeoAsstGui/Main/Bootstrapper.cs b/src/MaaWpfGui/Main/Bootstrapper.cs similarity index 97% rename from src/MeoAsstGui/Main/Bootstrapper.cs rename to src/MaaWpfGui/Main/Bootstrapper.cs index 85b13f3595..9dcf98e23f 100644 --- a/src/MeoAsstGui/Main/Bootstrapper.cs +++ b/src/MaaWpfGui/Main/Bootstrapper.cs @@ -1,5 +1,5 @@ // -// MeoAsstGui - A part of the MeoAssistantArknights project +// MaaWpfGui - A part of the MaaCoreArknights project // Copyright (C) 2021 MistEO and Contributors // // This program is free software: you can redistribute it and/or modify @@ -18,13 +18,13 @@ using System.Runtime.InteropServices; using System.Windows; using System.Windows.Threading; using GlobalHotKey; -using MeoAsstGui.MaaHotKeys; -using MeoAsstGui.Views; +using MaaWpfGui.MaaHotKeys; +using MaaWpfGui.Views; using Microsoft.Toolkit.Uwp.Notifications; using Stylet; using StyletIoC; -namespace MeoAsstGui +namespace MaaWpfGui { /// /// The bootstrapper. diff --git a/src/MeoAsstGui/Main/CopilotViewModel.cs b/src/MaaWpfGui/Main/CopilotViewModel.cs similarity index 99% rename from src/MeoAsstGui/Main/CopilotViewModel.cs rename to src/MaaWpfGui/Main/CopilotViewModel.cs index 8723cedb1e..30f92053ef 100644 --- a/src/MeoAsstGui/Main/CopilotViewModel.cs +++ b/src/MaaWpfGui/Main/CopilotViewModel.cs @@ -1,5 +1,5 @@ // -// MeoAsstGui - A part of the MeoAssistantArknights project +// MaaWpfGui - A part of the MaaCoreArknights project // Copyright (C) 2021 MistEO and Contributors // // This program is free software: you can redistribute it and/or modify @@ -30,7 +30,7 @@ using DataFormats = System.Windows.Forms.DataFormats; using DragEventArgs = System.Windows.DragEventArgs; using Screen = Stylet.Screen; -namespace MeoAsstGui +namespace MaaWpfGui { /// /// The view model of copilot. diff --git a/src/MeoAsstGui/Main/DepotViewModel.cs b/src/MaaWpfGui/Main/DepotViewModel.cs similarity index 98% rename from src/MeoAsstGui/Main/DepotViewModel.cs rename to src/MaaWpfGui/Main/DepotViewModel.cs index dadb925a03..8c8295c732 100644 --- a/src/MeoAsstGui/Main/DepotViewModel.cs +++ b/src/MaaWpfGui/Main/DepotViewModel.cs @@ -1,5 +1,5 @@ // -// MeoAsstGui - A part of the MeoAssistantArknights project +// MaaWpfGui - A part of the MaaCoreArknights project // Copyright (C) 2021 MistEO and Contributors // // This program is free software: you can redistribute it and/or modify @@ -19,7 +19,7 @@ using Newtonsoft.Json.Linq; using Stylet; using StyletIoC; -namespace MeoAsstGui +namespace MaaWpfGui { /// /// The view model of recruit. diff --git a/src/MeoAsstGui/Main/RecruitViewModel.cs b/src/MaaWpfGui/Main/RecruitViewModel.cs similarity index 98% rename from src/MeoAsstGui/Main/RecruitViewModel.cs rename to src/MaaWpfGui/Main/RecruitViewModel.cs index a368ab4f19..2490f1d0fd 100644 --- a/src/MeoAsstGui/Main/RecruitViewModel.cs +++ b/src/MaaWpfGui/Main/RecruitViewModel.cs @@ -1,5 +1,5 @@ // -// MeoAsstGui - A part of the MeoAssistantArknights project +// MaaWpfGui - A part of the MaaCoreArknights project // Copyright (C) 2021 MistEO and Contributors // // This program is free software: you can redistribute it and/or modify @@ -16,7 +16,7 @@ using System.Threading.Tasks; using Stylet; using StyletIoC; -namespace MeoAsstGui +namespace MaaWpfGui { /// /// The view model of recruit. diff --git a/src/MeoAsstGui/Main/RootViewModel.cs b/src/MaaWpfGui/Main/RootViewModel.cs similarity index 97% rename from src/MeoAsstGui/Main/RootViewModel.cs rename to src/MaaWpfGui/Main/RootViewModel.cs index b6fe268e3b..406b4c930d 100644 --- a/src/MeoAsstGui/Main/RootViewModel.cs +++ b/src/MaaWpfGui/Main/RootViewModel.cs @@ -1,5 +1,5 @@ // -// MeoAsstGui - A part of the MeoAssistantArknights project +// MaaWpfGui - A part of the MaaCoreArknights project // Copyright (C) 2021 MistEO and Contributors // // This program is free software: you can redistribute it and/or modify @@ -15,7 +15,7 @@ using System.Threading.Tasks; using Stylet; using StyletIoC; -namespace MeoAsstGui +namespace MaaWpfGui { /// /// The root view model. diff --git a/src/MeoAsstGui/Main/SettingsViewModel.cs b/src/MaaWpfGui/Main/SettingsViewModel.cs similarity index 99% rename from src/MeoAsstGui/Main/SettingsViewModel.cs rename to src/MaaWpfGui/Main/SettingsViewModel.cs index 4f1f7bb05c..4dc85afa67 100644 --- a/src/MeoAsstGui/Main/SettingsViewModel.cs +++ b/src/MaaWpfGui/Main/SettingsViewModel.cs @@ -1,5 +1,5 @@ // -// MeoAsstGui - A part of the MeoAssistantArknights project +// MaaWpfGui - A part of the MaaCoreArknights project // Copyright (C) 2021 MistEO and Contributors // // This program is free software: you can redistribute it and/or modify @@ -21,12 +21,12 @@ using System.Runtime.InteropServices; using System.Threading; using System.Threading.Tasks; using System.Windows; -using MeoAsstGui.MaaHotKeys; +using MaaWpfGui.MaaHotKeys; using Newtonsoft.Json.Linq; using Stylet; using StyletIoC; -namespace MeoAsstGui +namespace MaaWpfGui { /// /// The view model of settings. @@ -273,7 +273,7 @@ namespace MeoAsstGui } /* 启动设置 */ - private bool _startSelf = MeoAsstGui.AutoStart.CheckStart(); + private bool _startSelf = MaaWpfGui.AutoStart.CheckStart(); /// /// Gets or sets a value indicating whether to start itself. @@ -284,7 +284,7 @@ namespace MeoAsstGui set { SetAndNotify(ref _startSelf, value); - MeoAsstGui.AutoStart.SetStart(value); + MaaWpfGui.AutoStart.SetStart(value); } } @@ -2270,4 +2270,4 @@ namespace MeoAsstGui return false; } } -} \ No newline at end of file +} diff --git a/src/MeoAsstGui/Main/TaskQueueViewModel.cs b/src/MaaWpfGui/Main/TaskQueueViewModel.cs similarity index 99% rename from src/MeoAsstGui/Main/TaskQueueViewModel.cs rename to src/MaaWpfGui/Main/TaskQueueViewModel.cs index 2c22af3ee6..e4f9a60943 100644 --- a/src/MeoAsstGui/Main/TaskQueueViewModel.cs +++ b/src/MaaWpfGui/Main/TaskQueueViewModel.cs @@ -1,5 +1,5 @@ // -// MeoAsstGui - A part of the MeoAssistantArknights project +// MaaWpfGui - A part of the MaaCoreArknights project // Copyright (C) 2021 MistEO and Contributors // // This program is free software: you can redistribute it and/or modify @@ -22,13 +22,13 @@ using System.Text.RegularExpressions; using System.Threading.Tasks; using System.Windows; using System.Windows.Controls; -using MeoAsstGui.Helper; +using MaaWpfGui.Helper; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using Stylet; using StyletIoC; -namespace MeoAsstGui +namespace MaaWpfGui { /// /// The view model of task queue. diff --git a/src/MeoAsstGui/Main/VersionUpdateViewModel.cs b/src/MaaWpfGui/Main/VersionUpdateViewModel.cs similarity index 99% rename from src/MeoAsstGui/Main/VersionUpdateViewModel.cs rename to src/MaaWpfGui/Main/VersionUpdateViewModel.cs index 01f01cb71e..2a1a073485 100644 --- a/src/MeoAsstGui/Main/VersionUpdateViewModel.cs +++ b/src/MaaWpfGui/Main/VersionUpdateViewModel.cs @@ -1,5 +1,5 @@ // -// MeoAsstGui - A part of the MeoAssistantArknights project +// MaaWpfGui - A part of the MaaCoreArknights project // Copyright (C) 2021 MistEO and Contributors // // This program is free software: you can redistribute it and/or modify @@ -27,7 +27,7 @@ using Newtonsoft.Json.Linq; using Stylet; using StyletIoC; -namespace MeoAsstGui +namespace MaaWpfGui { /// /// The view model of version update. @@ -901,4 +901,4 @@ namespace MeoAsstGui Process.Start(e.Parameter.ToString()); } } -} \ No newline at end of file +} diff --git a/src/MeoAsstGui/MeoAsstGui.csproj.DotSettings b/src/MaaWpfGui/MeoAsstGui.csproj.DotSettings similarity index 100% rename from src/MeoAsstGui/MeoAsstGui.csproj.DotSettings rename to src/MaaWpfGui/MeoAsstGui.csproj.DotSettings diff --git a/src/MeoAsstGui/Properties/AssemblyInfo.cs b/src/MaaWpfGui/Properties/AssemblyInfo.cs similarity index 94% rename from src/MeoAsstGui/Properties/AssemblyInfo.cs rename to src/MaaWpfGui/Properties/AssemblyInfo.cs index 92da604950..4e8a1fdbbb 100644 --- a/src/MeoAsstGui/Properties/AssemblyInfo.cs +++ b/src/MaaWpfGui/Properties/AssemblyInfo.cs @@ -1,5 +1,5 @@ // -// MeoAsstGui - A part of the MeoAssistantArknights project +// MaaWpfGui - A part of the MaaCoreArknights project // Copyright (C) 2021 MistEO and Contributors // // This program is free software: you can redistribute it and/or modify @@ -19,11 +19,11 @@ using System.Windows; // 有关程序集的一般信息由以下 // 控制。更改这些特性值可修改 // 与程序集关联的信息。 -[assembly: AssemblyTitle("MeoAsstGui")] +[assembly: AssemblyTitle("MaaWpfGui")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("MeoAsstGui")] +[assembly: AssemblyProduct("MaaWpfGui")] [assembly: AssemblyCopyright("Copyright © 2021")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/src/MeoAsstGui/README.md b/src/MaaWpfGui/README.md similarity index 93% rename from src/MeoAsstGui/README.md rename to src/MaaWpfGui/README.md index 119ddda931..d5b60ffa40 100644 --- a/src/MeoAsstGui/README.md +++ b/src/MaaWpfGui/README.md @@ -1,4 +1,4 @@ -# MeoAsstGui +# MaaWpfGui 使用 C# WPF 编写的界面模块 diff --git a/src/MeoAsstGui/Res/Localizations/en-us.xaml b/src/MaaWpfGui/Res/Localizations/en-us.xaml similarity index 99% rename from src/MeoAsstGui/Res/Localizations/en-us.xaml rename to src/MaaWpfGui/Res/Localizations/en-us.xaml index 70b8ded3a0..6f5e5174b5 100644 --- a/src/MeoAsstGui/Res/Localizations/en-us.xaml +++ b/src/MaaWpfGui/Res/Localizations/en-us.xaml @@ -1,7 +1,7 @@  diff --git a/src/MeoAsstGui/Res/Localizations/ja-jp.xaml b/src/MaaWpfGui/Res/Localizations/ja-jp.xaml similarity index 99% rename from src/MeoAsstGui/Res/Localizations/ja-jp.xaml rename to src/MaaWpfGui/Res/Localizations/ja-jp.xaml index c2a3d91838..e066192f8c 100644 --- a/src/MeoAsstGui/Res/Localizations/ja-jp.xaml +++ b/src/MaaWpfGui/Res/Localizations/ja-jp.xaml @@ -1,7 +1,7 @@  diff --git a/src/MeoAsstGui/Res/Localizations/ko-kr.xaml b/src/MaaWpfGui/Res/Localizations/ko-kr.xaml similarity index 99% rename from src/MeoAsstGui/Res/Localizations/ko-kr.xaml rename to src/MaaWpfGui/Res/Localizations/ko-kr.xaml index 6bd2265411..bd37e5cbe5 100644 --- a/src/MeoAsstGui/Res/Localizations/ko-kr.xaml +++ b/src/MaaWpfGui/Res/Localizations/ko-kr.xaml @@ -1,7 +1,7 @@  diff --git a/src/MeoAsstGui/Res/Localizations/pallas.py b/src/MaaWpfGui/Res/Localizations/pallas.py similarity index 100% rename from src/MeoAsstGui/Res/Localizations/pallas.py rename to src/MaaWpfGui/Res/Localizations/pallas.py diff --git a/src/MeoAsstGui/Res/Localizations/pallas.xaml b/src/MaaWpfGui/Res/Localizations/pallas.xaml similarity index 99% rename from src/MeoAsstGui/Res/Localizations/pallas.xaml rename to src/MaaWpfGui/Res/Localizations/pallas.xaml index e7ef813f2c..b9c62dc883 100644 --- a/src/MeoAsstGui/Res/Localizations/pallas.xaml +++ b/src/MaaWpfGui/Res/Localizations/pallas.xaml @@ -1,7 +1,7 @@  diff --git a/src/MeoAsstGui/Res/Localizations/zh-cn.xaml b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml similarity index 99% rename from src/MeoAsstGui/Res/Localizations/zh-cn.xaml rename to src/MaaWpfGui/Res/Localizations/zh-cn.xaml index 383e5a1cde..944d9a64bb 100644 --- a/src/MeoAsstGui/Res/Localizations/zh-cn.xaml +++ b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml @@ -1,7 +1,7 @@  diff --git a/src/MeoAsstGui/Res/Localizations/zh-tw.xaml b/src/MaaWpfGui/Res/Localizations/zh-tw.xaml similarity index 99% rename from src/MeoAsstGui/Res/Localizations/zh-tw.xaml rename to src/MaaWpfGui/Res/Localizations/zh-tw.xaml index cb7ac55c05..99bd0820e4 100644 --- a/src/MeoAsstGui/Res/Localizations/zh-tw.xaml +++ b/src/MaaWpfGui/Res/Localizations/zh-tw.xaml @@ -1,7 +1,7 @@  diff --git a/src/MeoAsstGui/Views/CopilotView.xaml b/src/MaaWpfGui/Views/CopilotView.xaml similarity index 96% rename from src/MeoAsstGui/Views/CopilotView.xaml rename to src/MaaWpfGui/Views/CopilotView.xaml index e90de169f1..0a307c437f 100644 --- a/src/MeoAsstGui/Views/CopilotView.xaml +++ b/src/MaaWpfGui/Views/CopilotView.xaml @@ -1,13 +1,13 @@  diff --git a/src/MeoAsstGui/Views/RecruitView.xaml b/src/MaaWpfGui/Views/RecruitView.xaml similarity index 97% rename from src/MeoAsstGui/Views/RecruitView.xaml rename to src/MaaWpfGui/Views/RecruitView.xaml index 3f0a22cb2a..b90853167b 100644 --- a/src/MeoAsstGui/Views/RecruitView.xaml +++ b/src/MaaWpfGui/Views/RecruitView.xaml @@ -1,11 +1,11 @@  diff --git a/src/MeoAsstGui/Views/UserControl/AboutUserControl.xaml.cs b/src/MaaWpfGui/Views/UserControl/AboutUserControl.xaml.cs similarity index 93% rename from src/MeoAsstGui/Views/UserControl/AboutUserControl.xaml.cs rename to src/MaaWpfGui/Views/UserControl/AboutUserControl.xaml.cs index 30c4d98750..9fc061a8bb 100644 --- a/src/MeoAsstGui/Views/UserControl/AboutUserControl.xaml.cs +++ b/src/MaaWpfGui/Views/UserControl/AboutUserControl.xaml.cs @@ -1,5 +1,5 @@ // -// MeoAsstGui - A part of the MeoAssistantArknights project +// MaaWpfGui - A part of the MaaCoreArknights project // Copyright (C) 2021 MistEO and Contributors // // This program is free software: you can redistribute it and/or modify @@ -16,7 +16,7 @@ using System.Windows; using System.Windows.Controls; using System.Windows.Documents; -namespace MeoAsstGui +namespace MaaWpfGui { /// /// PenguinReportSettingsUserControl.xaml 的交互逻辑 diff --git a/src/MeoAsstGui/Views/UserControl/AutoRecruitSettingsUserControl.xaml b/src/MaaWpfGui/Views/UserControl/AutoRecruitSettingsUserControl.xaml similarity index 97% rename from src/MeoAsstGui/Views/UserControl/AutoRecruitSettingsUserControl.xaml rename to src/MaaWpfGui/Views/UserControl/AutoRecruitSettingsUserControl.xaml index d8b6413bcc..9fbc07cfc2 100644 --- a/src/MeoAsstGui/Views/UserControl/AutoRecruitSettingsUserControl.xaml +++ b/src/MaaWpfGui/Views/UserControl/AutoRecruitSettingsUserControl.xaml @@ -1,12 +1,12 @@  diff --git a/src/MeoAsstGui/Views/UserControl/AutoRecruitSettingsUserControl.xaml.cs b/src/MaaWpfGui/Views/UserControl/AutoRecruitSettingsUserControl.xaml.cs similarity index 92% rename from src/MeoAsstGui/Views/UserControl/AutoRecruitSettingsUserControl.xaml.cs rename to src/MaaWpfGui/Views/UserControl/AutoRecruitSettingsUserControl.xaml.cs index f992343d3a..8aa84f3ee8 100644 --- a/src/MeoAsstGui/Views/UserControl/AutoRecruitSettingsUserControl.xaml.cs +++ b/src/MaaWpfGui/Views/UserControl/AutoRecruitSettingsUserControl.xaml.cs @@ -1,5 +1,5 @@ // -// MeoAsstGui - A part of the MeoAssistantArknights project +// MaaWpfGui - A part of the MaaCoreArknights project // Copyright (C) 2021 MistEO and Contributors // // This program is free software: you can redistribute it and/or modify @@ -13,7 +13,7 @@ using System.Windows.Controls; -namespace MeoAsstGui +namespace MaaWpfGui { /// /// InfrastSettingsUserContril.xaml 的交互逻辑 diff --git a/src/MeoAsstGui/Views/UserControl/ConnectSettingsUserControl.xaml b/src/MaaWpfGui/Views/UserControl/ConnectSettingsUserControl.xaml similarity index 97% rename from src/MeoAsstGui/Views/UserControl/ConnectSettingsUserControl.xaml rename to src/MaaWpfGui/Views/UserControl/ConnectSettingsUserControl.xaml index b06173cd4b..5ffb708f68 100644 --- a/src/MeoAsstGui/Views/UserControl/ConnectSettingsUserControl.xaml +++ b/src/MaaWpfGui/Views/UserControl/ConnectSettingsUserControl.xaml @@ -1,5 +1,5 @@  -// MeoAsstGui - A part of the MeoAssistantArknights project +// MaaWpfGui - A part of the MaaCoreArknights project // Copyright (C) 2021 MistEO and Contributors // // This program is free software: you can redistribute it and/or modify @@ -13,7 +13,7 @@ using System.Windows.Controls; -namespace MeoAsstGui +namespace MaaWpfGui { /// /// ConnectSettingsUserControl.xaml 的交互逻辑 diff --git a/src/MeoAsstGui/Views/UserControl/FightSettingsUserControl.xaml b/src/MaaWpfGui/Views/UserControl/FightSettingsUserControl.xaml similarity index 98% rename from src/MeoAsstGui/Views/UserControl/FightSettingsUserControl.xaml rename to src/MaaWpfGui/Views/UserControl/FightSettingsUserControl.xaml index 92a57b7c71..b053d95ad6 100644 --- a/src/MeoAsstGui/Views/UserControl/FightSettingsUserControl.xaml +++ b/src/MaaWpfGui/Views/UserControl/FightSettingsUserControl.xaml @@ -1,14 +1,14 @@  diff --git a/src/MeoAsstGui/Views/UserControl/FightSettingsUserControl.xaml.cs b/src/MaaWpfGui/Views/UserControl/FightSettingsUserControl.xaml.cs similarity index 91% rename from src/MeoAsstGui/Views/UserControl/FightSettingsUserControl.xaml.cs rename to src/MaaWpfGui/Views/UserControl/FightSettingsUserControl.xaml.cs index 6953c7a851..9d62470d99 100644 --- a/src/MeoAsstGui/Views/UserControl/FightSettingsUserControl.xaml.cs +++ b/src/MaaWpfGui/Views/UserControl/FightSettingsUserControl.xaml.cs @@ -1,5 +1,5 @@ // -// MeoAsstGui - A part of the MeoAssistantArknights project +// MaaWpfGui - A part of the MaaCoreArknights project // Copyright (C) 2021 MistEO and Contributors // // This program is free software: you can redistribute it and/or modify @@ -13,7 +13,7 @@ using System.Windows.Controls; -namespace MeoAsstGui +namespace MaaWpfGui { /// /// ParamSettingUserControl.xaml 的交互逻辑 diff --git a/src/MeoAsstGui/Views/UserControl/GUISettingsUserControl.xaml b/src/MaaWpfGui/Views/UserControl/GUISettingsUserControl.xaml similarity index 97% rename from src/MeoAsstGui/Views/UserControl/GUISettingsUserControl.xaml rename to src/MaaWpfGui/Views/UserControl/GUISettingsUserControl.xaml index 65f6ffeabc..f8424e8dec 100644 --- a/src/MeoAsstGui/Views/UserControl/GUISettingsUserControl.xaml +++ b/src/MaaWpfGui/Views/UserControl/GUISettingsUserControl.xaml @@ -1,5 +1,5 @@  -// MeoAsstGui - A part of the MeoAssistantArknights project +// MaaWpfGui - A part of the MaaCoreArknights project // Copyright (C) 2021 MistEO and Contributors // // This program is free software: you can redistribute it and/or modify @@ -13,7 +13,7 @@ using System.Windows.Controls; -namespace MeoAsstGui +namespace MaaWpfGui { /// /// TraySettingsUserControl.xaml 的交互逻辑 diff --git a/src/MeoAsstGui/Views/UserControl/HotKeyEditorUserControl.xaml b/src/MaaWpfGui/Views/UserControl/HotKeyEditorUserControl.xaml similarity index 95% rename from src/MeoAsstGui/Views/UserControl/HotKeyEditorUserControl.xaml rename to src/MaaWpfGui/Views/UserControl/HotKeyEditorUserControl.xaml index b50f1b9465..792de00d96 100644 --- a/src/MeoAsstGui/Views/UserControl/HotKeyEditorUserControl.xaml +++ b/src/MaaWpfGui/Views/UserControl/HotKeyEditorUserControl.xaml @@ -1,5 +1,5 @@  -// MeoAsstGui - A part of the MeoAssistantArknights project +// MaaWpfGui - A part of the MaaCoreArknights project // Copyright (C) 2021 MistEO and Contributors // // This program is free software: you can redistribute it and/or modify @@ -14,9 +14,9 @@ using System.Windows; using System.Windows.Controls; using System.Windows.Input; -using MeoAsstGui.MaaHotKeys; +using MaaWpfGui.MaaHotKeys; -namespace MeoAsstGui +namespace MaaWpfGui { public partial class HotKeyEditorUserControl : UserControl { diff --git a/src/MeoAsstGui/Views/UserControl/HotKeySettingsUserControl.xaml b/src/MaaWpfGui/Views/UserControl/HotKeySettingsUserControl.xaml similarity index 92% rename from src/MeoAsstGui/Views/UserControl/HotKeySettingsUserControl.xaml rename to src/MaaWpfGui/Views/UserControl/HotKeySettingsUserControl.xaml index a46d24f60b..87405b423b 100644 --- a/src/MeoAsstGui/Views/UserControl/HotKeySettingsUserControl.xaml +++ b/src/MaaWpfGui/Views/UserControl/HotKeySettingsUserControl.xaml @@ -1,15 +1,15 @@  -// MeoAsstGui - A part of the MeoAssistantArknights project +// MaaWpfGui - A part of the MaaCoreArknights project // Copyright (C) 2021 MistEO and Contributors // // This program is free software: you can redistribute it and/or modify @@ -13,7 +13,7 @@ using System.Windows.Controls; -namespace MeoAsstGui +namespace MaaWpfGui { /// /// HotKeySettingsUserControl.xaml 的交互逻辑 diff --git a/src/MeoAsstGui/Views/UserControl/InfrastSettingsUserControl.xaml b/src/MaaWpfGui/Views/UserControl/InfrastSettingsUserControl.xaml similarity index 98% rename from src/MeoAsstGui/Views/UserControl/InfrastSettingsUserControl.xaml rename to src/MaaWpfGui/Views/UserControl/InfrastSettingsUserControl.xaml index 6bdb48c0b1..4b2c95a0b9 100644 --- a/src/MeoAsstGui/Views/UserControl/InfrastSettingsUserControl.xaml +++ b/src/MaaWpfGui/Views/UserControl/InfrastSettingsUserControl.xaml @@ -1,14 +1,14 @@  diff --git a/src/MeoAsstGui/Views/UserControl/InfrastSettingsUserControl.xaml.cs b/src/MaaWpfGui/Views/UserControl/InfrastSettingsUserControl.xaml.cs similarity index 94% rename from src/MeoAsstGui/Views/UserControl/InfrastSettingsUserControl.xaml.cs rename to src/MaaWpfGui/Views/UserControl/InfrastSettingsUserControl.xaml.cs index e15219a997..ae65f3fdca 100644 --- a/src/MeoAsstGui/Views/UserControl/InfrastSettingsUserControl.xaml.cs +++ b/src/MaaWpfGui/Views/UserControl/InfrastSettingsUserControl.xaml.cs @@ -1,5 +1,5 @@ // -// MeoAsstGui - A part of the MeoAssistantArknights project +// MaaWpfGui - A part of the MaaCoreArknights project // Copyright (C) 2021 MistEO and Contributors // // This program is free software: you can redistribute it and/or modify @@ -16,7 +16,7 @@ using System.Windows; using System.Windows.Controls; using System.Windows.Documents; -namespace MeoAsstGui +namespace MaaWpfGui { /// /// InfrastSettingsUserContril.xaml 的交互逻辑 diff --git a/src/MeoAsstGui/Views/UserControl/MallSettingsUserControl.xaml b/src/MaaWpfGui/Views/UserControl/MallSettingsUserControl.xaml similarity index 96% rename from src/MeoAsstGui/Views/UserControl/MallSettingsUserControl.xaml rename to src/MaaWpfGui/Views/UserControl/MallSettingsUserControl.xaml index f8276197bf..7737644bac 100644 --- a/src/MeoAsstGui/Views/UserControl/MallSettingsUserControl.xaml +++ b/src/MaaWpfGui/Views/UserControl/MallSettingsUserControl.xaml @@ -1,12 +1,12 @@  diff --git a/src/MeoAsstGui/Views/UserControl/MallSettingsUserControl.xaml.cs b/src/MaaWpfGui/Views/UserControl/MallSettingsUserControl.xaml.cs similarity index 91% rename from src/MeoAsstGui/Views/UserControl/MallSettingsUserControl.xaml.cs rename to src/MaaWpfGui/Views/UserControl/MallSettingsUserControl.xaml.cs index c28fd8bbea..a19080901e 100644 --- a/src/MeoAsstGui/Views/UserControl/MallSettingsUserControl.xaml.cs +++ b/src/MaaWpfGui/Views/UserControl/MallSettingsUserControl.xaml.cs @@ -1,5 +1,5 @@ // -// MeoAsstGui - A part of the MeoAssistantArknights project +// MaaWpfGui - A part of the MaaCoreArknights project // Copyright (C) 2021 MistEO and Contributors // // This program is free software: you can redistribute it and/or modify @@ -13,7 +13,7 @@ using System.Windows.Controls; -namespace MeoAsstGui +namespace MaaWpfGui { /// /// InfrastSettingsUserContril.xaml 的交互逻辑 diff --git a/src/MeoAsstGui/Views/UserControl/PenguinReportSettingsUserControl.xaml b/src/MaaWpfGui/Views/UserControl/PenguinReportSettingsUserControl.xaml similarity index 92% rename from src/MeoAsstGui/Views/UserControl/PenguinReportSettingsUserControl.xaml rename to src/MaaWpfGui/Views/UserControl/PenguinReportSettingsUserControl.xaml index 2fd1a2f367..8affce9d65 100644 --- a/src/MeoAsstGui/Views/UserControl/PenguinReportSettingsUserControl.xaml +++ b/src/MaaWpfGui/Views/UserControl/PenguinReportSettingsUserControl.xaml @@ -1,12 +1,12 @@  diff --git a/src/MeoAsstGui/Views/UserControl/PenguinReportSettingsUserControl.xaml.cs b/src/MaaWpfGui/Views/UserControl/PenguinReportSettingsUserControl.xaml.cs similarity index 92% rename from src/MeoAsstGui/Views/UserControl/PenguinReportSettingsUserControl.xaml.cs rename to src/MaaWpfGui/Views/UserControl/PenguinReportSettingsUserControl.xaml.cs index 92ffbd140a..a8e589c394 100644 --- a/src/MeoAsstGui/Views/UserControl/PenguinReportSettingsUserControl.xaml.cs +++ b/src/MaaWpfGui/Views/UserControl/PenguinReportSettingsUserControl.xaml.cs @@ -1,5 +1,5 @@ // -// MeoAsstGui - A part of the MeoAssistantArknights project +// MaaWpfGui - A part of the MaaCoreArknights project // Copyright (C) 2021 MistEO and Contributors // // This program is free software: you can redistribute it and/or modify @@ -13,7 +13,7 @@ using System.Windows.Controls; -namespace MeoAsstGui +namespace MaaWpfGui { /// /// PenguinReportSettingsUserControl.xaml 的交互逻辑 diff --git a/src/MeoAsstGui/Views/UserControl/RoguelikeSettingsUserControl.xaml b/src/MaaWpfGui/Views/UserControl/RoguelikeSettingsUserControl.xaml similarity index 98% rename from src/MeoAsstGui/Views/UserControl/RoguelikeSettingsUserControl.xaml rename to src/MaaWpfGui/Views/UserControl/RoguelikeSettingsUserControl.xaml index 9b3707627e..540d4d3c98 100644 --- a/src/MeoAsstGui/Views/UserControl/RoguelikeSettingsUserControl.xaml +++ b/src/MaaWpfGui/Views/UserControl/RoguelikeSettingsUserControl.xaml @@ -1,5 +1,5 @@  diff --git a/src/MeoAsstGui/Views/UserControl/RoguelikeSettingsUserControl.xaml.cs b/src/MaaWpfGui/Views/UserControl/RoguelikeSettingsUserControl.xaml.cs similarity index 92% rename from src/MeoAsstGui/Views/UserControl/RoguelikeSettingsUserControl.xaml.cs rename to src/MaaWpfGui/Views/UserControl/RoguelikeSettingsUserControl.xaml.cs index 25c4d63985..96bc326ca0 100644 --- a/src/MeoAsstGui/Views/UserControl/RoguelikeSettingsUserControl.xaml.cs +++ b/src/MaaWpfGui/Views/UserControl/RoguelikeSettingsUserControl.xaml.cs @@ -1,5 +1,5 @@ // -// MeoAsstGui - A part of the MeoAssistantArknights project +// MaaWpfGui - A part of the MaaCoreArknights project // Copyright (C) 2021 MistEO and Contributors // // This program is free software: you can redistribute it and/or modify @@ -13,7 +13,7 @@ using System.Windows.Controls; -namespace MeoAsstGui +namespace MaaWpfGui { /// /// InfrastSettingsUserContril.xaml 的交互逻辑 diff --git a/src/MeoAsstGui/Views/UserControl/StartSettingsUserControl.xaml b/src/MaaWpfGui/Views/UserControl/StartSettingsUserControl.xaml similarity index 97% rename from src/MeoAsstGui/Views/UserControl/StartSettingsUserControl.xaml rename to src/MaaWpfGui/Views/UserControl/StartSettingsUserControl.xaml index d90cff7fca..1ce50125be 100644 --- a/src/MeoAsstGui/Views/UserControl/StartSettingsUserControl.xaml +++ b/src/MaaWpfGui/Views/UserControl/StartSettingsUserControl.xaml @@ -1,12 +1,12 @@  -// MeoAsstGui - A part of the MeoAssistantArknights project +// MaaWpfGui - A part of the MaaCoreArknights project // Copyright (C) 2021 MistEO and Contributors // // This program is free software: you can redistribute it and/or modify @@ -13,7 +13,7 @@ using System.Windows.Controls; -namespace MeoAsstGui +namespace MaaWpfGui { /// /// StartSettingsUserControl.xaml 的交互逻辑 diff --git a/src/MeoAsstGui/Views/UserControl/TimerSettingsUserControl.xaml b/src/MaaWpfGui/Views/UserControl/TimerSettingsUserControl.xaml similarity index 98% rename from src/MeoAsstGui/Views/UserControl/TimerSettingsUserControl.xaml rename to src/MaaWpfGui/Views/UserControl/TimerSettingsUserControl.xaml index 69c2aa9d2b..11a74d879c 100644 --- a/src/MeoAsstGui/Views/UserControl/TimerSettingsUserControl.xaml +++ b/src/MaaWpfGui/Views/UserControl/TimerSettingsUserControl.xaml @@ -1,12 +1,12 @@  -// MeoAsstGui - A part of the MeoAssistantArknights project +// MaaWpfGui - A part of the MaaCoreArknights project // Copyright (C) 2021 MistEO and Contributors // // This program is free software: you can redistribute it and/or modify @@ -13,7 +13,7 @@ using System.Windows.Controls; -namespace MeoAsstGui +namespace MaaWpfGui { /// /// ParamSettingUserControl.xaml 的交互逻辑 diff --git a/src/MeoAsstGui/Views/UserControl/VersionUpdateSettingsUserControl.xaml b/src/MaaWpfGui/Views/UserControl/VersionUpdateSettingsUserControl.xaml similarity index 97% rename from src/MeoAsstGui/Views/UserControl/VersionUpdateSettingsUserControl.xaml rename to src/MaaWpfGui/Views/UserControl/VersionUpdateSettingsUserControl.xaml index 0719267e7a..127831479e 100644 --- a/src/MeoAsstGui/Views/UserControl/VersionUpdateSettingsUserControl.xaml +++ b/src/MaaWpfGui/Views/UserControl/VersionUpdateSettingsUserControl.xaml @@ -1,12 +1,12 @@  -// MeoAsstGui - A part of the MeoAssistantArknights project +// MaaWpfGui - A part of the MaaCoreArknights project // Copyright (C) 2021 MistEO and Contributors // // This program is free software: you can redistribute it and/or modify @@ -13,7 +13,7 @@ using System.Windows.Controls; -namespace MeoAsstGui +namespace MaaWpfGui { /// /// PenguinReportSettingsUserControl.xaml 的交互逻辑 diff --git a/src/MeoAsstGui/Views/UserControl/WarehouseUserControl.xaml b/src/MaaWpfGui/Views/UserControl/WarehouseUserControl.xaml similarity index 86% rename from src/MeoAsstGui/Views/UserControl/WarehouseUserControl.xaml rename to src/MaaWpfGui/Views/UserControl/WarehouseUserControl.xaml index e2ff6be9e2..b3f4a07cc6 100644 --- a/src/MeoAsstGui/Views/UserControl/WarehouseUserControl.xaml +++ b/src/MaaWpfGui/Views/UserControl/WarehouseUserControl.xaml @@ -1,14 +1,14 @@  -// MeoAsstGui - A part of the MeoAssistantArknights project +// MaaWpfGui - A part of the MaaCoreArknights project // Copyright (C) 2021 MistEO and Contributors // // This program is free software: you can redistribute it and/or modify @@ -13,7 +13,7 @@ using System.Windows.Controls; -namespace MeoAsstGui +namespace MaaWpfGui { /// /// ParamSettingUserControl.xaml 的交互逻辑 diff --git a/src/MeoAsstGui/Views/VersionUpdateView.xaml b/src/MaaWpfGui/Views/VersionUpdateView.xaml similarity index 95% rename from src/MeoAsstGui/Views/VersionUpdateView.xaml rename to src/MaaWpfGui/Views/VersionUpdateView.xaml index 83722f6c2d..ca196d6bc8 100644 --- a/src/MeoAsstGui/Views/VersionUpdateView.xaml +++ b/src/MaaWpfGui/Views/VersionUpdateView.xaml @@ -1,12 +1,12 @@ stdcpp20 /utf-8 /MP %(AdditionalOptions) stdc17 - $(ProjectDir)..\..\src\MeoAssistant;%(AdditionalIncludeDirectories) + $(ProjectDir)..\..\src\MaaCore;%(AdditionalIncludeDirectories) Console @@ -62,4 +62,4 @@ - \ No newline at end of file + diff --git a/tools/update_version.sh b/tools/update_version.sh index f8f1de50b9..222aac9ef9 100644 --- a/tools/update_version.sh +++ b/tools/update_version.sh @@ -2,4 +2,4 @@ . ./version.sh -sed -i "s/DEBUG VERSION/"$Version"/" ../src/MeoAssistant/Version.h +sed -i "s/DEBUG VERSION/"$Version"/" ../src/MaaCore/Version.h