mower-ng/mower-ng
4
0
Fork 0
Code Issues 51 Pull requests 1 Wiki Activity

WIP: 公招重写 #103

Draft
EightyDollars wants to merge 11 commits from dev_recruit into main
pull from: dev_recruit
merge into: mower-ng:main
Conversation 1 Commits 11 Files changed 157 +2583 -1208
EightyDollars commented 2025-01-02 14:34:16 +08:00
First-time contributor
Copy link
No description provided.
EightyDollars added 1 commit 2025-01-02 14:34:18 +08:00
增加选中后标签的模板
Some checks failed
ci/woodpecker/push/check_format Pipeline failed
Details
9b330ce948
zhao changed title from 公招重写 to WIP: 公招重写 2025-01-02 17:25:53 +08:00
zhao commented 2025-01-02 17:27:43 +08:00
Owner
Copy link
  1. auto_get_res_newer.py现在用不了，联系虎先锋
  2. 看看 Issue #86，利用立绘识别干员
  3. 标签数据在运行时生成
1. `auto_get_res_newer.py`现在用不了，联系虎先锋 2. 看看 [Issue #86](https://git.zhaozuohong.vip/mower-ng/mower-ng/issues/86)，利用立绘识别干员 3. 标签数据在运行时生成
EightyDollars added 2 commits 2025-01-13 02:40:44 +08:00
EightyDollars added 1 commit 2025-01-13 02:42:39 +08:00 
This reverts commit 96875bfe9f, reversing
changes made to b25a3d8c0e.
EightyDollars added 1 commit 2025-01-13 02:45:10 +08:00
删掉原本的RecruitSolver
Some checks failed
ci/woodpecker/push/check_format Pipeline failed
Details
8f693eae4e
EightyDollars added 1 commit 2025-01-14 01:48:57 +08:00
添加稀有标签刷新，公招点到招募券的场景
Some checks failed
ci/woodpecker/push/check_format Pipeline failed
Details
7344cb462c
EightyDollars added 2 commits 2025-01-21 19:31:40 +08:00
添加点击开始招募
Some checks failed
ci/woodpecker/push/check_format Pipeline failed
Details
4fb31b67a8
EightyDollars added 2 commits 2025-01-30 00:50:53 +08:00
识别剩余时间
Some checks failed
ci/woodpecker/push/check_format Pipeline failed
Details
ef457bb23e
EightyDollars added 1 commit 2025-02-19 02:42:08 +08:00
获取公招结果
Some checks failed
ci/woodpecker/push/check_format Pipeline failed
Details
397cf6ed6a
Some checks failed
ci/woodpecker/push/check_format Pipeline failed
Details
This pull request has changes conflicting with the target branch.
  • ArknightsGameData
  • ArknightsGameResource
  • ArknightsResource
  • auto_get_res.py
  • mower/data/agent.json
  • mower/data/key_mapping.json
  • mower/data/scene.json
  • mower/resources/clue/give_away_digit_bg.png
  • mower/resources/navigation/activity/banner_normal.png
  • mower/resources/navigation/activity/entry_normal.png
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin dev_recruit:dev_recruit
git checkout dev_recruit

Merge

Merge the changes and update on Forgejo.
git checkout main
git merge --no-ff dev_recruit
git checkout dev_recruit
git rebase main
git checkout main
git merge --ff-only dev_recruit
git checkout dev_recruit
git rebase main
git checkout main
git merge --no-ff dev_recruit
git checkout main
git merge --squash dev_recruit
git checkout main
git merge --ff-only dev_recruit
git checkout main
git merge dev_recruit
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
Game
Operation
与刷理智相关的问题

  
Game
RIIC
与基建相关的问题

  
Game
Rogue
与集成战略相关的问题

  
Performance

与性能相关的问题

  
Platform
Linux
与Linux平台有关的问题

  
Platform
Win
与Windows平台有关的问题

  
Platform
macOS
与macOS平台有关的问题

  
Priority
High
优先级较高的问题，考虑近期解决

  
Priority
Low
优先级较低的问题，以调查和研究为主

  
Priority
Medium
优先级一般、解决后提升较大的问题

  
Topic
Framework
与框架相关的问题，如Solver的写法、目录结构

  
Topic
GUI
与界面相关的问题

  
Topic
Solver
与游戏内功能（Solver）相关的问题

  
Topic
Tool
与具体工具相关的内容，如多开器、Scrcpy

  
Upstream

与上游相关的问题

No labels
Game
Operation
Game
RIIC
Game
Rogue
Performance
Platform
Linux
Platform
Win
Platform
macOS
Priority
High
Priority
Low
Priority
Medium
Topic
Framework
Topic
GUI
Topic
Solver
Topic
Tool
Upstream
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
2 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: mower-ng/mower-ng#103
No description provided.
Delete branch "dev_recruit"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?