Merge branch 'MaaXYZ:main' into main

.github/workflows/install.yml

@@ -23,7 +23,7 @@ jobs:
   meta:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - id: set_tag
@@ -58,26 +58,35 @@ jobs:
       fail-fast: false
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: true
 
       - name: Download MaaFramework
-        uses: robinraju/release-downloader@v1.8
+        uses: robinraju/release-downloader@v1
         with:
           repository: MaaXYZ/MaaFramework
           fileName: "MAA-win-${{ matrix.arch }}*"
           latest: true
-          preRelease: true
           out-file-path: "deps"
           extract: true
 
+      - name: Download MFAWPF  
+        uses: robinraju/release-downloader@v1  
+        with:  
+          repository: SweetSmellFox/MFAWPF  
+          filename: MFAWPF*
+          latest: true  
+          out-file-path: "MFA"  
+          extract: true  
+
       - name: Install
         shell: bash
         run: |
           python ./install.py ${{ needs.meta.outputs.tag }}
+          cp MFA/MFAWPF.exe install
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: M9A-win-${{ matrix.arch }}
           path: "install"
@@ -91,17 +100,16 @@ jobs:
       fail-fast: false
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: true
 
       - name: Download MaaFramework
-        uses: robinraju/release-downloader@v1.8
+        uses: robinraju/release-downloader@v1
         with:
           repository: MaaXYZ/MaaFramework
           fileName: "MAA-linux-${{ matrix.arch }}*"
           latest: true
-          preRelease: true
           out-file-path: "deps"
           extract: true
 
@@ -110,7 +118,7 @@ jobs:
         run: |
           python ./install.py ${{ needs.meta.outputs.tag }}
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: M9A-linux-${{ matrix.arch }}
           path: "install"
@@ -124,17 +132,16 @@ jobs:
       fail-fast: false
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: true
 
       - name: Download MaaFramework
-        uses: robinraju/release-downloader@v1.8
+        uses: robinraju/release-downloader@v1
         with:
           repository: MaaXYZ/MaaFramework
           fileName: "MAA-macos-${{ matrix.arch }}*"
           latest: true
-          preRelease: true
           out-file-path: "deps"
           extract: true
 
@@ -143,7 +150,7 @@ jobs:
         run: |
           python ./install.py ${{ needs.meta.outputs.tag }}
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: M9A-macos-${{ matrix.arch }}
           path: "install"
@@ -157,17 +164,16 @@ jobs:
       fail-fast: false
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: true
 
       - name: Download MaaFramework
-        uses: robinraju/release-downloader@v1.8
+        uses: robinraju/release-downloader@v1
         with:
           repository: MaaXYZ/MaaFramework
           fileName: "MAA-android-${{ matrix.arch }}*"
           latest: true
-          preRelease: true
           out-file-path: "deps"
           extract: true
 
@@ -176,17 +182,17 @@ jobs:
         run: |
           python ./install.py ${{ needs.meta.outputs.tag }}
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: M9A-android-${{ matrix.arch }}
           path: "install"
 
   release:
     if: ${{ needs.meta.outputs.is_release == 'true' }}
-    needs: [meta, windows, ubuntu, macos]
+    needs: [meta, windows, ubuntu, macos, android]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           path: assets
 
@@ -195,7 +201,7 @@ jobs:
           for f in *; do
             (cd $f && zip -r ../$f-${{ needs.meta.outputs.tag }}.zip .)
           done
-      - uses: softprops/action-gh-release@v1
+      - uses: softprops/action-gh-release@v2
         with:
           files: assets/*
           tag_name: ${{ needs.meta.outputs.tag }}

.gitignore

@@ -450,4 +450,7 @@ tools/ImageCropper/**/*.png
 # MacOS
 .DS_Store
 .nicegui/storage-general.json
+
+# M9A
 config/maa_option.json
+assets/config/maa_pi_config.json

README.md

@@ -8,10 +8,10 @@
 目前已有的功能：
 
 - 启动/关闭游戏
-- 收取荒原
+- 收取荒原、魔精收取生产物品
 - 每日心相（意志解析）
 - 刷体力、最优材料关卡、活动关卡导航、吃糖选项
-- 山麓的回音（肉鸽）
+- 局外演绎、山麓的回音（肉鸽）
 - 领取日常奖励
 - 每周深眠域（使用游戏自带自动战斗）
 
@@ -29,6 +29,13 @@
   _请注意！Windows 的电脑几乎全都是 x86_64 的，可能占 99.999%，除非你非常确定自己是 arm，否则别下这个！_
 - 解压后运行 `MaaPiCli.exe` 即可
 
