From 747ad051ed9b1db8d9a809850b690a0040fbbefd Mon Sep 17 00:00:00 2001 From: 0O0o0oOoO00 <11174151+0O0o0oOoO00@users.noreply.github.com> Date: Tue, 16 Sep 2025 17:49:48 +0800 Subject: [PATCH] fix: redirect _ship_detail_enter and _fleet_detail_enter to its real mode --- module/campaign/gems_farming.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/module/campaign/gems_farming.py b/module/campaign/gems_farming.py index ef5b6a626..72cd2bf67 100644 --- a/module/campaign/gems_farming.py +++ b/module/campaign/gems_farming.py @@ -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()