merge alas

module/campaign/run.py

@@ -6,10 +6,7 @@ import re
 
 from module.campaign.campaign_base import CampaignBase
 from module.campaign.campaign_event import CampaignEvent
-<<<<<<< HEAD
 from module.shop.shop_status import ShopStatus
-=======
->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
 from module.campaign.campaign_ui import MODE_SWITCH_1
 from module.config.config import AzurLaneConfig
 from module.exception import CampaignEnd, RequestHumanTakeover, ScriptEnd
@@ -19,11 +16,7 @@ from module.notify import handle_notify
 from module.ui.page import page_campaign
 
 
-<<<<<<< HEAD
 class CampaignRun(CampaignEvent, ShopStatus):
-=======
-class CampaignRun(CampaignEvent):
->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
     folder: str
     name: str
     stage: str
@@ -67,12 +60,9 @@ class CampaignRun(CampaignEvent):
             logger.critical(f'Possible reason #1: This event ({folder}) does not have {name}')
             logger.critical(f'Possible reason #2: You are using an old Alas, '
                             'please check for update, or make map files yourself using dev_tools/map_extractor.py')
-<<<<<<< HEAD
             if self.config.SERVER == 'cn':
                 logger.critical(f'Possible reason #3: 对于看不懂以上英文的用户，此处是友情翻译：'
                             f'还没更新呢急你妈急急急急。要么给极彩阿丽艾塔上总督催更，要么滚回去自己写')
-=======
->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
             raise RequestHumanTakeover
 
         config = copy.deepcopy(self.config).merge(self.module.Config())
@@ -109,14 +99,10 @@ class CampaignRun(CampaignEvent):
             return True
         # Oil limit
         if oil_check:
-<<<<<<< HEAD
             self.status_get_gems()
             self.get_coin()
             _oil = self.get_oil()
             if _oil < max(500, self.config.StopCondition_OilLimit):
-=======
-            if self.get_oil() < max(500, self.config.StopCondition_OilLimit):
->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
                 logger.hr('Triggered stop condition: Oil limit')
                 self.config.task_delay(minute=(120, 240))
                 return True
@@ -401,14 +387,11 @@ class CampaignRun(CampaignEvent):
             if self.triggered_stop_condition(oil_check=not self.campaign.is_in_auto_search_menu()):
                 break
 
-<<<<<<< HEAD
             # Update config
             if len(self.config.modified):
                 logger.info('Updating config for dashboard')
                 self.config.update()
 
-=======
->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
             # Run
             self.device.stuck_record_clear()
             self.device.click_record_clear()
@@ -419,13 +402,10 @@ class CampaignRun(CampaignEvent):
                 logger.info(str(e))
                 break
 
-<<<<<<< HEAD
             # Update config
             if len(self.campaign.config.modified):
                 logger.info('Updating config for dashboard')
                 self.campaign.config.update()
-=======
->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
             # After run
             self.run_count += 1
             if self.config.StopCondition_RunCount: