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
8,318 Commits 9 Branches 0 Tags 274 MiB
44b3ae1884
Commit Graph

509 Commits

Author SHA1 Message Date
LmeSzinc
cb2abd107f Merge branch 'master' into dev 2022-12-07 01:50:32 +08:00
LmeSzinc
47f820b7fd
Merge pull request #1951 from LmeSzinc/bug_fix 
Bug fix
 2022-12-07 01:49:40 +08:00
LmeSzinc
98c76297c3 Fix: Opened item info when getting mysteries 2022-12-07 01:47:17 +08:00
下面我簡單喵兩句
1046ba258a
Fix:handler assets (#1944) 2022-12-04 22:43:51 +08:00
LmeSzinc
af02d5e370
Merge pull request #1923 from nEEtdo0d/voucher_shop 
Add: Support OS Voucher Shop
 2022-12-03 16:42:05 +08:00
nEEtdo0d
96cb4aa4e1 Upd: handle_popup_* signature with custom offset; refactor dirty patches 
Upd: SHOP_BUY_CONFIRM_VOUCHER to handle_popup_confirm for server transparency
 2022-12-02 16:32:39 -05:00
LmeSzinc
4755ac586e
Merge pull request #1921 from bookbug666/hunt_and_boss 
Add: Submarine mode 'Hunt and boss'
 2022-12-02 00:10:37 +08:00
SarContDeli
6a4d3b5da5 Opt: Independent option to restart emulator daily 2022-12-01 15:20:14 +08:00
bookbug666
f3297889a4 Fix: wrong and/or usage;fix wrong function;improve translation 2022-11-29 15:06:37 +08:00
bookbug666
db4e30293e Add: Hybrid submarine hunt 2022-11-29 12:01:07 +08:00
LmeSzinc
000ba44a5c Fix: Disable MAP_MYSTERY_MAP_CLICK in chapter TH 2022-11-25 21:56:07 +08:00
LmeSzinc
803c3749aa Add: The Alchemist and the Archipelago of Secrets chapter TH 2022-11-25 01:58:05 +08:00
LmeSzinc
af0b11db40 Upd: [TW] SUBMARINE_MOVE_CANCEL and SUBMARINE_MOVE_CONFIRM (#1734) 2022-10-23 22:56:51 +08:00
LmeSzinc
7c2238ba1f Upd: [EN] USE_DATA_KEY 2022-10-15 23:55:27 +08:00
LmeSzinc
b2533c19b2 Merge branch 'master' into dev 2022-10-07 01:23:22 +08:00
LmeSzinc
3c50346470 Fix: Handle additional stories in B3/D3 between clear mode and threat safe 2022-10-06 16:35:21 +08:00
LmeSzinc
7fb8092950 Refactor: Reuse ui_page_main_popups in LoginHandler 2022-10-02 21:29:56 +08:00
LmeSzinc
13e653bfaa Fix: handle_popup_single() call in guild operations 2022-09-30 22:51:36 +08:00
LmeSzinc
8653f07e1c Fix: Conflict interval of GET_MISSION in ui switching 2022-09-30 11:27:10 +08:00
LmeSzinc
0db836bbd7
Merge pull request #1693 from LmeSzinc/bug_fix 
Upd: [CN] INFO_BAR_* (#1691)
 2022-09-29 18:03:34 +08:00
LmeSzinc
8a57abc922 Upd: [CN] INFO_BAR_* (#1691) 2022-09-29 18:02:05 +08:00
LmeSzinc
4dd2a5a8b5 Refactor: Move del_cached_property to module.base.decorator 2022-09-25 00:31:42 +08:00
LmeSzinc
74c200041d Upd: [TW] INFO_BAR_* (#1679) 2022-09-23 01:27:45 +08:00
LmeSzinc
81fd195560 Upd: [EN] INFO_BAR_* 2022-09-23 01:22:57 +08:00
LmeSzinc
5c95717474 Upd: AUTO_SEARCH_MENU_CONTINUE and AUTO_SEARCH_MENU_EXIT 2022-09-06 22:46:24 +08:00
LmeSzinc
c4714f7638 Fix: Missing offset of LOGIN_CHECK (#1566) 2022-08-28 23:17:40 +08:00
LmeSzinc
85e459ee3b Upd: [TW] USE_DATA_KEY and USE_DATA_KEY_NOTIFIED (fixed #1547) 2022-08-21 22:05:14 +08:00
LmeSzinc
af4c2c299c Fix: Catch timeout in _handle_air_raid() 2022-08-21 01:28:58 +08:00
SarContDeli
ac5466e5dc Upd: Modified some options for restart emulator 2022-08-17 20:22:11 +08:00
LmeSzinc
d1963503a7
Merge pull request #1326 from SaiCateDoan/sim 
Add: Emulator auto detect and restart
 2022-08-14 23:04:04 +08:00
LmeSzinc
e27ebbfab3 Fix: Timer _story_confirm conflict with STORY_SKIP timer 2022-08-05 23:41:00 +08:00
SarContDeli
3d6d777413 Add: Emulator auto detect and restart(experimental) 2022-08-05 09:53:28 +08:00
LmeSzinc
6687033377 Fix: Story skip interrupts auto search (#1478) 2022-08-03 00:45:44 +08:00
LmeSzinc
6702ec234a Fix: Catch server hot fix and restart game immediately 
- Pretty Timer print
 2022-07-31 23:34:40 +08:00
LmeSzinc
76881d68d5 Upd: Popup assets for all servers 2022-07-28 14:58:36 +08:00
LmeSzinc
4c1afd5ea4 Add: Adding projects into research queue 2022-07-17 01:47:26 +08:00
LmeSzinc
22ac87d9ae Fix: Don't check GET_SHIP before logged in (#1325) 2022-07-16 00:13:55 +08:00
LmeSzinc
ad3be48b5a Fix: Check LOGIN_CONFIRM before GET_SHIP (fixed #1152) 2022-07-09 13:03:49 +08:00
hgjazhgj
e779fd7e64 Fix: Misspelling & Line-end spaces 2022-06-25 20:04:45 +08:00
LmeSzinc
0c9494ee10 Fix: Stage increase is not working on main chapters due to different map file namings 2022-06-22 02:19:52 +08:00
LmeSzinc
3a38f803f6 Fix: Stage auto increase to SP4 but event doesn't have SP4 2022-06-20 02:17:58 +08:00
LmeSzinc
217b705c4d Add: Sundered Blue Rerun (event_20220616_cn) 2022-06-16 20:52:35 +08:00
nEEtdo0d
3be54837d4 Upd: [EN] *_PASS_NOTICE assets 
Fix: [EN] DOCK_AMOUNT area too wide; re-crop
Fix: [EN] MAP_ARCHIVES text intersects into area; re-crop
Upd: [EN] clarify enhance config description
 2022-05-29 15:10:45 -04:00
SarContDeli
dd66c8f289 Opt: Modified the options for all screenshots 2022-05-21 00:53:37 +08:00
LmeSzinc
1c9a555963 Fix: Confirm story option stabled to avoid choosing the wrong option 2022-05-17 01:23:19 +08:00
LmeSzinc
8ff93a15e3 Fix: AUTO_SEARCH_OS_MAP_OPTION_OFF is clicked after closing AUTO_SEARCH_REWARD 
which is unnecessary and time wasting
 2022-05-16 20:05:49 +08:00
LmeSzinc
39f720718c
Merge pull request #1117 from Horizon101011/dev 
Opt: Retire next time if material is too little
 2022-05-16 13:23:04 +08:00
LmeSzinc
9f2df3c2c5 Add: Do random map events in OpSi 
- Opt: Select the second story option from the bottom in OpSi
- Fix: ui_mask_homo_stroke in OpSi
- Dev: Fix relative_crop.py
 2022-05-15 00:03:33 +08:00
Horizon101011
f9a15be768 Merge branch 'dev' of https://github.com/Horizon101011/AzurLaneAutoScript into dev 2022-05-12 03:39:21 +08:00
Horizon101011
36ae64be9f Opt: Retire next time if material is too little 
1、Add a material counter. In attempt stage of enhancement, if available material is less than 3, counter += 1, else counter += 3. This process will run only once during an enhancement. After an enhancement process, check this counter. If it is less than 3, ALAS will retire next time when calling retirement module to avoid frequent enhancement while enhancement material is too little.
2、Moving assets to corresponding position.
 2022-05-12 03:38:29 +08:00
LmeSzinc
3c0b97e47f Fix: Not using auto search in event SP 2022-05-01 01:35:39 +08:00
LmeSzinc
8231b6a294 Add: Rondo at Rainbow's End chapter SP 
- Fix: Clear mode switching in SP
 2022-04-29 21:50:24 +08:00
LmeSzinc
3b8da700d3 Fix: Disable auto search temporarily instead of turning it off in user config 2022-04-29 11:41:27 +08:00
LmeSzinc
aa969ca090
Merge pull request #1047 from SaiCateDoan/fleetorder 
Opt: AutoSearchFleetOrder is merged into FleetOrder
 2022-04-23 16:06:49 +08:00
LmeSzinc
b6a5982db9 Opt: Enhancement clean up 2022-04-23 16:05:03 +08:00
LmeSzinc
f9e9ea856a
Merge branch 'dev' into Iss777 2022-04-23 15:48:33 +08:00
SarContDeli
f1e500a8a8 Opt: AutoSearchFleetOrder is merged into FleetOrder 2022-04-23 14:11:00 +08:00
LmeSzinc
ed5371cd11 Fix: map_has_clear_mode property in SP stages (#1035) 
- Del: Remove 2x book option in SP
 2022-04-19 20:49:57 +08:00
nEEtdo0d
f04a35b078 Upd: [EN] LOGIN_GAME_UPDATE, BATTLE_STATUS; text size/thickness changed 
Fix: [EN] restore commit df6e9385; skill exp detection read incorrectly
 2022-04-15 14:35:31 -04:00
Egor Nats
6eac8ae259 Opt: Imports isorted 2022-04-14 16:37:54 -03:00
nEEtdo0d
e57309d888 Upd: [EN] additional post update assets 
Add: restore select partial commits; 1e13eab, c3c0ba4, 1cc28f5
 2022-04-12 22:55:49 -04:00
Egor Nats
1ebe64950a Fix: [EN] Revert to old assets 
- Tactical class and Dorm feature still broken, please disable until fix.
 2022-04-12 11:20:34 -03:00
LmeSzinc
987b7b7b4e Fix: Handle game freeze at the first retreat after client start 2022-04-12 18:17:48 +08:00
SaarChaffee
303dd90fdc change CRLF to LF 2022-04-09 23:31:09 +08:00
LmeSzinc
1e6d3ba2d9 Fix: Stuck on map withdraw because cache is not cleared 2022-04-09 16:56:43 +08:00
nEEtdo0d
7779bc7672 Upd: [EN] remaining post major update assets 
Upd: [EN] adopt same style as other servers for MAIN_GOTO*

TODO: other uncommon assets updated when available; debug tactical class, stuck frequently
 2022-04-08 19:09:08 -04:00
nEEtdo0d
1cc28f524f Upd: [EN] post major app update bulk assets; WIP part 3 2022-04-08 01:28:25 -04:00
nEEtdo0d
96b39a9ea5 Upd: [EN] post major app update bulk assets; WIP part 1 2022-04-07 22:32:24 -04:00
LmeSzinc
8d25e709c3 Fix: Handle battle pass notice 2022-03-31 21:32:34 +08:00
LmeSzinc
af3e402c49 Fix: Handle monthly pass notice 2022-03-31 21:32:17 +08:00
LmeSzinc
55c8c9da3f Fix: Cannot set submarine role when auto search is not available 2022-03-16 02:10:16 +08:00
Horizon101011
2f5b19949e Opt: Refactor module enhancement 2022-03-12 01:22:31 +08:00
LmeSzinc
14fc2cab5d Opt: Enemy selection in Counterattack Within the Fjord 
And handle the stories in it
 2022-03-10 14:40:50 +08:00
LmeSzinc
1ad23dbe90 Fix: Watch device orientate when starting app 
- Opt: Skip screen size check at the first screenshot when game is not started
 2022-03-06 19:18:35 +08:00
LmeSzinc
49c9e0afd9 Add: Abyssal Refrain chapter AC 
- Add: clear_bouncing_enemy()
- Opt: Retry faster if fleet was caught by a moving enemy
 2022-02-24 21:34:16 +08:00
Horizon101011
6ba0a755db Opt: Refactoring logic of ship enhancement 
Using a new judgement logic similar to the state machine. Judge the state according to the appearance and disappearance of enhancement material after some operations, instead of only depending on info_bar. The new logic is more robust, even in poor equipment (simulating by delaying 5s)
 2022-02-23 00:06:11 +08:00
LmeSzinc
839fb18661 Fix: MapDetectionError raised in submarine move (#937) 2022-02-17 21:36:27 +08:00
nEEtdo0d
9e5d42a85b Add: [EN] submarine handler assets 2022-02-15 19:41:01 -05:00
LmeSzinc
e754e45edb Opt: Faster story handling in event maps 
- Del: Remove the use of handle_map_after_combat_story
- Opt: Skip checking arrive_timer when having a result
- Fix: Map detection is still working on story popup
 2022-02-10 18:25:51 +08:00
LmeSzinc
fe8fff68b0 Fix: Saving drop screenshots in OpSi abyssal 
- Increase timer of wait_until_camera_stable()
 2022-02-06 02:35:22 +08:00
LmeSzinc
893dc62afb Opt: [CN] Handle user agreement in pure image detection 
- Add image_color_button()
- Remove unused assets in login
 2022-02-02 19:44:58 +08:00
LmeSzinc
e92579b5f9 Opt: Remove redundant converts from pillow to numpy 2022-01-24 23:43:53 +08:00
LmeSzinc
b37114d505 Opt: Release cached assets 2022-01-24 23:15:47 +08:00
LmeSzinc
65f166ad12 Refactor: Use numpy image cache instead of pillow image 2022-01-23 23:03:55 +08:00
LmeSzinc
8374174d55 Refactor: module/device, separate all screenshot method and control methods 
- Better screenshot and control retries, handle common exceptions
 2022-01-22 17:42:47 +08:00
LmeSzinc
0caf4ba990 Fix: Handle popup to use 2x book (#880) 2022-01-18 22:06:38 +08:00
Ray
50ca1adf78 Upd: [JP] SUBMARINE_MOVE_* assets 2022-01-16 15:19:02 +08:00
LmeSzinc
50b5b49365 Opt: Faster Switch.set(), replace click-wait with click interval 2022-01-10 20:35:07 +08:00
LmeSzinc
84f5e86077 Fix: Hunt zone view re-enabled by game 
- Fix: Validate switch status
 2022-01-10 01:27:03 +08:00
LmeSzinc
1b5ecb21ac Opt: A revert of "Fix: Handle submarine view icon bug" 
Finally, that bug was fixed by game devs after 17 months.
 2022-01-09 23:10:09 +08:00
LmeSzinc
487d4ed9e8 Fix: Force to disable auto submarine call if only calling submarine at boss 2022-01-09 21:06:46 +08:00
LmeSzinc
63b6e07a45 Merge branch 'master' into dev 2022-01-09 19:26:49 +08:00
LmeSzinc
c5a04c55dc Add: Submarine move in map (#864) 2022-01-09 19:26:49 +08:00
MrGuoRanDuo
24b67f402e Fix: [CN]Bilibili: extend outside image 2022-01-09 15:32:38 +08:00
MrGuoRanDuo
0c4850bb9e Fix: [CN]Bilibili: user agreement and login btn 2022-01-03 01:40:35 +08:00
LmeSzinc
e89d07da12 Add: Tower of Transcendence chapter BD 
- Fix: BATTLE_STATUS_B was clicked after EXP_INFO
- Fix: STORY_SKIP offset
- Fix: One-time stages in stage auto increase
 2021-12-30 17:46:30 +08:00
hephooey
bfff82c778 Update LOGIN_GAME_UPDATE assets for tw servers 2021-12-15 23:57:08 -05:00
LmeSzinc
ae41f8fd0e Merge branch 'dev' 2021-12-09 23:33:48 +08:00
LmeSzinc
6e0bded8c4 Add: OpSi fleet filter 
- Fix: Showing disabled tasks in scheduler
- Fix: Fleet lock not detected in OpSi
- Fix: Filter presets are case sensitive
- Opt: Increase confirm timer in question_goto()
 2021-12-08 21:47:09 +08:00
LmeSzinc
d5735604e1 Dev: Uniform comments of generated files 2021-12-07 23:29:33 +08:00
LmeSzinc
caf51858e9 Add: Attack abyssal boss 2021-12-06 20:56:57 +08:00
Zorachristine
7cb6bf9e33 Fix: [TW] BOOK_BOX_AUTO & BOOK_CHECK_AUTO assets 2021-12-06 20:21:54 +08:00
LmeSzinc
c76313e02d Opt: Force to disable auto search if StopCondition.MapAchievement is not 'non_stop' 2021-11-30 18:27:49 +08:00
LmeSzinc
8ac6e59f2a Upd: Update World-spanning Arclight 
- Fix: Varies map mode switches
- Fix: Handle stories in map detection
- Upd: GAME_TIPS
 2021-11-26 01:17:49 +08:00
LmeSzinc
9b5df053f9 Add: Event maps in World-spanning Arclight (event_20211125_cn) 2021-11-26 01:17:48 +08:00
Cola
82f354da03 Fix: [TW] Submarine&Fleet assets 2021-11-25 13:31:47 +08:00
LmeSzinc
790515c800 Fix: Delay the wrong task after restart (#755) 2021-11-22 22:40:11 +08:00
LmeSzinc
153c9fb491 Revert "Fix: fix switch over missclick due emulator slowdown" 
This reverts commit cabbec29
 2021-11-22 17:44:46 +08:00
nEEtdo0d
3ff20265cb Fix: can enter early; add clause into handle_in_map_with_enemy_searching 2021-11-19 18:47:54 -05:00
LmeSzinc
e984859ad6 Add: Goto main page when task queue is empty 
- Refactor: Task waiting
- Fix: Saving config twice in nested multiset wrapper
 2021-11-14 01:10:36 +08:00
nEEtdo0d
f7035922fc Fix: [EN] IN_MAP not detected 2021-11-11 19:09:10 -05:00
LmeSzinc
1a1eceec41 Fix: Trying to select submarine auto search mode when not using submarines 
- Del: Remove Submarine_AutoSearchMode in stages without auto search
 2021-11-11 21:19:57 +08:00
nEEtdo0d
c902549ad0 Fix: [EN] Use asset button gif support for POPUP_CONFIRM and POPUP_CANCEL 
TODO: [JP] can make gif equivalents for same assets and adjust retirement to use handle_popup_confirm
 2021-11-10 19:42:56 -05:00
LmeSzinc
963437acb4 Opt: Use absolute ADB path 
- AzurLaneUncensored failed to push when using relative path
 2021-11-09 22:17:20 +08:00
Cola
dfa619ae45 Fix: [JP] USE_DATA_KEY_NOTIFIED asset 2021-11-07 19:59:49 +08:00
LmeSzinc
5b05a24cab Fix: Sleep length must be non-negative error after DST 2021-11-07 17:47:52 +08:00
Ray
d255c116f2 Upd: [JP] AUTO_SEARCH_SET_SUB assets 2021-11-07 15:47:23 +08:00
nEEtdo0d
1914f0af58 Upd: [EN] AUTO_SEARCH_SET_SUB assets 2021-11-06 11:01:32 -04:00
LmeSzinc
b554a39351 Refactor: Fleet switching and fleet reverse 
- Revert swipe limit of ensure_edge_insight
 2021-11-06 22:25:14 +08:00
lonelyzerg
e047031887 Change sub_auto_summon to sub_auto_call, add en and tw translation 2021-11-06 08:54:06 -05:00
lonelyzerg
dea996596d Add translation for subs, modified logging for auto search selction 2021-11-06 06:56:31 -05:00
lonelyzerg
5b444b73a6 Add Submarine Auto Search Selection 2021-11-06 06:35:13 -05:00
LmeSzinc
3098aa31aa Fix: Stop scheduler if a task failed 3 or more times 
- Add: Clear click record
- Opt: Check the type of user setting and display invalid settings
 2021-11-03 20:46:34 +08:00
LmeSzinc
3249190d61 Opt: Longer wait on stage bonus drops, still a poor implementation 2021-10-25 17:49:49 +08:00
LmeSzinc
31cd872145 Fix: Flares counted as mystery in W14 
- Refactor: Separate handle_mystery
 2021-10-22 02:11:07 +08:00
LmeSzinc
150eda12c7 Fix: Negative sleep length 2021-10-19 21:19:13 +08:00
LmeSzinc
6bf5f9fa92 Add: TaskHoardingDuration and CloseGameDuringWait (#643) 2021-10-18 21:36:22 +08:00
LmeSzinc
4143f26145 Add: Stage Increase for exploring stages one by one (#192) 2021-10-16 19:10:45 +08:00
LmeSzinc
8b052e7dd3 Fix: More campaign reward popup handlers 2021-10-15 21:55:32 +08:00
LmeSzinc
1a683b02a4 Merge branch 'master' into app 2021-10-15 21:22:41 +08:00
Ray
2b074cd213 Fix: [JP] VOTE_CANCEL & SHOP_SELECT_PR1 assets 2021-10-15 09:39:57 +08:00
LmeSzinc
b01e042c04 Merge branch 'master' into app 2021-10-15 02:48:16 +08:00
LmeSzinc
53482ab6d4 Upd: [EN][JP] Auto search assets 2021-10-15 02:43:06 +08:00
nEEtdo0d
4cb52b66a7 Merge branch 'master' into app 
# Updates EN VOTE_CANCEL
# Mitigates multi-click for submit-gacha in case of slow transition
 2021-10-14 11:41:21 -04:00
nEEtdo0d
cc193f96b7 Upd: validate and re-try mechanism for notified check box 2021-10-14 11:32:33 -04:00
nEEtdo0d
bc8536f492 Fix: [EN] VOTE_CANCEL asset 2021-10-14 11:23:32 -04:00
LmeSzinc
6a4064e57f Merge branch 'master' into app 
# Conflicts:
#	module/config/event.py
 2021-10-14 22:07:50 +08:00
LmeSzinc
9b2543f4a7 Upd: [TW] Auto search settings assets 2021-10-14 22:04:34 +08:00
LmeSzinc
21c25ebf3e Fix: Retry selecting auto search options if it's not loaded that fast 2021-10-14 21:56:57 +08:00
LmeSzinc
15d1aae6b3 Opt: Wait campaign bonus show up 2021-10-14 20:48:35 +08:00
LmeSzinc
fe99f712b2 Upd: Campaign bonus drop screenshots 2021-10-14 17:51:36 +08:00
LmeSzinc
01d49bb752 Merge branch 'master' into app 2021-10-14 17:48:12 +08:00
LmeSzinc
6e2b418ddd Fix: AUTO_SEARCH_ON/OFF assets, handle vote popup 2021-10-14 17:37:02 +08:00
nEEtdo0d
2fdb7447a3 Fix: same appear clause for both areas 2021-10-11 00:00:10 -04:00
nEEtdo0d
d9cec4134e Add: war archives support for app 2021-10-10 23:38:10 -04:00
LmeSzinc
672f5b4608 Fix: Daily app restart 2021-09-25 00:51:51 +08:00
LmeSzinc
b2ea5f897f Fix: Auto search option handling after retire 2021-09-18 18:45:35 +08:00
LmeSzinc
5ed75c8de5 Merge branch 'master' into app 
# Conflicts:
#	module/config/config.py
#	module/map/fleet.py
#	module/ui/ui.py
 2021-09-17 23:53:15 +08:00
LmeSzinc
017df17029 Fix: Path finding when grids blocked by fortress 2021-09-17 18:23:25 +08:00
LmeSzinc
61cbe75527 Refactor: More accurate exceptions and add friendly advices 2021-09-16 12:09:00 +08:00