merge: 主角增益只续时不叠层批落籍(台账 102,让号注记)
冲突解式:与伏击退役/格面资源八型批(3468066)双向共存—— - status_effects.tres:attack_up/ac_up refresh(本批)+ ambush 删行/alert 进(八型批) - 增益状态 v0.11(八型,原分支报 v0.8 旧基线编号顺延)/v0.12(本批续时) - registry:alert 行 + attack_up/ac_up refresh 两行并存 - active.md 台账 101(伏击/八型)+102(本批,让号) - 合并后冒烟 355 项 0 失败三闸全过
This commit is contained in:
commit
867e12da3b
13 files changed
+1148
-37
No files matched your search
Binary file not shown.
|
After Width: | Height: | Size: 677 KiB |
Reference in new issue
Block a user