Merge remote-tracking branch 'upstream/main' into main

# Conflicts: # .github/workflows/ci.yml # CMakeLists.txt # README.md # source/cli/CMakeLists.txt # source/cli/main.cpp
MaaXYZ · Dec 31, 2023 · d6ff3a2 · d6ff3a2
2 parents c13fa17 + e1c6372
commit d6ff3a2
Show file tree

Hide file tree

Showing 20 changed files with 266 additions and 302 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -78,8 +78,8 @@ jobs:
         uses: robinraju/[email protected]
         with:
           repository: MaaAssistantArknights/MaaFramework
-          latest: true
           fileName: "MAA-win-${{ matrix.arch }}*"
+          latest: true
           out-file-path: "deps"
           extract: true
 
@@ -143,8 +143,8 @@ jobs:
         uses: robinraju/[email protected]
         with:
           repository: MaaAssistantArknights/MaaFramework
-          latest: true
           fileName: "MAA-linux-${{ matrix.arch }}*"
+          latest: true
           out-file-path: "deps"
           extract: true
 
@@ -165,7 +165,7 @@ jobs:
 
       - uses: actions/upload-artifact@v3
         with:
-          name: MAA1999-linux-${{ matrix.arch }}
+          name: M9A-linux-${{ matrix.arch }}
           path: "install"
 
   macos:
@@ -199,8 +199,8 @@ jobs:
         uses: robinraju/[email protected]
         with:
           repository: MaaAssistantArknights/MaaFramework
-          latest: true
           fileName: "MAA-macos-${{ matrix.arch }}*"
+          latest: true
           out-file-path: "deps"
           extract: true
 
@@ -222,7 +222,7 @@ jobs:
 
       - uses: actions/upload-artifact@v3
         with:
-          name: MAA1999-macos-${{ matrix.arch }}
+          name: M9A-macos-${{ matrix.arch }}
           path: "install"
 
   release:

diff --git a/.maay/repo.json b/.maay/repo.json
diff --git a/CMakePresets.json b/CMakePresets.json
@@ -41,5 +41,63 @@
                 "value": "ARM64"
             }
         }
+    ],
+    "buildPresets": [
+        {
+            "name": "NinjaMulti - Debug",
+            "displayName": "Ninja MultiConfig Debug",
+            "description": "Ninja MultiConfig Debug",
+            "configurePreset": "NinjaMulti",
+            "configuration": "Debug",
+            "jobs": 16
+        },
+        {
+            "name": "NinjaMulti - DebWithRelDeps",
+            "displayName": "Ninja MultiConfig DebWithRelDeps",
+            "description": "Ninja MultiConfig DebWithRelDeps",
+            "configurePreset": "NinjaMulti",
+            "configuration": "RelWithDebInfo",
+            "jobs": 16
+        },
+        {
+            "name": "NinjaMulti - Release",
+            "displayName": "Ninja MultiConfig Release",
+            "description": "Ninja MultiConfig Release",
+            "configurePreset": "NinjaMulti",
+            "configuration": "Release",
+            "jobs": 16
+        },
+        {
+            "name": "MSVC 2022 - Debug",
+            "displayName": "MSVC 2022 Debug",
+            "description": "MSVC 2022 Debug",
+            "configurePreset": "MSVC 2022",
+            "configuration": "Debug",
+            "jobs": 16
+        },
+        {
+            "name": "MSVC 2022 - DebWithRelDeps",
+            "displayName": "MSVC 2022 DebWithRelDeps",
+            "description": "MSVC 2022 DebWithRelDeps",
+            "configurePreset": "MSVC 2022",
+            "configuration": "DebWithRelDeps",
+            "jobs": 16
+        },
+        {
+            "name": "MSVC 2022 - Release",
+            "displayName": "MSVC 2022 Release",
+            "description": "MSVC 2022 Release",
+            "configurePreset": "MSVC 2022",
+            "configuration": "Release",
+            "jobs": 16
+        },
+        {
+            "name": "MSVC 2022 ARM - Release",
+            "displayName": "MSVC 2022 ARM Release",
+            "description": "MSVC 2022 ARM Release",
+            "configurePreset": "MSVC 2022 ARM",
+            "configuration": "Release",
+            "jobs": 16
+        }
     ]
 }
diff --git a/README.md b/README.md
@@ -29,9 +29,16 @@
 MAA1999_CLI.exe "H:\Program Files\Netease\MuMuPlayer-12.0\shell\.\adb.exe" "127.0.0.1:16640" ThreadLuxcavationBattle ExpLuxcavation CraftModule
 ```
 
+## 图形化界面
+
+目前暂无正式版 GUI，但有以下由社区大佬们贡献的 GUI 项目，欢迎使用！
+
+- [MAA1999WPF](https://github.com/MLAcookie/MAA1999WPF) 拿WPF框架写的一个MAA199的UI
+- [MaaY](https://github.com/MaaAssistantArknights/MaaY) 为MaaFramework重新设计的通用界面
+
 ## How to build
 
-**如果你要编译源码才看这节，否则直接 [下载](https://github.com/MaaAssistantArknights/MAA1999/releases) 即可**
+**如果你要编译源码才看这节，否则直接 [下载](https://github.com/MaaAssistantArknights/M9A/releases) 即可**
 
 1. 下载 MaaFramework 的 [Release 包](https://github.com/MaaAssistantArknights/MaaFramework/releases)，解压到 `deps` 文件夹中
 2. 配置 cmake