1
0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-14 11:49:26 +08:00

fix: redirect _ship_detail_enter and _fleet_detail_enter to its real mode

This commit is contained in:
0O0o0oOoO00
2025-09-16 17:49:48 +08:00
parent 6e2173f074
commit 747ad051ed

View File

@@ -478,8 +478,8 @@ class GemsFarming(GemsFarming):
]
if inflection.underscore(self.config.Campaign_Name) in HARDMODEMAPS:
logger.info('Is in hard mode, switch ship changing method.')
self._ship_detail_enter = self._ship_detail_enter_hard
self._fleet_detail_enter = self._fleet_detail_enter_hard
self._ship_detail_enter_ex = self._ship_detail_enter_hard
self._fleet_detail_enter_ex = self._fleet_detail_enter_hard
self.page_fleet_check_button = FLEET_PREPARATION
if self.config.Fleet_FleetOrder == 'fleet1_all_fleet2_standby':
self.FLEET_ENTER_FLAGSHIP = my_FLEET_ENTER_FLAGSHIP_HARD_1
@@ -497,8 +497,8 @@ class GemsFarming(GemsFarming):
raise RequestHumanTakeover
self.hard_mode = True
else:
self._ship_detail_enter = self._ship_detail_enter
self._fleet_detail_enter = self._fleet_detail_enter
self._ship_detail_enter_ex = self._ship_detail_enter
self._fleet_detail_enter_ex = self._fleet_detail_enter
self.page_fleet_check_button = page_fleet.check_button
self.FLEET_ENTER_FLAGSHIP = old_FLEET_ENTER_FLAGSHIP
self._FLEET_ENTER_FLAGSHIP = self.FLEET_ENTER_FLAGSHIP
@@ -590,18 +590,18 @@ class GemsFarming(GemsFarming):
logger.attr('ChangeFlagship', self.config.GemsFarming_ChangeFlagship)
if self.change_flagship_equip:
logger.hr('Record flagship equipment', level=2)
self._ship_detail_enter(self.FLEET_ENTER_FLAGSHIP)
self._ship_detail_enter_ex(self.FLEET_ENTER_FLAGSHIP)
self.old_equip.record_equipment(index_list=index_list)
self.old_equip._equip_take_off_one()
self.ui_back(self.page_fleet_check_button)
logger.hr('Change flagship', level=2)
self._fleet_detail_enter()
self._fleet_detail_enter_ex()
success = self.flagship_change_execute()
if self.change_flagship_equip:
logger.hr('Equip flagship equipment', level=2)
self._ship_detail_enter(self.FLEET_ENTER_FLAGSHIP)
self._ship_detail_enter_ex(self.FLEET_ENTER_FLAGSHIP)
self.old_equip._equip_take_off_one()
OldEquipmentChange.equipment_take_on(self.old_equip, index_list=index_list)
@@ -621,18 +621,18 @@ class GemsFarming(GemsFarming):
logger.attr('ChangeVanguard', self.config.GemsFarming_ChangeVanguard)
if self.change_vanguard_equip:
logger.hr('Record vanguard equipment', level=2)
self._ship_detail_enter(self.FLEET_ENTER)
self._ship_detail_enter_ex(self.FLEET_ENTER)
self.old_equip.record_equipment()
self.old_equip._equip_take_off_one()
self.ui_back(self.page_fleet_check_button)
logger.hr('Change vanguard', level=2)
self._fleet_detail_enter()
self._fleet_detail_enter_ex()
success = self.vanguard_change_execute()
if self.change_vanguard_equip:
logger.hr('Equip vanguard equipment', level=2)
self._ship_detail_enter(self.FLEET_ENTER)
self._ship_detail_enter_ex(self.FLEET_ENTER)
self.old_equip._equip_take_off_one()
self.old_equip.equipment_take_on()