Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: 运行 ReclamationAlgorithm 时默认运行 Reclamation2 而不是旧演算 #8229

Merged
merged 5 commits into from
Feb 8, 2024

Conversation

horror-proton
Copy link
Contributor

也许应该增加一个选项来选择原来的 沙中之火 主题? 🤔

@ABA2396 能帮忙改下 WPF 那边吗

@horror-proton horror-proton changed the title feat: 运行 ReclamationTask 时默认运行 Reclamation2 而不是旧演算 feat: 运行 ReclamationAlgorithm 时默认运行 Reclamation2 而不是旧演算 Feb 4, 2024
@ABA2396
Copy link
Member

ABA2396 commented Feb 8, 2024

先这样,等之后看看新主题会咋样再说)

@ABA2396 ABA2396 merged commit 7ef36af into dev Feb 8, 2024
19 checks passed
@ABA2396 ABA2396 deleted the feat/reclamation_2_portal branch February 8, 2024 03:26
Rbqwow pushed a commit to Rbqwow/MaaAssistantArknights that referenced this pull request Feb 11, 2024
…tantArknights#8229)

* feat: run `Reclamation2` from `ReclamationTask`

* feat: add param to choose Reclamation theme

* chore: c# 生息演算2入口改为ReclamationAlgorithm

* chore: UI生息演算添加"theme"参数

* chore: 漏掉的参数

---------

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants