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

Fix: Clicked GET_SHIP when exiting page_meowfficer (#1273)

Browse Source 
- Rename MEOWFFICER_GOTO_DORM to MEOWFFICER_GOTO_DORMMENU for clarity
This commit is contained in:
LmeSzinc
2022-07-02 16:06:24 +08:00
parent da78c647ae
commit 1f1141a1f5
9 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
module/meowfficer/buy.py
View File

@@ -5,7 +5,7 @@ from module.logger import logger
from module.meowfficer.assets import *
from module.meowfficer.base import MeowfficerBase
from module.ocr.ocr import Digit, DigitCounter
from module.ui.assets import MEOWFFICER_GOTO_DORM
from module.ui.assets import MEOWFFICER_GOTO_DORMMENU
BUY_MAX = 15
BUY_PRIZE = 1500
@@ -79,7 +79,7 @@ class MeowfficerBuy(MeowfficerBase):
if self.appear(MEOWFFICER_BUY, offset=(20, 20), interval=3):
if executed:
self.device.click(MEOWFFICER_GOTO_DORM)
self.device.click(MEOWFFICER_GOTO_DORMMENU)
else:
self.device.click(MEOWFFICER_BUY)
continue

6
module/meowfficer/enhance.py
View File

@@ -5,7 +5,7 @@ from module.meowfficer.assets import *
from module.meowfficer.base import MeowfficerBase
from module.meowfficer.buy import MEOWFFICER_COINS
from module.ocr.ocr import DigitCounter
from module.ui.assets import MEOWFFICER_GOTO_DORM
from module.ui.assets import MEOWFFICER_GOTO_DORMMENU
from module.ui.page import page_meowfficer
MEOWFFICER_SELECT_GRID = ButtonGrid(
@@ -304,7 +304,7 @@ class MeowfficerEnhance(MeowfficerBase):
logger.hr('Enhance once', level=2)
if not self.meow_feed_enter():
# Exit back into page_meowfficer
self.ui_click(MEOWFFICER_GOTO_DORM, check_button=MEOWFFICER_ENHANCE_ENTER,
self.ui_click(MEOWFFICER_GOTO_DORMMENU, check_button=MEOWFFICER_ENHANCE_ENTER,
appear_button=MEOWFFICER_ENHANCE_CONFIRM, offset=None, skip_first_screenshot=True)
# Re-enter page_meowfficer
self.ui_goto_main()
@@ -321,7 +321,7 @@ class MeowfficerEnhance(MeowfficerBase):
break
# Exit back into page_meowfficer
self.ui_click(MEOWFFICER_GOTO_DORM, check_button=MEOWFFICER_ENHANCE_ENTER,
self.ui_click(MEOWFFICER_GOTO_DORMMENU, check_button=MEOWFFICER_ENHANCE_ENTER,
appear_button=MEOWFFICER_ENHANCE_CONFIRM, offset=None, skip_first_screenshot=True)
return True