From ef44e718cd9751fb969413c9f91d350b6c8ed140 Mon Sep 17 00:00:00 2001 From: MistEO Date: Thu, 1 Dec 2022 20:45:19 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E9=87=8D=E5=91=BD=E5=90=8Dvs=E5=B7=A5?= =?UTF-8?q?=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/dev-build-win.yml | 4 +- ...knights.sln.DotSettings => MAA.DotSettings | 0 MeoAssistantArknights.sln => MAA.sln | 134 +-- README.md | 2 +- README_en-US.md | 2 +- README_ja-JP.md | 2 +- README_ko-KR.md | 2 +- README_zh-TW.md | 2 +- docs/2.2-开发相关.md | 2 +- docs/en-us/2.2-DEVELOPMENT.md | 2 +- docs/ja-jp/2.2-プルリクエスト.md | 2 +- docs/zh-tw/2.2-開發相關.md | 2 +- .../{CppSample.vcxproj => Sample.vcxproj} | 4 +- ...vcxproj.filters => Sample.vcxproj.filters} | 8 +- src/MeoAssistant/MeoAssistant.vcxproj | 1 + src/MeoAssistant/README.md | 2 +- .../{MeoAsstGui.csproj => MaaWpfGui.csproj} | 988 +++++++++--------- src/SyncResources/SyncResources.vcxproj | 1 + tools/MaaBuilder/Builder/BuildParameters.cs | 4 +- .../CI/Build.CI.GitHubActions.DevBuild.cs | 4 +- 20 files changed, 585 insertions(+), 583 deletions(-) rename MeoAssistantArknights.sln.DotSettings => MAA.DotSettings (100%) rename MeoAssistantArknights.sln => MAA.sln (84%) rename src/CppSample/{CppSample.vcxproj => Sample.vcxproj} (99%) rename src/CppSample/{CppSample.vcxproj.filters => Sample.vcxproj.filters} (95%) rename src/MeoAsstGui/{MeoAsstGui.csproj => MaaWpfGui.csproj} (97%) diff --git a/.github/workflows/dev-build-win.yml b/.github/workflows/dev-build-win.yml index f057e92f16..f6aec80190 100644 --- a/.github/workflows/dev-build-win.yml +++ b/.github/workflows/dev-build-win.yml @@ -28,7 +28,7 @@ on: - tools/MaaBuilder.sln - 'include/**' - 'resource/**' - - MeoAssistantArknights.sln + - MAA.sln pull_request: branches: - dev @@ -40,7 +40,7 @@ on: - tools/MaaBuilder.sln - 'include/**' - 'resource/**' - - MeoAssistantArknights.sln + - MAA.sln workflow_dispatch: inputs: Reason: diff --git a/MeoAssistantArknights.sln.DotSettings b/MAA.DotSettings similarity index 100% rename from MeoAssistantArknights.sln.DotSettings rename to MAA.DotSettings diff --git a/MeoAssistantArknights.sln b/MAA.sln similarity index 84% rename from MeoAssistantArknights.sln rename to MAA.sln index 7541425c1e..b3105a22bb 100644 --- a/MeoAssistantArknights.sln +++ b/MAA.sln @@ -1,67 +1,67 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -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("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CppSample", "src\CppSample\CppSample.vcxproj", "{63B4F1A2-291C-4C85-91E1-A1F6DAE30D64}" - 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("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MeoAsstGui", "src\MeoAsstGui\MeoAsstGui.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}") = "MeoAssistant", "src\MeoAssistant\MeoAssistant.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 - .editorconfig = .editorconfig - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ResourceUpdater", "tools\ResourceUpdater\ResourceUpdater.vcxproj", "{C9EA2837-0A4B-488F-A289-643B9D0BFCEB}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SyncResources", "src\SyncResources\SyncResources.vcxproj", "{F860C043-4D86-41B6-A97E-4A75C9A6C4EC}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Release|x64 = Release|x64 - RelWithDebInfo|x64 = RelWithDebInfo|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {63B4F1A2-291C-4C85-91E1-A1F6DAE30D64}.Release|x64.ActiveCfg = Release|x64 - {63B4F1A2-291C-4C85-91E1-A1F6DAE30D64}.Release|x64.Build.0 = Release|x64 - {63B4F1A2-291C-4C85-91E1-A1F6DAE30D64}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64 - {63B4F1A2-291C-4C85-91E1-A1F6DAE30D64}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64 - {FFDC8F49-8EAF-45BE-B0A8-7EF0DB9875A2}.Release|x64.ActiveCfg = Release|x64 - {FFDC8F49-8EAF-45BE-B0A8-7EF0DB9875A2}.Release|x64.Build.0 = Release|x64 - {FFDC8F49-8EAF-45BE-B0A8-7EF0DB9875A2}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64 - {FFDC8F49-8EAF-45BE-B0A8-7EF0DB9875A2}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64 - {362D1E30-F5AE-4279-9985-65C27B3BA300}.Release|x64.ActiveCfg = Release|x64 - {362D1E30-F5AE-4279-9985-65C27B3BA300}.Release|x64.Build.0 = Release|x64 - {362D1E30-F5AE-4279-9985-65C27B3BA300}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64 - {362D1E30-F5AE-4279-9985-65C27B3BA300}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64 - {C9EA2837-0A4B-488F-A289-643B9D0BFCEB}.Release|x64.ActiveCfg = Release|x64 - {C9EA2837-0A4B-488F-A289-643B9D0BFCEB}.Release|x64.Build.0 = Release|x64 - {C9EA2837-0A4B-488F-A289-643B9D0BFCEB}.RelWithDebInfo|x64.ActiveCfg = Release|x64 - {C9EA2837-0A4B-488F-A289-643B9D0BFCEB}.RelWithDebInfo|x64.Build.0 = Release|x64 - {F860C043-4D86-41B6-A97E-4A75C9A6C4EC}.Release|x64.ActiveCfg = Release|x64 - {F860C043-4D86-41B6-A97E-4A75C9A6C4EC}.Release|x64.Build.0 = Release|x64 - {F860C043-4D86-41B6-A97E-4A75C9A6C4EC}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64 - {F860C043-4D86-41B6-A97E-4A75C9A6C4EC}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {C9EA2837-0A4B-488F-A289-643B9D0BFCEB} = {6C4B8D52-51D1-45F8-AAEC-808035443FD6} - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {4F2C0E4B-4FE9-47C6-A878-6BD2FAD8B9B2} - EndGlobalSection -EndGlobal + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +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}" + 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\MeoAssistant.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 + .editorconfig = .editorconfig + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ResourceUpdater", "tools\ResourceUpdater\ResourceUpdater.vcxproj", "{C9EA2837-0A4B-488F-A289-643B9D0BFCEB}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SyncRes", "src\SyncResources\SyncResources.vcxproj", "{F860C043-4D86-41B6-A97E-4A75C9A6C4EC}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Sample", "src\CppSample\Sample.vcxproj", "{63B4F1A2-291C-4C85-91E1-A1F6DAE30D64}" + 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 +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Release|x64 = Release|x64 + RelWithDebInfo|x64 = RelWithDebInfo|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {FFDC8F49-8EAF-45BE-B0A8-7EF0DB9875A2}.Release|x64.ActiveCfg = Release|x64 + {FFDC8F49-8EAF-45BE-B0A8-7EF0DB9875A2}.Release|x64.Build.0 = Release|x64 + {FFDC8F49-8EAF-45BE-B0A8-7EF0DB9875A2}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64 + {FFDC8F49-8EAF-45BE-B0A8-7EF0DB9875A2}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64 + {362D1E30-F5AE-4279-9985-65C27B3BA300}.Release|x64.ActiveCfg = Release|x64 + {362D1E30-F5AE-4279-9985-65C27B3BA300}.Release|x64.Build.0 = Release|x64 + {362D1E30-F5AE-4279-9985-65C27B3BA300}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64 + {362D1E30-F5AE-4279-9985-65C27B3BA300}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64 + {C9EA2837-0A4B-488F-A289-643B9D0BFCEB}.Release|x64.ActiveCfg = Release|x64 + {C9EA2837-0A4B-488F-A289-643B9D0BFCEB}.Release|x64.Build.0 = Release|x64 + {C9EA2837-0A4B-488F-A289-643B9D0BFCEB}.RelWithDebInfo|x64.ActiveCfg = Release|x64 + {C9EA2837-0A4B-488F-A289-643B9D0BFCEB}.RelWithDebInfo|x64.Build.0 = Release|x64 + {F860C043-4D86-41B6-A97E-4A75C9A6C4EC}.Release|x64.ActiveCfg = Release|x64 + {F860C043-4D86-41B6-A97E-4A75C9A6C4EC}.Release|x64.Build.0 = Release|x64 + {F860C043-4D86-41B6-A97E-4A75C9A6C4EC}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64 + {F860C043-4D86-41B6-A97E-4A75C9A6C4EC}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64 + {63B4F1A2-291C-4C85-91E1-A1F6DAE30D64}.Release|x64.ActiveCfg = Release|x64 + {63B4F1A2-291C-4C85-91E1-A1F6DAE30D64}.Release|x64.Build.0 = Release|x64 + {63B4F1A2-291C-4C85-91E1-A1F6DAE30D64}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64 + {63B4F1A2-291C-4C85-91E1-A1F6DAE30D64}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {C9EA2837-0A4B-488F-A289-643B9D0BFCEB} = {6C4B8D52-51D1-45F8-AAEC-808035443FD6} + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {4F2C0E4B-4FE9-47C6-A878-6BD2FAD8B9B2} + EndGlobalSection +EndGlobal diff --git a/README.md b/README.md index fa8c7dc637..a1396c0095 100644 --- a/README.md +++ b/README.md @@ -134,7 +134,7 @@ MAA 的意思是 MAA Assistant Arknights ### Windows -- 直接使用 Visual Studio 2022 打开 `MeoAssistantArknights.sln` 即可，所有环境都是配置好的 +- 直接使用 Visual Studio 2022 打开 `MAA.sln` 即可，所有环境都是配置好的 - 建议启用 clang-format 支持，详细内容可以参考 [在 Visual Studio 中启用 clang-format](docs/2.2-开发相关.md#在-visual-studio-中启用-clang-format) ### Linux | macOS diff --git a/README_en-US.md b/README_en-US.md index 763a480a07..ee9e4fbb0a 100644 --- a/README_en-US.md +++ b/README_en-US.md @@ -133,7 +133,7 @@ Thanks to all friends who contribute to development/testing for making MAA bette ### Windows -- Open `MeoAssistantArknights.sln` with Visual Studio 2022. All settings have been configured properly. +- Open `MAA.sln` with Visual Studio 2022. All settings have been configured properly. - Switch on the feature of clang-format. Please refer to [Using clang-format in Visual Studio](docs/en-us/2.2-DEVELOPMENT.md#using-clang-format-in-visual-studio). ### Linux/MacOS diff --git a/README_ja-JP.md b/README_ja-JP.md index 8c5e7e97cb..8408d13667 100644 --- a/README_ja-JP.md +++ b/README_ja-JP.md @@ -135,7 +135,7 @@ MAAをより良くするために開発・テストに貢献してくれたす ### Windows -- Visual Studio 2022で `MeoAssistantArknights.sln` を開きます。環境がすでに構成されています。 +- Visual Studio 2022で `MAA.sln` を開きます。環境がすでに構成されています。 - clang-formatのサポートを有効にすることをお勧めします。詳細については、[Visual Studioでclang-formatを有効にする](docs/ja-jp/2.2-プルリクエスト.md)を参照してください。 ### Linux | macOS diff --git a/README_ko-KR.md b/README_ko-KR.md index d7ded72e47..900f7ab616 100644 --- a/README_ko-KR.md +++ b/README_ko-KR.md @@ -137,7 +137,7 @@ MAA의 개선을 위한 개발/테스트에 기여해준 모든 친구들에게 ### Windows -- `MeoAssistantArknights.sln`를 Visual Studio 2022로 열어주세요. 모든 설정이 제대로 구성되어 있습니다. +- `MAA.sln`를 Visual Studio 2022로 열어주세요. 모든 설정이 제대로 구성되어 있습니다. - clang-format 기능을 활성화해 주세요. 자세한 내용은 [개발](docs/ko-kr/2.2-개발.md) 문서의 [Visual Studio에서 clang-format 활성화](docs/ko-kr/2.2-개발.md#visual-studio에서-clang-format-활성화) 문단을 참조해 주세요. ### Linux/MacOS diff --git a/README_zh-TW.md b/README_zh-TW.md index 2cee42c067..56a43981cd 100644 --- a/README_zh-TW.md +++ b/README_zh-TW.md @@ -133,7 +133,7 @@ MAA 的意思是 MAA Assistant Arknights ### Windows -- 直接使用 Visual Studio 2022 打開 `MeoAssistantArknights.sln` 即可，所有環境都是配置好的 +- 直接使用 Visual Studio 2022 打開 `MAA.sln` 即可，所有環境都是配置好的 - 建議啟用 clang-format 支援，詳細內容可以參考 [在 Visual Studio 中啟用 clang-format](docs/2.2-开发相关.md#在-visual-studio-中启用-clang-format) ### Linux | macOS diff --git a/docs/2.2-开发相关.md b/docs/2.2-开发相关.md index 41d15a89e9..d7a7512fd7 100644 --- a/docs/2.2-开发相关.md +++ b/docs/2.2-开发相关.md @@ -20,7 +20,7 @@ 1. 下载并安装 `Visual Studio 2022 community`, 安装的时候需要选中 `基于c++的桌面开发` 和 `.NET桌面开发` -5. 双击打开 `MeoAssistantArknights.sln` 文件。Visual Studio 会自动加载整个项目。 +5. 双击打开 `MAA.sln` 文件。Visual Studio 会自动加载整个项目。 6. 测试一下是否成功搭建编程环境，选择参数 `Release`, `x64`, 右键 `MeoAsstGui` 设为启动项目；点击启动，选择继续调试。如果成功打开了 GUI，就说明成功搭建了环境。如果求稳，可以继续连接模拟器跑一下 MAA 7. 到这里，你就可以愉快地 ~~瞎 JB 改~~ 发电了 8. 开发过程中，每一定数量，记得提交一个 commit, 别忘了写上 message diff --git a/docs/en-us/2.2-DEVELOPMENT.md b/docs/en-us/2.2-DEVELOPMENT.md index 5e6cd5f020..22274d7b89 100644 --- a/docs/en-us/2.2-DEVELOPMENT.md +++ b/docs/en-us/2.2-DEVELOPMENT.md @@ -14,7 +14,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 `MeoAssistantArknights.sln`. Visual Studio will load the project automatically. +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. 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. diff --git a/docs/ja-jp/2.2-プルリクエスト.md b/docs/ja-jp/2.2-プルリクエスト.md index 30a3c6c57f..c874feee24 100644 --- a/docs/ja-jp/2.2-プルリクエスト.md +++ b/docs/ja-jp/2.2-プルリクエスト.md @@ -14,7 +14,7 @@ 1. `Visual Studio 2022 community` をダウンロードしてインストールします。インストール時に `C++ベースのデスクトップ開発` と `.NETデスクトップ開発` を選択する必要があります。 -5. ダブルクリックして `MeoAssistantArknights.sln` ファイルを開きます。 Visual Studioは、プロジェクト全体を自動的に読み込みます。 +5. ダブルクリックして `MAA.sln` ファイルを開きます。 Visual Studioは、プロジェクト全体を自動的に読み込みます。 6. プログラミング環境が正常に構築されているかどうかをテストし、パラメーター `Release`、`x64` を選択し、スタートアッププロジェクトとして `MeoAsstGui` を右クリックして設定してから、`開始` をクリックして、`デバッグを続行` を選択します。 GUIが正常に開かれれば、環境が正常に構築されたことを意味します。もっと安定したい場合は、引き続きシミュレーターに接続してMAAを実行してみます。 7. ここまで楽しくコードを変更できます～ 8. 開発中は、一定量修正するたびにcommitを忘れず、コメントを書くことを忘れないでください。 diff --git a/docs/zh-tw/2.2-開發相關.md b/docs/zh-tw/2.2-開發相關.md index 35f0d29356..ddfa6ed920 100644 --- a/docs/zh-tw/2.2-開發相關.md +++ b/docs/zh-tw/2.2-開發相關.md @@ -14,7 +14,7 @@ 1. 下載並安裝 `Visual Studio 2022 community`, 安裝的時候需要選中 `基於c++的桌面開發` 和 `.NET桌面開發` -5. 雙擊打開 `MeoAssistantArknights.sln` 檔案。 Visual Studio 會自動加載整個項目。 +5. 雙擊打開 `MAA.sln` 檔案。 Visual Studio 會自動加載整個項目。 6. 測試一下是否成功搭建編程環境，選擇參數 `Release`, `x64`, 右鍵 `MeoAsstGui` 設為啟動項目；點擊啟動，選擇繼續調試。如果成功打開了 GUI，就說明成功搭建了環境。如果求穩，可以繼續連接模擬器跑一下 MAA 7. 到這裡，你就可以愉快地 ~~瞎 ㄐㄅ 改~~ 發電了 8. 開發過程中，每一定數量，記得提交一個 commit, 別忘了寫上 message diff --git a/src/CppSample/CppSample.vcxproj b/src/CppSample/Sample.vcxproj similarity index 99% rename from src/CppSample/CppSample.vcxproj rename to src/CppSample/Sample.vcxproj index b233a1fea4..38f23bc720 100644 --- a/src/CppSample/CppSample.vcxproj +++ b/src/CppSample/Sample.vcxproj @@ -19,7 +19,7 @@ {63B4F1A2-291C-4C85-91E1-A1F6DAE30D64} Tools 10.0 - CppSample + Sample @@ -108,4 +108,4 @@ - + \ No newline at end of file diff --git a/src/CppSample/CppSample.vcxproj.filters b/src/CppSample/Sample.vcxproj.filters similarity index 95% rename from src/CppSample/CppSample.vcxproj.filters rename to src/CppSample/Sample.vcxproj.filters index 65fa6d5ae5..16f0113df2 100644 --- a/src/CppSample/CppSample.vcxproj.filters +++ b/src/CppSample/Sample.vcxproj.filters @@ -5,14 +5,14 @@ {4FC737F1-C7A5-4376-A066-2A32D752A2FF} cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd + diff --git a/src/MeoAssistant/MeoAssistant.vcxproj b/src/MeoAssistant/MeoAssistant.vcxproj index 1e89904115..a0ff824415 100644 --- a/src/MeoAssistant/MeoAssistant.vcxproj +++ b/src/MeoAssistant/MeoAssistant.vcxproj @@ -236,6 +236,7 @@ {362d1e30-f5ae-4279-9985-65c27b3ba300} MeoAssistant 10.0 + MaaCore diff --git a/src/MeoAssistant/README.md b/src/MeoAssistant/README.md index 968829cba0..2edefcb655 100644 --- a/src/MeoAssistant/README.md +++ b/src/MeoAssistant/README.md @@ -6,7 +6,7 @@ MAA 底层 C++ 模块 ### Windows -直接使用 Visual 2022 或以上版本打开 `MeoAssistantArknights.sln` 即可，所有环境都是配置好的 +直接使用 Visual 2022 或以上版本打开 `MAA.sln` 即可，所有环境都是配置好的 ### Linux | macOS diff --git a/src/MeoAsstGui/MeoAsstGui.csproj b/src/MeoAsstGui/MaaWpfGui.csproj similarity index 97% rename from src/MeoAsstGui/MeoAsstGui.csproj rename to src/MeoAsstGui/MaaWpfGui.csproj index d064738b87..198d634cb8 100644 --- a/src/MeoAsstGui/MeoAsstGui.csproj +++ b/src/MeoAsstGui/MaaWpfGui.csproj @@ -1,495 +1,495 @@ - - - - - Debug - AnyCPU - {FFDC8F49-8EAF-45BE-B0A8-7EF0DB9875A2} - WinExe - MeoAsstGui - MeoAsstGui - v4.8 - 512 - {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 4 - true - true - false - - - - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - https://github.com/MistEO/MeoAssistantArknights - https://github.com/MistEO/MeoAssistantArknights/issues - Meo明日方舟辅助 - MistEO - MeoAssistant - 0 - 4.0.0.0 - false - true - - - OnBuildSuccess - - - newlogo.ico - - - MeoAsstGui.App - - - ..\..\x64\Release\ - TRACE - true - pdbonly - x64 - 8.0 - prompt - ..\..\x64\Release\MeoAsstGui.xml - true - - - ..\..\x64\RelWithDebInfo\ - DEBUG;TRACE - false - pdbonly - x64 - 8.0 - prompt - true - - - - false - true - - - - - - - - - - - - - - - - - - - - - 4.0 - - - - - - - - MSBuild:Compile - Designer - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - GUISettingsUserControl.xaml - - - - - HotKeyEditorUserControl.xaml - - - HotKeySettingsUserControl.xaml - - - StartSettingsUserControl.xaml - - - TimerSettingsUserControl.xaml - - - AutoRecruitSettingsUserControl.xaml - - - ConnectSettingsUserControl.xaml - - - RoguelikeSettingsUserControl.xaml - - - MallSettingsUserControl.xaml - - - InfrastSettingsUserControl.xaml - - - FightSettingsUserControl.xaml - - - - PenguinReportSettingsUserControl.xaml - - - AboutUserControl.xaml - - - VersionUpdateSettingsUserControl.xaml - - - - - - - - - - - App.xaml - Code - - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - - - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - - - MSBuild:Compile - Designer - - - - MSBuild:Compile - Designer - - - - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - - - Code - - - - - - - - - False - Microsoft .NET Framework 4.7.2 %28x86 和 x64%29 - true - - - False - .NET Framework 3.5 SP1 - false - - - - - 2.5.2 - - - 5.7.0 - All - - - 1.1.0 - - - 3.1.1 - - - 3.3.0 - - - 1.15.0 - - - 6.0.4 - - - 7.1.2 - - - 4.3.0 - - - 1.0.10 - - - 2.0.3 - - - 13.0.1 - - - 6.1.0.5 - - - 2.2.0 - - - 1.2.0-beta.435 - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - 1.3.6 - - - 4.3.0 - - - 4.3.0 - - - 4.3.0 - - - 4.3.1 - - - 4.3.0 - - - 6.0.0 - - - 4.3.0 - - - 4.3.0 - - - 4.3.0 - - - 4.3.0 - - - 4.3.0 - - - 4.3.0 - - - 4.3.0 - - - 4.3.0 - - - 4.3.0 - - - 4.3.4 - - - 4.3.1 - - - 4.3.0 - - - 4.3.0 - - - 4.3.0 - - - 4.3.0 - - - 4.3.0 - - - 4.3.0 - - - 4.3.1 - - - 4.3.1 - - - 4.3.0 - - - 4.3.0 - - - 4.3.0 - - - 4.3.0 - - - 4.3.1 - - - 4.3.2 - - - 4.3.0 - - - 4.3.0 - - - 4.3.1 - - - 4.3.0 - - - 4.3.0 - - - 4.3.0 - - - 4.3.1 - - - 4.3.0 - - - - - - - - xcopy /e /y /i /c "$(ProjectDir)..\..\3rdparty\tools" "$(TargetDir)" -xcopy /e /y /i /c "$(ProjectDir)..\..\src\Python" "$(TargetDir)\Python" - + + + + + Debug + AnyCPU + {FFDC8F49-8EAF-45BE-B0A8-7EF0DB9875A2} + WinExe + MeoAsstGui + MeoAsstGui + v4.8 + 512 + {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + 4 + true + true + false + + + + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + https://github.com/MistEO/MeoAssistantArknights + https://github.com/MistEO/MeoAssistantArknights/issues + Meo明日方舟辅助 + MistEO + MeoAssistant + 0 + 4.0.0.0 + false + true + + + OnBuildSuccess + + + newlogo.ico + + + MeoAsstGui.App + + + ..\..\x64\Release\ + TRACE + true + pdbonly + x64 + 8.0 + prompt + ..\..\x64\Release\MeoAsstGui.xml + true + + + ..\..\x64\RelWithDebInfo\ + DEBUG;TRACE + false + pdbonly + x64 + 8.0 + prompt + true + + + + false + true + + + + + + + + + + + + + + + + + + + + + 4.0 + + + + + + + + MSBuild:Compile + Designer + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + GUISettingsUserControl.xaml + + + + + HotKeyEditorUserControl.xaml + + + HotKeySettingsUserControl.xaml + + + StartSettingsUserControl.xaml + + + TimerSettingsUserControl.xaml + + + AutoRecruitSettingsUserControl.xaml + + + ConnectSettingsUserControl.xaml + + + RoguelikeSettingsUserControl.xaml + + + MallSettingsUserControl.xaml + + + InfrastSettingsUserControl.xaml + + + FightSettingsUserControl.xaml + + + + PenguinReportSettingsUserControl.xaml + + + AboutUserControl.xaml + + + VersionUpdateSettingsUserControl.xaml + + + + + + + + + + + App.xaml + Code + + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + Designer + MSBuild:Compile + + + MSBuild:Compile + Designer + + + Designer + MSBuild:Compile + + + MSBuild:Compile + Designer + + + + MSBuild:Compile + Designer + + + + MSBuild:Compile + Designer + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + Designer + MSBuild:Compile + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + + + Code + + + + + + + + + False + Microsoft .NET Framework 4.7.2 %28x86 和 x64%29 + true + + + False + .NET Framework 3.5 SP1 + false + + + + + 2.5.2 + + + 5.7.0 + All + + + 1.1.0 + + + 3.1.1 + + + 3.3.0 + + + 1.15.0 + + + 6.0.4 + + + 7.1.2 + + + 4.3.0 + + + 1.0.10 + + + 2.0.3 + + + 13.0.1 + + + 6.1.0.5 + + + 2.2.0 + + + 1.2.0-beta.435 + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + 1.3.6 + + + 4.3.0 + + + 4.3.0 + + + 4.3.0 + + + 4.3.1 + + + 4.3.0 + + + 6.0.0 + + + 4.3.0 + + + 4.3.0 + + + 4.3.0 + + + 4.3.0 + + + 4.3.0 + + + 4.3.0 + + + 4.3.0 + + + 4.3.0 + + + 4.3.0 + + + 4.3.4 + + + 4.3.1 + + + 4.3.0 + + + 4.3.0 + + + 4.3.0 + + + 4.3.0 + + + 4.3.0 + + + 4.3.0 + + + 4.3.1 + + + 4.3.1 + + + 4.3.0 + + + 4.3.0 + + + 4.3.0 + + + 4.3.0 + + + 4.3.1 + + + 4.3.2 + + + 4.3.0 + + + 4.3.0 + + + 4.3.1 + + + 4.3.0 + + + 4.3.0 + + + 4.3.0 + + + 4.3.1 + + + 4.3.0 + + + + + + + + xcopy /e /y /i /c "$(ProjectDir)..\..\3rdparty\tools" "$(TargetDir)" +xcopy /e /y /i /c "$(ProjectDir)..\..\src\Python" "$(TargetDir)\Python" + \ No newline at end of file diff --git a/src/SyncResources/SyncResources.vcxproj b/src/SyncResources/SyncResources.vcxproj index 7d74b2e884..d356060e4b 100644 --- a/src/SyncResources/SyncResources.vcxproj +++ b/src/SyncResources/SyncResources.vcxproj @@ -16,6 +16,7 @@ {f860c043-4d86-41b6-a97e-4a75c9a6c4ec} SyncResources 10.0 + SyncRes diff --git a/tools/MaaBuilder/Builder/BuildParameters.cs b/tools/MaaBuilder/Builder/BuildParameters.cs index 30d4d88ac2..a9ccda5476 100644 --- a/tools/MaaBuilder/Builder/BuildParameters.cs +++ b/tools/MaaBuilder/Builder/BuildParameters.cs @@ -120,8 +120,8 @@ public partial class Build MaaChangelogFile = RootDirectory / "CHANGELOG.md"; // 项目 - var maaSolution = ProjectModelTasks.ParseSolution(RootDirectory / "MeoAssistantArknights.sln"); - Assert.True(maaSolution is not null, "无法载入 MeoAssistantArknights.sln"); + var maaSolution = ProjectModelTasks.ParseSolution(RootDirectory / "MAA.sln"); + Assert.True(maaSolution is not null, "无法载入 MAA.sln"); MaaCoreProject = maaSolution.GetProject("MeoAssistant"); MaaWpfProject = maaSolution.GetProject("MeoAsstGui"); diff --git a/tools/MaaBuilder/Builder/CI/Build.CI.GitHubActions.DevBuild.cs b/tools/MaaBuilder/Builder/CI/Build.CI.GitHubActions.DevBuild.cs index 79fab25947..ad71a60c2d 100644 --- a/tools/MaaBuilder/Builder/CI/Build.CI.GitHubActions.DevBuild.cs +++ b/tools/MaaBuilder/Builder/CI/Build.CI.GitHubActions.DevBuild.cs @@ -16,7 +16,7 @@ namespace MaaBuilder; "tools/MaaBuilder.sln", "include/**", "resource/**", // 新 UI 发布后，DevBuild 不再包含 WPF Gui 内容，不再打包 MaaBundle，因此移除资源文件夹的监控 - "MeoAssistantArknights.sln" + "MAA.sln" }, OnPullRequestIncludePaths = new[] { @@ -27,7 +27,7 @@ namespace MaaBuilder; "tools/MaaBuilder.sln", "include/**", "resource/**", // 新 UI 发布后，DevBuild 不再包含 WPF Gui 内容，不再打包 MaaBundle，因此移除资源文件夹的监控 - "MeoAssistantArknights.sln" + "MAA.sln" }, OnWorkflowDispatchRequiredInputs = new [] { "Reason", "ReleaseSimulation" }, InvokedTargets = new[] { nameof(DevBuild) },