sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-12 00:28:20 +08:00
Code Activity

Merge branch 'bug_fix' into dev

Browse Source
This commit is contained in:
LmeSzinc
2022-09-12 13:18:04 +08:00
parent bdf8653ee8 4e0c3a3bf5
commit 654a5d5aac
3 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
module/commission/commission.py
View File

@@ -185,11 +185,16 @@ class RewardCommission(UI, InfoHandler):
# If daily list has commissions > 4, usually to be 5, and 1 <= urgent <= 4
# commission list will have an animation to scroll,
# which causes the topmost one undetected.
if not COMMISSION_SCROLL.appear(main=self) or COMMISSION_SCROLL.cal_position(main=self) < 0.05:
if not COMMISSION_SCROLL.appear(main=self) or COMMISSION_SCROLL.cal_position(main=self) < 0.05 or COMMISSION_SCROLL.length / COMMISSION_SCROLL.total > 0.98:
pre_peaks = lines_detect(self.device.image)
if not len(pre_peaks):
return True
self.device.screenshot()
while 1:
peaks = lines_detect(self.device.image)
if not len(peaks) or peaks[0] > 67 + 117:
if (not len(peaks) or peaks[0] > 67 + 117) and (not len(pre_peaks) or abs(peaks[0] - pre_peaks[0]) < 3):
break
pre_peaks = peaks
self.device.screenshot()
return True