Release v5.2.2 (#8933)

MaaAssistantArknights · Apr 29, 2024 · 1f8bb96 · 1f8bb96
2 parents fd13d97 + 35e399c
commit 1f8bb96
Show file tree

Hide file tree

Showing 241 changed files with 43,026 additions and 557 deletions.
diff --git a/.github/workflows/deploy-website.yaml b/.github/workflows/deploy-website.yaml
@@ -0,0 +1,91 @@
+name: Deploy Website
+
+on:
+  push:
+    branches:
+      - master
+      - dev
+  workflow_dispatch:
+    inputs:
+      deploy-to-prod-env:
+        description: "Deploy to production environment"
+        default: false
+        required: true
+        type: boolean
+
+jobs:
+  deploy:
+    timeout-minutes: 20
+    runs-on: ubuntu-latest
+    env:
+      DO_NOT_TRACK: 1
+
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js environment
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+
+      - uses: pnpm/action-setup@v3
+        name: Install pnpm
+        with:
+          version: 9
+          run_install: false
+
+      - name: Install dependencies
+        run: pnpm install
+        working-directory: "./website"
+
+      - name: Build
+        run: pnpm run build
+        working-directory: "./website"
+
+      - name: Set deployment environment
+        id: set-deployment-env
+        run: |
+          if [[ "${{ github.event_name }}" != "workflow_dispatch" ]]; then
+            if [[ "${{ github.ref }}" == "refs/heads/master" ]]; then
+              echo "AZURE_TARGET_ENV=prod" >> $GITHUB_ENV
+            else
+              echo "AZURE_TARGET_ENV=dev" >> $GITHUB_ENV
+            fi
+          else
+            if [[ "${{ github.event.inputs.deploy-to-prod-env }}" == "true" ]]; then
+              echo "AZURE_TARGET_ENV=prod" >> $GITHUB_ENV
+            else
+              echo "AZURE_TARGET_ENV=dev" >> $GITHUB_ENV
+            fi
+          fi
+
+      - name: Show environment
+        run: echo ${{ env.AZURE_TARGET_ENV }}
+
+      - name: Deploy to Azure (prod)
+        id: deploy-prod
+        uses: Azure/static-web-apps-deploy@v1
+        if: env.AZURE_TARGET_ENV == 'prod'
+        with:
+          azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_MAA_WEBSITE }}
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          action: "upload"
+          app_location: "./website/dist"
+          api_location: ""
+          skip_app_build: true
+          skip_api_build: true
+
+      - name: Deploy to Azure (dev)
+        id: deploy-dev
+        uses: Azure/static-web-apps-deploy@v1
+        if: env.AZURE_TARGET_ENV == 'dev'
+        with:
+          azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_MAA_WEBSITE }}
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          action: "upload"
+          deployment_environment: dev
+          app_location: "./website/dist"
+          api_location: ""
+          skip_app_build: true
+          skip_api_build: true
diff --git a/.github/workflows/res-update-game.yml b/.github/workflows/res-update-game.yml
@@ -177,6 +177,7 @@ jobs:
           github_token: ${{ secrets.MISTEOWORKFLOW }}
 
       - name: Update OTA resource
+        if: steps.add_files.outputs.have_commits == 'True'
         run: |
           gh workflow --repo MaaAssistantArknights/MaaRelease run update-resource.yml
 

diff --git a/.github/workflows/docs-build-test.yml → .github/workflows/website-build-test.yml b/.github/workflows/docs-build-test.yml → .github/workflows/website-build-test.yml
@@ -1,16 +1,19 @@
-name: Build Test for docs
+name: Build Test for website
 
 on:
   push:
     branches-ignore:
       - "master"
+      - "dev"
     paths:
       - "docs/**"
+      - "website/**"
   pull_request:
     branches:
       - "dev"
     paths:
       - "docs/**"
+      - "website/**"
   workflow_dispatch:
 
 jobs:
@@ -29,20 +32,22 @@ jobs:
         with:
           node-version: 20
 
-      - name: Install dependencies
-        run: npm i
-        working-directory: "./docs"
+      - uses: pnpm/action-setup@v3
+        name: Install pnpm
+        with:
+          version: 9
+          run_install: false
 
-      - name: Cleanup files
-        run: rm tsconfig.json
-        working-directory: "./docs"
+      - name: Install dependencies
+        run: pnpm install
+        working-directory: "./website"
 
       - name: Build
-        run: npm run build
-        working-directory: "./docs"
+        run: pnpm run build
+        working-directory: "./website"
 
       - name: Upload artifact to GitHub
         uses: actions/upload-artifact@v4
         with:
-          name: docs
-          path: "./docs/.vuepress/dist"
+          name: dist
+          path: "./website/dist"
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,132 +1,84 @@
-## v5.2.1
+## v5.2.2
 
 ### 新增 | New
 
-* 巴别塔二、三阶段导航预载 (#8829) @AnnAngela
-* 巴别塔导航数据 (#8827) @AnnAngela
-* Add Bark notification provider (#8701) @KawashiroNitori
-* Add multi external notifications (#8628) @Sieluna
-* 计算开启技能及撤退按钮位置 | calculate position of skill & retreat button @horror-proton
+* CC 镜像路径变动 (#8935) @AnnAngela
+* 标题栏可选隐藏内容 (#8932) @ABA2396 @moomiji
+* 支持五周年赠送月卡的领取 (#8918) @SherkeyXD
+* "粘贴剪贴板"右键可添加作业集 @moomiji
+* 界面置顶功能 @ABA2396
+* 新增 边地移动城镇另外两个元件的保全派驻作业 (#8858) @junyihan233
+* 新增 多索雷斯商业地块 保全派驻作业 (#8848) @junyihan233
+* 阿尔斯特甜品制作平台追加作业 (#8847) @junyihan233
+* 新增 多索雷斯商业地块、边地移动城镇 保全派驻作业 (#8843) @junyihan233
+* add google analytics to docs @LiamSho
 
 ### 改进 | Improved
 
-* 战斗列表处于激活时，浏览带有难度标识的作业会自动添加对应难度到战斗列表 (#8491) @status102
-* 肉鸽投资模式`进入第二层`拓展为`投资模式启用购物、招募` (#8620) @status102
-* 移除过多的剧情检查 @status102
-* 专精干员名称按ui语言显示 @ABA2396
-* 自动战斗-自动编队存储编队信息 (#8542) @status102
-* Add missing headers & optimize the code @ABA2396
-* Improved InfrastFilterMenuNotStationedButton recognition score @Constrat
+* 生息演算更新后BB导航 @ABA2396
+* 更新明日方舟工具箱地址 (#8835) @Rbqwow
+* 优化边城保全声波记录扩音器脚本打法及修改脚本名称 (#8857) @junyihan233
+* 无变动时不再发起更新资源 (#8846) @AnnAngela
+* 更好的开局干员搜索 @moomiji
+* 更好的开局干员验证 @moomiji
 
 ### 修复 | Fix
 
-* 所有任务都添加失败时清空Core任务列表 @ABA2396
-* 部分场景下无法执行访问好友 @ABA2396
-* 假日场景下，银淞主题UI无法进入基建 (#8795) @HoshinoAyako
-* 肉鸽解析Vision失败 @ABA2396
-* 刷理智愚人号任务出错 @ABA2396
-* 无奖励关卡无法匹配愚人号部分关卡 @ABA2396
-* 泡普卡识别错误 @ABA2396
-* 尝试修复肉鸽导航 (#8764) @horror-proton
-* 无法进入设置 @ABA2396
-* 信用购买卡在购买完成界面 @ABA2396
-* macos 生息演算无法退出关卡 @ABA2396
-* 训练室读取干员名失效 @status102
-* 干员名ocrReplace追加`一煌`->`煌` & 夹子 @Saratoga-Official
-* 干员名识别移除前缀c @status102
-* 低信赖筛选错误 @status102
-* 战斗中教程剧情导致错误的倍速切换 @status102
-* 自动战斗-自动编队-补充低信赖时自动关闭特关 @status102
-* 干员名识别`一山`->`山` @status102
-* 自动战斗作业自动点赞检测 @status102
-* 尝试修复换行混乱 @status102
-* 特米米 in battle ocr detection (#8788) @Constrat
-* train regex @status102
-* match the correct file suffix @Amsterwolf
+* 修复不进入树篱之途节点的问题 @DavidWang19
+* 第一次启动时无法检测蓝叠国际版的adb路径 @ABA2396
+* 修复开始唤醒时卡在五周年月卡的问题 @SherkeyXD
+* 导航报错 @ABA2396
+* 修复开局干员搜索的性能和显示问题 @moomiji
+* 增加对地图文件检查，避免只存在索引 (#8895) @status102
+* 标题过长时无法显示置顶按钮 @ABA2396
+* 修复干员名识别识别含有`《。`前缀时，预处理结果错误 @status102
+* 修复404的链接 (#8839) @HChenZi
+* 修复#8892导致的崩溃 @status102
+* crash on background update @dantmnf
+* Copilot Combatlist H-1x-x Stage recognition (#8892) @HX3N
+* Unable to cast object of type LinearGradientBrush to type SolidColorBrush @ABA2396
+* add quote around adb args with character `|` @horror-proton
 
 ### 其他 | Other
 
-* pallas 无法获取 DynamicResource @ABA2396
-* 找不到语言资源文件 @ABA2396
-* 修复gen_changelog的错误操作 (#8756) @AnnAngela
-* 修复changelog_generator编码问题，以及部分重构 (#8739) @SherkeyXD
-* 修复nightly的changelog tag选取 @status102
-* 优化changelog (#8608) @AnnAngela
-* 优化 LocalizationHelper @ABA2396
-* 修改文档图片透明度 @ABA2396
-* 修改抗干扰值日志输出 @ABA2396
-* 生息演算介绍Update zh-cn.xaml @ABA2396
-* 加点不期而遇的日志 @ABA2396
-* LastBuyWineTime 改为全局配置 @ABA2396
-* 修改nightly changelog忽略多余抬头 @status102
-* 修正nightly使用生成文件 @status102
-* 一天只喝一次酒 @ABA2396
-* 修改不支持的关卡提示 @ABA2396
-* 去掉太慢的clang-format配置 @MistEO
-* 添加蓝叠核心版本推荐 (#8688) @Rbqwow
-* Update 肉鸽辅助协议.md (#8703) @guguji12
-* 修改changelog_generator的无序列表格式，从`- `改为`* ` @status102
-* 移除空格转义 @status102
-* 修改自动生成changelog与上个tag对比，而非与上个公版 @status102
-* rename Linux模拟器.md to Linux模拟器&容器.md (#8513) @zayn7lie
-* change image transparency (#8802) @Manicsteiner
-* use relative md instead of html links @wangl-cc
-* split and update CLI documents @wangl-cc
-* update maa-cli to 0.4.5 and build with vendored-openssl @wangl-cc
-* Remote Control spacing @Constrat
-* LocalizationHelper & SettingsViewModel @ABA2396
-* sync with upstream, re-arrange for linux users (#8733) @Constrat @Cryolitia
-* fix breakline @Cryolitia
-* declare license AGPL-3.0-only @Cryolitia
-* generate changelog with python script for nightly (#8728) @wangl-cc
-* output format @status102
-* Update .clang-format @MistEO
-* nightly auto changelog (#8614) @status102 @AnnAngela
+* 更新 Award 的集成文档 @SherkeyXD
+* 调整 UnsupportedLevel 界面提示说明 @ABA2396
+* update 新手上路.md @ABA2396
+* 标题滚动可选开启 @ABA2396
+* 新手引导 (#8749) @Rbqwow
+* 合并 MAA Website 仓库 (#8886) @LiamSho
+* 改个置顶的图标 @ABA2396
+* 撤回掉修 NumericUpDown 的反射 @moomiji
+* update `HandyControls` to `3.5.2` @moomiji
+* fix azure deployment_environment error @LiamSho
+* fix unexpected build and deploy behavior @LiamSho
+* update website deployment action to support deployment_environment @LiamSho
 
 ### For Overseas
 
-* 外服小车名称识别 @ABA2396
-
 #### txwy
 
-* 台服保全開場選元件ocr替换 (#8641) @vonnoq
-* 替換繁中服 StartToVisit 圖片 (#8817) @momomochi987
-* 繁中服幹員識別修正 (#8807) @vonnoq
-* custom ROI and notes for StartToVisit txwy (#8682) @Manicsteiner
-* txwy ocrreplace (#8655) @EROTCZ
-* 繁中服「孤星」活動導航 (#8662) @momomochi987
+* 繁中服「空想花庭」活動導航 (#8897) @momomochi987
 
 #### YostarEN
 
-* Skip the story before a battle for EN @Constrat
-* optimized roi for EN infrast training @Constrat
-* IS4 EN foldartal declare text @Constrat
-* Foldartal use for IS4 - overseas (#8612) @Constrat
-* IS4 Rain! encounter regex fix #8709 @Constrat
-* OCR replace for Auto Battle (CV) @Constrat
-* CV roi for navigation @Constrat
-* Eyja Alter EN regex for SSS @Constrat
-* Eyjafjalla Alter ocr @Constrat
-* en transparency ref: 0c5a79f @Constrat
-* EN CV navigation @Constrat
-* YostarEN SSS#3 (#8645) @Constrat
+* EN ZT navigation @Constrat
+* EN Mist City theme @Constrat
+* YostarEN Dark theme @Constrat
+* EN IS4 all squads implementation fix #8850 @Constrat
+* EN adverse farming cache error fix #8849 @Constrat
 
 #### YostarKR
 
-* YoStarKR SSS#3 (#8643) @HX3N
-* YoStarKR Executor alter regex (#8723) @HX3N
-* YoStarKR SkipThePreBattlePlot (#8671) @HX3N
-* YoStarKR ocrReplace (#8665) @HX3N
-* YoStarKR update operators.md @HX3N
-*  docs: update and refactor KR docs (#8793) @HX3N
-* YoStarKR CV stage navigation and add Conductive Unit Upgrade (#8649) @HX3N
-* YoStarKR update operator.md (#8626) @HX3N
+* YoStarKR ZT navigation @HX3N
+* fix incorrect link in KR docs @HX3N
+* YoStarKR add new UI Interface template images @HX3N
+* YoStarKR modify task.json @HX3N
+* modify KR document @HX3N
 
 #### YostarJP
 
-* YoStarJP SSS#4 (#8630) @Manicsteiner
-* Global IS navigation (#8769) @Manicsteiner
-* YoStarJP ocrreplace (#8663) @Manicsteiner
-* YoStarJP ocr fix (#8768) @Manicsteiner @Constrat
-* YoStarJP ダーティマネー navigation (#8647) @Manicsteiner
-* Update operators.md for JP ダーティマネー @wallsman
+* 日服 基建 火龙S黑角 识别错误 @ABA2396
+* YoStarJP ZT navigation (#8912) @Manicsteiner
+* YoStarJP new UI theme templates (#8851) @Manicsteiner
+* JP Chapter13 Update @wallsman
diff --git a/README.md b/README.md
@@ -40,7 +40,7 @@ MAA 的意思是 MAA Assistant Arknights
 - 自动公招，可选使用加急许可，一次全部刷完！公招数据自动上传 [企鹅物流](https://penguin-stats.cn/result/stage/recruit/recruit)，[一图流](https://ark.yituliu.cn/survey/maarecruitdata)；
 - 支持手动识别公招界面，方便对高星公招做出选择 ~~（你的这个高姿回费出的是推王呢还是推王呢）~~；
 - 支持识别干员列表，统计已有和未有干员及潜能，并在公招识别显示；
-- 支持识别养成材料，并导出至 [企鹅物流刷图规划](https://penguin-stats.cn/planner)、[明日方舟工具箱](https://arkn.lolicon.app/#/material)、[ARK-NIGHTS 干员培养表](https://ark-nights.com/settings)；
+- 支持识别养成材料，并导出至 [企鹅物流刷图规划](https://penguin-stats.cn/planner)、[明日方舟工具箱](https://arkntools.app/#/material)、[ARK-NIGHTS 干员培养表](https://ark-nights.com/settings)；
 - 访问好友、收取信用及购物、领取日常奖励等，一键全日常自动长草；
 - 肉鸽全自动刷源石锭和等级，自动烧水和凹直升，智能识别干员及练度；
 - 选择作业 JSON 文件，自动抄作业， [视频演示](https://www.bilibili.com/video/BV1H841177Fk/)；

diff --git a/docs/.vuepress/config.ts b/docs/.vuepress/config.ts
@@ -1,5 +1,6 @@
 import { defineUserConfig } from "vuepress";
 import { viteBundler } from "@vuepress/bundler-vite";
+import { googleAnalyticsPlugin } from "@vuepress/plugin-google-analytics";
 import Theme from "./theme";
 
 export default defineUserConfig({
@@ -40,7 +41,11 @@ export default defineUserConfig({
 
   theme: Theme,
 
-  plugins: [],
+  plugins: [
+    googleAnalyticsPlugin({
+      id: "G-FJQDKG394Z",
+    }),
+  ],
 
   head: [
     ["link", { rel: "preconnect", href: "https://fonts.googleapis.com" }],

diff --git a/docs/.vuepress/sidebar/en-us.ts b/docs/.vuepress/sidebar/en-us.ts
@@ -12,6 +12,11 @@ export const enusSidebar = sidebar({
       icon: "mdi:user",
       collapsible: true,
       children: [
+        {
+          text: "Beginner's guide",
+          icon: "ri:guide-fill",
+          link: "/en-us/1.0-BEGINNER'S_GUIDE",
+        },
         {
           text: "Introduction",
           icon: "mdi:information-outline",

diff --git a/docs/.vuepress/sidebar/zh-cn.ts b/docs/.vuepress/sidebar/zh-cn.ts
@@ -13,6 +13,11 @@ export const zhcnSidebar = sidebar({
       prefix: "用户手册/",
       collapsible: true,
       children: [
+        {
+          text: "新手上路",
+          icon: "ri:guide-fill",
+          link: "新手上路",
+        },
         {
           text: "功能介绍",
           icon: "mdi:information-outline",