+### 图形化界面
+
+目前暂无正式版 GUI，但有以下由社区大佬们贡献的 GUI 项目，欢迎使用！
+
+- [MFAWPF](https://github.com/SweetSmellFox/MFAWPF) 本项目是一个基于WPF框架开发的用户界面，旨在提供类似于MaaPiCli的功能
+- 目前MFAWPF已经集成到 `M9A-win-x86_64-vXXX.zip`中，解压后运行 `MFAWPF.exe` 即可
+
 ### macOS
 
 - 若使用 Intel 处理器，请下载 `M9A-macos-x86_64-vXXX.zip`
@@ -51,11 +58,7 @@
 - 2.0 版本已支持 mumu 后台保活，会在 run task 时获取 mumu 最前台的 tab，并始终使用这个 tab（即使之后被切到后台了）
 - 反馈问题请附上日志文件 `debug/maa.log`以及问题界面的截图，谢谢！
 
-## 图形化界面
-
-目前暂无正式版 GUI，但有以下由社区大佬们贡献的 GUI 项目，欢迎使用！
 
-- [MFAWPF](https://github.com/SweetSmellFox/MFAWPF) 本项目是一个基于WPF框架开发的用户界面，旨在提供类似于MaaPiCli的功能
 
 ## How to build
 
@@ -78,7 +81,7 @@
 
 ## 开发相关
 
-- [MaaFW 开发思路](https://github.com/MaaXYZ/MaaFramework/blob/main/docs/zh_cn/0.1-%E5%BC%80%E5%8F%91%E6%80%9D%E8%B7%AF.md)  
+- [MaaFW 开发思路](https://github.com/MaaXYZ/MaaFramework/blob/main/docs/zh_cn/1.1-%E5%BF%AB%E9%80%9F%E5%BC%80%E5%A7%8B.md#%E5%BC%80%E5%8F%91%E6%80%9D%E8%B7%AF)  
   M9A 目前使用其中第一种方式（纯 Pipeline 低代码），后续可能会迁移到第二种方式（Pipeline + 自定义任务）
 - [Pipeline 流水线协议](https://github.com/MaaXYZ/MaaFramework/blob/main/docs/zh_cn/3.1-%E4%BB%BB%E5%8A%A1%E6%B5%81%E6%B0%B4%E7%BA%BF%E5%8D%8F%E8%AE%AE.md)
 

assets/interface.json

@@ -1,4 +1,8 @@
 {
+    "name": "M9A",
+    "url": "https://github.com/MaaXYZ/M9A",
+    "default_controller": "adb",
+    "lock_controller": true,
     "controller": [
         {
             "name": "ADB 默认方式",
@@ -28,17 +32,16 @@
         }
     ],
     "task": [
-        {
-            "name": "（不可用）日常任务顺序建议：启动游戏、收取荒原、每日心相、清体力、领取奖励、关闭游戏",
-            "entry": ""
-        },
         {
             "name": "启动游戏",
             "entry": "StartUp"
         },
         {
             "name": "收取荒原",
-            "entry": "Wilderness"
+            "entry": "Wilderness",
+            "option": [
+                "魔精收菜"
+            ]
         },
         {
             "name": "每日心相（意志解析）",
@@ -885,6 +888,26 @@
                 }
             ]
         },
+        "魔精收菜": {
+            "cases": [
+                {
+                    "name": "Yes",
+                    "pipeline_override": {
+                        "EnterProduct": {
+                            "enabled": true
+                        }
+                    }
+                },
+                {
+                    "name": "No",
+                    "pipeline_override": {
+                        "EnterProduct": {
+                            "enabled": false
+                        }
+                    }
+                }
+            ]
+        },
         "模式选择": {
             "cases": [
                 {

assets/resource/base/pipeline/activity/outsidededuction.json

@@ -1309,7 +1309,7 @@
         "recognition": "TemplateMatch",
         "template": "OutsideDeduction/SOD_Combat.png",
         "threshold": 0.85,
-        "index": 3,
+        "index": -1,
         "roi": [
             277,
             23,
@@ -1341,7 +1341,7 @@
         "recognition": "TemplateMatch",
         "template": "OutsideDeduction/SOD_Danger.png",
         "threshold": 0.85,
-        "index": 3,
+        "index": -1,
         "roi": [
             277,
             23,
@@ -1372,7 +1372,7 @@
         "recognition": "TemplateMatch",
         "template": "OutsideDeduction/SOD_Imminent.png",
         "threshold": 0.85,
-        "index": 3,
+        "index": -1,
         "roi": [
             277,
             23,
@@ -1402,7 +1402,7 @@
         "recognition": "TemplateMatch",
         "template": "OutsideDeduction/SOD_Shopping.png",
         "threshold": 0.85,
-        "index": 3,
+        "index": -1,
         "roi": [
             277,
             23,
@@ -1431,7 +1431,7 @@
         "recognition": "TemplateMatch",
         "template": "OutsideDeduction/SOD_Discovery.png",
         "threshold": 0.85,
-        "index": 3,
+        "index": -1,
         "roi": [
             277,
             23,
@@ -1459,7 +1459,7 @@
         "recognition": "TemplateMatch",
         "template": "OutsideDeduction/SOD_RestSite.png",
         "threshold": 0.85,
-        "index": 3,
+        "index": -1,
         "roi": [
             277,
             23,
@@ -1486,7 +1486,7 @@
         "recognition": "TemplateMatch",
         "template": "OutsideDeduction/SOD_Treasure.png",
         "threshold": 0.85,
-        "index": 3,
+        "index": -1,
         "roi": [
             277,
             23,
@@ -1646,6 +1646,7 @@
             "Sub_SOD_Dialog_4",
             "SOD_CombatDefeat_hint",
             "SOD_CombatDefeat",
+            "SOD_ItemSellct_1",
             "SOD_Combating"
         ]
     },
@@ -2177,6 +2178,7 @@
             "SOD_Skip",
             "SOD_Acquire",
             "SOD_NewArcanist",
+            "SOD_EndEvent",
             "SOD_SellectNext_1",
             "SOD_SellectNext_2",
             "SOD_SellectNext_3",
@@ -2335,12 +2337,12 @@
         "action": "Click",
         "threshold": 0.55,
         "next": [
+            "SOD_EndEvent_OK",
             "SOD_Departure",
             "SOD_Main",
             "SOD_Skip",
             "SOD_Ending_1",
             "SOD_Ending_2",
-            "SOD_EndingSelecct",
             "SOD_Levelup",
             "SOD_ItemSellct_1",
             "SOD_ItemLose_1",
@@ -2350,7 +2352,7 @@
             "SOD_ArcanistSellct",
             "SOD_ArcanistAdd_Single4",
             "SOD_CombatStart",
-            "SOD_EndEvent_OK"
+            "SOD_EndingSelecct"
         ]
     }
 }