WindyMadman/AzurLaneAutoScript
1
0
Fork 0
mirror of https://github.com/LmeSzinc/AzurLaneAutoScript.git synced 2025-01-09 05:47:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix: [EN] meow_confirm increase horizontal offset

Browse Source 
Upd: [EN] offset for MEOWFFICER_STATUS, MEOWFFICER_TRAIN_CLICK_SAFE_AREA position move
This commit is contained in:
nEEtdo0d 2021-09-03 23:17:56 -04:00
parent d20f4a3ccd
commit 94209df83f
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/en/reward/MEOWFFICER_TRAIN_CLICK_SAFE_AREA.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

2
module/reward/assets.py
View File

@ -32,7 +32,7 @@ MEOWFFICER_FORT_GET_XP_1 = Button(area={'cn': (371, 198, 453, 278), 'en': (371,
MEOWFFICER_FORT_GET_XP_2 = Button(area={'cn': (320, 314, 422, 412), 'en': (320, 314, 422, 412), 'jp': (302, 318, 414, 393), 'tw': (320, 314, 422, 412)}, color={'cn': (221, 189, 148), 'en': (221, 189, 148), 'jp': (227, 192, 151), 'tw': (221, 189, 148)}, button={'cn': (320, 314, 422, 412), 'en': (320, 314, 422, 412), 'jp': (302, 318, 414, 393), 'tw': (320, 314, 422, 412)}, file={'cn': './assets/cn/reward/MEOWFFICER_FORT_GET_XP_2.png', 'en': './assets/en/reward/MEOWFFICER_FORT_GET_XP_2.png', 'jp': './assets/jp/reward/MEOWFFICER_FORT_GET_XP_2.png', 'tw': './assets/tw/reward/MEOWFFICER_FORT_GET_XP_2.png'})
MEOWFFICER_FORT_RED_DOT = Button(area={'cn': (938, 655, 958, 676), 'en': (938, 655, 958, 676), 'jp': (938, 654, 957, 676), 'tw': (938, 655, 958, 676)}, color={'cn': (244, 131, 117), 'en': (244, 131, 117), 'jp': (244, 132, 118), 'tw': (244, 131, 117)}, button={'cn': (938, 655, 958, 676), 'en': (938, 655, 958, 676), 'jp': (938, 654, 957, 676), 'tw': (938, 655, 958, 676)}, file={'cn': './assets/cn/reward/MEOWFFICER_FORT_RED_DOT.png', 'en': './assets/en/reward/MEOWFFICER_FORT_RED_DOT.png', 'jp': './assets/jp/reward/MEOWFFICER_FORT_RED_DOT.png', 'tw': './assets/tw/reward/MEOWFFICER_FORT_RED_DOT.png'})
MEOWFFICER_STATUS = Button(area={'cn': (987, 44, 1035, 104), 'en': (987, 44, 1035, 104), 'jp': (987, 44, 1035, 104), 'tw': (987, 44, 1035, 104)}, color={'cn': (252, 244, 232), 'en': (252, 244, 232), 'jp': (252, 244, 232), 'tw': (252, 244, 232)}, button={'cn': (987, 44, 1035, 104), 'en': (987, 44, 1035, 104), 'jp': (987, 44, 1035, 104), 'tw': (987, 44, 1035, 104)}, file={'cn': './assets/cn/reward/MEOWFFICER_STATUS.png', 'en': './assets/en/reward/MEOWFFICER_STATUS.png', 'jp': './assets/jp/reward/MEOWFFICER_STATUS.png', 'tw': './assets/tw/reward/MEOWFFICER_STATUS.png'})
MEOWFFICER_TRAIN_CLICK_SAFE_AREA = Button(area={'cn': (224, 184, 242, 347), 'en': (224, 184, 242, 347), 'jp': (224, 184, 242, 347), 'tw': (224, 184, 242, 347)}, color={'cn': (242, 237, 237), 'en': (242, 237, 237), 'jp': (242, 237, 237), 'tw': (242, 237, 237)}, button={'cn': (224, 184, 242, 347), 'en': (224, 184, 242, 347), 'jp': (224, 184, 242, 347), 'tw': (224, 184, 242, 347)}, file={'cn': './assets/cn/reward/MEOWFFICER_TRAIN_CLICK_SAFE_AREA.png', 'en': './assets/en/reward/MEOWFFICER_TRAIN_CLICK_SAFE_AREA.png', 'jp': './assets/jp/reward/MEOWFFICER_TRAIN_CLICK_SAFE_AREA.png', 'tw': './assets/tw/reward/MEOWFFICER_TRAIN_CLICK_SAFE_AREA.png'})
MEOWFFICER_TRAIN_CLICK_SAFE_AREA = Button(area={'cn': (224, 184, 242, 347), 'en': (234, 191, 244, 523), 'jp': (224, 184, 242, 347), 'tw': (224, 184, 242, 347)}, color={'cn': (242, 237, 237), 'en': (243, 239, 238), 'jp': (242, 237, 237), 'tw': (242, 237, 237)}, button={'cn': (224, 184, 242, 347), 'en': (234, 191, 244, 523), 'jp': (224, 184, 242, 347), 'tw': (224, 184, 242, 347)}, file={'cn': './assets/cn/reward/MEOWFFICER_TRAIN_CLICK_SAFE_AREA.png', 'en': './assets/en/reward/MEOWFFICER_TRAIN_CLICK_SAFE_AREA.png', 'jp': './assets/jp/reward/MEOWFFICER_TRAIN_CLICK_SAFE_AREA.png', 'tw': './assets/tw/reward/MEOWFFICER_TRAIN_CLICK_SAFE_AREA.png'})
MEOWFFICER_TRAIN_COMPLETE = Button(area={'cn': (255, 188, 353, 215), 'en': (253, 187, 357, 216), 'jp': (247, 186, 348, 216), 'tw': (261, 196, 365, 222)}, color={'cn': (134, 216, 154), 'en': (179, 215, 163), 'jp': (151, 213, 154), 'tw': (132, 213, 149)}, button={'cn': (255, 188, 353, 215), 'en': (253, 187, 357, 216), 'jp': (247, 186, 348, 216), 'tw': (261, 196, 365, 222)}, file={'cn': './assets/cn/reward/MEOWFFICER_TRAIN_COMPLETE.png', 'en': './assets/en/reward/MEOWFFICER_TRAIN_COMPLETE.png', 'jp': './assets/jp/reward/MEOWFFICER_TRAIN_COMPLETE.png', 'tw': './assets/tw/reward/MEOWFFICER_TRAIN_COMPLETE.png'})
MEOWFFICER_TRAIN_ENTER = Button(area={'cn': (1142, 581, 1258, 651), 'en': (1178, 616, 1266, 648), 'jp': (1140, 579, 1262, 644), 'tw': (1148, 601, 1246, 653)}, color={'cn': (193, 167, 113), 'en': (212, 175, 96), 'jp': (196, 171, 119), 'tw': (199, 166, 99)}, button={'cn': (1142, 581, 1258, 651), 'en': (1178, 616, 1266, 648), 'jp': (1140, 579, 1262, 644), 'tw': (1148, 601, 1246, 653)}, file={'cn': './assets/cn/reward/MEOWFFICER_TRAIN_ENTER.png', 'en': './assets/en/reward/MEOWFFICER_TRAIN_ENTER.png', 'jp': './assets/jp/reward/MEOWFFICER_TRAIN_ENTER.png', 'tw': './assets/tw/reward/MEOWFFICER_TRAIN_ENTER.png'})
MEOWFFICER_TRAIN_FILL_QUEUE = Button(area={'cn': (780, 548, 859, 567), 'en': (772, 544, 866, 568), 'jp': (779, 547, 859, 569), 'tw': (778, 545, 863, 571)}, color={'cn': (205, 179, 89), 'en': (222, 198, 100), 'jp': (204, 176, 82), 'tw': (213, 187, 95)}, button={'cn': (780, 548, 859, 567), 'en': (772, 544, 866, 568), 'jp': (779, 547, 859, 569), 'tw': (778, 545, 863, 571)}, file={'cn': './assets/cn/reward/MEOWFFICER_TRAIN_FILL_QUEUE.png', 'en': './assets/en/reward/MEOWFFICER_TRAIN_FILL_QUEUE.png', 'jp': './assets/jp/reward/MEOWFFICER_TRAIN_FILL_QUEUE.png', 'tw': './assets/tw/reward/MEOWFFICER_TRAIN_FILL_QUEUE.png'})

4
module/reward/meowfficer.py
View File

@ -53,7 +53,7 @@ class RewardMeowfficer(UI):
return True
def handle_meow_popup_confirm(self):
if self.appear_then_click(MEOWFFICER_CONFIRM, offset=(20, 20), interval=5):
if self.appear_then_click(MEOWFFICER_CONFIRM, offset=(40, 20), interval=5):
return True
else:
return False
@ -116,7 +116,7 @@ class RewardMeowfficer(UI):
else:
self.device.screenshot()
if self.appear(MEOWFFICER_STATUS, interval=1):
if self.appear(MEOWFFICER_STATUS, offset=(20, 20), interval=1):
self.device.multi_click(MEOWFFICER_TRAIN_CLICK_SAFE_AREA, 2)
confirm_timer.reset()
continue