Skip to content

Commit

Permalink
Merge branch 'MaaXYZ:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
a16797 authored Sep 21, 2024
2 parents 7d59f13 + 7667966 commit d66f0a9
Show file tree
Hide file tree
Showing 10 changed files with 388 additions and 189 deletions.
36 changes: 36 additions & 0 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
name: check

on:
push:
branches:
- "**"
paths:
- ".github/workflows/check.yml"
- "assets/**"
- "**.py"
pull_request:
branches:
- "**"
paths:
- ".github/workflows/check.yml"
- "assets/**"
- "**.py"
workflow_dispatch:

jobs:
resource:
runs-on: windows-latest
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0

# pip install maafw
- name: Install maafw
run: |
python -m pip install --upgrade pip
python -m pip install --upgrade maafw --pre
- name: Check Resource
run: |
python ./check_resource.py ./assets/resource/base/ ./assets/resource/bilibili/ ./assets/resource/global_en/
8 changes: 7 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,9 @@

## 其他说明

- 提示“应用程序错误”,一般是缺少运行库,请安装一下 [vc_redist](https://aka.ms/vs/17/release/vc_redist.x64.exe)
- 添加 `-d` 参数可跳过交互直接运行任务,如 `./MaaPiCli.exe -d`
- 2.0 版本已支持 mumu 后台保活,会在 run task 时获取 mumu 最前台的 tab,并始终使用这个 tab(即使之后被切到后台了)
- 反馈问题请附上日志文件 `debug/maa.log`,谢谢!

## 图形化界面
Expand Down Expand Up @@ -76,7 +78,11 @@

## 开发相关

- [MaaFramework 快速开始](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)
- [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)
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)

更多文档请前往 [MaaFramework](https://github.com/MaaXYZ/MaaFramework) 主仓库查看

## 鸣谢

Expand Down
Loading

0 comments on commit d66f0a9

Please sign in to comment.