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

module/raid/raid.py

@@ -194,11 +194,14 @@ class Raid(MapOperation, RaidCombat, CampaignEvent):
             fleet_index (int):
         """
         logger.info('Combat preparation.')
+<<<<<<< HEAD
 
         # Power limit check
         from module.gg_handler.gg_handler import GGHandler
         GGHandler(config=self.config, device=self.device).power_limit('Raid')
 
+=======
+>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
         skip_first_screenshot = True
 
         # No need, already waited in `raid_execute_once()`
@@ -343,7 +346,10 @@ class Raid(MapOperation, RaidCombat, CampaignEvent):
         Pages:
             in: page_raid
         """
+<<<<<<< HEAD
         from module.log_res.log_res import LogRes
+=======
+>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
         skip_first_screenshot = True
         timeout = Timer(1.5, count=5).start()
         ocr = pt_ocr(self.config.Campaign_Event)
@@ -358,12 +364,18 @@ class Raid(MapOperation, RaidCombat, CampaignEvent):
                 pt = ocr.ocr(self.device.image)
                 if timeout.reached():
                     logger.warning('Wait PT timeout, assume it is')
+<<<<<<< HEAD
                     LogRes(self.config).Pt = pt
+=======
+>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
                     return pt
                 if pt in [70000, 70001]:
                     continue
                 else:
+<<<<<<< HEAD
                     LogRes(self.config).Pt = pt
+=======
+>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
                     return pt
         else:
             logger.info(f'Raid {self.config.Campaign_Event} does not support PT ocr, skip')