Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript

campaign/campaign_main/campaign_2_1.py

@@ -1,4 +1,4 @@
-from module.campaign.campaign_base import CampaignBase
+from .campaign_2_base import CampaignBase
 from module.logger import logger
 from module.map.map_base import CampaignMap
 from module.map.map_grids import RoadGrids, SelectedGrids

campaign/campaign_main/campaign_2_2.py

@@ -1,5 +1,5 @@
 from campaign.campaign_main.campaign_2_1 import Config
-from module.campaign.campaign_base import CampaignBase
+from .campaign_2_base import CampaignBase
 from module.logger import logger
 from module.map.map_base import CampaignMap
 from module.map.map_grids import RoadGrids, SelectedGrids

campaign/campaign_main/campaign_2_3.py

@@ -1,5 +1,5 @@
 from campaign.campaign_main.campaign_2_1 import Config
-from module.campaign.campaign_base import CampaignBase
+from .campaign_2_base import CampaignBase
 from module.logger import logger
 from module.map.map_base import CampaignMap
 from module.map.map_grids import RoadGrids, SelectedGrids

campaign/campaign_main/campaign_2_4.py

@@ -1,5 +1,5 @@
 from campaign.campaign_main.campaign_2_1 import Config as ConfigBase
-from module.campaign.campaign_base import CampaignBase
+from .campaign_2_base import CampaignBase
 from module.logger import logger
 from module.map.map_base import CampaignMap
 from module.map.map_grids import RoadGrids, SelectedGrids

campaign/campaign_main/campaign_2_base.py

@@ -0,0 +1,10 @@
+from module.campaign.campaign_base import CampaignBase as CampaignBase_
+from module.ui.page import page_campaign
+
+
+class CampaignBase(CampaignBase_):
+    def handle_exp_info(self):
+        # Random background of Main Chapter 2 hits EXP_INFO_B
+        if self.ui_page_appear(page_campaign):
+            return False
+        return super().handle_exp_info()

campaign/campaign_main/campaign_3_1.py

@@ -1,4 +1,4 @@
-from module.campaign.campaign_base import CampaignBase
+from .campaign_3_base import CampaignBase
 from module.logger import logger
 from module.map.map_base import CampaignMap
 from module.map.map_grids import RoadGrids, SelectedGrids

campaign/campaign_main/campaign_3_2.py

@@ -1,5 +1,5 @@
 from campaign.campaign_main.campaign_3_1 import Config
-from module.campaign.campaign_base import CampaignBase
+from .campaign_3_base import CampaignBase
 from module.logger import logger
 from module.map.map_base import CampaignMap
 from module.map.map_grids import RoadGrids, SelectedGrids

campaign/campaign_main/campaign_3_3.py

@@ -1,5 +1,5 @@
 from campaign.campaign_main.campaign_3_1 import Config as ConfigBase
-from module.campaign.campaign_base import CampaignBase
+from .campaign_3_base import CampaignBase
 from module.logger import logger
 from module.map.map_base import CampaignMap
 from module.map.map_grids import RoadGrids, SelectedGrids

campaign/campaign_main/campaign_3_4.py

@@ -1,5 +1,5 @@
 from campaign.campaign_main.campaign_3_1 import Config as Config31
-from module.campaign.campaign_base import CampaignBase
+from .campaign_3_base import CampaignBase
 from module.logger import logger
 from module.map.map_base import CampaignMap
 from module.map.map_grids import RoadGrids, SelectedGrids

campaign/campaign_main/campaign_3_base.py

@@ -0,0 +1,11 @@
+from module.campaign.campaign_base import CampaignBase as CampaignBase_
+from module.logger import logger
+from module.ui.page import page_campaign
+
+
+class CampaignBase(CampaignBase_):
+    def handle_exp_info(self):
+        # Random background of Main Chapter 3 hits EXP_INFO_B
+        if self.ui_page_appear(page_campaign):
+            return False
+        return super().handle_exp_info()

module/os_shop/port_shop.py

@@ -151,7 +151,7 @@ class PortShop(OSStatus, OSShopUI, Selector, MapEventHandler):
                     logger.info('OS shop reach bottom, stop')
                     break
                 else:
-                    OS_SHOP_SCROLL.next_page(main=self, page=0.5)
+                    OS_SHOP_SCROLL.next_page(main=self, page=0.5, skip_first_screenshot=False)
                     cur_pos = OS_SHOP_SCROLL.cal_position(main=self)
                     continue
             self.device.click_record.clear()

module/os_shop/ui.py

@@ -13,7 +13,8 @@ from module.ui.ui import UI
 OS_SHOP_SCROLL = AdaptiveScroll(
     OS_SHOP_SCROLL_AREA.button,
     parameters={
-        'height': 255 - 99
+        'height': 255 - 99,
+        'prominence': 40,
     },
     name="OS_SHOP_SCROLL"
 )
@@ -149,7 +150,7 @@ class OSShopUI(UI):
             retry.start()
             while True:
                 logger.warning('Scroll does not drag success, retrying scroll')
-                OS_SHOP_SCROLL.next_page(main=self, page=0.5)
+                OS_SHOP_SCROLL.next_page(main=self, page=0.5, skip_first_screenshot=False)
                 cur_pos = OS_SHOP_SCROLL.cal_position(main=self)
                 if pre_pos != cur_pos:
                     logger.info(f'Scroll success drag page to {cur_pos}')