Skip to content

Merge branch 'master' into dev #1690

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.

Sign up for GitHub

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

Merged
runhey merged 5 commits into from
Jul 22, 2026
Merged

Merge branch 'master' into dev #1690

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e145299
Merge pull request #1672 from runhey/dev
runhey Jul 12, 2026
7c9053b
Merge pull request #1673 from weirj2016-ai/fix/bondling-invite-six-ga…
runhey Jul 12, 2026
9383eb6
Merge branch 'dev'
runhey Jul 20, 2026
a615817
fix: 处理契灵求援后的式盘上限确认
weirj2016-ai Jul 21, 2026
b7497a3
Merge pull request #1686 from weirj2016-ai/fix/bondling-shipan-confirm
runhey Jul 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions tasks/BondlingFairyland/script_task.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,14 +101,15 @@ def create_bond_team():
self.screenshot()
if self.appear(self.I_GI_IN_ROOM):
return True
# 求援后可能出现式盘数量上限确认弹窗
if self.appear_then_click(self.I_UI_CONFIRM, interval=1):
sleep(1)
continue
if click_count >= 6:
logger.error('Click fire failed')
logger.error(
'You might need to check your bondling number. It most possibly arrived to the max 500')
raise BondlingNumberMax
# 某些活动的时候出现 “选择共鸣的阴阳师”
if self.appear_then_click(self.I_UI_CONFIRM, interval=1):
continue
if self.check_and_invite(True):
continue
if self.appear(self.I_CREATE_TEAM, interval=1):
Expand Down
Loading