From 50f784643530b5576f9381685441d0fcc41054fd Mon Sep 17 00:00:00 2001 From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com> Date: Thu, 20 Jun 2024 02:09:26 +0800 Subject: [PATCH] Upd: Add SWITCH_DUNGEON_TAB.Simulated_Universe --- .../dungeon/ui/SIMULATED_UNIVERSE_CHECK.png | Bin 0 -> 7363 bytes .../dungeon/ui/SIMULATED_UNIVERSE_CLICK.png | Bin 0 -> 7491 bytes dev_tools/keyword_extract.py | 2 +- tasks/dungeon/assets/assets_dungeon_ui.py | 20 ++++++++++++++++++ tasks/dungeon/keywords/tab.py | 13 ++++++++++-- tasks/dungeon/ui.py | 5 +++++ 6 files changed, 37 insertions(+), 3 deletions(-) create mode 100644 assets/share/dungeon/ui/SIMULATED_UNIVERSE_CHECK.png create mode 100644 assets/share/dungeon/ui/SIMULATED_UNIVERSE_CLICK.png diff --git a/assets/share/dungeon/ui/SIMULATED_UNIVERSE_CHECK.png b/assets/share/dungeon/ui/SIMULATED_UNIVERSE_CHECK.png new file mode 100644 index 0000000000000000000000000000000000000000..58d458c76d27577792b03a51768c5a620529a15f GIT binary patch literal 7363 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 NqNM($M8W*+{{XtRu4VuL literal 0 HcmV?d00001 diff --git a/dev_tools/keyword_extract.py b/dev_tools/keyword_extract.py index f681fff8f..a53c9d89b 100644 --- a/dev_tools/keyword_extract.py +++ b/dev_tools/keyword_extract.py @@ -557,7 +557,7 @@ class KeywordExtract: self.load_keywords(['模拟宇宙', '拟造花萼（金）', '拟造花萼（赤）', '凝滞虚影', '侵蚀隧洞', '历战余响', '忘却之庭', '虚构叙事']) self.write_keywords(keyword_class='DungeonNav', output_file='./tasks/dungeon/keywords/nav.py') - self.load_keywords(['行动摘要', '生存索引', '每日实训', '逐光捡金', '战术训练']) + self.load_keywords(['行动摘要', '生存索引', '每日实训', '模拟宇宙', '逐光捡金', '战术训练']) self.write_keywords(keyword_class='DungeonTab', output_file='./tasks/dungeon/keywords/tab.py') self.load_keywords(['前往', '领取', '进行中', '已领取', '本日活跃度已满']) self.write_keywords(keyword_class='DailyQuestState', output_file='./tasks/daily/keywords/daily_quest_state.py') diff --git a/tasks/dungeon/assets/assets_dungeon_ui.py b/tasks/dungeon/assets/assets_dungeon_ui.py index 87d79d6f7..75bbfd166 100644 --- a/tasks/dungeon/assets/assets_dungeon_ui.py +++ b/tasks/dungeon/assets/assets_dungeon_ui.py @@ -123,6 +123,26 @@ OPERATION_BRIEFING_CLICK = ButtonWrapper( button=(149, 92, 193, 136), ), ) +SIMULATED_UNIVERSE_CHECK = ButtonWrapper( + name='SIMULATED_UNIVERSE_CHECK', + share=Button( + file='./assets/share/dungeon/ui/SIMULATED_UNIVERSE_CHECK.png', + area=(352, 99, 386, 133), + search=(332, 79, 406, 153), + color=(96, 96, 96), + button=(352, 99, 386, 133), + ), +) +SIMULATED_UNIVERSE_CLICK = ButtonWrapper( + name='SIMULATED_UNIVERSE_CLICK', + share=Button( + file='./assets/share/dungeon/ui/SIMULATED_UNIVERSE_CLICK.png', + area=(352, 99, 386, 133), + search=(332, 79, 406, 153), + color=(122, 120, 120), + button=(352, 99, 386, 133), + ), +) SURVIVAL_INDEX_CHECK = ButtonWrapper( name='SURVIVAL_INDEX_CHECK', share=Button( diff --git a/tasks/dungeon/keywords/tab.py b/tasks/dungeon/keywords/tab.py index 6dbec3781..22fab66d3 100644 --- a/tasks/dungeon/keywords/tab.py +++ b/tasks/dungeon/keywords/tab.py @@ -30,8 +30,17 @@ Daily_Training = DungeonTab( jp='デイリー訓練', es='Entrenamiento diario', ) -Treasures_Lightward = DungeonTab( +Simulated_Universe = DungeonTab( id=4, + name='Simulated_Universe', + cn='模拟宇宙', + cht='模擬宇宙', + en='Simulated Universe', + jp='模擬宇宙', + es='Universo Simulado', +) +Treasures_Lightward = DungeonTab( + id=5, name='Treasures_Lightward', cn='逐光捡金', cht='逐光撿金', @@ -40,7 +49,7 @@ Treasures_Lightward = DungeonTab( es='En busca de fortuna', ) Strategic_Training = DungeonTab( - id=5, + id=6, name='Strategic_Training', cn='战术训练', cht='戰術訓練', diff --git a/tasks/dungeon/ui.py b/tasks/dungeon/ui.py index 177ccc6bf..35b45e17d 100644 --- a/tasks/dungeon/ui.py +++ b/tasks/dungeon/ui.py @@ -68,6 +68,11 @@ SWITCH_DUNGEON_TAB.add_state( check_button=SURVIVAL_INDEX_CHECK, click_button=SURVIVAL_INDEX_CLICK ) +SWITCH_DUNGEON_TAB.add_state( + KEYWORDS_DUNGEON_TAB.Simulated_Universe, + check_button=SIMULATED_UNIVERSE_CHECK, + click_button=SIMULATED_UNIVERSE_CLICK +) SWITCH_DUNGEON_TAB.add_state( KEYWORDS_DUNGEON_TAB.Treasures_Lightward, check_button=TREASURES_LIGHTWARD_CHECK,