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()