Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] dashboard from LmeSzinc:master #683

Open
wants to merge 156 commits into
base: dashboard
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
156 commits
Select commit Hold shift + click to select a range
1ca4f63
Fix: [ALAS] Missing wait after down event
LmeSzinc Oct 10, 2024
6b7ea04
Upd:Adds the Meowfficer maximum level option for enhance (#4267)
z-wl Oct 11, 2024
e89063b
Jp font 20241011 (#4272)
guoh064 Oct 12, 2024
4da606f
Merge pull request #4274 from LmeSzinc/dev
LmeSzinc Oct 12, 2024
5ebada5
Upd: [JP] assets of storage module (#4276)
yulu901107 Oct 13, 2024
9508f79
Fix: Handle missing / in BEACON_REMAIN ocr
LmeSzinc Oct 13, 2024
f94495d
Merge pull request #4282 from LmeSzinc/dev
LmeSzinc Oct 13, 2024
95ac640
Fix: Clicking GET_SHIP after MAIN_GOTO_REWARD
LmeSzinc Oct 13, 2024
ce4de6b
Fix: Limit trials on _retire_select_one()
LmeSzinc Oct 13, 2024
a24a7fc
tmp: [JP] LevelOcr
guoh064 Oct 12, 2024
402a008
tmp: [JP] opsi beacon page color and assets
guoh064 Oct 12, 2024
7e47138
upd: [JP] dorm assets
guoh064 Oct 16, 2024
b5dd289
Opt: search archives entrance (#4284)
Air111 Oct 16, 2024
423ac12
Merge pull request #4291 from LmeSzinc/dev
LmeSzinc Oct 16, 2024
d35bfa0
Add: War Archives
guoh064 Oct 17, 2024
bd0fccb
Add: event entrance 20241017
guoh064 Oct 17, 2024
d4df09d
Upd: [JP] asset QUIT (#4296)
guoh064 Oct 17, 2024
233462c
Merge pull request #4298 from LmeSzinc/dev
LmeSzinc Oct 17, 2024
560a747
Upd: [EN] QUIT assets
LmeSzinc Oct 18, 2024
9390cf0
Upd: module.combat_ui.assets
guoh064 Oct 18, 2024
12096e5
Upd: war archives entrance
guoh064 Oct 18, 2024
168338b
Upd: [JP] asset OCR_REMAIN
guoh064 Oct 18, 2024
92c5f5f
upd: [JP] commission ocr
guoh064 Oct 17, 2024
d13e852
upd: [JP] retire assets
guoh064 Oct 17, 2024
17a6da5
upd: [JP] OCR_DOCK_AMOUNT
guoh064 Oct 17, 2024
d1052df
Revert "tmp: [JP] LevelOcr"
guoh064 Oct 18, 2024
65304fe
upd: [JP] LevelOcr and EmotionDigit
guoh064 Oct 19, 2024
cc957fe
upd: [JP] SKILL_EXP
guoh064 Oct 19, 2024
be85625
upd: [JP] ExpOnSkillSelect
guoh064 Oct 19, 2024
98e6d13
Upd: [TW] Assets for COALITION_ACADEMY
Air111 Oct 20, 2024
05abbb2
Merge pull request #4306 from LmeSzinc/dev
LmeSzinc Oct 20, 2024
d3eb5fa
Revert "tmp: [JP] opsi beacon page color and assets"
guoh064 Oct 21, 2024
99363a3
upd: [JP] opsi beacon page color
guoh064 Oct 21, 2024
25b5349
Merge pull request #4307 from guoh064/asset_update
LmeSzinc Oct 22, 2024
049f478
Add: auto format for campaign/Readme.md
guoh064 Oct 25, 2024
3f6738a
Add: event entrance of event_20241024_cn
guoh064 Oct 25, 2024
847dcd8
Add: Chapter T
LmeSzinc Oct 25, 2024
36568ca
Add: Chapter SP
LmeSzinc Oct 25, 2024
1024f50
Add: CHAPTER_SWITCH_20241024
LmeSzinc Oct 25, 2024
47a85ab
Merge pull request #4326 from LmeSzinc/dev
LmeSzinc Oct 25, 2024
74e241d
Revert "tmp: [JP] opsi beacon page color and assets"
guoh064 Oct 21, 2024
4f79fba
upd: [JP] opsi beacon page color
guoh064 Oct 21, 2024
68e6ac4
upd: [JP] OCR_SHOP_GOLD_COINS and OCR_SHOP_GEMS
guoh064 Oct 20, 2024
6ea92ef
upd: [JP] COIN_HOLDER in minigame
guoh064 Oct 22, 2024
51c84fc
tmp: ocr_collect in jp
guoh064 Oct 22, 2024
1dd263d
upd: [JP] get_zone_name correction
guoh064 Oct 22, 2024
ba27a51
tmp: [JP] OCR_REMAIN in daily
guoh064 Oct 22, 2024
08a9326
upd: [JP] EmotionDigit pre_process
guoh064 Oct 26, 2024
227fed1
upd: [JP] OCR_SHOP_YELLOW_COINS
guoh064 Oct 29, 2024
9a31f70
Fix: Double clicking REWARD_GOTO_TACTICAL (#4328)
LmeSzinc Oct 30, 2024
e3fabe1
Merge pull request #4336 from LmeSzinc/dev
LmeSzinc Oct 30, 2024
0d0aff4
[TW]Event: Whence Flowers Bear No Fruit (#4347)
hephooey Nov 5, 2024
29b1e8b
Fix: predict_enemy_genre in t4 of event_20241024_cn (#4352)
guoh064 Nov 6, 2024
1c4857d
Fix: Double clicking REWARD_GOTO_TACTICAL
LmeSzinc Nov 6, 2024
1889ab1
Merge pull request #4356 from LmeSzinc/dev
LmeSzinc Nov 6, 2024
6cddaf4
Fix: Compatible with new versions of maa (#4366)
SaiCateDoan Nov 10, 2024
4b6a956
Revert "Upd: [JP] asset QUIT" (#4370)
guoh064 Nov 11, 2024
56a9df0
Add: JP iridescent fantasy ui quit button (#4369)
ken1882 Nov 12, 2024
1765b5e
Merge pull request #4375 from LmeSzinc/dev
LmeSzinc Nov 13, 2024
b689b59
Add: [CN, EN, JP] event_20220915_cn rerun
guoh064 Nov 14, 2024
d5c7eaa
Add: [TW] event_20240229_cn
guoh064 Nov 14, 2024
bc5e6ed
Merge pull request #4377 from guoh064/event_update
LmeSzinc Nov 14, 2024
bd680eb
Add: fake module PIL for webui (#4374)
SaiCateDoan Nov 19, 2024
ecf357a
Add: Event entrance of Dangerous Inventions Incoming (event_20241121_cn)
LmeSzinc Nov 22, 2024
64b3122
Add: Chapter T
LmeSzinc Nov 22, 2024
be37625
Add: Chapter TTL
LmeSzinc Nov 22, 2024
edd9d63
Add: Chapter SP
LmeSzinc Nov 22, 2024
c790807
Upd: [JP] USE_DATA_KEY (fixed #4344)
LmeSzinc Nov 22, 2024
a0f252e
Merge pull request #4389 from LmeSzinc/dev
LmeSzinc Nov 22, 2024
4245109
Upd: [JP] commission suffix ocr pre_process (#4403)
guoh064 Nov 29, 2024
4eef405
Upd: [TW] Event event_20241121_cn
LmeSzinc Nov 29, 2024
f3e268d
Merge pull request #4404 from LmeSzinc/dev
LmeSzinc Nov 29, 2024
9efe590
Fix: [CN] POPUP_CONFIRM_WHITE_BATTLEPASS
LmeSzinc Dec 4, 2024
934c249
upd: [JP] asset COMMISSION_START (#4353)
guoh064 Dec 9, 2024
40b3c25
Fix: Remove sleep in _tactical_book_select()
LmeSzinc Dec 9, 2024
164db6f
Chore: Rename "threshold" in template matching to "similarity"
LmeSzinc Dec 9, 2024
ba5b853
Refactor: Standardize the use of match_template_color()
LmeSzinc Dec 9, 2024
97f8367
Fix: Handle storage page in os_auto_search_quit()
LmeSzinc Dec 9, 2024
2694369
Fix: Wait disappearing scroll in retirement_get_common_rarity_cv()
LmeSzinc Dec 9, 2024
386a248
Fix: No drop image caching if no drop image save
LmeSzinc Dec 9, 2024
8081764
Merge pull request #4419 from LmeSzinc/dev
LmeSzinc Dec 9, 2024
4ab8337
Sync: [ALAS] Refactored Switch.set()
LmeSzinc Dec 9, 2024
a67bbba
Fix: [EN] Strict color match threshold on RESET_AVAILABLE
LmeSzinc Dec 11, 2024
48e4c78
Fix: Default color match threshold should be the original value
LmeSzinc Dec 11, 2024
bfdf6e4
Fix: Redirect stage names like "B-1" to be foolproof
LmeSzinc Dec 11, 2024
c483cd5
Merge pull request #4423 from LmeSzinc/dev
LmeSzinc Dec 11, 2024
8dbc3ac
upd: [JP] yellow_coin color (#4427)
guoh064 Dec 13, 2024
eb836d1
Fix: correct check_button in add_state() (#4429)
sui-feng-cb Dec 13, 2024
9d27da1
Merge pull request #4430 from LmeSzinc/dev
LmeSzinc Dec 13, 2024
27b92c9
Bugfix: to_map_input_name case issue (#4433)
Shane-Xue Dec 15, 2024
52a29aa
Fix: jp commission suffix pre_process (#4435)
guoh064 Dec 15, 2024
3512191
Merge pull request #4439 from LmeSzinc/dev
LmeSzinc Dec 16, 2024
256e069
Tmp: resume low hp detection after false BATTLE_STATUS
guoh064 Dec 15, 2024
ad138da
Merge pull request #4445 from guoh064/exercise_false_d
LmeSzinc Dec 20, 2024
fa78a95
Add: event entrance of event_20241219_cn
guoh064 Dec 19, 2024
a1d8e62
Add: event entrance of event_20231221_cn (tw event)
guoh064 Dec 19, 2024
bc3c602
Fix: Re-order retire popup handles by display hierarchy
LmeSzinc Dec 20, 2024
bc3f549
i18n: [EN] Rename "SpecialRadar" to "OpSi Data Logger"
LmeSzinc Dec 20, 2024
63c091b
Fix: Double clicking EQUIP_OFF after popup confirm on slow devices
LmeSzinc Dec 20, 2024
a3bb25a
Fix: [ALAS] Fallback to auto if nemu_ipc and ldopengl are selected on…
LmeSzinc Dec 20, 2024
cc2cf0d
Refactor: Abstract chapter switches from 20240725 to 20241219
LmeSzinc Dec 20, 2024
b77f486
Add: Chapter ABCD
LmeSzinc Dec 20, 2024
be48eca
Fix: Avoid clicking EXERCISE_PREPARATION after DORM_FURNITURE_SHOP_FI…
LmeSzinc Dec 20, 2024
c9fff1e
Fix: Handle mis-clicked to page_exercise (#4434)
LmeSzinc Dec 20, 2024
7b4a716
Add: Chapter SP
LmeSzinc Dec 20, 2024
63bd1fc
Merge pull request #4450 from LmeSzinc/dev
LmeSzinc Dec 20, 2024
e08ca5b
Add: Chapter SP
LmeSzinc Dec 26, 2024
1e7aaf5
Fix: Handle BATTLE_PASS_NEW_SEASON
LmeSzinc Dec 26, 2024
76fcfdf
Upd: Battle UI Christmas, Cyber, Neon
LmeSzinc Dec 26, 2024
62b3bd1
Chore: Log battle UI theme
LmeSzinc Dec 26, 2024
42b4eb3
Opt: [ALAS] Match luma template in match_template_color
LmeSzinc Dec 26, 2024
9b69de4
Upd: [EN] QUIT_Christmas
LmeSzinc Dec 27, 2024
0973cbc
Upd: _at_low_hp() in various battle UI
LmeSzinc Dec 27, 2024
a6f8172
Refactor: [ALAS] Use trio-like thread pool in nemu_ipc instead of asy…
LmeSzinc Dec 27, 2024
3d112b4
Opt: [ALAS] Dynamically extends nemu_ipc timeout on retries for slow PCs
LmeSzinc Dec 27, 2024
e44589d
Merge pull request #4472 from LmeSzinc/dev
LmeSzinc Dec 27, 2024
b23ff47
Fix: Expand search area of MISSION_WEEKLY_RED_DOT
LmeSzinc Jan 1, 2025
72142c6
Chore: campaign_set_chapter_20241219 should use wrapped methods
LmeSzinc Jan 1, 2025
f434784
Add: Do event story, not added to GUI yet
LmeSzinc Jan 1, 2025
7866150
Merge pull request #4480 from LmeSzinc/dev
LmeSzinc Jan 1, 2025
39546d5
Fix: get_event_story_state should not have interval
LmeSzinc Jan 1, 2025
3be9adc
Fix: Switch handler in campaign_ensure_aside_20241219
LmeSzinc Jan 1, 2025
3733cc5
Merge pull request #4481 from LmeSzinc/dev
LmeSzinc Jan 1, 2025
4a2eb44
Opt: Combine dock filter operations to skip waiting dock loaded
LmeSzinc Jan 3, 2025
8366b71
Add: page_dock
LmeSzinc Jan 3, 2025
b9be029
Chore: Update comments in dock_filter_set
LmeSzinc Jan 3, 2025
47e833f
Add: Awaken ships
LmeSzinc Jan 3, 2025
9395738
Opt: Quick exit if there's only a few CV to retire
LmeSzinc Jan 3, 2025
c8bf55b
Upd: [EN] MEOWFFICER_BUY_ENTER
LmeSzinc Jan 4, 2025
da81498
Add: Task `Awaken` to GUI
LmeSzinc Jan 4, 2025
6070785
Upd: [TW] Raid entrance of Spring Festive Fiasco (raid_20240130)
LmeSzinc Jan 4, 2025
b72095e
Upd: [TW] Raid assets of raid_20240130
LmeSzinc Jan 4, 2025
0052dc4
Fix: Subpress get_ship in dorm (#4488)
LmeSzinc Jan 4, 2025
0ad3c2e
Fix: Skip second awaken if first run get timeout
LmeSzinc Jan 4, 2025
46b1abf
Fix: Handle game tips in ship_info_enter()
LmeSzinc Jan 4, 2025
61fa225
Merge pull request #4489 from LmeSzinc/dev
LmeSzinc Jan 4, 2025
5a74418
Fix: Missing awaken_popup_close if resource insufficient
LmeSzinc Jan 4, 2025
cc5b26e
Upd: [EN] Awaken assets
LmeSzinc Jan 4, 2025
875133d
Upd: [EN] Allow running task Awaken
LmeSzinc Jan 4, 2025
269c4d6
Merge pull request #4490 from LmeSzinc/dev
LmeSzinc Jan 4, 2025
e60ea81
Add: [JP] asset GUILD_MISSION_NEW (#4493)
guoh064 Jan 6, 2025
ab9f289
Upd: [JP] Opsi assets (#4492)
guoh064 Jan 6, 2025
9b61faf
Fix: z20_or_z21 should be filtered by any ship (#4494)
sui-feng-cb Jan 7, 2025
38da2ab
Fix: [ALAS] Patch to fix atx_agent_url on arm64-v8a
LmeSzinc Jul 1, 2024
546f25d
Chore: [ALAS] Directly mark nemuipc and ldopengl unavailable on non-W…
LmeSzinc Jan 7, 2025
a36b82b
Merge pull request #4497 from LmeSzinc/dev
LmeSzinc Jan 7, 2025
04de221
Opt: Clear GET_ITEMS_1 interval before os_shop_buy_execute
LmeSzinc Jan 8, 2025
78c9083
Add: event entrance for rerun event 20250109 (#4500)
guoh064 Jan 9, 2025
40a9e90
Fix: siren has boss icon small in event 20221222 rerun (#4502)
Air111 Jan 9, 2025
30e5ff1
Merge pull request #4503 from LmeSzinc/dev
LmeSzinc Jan 9, 2025
2176fdf
Fix: Getting index of a digit chapter when looking for a non-digit ch…
LmeSzinc Jan 9, 2025
c98ea50
Del: Remove scrcpy screenshot
LmeSzinc Jan 9, 2025
156a988
Fix: Skip using emergency repair if all HP is 0 (#4501)
LmeSzinc Jan 9, 2025
bad155d
Fix: Subpress wrong siren predictions on land in B3/D3
LmeSzinc Jan 10, 2025
3995010
Upd: Enemy templates in event 20221222 to select weaker enemy
LmeSzinc Jan 10, 2025
ea650eb
Merge pull request #4506 from LmeSzinc/dev
LmeSzinc Jan 10, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 4 additions & 0 deletions alas.py
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,10 @@ def reward(self):
from module.reward.reward import Reward
Reward(config=self.config, device=self.device).run()

def awaken(self):
from module.awaken.awaken import Awaken
Awaken(config=self.config, device=self.device).run()

def shop_frequent(self):
from module.shop.shop_reward import RewardShop
RewardShop(config=self.config, device=self.device).run_frequent()
Expand Down
Binary file added assets/cn/awaken/AWAKENING.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/cn/awaken/AWAKEN_CANCEL.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/cn/awaken/AWAKEN_FINISH.BUTTON.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/cn/awaken/AWAKEN_FINISH.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/cn/awaken/COST_ARRAY.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/cn/awaken/COST_CHIP.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/cn/awaken/COST_COIN.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/cn/awaken/LEVEL_UP.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/cn/awaken/OCR_SHIP_LEVEL.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/cn/awaken/SHIP_LEVEL_CHECK.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/cn/campaign/CHAPTER_20241219_SP.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/cn/combat_ui/PAUSE_Christmas.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/cn/combat_ui/PAUSE_Neon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/cn/combat_ui/QUIT_Christmas.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/cn/eventstory/BATTLE_MIDDLE.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/cn/eventstory/STORY_FINISHED.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/cn/eventstory/STORY_FIRST.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/cn/eventstory/STORY_LAST.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/cn/eventstory/STORY_MIDDLE.png
Binary file added assets/cn/handler/BATTLE_PASS_NEW_SEASON.png
Binary file modified assets/cn/reward/MISSION_WEEKLY_RED_DOT.png
Binary file added assets/cn/template/TEMPLATE_SIREN_Amity.gif
Binary file added assets/cn/template/TEMPLATE_SIREN_MaryCeleste.gif
Binary file added assets/cn/template/TEMPLATE_SIREN_Portsmouth.gif
Binary file added assets/cn/template/TEMPLATE_SIREN_ToLoveYui02.gif
Binary file added assets/cn/ui/MAIN_GOTO_DOCK.png
Binary file added assets/cn/ui_white/MAIN_GOTO_DOCK_WHITE.png
Binary file modified assets/cn/war_archives/TEMPLATE_ASHEN_SIMULACRUM.png
Binary file modified assets/cn/war_archives/TEMPLATE_AURORA_NOCTIS.png
Binary file modified assets/cn/war_archives/TEMPLATE_CRESCENDO_OF_POLARIS.png
Binary file modified assets/cn/war_archives/TEMPLATE_CRIMSON_ECHOES.png
Binary file modified assets/cn/war_archives/TEMPLATE_DIVERGENT_CHESSBOARD.png
Binary file modified assets/cn/war_archives/TEMPLATE_DREAMWAKERS_BUTTERFLY.png
Binary file modified assets/cn/war_archives/TEMPLATE_EMPYREAL_TRAGICOMEDY.png
Binary file modified assets/cn/war_archives/TEMPLATE_ENCIRCLING_GRAF_SPEE.png
Binary file modified assets/cn/war_archives/TEMPLATE_FALLEN_WINGS.png
Binary file modified assets/cn/war_archives/TEMPLATE_GLORIOUS_BATTLE.png
Binary file modified assets/cn/war_archives/TEMPLATE_INK_STAINED_STEEL_SAKURA.png
Binary file modified assets/cn/war_archives/TEMPLATE_INVERTED_ORTHANT.png
Binary file modified assets/cn/war_archives/TEMPLATE_IRIS_OF_LIGHT_AND_DARK.png
Binary file modified assets/cn/war_archives/TEMPLATE_KHOROVOD_OF_DAWNS_RIME.png
Binary file modified assets/cn/war_archives/TEMPLATE_MICROLAYER_MEDLEY.png
Binary file modified assets/cn/war_archives/TEMPLATE_MIRROR_INVOLUTION.png
Binary file modified assets/cn/war_archives/TEMPLATE_NORTHERN_OVERTURE.png
Binary file modified assets/cn/war_archives/TEMPLATE_PRELUDE_UNDER_THE_MOON.png
Binary file modified assets/cn/war_archives/TEMPLATE_SCHERZO_OF_IRON_AND_BLOOD.png
Binary file modified assets/cn/war_archives/TEMPLATE_SKYBOUND_ORATORIO.png
Binary file modified assets/cn/war_archives/TEMPLATE_STRIVE_WISH_AND_STRATEGIZE.png
Binary file added assets/cn/war_archives/TEMPLATE_SUNDERED_BLUE.png
Binary file modified assets/cn/war_archives/TEMPLATE_SWIRLING_CHERRY_BLOSSOMS.png
Binary file modified assets/cn/war_archives/TEMPLATE_THE_ENIGMA_AND_THE_SHARK.png
Binary file modified assets/cn/war_archives/TEMPLATE_THE_SOLOMON_RANGER.png
Binary file modified assets/cn/war_archives/TEMPLATE_THE_WAY_HOME_IN_THE_NIGHT.png
Binary file modified assets/cn/war_archives/TEMPLATE_UNIVERSE_IN_UNISON.png
Binary file modified assets/cn/war_archives/TEMPLATE_VISITORS_DYED_IN_RED.png
Binary file modified assets/cn/war_archives/TEMPLATE_WINTERS_CROWN.png
Binary file added assets/en/awaken/AWAKENING.png
Binary file added assets/en/awaken/AWAKEN_CANCEL.png
Binary file added assets/en/awaken/AWAKEN_CONFIRM.png
Binary file added assets/en/awaken/LEVEL_UP.png
Binary file modified assets/en/combat_ui/QUIT.png
Binary file added assets/en/combat_ui/QUIT_Christmas.png
Binary file modified assets/en/combat_ui/QUIT_Iridescent_Fantasy.png
Binary file modified assets/en/combat_ui/QUIT_New.png
Binary file modified assets/en/meowfficer/MEOWFFICER_BUY_ENTER.png
Binary file added assets/en/template/TEMPLATE_SIREN_Amity.gif
Binary file added assets/en/template/TEMPLATE_SIREN_MaryCeleste.gif
Binary file added assets/en/template/TEMPLATE_SIREN_Portsmouth.gif
Binary file added assets/en/template/TEMPLATE_SIREN_ToLoveYui02.gif
Binary file added assets/en/ui/MAIN_GOTO_DOCK.png
Binary file added assets/en/ui_white/MAIN_GOTO_DOCK_WHITE.png
Binary file added assets/jp/combat_ui/QUIT_Iridescent_Fantasy.png
Binary file added assets/jp/commission/COMMISSION_ADVICE.BUTTON.png
Binary file modified assets/jp/commission/COMMISSION_ADVICE.png
Binary file modified assets/jp/commission/COMMISSION_START.png
Binary file modified assets/jp/daily/OCR_REMAIN.png
Binary file modified assets/jp/dorm/DORM_FURNITURE_BUY_ALL.png
Binary file modified assets/jp/dorm/DORM_FURNITURE_BUY_CONFIRM.png
Binary file modified assets/jp/dorm/DORM_FURNITURE_BUY_SET.png
Binary file modified assets/jp/dorm/DORM_FURNITURE_DETAILS_ENTER.png
Binary file modified assets/jp/freebies/MAIL_BATCH_CLAIM.png
Binary file modified assets/jp/freebies/MAIL_BATCH_DELETE.png
Binary file added assets/jp/guild/GUILD_MISSION_NEW.png
Binary file modified assets/jp/handler/USE_DATA_KEY.png
Binary file modified assets/jp/os_handler/ACTION_POINT_BUY_REMAIN.png
Binary file modified assets/jp/os_handler/OS_MONTHBOSS_HARD.png
Binary file modified assets/jp/os_handler/OS_MONTHBOSS_NORMAL.png
Binary file modified assets/jp/research/RESEARCH_COST_CHECKER.png
Binary file modified assets/jp/retire/DOCK_AMOUNT.png
Binary file modified assets/jp/retire/TEMPLATE_IN_BATTLE.png
Binary file removed assets/jp/retire/TEMPLATE_IN_COMMISSION.gif
Diff not rendered.
Binary file added assets/jp/retire/TEMPLATE_IN_COMMISSION.png
Binary file modified assets/jp/storage/BOX_USE.BUTTON.png
Binary file modified assets/jp/storage/BOX_USE.png
Binary file modified assets/jp/storage/MATERIAL_CHECK.png
Binary file modified assets/jp/tactical/OCR_SKILL_EXP.png
Binary file added assets/jp/template/TEMPLATE_SIREN_Amity.gif
Binary file added assets/jp/template/TEMPLATE_SIREN_MaryCeleste.gif
Binary file added assets/jp/template/TEMPLATE_SIREN_Portsmouth.gif
Binary file added assets/jp/template/TEMPLATE_SIREN_ToLoveYui02.gif
Binary file added assets/jp/ui/MAIN_GOTO_DOCK.png
Binary file added assets/jp/ui_white/MAIN_GOTO_DOCK_WHITE.png
Binary file modified assets/jp/war_archives/TEMPLATE_CRESCENDO_OF_POLARIS.png
Binary file modified assets/jp/war_archives/TEMPLATE_CRIMSON_ECHOES.png
Binary file modified assets/jp/war_archives/TEMPLATE_DIVERGENT_CHESSBOARD.png
Binary file modified assets/jp/war_archives/TEMPLATE_ENCIRCLING_GRAF_SPEE.png
Binary file modified assets/jp/war_archives/TEMPLATE_FALLEN_WINGS.png
Binary file modified assets/jp/war_archives/TEMPLATE_GLORIOUS_BATTLE.png
Binary file modified assets/jp/war_archives/TEMPLATE_INK_STAINED_STEEL_SAKURA.png
Binary file modified assets/jp/war_archives/TEMPLATE_IRIS_OF_LIGHT_AND_DARK.png
Binary file modified assets/jp/war_archives/TEMPLATE_STRIVE_WISH_AND_STRATEGIZE.png
Binary file modified assets/jp/war_archives/TEMPLATE_UNIVERSE_IN_UNISON.png
Binary file modified assets/jp/war_archives/TEMPLATE_VISITORS_DYED_IN_RED.png
Binary file modified assets/jp/war_archives/TEMPLATE_WINTERS_CROWN.png
Binary file removed assets/tw/campaign/SWITCH_20240725_COMBAT.png
Diff not rendered.
Binary file added assets/tw/coalition/ACADEMY_EASY.png
Binary file added assets/tw/coalition/ACADEMY_EX.png
Binary file added assets/tw/coalition/ACADEMY_HARD.png
Binary file added assets/tw/coalition/ACADEMY_MODE_BATTLE.png
Binary file added assets/tw/coalition/ACADEMY_MODE_STORY.png
Binary file added assets/tw/coalition/ACADEMY_NORMAL.png
Binary file added assets/tw/coalition/ACADEMY_SP.png
Binary file added assets/tw/coalition/ACADEMY_SWITCH_MULTI.png
Binary file added assets/tw/coalition/ACADEMY_SWITCH_SINGLE.png
Binary file added assets/tw/coalition/ACEDEMY_FLEET_PREPARATION.png
Binary file added assets/tw/raid/HUANCHANG_OCR_PT.png
Binary file added assets/tw/raid/HUANCHANG_OCR_REMAIN_NORMAL.png
Binary file added assets/tw/raid/HUANCHANG_RAID_EASY.png
Binary file added assets/tw/raid/HUANCHANG_RAID_EX.png
Binary file added assets/tw/raid/HUANCHANG_RAID_HARD.png
Binary file added assets/tw/raid/HUANCHANG_RAID_NORMAL.png
Binary file added assets/tw/template/TEMPLATE_SIREN_Amity.gif
Binary file added assets/tw/template/TEMPLATE_SIREN_MaryCeleste.gif
Binary file added assets/tw/template/TEMPLATE_SIREN_Portsmouth.gif
Binary file added assets/tw/template/TEMPLATE_SIREN_ToLoveYui02.gif
Binary file added assets/tw/ui/MAIN_GOTO_DOCK.png
Binary file added assets/tw/ui_white/MAIN_GOTO_DOCK_WHITE.png
Binary file modified assets/tw/war_archives/TEMPLATE_DIVERGENT_CHESSBOARD.png
Binary file modified assets/tw/war_archives/TEMPLATE_ENCIRCLING_GRAF_SPEE.png
Binary file modified assets/tw/war_archives/TEMPLATE_FALLEN_WINGS.png
Binary file modified assets/tw/war_archives/TEMPLATE_GLORIOUS_BATTLE.png
Binary file modified assets/tw/war_archives/TEMPLATE_MICROLAYER_MEDLEY.png
Binary file modified assets/tw/war_archives/TEMPLATE_STRIVE_WISH_AND_STRATEGIZE.png
Binary file modified assets/tw/war_archives/TEMPLATE_VISITORS_DYED_IN_RED.png
Binary file modified assets/tw/war_archives/TEMPLATE_WINTERS_CROWN.png
179 changes: 98 additions & 81 deletions campaign/Readme.md

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions campaign/campaign_main/campaign_15_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@ def map_data_init(self, map_):

map_has_mob_move = True

def strategy_set_execute(self, formation_index=None, sub_view=None, sub_hunt=None):
def strategy_set_execute(self, formation=None, sub_view=None, sub_hunt=None):
super().strategy_set_execute(
formation_index=formation_index,
formation=formation,
sub_view=sub_view,
sub_hunt=sub_hunt,
)
Expand Down
11 changes: 7 additions & 4 deletions campaign/campaign_war_archives/campaign_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
from module.war_archives.dictionary import dic_archives_template

WAR_ARCHIVES_SWITCH = Switch('War_Archives_switch', is_selector=True)
WAR_ARCHIVES_SWITCH.add_status('ex', WAR_ARCHIVES_EX_ON)
WAR_ARCHIVES_SWITCH.add_status('sp', WAR_ARCHIVES_SP_ON)
WAR_ARCHIVES_SWITCH.add_state('ex', WAR_ARCHIVES_EX_ON)
WAR_ARCHIVES_SWITCH.add_state('sp', WAR_ARCHIVES_SP_ON)
WAR_ARCHIVES_SCROLL = Scroll(WAR_ARCHIVES_SCROLL, color=(247, 211, 66), name='WAR_ARCHIVES_SCROLL')


Expand Down Expand Up @@ -58,12 +58,15 @@ def _search_archives_entrance(self, name, skip_first_screenshot=True):
Fixed number of scrolls until give up, may need to
increase as more war archives campaigns are added
"""
for _ in range(10):
for _ in range(20):
if skip_first_screenshot:
skip_first_screenshot = False
else:
self.device.screenshot()

while self.device.click_record and self.device.click_record[-1] == 'WAR_ARCHIVES_SCROLL':
self.device.click_record.pop()

# Drag may result in accidental exit, recover
# before starting next search attempt
while not self.appear(WAR_ARCHIVES_CHECK):
Expand All @@ -80,7 +83,7 @@ def _search_archives_entrance(self, name, skip_first_screenshot=True):
if WAR_ARCHIVES_SCROLL.at_bottom(main=self):
WAR_ARCHIVES_SCROLL.set_top(main=self)
else:
WAR_ARCHIVES_SCROLL.next_page(main=self)
WAR_ARCHIVES_SCROLL.next_page(main=self, page=0.66)
continue
else:
break
Expand Down
8 changes: 4 additions & 4 deletions campaign/event_20200917_cn/campaign_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ def campaign_set_chapter(self, name, mode='normal'):
if chapter.isdigit():
self.ui_goto_campaign()
self.campaign_ensure_mode('normal')
self.campaign_ensure_chapter(index=chapter)
self.campaign_ensure_chapter(chapter)
if mode == 'hard':
self.campaign_ensure_mode('hard')

Expand All @@ -39,11 +39,11 @@ def campaign_set_chapter(self, name, mode='normal'):
self.campaign_ensure_mode('hard')
elif chapter == 'ex_sp':
self.campaign_ensure_mode('ex')
self.campaign_ensure_chapter(index=chapter)
self.campaign_ensure_chapter(chapter)

elif chapter == 'sp':
self.ui_goto_sp()
self.campaign_ensure_chapter(index=chapter)
self.campaign_ensure_chapter(chapter)

elif chapter in ['t', 'ts', 'ht', 'hts']:
self.ui_goto_event()
Expand All @@ -60,7 +60,7 @@ def campaign_set_chapter(self, name, mode='normal'):
if chapter == 'ex_sp':
self.campaign_ensure_mode('ex')
# Get stage
self.campaign_ensure_chapter(index=1)
self.campaign_ensure_chapter(1)
else:
logger.warning(f'Unknown campaign chapter: {name}')

Expand Down
8 changes: 4 additions & 4 deletions campaign/event_20201029_cn/campaign_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@ def campaign_set_chapter(self, name, mode='normal'):
if chapter.isdigit():
self.ui_goto_campaign()
self.campaign_ensure_mode('normal')
self.campaign_ensure_chapter(index=chapter)
self.campaign_ensure_chapter(chapter)
if mode == 'hard':
self.campaign_ensure_mode('hard')
self.campaign_ensure_chapter(index=chapter)
self.campaign_ensure_chapter(chapter)

elif chapter in 'abcd' or chapter == 'ex_sp':
self.ui_goto_event()
Expand All @@ -57,11 +57,11 @@ def campaign_set_chapter(self, name, mode='normal'):
self.campaign_ensure_mode('hard')
elif chapter == 'ex_sp':
pass # Difference
self.campaign_ensure_chapter(index=chapter)
self.campaign_ensure_chapter(chapter)

elif chapter == 'sp':
self.ui_goto_event() # Difference
self.campaign_ensure_chapter(index=chapter)
self.campaign_ensure_chapter(chapter)

else:
logger.warning(f'Unknown campaign chapter: {name}')
Expand Down
2 changes: 1 addition & 1 deletion campaign/event_20201126_cn/campaign_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ def _campaign_get_chapter_index(name):

def campaign_set_chapter_event(self, chapter, mode='normal'):
self.ui_goto_event()
self.campaign_ensure_chapter(index=chapter)
self.campaign_ensure_chapter(chapter)
return True

def campaign_get_entrance(self, name):
Expand Down
8 changes: 4 additions & 4 deletions campaign/event_20210121_cn/campaign_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ def campaign_set_chapter(self, name, mode='normal'):
if chapter.isdigit():
self.ui_weigh_anchor()
self.campaign_ensure_mode('normal')
self.campaign_ensure_chapter(index=chapter)
self.campaign_ensure_chapter(chapter)
if mode == 'hard':
self.campaign_ensure_mode('hard')
self.campaign_ensure_chapter(index=chapter)
self.campaign_ensure_chapter(chapter)

elif chapter in 'abcd' or chapter == 'ex_sp' or chapter in ['as', 'cs']:
self.ui_goto_event()
Expand All @@ -28,11 +28,11 @@ def campaign_set_chapter(self, name, mode='normal'):
self.campaign_ensure_mode('hard')
elif chapter == 'ex_sp':
self.campaign_ensure_mode('ex')
self.campaign_ensure_chapter(index=chapter)
self.campaign_ensure_chapter(chapter)

elif chapter == 'sp':
self.ui_goto_sp()
self.campaign_ensure_chapter(index=chapter)
self.campaign_ensure_chapter(chapter)

else:
logger.warning(f'Unknown campaign chapter: {name}')
Expand Down
126 changes: 0 additions & 126 deletions campaign/event_20210422_cn/sp.py

This file was deleted.

8 changes: 4 additions & 4 deletions campaign/event_20210722_cn/campaign_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,10 @@ def campaign_set_chapter(self, name, mode='normal'):
if chapter.isdigit():
self.ui_goto_campaign()
self.campaign_ensure_mode('normal')
self.campaign_ensure_chapter(index=chapter)
self.campaign_ensure_chapter(chapter)
if mode == 'hard':
self.campaign_ensure_mode('hard')
self.campaign_ensure_chapter(index=chapter)
self.campaign_ensure_chapter(chapter)

elif chapter in ['a', 'b', 'c', 'd', 'ex_sp', 'as', 'bs', 'cs', 'ds']:
self.ui_goto_event()
Expand All @@ -86,12 +86,12 @@ def campaign_set_chapter(self, name, mode='normal'):
elif chapter == 'ex_sp':
# self.campaign_ensure_mode('ex')
pass # Difference
self.campaign_ensure_chapter(index=chapter)
self.campaign_ensure_chapter(chapter)

elif chapter == 'sp':
# self.ui_goto_sp()
self.ui_goto_event() # Difference
self.campaign_ensure_chapter(index=chapter)
self.campaign_ensure_chapter(chapter)

else:
logger.warning(f'Unknown campaign chapter: {name}')
Expand Down
Loading