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

Pref: Remove rpg page definition since event was over

Browse Source
This commit is contained in:
LmeSzinc
2024-06-05 02:55:47 +08:00
parent 0e7008a8b1
commit 33cefa9817
2 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
module/ui/page.py
View File

@@ -1,6 +1,5 @@
import traceback import traceback
from module.raid.assets import *
from module.ui.assets import * from module.ui.assets import *
from module.ui_white.assets import * from module.ui_white.assets import *
@@ -277,16 +276,19 @@ page_mail.link(button=GOTO_MAIN_WHITE, destination=page_main)
# page_main.link(button=MAIL_ENTER_WHITE, destination=page_mail) # page_main.link(button=MAIL_ENTER_WHITE, destination=page_mail)
# RPG event (raid_20240328) # RPG event (raid_20240328)
page_rpg_stage = Page(RPG_GOTO_STORY) # page_rpg_stage = Page(RPG_GOTO_STORY)
page_rpg_story = Page(RPG_GOTO_STAGE) # page_rpg_story = Page(RPG_GOTO_STAGE)
page_rpg_stage.link(button=RPG_GOTO_STORY, destination=page_rpg_story) # page_rpg_stage.link(button=RPG_GOTO_STORY, destination=page_rpg_story)
page_rpg_stage.link(button=RPG_HOME, destination=page_main) # page_rpg_stage.link(button=RPG_HOME, destination=page_main)
page_rpg_story.link(button=RPG_GOTO_STAGE, destination=page_rpg_stage) # page_rpg_story.link(button=RPG_GOTO_STAGE, destination=page_rpg_stage)
page_rpg_story.link(button=RPG_HOME, destination=page_main) # page_rpg_story.link(button=RPG_HOME, destination=page_main)
#
# page_main.link(button=MAIN_GOTO_RAID, destination=page_rpg_stage)
# # page_main_white.link(button=MAIN_GOTO_RAID_WHITE, destination=page_rpg_stage)
#
# page_rpg_city = Page(RPG_LEAVE_CITY)
# page_rpg_city.link(button=RPG_LEAVE_CITY, destination=page_rpg_stage)
# page_rpg_city.link(button=RPG_HOME, destination=page_main)
page_main.link(button=MAIN_GOTO_RAID, destination=page_rpg_stage) # Keep page_rpg_stage, so Raid can import
# page_main_white.link(button=MAIN_GOTO_RAID_WHITE, destination=page_rpg_stage) page_rpg_stage = page_raid
page_rpg_city = Page(RPG_LEAVE_CITY)
page_rpg_city.link(button=RPG_LEAVE_CITY, destination=page_rpg_stage)
page_rpg_city.link(button=RPG_HOME, destination=page_main)

14
module/ui/ui.py
View File

@@ -197,9 +197,9 @@ class UI(InfoHandler):
if self.appear_then_click(GOTO_MAIN, offset=(30, 30), interval=2): if self.appear_then_click(GOTO_MAIN, offset=(30, 30), interval=2):
timeout.reset() timeout.reset()
continue continue
if self.appear_then_click(RPG_HOME, offset=(30, 30), interval=2): # if self.appear_then_click(RPG_HOME, offset=(30, 30), interval=2):
timeout.reset() # timeout.reset()
continue # continue
if self.ui_additional(): if self.ui_additional():
timeout.reset() timeout.reset()
continue continue
@@ -534,8 +534,8 @@ class UI(InfoHandler):
return True return True
# RPG event (raid_20240328) # RPG event (raid_20240328)
if self.appear_then_click(RPG_STATUS_POPUP, offset=(30, 30), interval=3): # if self.appear_then_click(RPG_STATUS_POPUP, offset=(30, 30), interval=3):
return True # return True
# Idle page # Idle page
if self.get_interval_timer(IDLE, interval=3).reached(): if self.get_interval_timer(IDLE, interval=3).reached():
@@ -565,5 +565,5 @@ class UI(InfoHandler):
self.interval_reset(RAID_CHECK) self.interval_reset(RAID_CHECK)
if button == SHOP_GOTO_SUPPLY_PACK: if button == SHOP_GOTO_SUPPLY_PACK:
self.interval_reset(EXCHANGE_CHECK) self.interval_reset(EXCHANGE_CHECK)
if button in [RPG_GOTO_STAGE, RPG_GOTO_STORY, RPG_LEAVE_CITY]: # if button in [RPG_GOTO_STAGE, RPG_GOTO_STORY, RPG_LEAVE_CITY]:
self.interval_timer[GET_SHIP.name] = Timer(5).reset() # self.interval_timer[GET_SHIP.name] = Timer(5).reset()