mirror of
https://gitee.com/sui-feng-cb/AzurLaneAutoScript1
synced 2026-05-06 07:54:04 +08:00
Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript
This commit is contained in:
@@ -290,4 +290,5 @@ To add a new event, add a new row in here, and run `python -m module.config.conf
|
||||
| 20260416 | event 20220915 cn | Violet Tempest Blooming Lycoris | - | - | - | 復刻紫絳槿嵐 |
|
||||
| 20260417 | event 20260417 cn | Vacation Lane – Beachside Brilliance | 假日航线闪耀海滨 | Vacation Lane – Beachside Brilliance | バケーションレーン・きらめく砂浜 | - |
|
||||
| 20260417 | event 20201126 cn | Vacation Lane Rerun | 复刻假日航线 | Vacation Lane Rerun | バケーションレーン(復刻) | - |
|
||||
| 20260430 | event 20250424 cn | Toward Tulipa’s Seas | 复刻扬起郁金之旗 | Toward Tulipa’s Seas Rerun | チュリッパの海へ(復刻) | - |
|
||||
| 20260417 | event 20250424 cn | Toward Tulipa’s Seas Rerun | 复刻扬起郁金之旗 | Toward Tulipa’s Seas Rerun | チュリッパの海へ(復刻) | - |
|
||||
| 20260417 | event 20260417 cn | Vacation Lane – Beachside Brilliance | - | - | - | 假日航線閃耀海濱 |
|
||||
|
||||
@@ -107,9 +107,10 @@ class Campaign(CampaignBase):
|
||||
|
||||
def map_data_init(self, map_):
|
||||
super().map_data_init(map_)
|
||||
for override_grid in OVERRIDE:
|
||||
# Set may_enemy, but keep may_ambush
|
||||
self.map[override_grid.location].may_enemy = override_grid.may_enemy
|
||||
if not self.map_is_clear_mode:
|
||||
for override_grid in OVERRIDE:
|
||||
# Set may_enemy, but keep may_ambush
|
||||
self.map[override_grid.location].may_enemy = override_grid.may_enemy
|
||||
|
||||
def battle_0(self):
|
||||
self.pick_up_light_house(A9)
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
from module.base.button import Button
|
||||
from module.campaign.assets import EVENT_20201126_ENTRANCE_TEMP, EVENT_20201126_PT_ICON
|
||||
from module.campaign.assets import EVENT_20201126_PT_ICON, EVENT_20201126_DETAIL, EVENT_20201126_DETAIL_CHECK, EVENT_20201126_DETAIL_WHITE, EVENT_20201126_ENTRANCE
|
||||
from module.campaign.campaign_base import CampaignBase as CampaignBase_
|
||||
from module.exception import CampaignNameError
|
||||
from module.logger import logger
|
||||
from module.ui.page import page_campaign_menu, page_event, page_main
|
||||
from module.ui.page import page_campaign_menu, page_event, page_main_white
|
||||
|
||||
EVENT_ANIMATION = Button(area=(49, 229, 119, 400), color=(118, 215, 240), button=(49, 229, 119, 400),
|
||||
name='EVENT_ANIMATION')
|
||||
@@ -24,11 +24,13 @@ class CampaignBase(CampaignBase_):
|
||||
return True
|
||||
self.ui_ensure(page_campaign_menu)
|
||||
if self.is_event_entrance_available():
|
||||
self.ui_ensure(page_main)
|
||||
self.ui_click(EVENT_20201126_ENTRANCE_TEMP,
|
||||
check_button=EVENT_20201126_PT_ICON,
|
||||
appear_button=EVENT_20201126_ENTRANCE_TEMP,
|
||||
offset=(40, 20))
|
||||
self.ui_goto_main()
|
||||
if self.ui_page_appear(page_main_white):
|
||||
self.ui_click(EVENT_20201126_DETAIL_WHITE, check_button=EVENT_20201126_DETAIL_CHECK)
|
||||
else:
|
||||
self.ui_click(EVENT_20201126_DETAIL, check_button=EVENT_20201126_DETAIL_CHECK)
|
||||
self.ui_click(EVENT_20201126_ENTRANCE, check_button=EVENT_20201126_PT_ICON,
|
||||
appear_button=EVENT_20201126_DETAIL_CHECK, offset=(40, 20))
|
||||
return True
|
||||
|
||||
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
from module.campaign.assets import EVENT_20250424_PT_ICON
|
||||
from module.campaign.campaign_base import CampaignBase as CampaignBase_
|
||||
from module.ui.page import page_event
|
||||
from module.logger import logger
|
||||
from module.ui.page import page_campaign_menu, page_event
|
||||
|
||||
|
||||
class CampaignBase(CampaignBase_):
|
||||
@@ -8,3 +10,12 @@ class CampaignBase(CampaignBase_):
|
||||
if self.ui_page_appear(page_event):
|
||||
return False
|
||||
return super().handle_exp_info()
|
||||
|
||||
def ui_goto_event(self):
|
||||
if self.appear(EVENT_20250424_PT_ICON, offset=(20, 20)) and self.ui_page_appear(page_event):
|
||||
logger.info('Already at EVENT_20250424')
|
||||
return True
|
||||
self.ui_ensure(page_campaign_menu)
|
||||
if self.is_event_entrance_available():
|
||||
self.ui_goto(page_event)
|
||||
return True
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
from module.base.button import Button
|
||||
from module.campaign.assets import EVENT_20260417_PT_ICON
|
||||
from module.campaign.assets import EVENT_20260417_PT_ICON, EVENT_20260417_DETAIL, EVENT_20260417_DETAIL_CHECK, EVENT_20260417_DETAIL_WHITE, EVENT_20260417_ENTRANCE
|
||||
from module.campaign.campaign_base import CampaignBase as CampaignBase_
|
||||
from module.logger import logger
|
||||
from module.ui.page import page_campaign_menu, page_event
|
||||
from module.ui.page import page_campaign_menu, page_event, page_main_white
|
||||
|
||||
EVENT_ANIMATION = Button(area=(49, 229, 119, 400), color=(118, 215, 240), button=(49, 229, 119, 400),
|
||||
name='EVENT_ANIMATION')
|
||||
@@ -10,12 +10,18 @@ EVENT_ANIMATION = Button(area=(49, 229, 119, 400), color=(118, 215, 240), button
|
||||
|
||||
class CampaignBase(CampaignBase_):
|
||||
def ui_goto_event(self):
|
||||
if self.appear(EVENT_20260417_PT_ICON, offset=(20, 20)) and self.ui_page_appear(page_event):
|
||||
if self.appear(EVENT_20260417_PT_ICON, offset=(40, 20)) and self.ui_page_appear(page_event):
|
||||
logger.info('Already at EVENT_20260417')
|
||||
return True
|
||||
self.ui_ensure(page_campaign_menu)
|
||||
if self.is_event_entrance_available():
|
||||
self.ui_goto(page_event)
|
||||
self.ui_goto_main()
|
||||
if self.ui_page_appear(page_main_white):
|
||||
self.ui_click(EVENT_20260417_DETAIL_WHITE, check_button=EVENT_20260417_DETAIL_CHECK)
|
||||
else:
|
||||
self.ui_click(EVENT_20260417_DETAIL, check_button=EVENT_20260417_DETAIL_CHECK)
|
||||
self.ui_click(EVENT_20260417_ENTRANCE, check_button=EVENT_20260417_PT_ICON,
|
||||
appear_button=EVENT_20260417_DETAIL_CHECK, offset=(40, 20))
|
||||
return True
|
||||
|
||||
@staticmethod
|
||||
|
||||
Reference in New Issue
Block a user