sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-24 04:25:56 +08:00
Code Activity

Fix: Handle random ocr error from OCR_DORM_FILL

Browse Source
This commit is contained in:
LmeSzinc
2023-08-24 12:38:43 +08:00
parent ba03a9c870
commit 1194bbb441
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
module/dorm/dorm.py
View File

@@ -246,7 +246,9 @@ class RewardDorm(UI):
amount = self._dorm_food_ocr.ocr(self.device.image) amount = self._dorm_food_ocr.ocr(self.device.image)
amount = [a if hf else 0 for a, hf in zip(amount, has_food)] amount = [a if hf else 0 for a, hf in zip(amount, has_food)]
food = [Food(feed=f, amount=a) for f, a in zip(FOOD_FEED_AMOUNT, amount)] food = [Food(feed=f, amount=a) for f, a in zip(FOOD_FEED_AMOUNT, amount)]
_, fill, _ = OCR_FILL.ocr(self.device.image) _, fill, total = OCR_FILL.ocr(self.device.image)
if total == 0:
fill = -1
logger.info(f'Dorm food: {[f.amount for f in food]}, to fill: {fill}') logger.info(f'Dorm food: {[f.amount for f in food]}, to fill: {fill}')
return food, fill return food, fill
@@ -278,8 +280,12 @@ class RewardDorm(UI):
# Get # Get
food, fill = self.dorm_food_get() food, fill = self.dorm_food_get()
if fill == -1:
continue
if sum([f.amount for f in food]) > 0: if sum([f.amount for f in food]) > 0:
break break
if fill < 0:
fill = 0
FOOD_FILTER.load(self.config.Dorm_FeedFilter) FOOD_FILTER.load(self.config.Dorm_FeedFilter)
for selected in FOOD_FILTER.apply(food): for selected in FOOD_FILTER.apply(food):