sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-04-24 11:00:00 +08:00
Code Activity

Fix: merge conflict in campaign_base

Browse Source
This commit is contained in:
sui-feng-cb
2026-04-23 17:33:29 +08:00
parent 822dbca8b2
commit ed2582e719
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
campaign/event_20201126_cn/campaign_base.py
View File

@@ -3,11 +3,7 @@ from module.campaign.assets import EVENT_20201126_ENTRANCE_TEMP, EVENT_20201126_
from module.campaign.campaign_base import CampaignBase as CampaignBase_ from module.campaign.campaign_base import CampaignBase as CampaignBase_
from module.exception import CampaignNameError from module.exception import CampaignNameError
from module.logger import logger 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 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), EVENT_ANIMATION = Button(area=(49, 229, 119, 400), color=(118, 215, 240), button=(49, 229, 119, 400),
name='EVENT_ANIMATION') name='EVENT_ANIMATION')