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

Fix: fix daily locked due low commander level

Browse Source 
- Commanders below level 60 do not have access to all dailys, this causes ALAS to stuck, this problem has been fixed, if the commander does not have access to the dailys, ALAS will ignore and try the next daily.
- Changed index_1, index_2, index_3 for easier to understand terms, the old terms were kept so as not to cause a problem at startup.
This commit is contained in:
whoamikyo
2020-07-19 19:19:46 -03:00
parent 21d280f67f
commit e16c9c8c7d
7 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
module/daily/assets.py
View File

@@ -9,6 +9,7 @@ DAILY_ENTER = Button(area={'cn': (534, 118, 744, 645), 'en': (534, 118, 744, 645
DAILY_ENTER_CHECK = Button(area={'cn': (1222, 141, 1229, 150), 'en': (1221, 136, 1230, 143), 'jp': (1222, 139, 1225, 307)}, color={'cn': (247, 209, 66), 'en': (247, 214, 82), 'jp': (244, 208, 66)}, button={'cn': (1222, 141, 1229, 150), 'en': (1221, 136, 1230, 143), 'jp': (1222, 139, 1225, 307)}, file={'cn': './assets/cn/daily/DAILY_ENTER_CHECK.png', 'en': './assets/en/daily/DAILY_ENTER_CHECK.png', 'jp': './assets/jp/daily/DAILY_ENTER_CHECK.png'})
DAILY_FLEET_NEXT = Button(area={'cn': (914, 325, 931, 354), 'en': (914, 325, 931, 354), 'jp': (914, 325, 931, 354)}, color={'cn': (86, 115, 149), 'en': (86, 115, 149), 'jp': (86, 115, 149)}, button={'cn': (914, 325, 931, 354), 'en': (914, 325, 931, 354), 'jp': (914, 325, 931, 354)}, file={'cn': './assets/cn/daily/DAILY_FLEET_NEXT.png', 'en': './assets/en/daily/DAILY_FLEET_NEXT.png', 'jp': './assets/jp/daily/DAILY_FLEET_NEXT.png'})
DAILY_FLEET_PREV = Button(area={'cn': (36, 325, 53, 354), 'en': (36, 325, 53, 354), 'jp': (36, 325, 53, 354)}, color={'cn': (103, 130, 163), 'en': (103, 130, 163), 'jp': (103, 130, 163)}, button={'cn': (36, 325, 53, 354), 'en': (36, 325, 53, 354), 'jp': (36, 325, 53, 354)}, file={'cn': './assets/cn/daily/DAILY_FLEET_PREV.png', 'en': './assets/en/daily/DAILY_FLEET_PREV.png', 'jp': './assets/jp/daily/DAILY_FLEET_PREV.png'})
DAILY_LOCKED = Button(area={'cn': (684, 182, 718, 228), 'en': (684, 182, 718, 228), 'jp': (684, 182, 718, 228)}, color={'cn': (68, 76, 85), 'en': (68, 76, 85), 'jp': (68, 76, 85)}, button={'cn': (684, 182, 718, 228), 'en': (684, 182, 718, 228), 'jp': (684, 182, 718, 228)}, file={'cn': './assets/cn/daily/DAILY_LOCKED.png', 'en': './assets/en/daily/DAILY_LOCKED.png', 'jp': './assets/cn/daily/DAILY_LOCKED.png'})
DAILY_MISSION_1 = Button(area={'cn': (482, 140, 701, 255), 'en': (584, 203, 701, 214), 'jp': (595, 141, 719, 266)}, color={'cn': (58, 80, 123), 'en': (62, 83, 124), 'jp': (53, 78, 122)}, button={'cn': (482, 140, 701, 255), 'en': (584, 203, 701, 214), 'jp': (595, 141, 719, 266)}, file={'cn': './assets/cn/daily/DAILY_MISSION_1.png', 'en': './assets/en/daily/DAILY_MISSION_1.png', 'jp': './assets/jp/daily/DAILY_MISSION_1.png'})
DAILY_MISSION_2 = Button(area={'cn': (482, 300, 701, 415), 'en': (584, 363, 701, 374), 'jp': (482, 300, 701, 415)}, color={'cn': (61, 84, 128), 'en': (65, 88, 128), 'jp': (61, 84, 128)}, button={'cn': (482, 300, 701, 415), 'en': (584, 363, 701, 374), 'jp': (482, 300, 701, 415)}, file={'cn': './assets/cn/daily/DAILY_MISSION_2.png', 'en': './assets/en/daily/DAILY_MISSION_2.png', 'jp': './assets/jp/daily/DAILY_MISSION_2.png'})
DAILY_MISSION_3 = Button(area={'cn': (482, 460, 701, 575), 'en': (583, 522, 701, 534), 'jp': (482, 460, 701, 575)}, color={'cn': (75, 106, 146), 'en': (73, 101, 139), 'jp': (75, 106, 146)}, button={'cn': (482, 460, 701, 575), 'en': (583, 522, 701, 534), 'jp': (482, 460, 701, 575)}, file={'cn': './assets/cn/daily/DAILY_MISSION_3.png', 'en': './assets/en/daily/DAILY_MISSION_3.png', 'jp': './assets/jp/daily/DAILY_MISSION_3.png'})

4
module/daily/daily.py
View File

@@ -59,7 +59,11 @@ class Daily(Combat, DailyEquipment):
return self.appear(DAILY_ENTER_CHECK) or self.appear(BACK_ARROW)
self.ui_click(click_button=DAILY_ENTER, check_button=daily_enter_check, appear_button=DAILY_CHECK)
if self.appear(DAILY_LOCKED):
self.ui_click(click_button=BACK_ARROW, check_button=DAILY_CHECK)
self.next()
self.ui_click(click_button=DAILY_ENTER, check_button=daily_enter_check, appear_button=DAILY_CHECK)
button = DAILY_MISSION_LIST[self.config.DAILY_CHOOSE[self.daily_current] - 1]
for n in range(remain):
logger.hr(f'Count {n + 1}')