diff --git a/.gitignore b/.gitignore index f6c3c489..85404845 100644 --- a/.gitignore +++ b/.gitignore @@ -417,7 +417,7 @@ FodyWeavers.xsd !.vscode/settings.json # !.vscode/tasks.json # !.vscode/launch.json -# !.vscode/extensions.json +!.vscode/extensions.json *.code-workspace # Local History for Visual Studio Code diff --git a/.vscode/extensions.json b/.vscode/extensions.json new file mode 100644 index 00000000..f212cc09 --- /dev/null +++ b/.vscode/extensions.json @@ -0,0 +1,7 @@ +{ + "recommendations": [ + "ms-python.black-formatter", + "nekosu.maa-support", + "davidanson.vscode-markdownlint" + ] +} \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index 5b2776ca..36cea99e 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -21,6 +21,9 @@ "url": "/deps/tools/interface_config.schema.json" } ], + "files.exclude": { + "__pycache__": true + }, "[json]": { "editor.formatOnSave": true, "editor.insertSpaces": true, @@ -29,5 +32,12 @@ }, "[python]": { "editor.defaultFormatter": "ms-python.black-formatter" + }, + "[markdown]": { + "editor.formatOnSave": true, + "editor.defaultFormatter": "DavidAnson.vscode-markdownlint" + }, + "markdownlint.config": { + "MD028": false } } \ No newline at end of file diff --git a/README.md b/README.md index 1c997084..4ea80e74 100644 --- a/README.md +++ b/README.md @@ -1,84 +1,45 @@ # M9A -基于全新架构的 亿韭韭韭 小助手。图像技术 + 模拟控制，解放双手！ +基于全新架构的 亿韭韭韭 小助手。图像技术 + 模拟控制，解放双手！ 由 [MaaFramework](https://github.com/MaaXYZ/MaaFramework) 强力驱动！ -## 功能介绍 +## 功能列表 目前已有的功能： - 启动/关闭游戏 - 收取荒原、魔精收取生产物品 - 每日心相（意志解析） -- 刷体力、最优材料关卡、活动关卡导航、吃糖选项 +- 刷体力、最优材料关卡、活动关卡、吃糖选项 +- 每周深眠域 - 领取日常奖励 - 轶事派遣 -- 雨中悬想：迷思海（“寻思”每周扫荡） +- 雨中悬想：迷思海（"寻思"周扫荡） - 局外演绎：山麓的回音（肉鸽） -- 每周深眠域（使用游戏自带自动战斗） - -近期可能会支持的功能： -- 自定义刷体力关卡 ## 使用说明 -下载地址： - -### Windows - -- 对于绝大部分用户，请下载 `M9A-win-x86_64-vXXX.zip` -- 若确定自己的电脑是 arm 架构，请下载 `M9A-win-aarch64-vXXX.zip` - _请注意！Windows 的电脑几乎全都是 x86_64 的，可能占 99.999%，除非你非常确定自己是 arm，否则别下这个！_ -- 解压后运行 `MFAWPF.exe`（图形化界面）或 `MaaPiCli.exe`（命令行）即可 - -### macOS - -- 若使用 Intel 处理器，请下载 `M9A-macos-x86_64-vXXX.zip` -- 若使用 M1, M2 等 arm 处理器，请下载 `M9A-macos-aarch64-vXXX.zip` -- 使用方式： - - ```bash - chmod a+x MaaPiCli - ./MaaPiCli - ``` - -### Linux - -~~用 Linux 的大佬应该不需要我教~~ - -## 其他说明 +- [新手上路](./docs/zh_cn/manual/%E6%96%B0%E6%89%8B%E4%B8%8A%E8%B7%AF.md)(必看) -- 提示“应用程序错误”，一般是缺少运行库，请安装一下 [vc_redist](https://aka.ms/vs/17/release/vc_redist.x64.exe) -- 添加 `-d` 参数可跳过交互直接运行任务，如 `./MaaPiCli.exe -d` -- 2.0 版本已支持 mumu 后台保活，会在 run task 时获取 mumu 最前台的 tab -- 反馈问题请附上日志文件 `debug/maa.log`以及问题界面的截图，谢谢！ +- [部分功能介绍](./docs/zh_cn/manual/%E9%83%A8%E5%88%86%E5%8A%9F%E8%83%BD%E4%BB%8B%E7%BB%8D.md)(推荐) +- [连接设置](./docs/zh_cn/manual/%E8%BF%9E%E6%8E%A5%E8%AE%BE%E7%BD%AE.md)(可选) - -## How to build - -**如果你要编译源码才看这节，否则直接 [下载](https://github.com/MaaXYZ/M9A/releases) 即可** - -0. 完整克隆本项目及子项目 - - ```bash - git clone --recursive https://github.com/MaaXYZ/M9A.git - ``` - -1. 下载 MaaFramework 的 [Release 包](https://github.com/MaaXYZ/MaaFramework/releases)，解压到 `deps` 文件夹中 -2. 安装 - - ```python - python ./install.py - ``` - -生成的二进制及相关资源文件在 `install` 目录下 +- [常见问题](./docs/zh_cn/manual/%E5%B8%B8%E8%A7%81%E9%97%AE%E9%A2%98.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) + > M9A 目前使用其中第一种方式（纯 Pipeline 低代码）， + > 后续可能会迁移到第二种方式（Pipeline + 自定义任务） +- [开发前须知](./docs/zh_cn/develop/开发前须知.md) +- [interface.json 编写](./docs/zh_cn/develop/interface.json%20编写.md) +- [Pipeline 编写](./docs/zh_cn/develop/Pipeline%20编写.md) +- [Bug 排查](./docs/zh_cn/develop/Bug%20排查.md) +- [项目重构](./docs/zh_cn/develop/项目重构.md) +- [活动资源维护](./docs/zh_cn/develop/活动资源维护.md) +- [外服适配](./docs/zh_cn/develop/外服适配.md) +- [文档编写](./docs/zh_cn/develop/文档编写.md) 更多文档请前往 [MaaFramework](https://github.com/MaaXYZ/MaaFramework) 主仓库查看 @@ -88,11 +49,10 @@ 感谢以下开发者对本项目作出的贡献: - - - +[![Contributors](https://contrib.rocks/image?repo=MaaXYZ/M9A&max=1000)](https://github.com/MaaXYZ/M9A/graphs/contributors) ## Join us + - M9A 闲聊群 QQ 群：175638678 - M9A 开发群 QQ 群：649344857 - MaaFramework 开发交流 QQ 群: 595990173 diff --git a/assets/resource/base/image/Anecdote/AddPerson.png b/assets/resource/base/image/Anecdote/AddPerson.png index 42aad4f6..79655155 100644 Binary files a/assets/resource/base/image/Anecdote/AddPerson.png and b/assets/resource/base/image/Anecdote/AddPerson.png differ diff --git a/assets/resource/base/image/Anecdote/TaskAward.png b/assets/resource/base/image/Anecdote/TaskAward.png index 085f9a51..8e7136e9 100644 Binary files a/assets/resource/base/image/Anecdote/TaskAward.png and b/assets/resource/base/image/Anecdote/TaskAward.png differ diff --git a/assets/resource/base/image/Anecdote/TaskAward1.png b/assets/resource/base/image/Anecdote/TaskAward1.png index f30fd014..0b67c085 100644 Binary files a/assets/resource/base/image/Anecdote/TaskAward1.png and b/assets/resource/base/image/Anecdote/TaskAward1.png differ diff --git a/assets/resource/base/image/Anecdote/TaskAward2.png b/assets/resource/base/image/Anecdote/TaskAward2.png index 5c4be060..ffde35d5 100644 Binary files a/assets/resource/base/image/Anecdote/TaskAward2.png and b/assets/resource/base/image/Anecdote/TaskAward2.png differ diff --git a/assets/resource/base/image/Anecdote/TaskAward3.png b/assets/resource/base/image/Anecdote/TaskAward3.png index 8f326c2a..6a30c579 100644 Binary files a/assets/resource/base/image/Anecdote/TaskAward3.png and b/assets/resource/base/image/Anecdote/TaskAward3.png differ diff --git a/assets/resource/base/image/Anecdote/TaskAward4.png b/assets/resource/base/image/Anecdote/TaskAward4.png index c6a82bfd..b6a1c056 100644 Binary files a/assets/resource/base/image/Anecdote/TaskAward4.png and b/assets/resource/base/image/Anecdote/TaskAward4.png differ diff --git a/assets/resource/base/image/Anecdote/TaskAward5.png b/assets/resource/base/image/Anecdote/TaskAward5.png index 3bd54a8d..d6a28a35 100644 Binary files a/assets/resource/base/image/Anecdote/TaskAward5.png and b/assets/resource/base/image/Anecdote/TaskAward5.png differ diff --git a/assets/resource/base/image/Anecdote/TaskAward6.png b/assets/resource/base/image/Anecdote/TaskAward6.png index f82a1229..5a1329e5 100644 Binary files a/assets/resource/base/image/Anecdote/TaskAward6.png and b/assets/resource/base/image/Anecdote/TaskAward6.png differ diff --git a/assets/resource/base/image/Anecdote/TaskAwardMainCompleted.png b/assets/resource/base/image/Anecdote/TaskAwardMainCompleted.png index b05df3b6..fe968f18 100644 Binary files a/assets/resource/base/image/Anecdote/TaskAwardMainCompleted.png and b/assets/resource/base/image/Anecdote/TaskAwardMainCompleted.png differ diff --git a/assets/resource/base/image/Anecdote/TaskCompleted.png b/assets/resource/base/image/Anecdote/TaskCompleted.png index d9694e53..ee3640cb 100644 Binary files a/assets/resource/base/image/Anecdote/TaskCompleted.png and b/assets/resource/base/image/Anecdote/TaskCompleted.png differ diff --git a/assets/resource/base/image/Anecdote/TaskEntry.png b/assets/resource/base/image/Anecdote/TaskEntry.png index d2378ce7..8a8cfc52 100644 Binary files a/assets/resource/base/image/Anecdote/TaskEntry.png and b/assets/resource/base/image/Anecdote/TaskEntry.png differ diff --git a/assets/resource/base/image/Awards/CollectDailyAwards.png b/assets/resource/base/image/Awards/CollectDailyAwards.png index 459a1580..99752cc4 100644 Binary files a/assets/resource/base/image/Awards/CollectDailyAwards.png and b/assets/resource/base/image/Awards/CollectDailyAwards.png differ diff --git a/assets/resource/base/image/Awards/CollectJukebox.png b/assets/resource/base/image/Awards/CollectJukebox.png index e231a8d7..4a4862a1 100644 Binary files a/assets/resource/base/image/Awards/CollectJukebox.png and b/assets/resource/base/image/Awards/CollectJukebox.png differ diff --git a/assets/resource/base/image/Awards/CollectMailAwards.png b/assets/resource/base/image/Awards/CollectMailAwards.png index 9be9e83c..99c2e3ec 100644 Binary files a/assets/resource/base/image/Awards/CollectMailAwards.png and b/assets/resource/base/image/Awards/CollectMailAwards.png differ diff --git a/assets/resource/base/image/Awards/CollectSingleDailyAwards.png b/assets/resource/base/image/Awards/CollectSingleDailyAwards.png index 9e418b99..0614f067 100644 Binary files a/assets/resource/base/image/Awards/CollectSingleDailyAwards.png and b/assets/resource/base/image/Awards/CollectSingleDailyAwards.png differ diff --git a/assets/resource/base/image/Awards/DailyAwardsPageFlag.png b/assets/resource/base/image/Awards/DailyAwardsPageFlag.png index b09c7e7b..0f052bd1 100644 Binary files a/assets/resource/base/image/Awards/DailyAwardsPageFlag.png and b/assets/resource/base/image/Awards/DailyAwardsPageFlag.png differ diff --git a/assets/resource/base/image/Awards/DailyBadge.png b/assets/resource/base/image/Awards/DailyBadge.png index ba014af4..ead5768a 100644 Binary files a/assets/resource/base/image/Awards/DailyBadge.png and b/assets/resource/base/image/Awards/DailyBadge.png differ diff --git a/assets/resource/base/image/Awards/JukeboxAwardsBadge.png b/assets/resource/base/image/Awards/JukeboxAwardsBadge.png index 6030394d..d261d8c3 100644 Binary files a/assets/resource/base/image/Awards/JukeboxAwardsBadge.png and b/assets/resource/base/image/Awards/JukeboxAwardsBadge.png differ diff --git a/assets/resource/base/image/Awards/JukeboxBadge.png b/assets/resource/base/image/Awards/JukeboxBadge.png index b245c6d4..388aec35 100644 Binary files a/assets/resource/base/image/Awards/JukeboxBadge.png and b/assets/resource/base/image/Awards/JukeboxBadge.png differ diff --git a/assets/resource/base/image/Awards/MailBadge.png b/assets/resource/base/image/Awards/MailBadge.png index 3a2d7280..7f14c322 100644 Binary files a/assets/resource/base/image/Awards/MailBadge.png and b/assets/resource/base/image/Awards/MailBadge.png differ diff --git a/assets/resource/base/image/Awards/NoJukeboxAwards.png b/assets/resource/base/image/Awards/NoJukeboxAwards.png index ffd23d30..290933bd 100644 Binary files a/assets/resource/base/image/Awards/NoJukeboxAwards.png and b/assets/resource/base/image/Awards/NoJukeboxAwards.png differ diff --git a/assets/resource/base/image/Awards/NoMailAwards.png b/assets/resource/base/image/Awards/NoMailAwards.png index 9e2dbae4..021ebafb 100644 Binary files a/assets/resource/base/image/Awards/NoMailAwards.png and b/assets/resource/base/image/Awards/NoMailAwards.png differ diff --git a/assets/resource/base/image/Awards/ObtainedAwards.png b/assets/resource/base/image/Awards/ObtainedAwards.png index 4d513135..07d2abbe 100644 Binary files a/assets/resource/base/image/Awards/ObtainedAwards.png and b/assets/resource/base/image/Awards/ObtainedAwards.png differ diff --git a/assets/resource/base/image/Awards/WeeklyAwardsBadge.png b/assets/resource/base/image/Awards/WeeklyAwardsBadge.png index af521a56..4148a825 100644 Binary files a/assets/resource/base/image/Awards/WeeklyAwardsBadge.png and b/assets/resource/base/image/Awards/WeeklyAwardsBadge.png differ diff --git a/assets/resource/base/image/Combat/Activity/ANightmareAtGreenLakeEnterTheShow.png b/assets/resource/base/image/Combat/Activity/ANightmareAtGreenLakeEnterTheShow.png index dbafd2b5..0810a26e 100644 Binary files a/assets/resource/base/image/Combat/Activity/ANightmareAtGreenLakeEnterTheShow.png and b/assets/resource/base/image/Combat/Activity/ANightmareAtGreenLakeEnterTheShow.png differ diff --git a/assets/resource/base/image/Combat/Activity/ANightmareAtGreenLakeMainChapter.png b/assets/resource/base/image/Combat/Activity/ANightmareAtGreenLakeMainChapter.png index cd017248..c1faebc4 100644 Binary files a/assets/resource/base/image/Combat/Activity/ANightmareAtGreenLakeMainChapter.png and b/assets/resource/base/image/Combat/Activity/ANightmareAtGreenLakeMainChapter.png differ diff --git a/assets/resource/base/image/Combat/Activity/ActivityNextStage1.png b/assets/resource/base/image/Combat/Activity/ActivityNextStage1.png index 9f55c7d8..9e0f4163 100644 Binary files a/assets/resource/base/image/Combat/Activity/ActivityNextStage1.png and b/assets/resource/base/image/Combat/Activity/ActivityNextStage1.png differ diff --git a/assets/resource/base/image/Combat/Activity/ActivityNextStage2.png b/assets/resource/base/image/Combat/Activity/ActivityNextStage2.png index 3ba7ccf8..a7d29c0e 100644 Binary files a/assets/resource/base/image/Combat/Activity/ActivityNextStage2.png and b/assets/resource/base/image/Combat/Activity/ActivityNextStage2.png differ diff --git a/assets/resource/base/image/Combat/Activity/ActivityStageDifficultyToRight.png b/assets/resource/base/image/Combat/Activity/ActivityStageDifficultyToRight.png index f3980ad7..b10920d7 100644 Binary files a/assets/resource/base/image/Combat/Activity/ActivityStageDifficultyToRight.png and b/assets/resource/base/image/Combat/Activity/ActivityStageDifficultyToRight.png differ diff --git "a/assets/resource/base/image/Combat/Activity/EchoesinInTheMountain/\344\273\205\346\210\230\346\226\227.png" "b/assets/resource/base/image/Combat/Activity/EchoesinInTheMountain/\344\273\205\346\210\230\346\226\227.png" index 36361f0d..e602d1aa 100644 Binary files "a/assets/resource/base/image/Combat/Activity/EchoesinInTheMountain/\344\273\205\346\210\230\346\226\227.png" and "b/assets/resource/base/image/Combat/Activity/EchoesinInTheMountain/\344\273\205\346\210\230\346\226\227.png" differ diff --git "a/assets/resource/base/image/Combat/Activity/EchoesinInTheMountain/\345\205\245\345\217\2431.png" "b/assets/resource/base/image/Combat/Activity/EchoesinInTheMountain/\345\205\245\345\217\2431.png" index 512d2ed7..c4b74f6b 100644 Binary files "a/assets/resource/base/image/Combat/Activity/EchoesinInTheMountain/\345\205\245\345\217\2431.png" and "b/assets/resource/base/image/Combat/Activity/EchoesinInTheMountain/\345\205\245\345\217\2431.png" differ diff --git "a/assets/resource/base/image/Combat/Activity/EchoesinInTheMountain/\345\205\245\345\217\2432.png" "b/assets/resource/base/image/Combat/Activity/EchoesinInTheMountain/\345\205\245\345\217\2432.png" index 1e6eb722..1facaaec 100644 Binary files "a/assets/resource/base/image/Combat/Activity/EchoesinInTheMountain/\345\205\245\345\217\2432.png" and "b/assets/resource/base/image/Combat/Activity/EchoesinInTheMountain/\345\205\245\345\217\2432.png" differ diff --git "a/assets/resource/base/image/Combat/Activity/EchoesinInTheMountain/\345\207\206\345\244\207.png" "b/assets/resource/base/image/Combat/Activity/EchoesinInTheMountain/\345\207\206\345\244\207.png" index 483879ad..4138853f 100644 Binary files "a/assets/resource/base/image/Combat/Activity/EchoesinInTheMountain/\345\207\206\345\244\207.png" and "b/assets/resource/base/image/Combat/Activity/EchoesinInTheMountain/\345\207\206\345\244\207.png" differ diff --git "a/assets/resource/base/image/Combat/Activity/EchoesinInTheMountain/\345\211\215\350\267\257\345\260\275\345\244\261.png" "b/assets/resource/base/image/Combat/Activity/EchoesinInTheMountain/\345\211\215\350\267\257\345\260\275\345\244\261.png" index 35fb0327..6151b1f6 100644 Binary files "a/assets/resource/base/image/Combat/Activity/EchoesinInTheMountain/\345\211\215\350\267\257\345\260\275\345\244\261.png" and "b/assets/resource/base/image/Combat/Activity/EchoesinInTheMountain/\345\211\215\350\267\257\345\260\275\345\244\261.png" differ diff --git "a/assets/resource/base/image/Combat/Activity/EchoesinInTheMountain/\345\274\200\345\247\213\346\216\242\347\264\242.png" "b/assets/resource/base/image/Combat/Activity/EchoesinInTheMountain/\345\274\200\345\247\213\346\216\242\347\264\242.png" index 1bf7d153..6ca20e30 100644 Binary files "a/assets/resource/base/image/Combat/Activity/EchoesinInTheMountain/\345\274\200\345\247\213\346\216\242\347\264\242.png" and "b/assets/resource/base/image/Combat/Activity/EchoesinInTheMountain/\345\274\200\345\247\213\346\216\242\347\264\242.png" differ diff --git "a/assets/resource/base/image/Combat/Activity/EchoesinInTheMountain/\345\274\200\345\247\213\350\241\214\345\212\250.png" "b/assets/resource/base/image/Combat/Activity/EchoesinInTheMountain/\345\274\200\345\247\213\350\241\214\345\212\250.png" index deaab7fb..eb0f0c74 100644 Binary files "a/assets/resource/base/image/Combat/Activity/EchoesinInTheMountain/\345\274\200\345\247\213\350\241\214\345\212\250.png" and "b/assets/resource/base/image/Combat/Activity/EchoesinInTheMountain/\345\274\200\345\247\213\350\241\214\345\212\250.png" differ diff --git "a/assets/resource/base/image/Combat/Activity/EchoesinInTheMountain/\345\274\200\345\247\213\350\260\203\346\237\245.png" "b/assets/resource/base/image/Combat/Activity/EchoesinInTheMountain/\345\274\200\345\247\213\350\260\203\346\237\245.png" index e80b359e..918604f4 100644 Binary files "a/assets/resource/base/image/Combat/Activity/EchoesinInTheMountain/\345\274\200\345\247\213\350\260\203\346\237\245.png" and "b/assets/resource/base/image/Combat/Activity/EchoesinInTheMountain/\345\274\200\345\247\213\350\260\203\346\237\245.png" differ diff --git "a/assets/resource/base/image/Combat/Activity/EchoesinInTheMountain/\346\210\230\346\226\227\344\270\255.png" "b/assets/resource/base/image/Combat/Activity/EchoesinInTheMountain/\346\210\230\346\226\227\344\270\255.png" index 0d2f9f9a..0487f0a7 100644 Binary files "a/assets/resource/base/image/Combat/Activity/EchoesinInTheMountain/\346\210\230\346\226\227\344\270\255.png" and "b/assets/resource/base/image/Combat/Activity/EchoesinInTheMountain/\346\210\230\346\226\227\344\270\255.png" differ diff --git "a/assets/resource/base/image/Combat/Activity/EchoesinInTheMountain/\346\210\230\346\226\227\350\203\234\345\210\251.png" "b/assets/resource/base/image/Combat/Activity/EchoesinInTheMountain/\346\210\230\346\226\227\350\203\234\345\210\251.png" index 3ac3bd45..e24ebd36 100644 Binary files "a/assets/resource/base/image/Combat/Activity/EchoesinInTheMountain/\346\210\230\346\226\227\350\203\234\345\210\251.png" and "b/assets/resource/base/image/Combat/Activity/EchoesinInTheMountain/\346\210\230\346\226\227\350\203\234\345\210\251.png" differ diff --git "a/assets/resource/base/image/Combat/Activity/EchoesinInTheMountain/\346\224\276\345\274\203\345\245\226\345\212\261.png" "b/assets/resource/base/image/Combat/Activity/EchoesinInTheMountain/\346\224\276\345\274\203\345\245\226\345\212\261.png" index d8f34ead..3a354a3d 100644 Binary files "a/assets/resource/base/image/Combat/Activity/EchoesinInTheMountain/\346\224\276\345\274\203\345\245\226\345\212\261.png" and "b/assets/resource/base/image/Combat/Activity/EchoesinInTheMountain/\346\224\276\345\274\203\345\245\226\345\212\261.png" differ diff --git "a/assets/resource/base/image/Combat/Activity/EchoesinInTheMountain/\346\262\277\351\200\224\346\211\200\350\247\201.png" "b/assets/resource/base/image/Combat/Activity/EchoesinInTheMountain/\346\262\277\351\200\224\346\211\200\350\247\201.png" index e9301f53..959e247a 100644 Binary files "a/assets/resource/base/image/Combat/Activity/EchoesinInTheMountain/\346\262\277\351\200\224\346\211\200\350\247\201.png" and "b/assets/resource/base/image/Combat/Activity/EchoesinInTheMountain/\346\262\277\351\200\224\346\211\200\350\247\201.png" differ diff --git "a/assets/resource/base/image/Combat/Activity/EchoesinInTheMountain/\347\241\256\350\256\244.png" "b/assets/resource/base/image/Combat/Activity/EchoesinInTheMountain/\347\241\256\350\256\244.png" index 69cf238c..96f6362a 100644 Binary files "a/assets/resource/base/image/Combat/Activity/EchoesinInTheMountain/\347\241\256\350\256\244.png" and "b/assets/resource/base/image/Combat/Activity/EchoesinInTheMountain/\347\241\256\350\256\244.png" differ diff --git "a/assets/resource/base/image/Combat/Activity/EchoesinInTheMountain/\347\247\273\345\212\250.png" "b/assets/resource/base/image/Combat/Activity/EchoesinInTheMountain/\347\247\273\345\212\250.png" index 0deba58e..a7523dc6 100644 Binary files "a/assets/resource/base/image/Combat/Activity/EchoesinInTheMountain/\347\247\273\345\212\250.png" and "b/assets/resource/base/image/Combat/Activity/EchoesinInTheMountain/\347\247\273\345\212\250.png" differ diff --git "a/assets/resource/base/image/Combat/Activity/EchoesinInTheMountain/\351\200\200\345\207\272.png" "b/assets/resource/base/image/Combat/Activity/EchoesinInTheMountain/\351\200\200\345\207\272.png" index db995541..b4b28971 100644 Binary files "a/assets/resource/base/image/Combat/Activity/EchoesinInTheMountain/\351\200\200\345\207\272.png" and "b/assets/resource/base/image/Combat/Activity/EchoesinInTheMountain/\351\200\200\345\207\272.png" differ diff --git "a/assets/resource/base/image/Combat/Activity/EchoesinInTheMountain/\351\207\215\347\275\256.png" "b/assets/resource/base/image/Combat/Activity/EchoesinInTheMountain/\351\207\215\347\275\256.png" index f67700fc..99145922 100644 Binary files "a/assets/resource/base/image/Combat/Activity/EchoesinInTheMountain/\351\207\215\347\275\256.png" and "b/assets/resource/base/image/Combat/Activity/EchoesinInTheMountain/\351\207\215\347\275\256.png" differ diff --git a/assets/resource/base/image/Combat/Activity/FloorItToTheGoldenCityEnterTheShow.png b/assets/resource/base/image/Combat/Activity/FloorItToTheGoldenCityEnterTheShow.png index 20239ca0..d3a56f19 100644 Binary files a/assets/resource/base/image/Combat/Activity/FloorItToTheGoldenCityEnterTheShow.png and b/assets/resource/base/image/Combat/Activity/FloorItToTheGoldenCityEnterTheShow.png differ diff --git a/assets/resource/base/image/Combat/Activity/FloorItToTheGoldenCityMainChapter.png b/assets/resource/base/image/Combat/Activity/FloorItToTheGoldenCityMainChapter.png index d4ea4ba2..314b62bf 100644 Binary files a/assets/resource/base/image/Combat/Activity/FloorItToTheGoldenCityMainChapter.png and b/assets/resource/base/image/Combat/Activity/FloorItToTheGoldenCityMainChapter.png differ diff --git a/assets/resource/base/image/Combat/Activity/GoodbyeRayaEnterTheShow.png b/assets/resource/base/image/Combat/Activity/GoodbyeRayaEnterTheShow.png index 33ffd7f2..0eeeb6d8 100644 Binary files a/assets/resource/base/image/Combat/Activity/GoodbyeRayaEnterTheShow.png and b/assets/resource/base/image/Combat/Activity/GoodbyeRayaEnterTheShow.png differ diff --git a/assets/resource/base/image/Combat/Activity/GoodbyeRayaMainChapter.png b/assets/resource/base/image/Combat/Activity/GoodbyeRayaMainChapter.png index 9cef8258..ce436ab2 100644 Binary files a/assets/resource/base/image/Combat/Activity/GoodbyeRayaMainChapter.png and b/assets/resource/base/image/Combat/Activity/GoodbyeRayaMainChapter.png differ diff --git a/assets/resource/base/image/Combat/Activity/JourneytoMorPankhEnterTheShow.png b/assets/resource/base/image/Combat/Activity/JourneytoMorPankhEnterTheShow.png index f2c60e95..0be82fc4 100644 Binary files a/assets/resource/base/image/Combat/Activity/JourneytoMorPankhEnterTheShow.png and b/assets/resource/base/image/Combat/Activity/JourneytoMorPankhEnterTheShow.png differ diff --git a/assets/resource/base/image/Combat/Activity/JourneytoMorPankhMainChapter.png b/assets/resource/base/image/Combat/Activity/JourneytoMorPankhMainChapter.png index a4cd122f..757a208d 100644 Binary files a/assets/resource/base/image/Combat/Activity/JourneytoMorPankhMainChapter.png and b/assets/resource/base/image/Combat/Activity/JourneytoMorPankhMainChapter.png differ diff --git a/assets/resource/base/image/Combat/Activity/LondonDawningEnterTheShow.png b/assets/resource/base/image/Combat/Activity/LondonDawningEnterTheShow.png index 3ecf1efe..24e7b3eb 100644 Binary files a/assets/resource/base/image/Combat/Activity/LondonDawningEnterTheShow.png and b/assets/resource/base/image/Combat/Activity/LondonDawningEnterTheShow.png differ diff --git a/assets/resource/base/image/Combat/Activity/NotesOnShuoRiEnterTheShow.png b/assets/resource/base/image/Combat/Activity/NotesOnShuoRiEnterTheShow.png index d63ea8f1..3bb5248f 100644 Binary files a/assets/resource/base/image/Combat/Activity/NotesOnShuoRiEnterTheShow.png and b/assets/resource/base/image/Combat/Activity/NotesOnShuoRiEnterTheShow.png differ diff --git a/assets/resource/base/image/Combat/Activity/NotesOnShuoRiMainChapter.png b/assets/resource/base/image/Combat/Activity/NotesOnShuoRiMainChapter.png index 8d514fad..2a3b1843 100644 Binary files a/assets/resource/base/image/Combat/Activity/NotesOnShuoRiMainChapter.png and b/assets/resource/base/image/Combat/Activity/NotesOnShuoRiMainChapter.png differ diff --git a/assets/resource/base/image/Combat/Activity/RevivalTheUluruGamesEnterTheShow.png b/assets/resource/base/image/Combat/Activity/RevivalTheUluruGamesEnterTheShow.png index 279b717e..95e59c04 100644 Binary files a/assets/resource/base/image/Combat/Activity/RevivalTheUluruGamesEnterTheShow.png and b/assets/resource/base/image/Combat/Activity/RevivalTheUluruGamesEnterTheShow.png differ diff --git a/assets/resource/base/image/Combat/Activity/RevivalTheUluruGamesMainChapter.png b/assets/resource/base/image/Combat/Activity/RevivalTheUluruGamesMainChapter.png index f30be29e..1190bb19 100644 Binary files a/assets/resource/base/image/Combat/Activity/RevivalTheUluruGamesMainChapter.png and b/assets/resource/base/image/Combat/Activity/RevivalTheUluruGamesMainChapter.png differ diff --git a/assets/resource/base/image/Combat/Activity/Route77EnterTheShow.png b/assets/resource/base/image/Combat/Activity/Route77EnterTheShow.png index be844a8c..c2858a51 100644 Binary files a/assets/resource/base/image/Combat/Activity/Route77EnterTheShow.png and b/assets/resource/base/image/Combat/Activity/Route77EnterTheShow.png differ diff --git a/assets/resource/base/image/Combat/Activity/Route77MainChapter.png b/assets/resource/base/image/Combat/Activity/Route77MainChapter.png index ad3a9bb6..fe6995d4 100644 Binary files a/assets/resource/base/image/Combat/Activity/Route77MainChapter.png and b/assets/resource/base/image/Combat/Activity/Route77MainChapter.png differ diff --git a/assets/resource/base/image/Combat/Activity/ThePrisonerintheCaveEnterTheShow.png b/assets/resource/base/image/Combat/Activity/ThePrisonerintheCaveEnterTheShow.png index 2e087fc1..b998271d 100644 Binary files a/assets/resource/base/image/Combat/Activity/ThePrisonerintheCaveEnterTheShow.png and b/assets/resource/base/image/Combat/Activity/ThePrisonerintheCaveEnterTheShow.png differ diff --git a/assets/resource/base/image/Combat/Activity/ThePrisonerintheCaveTheProofs.png b/assets/resource/base/image/Combat/Activity/ThePrisonerintheCaveTheProofs.png index c0e2beb7..40230526 100644 Binary files a/assets/resource/base/image/Combat/Activity/ThePrisonerintheCaveTheProofs.png and b/assets/resource/base/image/Combat/Activity/ThePrisonerintheCaveTheProofs.png differ diff --git a/assets/resource/base/image/Combat/CantAuto.png b/assets/resource/base/image/Combat/CantAuto.png index d3d82927..0af971a3 100644 Binary files a/assets/resource/base/image/Combat/CantAuto.png and b/assets/resource/base/image/Combat/CantAuto.png differ diff --git a/assets/resource/base/image/Combat/EnterTheShow.png b/assets/resource/base/image/Combat/EnterTheShow.png index 978b05e2..b60dceda 100644 Binary files a/assets/resource/base/image/Combat/EnterTheShow.png and b/assets/resource/base/image/Combat/EnterTheShow.png differ diff --git a/assets/resource/base/image/Combat/IsReplay.png b/assets/resource/base/image/Combat/IsReplay.png index ddf56b57..7b0f0ba7 100644 Binary files a/assets/resource/base/image/Combat/IsReplay.png and b/assets/resource/base/image/Combat/IsReplay.png differ diff --git a/assets/resource/base/image/Combat/MainChapter_1Enter.png b/assets/resource/base/image/Combat/MainChapter_1Enter.png index 3624d6c1..393cdb92 100644 Binary files a/assets/resource/base/image/Combat/MainChapter_1Enter.png and b/assets/resource/base/image/Combat/MainChapter_1Enter.png differ diff --git a/assets/resource/base/image/Combat/MainChapter_2Enter.png b/assets/resource/base/image/Combat/MainChapter_2Enter.png index cf6202c3..1c08c04e 100644 Binary files a/assets/resource/base/image/Combat/MainChapter_2Enter.png and b/assets/resource/base/image/Combat/MainChapter_2Enter.png differ diff --git a/assets/resource/base/image/Combat/MainChapter_3Enter.png b/assets/resource/base/image/Combat/MainChapter_3Enter.png index 545097ac..97bc14a6 100644 Binary files a/assets/resource/base/image/Combat/MainChapter_3Enter.png and b/assets/resource/base/image/Combat/MainChapter_3Enter.png differ diff --git a/assets/resource/base/image/Combat/MainChapter_4Enter.png b/assets/resource/base/image/Combat/MainChapter_4Enter.png index 6397f39f..4c357239 100644 Binary files a/assets/resource/base/image/Combat/MainChapter_4Enter.png and b/assets/resource/base/image/Combat/MainChapter_4Enter.png differ diff --git a/assets/resource/base/image/Combat/MainChapter_5Enter.png b/assets/resource/base/image/Combat/MainChapter_5Enter.png index 3d2097ea..67384f57 100644 Binary files a/assets/resource/base/image/Combat/MainChapter_5Enter.png and b/assets/resource/base/image/Combat/MainChapter_5Enter.png differ diff --git a/assets/resource/base/image/Combat/MainChapter_6Enter.png b/assets/resource/base/image/Combat/MainChapter_6Enter.png index 54850541..b81a6992 100644 Binary files a/assets/resource/base/image/Combat/MainChapter_6Enter.png and b/assets/resource/base/image/Combat/MainChapter_6Enter.png differ diff --git a/assets/resource/base/image/Combat/MainChapter_7Enter.png b/assets/resource/base/image/Combat/MainChapter_7Enter.png index f1d21b6c..29772e6b 100644 Binary files a/assets/resource/base/image/Combat/MainChapter_7Enter.png and b/assets/resource/base/image/Combat/MainChapter_7Enter.png differ diff --git a/assets/resource/base/image/Combat/MainChapter_8Enter.png b/assets/resource/base/image/Combat/MainChapter_8Enter.png index e3717506..25047804 100644 Binary files a/assets/resource/base/image/Combat/MainChapter_8Enter.png and b/assets/resource/base/image/Combat/MainChapter_8Enter.png differ diff --git a/assets/resource/base/image/Combat/OpenReplaysTimes.png b/assets/resource/base/image/Combat/OpenReplaysTimes.png index 47ca498d..b9d871b8 100644 Binary files a/assets/resource/base/image/Combat/OpenReplaysTimes.png and b/assets/resource/base/image/Combat/OpenReplaysTimes.png differ diff --git a/assets/resource/base/image/Combat/PromotionChapterLabel.png b/assets/resource/base/image/Combat/PromotionChapterLabel.png index e8d1162f..e0004800 100644 Binary files a/assets/resource/base/image/Combat/PromotionChapterLabel.png and b/assets/resource/base/image/Combat/PromotionChapterLabel.png differ diff --git a/assets/resource/base/image/Combat/PromotionChapter_BWEnter.png b/assets/resource/base/image/Combat/PromotionChapter_BWEnter.png index 4513c61a..66e3fdba 100644 Binary files a/assets/resource/base/image/Combat/PromotionChapter_BWEnter.png and b/assets/resource/base/image/Combat/PromotionChapter_BWEnter.png differ diff --git a/assets/resource/base/image/Combat/PromotionChapter_MEEnter.png b/assets/resource/base/image/Combat/PromotionChapter_MEEnter.png index e2478062..fe37659d 100644 Binary files a/assets/resource/base/image/Combat/PromotionChapter_MEEnter.png and b/assets/resource/base/image/Combat/PromotionChapter_MEEnter.png differ diff --git a/assets/resource/base/image/Combat/PromotionChapter_SLEnter.png b/assets/resource/base/image/Combat/PromotionChapter_SLEnter.png index 9eb0c6bb..e80767ec 100644 Binary files a/assets/resource/base/image/Combat/PromotionChapter_SLEnter.png and b/assets/resource/base/image/Combat/PromotionChapter_SLEnter.png differ diff --git a/assets/resource/base/image/Combat/PromotionChapter_SSEnter.png b/assets/resource/base/image/Combat/PromotionChapter_SSEnter.png index 2ab82524..dfa1034a 100644 Binary files a/assets/resource/base/image/Combat/PromotionChapter_SSEnter.png and b/assets/resource/base/image/Combat/PromotionChapter_SSEnter.png differ diff --git a/assets/resource/base/image/Combat/ResourceChapterLabel.png b/assets/resource/base/image/Combat/ResourceChapterLabel.png index dd3bb5ac..7b4f8e10 100644 Binary files a/assets/resource/base/image/Combat/ResourceChapterLabel.png and b/assets/resource/base/image/Combat/ResourceChapterLabel.png differ diff --git a/assets/resource/base/image/Combat/ResourceChapter_HPEnter.png b/assets/resource/base/image/Combat/ResourceChapter_HPEnter.png index 4e402a45..b8f9516c 100644 Binary files a/assets/resource/base/image/Combat/ResourceChapter_HPEnter.png and b/assets/resource/base/image/Combat/ResourceChapter_HPEnter.png differ diff --git a/assets/resource/base/image/Combat/ResourceChapter_LPEnter.png b/assets/resource/base/image/Combat/ResourceChapter_LPEnter.png index 85aeb1da..197f7529 100644 Binary files a/assets/resource/base/image/Combat/ResourceChapter_LPEnter.png and b/assets/resource/base/image/Combat/ResourceChapter_LPEnter.png differ diff --git a/assets/resource/base/image/Combat/ResourceChapter_MAEnter.png b/assets/resource/base/image/Combat/ResourceChapter_MAEnter.png index ae692640..48f2b966 100644 Binary files a/assets/resource/base/image/Combat/ResourceChapter_MAEnter.png and b/assets/resource/base/image/Combat/ResourceChapter_MAEnter.png differ diff --git a/assets/resource/base/image/Combat/SetReplaysTimesX1.png b/assets/resource/base/image/Combat/SetReplaysTimesX1.png index 3bd96f55..44feb239 100644 Binary files a/assets/resource/base/image/Combat/SetReplaysTimesX1.png and b/assets/resource/base/image/Combat/SetReplaysTimesX1.png differ diff --git a/assets/resource/base/image/Combat/SetReplaysTimesX1_selected.png b/assets/resource/base/image/Combat/SetReplaysTimesX1_selected.png index 4e99dfa4..2a41af61 100644 Binary files a/assets/resource/base/image/Combat/SetReplaysTimesX1_selected.png and b/assets/resource/base/image/Combat/SetReplaysTimesX1_selected.png differ diff --git a/assets/resource/base/image/Combat/SetReplaysTimesX2.png b/assets/resource/base/image/Combat/SetReplaysTimesX2.png index 14641295..ff47faa3 100644 Binary files a/assets/resource/base/image/Combat/SetReplaysTimesX2.png and b/assets/resource/base/image/Combat/SetReplaysTimesX2.png differ diff --git a/assets/resource/base/image/Combat/SetReplaysTimesX2_selected.png b/assets/resource/base/image/Combat/SetReplaysTimesX2_selected.png index bf1edbd3..7cfeedfc 100644 Binary files a/assets/resource/base/image/Combat/SetReplaysTimesX2_selected.png and b/assets/resource/base/image/Combat/SetReplaysTimesX2_selected.png differ diff --git a/assets/resource/base/image/Combat/SetReplaysTimesX3.png b/assets/resource/base/image/Combat/SetReplaysTimesX3.png index 2971aa24..ed001219 100644 Binary files a/assets/resource/base/image/Combat/SetReplaysTimesX3.png and b/assets/resource/base/image/Combat/SetReplaysTimesX3.png differ diff --git a/assets/resource/base/image/Combat/SetReplaysTimesX3_selected.png b/assets/resource/base/image/Combat/SetReplaysTimesX3_selected.png index 898f962f..e6b6c81c 100644 Binary files a/assets/resource/base/image/Combat/SetReplaysTimesX3_selected.png and b/assets/resource/base/image/Combat/SetReplaysTimesX3_selected.png differ diff --git a/assets/resource/base/image/Combat/SetReplaysTimesX4.png b/assets/resource/base/image/Combat/SetReplaysTimesX4.png index 68a23d17..da4ab64e 100644 Binary files a/assets/resource/base/image/Combat/SetReplaysTimesX4.png and b/assets/resource/base/image/Combat/SetReplaysTimesX4.png differ diff --git a/assets/resource/base/image/Combat/SetReplaysTimesX4_selected.png b/assets/resource/base/image/Combat/SetReplaysTimesX4_selected.png index aa6c4167..7282b813 100644 Binary files a/assets/resource/base/image/Combat/SetReplaysTimesX4_selected.png and b/assets/resource/base/image/Combat/SetReplaysTimesX4_selected.png differ diff --git a/assets/resource/base/image/Combat/SwitchToReplay.png b/assets/resource/base/image/Combat/SwitchToReplay.png index b958fa2a..b742d790 100644 Binary files a/assets/resource/base/image/Combat/SwitchToReplay.png and b/assets/resource/base/image/Combat/SwitchToReplay.png differ diff --git a/assets/resource/base/image/EatCandy/BigCandy.png b/assets/resource/base/image/EatCandy/BigCandy.png index f24bac07..742af083 100644 Binary files a/assets/resource/base/image/EatCandy/BigCandy.png and b/assets/resource/base/image/EatCandy/BigCandy.png differ diff --git a/assets/resource/base/image/EatCandy/Confirm.png b/assets/resource/base/image/EatCandy/Confirm.png index 6fe4597b..192bd072 100644 Binary files a/assets/resource/base/image/EatCandy/Confirm.png and b/assets/resource/base/image/EatCandy/Confirm.png differ diff --git a/assets/resource/base/image/EatCandy/ConvertCandyConfirm.png b/assets/resource/base/image/EatCandy/ConvertCandyConfirm.png index 1d9fa18b..d09d92d1 100644 Binary files a/assets/resource/base/image/EatCandy/ConvertCandyConfirm.png and b/assets/resource/base/image/EatCandy/ConvertCandyConfirm.png differ diff --git a/assets/resource/base/image/EatCandy/MiniCandy.png b/assets/resource/base/image/EatCandy/MiniCandy.png index a73009d1..1d821cb5 100644 Binary files a/assets/resource/base/image/EatCandy/MiniCandy.png and b/assets/resource/base/image/EatCandy/MiniCandy.png differ diff --git a/assets/resource/base/image/EatCandy/SelectMiniCandyMax.png b/assets/resource/base/image/EatCandy/SelectMiniCandyMax.png index e87ec265..eb159280 100644 Binary files a/assets/resource/base/image/EatCandy/SelectMiniCandyMax.png and b/assets/resource/base/image/EatCandy/SelectMiniCandyMax.png differ diff --git a/assets/resource/base/image/EatCandy/SmallCandy.png b/assets/resource/base/image/EatCandy/SmallCandy.png index bad1c247..17dcb093 100644 Binary files a/assets/resource/base/image/EatCandy/SmallCandy.png and b/assets/resource/base/image/EatCandy/SmallCandy.png differ diff --git a/assets/resource/base/image/Limbo/ArtificialSleepwalkingAwards.png b/assets/resource/base/image/Limbo/ArtificialSleepwalkingAwards.png index 4e552167..79f53c29 100644 Binary files a/assets/resource/base/image/Limbo/ArtificialSleepwalkingAwards.png and b/assets/resource/base/image/Limbo/ArtificialSleepwalkingAwards.png differ diff --git a/assets/resource/base/image/Limbo/EnterTheShow.png b/assets/resource/base/image/Limbo/EnterTheShow.png index 978b05e2..b60dceda 100644 Binary files a/assets/resource/base/image/Limbo/EnterTheShow.png and b/assets/resource/base/image/Limbo/EnterTheShow.png differ diff --git a/assets/resource/base/image/Limbo/LimboAwards.png b/assets/resource/base/image/Limbo/LimboAwards.png index 74d0be29..f17ed734 100644 Binary files a/assets/resource/base/image/Limbo/LimboAwards.png and b/assets/resource/base/image/Limbo/LimboAwards.png differ diff --git a/assets/resource/base/image/Limbo/LimboEnd.png b/assets/resource/base/image/Limbo/LimboEnd.png index bba70e6e..507baa5d 100644 Binary files a/assets/resource/base/image/Limbo/LimboEnd.png and b/assets/resource/base/image/Limbo/LimboEnd.png differ diff --git a/assets/resource/base/image/Limbo/LimboEntry.png b/assets/resource/base/image/Limbo/LimboEntry.png index 03c266c6..53d8aeb0 100644 Binary files a/assets/resource/base/image/Limbo/LimboEntry.png and b/assets/resource/base/image/Limbo/LimboEntry.png differ diff --git a/assets/resource/base/image/Limbo/LimboFinish.png b/assets/resource/base/image/Limbo/LimboFinish.png index 011b061d..32d0c828 100644 Binary files a/assets/resource/base/image/Limbo/LimboFinish.png and b/assets/resource/base/image/Limbo/LimboFinish.png differ diff --git a/assets/resource/base/image/Limbo/LimboTeamList_Off.png b/assets/resource/base/image/Limbo/LimboTeamList_Off.png index 700b2653..970e2b62 100644 Binary files a/assets/resource/base/image/Limbo/LimboTeamList_Off.png and b/assets/resource/base/image/Limbo/LimboTeamList_Off.png differ diff --git a/assets/resource/base/image/Limbo/LimboTeamList_Open.png b/assets/resource/base/image/Limbo/LimboTeamList_Open.png index 31bdd69f..8d2ba55d 100644 Binary files a/assets/resource/base/image/Limbo/LimboTeamList_Open.png and b/assets/resource/base/image/Limbo/LimboTeamList_Open.png differ diff --git a/assets/resource/base/image/Limbo/ObtainedAllAwards.png b/assets/resource/base/image/Limbo/ObtainedAllAwards.png index 6185a1dd..e1bc3cf7 100644 Binary files a/assets/resource/base/image/Limbo/ObtainedAllAwards.png and b/assets/resource/base/image/Limbo/ObtainedAllAwards.png differ diff --git a/assets/resource/base/image/Limbo/ObtainedAwards.png b/assets/resource/base/image/Limbo/ObtainedAwards.png index cd8b3955..9f600c99 100644 Binary files a/assets/resource/base/image/Limbo/ObtainedAwards.png and b/assets/resource/base/image/Limbo/ObtainedAwards.png differ diff --git a/assets/resource/base/image/OutsideDeduction/OutsideDeduction.png b/assets/resource/base/image/OutsideDeduction/OutsideDeduction.png index a3dd02a3..24f3e4a1 100644 Binary files a/assets/resource/base/image/OutsideDeduction/OutsideDeduction.png and b/assets/resource/base/image/OutsideDeduction/OutsideDeduction.png differ diff --git a/assets/resource/base/image/OutsideDeduction/SODStart.png b/assets/resource/base/image/OutsideDeduction/SODStart.png index 14746479..03f1fa8f 100644 Binary files a/assets/resource/base/image/OutsideDeduction/SODStart.png and b/assets/resource/base/image/OutsideDeduction/SODStart.png differ diff --git a/assets/resource/base/image/OutsideDeduction/SODStart_Confirm.png b/assets/resource/base/image/OutsideDeduction/SODStart_Confirm.png index 5390af80..dc5220c7 100644 Binary files a/assets/resource/base/image/OutsideDeduction/SODStart_Confirm.png and b/assets/resource/base/image/OutsideDeduction/SODStart_Confirm.png differ diff --git a/assets/resource/base/image/OutsideDeduction/SODStart_MediaSelect1.png b/assets/resource/base/image/OutsideDeduction/SODStart_MediaSelect1.png index 79d3ea66..58c53e4f 100644 Binary files a/assets/resource/base/image/OutsideDeduction/SODStart_MediaSelect1.png and b/assets/resource/base/image/OutsideDeduction/SODStart_MediaSelect1.png differ diff --git a/assets/resource/base/image/OutsideDeduction/SODStart_MediaSelect3.png b/assets/resource/base/image/OutsideDeduction/SODStart_MediaSelect3.png index b70ffe5a..0e846c97 100644 Binary files a/assets/resource/base/image/OutsideDeduction/SODStart_MediaSelect3.png and b/assets/resource/base/image/OutsideDeduction/SODStart_MediaSelect3.png differ diff --git a/assets/resource/base/image/OutsideDeduction/SODStop.png b/assets/resource/base/image/OutsideDeduction/SODStop.png index c1275ad8..8e729354 100644 Binary files a/assets/resource/base/image/OutsideDeduction/SODStop.png and b/assets/resource/base/image/OutsideDeduction/SODStop.png differ diff --git a/assets/resource/base/image/OutsideDeduction/SOD_ArcanistAdd.png b/assets/resource/base/image/OutsideDeduction/SOD_ArcanistAdd.png index 7229c7d7..520edfdb 100644 Binary files a/assets/resource/base/image/OutsideDeduction/SOD_ArcanistAdd.png and b/assets/resource/base/image/OutsideDeduction/SOD_ArcanistAdd.png differ diff --git a/assets/resource/base/image/OutsideDeduction/SOD_ArcanistAdd_Confirm_1.png b/assets/resource/base/image/OutsideDeduction/SOD_ArcanistAdd_Confirm_1.png index 22744912..cbac4ea9 100644 Binary files a/assets/resource/base/image/OutsideDeduction/SOD_ArcanistAdd_Confirm_1.png and b/assets/resource/base/image/OutsideDeduction/SOD_ArcanistAdd_Confirm_1.png differ diff --git a/assets/resource/base/image/OutsideDeduction/SOD_ArcanistSelect.png b/assets/resource/base/image/OutsideDeduction/SOD_ArcanistSelect.png index 6f6ec6a8..bf558c01 100644 Binary files a/assets/resource/base/image/OutsideDeduction/SOD_ArcanistSelect.png and b/assets/resource/base/image/OutsideDeduction/SOD_ArcanistSelect.png differ diff --git a/assets/resource/base/image/OutsideDeduction/SOD_Combat.png b/assets/resource/base/image/OutsideDeduction/SOD_Combat.png index 0ce0136a..2188d13c 100644 Binary files a/assets/resource/base/image/OutsideDeduction/SOD_Combat.png and b/assets/resource/base/image/OutsideDeduction/SOD_Combat.png differ diff --git a/assets/resource/base/image/OutsideDeduction/SOD_CombatStart.png b/assets/resource/base/image/OutsideDeduction/SOD_CombatStart.png index c0eaaee4..e08c5d48 100644 Binary files a/assets/resource/base/image/OutsideDeduction/SOD_CombatStart.png and b/assets/resource/base/image/OutsideDeduction/SOD_CombatStart.png differ diff --git a/assets/resource/base/image/OutsideDeduction/SOD_Combating.png b/assets/resource/base/image/OutsideDeduction/SOD_Combating.png index bc0d45bf..be40108b 100644 Binary files a/assets/resource/base/image/OutsideDeduction/SOD_Combating.png and b/assets/resource/base/image/OutsideDeduction/SOD_Combating.png differ diff --git a/assets/resource/base/image/OutsideDeduction/SOD_Danger.png b/assets/resource/base/image/OutsideDeduction/SOD_Danger.png index a6300193..a1227013 100644 Binary files a/assets/resource/base/image/OutsideDeduction/SOD_Danger.png and b/assets/resource/base/image/OutsideDeduction/SOD_Danger.png differ diff --git a/assets/resource/base/image/OutsideDeduction/SOD_Dialog_1.png b/assets/resource/base/image/OutsideDeduction/SOD_Dialog_1.png index 6bddea5d..8b8d06ea 100644 Binary files a/assets/resource/base/image/OutsideDeduction/SOD_Dialog_1.png and b/assets/resource/base/image/OutsideDeduction/SOD_Dialog_1.png differ diff --git a/assets/resource/base/image/OutsideDeduction/SOD_Dialog_2.png b/assets/resource/base/image/OutsideDeduction/SOD_Dialog_2.png index bb65f888..e092e090 100644 Binary files a/assets/resource/base/image/OutsideDeduction/SOD_Dialog_2.png and b/assets/resource/base/image/OutsideDeduction/SOD_Dialog_2.png differ diff --git a/assets/resource/base/image/OutsideDeduction/SOD_Dialog_4.png b/assets/resource/base/image/OutsideDeduction/SOD_Dialog_4.png index f9f1c4cb..86a84ee2 100644 Binary files a/assets/resource/base/image/OutsideDeduction/SOD_Dialog_4.png and b/assets/resource/base/image/OutsideDeduction/SOD_Dialog_4.png differ diff --git a/assets/resource/base/image/OutsideDeduction/SOD_Discovery.png b/assets/resource/base/image/OutsideDeduction/SOD_Discovery.png index c384a821..359a086e 100644 Binary files a/assets/resource/base/image/OutsideDeduction/SOD_Discovery.png and b/assets/resource/base/image/OutsideDeduction/SOD_Discovery.png differ diff --git a/assets/resource/base/image/OutsideDeduction/SOD_EndEvent.png b/assets/resource/base/image/OutsideDeduction/SOD_EndEvent.png index a7d99fd4..2f4796fe 100644 Binary files a/assets/resource/base/image/OutsideDeduction/SOD_EndEvent.png and b/assets/resource/base/image/OutsideDeduction/SOD_EndEvent.png differ diff --git a/assets/resource/base/image/OutsideDeduction/SOD_EndEvent_OK.png b/assets/resource/base/image/OutsideDeduction/SOD_EndEvent_OK.png index 1fc2dc7a..9f34f0b0 100644 Binary files a/assets/resource/base/image/OutsideDeduction/SOD_EndEvent_OK.png and b/assets/resource/base/image/OutsideDeduction/SOD_EndEvent_OK.png differ diff --git a/assets/resource/base/image/OutsideDeduction/SOD_Ending_1.png b/assets/resource/base/image/OutsideDeduction/SOD_Ending_1.png index 9c90e561..aa0420da 100644 Binary files a/assets/resource/base/image/OutsideDeduction/SOD_Ending_1.png and b/assets/resource/base/image/OutsideDeduction/SOD_Ending_1.png differ diff --git a/assets/resource/base/image/OutsideDeduction/SOD_Ending_2.png b/assets/resource/base/image/OutsideDeduction/SOD_Ending_2.png index 93f1954e..1d9b5a7c 100644 Binary files a/assets/resource/base/image/OutsideDeduction/SOD_Ending_2.png and b/assets/resource/base/image/OutsideDeduction/SOD_Ending_2.png differ diff --git a/assets/resource/base/image/OutsideDeduction/SOD_Imminent.png b/assets/resource/base/image/OutsideDeduction/SOD_Imminent.png index 2c7a5592..335340e8 100644 Binary files a/assets/resource/base/image/OutsideDeduction/SOD_Imminent.png and b/assets/resource/base/image/OutsideDeduction/SOD_Imminent.png differ diff --git a/assets/resource/base/image/OutsideDeduction/SOD_MENU.png b/assets/resource/base/image/OutsideDeduction/SOD_MENU.png index ffba0bff..54784918 100644 Binary files a/assets/resource/base/image/OutsideDeduction/SOD_MENU.png and b/assets/resource/base/image/OutsideDeduction/SOD_MENU.png differ diff --git a/assets/resource/base/image/OutsideDeduction/SOD_Main.png b/assets/resource/base/image/OutsideDeduction/SOD_Main.png index 2ab880d0..1300ceaf 100644 Binary files a/assets/resource/base/image/OutsideDeduction/SOD_Main.png and b/assets/resource/base/image/OutsideDeduction/SOD_Main.png differ diff --git a/assets/resource/base/image/OutsideDeduction/SOD_Move.png b/assets/resource/base/image/OutsideDeduction/SOD_Move.png index 8bf92f26..22af9e94 100644 Binary files a/assets/resource/base/image/OutsideDeduction/SOD_Move.png and b/assets/resource/base/image/OutsideDeduction/SOD_Move.png differ diff --git a/assets/resource/base/image/OutsideDeduction/SOD_Nothinghappen.png b/assets/resource/base/image/OutsideDeduction/SOD_Nothinghappen.png index 7fdef62c..9be5a7d9 100644 Binary files a/assets/resource/base/image/OutsideDeduction/SOD_Nothinghappen.png and b/assets/resource/base/image/OutsideDeduction/SOD_Nothinghappen.png differ diff --git a/assets/resource/base/image/OutsideDeduction/SOD_RestSite.png b/assets/resource/base/image/OutsideDeduction/SOD_RestSite.png index c62d440b..22a27ae7 100644 Binary files a/assets/resource/base/image/OutsideDeduction/SOD_RestSite.png and b/assets/resource/base/image/OutsideDeduction/SOD_RestSite.png differ diff --git a/assets/resource/base/image/OutsideDeduction/SOD_Shopping.png b/assets/resource/base/image/OutsideDeduction/SOD_Shopping.png index cdc0aad3..016c762e 100644 Binary files a/assets/resource/base/image/OutsideDeduction/SOD_Shopping.png and b/assets/resource/base/image/OutsideDeduction/SOD_Shopping.png differ diff --git a/assets/resource/base/image/OutsideDeduction/SOD_Shopping_Leave.png b/assets/resource/base/image/OutsideDeduction/SOD_Shopping_Leave.png index ce12e07b..91937505 100644 Binary files a/assets/resource/base/image/OutsideDeduction/SOD_Shopping_Leave.png and b/assets/resource/base/image/OutsideDeduction/SOD_Shopping_Leave.png differ diff --git a/assets/resource/base/image/OutsideDeduction/SOD_Treasure.png b/assets/resource/base/image/OutsideDeduction/SOD_Treasure.png index 534a0801..a529eaf9 100644 Binary files a/assets/resource/base/image/OutsideDeduction/SOD_Treasure.png and b/assets/resource/base/image/OutsideDeduction/SOD_Treasure.png differ diff --git a/assets/resource/base/image/OutsideDeductionRapid/Chess.png b/assets/resource/base/image/OutsideDeductionRapid/Chess.png index 6566a7ff..dc908668 100644 Binary files a/assets/resource/base/image/OutsideDeductionRapid/Chess.png and b/assets/resource/base/image/OutsideDeductionRapid/Chess.png differ diff --git a/assets/resource/base/image/OutsideDeductionRapid/Combat.png b/assets/resource/base/image/OutsideDeductionRapid/Combat.png index c99b58f6..c2447337 100644 Binary files a/assets/resource/base/image/OutsideDeductionRapid/Combat.png and b/assets/resource/base/image/OutsideDeductionRapid/Combat.png differ diff --git a/assets/resource/base/image/OutsideDeductionRapid/Discovery.png b/assets/resource/base/image/OutsideDeductionRapid/Discovery.png index 07d66b33..87175b19 100644 Binary files a/assets/resource/base/image/OutsideDeductionRapid/Discovery.png and b/assets/resource/base/image/OutsideDeductionRapid/Discovery.png differ diff --git a/assets/resource/base/image/OutsideDeductionRapid/Door.png b/assets/resource/base/image/OutsideDeductionRapid/Door.png index 3e0b1189..21f15915 100644 Binary files a/assets/resource/base/image/OutsideDeductionRapid/Door.png and b/assets/resource/base/image/OutsideDeductionRapid/Door.png differ diff --git a/assets/resource/base/image/OutsideDeductionRapid/Event.png b/assets/resource/base/image/OutsideDeductionRapid/Event.png index 22a05c3d..69fdb21e 100644 Binary files a/assets/resource/base/image/OutsideDeductionRapid/Event.png and b/assets/resource/base/image/OutsideDeductionRapid/Event.png differ diff --git a/assets/resource/base/image/OutsideDeductionRapid/EventSelect.png b/assets/resource/base/image/OutsideDeductionRapid/EventSelect.png index 16a3abe5..c5106934 100644 Binary files a/assets/resource/base/image/OutsideDeductionRapid/EventSelect.png and b/assets/resource/base/image/OutsideDeductionRapid/EventSelect.png differ diff --git a/assets/resource/base/image/OutsideDeductionRapid/Imminent.png b/assets/resource/base/image/OutsideDeductionRapid/Imminent.png index 582d301b..946325fa 100644 Binary files a/assets/resource/base/image/OutsideDeductionRapid/Imminent.png and b/assets/resource/base/image/OutsideDeductionRapid/Imminent.png differ diff --git a/assets/resource/base/image/OutsideDeductionRapid/RestSite.png b/assets/resource/base/image/OutsideDeductionRapid/RestSite.png index 2b71def3..8983f629 100644 Binary files a/assets/resource/base/image/OutsideDeductionRapid/RestSite.png and b/assets/resource/base/image/OutsideDeductionRapid/RestSite.png differ diff --git a/assets/resource/base/image/OutsideDeductionRapid/Shop.png b/assets/resource/base/image/OutsideDeductionRapid/Shop.png index 91081594..106b13f4 100644 Binary files a/assets/resource/base/image/OutsideDeductionRapid/Shop.png and b/assets/resource/base/image/OutsideDeductionRapid/Shop.png differ diff --git a/assets/resource/base/image/OutsideDeductionRapid/Treasure.png b/assets/resource/base/image/OutsideDeductionRapid/Treasure.png index 6222c012..0076bc53 100644 Binary files a/assets/resource/base/image/OutsideDeductionRapid/Treasure.png and b/assets/resource/base/image/OutsideDeductionRapid/Treasure.png differ diff --git a/assets/resource/base/image/Psychube/EnterTheShow.png b/assets/resource/base/image/Psychube/EnterTheShow.png index 978b05e2..b60dceda 100644 Binary files a/assets/resource/base/image/Psychube/EnterTheShow.png and b/assets/resource/base/image/Psychube/EnterTheShow.png differ diff --git a/assets/resource/base/image/Psychube/FreePsychubeStages.png b/assets/resource/base/image/Psychube/FreePsychubeStages.png index 3aa76ecf..b3eff36c 100644 Binary files a/assets/resource/base/image/Psychube/FreePsychubeStages.png and b/assets/resource/base/image/Psychube/FreePsychubeStages.png differ diff --git a/assets/resource/base/image/Psychube/NoFreePsychubeStagesFlag.png b/assets/resource/base/image/Psychube/NoFreePsychubeStagesFlag.png index bc6abcb6..1671c08c 100644 Binary files a/assets/resource/base/image/Psychube/NoFreePsychubeStagesFlag.png and b/assets/resource/base/image/Psychube/NoFreePsychubeStagesFlag.png differ diff --git a/assets/resource/base/image/Psychube/PsychubeStages_7.png b/assets/resource/base/image/Psychube/PsychubeStages_7.png index e531f33b..510869be 100644 Binary files a/assets/resource/base/image/Psychube/PsychubeStages_7.png and b/assets/resource/base/image/Psychube/PsychubeStages_7.png differ diff --git a/assets/resource/base/image/Psychube/ReplayTwice.png b/assets/resource/base/image/Psychube/ReplayTwice.png index 2ba092f0..9c388477 100644 Binary files a/assets/resource/base/image/Psychube/ReplayTwice.png and b/assets/resource/base/image/Psychube/ReplayTwice.png differ diff --git a/assets/resource/base/image/Psychube/ResourceStages.png b/assets/resource/base/image/Psychube/ResourceStages.png index dd3bb5ac..7b4f8e10 100644 Binary files a/assets/resource/base/image/Psychube/ResourceStages.png and b/assets/resource/base/image/Psychube/ResourceStages.png differ diff --git a/assets/resource/base/image/Psychube/SetReplaysTimes.png b/assets/resource/base/image/Psychube/SetReplaysTimes.png index 47ca498d..b9d871b8 100644 Binary files a/assets/resource/base/image/Psychube/SetReplaysTimes.png and b/assets/resource/base/image/Psychube/SetReplaysTimes.png differ diff --git a/assets/resource/base/image/Psychube/SwitchToReplay.png b/assets/resource/base/image/Psychube/SwitchToReplay.png index b958fa2a..b742d790 100644 Binary files a/assets/resource/base/image/Psychube/SwitchToReplay.png and b/assets/resource/base/image/Psychube/SwitchToReplay.png differ diff --git a/assets/resource/base/image/ReveriesInTheRain/DepthsOfMythEntry.png b/assets/resource/base/image/ReveriesInTheRain/DepthsOfMythEntry.png index 9ff0f43c..be742bfd 100644 Binary files a/assets/resource/base/image/ReveriesInTheRain/DepthsOfMythEntry.png and b/assets/resource/base/image/ReveriesInTheRain/DepthsOfMythEntry.png differ diff --git a/assets/resource/base/image/ReveriesInTheRain/PlayTimesX1.png b/assets/resource/base/image/ReveriesInTheRain/PlayTimesX1.png index 74585ba2..515ca00c 100644 Binary files a/assets/resource/base/image/ReveriesInTheRain/PlayTimesX1.png and b/assets/resource/base/image/ReveriesInTheRain/PlayTimesX1.png differ diff --git a/assets/resource/base/image/ReveriesInTheRain/PlayTimesX2.png b/assets/resource/base/image/ReveriesInTheRain/PlayTimesX2.png index 2e73500d..0d79796a 100644 Binary files a/assets/resource/base/image/ReveriesInTheRain/PlayTimesX2.png and b/assets/resource/base/image/ReveriesInTheRain/PlayTimesX2.png differ diff --git a/assets/resource/base/image/ReveriesInTheRain/PlayTimesX3.png b/assets/resource/base/image/ReveriesInTheRain/PlayTimesX3.png index 7e959e39..92affee3 100644 Binary files a/assets/resource/base/image/ReveriesInTheRain/PlayTimesX3.png and b/assets/resource/base/image/ReveriesInTheRain/PlayTimesX3.png differ diff --git a/assets/resource/base/image/ReveriesInTheRain/PlayTimesX4.png b/assets/resource/base/image/ReveriesInTheRain/PlayTimesX4.png index 9a4d1bdd..6118de04 100644 Binary files a/assets/resource/base/image/ReveriesInTheRain/PlayTimesX4.png and b/assets/resource/base/image/ReveriesInTheRain/PlayTimesX4.png differ diff --git a/assets/resource/base/image/ReveriesInTheRain/ReveriesInTheRainMainEntry.png b/assets/resource/base/image/ReveriesInTheRain/ReveriesInTheRainMainEntry.png index bc9f6a96..d107143c 100644 Binary files a/assets/resource/base/image/ReveriesInTheRain/ReveriesInTheRainMainEntry.png and b/assets/resource/base/image/ReveriesInTheRain/ReveriesInTheRainMainEntry.png differ diff --git a/assets/resource/base/image/ReveriesInTheRain/TranceButton.png b/assets/resource/base/image/ReveriesInTheRain/TranceButton.png index da2b2fc0..3175b962 100644 Binary files a/assets/resource/base/image/ReveriesInTheRain/TranceButton.png and b/assets/resource/base/image/ReveriesInTheRain/TranceButton.png differ diff --git a/assets/resource/base/image/ReveriesInTheRain/TranceClose.png b/assets/resource/base/image/ReveriesInTheRain/TranceClose.png index 12f3a77a..3995bc99 100644 Binary files a/assets/resource/base/image/ReveriesInTheRain/TranceClose.png and b/assets/resource/base/image/ReveriesInTheRain/TranceClose.png differ diff --git a/assets/resource/base/image/StartUp/AccumulatedSignIn.png b/assets/resource/base/image/StartUp/AccumulatedSignIn.png index 413ba7c5..2e967063 100644 Binary files a/assets/resource/base/image/StartUp/AccumulatedSignIn.png and b/assets/resource/base/image/StartUp/AccumulatedSignIn.png differ diff --git a/assets/resource/base/image/StartUp/BackButton.png b/assets/resource/base/image/StartUp/BackButton.png index d0f980fd..0cec693f 100644 Binary files a/assets/resource/base/image/StartUp/BackButton.png and b/assets/resource/base/image/StartUp/BackButton.png differ diff --git a/assets/resource/base/image/StartUp/BackButton_White.png b/assets/resource/base/image/StartUp/BackButton_White.png index 2b3afaf3..3b02135b 100644 Binary files a/assets/resource/base/image/StartUp/BackButton_White.png and b/assets/resource/base/image/StartUp/BackButton_White.png differ diff --git a/assets/resource/base/image/StartUp/BirthdayReward.png b/assets/resource/base/image/StartUp/BirthdayReward.png index 03caf00d..71c4f670 100644 Binary files a/assets/resource/base/image/StartUp/BirthdayReward.png and b/assets/resource/base/image/StartUp/BirthdayReward.png differ diff --git a/assets/resource/base/image/StartUp/BluePochLogo.png b/assets/resource/base/image/StartUp/BluePochLogo.png index 25d4d1c4..949ba6dc 100644 Binary files a/assets/resource/base/image/StartUp/BluePochLogo.png and b/assets/resource/base/image/StartUp/BluePochLogo.png differ diff --git a/assets/resource/base/image/StartUp/CloseAnnouncement.png b/assets/resource/base/image/StartUp/CloseAnnouncement.png index 32e611a1..c27833d2 100644 Binary files a/assets/resource/base/image/StartUp/CloseAnnouncement.png and b/assets/resource/base/image/StartUp/CloseAnnouncement.png differ diff --git a/assets/resource/base/image/StartUp/CloseItemDetail.png b/assets/resource/base/image/StartUp/CloseItemDetail.png index c2bf766d..e9d56b08 100644 Binary files a/assets/resource/base/image/StartUp/CloseItemDetail.png and b/assets/resource/base/image/StartUp/CloseItemDetail.png differ diff --git a/assets/resource/base/image/StartUp/CloseRewardPage.png b/assets/resource/base/image/StartUp/CloseRewardPage.png index 65733998..0bbbf108 100644 Binary files a/assets/resource/base/image/StartUp/CloseRewardPage.png and b/assets/resource/base/image/StartUp/CloseRewardPage.png differ diff --git a/assets/resource/base/image/StartUp/Disclaimer.png b/assets/resource/base/image/StartUp/Disclaimer.png index c2ec5041..b2f849ec 100644 Binary files a/assets/resource/base/image/StartUp/Disclaimer.png and b/assets/resource/base/image/StartUp/Disclaimer.png differ diff --git a/assets/resource/base/image/StartUp/GameLoading.png b/assets/resource/base/image/StartUp/GameLoading.png index 45c09a65..293dc484 100644 Binary files a/assets/resource/base/image/StartUp/GameLoading.png and b/assets/resource/base/image/StartUp/GameLoading.png differ diff --git a/assets/resource/base/image/StartUp/GameLoading2.png b/assets/resource/base/image/StartUp/GameLoading2.png index cbfb67e1..62ae759f 100644 Binary files a/assets/resource/base/image/StartUp/GameLoading2.png and b/assets/resource/base/image/StartUp/GameLoading2.png differ diff --git a/assets/resource/base/image/StartUp/HomeButton.png b/assets/resource/base/image/StartUp/HomeButton.png index e904f9b6..5f0f8906 100644 Binary files a/assets/resource/base/image/StartUp/HomeButton.png and b/assets/resource/base/image/StartUp/HomeButton.png differ diff --git a/assets/resource/base/image/StartUp/HomeButton_White.png b/assets/resource/base/image/StartUp/HomeButton_White.png index 1900a706..49546cea 100644 Binary files a/assets/resource/base/image/StartUp/HomeButton_White.png and b/assets/resource/base/image/StartUp/HomeButton_White.png differ diff --git a/assets/resource/base/image/StartUp/HomeFlag.png b/assets/resource/base/image/StartUp/HomeFlag.png index d0af3e01..b38ad080 100644 Binary files a/assets/resource/base/image/StartUp/HomeFlag.png and b/assets/resource/base/image/StartUp/HomeFlag.png differ diff --git a/assets/resource/base/image/StartUp/HomeLoading.png b/assets/resource/base/image/StartUp/HomeLoading.png index 2a950275..08674d26 100644 Binary files a/assets/resource/base/image/StartUp/HomeLoading.png and b/assets/resource/base/image/StartUp/HomeLoading.png differ diff --git a/assets/resource/base/image/StartUp/Item-140001Reward.png b/assets/resource/base/image/StartUp/Item-140001Reward.png index 0fe2e3e3..9f30586a 100644 Binary files a/assets/resource/base/image/StartUp/Item-140001Reward.png and b/assets/resource/base/image/StartUp/Item-140001Reward.png differ diff --git a/assets/resource/base/image/StartUp/Reward.png b/assets/resource/base/image/StartUp/Reward.png index 11a529de..673b4dbb 100644 Binary files a/assets/resource/base/image/StartUp/Reward.png and b/assets/resource/base/image/StartUp/Reward.png differ diff --git a/assets/resource/base/image/StartUp/Reward1.png b/assets/resource/base/image/StartUp/Reward1.png index 8de501b0..a01b3499 100644 Binary files a/assets/resource/base/image/StartUp/Reward1.png and b/assets/resource/base/image/StartUp/Reward1.png differ diff --git a/assets/resource/base/image/StartUp/StartGame.png b/assets/resource/base/image/StartUp/StartGame.png index 790883bd..c5922a7a 100644 Binary files a/assets/resource/base/image/StartUp/StartGame.png and b/assets/resource/base/image/StartUp/StartGame.png differ diff --git a/assets/resource/base/image/Wilderness/CollectAwards.png b/assets/resource/base/image/Wilderness/CollectAwards.png index ae067653..97b8450f 100644 Binary files a/assets/resource/base/image/Wilderness/CollectAwards.png and b/assets/resource/base/image/Wilderness/CollectAwards.png differ diff --git a/assets/resource/base/image/Wilderness/CollectEXP.png b/assets/resource/base/image/Wilderness/CollectEXP.png index aaf8d44f..ecf44ee1 100644 Binary files a/assets/resource/base/image/Wilderness/CollectEXP.png and b/assets/resource/base/image/Wilderness/CollectEXP.png differ diff --git a/assets/resource/base/image/Wilderness/CollectMoney.png b/assets/resource/base/image/Wilderness/CollectMoney.png index fe8688e6..ec19f60d 100644 Binary files a/assets/resource/base/image/Wilderness/CollectMoney.png and b/assets/resource/base/image/Wilderness/CollectMoney.png differ diff --git a/assets/resource/base/image/Wilderness/CollectProduct.png b/assets/resource/base/image/Wilderness/CollectProduct.png index fa48a24f..d58a9560 100644 Binary files a/assets/resource/base/image/Wilderness/CollectProduct.png and b/assets/resource/base/image/Wilderness/CollectProduct.png differ diff --git a/assets/resource/base/image/Wilderness/CollectTrust.png b/assets/resource/base/image/Wilderness/CollectTrust.png index 4fe87f8b..cad20c1a 100644 Binary files a/assets/resource/base/image/Wilderness/CollectTrust.png and b/assets/resource/base/image/Wilderness/CollectTrust.png differ diff --git a/assets/resource/base/image/Wilderness/EnterWilderness.png b/assets/resource/base/image/Wilderness/EnterWilderness.png index 32daabad..b35ffaff 100644 Binary files a/assets/resource/base/image/Wilderness/EnterWilderness.png and b/assets/resource/base/image/Wilderness/EnterWilderness.png differ diff --git a/assets/resource/base/image/Wilderness/SummonlngSuccess.png b/assets/resource/base/image/Wilderness/SummonlngSuccess.png index 7473a27c..d75b3f65 100644 Binary files a/assets/resource/base/image/Wilderness/SummonlngSuccess.png and b/assets/resource/base/image/Wilderness/SummonlngSuccess.png differ diff --git a/assets/resource/base/image/Wilderness/TrustDialogueInteraction.png b/assets/resource/base/image/Wilderness/TrustDialogueInteraction.png index 7841fe62..8ba9d430 100644 Binary files a/assets/resource/base/image/Wilderness/TrustDialogueInteraction.png and b/assets/resource/base/image/Wilderness/TrustDialogueInteraction.png differ diff --git a/assets/resource/base/image/Wilderness/TrustDialogueNext.png b/assets/resource/base/image/Wilderness/TrustDialogueNext.png index 6ae8d4dc..c10f1651 100644 Binary files a/assets/resource/base/image/Wilderness/TrustDialogueNext.png and b/assets/resource/base/image/Wilderness/TrustDialogueNext.png differ diff --git a/assets/resource/base/image/Wilderness/TrustMax.png b/assets/resource/base/image/Wilderness/TrustMax.png index 1d909fd8..fa4661f9 100644 Binary files a/assets/resource/base/image/Wilderness/TrustMax.png and b/assets/resource/base/image/Wilderness/TrustMax.png differ diff --git a/assets/resource/base/image/Wilderness/UniqueParxxxx.png b/assets/resource/base/image/Wilderness/UniqueParxxxx.png index eb31cb2d..f547371d 100644 Binary files a/assets/resource/base/image/Wilderness/UniqueParxxxx.png and b/assets/resource/base/image/Wilderness/UniqueParxxxx.png differ diff --git a/assets/resource/global_jp/image/StartUp/BluePochLogo.png b/assets/resource/global_jp/image/StartUp/BluePochLogo.png index 1da196d6..c7d7c2ab 100644 Binary files a/assets/resource/global_jp/image/StartUp/BluePochLogo.png and b/assets/resource/global_jp/image/StartUp/BluePochLogo.png differ diff --git a/assets/resource/global_jp/image/StartUp/Disclaimer.png b/assets/resource/global_jp/image/StartUp/Disclaimer.png index 410bb439..7f255d18 100644 Binary files a/assets/resource/global_jp/image/StartUp/Disclaimer.png and b/assets/resource/global_jp/image/StartUp/Disclaimer.png differ diff --git a/docs/.markdownlint.yaml b/docs/.markdownlint.yaml index 9fc29b37..f6e026d6 100644 --- a/docs/.markdownlint.yaml +++ b/docs/.markdownlint.yaml @@ -112,7 +112,7 @@ MD026: MD027: false # MD028/no-blanks-blockquote - Blank line inside blockquote -MD028: true +MD028: false # MD029/ol-prefix - Ordered list item prefix MD029: diff --git "a/docs/zh_cn/develop/Bug \346\216\222\346\237\245.md" "b/docs/zh_cn/develop/Bug \346\216\222\346\237\245.md" new file mode 100644 index 00000000..fbcb9ea1 --- /dev/null +++ "b/docs/zh_cn/develop/Bug \346\216\222\346\237\245.md" @@ -0,0 +1,83 @@ +# Bug 排查 + +修 bug 也是开发中重要的一环，如何快速准确地定位、分析、解决 bug 是有技巧的。本文将介绍一些常见的 bug 排查方法。 + +> [!NOTE] +> +> 以下内容仅供参考，注意时效性。 + +## 前置准备 + +与 bug 发现者沟通，尽可能的获取 bug 相关的信息，如： + +- 资源版本 +- 系统版本 +- 问题的细节（发生的时间、场景等） +- 配置文件、日志、截图等 + +## 定位问题 + +### 确认资源版本以及运行方式 + +对于 M9A 来说，有两种运行方式：1. MaaPiCli 2. MFAWPF + +根据观察，MaaPiCli运行时有行log为 + +```plaintext +[2024-11-28 19:46:32.571][INF][Px14600][Tx16498][Parser.cpp][L56][MaaNS::ProjectInterfaceNS::Parser::parse_interface] Interface Version: [data.version=v2.4.11] +``` + +既能看出资源版本，又能看出是以 MaaPiCli 方式运行。 + +```plaintext +[2024-11-30 01:46:56.490][INF][Px20060][Tx33876][Parser.cpp][L56][MaaNS::ProjectInterfaceNS::Parser::parse_interface] Interface Version: [data.version=] +``` + +当 `version` 为空时，MaaPiCli log 为以上样式。 + +确认资源版本可以了解是否为已修复bug版本，确认运行方式则是因为不同运行方式，config文件不同，同时可能生成的bug也不同。 + +### 确定问题 log 范围 + +- 根据问题描述发生的时间缩小范围 +- 根据问题发生的任务缩小范围 +- 根据[ERR]确定错误相关原因 +- 根据bug相关的[ERR]处反向查找 `Task Hit` ，以确定出错任务 + +## 分析问题 + +在这里我将问题大致分为三类：资源加载问题、连接问题以及 pipeline 问题（timeout）。 + +### 资源加载问题 + +资源改名时覆盖安装导致的资源加载失败： + +```log +[2024-11-17 22:29:04.185][ERR][Px10564][Tx9380][PipelineResMgr.cpp][L211][MaaNS::ResourceNS::PipelineResMgr::parse_config] key already exists [key=OutsideDeduction] +``` + +### 连接问题 + +模拟器连接失败： + +```log +[2024-11-24 23:44:05.539][ERR][Px26056][Tx55883][ControlUnitMgr.cpp][L55][MaaNS::CtrlUnitNs::ControlUnitMgr::connect] failed to connect [adb_path_=D:/MuMu Player 12/shell/adb.exe] [adb_serial_=127.0.0.1:16384] +``` + +### pipeline 问题 + +一般来说，是pipeline逻辑有漏洞导致的，需要进一步分析。 + +常用的解决方法有： + +- 增加 `flag` 任务 +- 增加 `pre/post_wait_freezes` （注意默认 `target` 是否是你想要的） +- 更改实现逻辑（如更换识别方式以及动作逻辑） + +## 解决问题 + +前两种参考[常见问题](../manual/常见问题.md)解决，pipeline 问题需要进一步分析。 + +## 验证修复 + +修复后发布测试版，经测试无误后解决问题。 diff --git "a/docs/zh_cn/develop/Pipeline \347\274\226\345\206\231.md" "b/docs/zh_cn/develop/Pipeline \347\274\226\345\206\231.md" new file mode 100644 index 00000000..66872619 --- /dev/null +++ "b/docs/zh_cn/develop/Pipeline \347\274\226\345\206\231.md" @@ -0,0 +1,82 @@ +# Pipeline 编写 + +## 编写规范 + +### 命名规范 + +为保证资源的美观一致，请尽量遵循以下现有规则。 + +#### 资源命名 + +- 对于图片等文件，采用大驼峰命名法，所有单词的首字母都大写。 +- 对于 `pipeline.json` 文件，一般来说，采用蛇形命名法，单词之间用下划线分隔，所有字母小写， + 特别地，专有名词的活动采取大驼峰命名法，一般在 `activity` 内。 +- 对于 `image` 下文件夹，每个文件夹对应一个 `pipeline.json` 文件，文件夹名采用大驼峰命名法， + 特别地，`activity` 内 `pipeline.json` 对应的 `image` 放到 `Combat/Activity` 处。 + +#### Task 命名 + +大多数采用大驼峰命名法，特别地，部分情况下用 `_` 连接前、后缀。 + +前缀一般为 `Sub` 或 当前活动缩写（如 `SOD` 黄昏的音序、`EITM` 山麓的回音）等，其他情况建议不要前缀。 + +后缀一般为 `数字` 或 `状态` 等，表示该任务的具体阶段或状态。（建议新写的任务不加后缀） + +### Task 编写 + +参考[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) + +> [!NOTE] +> +> - 一般 `next` 放置当前任务的出口任务，`interrupt` 放置当前任务的中断任务。 +> - 建议多写些 `Flag` 任务进行判断，以保证任务的稳定性。 +> - 部分情况下，可在 `next` 加入自身，以提高任务的稳定性。（存在程序未正确接受动作的情况） + +### next & interrupt 任务顺序 + +总体上，`interrupt` 第一个任务 比 `next` 最后一个任务低一优先级。 + +在 `next` 或 `interrupt` 内部，统一先按照优先级由高到低顺序排列，不能出现优先级倒挂的情况。举例： + +```plaintext +现有判断一个小弹窗的任务B，和判断跳出弹窗前界面的任务A。 +如果弹窗出现时依旧能匹配到任务A，则任务B的优先级应该高于任务A，否则会出现无法处理B而卡死于A的情况 +``` + +同一优先级内的任务，可按照匹配频率由高到低顺序排列，以便提高命中率，降低资源消耗。 + +### 注释规范 + +`pipeline.json` 文件中，注释共两种属性字段： + +1. `.*_doc$|^doc$`： 以 _doc 结尾的字符串或者正好是 doc 的字符串。 +2. `.*_code$|^code$`：以 _code 结尾的字符串或者正好是 code 的字符串。 + +前者为对当前 task（或某字段）的说明，后者为对必填字段的占位。举例： + +```json +{ + "EnterTheActivityMain": { + "doc": "进入当期活动主界面", + "template_code": "在interface.json中修改template", + "recognition": "TemplateMatch", + "roi": [ + 885, + 123, + 340, + 183 + ], + "action": "Click", + "post_wait_freezes": 300, + "next": [ + "ActivityMainFlag", + "EnterTheActivityMain" + ] + } +} +``` + +`doc` 为当前 task 说明。 + +`template_code` 为必填字段占位， +原因是 `recognition` 为 `TemplateMatch` 时， "template" 字段必填，但我们想在 `interface.json` 中修改，故用 `template_code` 占位。 diff --git "a/docs/zh_cn/develop/interface.json \347\274\226\345\206\231.md" "b/docs/zh_cn/develop/interface.json \347\274\226\345\206\231.md" new file mode 100644 index 00000000..4d0ed756 --- /dev/null +++ "b/docs/zh_cn/develop/interface.json \347\274\226\345\206\231.md" @@ -0,0 +1,156 @@ +# interface.json 编写 + +[参考资料——interface.schema.json](https://github.com/MaaXYZ/MaaFramework/blob/main/tools/interface.schema.json) + +`interface.json` 旨在提供菜单配置。 + +## controller + +对于 M9A 来说，固定选择 adb 方式，基本不需要改动。 + +## resource + +资源配置。每种资源需要资源名 `name` 以及 资源路径 `path`，均为必填。 + +特别地，对于资源路径 'path'，M9A 按顺序加载资源，若是存在相同资源名，则后加载的资源会覆盖前面的资源。 + +以 B 服为例，资源配置如下： + +```json +{ + "resources": [ + { + "name": "B 服", + "path": [ + "{PROJECT_DIR}/resource/base", + "{PROJECT_DIR}/resource/bilibili" + ] + } + ] +} +``` + +这里，`{PROJECT_DIR}` 是 M9A 项目根目录，`base` 文件夹是官服资源，`bilibili` 文件夹是 B 服覆盖官服的资源。 + +## task + +任务列表。任务列表包含多个任务，而每个任务又有任务名 `name`、任务入口 `entry`、任务参数 `pipeline_override`、以及任务选项 `option`，其中 `name` `entry` 必填。 + +`pipeline_override` 中应为 pipeline task，并带有覆写参数，例如： + +```json +{ + "name": "轶事派遣（角色故事请自行阅读）", + "entry": "Anecdote", + "pipeline_override": { + "EnterTheActivityMain": { + "template_doc": "修改为当期活动入口的template", + "template": "Combat/Activity/LondonDawningEnterTheShow.png" + } + } +} +``` + +这里原task为： + +```json +{ + "EnterTheActivityMain": { + "doc": "进入当期活动主界面", + "template_code": "在interface.json中修改template", + "recognition": "TemplateMatch", + "roi": [ + 885, + 123, + 340, + 183 + ], + "action": "Click", + "post_wait_freezes": 300, + "next": [ + "ActivityMainFlag", + "EnterTheActivityMain" + ] + } +} +``` + +经过覆写，该 task 在执行“轶事派遣（角色故事请自行阅读）”任务时，实际执行效果等同于： + +```json +{ + "EnterTheActivityMain": { + "recognition": "TemplateMatch", + "template": "Combat/Activity/LondonDawningEnterTheShow.png", + "roi": [ + 885, + 123, + 340, + 183 + ], + "action": "Click", + "post_wait_freezes": 300, + "next": [ + "ActivityMainFlag", + "EnterTheActivityMain" + ] + } +} +``` + +执行“轶事派遣（角色故事请自行阅读）”任务后，task 便会恢复原状。 + +`option` 则是根据你下面的具体设置来决定如何覆写 pipeline task。 + +## option + +选项定义。每种选项有可选项 `cases` 以及 默认选项 `default_case`, 其中`cases`必填。 + +一般用 `cases`,举例： + +```json +{ + "task": [ + { + "name": "常规作战", + "entry": "Combat", + "option": [ + "作战关卡", + "复现次数", + "刷完全部体力", + "吃全部临期糖" + ] + } + ], + "option":{ + "刷完全部体力": { + "cases": [ + { + "name": "Yes", + "pipeline_override": { + "AllIn": { + "enabled": true + } + } + }, + { + "name": "No", + "pipeline_override": { + "AllIn": { + "enabled": false + } + } + } + ] + } + } +} +``` + +## version + +版本。不必填写，ci install 时会自动生成。 + +## message + +信息。目前为 `MaaPiCli` 运行时第一行输出的文字。 diff --git "a/docs/zh_cn/develop/\345\244\226\346\234\215\351\200\202\351\205\215.md" "b/docs/zh_cn/develop/\345\244\226\346\234\215\351\200\202\351\205\215.md" new file mode 100644 index 00000000..675b034f --- /dev/null +++ "b/docs/zh_cn/develop/\345\244\226\346\234\215\351\200\202\351\205\215.md" @@ -0,0 +1,11 @@ +# 外服适配 + +目前来说，1999的外服都可以在游戏设置中选择中文，修改后与国服相差不多，所以适配要做的事情也不是很多。 + +## 资源适配 + +参考[interface.json 编写](./interface.json%20编写.md#resource) + +主要适配 `startup.json` 以及 `shutdown.json`。 + +其他问题具体遇到再解决 diff --git "a/docs/zh_cn/develop/\345\274\200\345\217\221\345\211\215\351\241\273\347\237\245.md" "b/docs/zh_cn/develop/\345\274\200\345\217\221\345\211\215\351\241\273\347\237\245.md" new file mode 100644 index 00000000..bae09e30 --- /dev/null +++ "b/docs/zh_cn/develop/\345\274\200\345\217\221\345\211\215\351\241\273\347\237\245.md" @@ -0,0 +1,158 @@ +# 开发前须知 + +> [!NOTE] +> +> 只有当您想要开发 M9A 时才需要看当前页面！ +> +> 用户请转到 [M9A 使用手册](../manual/新手上路.md)。 +> +> 开发 MaaFramework 或开发自己的项目请到 [MaaXYZ/MaaFramework](https://github.com/MaaXYZ/MaaFramework)。 + +## Github Pull Request 流程简述 + +### 我不懂编程，只是想改一点点 JSON 文件/文档等，要怎么操作？ + +欢迎收看 [牛牛也能看懂的 GitHub Pull Request 使用指南](https://maa.plus/docs/zh-cn/develop/pr-tutorial.html) + +### 我有编程经验，但是没参与过相关项目，要怎么做？ + +1. 如果很久以前 fork 过，先在自己仓库的 `Settings` 里，翻到最下面，删除 + +2. 打开 [M9A 主仓库](https://github.com/MaaXYZ/M9A)，点击 `Fork`，继续点击 `Create fork` + +3. 克隆你自己的仓库到本地，并拉取子模块 + + ```bash + git clone --recursive https://github.com/<你的用户名>/M9A.git + ``` + + > ⚠ + > + > **--recursive 一定不要忘！****--recursive 一定不要忘！****--recursive 一定不要忘！** + > + > OCR异常失败很可能就是没加recursive导致。 + +4. 下载 MaaFramework 的 [Release 包](https://github.com/MaaXYZ/MaaFramework/releases)，解压到 `deps` 文件夹中。 + +5. 配置编程环境 + + - 下载并安装vscode + - 选择性安装调试/开发工具 + + | 工具 | 简介 | + | --- | --- | + | [MaaDebugger](https://github.com/MaaXYZ/MaaDebugger) | 独立调试工具 | + | [Maa Pipeline Support](https://marketplace.visualstudio.com/items?itemName=nekosu.maa-support) | VSCode 插件，提供调试、截图、获取 ROI 、取色等功能 | + | [ImageCropper](https://github.com/MaaXYZ/MaaFramework/tree/main/tools/ImageCropper) | 独立截图及获取 ROI 工具 | + | [MFA Tools](https://github.com/SweetSmellFox/MFATools) | 独立截图、获取 ROI 及取色工具 | + +6. 开始开发 + + 开始愉快的改代码吧，开始前查看[相关阅读](#相关阅读)。 + +7. git 操作 + + 通常用的最多的基本命令有： + - `git add `：添加文件到暂存区，`*` 代表全部文件 + - `git commit -m "message"`：提交暂存区到本地仓库。`message` 请遵循 [约定式提交规范](https://www.conventionalcommits.org/zh-hans/v1.0.0/)，让你的 commit 信息更加清晰 + - `git pull origin `：拉取远程仓库到本地仓库 + - `git push origin `：推送本地仓库到远程仓库 + + > ⚠ + > + > 开发过程中，每一定数量，记得提交一个 commit, 别忘了写上 message + > 假如你不熟悉 git 的使用，你可能需要创建并切换到一个新的分支，而不是直接提交在 main 上 + > 这样你的提交就能在新的分支上生长，不会受到 main 更新的打扰 + + ```bash + git checkout -b # 创建并切换到新的分支 + ``` + + 完成开发后，推送你修改的本地分支到远程仓库（fork 的仓库） + + ```bash + git push origin + ``` + + 当 M9A 仓库出现更改（如其他人的commit），你可能需要把这些更改同步到你的分支 + + 1. 关联 M9A 原仓库： + + ```bash + git remote add upstream https://github.com/MaaXYZ/M9A.git` + ``` + + 2. 拉取远程仓库更新： + + ```bash + git fetch upstream + ``` + + 3. 变基（推荐）或者合并修改： + + ```bash + git rebase upstream/main # 变基，使commit历史更清晰，完成你的个人pr时建议使用rebase而不是merge来合并修改 + ``` + + 或者 + + ```bash + git merge upstream/main + ``` + + git 参考资料： + - [git 官方文档](https://git-scm.com/docs) + - [git 简明指南](https://www.runoob.com/manual/git-guide/) + - [git 教程|菜鸟教程](https://www.runoob.com/git/git-tutorial.html) + +8. 提交 Pull Request + + 你修改的代码已经提交到你的仓库，现在你需要提交一个 Pull Request 到 M9A 的仓库，等待维护者审核 + + [GitHub Pull Request 参考](https://maa.plus/docs/zh-cn/develop/pr-tutorial.html) + +## M9A 格式化要求 + +M9A 使用一系列的格式化工具来保证仓库中的代码和资源文件美观统一，以便于维护和阅读 + +请确保在提交之前已经格式化，或是[启用 Pre-commit Hooks 进行自动格式化](#pre-commit-hooks) + +目前启用的格式化工具如下： + +| 文件类型 | 格式化工具 | +| --- | --- | +| JSON/Yaml | [prettier](https://prettier.io/) | +| Markdown | [MarkdownLint](https://github.com/DavidAnson/markdownlint-cli2) | + +### 利用 Pre-commit Hooks 自动进行代码格式化 + + + +1. 确保你的电脑上有 Python 与 Node 环境 + +2. 在项目根目录下执行以下命令 + + ```bash + pip install pre-commit + pre-commit install + ``` + +如果pip安装后依然无法运行pre-commit，请确认pip安装地址已被添加到PATH + +接下来，每次提交时都将会自动运行格式化工具，来确保你的代码格式符合规范 + +手动触发： + +```bash +pre-commit run --all-files +``` + +## 相关阅读 + +- [interface.json 编写](./interface.json%20编写.md) +- [Pipeline 编写](./Pipeline%20编写.md) +- [BUG 排查](./Bug%20排查.md) +- [项目重构](./项目重构.md) +- [活动资源维护](./活动资源维护.md) +- [外服适配](./外服适配.md) +- [文档编写](./文档编写.md) diff --git "a/docs/zh_cn/develop/\346\226\207\346\241\243\347\274\226\345\206\231.md" "b/docs/zh_cn/develop/\346\226\207\346\241\243\347\274\226\345\206\231.md" new file mode 100644 index 00000000..2488b751 --- /dev/null +++ "b/docs/zh_cn/develop/\346\226\207\346\241\243\347\274\226\345\206\231.md" @@ -0,0 +1,49 @@ +# 文档编写 + +> [!IMPORTANT] +> 文档编写应符合 MarkdownLint 规范，请参考 [MarkdownLint 规则](https://github.com/markdownlint/markdownlint/blob/master/docs/RULES.md)，可通过[VSCode插件](https://github.com/DavidAnson/vscode-markdownlint)辅助编写。 +> + +## Block Quote + +接下来介绍 Github 5种 Block Quote 的用法： + +> [!NOTE] +> Highlights information that users should take into account, even when skimming. +> 突出显示用户应考虑的信息，即使在浏览时也是如此。 + +> [!TIP] +> Optional information to help a user be more successful. +> 帮助用户取得更大成功的可选信息。 + +> [!IMPORTANT] +> Crucial information necessary for users to succeed. +> 用户成功所需的重要信息。 + +> [!WARNING] +> Critical content demanding immediate user attention due to potential risks. +> 由于存在潜在风险，需要用户立即关注的关键内容。 + +> [!CAUTION] +> Negative potential consequences of an action. +> 操作的潜在负面后果。 + +不过需要注意，[嵌套的 Block Quote 不会被 github 渲染](https://github.com/orgs/community/discussions/16925#discussioncomment-10195289)。像下面这样： + +1. 第一层 Block Quote +2. 第二层 Block Quote + > [!NOTE] + > 嵌套的 Block Quote 不会被 github 渲染。 + +## 图片 + +为了向文档中添加图片，我们采取以下步骤： + +1. 上传图片到公共仓库的 `Issues` 或 `Pull Requests` 中 + [样例](https://github.com/MaaXYZ/M9A/pull/255#issuecomment-2489676567) +2. 选择 `Edit` 看到类似 `![name](anonymized URL)` 的内容，复制待用 +3. 在文档中使用 `![name](anonymized URL)` 语法插入图片 + +> [!NOTE] +> 非组织成员上传的图片、GIF、视频应小于10MB +> [更多详细信息](https://docs.github.com/zh/get-started/writing-on-github/working-with-advanced-formatting/attaching-files) diff --git "a/docs/zh_cn/develop/\346\264\273\345\212\250\350\265\204\346\272\220\347\273\264\346\212\244.md" "b/docs/zh_cn/develop/\346\264\273\345\212\250\350\265\204\346\272\220\347\273\264\346\212\244.md" new file mode 100644 index 00000000..02a42ddb --- /dev/null +++ "b/docs/zh_cn/develop/\346\264\273\345\212\250\350\265\204\346\272\220\347\273\264\346\212\244.md" @@ -0,0 +1,12 @@ +# 活动资源维护 + +一般是新活动开启时，新增 `./assets/resource/base/image` 下资源，以及 `./assets/interface.json` 中活动相关的 `pipeline_override` 的修改。 + +## 维护列表 + +| 任务/选项名 | 覆写任务 | 覆写参数 | 备注 | +| --- | --- | --- | --- | +| 轶事派遣 | EnterTheActivityMain | template | 当期活动入口模板 | +| 活动选择 | ActivityEnterTheShow | template | 当期活动入口模板 | +| 活动选择 | TargetStageName | expected | 关卡编号 | +| 活动选择 | StageDifficulty | next | 关卡难度 | diff --git "a/docs/zh_cn/develop/\351\241\271\347\233\256\351\207\215\346\236\204.md" "b/docs/zh_cn/develop/\351\241\271\347\233\256\351\207\215\346\236\204.md" new file mode 100644 index 00000000..f79dbdc5 --- /dev/null +++ "b/docs/zh_cn/develop/\351\241\271\347\233\256\351\207\215\346\236\204.md" @@ -0,0 +1,38 @@ +# 项目重构 + +## 资源 + +注意对其修改时不要落下任何用到该资源的任务。 + +> [!TIP] +> +> 善用全局搜索 + +## 任务 + +### sub 任务 + +这里将 `is_sub` (已废弃) 值为 `true` 的任务称为 `sub 任务` 。 + +重构 `sub 任务` ，有以下几个步骤： + +1. 判断该 `sub 任务` 在当前任务 `next` 列表中是否处于最低优先级（即直接放到当前任务 `interrupt` 列表中对实际效果有无影响） +2. 若该 `sub 任务` 不处于最低优先级，重构方法是将当前任务的 `next` 和 `interrupt` 加入 `sub 任务` (原 `next` 和 `interrupt` 为空可直接进行，不为空则需考虑是否冲突)；若该 `sub 任务` 处于最低优先级，重构方法为直接放到当前任务的 `interrupt` 中 +3. 若该 `sub 任务` 不处于最低优先级，且步骤2的改动会引起冲突，则需要重新考虑任务逻辑。 +4. 将 `sub 任务` 的 `is_sub` 属性删除 + +> [!WARNING] +> +> 以上全部改动均需考虑所有使用该 `sub 任务` 的任务，不要落下！ + +### 其它任务 + +#### 简化任务链 + +##### 目的 + +简化 pipeline、理清逻辑 + +##### 操作 + +部分任务可放在 `当前 task` 的 `父 task`（或 `父 task` 的 `父 task` 等等）的 `interrupt` 中，若一味的放入 `next` 则会导致任务链过长，影响 pipeline 的可读性和简洁性。 diff --git "a/docs/zh_cn/manual/\345\270\270\350\247\201\351\227\256\351\242\230.md" "b/docs/zh_cn/manual/\345\270\270\350\247\201\351\227\256\351\242\230.md" new file mode 100644 index 00000000..42635807 --- /dev/null +++ "b/docs/zh_cn/manual/\345\270\270\350\247\201\351\227\256\351\242\230.md" @@ -0,0 +1,95 @@ +# 常见问题 + +## 软件无法运行/闪退/报错 + +### 下载/安装问题 + +- 完整 M9A 软件压缩包命名格式为 "M9A-`平台`-`架构`-`版本`.zip"，其余均为无法单独使用的“零部件”，请仔细阅读。 + 在大部分情况下，您需要使用 x64 架构的 M9A，即您需要下载 `M9A-win-x86_64-vXXX.zip`，而非`M9A-win-aarch64-vXXX.zip`。 +- 若在某次更新后无法使用，可能是您覆盖安装造成的, 请尝试重新(下载)解压完整包后新文件夹。 + +### 运行库问题 + +特征： + +1. 使用 MFAWPF 时，出现 + + ```plaintext + MFA 遇到了问题 + “对类型“MFAWPF.Views.MainWindow”的构造函数执行符合指定的绑定约束的调用时引发了异常。”，行号为“14”，行位置为“24”。 + Unable to load DLL 'MaaToolkit' or one of its dependencies: 动态链接库(DLL)初始化例程失败。 (0x8007045A) + 详细信息 + System.Windows.Markup.XamlParseException: “对类型“MFAWPF.Views.MainWindow”的构造函数执行符合指定的绑定约束的调用时引发了异常。”，行号为“14”，行位置为“24”。 + ---> System.DllNotFoundException: Unable to load DLL 'MaaToolkit' or one of its dependencies: 动态链接库(DLL)初始化例程失败。 (0x8007045A) + ``` + +2. 在使用MaaPiCli时，出现 `应用程序错误：应用程序无法正常启动` + +以上一般便是运行库问题，需要[更新运行库](./新手上路.md#2-安装运行库) + +若更新运行库后仍然无法解决，以上两种启动方法均闪退，且在当前目录不生成任何日志文件，则是其它依赖相关问题。 +请到[项目Issues页面](https://github.com/MaaXYZ/M9A/issues)反馈。 + +### 资源加载失败 + +删除整个文件夹，[重新下载](https://github.com/MaaXYZ/M9A/releases)安装 M9A 。 + +## 运行自动深眠闪退 + +> [!NOTE] +> +> 原问题链接: [自动深眠闪退](https://github.com/MaaXYZ/M9A/issues/242) +> +> 解决方案: +> +> 使用MaaPiCli： 将 `config/maa_pi_config.json` 里的 `gpu` 字段改成 -2，即使用 CPU。 +> +> 使用MFAWPF：在[设置]-[高级设置]里将[启用gpu加速]取消勾选 + +## 连接错误 + +### 确认 ADB 及连接地址正确 + +参阅 [连接设置](./连接设置.md#连接设置) + +> [!TIP] +> +> 不要连到别的模拟器/设备去了！ + +### 关闭现有 ADB 进程 + +关闭 M9A 后查找 `任务管理器` - `详细信息` 中有无名称包含 `adb` 的进程，如有，结束它后重试连接。 + +### 正确使用多个 ADB + +当 ADB 版本不同时，新启动的进程会关闭旧的进程。因此在需要同时运行多个 ADB，如 Android Studio、Alas、手机助手时，请确认它们的版本相同。 + +### 改用 MaaPiCli + +若您使用 MFAWPF 连接失败，请尝试改用 MaaPiCli 。 +[原问题链接](https://github.com/SweetSmellFox/MFAWPF/issues/54) + +### 避免游戏加速器 + +部分加速器在启动加速和停止加速之后，都需要重启 MAA、ADB 和模拟器再连接。 + +同时使用 UU 加速器 和 MuMu 12 可以参考[官方文档](https://mumu.163.com/help/20240321/35047_1144608.html)。 + +### 重启电脑 + +重启能解决 97% 的问题。（确信 + +### 换模拟器 + +请参阅 [模拟器和设备支持](https://maa.plus/docs/zh-cn/manual/device/)。 + +## 文件下载速度慢 + +求助群友/到网上查询相关办法。 + +## 其他问题 + +当您**确定已经阅读过以上常见问题**并**尝试自行解决无果**后，您可以： + +1. 到[项目Issues页面](https://github.com/MaaXYZ/M9A/issues) ，**根据模板要求**提交相关材料。 +2. M9A 闲聊群 QQ 群：175638678，在**阅读完群公告**后提问。 diff --git "a/docs/zh_cn/manual/\346\226\260\346\211\213\344\270\212\350\267\257.md" "b/docs/zh_cn/manual/\346\226\260\346\211\213\344\270\212\350\267\257.md" new file mode 100644 index 00000000..0944950d --- /dev/null +++ "b/docs/zh_cn/manual/\346\226\260\346\211\213\344\270\212\350\267\257.md" @@ -0,0 +1,91 @@ +# 新手上路 + +## 前置准备 + +### 1. 确认版本系统 + +M9A 在 Windows 下仅支持 10 和 11，旧版 Windows 请参阅[常见问题](https://maa.plus/docs/zh-cn/manual/faq.html#%E7%B3%BB%E7%BB%9F%E9%97%AE%E9%A2%98)中的系统问题部分。 + +> [!WARNING] +> +> 以下内容源自MAA，与 M9A 有差异，故仅供参考 +> [暂不支持 PlayCover](https://github.com/MaaXYZ/MaaFramework/issues/405)。 + +若您正在使用 Apple Silicon MacBook，请前往[此页面](https://maa.plus/docs/zh-cn/manual/device/macos.html#apple-silicon-%E8%8A%AF%E7%89%87) +M9A 同样支持搭载 [Intel 芯片](https://maa.plus/docs/zh-cn/manual/device/macos.html#intel-%E8%8A%AF%E7%89%87)的 MacBook，但更推荐使用 Mac 自带的多系统安装 Windows，并使用 Windows 版 M9A。 + +若您希望使用 Android 实体设备，请前往[此页面](https://maa.plus/docs/zh-cn/manual/device/android.html)。 +由于此方法涉及 adb 调试且仍需与电脑连接，不推荐入门玩家使用此方法。 + +### 2. 安装运行库(Windows) + +M9A 需要 VCRedist x64 (cli与gui都需要) 和 .NET 8 (仅使用gui时需要)。 +点击 [vc_redist.x64](https://aka.ms/vs/17/release/vc_redist.x64.exe) 下载安装 VCRedist x64，点击 [dotnet-sdk-8.0.5-win-x64.exe](https://download.visualstudio.microsoft.com/download/pr/ba3a1364-27d8-472e-a33b-5ce0937728aa/6f9495e5a587406c85af6f93b1c89295/dotnet-sdk-8.0.404-win-x64.exe) 下载安装.NET 8。 +也可以右键开始按钮打开终端，在终端内粘贴以下命令回车以进行安装。 + +```sh +winget install Microsoft.VCRedist.2017.x64 Microsoft.DotNet.DesktopRuntime.8 +``` + +### 3. 下载正确的版本 + +M9A 下载地址： + +#### Windows + +* 对于**绝大部分**用户，请下载 `M9A-win-x86_64-vXXX.zip` +* 若确定自己的电脑是 arm 架构，请下载 `M9A-win-aarch64-vXXX.zip` + +> [!WARNING] +> 请注意！Windows 的电脑几乎全都是 x86\_64 的，可能占 99.999%，除非你非常确定自己是 arm，否则别下这个！ + +* 解压后运行 `MaaPiCli.exe`（命令行）或 `MFAWPF.exe`（图形化界面）即可 + +#### macOS + +* 若使用 Intel 处理器，请下载 `M9A-macos-x86_64-vXXX.zip` +* 若使用 M1, M2 等 arm 处理器，请下载 `M9A-macos-aarch64-vXXX.zip` +* 使用方式： + + ```shell + chmod a+x MaaPiCli + ./MaaPiCli + ``` + +#### Linux + +同macOS，下载对应版本的压缩包，添加权限后运行 `MaaPiCli` 即可。 + +#### Android + +~~这个不是 apk ，一般人用不到~~ + +### 4. 正确解压 + +确认解压完整，并确保将 M9A 解压到一个独立的文件夹中。请勿将 MAA 解压到如 `C:\`、`C:\Program Files\` 等需要 UAC 权限的路径。 + +> [!CAUTION] +> 不要在压缩软件直接打开程序！ + +### 5. 确认模拟器支持 + +查阅[模拟器和设备支持](https://maa.plus/docs/zh-cn/manual/device/)，确认正在使用的模拟器支持情况。 + +### 6. 正确设置模拟器分辨率 + +模拟器分辨率应为 `16:9` 比例，最低为 `1280x720`，不符合要求造成的运行报错将不会被解决。 + +## 初始配置 + +0. 若需要使用自动检测，则运行**一个**模拟器，并确保没有其他安卓设备连接电脑。 +1. 跟随设置指引进行配置，M9A 会自动检测正在运行的模拟器。 +2. 添加任务 +3. 运行任务 + +## 进阶使用 + +* 添加 `-d` 参数可跳过交互直接运行任务，如 `./MaaPiCli.exe -d` +* 2.0 版本已支持 mumu 后台保活，会在 run task 时获取 mumu 最前台的 tab，并始终使用这个 tab（即使之后被切到后台了） +* [连接设置](./连接设置.md#连接设置) +* [部分功能介绍](./部分功能介绍.md) +* [常见问题](./常见问题.md) diff --git "a/docs/zh_cn/manual/\350\277\236\346\216\245\350\256\276\347\275\256.md" "b/docs/zh_cn/manual/\350\277\236\346\216\245\350\256\276\347\275\256.md" new file mode 100644 index 00000000..e2658e01 --- /dev/null +++ "b/docs/zh_cn/manual/\350\277\236\346\216\245\350\256\276\347\275\256.md" @@ -0,0 +1,17 @@ +# 连接设置 + +adb路径及adb(连接)地址请参考[连接设置 | MaaAssistantArknights](https://maa.plus/docs/zh-cn/manual/connection.html) + +## MFAWPF 特殊设置 + +### 模拟器启动参数 + +| 品牌 | 启动参数 | +| --- | --- | +| MuMu | -v 多开号(从0开始) | +| 雷电 | index=多开号(从0开始) | + +### adb 额外参数 + +`debug/config.json` 中 `"AdbDevice"` 中 `"Config"` 的值, +形如 `{"extras":{"ld":{"enable":true,"index":1,"path":"C:/leidian/LDPlayer9","pid":7524}}}`。 diff --git "a/docs/zh_cn/manual/\351\203\250\345\210\206\345\212\237\350\203\275\344\273\213\347\273\215.md" "b/docs/zh_cn/manual/\351\203\250\345\210\206\345\212\237\350\203\275\344\273\213\347\273\215.md" new file mode 100644 index 00000000..4aba605a --- /dev/null +++ "b/docs/zh_cn/manual/\351\203\250\345\210\206\345\212\237\350\203\275\344\273\213\347\273\215.md" @@ -0,0 +1,67 @@ +# 部分功能介绍 + +## 每日心相（意志解析） + +完成每日免费的两次意志解析刷取。 + +> [!TIP] +> +> 1. 仅在有剩余免费次数时会运行 +> 2. 运行时固定刷取两次 +> 3. 运行时固定刷取意志解析Ⅶ，未解锁时会报错 +> 4. “双重解析”活动期间，若想有双倍加成的作战，请在添加本任务后再次添加“常规作战”任务 + +## 自动深眠 + +深眠域开启后，尝试自动推图和领取奖励。 + +> [!TIP] +> +> 1. 编队选项中编队编号为作战前编队由上自下排序 +> 2. 上半编队、下半编队分别为深眠上下半作战的队伍 + +> [!WARNING] +> +> 1. 由于深眠的特点，请不要选择上下半为同一编队 +> 2. ~~深眠闪退请关闭GPU加速，详情请看[常见问题-运行自动深眠闪退](./常见问题.md#运行自动深眠闪退)~~ + +## 轶事派遣 + +每日刷取完体力后，尝试完成轶事派遣任务。 + +> [!TIP] +> +> 1. 请在当期角色故事阅读并领取奖励后使用本任务 +> 2. 轶事活动关闭后请关闭本任务 + +## 雨中悬想：迷思海 + +完成透光层50M后可运行，以完成 `寻思` 扫荡。 + +## 局外演绎：黄昏的音序 + +最有用的肉鸽刷取信用功能。 + +> [!TIP] +> +> 1. 队伍推荐带一个奶，具体可根据个人情况调整 +> 2. 使用前在箱子里置顶(标记)四个角色 +> 3. 使用前请保证最近一次战斗处于自动战斗状态，否则需要进入第一次战斗时手动点击进入自动战斗 +> 4. 账号首次进行肉鸽时，请先至少自己打一遍，M9A不对仅在初次玩肉鸽的剧情、引导等做额外处理 +> 5. 使用速刷功能前请先将 `刻画生长-指引之歌` 点满 + +> [!WARNING] +> +> 1. 勿挂资料片（M9A无法识别“问号”节点） +> 2. 如有可能，请不要使用天使娜娜，否则可能导致任务失败（未知原因~~，本人还在测试~~） + +> [!NOTE] +> 由于本功能实现较为复杂，容易出现奇怪的问题。如果有条件请开启模拟器的录屏，发现问题时尽量保留足够的证据（`debug`目录下`maa.log`、问题发生时间、录屏/截图），以便开发者快速定位问题并解决。[提交问题点击此处](https://github.com/MaaXYZ/M9A/issues/new/choose) + +### 置顶演示 + +![置顶演示](https://github.com/user-attachments/assets/ff9d66d8-9540-447a-9eac-315caec00fe9) + +### 置顶成功 + +![置顶成功](https://github.com/user-attachments/assets/d88fea79-df1b-4651-9d6d-386a40bf3b55)