diff --git a/campaign/event_20201126_cn/campaign_base.py b/campaign/event_20201126_cn/campaign_base.py index 4ef11bf88..ce041508e 100644 --- a/campaign/event_20201126_cn/campaign_base.py +++ b/campaign/event_20201126_cn/campaign_base.py @@ -3,7 +3,11 @@ from module.campaign.assets import EVENT_20201126_ENTRANCE_TEMP, EVENT_20201126_ from module.campaign.campaign_base import CampaignBase as CampaignBase_ from module.exception import CampaignNameError from module.logger import logger +<<<<<<< HEAD from module.ui.page import page_campaign_menu, page_event, page_main_white +======= +from module.ui.page import page_campaign_menu, page_event, page_main +>>>>>>> pr5625 EVENT_ANIMATION = Button(area=(49, 229, 119, 400), color=(118, 215, 240), button=(49, 229, 119, 400), name='EVENT_ANIMATION') @@ -24,7 +28,7 @@ class CampaignBase(CampaignBase_): return True self.ui_ensure(page_campaign_menu) if self.is_event_entrance_available(): - self.ui_ensure(page_main_white) + self.ui_ensure(page_main) self.ui_click(EVENT_20201126_ENTRANCE_TEMP, check_button=EVENT_20201126_PT_ICON, appear_button=EVENT_20201126_ENTRANCE_TEMP)