Skip to content

Commit 9d7d047

Browse files
ZuosizhuLmeSzinc
andauthored
Fix: Change Fleet_2's ships instead of fixed Fleet_1 when using 'fleet1_standby_fleet2_all' in GemsFarming (#3387)
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
1 parent 108e0d7 commit 9d7d047

1 file changed

Lines changed: 7 additions & 2 deletions

File tree

module/campaign/gems_farming.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,15 @@ def change_vanguard_equip(self):
9292

9393
def _fleet_detail_enter(self):
9494
"""
95-
Enter GEMS_FLEET_1 page
95+
Enter GEMS_FLEET page
9696
"""
9797
self.ui_ensure(page_fleet)
98-
self.ui_ensure_index(self.config.Fleet_Fleet1, letter=OCR_FLEET_INDEX,
98+
_fleet_to_change = self.config.Fleet_Fleet1
99+
if self.config.Fleet_FleetOrder == 'fleet1_all_fleet2_standby':
100+
_fleet_to_change = self.config.Fleet_Fleet1
101+
elif self.config.Fleet_FleetOrder == 'fleet1_standby_fleet2_all':
102+
_fleet_to_change = self.config.Fleet_Fleet2
103+
self.ui_ensure_index(_fleet_to_change, letter=OCR_FLEET_INDEX,
99104
next_button=FLEET_NEXT, prev_button=FLEET_PREV, skip_first_screenshot=True)
100105

101106
def _ship_detail_enter(self, button):

0 commit comments

Comments
 (0)