sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-09 18:39:04 +08:00
Code
3,370 Commits 9 Branches 0 Tags 274 MiB
5bde0ae25f
Commit Graph

286 Commits

Author SHA1 Message Date
LmeSzinc
a3d26f17a2 Merge branch 'master' into gems_farming 2021-07-03 22:08:39 +08:00
LmeSzinc
7ce057ce8c Fix: Handle if map do not have 2x book setting 2021-07-03 21:59:31 +08:00
LmeSzinc
08325029f1 Merge branch 'master' into gems_farming 2021-07-03 17:00:17 +08:00
LmeSzinc
86d6948551 Opt: Faster detection when 2X book option is not loaded immediately 2021-07-03 16:59:25 +08:00
LmeSzinc
e6facc606a Opt: Cache ButtonGrid.buttons and add move() crop() 2021-06-29 23:04:19 +08:00
nEEtdo0d
8c0be41d7a Fix: interval_reset AUTO_SEARCH_MENU_CONTINUE to account for delay made by handle_2x_book_setting 2021-06-29 08:09:30 -04:00
LmeSzinc
6bd8f7d1de Fix: [CN] Handle User Agreement and Privacy Policy (#446) 2021-06-29 14:42:47 +08:00
LmeSzinc
6607fe6472 Upd: [CN] BOOK_BOX_* assets 2021-06-27 22:03:42 +08:00
nEEtdo0d
1458aadbbf Opt: code style alterations 2021-06-26 11:06:19 -04:00
nEEtdo0d
3a7d4052df Fix: Re-work to combine effort between both previous funcs 2021-06-24 21:00:00 -04:00
nEEtdo0d
f45c16fc4d Upd: public to protected, since are just helper funcs for handle_2x_book_setting 2021-06-24 09:35:43 -04:00
nEEtdo0d
0380e76184 Fix: 2x book can be delayed in appearance onto screen, add timeout ensurance whether present or not 2021-06-22 23:34:27 -04:00
nEEtdo0d
786aa3ee7a Add: [EN, JP, TW] same assets across all servers for new 2x book handling 2021-06-22 22:36:21 -04:00
nEEtdo0d
fb567eefeb Upd: change func signature, minor edits 2021-06-22 22:28:03 -04:00
nEEtdo0d
d43842e025 Fix: incorrect asset reference 2021-06-22 22:12:31 -04:00
nEEtdo0d
8ea03b83e8 Fix: implement using image_color_count instead of Switch class due to inconsistencies in appearance on various campaign UIs 2021-06-22 21:58:49 -04:00
LmeSzinc
3f38f0c7d4 Fix: Add offset argument to all uses of MAP_PREPARATION and FLEET_PREPARATION (#493) 2021-06-20 17:03:35 +08:00
LmeSzinc
d6d56c79d6 Del: Remove GUILD_POPUP_TRIGGERED because AL can receive guild missions automatically now 2021-06-20 16:39:14 +08:00
nEEtdo0d
7a4581a695 Fix: 2x book enable in fleet prep mode, likewise done in auto mode 2021-06-14 13:32:17 -04:00
LmeSzinc
7ba14590a6 Fix: UI changes in fleet preparation 
EN, JP, TW need to update assets except *_IN_USE and check _fleet_sidebar
 2021-06-10 16:07:32 +08:00
nEEtdo0d
770292758b Fix: Remove offset for AUTO_*_BOOK 2021-05-29 17:31:12 -04:00
LmeSzinc
bb33e1d183 Add: Handle maze in map 
- Fix: round_wait when no sirens on map
- Fix: Repeated path end in find_path
 2021-04-23 19:13:37 +08:00
LmeSzinc
1a1519ede5 Fix: Clear mode now unlock after map 100 percent clear 2021-04-17 13:53:13 +08:00
noname94
8c3b433f19 Add: [JP] DAILY_NORMAL_RUN asset 
and minor fixes after font changed
 2021-04-17 11:33:20 +09:00
Zorachristine
48f1047152 Add: [TW] Daily assets 2021-04-17 09:53:19 +08:00
noname94
b8e2321140 Fix: [JP] assets fix after font changed 
Many assets with words need fixes after the font changed. This commit is not complete yet.
 2021-04-16 02:47:31 +09:00
Ray
2474df1397 fix: update [jp] asset USE_DATA_KEY 2021-04-14 18:10:48 +08:00
nEEtdo0d
f1dfc402d2 Opt: Extend handle_2x_book_setting for prep and auto menu 2021-04-09 00:36:24 -04:00
nEEtdo0d
ec04eb7c8c Mov: 2x book check and handle setting 
Opt: Switch for enable and disable for 2x book, get_expected_reduce @property now
 2021-04-02 18:26:00 -04:00
LmeSzinc
51c65f062d Fix: Handle moving normal enemies 
- Add option to disable swipe predict
 2021-03-26 17:15:12 +08:00
LmeSzinc
fe2b48dd52 Upd: [CN] War archives entrance assets 2021-03-15 22:36:59 +08:00
LmeSzinc
17f844fe58 Fix: [CN] LOGIN_CONFIRM 
There are 2 fonts may be used in LOGIN_CONFIRM, so change detection from letter LOGIN to color
 2021-03-12 14:40:50 +08:00
LmeSzinc
4b43011632 Del: Assets STORY_CHOOSE_* 2021-03-08 10:57:49 +08:00
LmeSzinc
71b1e6eefd Fix: Redundant story option in EN 
EN has 2 lines of text in one option, may detected as two option
 2021-03-07 15:51:12 +08:00
LmeSzinc
2b6e6807dc Fix: Detection of story options, changes to color detection 
Current detection of options is based on texture.
But some users get screenshots with a little grayish and have different texture, which result in keep clicking SKIP and ignore the options.
 2021-03-03 22:58:25 +08:00
LmeSzinc
cf494bb35c Opt: Decrease timer in ensure_no_story 2021-02-25 17:44:06 +08:00
whoamikyo
a0f84696e1 Opt: Few changes to match with new notifications system 2021-02-19 20:01:32 -03:00
whoamikyo
f506631456 Added: added GameStuckHandler for C and D battle status 
- game will restart when get C and D battle status now
 2021-02-15 15:14:47 -03:00
Zorachristine
766df5ccea Add:[TW] auto_search assets 2021-02-15 12:23:50 +08:00
noname94
f071d10802 Fix: [JP] STORY_CHOOSE_LONG_n assets fixed 
a little bit different in CN and JP server.
 2021-02-15 03:22:55 +09:00
whoamikyo
e72605ba95 Fix: fixed bluestacks hyper-v multi-instance support 2021-02-13 00:53:19 -03:00
noname94
d37041ee6e Add: [JP] assets for guild and OS 
GUILD_BOSS_ENTER and GUILD_OPERATIONS_JOIN still missing.
Also fixed map name detection in OS and _fleet_sidebar of auto search.
 2021-02-10 18:38:20 +09:00
nEEtdo0d
4bc0788398 Fix: [EN] STORY_CHOOSE_LONG and STORY_CHOOSE_LONG_3 diff from 
other servers, updated shape and location of detection
 2021-02-06 11:23:44 -05:00
nEEtdo0d
a028c1ba43 Merge remote-tracking branch 'origin/master' into operation_siren 2021-02-06 02:29:14 -05:00
Ray
b7f4dabe9f update jp auto_search assets 2021-02-06 13:39:20 +08:00
nEEtdo0d
860789078e Add: [EN] OS Ash, Map, and various Assets 
Opt: [JP, TW] Common OS and other assets
 2021-02-06 00:08:52 -05:00
nEEtdo0d
4e9a2a5c61 Add: handle_popup_single, shared asset GET_MISSION is used in other 
UI pages such as guild
 2021-02-05 22:27:05 -05:00
LmeSzinc
ceaa5d2545 Fix: [CN] GET_MISSION 2021-02-04 21:28:19 +08:00
LmeSzinc
f6327b655d Fix: Handle guild popup in login 2021-02-04 00:02:45 +08:00
LmeSzinc
bccd5650d0 Fix: Move STORY_SKIP to avoid clicking on HOME button 2021-02-03 16:59:38 +08:00
nEEtdo0d
5a33291944 Fix: Update handler assets.py, forgot in last PR 2021-01-31 19:50:55 -05:00
nEEtdo0d
fd61568ad0 Add: USE_DATA_KEY_NOTIFIED action to remove pop up in subsequent runs 2021-01-30 11:52:04 -05:00
LmeSzinc
8e84099073 Fix: [EN] Fleet side bar server difference 2021-01-28 12:27:00 +08:00
Kyo
7873c87c9b
Merge pull request #321 from nEEtdo0d/update_asset 
Fix: Daily Ash and Guild Pop Up
 2021-01-27 22:38:18 -03:00
nEEtdo0d
b2f1b21e9b Add: [EN] AUTO_SEARCH_* assets, 
Verified AUTO_SEARCH_SET_* are at the same location as CN for EN,
likely other servers share this same trait
 2021-01-27 18:28:18 -05:00
nEEtdo0d
eabede70e1 Fix: Merge latest and resolve conflict in module/campaign/run.py 2021-01-27 15:34:37 -05:00
LmeSzinc
f6fdb1e5ec Fix: Auto fallback to original mode if a map don't have auto search 
- Disable auto search in daily hard currently
- Handle auto search menu sometimes disappear
 2021-01-28 02:58:25 +08:00
LmeSzinc
5ac50e6910 Add: Support auto search 2021-01-28 00:35:15 +08:00
nEEtdo0d
b4dd5b2d96 Opt: Daily can also trigger guild pop up, cancel when encountered 
Fix: During campaign, may enter this method too early resulting
in stuck status. Allow method to detect for guild pop up as well
 2021-01-26 14:43:16 -05:00
nEEtdo0d
bb9ebc524e Opt: Match guild pop up handling to predecessor handle_popup_* calls 2021-01-26 13:55:21 -05:00
LmeSzinc
cebb785e14
Merge pull request #318 from noname94/patch1 
Fix: [JP] MAP_STAR_n assets fixed.
 2021-01-24 15:53:45 +08:00
noname94
27b49b736a Fix: [JP] MAP_STAR_n assets fixed 2021-01-24 15:54:08 +09:00
LmeSzinc
8e9e62bb27 Add: Entrance of auto search, but not fully supported yet 
- Add: Option ENABLE_FLEET_REVERSE_IN_HARD
 2021-01-22 23:50:44 +08:00
LmeSzinc
237c871d7d Opt: Add logging STOP_IF_MAP_REACH when parsing map info 2021-01-22 20:50:02 +08:00
nEEtdo0d
55b7e801cb Add: [EN] AUTO_SEARCH_* assets 
Upd: [EN] FAST_FORWARD_* assets

TODO: [JP, TW] Replace placeholder assets based on CN, FAST_FORWARD_*
should be same across servers

TODO: [EN, JP, TW] Guild leaders need additional assets for module guild
 2021-01-21 12:56:00 -05:00
LmeSzinc
453b38f15c Fix: Handle auto search, disable it currently 2021-01-21 19:54:36 +08:00
LmeSzinc
191274c10c Add: Empyreal Tragicomedy A2 AS2 
- Fix: map clear bar in A2
- Fix: Handle mechanics in A2, just able to run, slow
- Opt: perspective parameters
 2021-01-21 17:25:25 +08:00
noname94
e85be55bc1 Add: [JP] GUILD_POPUP_* assets added. 2021-01-20 02:33:07 +09:00
nEEtdo0d
ac6c82a496 Add: MISSION_POPUP_* assets and handling 
TODO: [CN, TW, JP] may need to replace unless POP_UP_* assets are sufficient
EN may be the only server that has altered pop up for these missions
 2021-01-17 22:23:40 -05:00
nEEtdo0d
4e3f275f4c Del: Unused .BUTTON assets for module guild 
TODO: [JP, TW] Replace GUILD_POPUP_*
 2021-01-16 19:23:37 -05:00
nEEtdo0d
918eddb740 Fix: Resolve merge conflict 2021-01-16 09:56:52 -05:00
nEEtdo0d
5c51818c6b Fix: [CN] Correct asset name, adjust code 2021-01-16 09:08:33 -05:00
nEEtdo0d
8dca110761 Add: [EN] GUILD_POPUP_* assets 2021-01-16 08:57:42 -05:00
nEEtdo0d
44442c5876 Add: [EN] GUILD_POPUP_* assets 2021-01-15 11:16:01 -05:00
LmeSzinc
717420aa6a Fix: Handle guild popups 2021-01-15 22:32:06 +08:00
LmeSzinc
58cbc8033c Add: Daily OS ash beacon assist 
- TODO: [EN][JP][TW] Replace assets
 2021-01-15 17:41:39 +08:00
nEEtdo0d
b6e3222927 Opt: [JP, TW] Clean up dev_tool.button_extract output 
Copied placeholder assets from CN to missing servers
 2021-01-01 15:43:59 -05:00
LmeSzinc
c2ab750f0c Del: Complex logic in STOP_IF_MAP_REACH, now it's just how people understand 2020-12-29 23:42:05 +08:00
nEEtdo0d
5453c6b560 Add: Semi-auto operation siren additional assets 
TODO: [CN, JP, TW] Add equivalent GET_MEOWFFICER_ITEMS and MAP_WORLD
STORY_CHOOSE_SHORT_2 does not need to be replaced
 2020-12-27 10:32:42 -05:00
noname94
093c5e8b3e Fix: stuck in retreat confirmation on potato pcs 
and remove duplicate GET_ITEMS_1 in handler assets
 2020-12-27 11:55:52 +09:00
whoamikyo
2a471523f6 Fix: fixed STORY_CHOOSE_LONG_3 2020-12-26 11:37:27 -03:00
Zorachristine
0564665aa9 twassetsfix 2020-12-26 12:44:06 +08:00
LmeSzinc
ddd44d231d Add: STORY_CHOOSE_LONG_3 to choose the first option 2020-12-25 16:38:53 +08:00
LmeSzinc
57822607e1 Add: Semi-auto for operation siren 
- Fix: Clicking on HOME button when skipping story
- TODO: [EN][JP] Replace assets in os_combat and os_handler
 2020-12-23 18:50:51 +08:00
LmeSzinc
12e8ddc87b Fix: ensure_no_unfinished_campaign (#273) 2020-12-23 16:01:12 +08:00
LmeSzinc
b497454edc Opt: Lazy load ambush and enhancement templates 
- Opt: move letter preprocess functions to info_bar.py
 2020-12-16 19:57:57 +08:00
LmeSzinc
7fba5b6cb2 Add: STORY_CHOOSE_LONG_2 2020-11-27 19:45:03 +08:00
LmeSzinc
75c958bb06 Fix: Handle Story with long choosing button 
- Opt: Campaign swipe multiply in SP1
 2020-11-26 18:10:18 +08:00
LmeSzinc
4e9d46fb85 Fix: Handle Game tips 2020-11-26 17:52:24 +08:00
LmeSzinc
4e564cbf71 Fix: UI switching in Vacation Lane 
- Fix: Handle Animation after cleared the 4th enemy
 2020-11-26 17:39:12 +08:00
LmeSzinc
d37e9ba4b0 Opt: Code formatting 2020-11-21 11:14:43 +08:00
nEEtdo0d
7607d50545 Fix: resolve merge conflicts 2020-11-19 11:19:41 -05:00
LmeSzinc
3772d5046f Add: Disable mechanism when reach threat save 2020-11-19 17:43:47 +08:00
nEEtdo0d
f22e5e68a8 Merge remote-tracking branch 'origin/master' into war_archives 2020-11-17 00:31:45 -05:00
noname94
849c86cc78 Revert "Fix: info_bar breaks map edge detection" 
This reverts commit 708c6a8658.
 2020-11-17 10:57:30 +09:00
nEEtdo0d
fc384b3e0a Fix: Remove 'EX' maps not available in war archives, update offset for USE_DATA_KEY 2020-11-16 13:54:23 -05:00
nEEtdo0d
7d2547e5be Fix: Re-implemented per PR comments 2020-11-14 17:54:21 -05:00
nEEtdo0d
af9add1e8e Fix: Winter's Crown incorrect siren template names, map_extractor may need dictionary updates 
Fix: Detection of info window pertaining to data key usage from appear to ocr method
 2020-11-14 00:50:56 -05:00
nEEtdo0d
274e56529a Add: War Archives Campaign Run 
TODO: Update images as needed per server, scroll/next page implementation for page_archives, maybe rename and move war archives events back to where others are and prepend with 'war_archives' for those events
 2020-11-07 13:45:30 -05:00
LmeSzinc
589b125ddc
Merge pull request #232 from noname94/patch2 
Opt: Skip dorm collecting when nothing to collect.
 2020-11-02 20:54:20 +08:00