Merge pull request LmeSzinc#3382 from LmeSzinc/dev

Bug fix
MengNianxiaoyao · Dec 26, 2023 · a37a0cb · a37a0cb
2 parents 5c822e2 + 49b40ff
commit a37a0cb
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/campaign/event_20231221_cn/a3.py b/campaign/event_20231221_cn/a3.py
@@ -61,6 +61,8 @@ class Config(ConfigBase):
     MAP_SWIPE_MULTIPLY = (1.112, 1.132)
     MAP_SWIPE_MULTIPLY_MINITOUCH = (1.075, 1.095)
     MAP_SWIPE_MULTIPLY_MAATOUCH = (1.044, 1.062)
+    MAP_WALK_USE_CURRENT_FLEET = True
+    MAP_ENSURE_EDGE_INSIGHT_CORNER = 'bottom-right'
 
 
 class Campaign(CampaignBase):

diff --git a/campaign/event_20231221_cn/c3.py b/campaign/event_20231221_cn/c3.py
@@ -62,6 +62,8 @@ class Config(ConfigBase):
     MAP_SWIPE_MULTIPLY = (1.112, 1.132)
     MAP_SWIPE_MULTIPLY_MINITOUCH = (1.075, 1.095)
     MAP_SWIPE_MULTIPLY_MAATOUCH = (1.044, 1.062)
+    MAP_WALK_USE_CURRENT_FLEET = True
+    MAP_ENSURE_EDGE_INSIGHT_CORNER = 'bottom-right'
 
 
 class Campaign(CampaignBase):

diff --git a/module/dorm/buy_furniture.py b/module/dorm/buy_furniture.py
@@ -1,5 +1,6 @@
 from datetime import datetime, timedelta
 
+from module.combat.assets import GET_SHIP
 from module.dorm.assets import *
 from module.logger import logger
 from module.ocr.ocr import Digit
@@ -39,6 +40,7 @@ def enter_first_furniture_details_page(self, skip_first_screenshot=False):
             # Enter furniture shop page from page_dorm, only need to enter once
             if self.appear(DORM_CHECK, offset=(20, 20), interval=3):
                 self.device.click(DORM_FURNITURE_SHOP_ENTER)
+                self.interval_reset(GET_SHIP)
                 continue
 
             if self.appear(DORM_FURNITURE_SHOP_FIRST_SELECTED, offset=(20, 20)):
@@ -179,7 +181,8 @@ def _buy_furniture_run(self):
                   False if Failed buy
         """
         self.enter_first_furniture_details_page()
-        if self.appear(DORM_FURNITURE_COUNTDOWN, offset=(20, 20)):
+        if self.appear(DORM_FURNITURE_COUNTDOWN, offset=(20, 20)) \
+                and DORM_FURNITURE_COUNTDOWN.match_appear_on(self.device.image):
             logger.info("There is a time-limited furniture available for buy")
 
             if self.buy_furniture_once(self.config.BuyFurniture_BuyOption):

diff --git a/module/ui/ui.py b/module/ui/ui.py
@@ -19,9 +19,10 @@
 from module.ocr.ocr import Ocr
 from module.os_handler.assets import (AUTO_SEARCH_REWARD, EXCHANGE_CHECK, RESET_FLEET_PREPARATION, RESET_TICKET_POPUP)
 from module.raid.assets import RAID_FLEET_PREPARATION
-from module.ui.assets import (BACK_ARROW, DORM_FEED_CANCEL, DORM_INFO, DORM_TROPHY_CONFIRM, EVENT_LIST_CHECK, GOTO_MAIN,
-                              MAIN_GOTO_CAMPAIGN, MEOWFFICER_GOTO_DORMMENU, MEOWFFICER_INFO, META_CHECK, PLAYER_CHECK,
-                              RAID_CHECK, SHIPYARD_CHECK, SHOP_GOTO_SUPPLY_PACK)
+from module.ui.assets import (BACK_ARROW, DORMMENU_GOTO_DORM, DORM_FEED_CANCEL, DORM_INFO, DORM_TROPHY_CONFIRM,
+                              EVENT_LIST_CHECK, GOTO_MAIN, MAIN_GOTO_CAMPAIGN, MEOWFFICER_GOTO_DORMMENU,
+                              MEOWFFICER_INFO, META_CHECK, PLAYER_CHECK, RAID_CHECK, SHIPYARD_CHECK,
+                              SHOP_GOTO_SUPPLY_PACK)
 from module.ui.page import (Page, page_campaign, page_event, page_main, page_sp)
 
 
@@ -513,3 +514,5 @@ def ui_button_interval_reset(self, button):
             self.interval_reset(RAID_CHECK)
         if button == SHOP_GOTO_SUPPLY_PACK:
             self.interval_reset(EXCHANGE_CHECK)
+        if button == DORMMENU_GOTO_DORM:
+            self.interval_reset(GET_SHIP)