Repository navigation
fix(avd): ModAVD 包自带 MAA 截图外壳时不再覆盖 - #1979
Merged
qiyinxi merged 1 commit intoNov 13, 2026
Merged
Conversation
ModAVD 0.40.1 起整包带 mumu-shim\shell\sdk\external_renderer_ipc.dll 并列在 modavd-manifest.json 里。换成本体的那份会和清单对不上,ModAVD 用 Mirror 酱增量更新时核对失败。清单列了外壳就用包里的;更早的包照旧放本体的那份。
Contributor
总体结论:修改后合并宝宝,保留 ModAVD 包内的截图组件是对的,清单路径也与上游实际打包格式一致喵。不过新增的清单读取还差一处规范要求,别把“读坏了”当成“旧包没有”。 [规范 · P3] 清单损坏时不要继续覆盖组件 avd.py:90–99 把读取失败、非法 JSON、非映射根节点都返回为 在这个读取入口区分两种情况就够啦:清单不存在或有效清单未列该 DLL,沿用旧包逻辑;清单存在但读不了、结构损坏,则保留现有 DLL 并报出带路径的错误。对应测试也改成断言“报错且 DLL 未改变”,不要把静默覆盖固定成预期。 dot酱未执行测试或真实模拟器加载。 —— 不让坏清单冒充旧包的 dot酱敬上 🐾 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
改了什么
ModAVD 0.40.1 起,整包自带 MAA 截图外壳
mumu-shim\shell\sdk\external_renderer_ipc.dll,列在根目录的modavd-manifest.json里。ensure_mumu_shim以前每次运行都会把它换成本体res/avdshim里的那份,两份内容不同,ModAVD 用 Mirror 酱增量更新时,这个文件和新清单对不上,核对失败,只能改走 GitHub 下整包。现在:
包里的外壳是 ModAVDExtras v0.1.3,比本体
res/avdshim里的新,实例编号也可以直接填 ModAVD 的编号。测试
tests/task/test_maa_avd_shim.py,覆盖上面几种情况,还有带 BOM 的清单和读不了的清单。和tests/tools/test_avd_cli.py一起跑,48 项全过。ruff check、ruff format --check通过。