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
4,097 Commits 9 Branches 0 Tags 274 MiB
f3e62ffaf1
Commit Graph

2906 Commits

Author SHA1 Message Date
LmeSzinc
16daca85b0 Upd: [JP] Joint Battle Mystery Investigation assets 2022-01-27 23:13:26 +08:00
LmeSzinc
9e43da559e Merge branch 'master' into dev 2022-01-27 20:51:20 +08:00
LmeSzinc
7856c5eba5 Add: Joint Battle Mystery Investigation (raid_20220127) 2022-01-27 20:49:46 +08:00
LmeSzinc
1b1968dab4 Opt: Don't stop app if HandleError disabled 2022-01-27 17:11:46 +08:00
LmeSzinc
a758f24b70 Add: OpSi drop record 2022-01-27 17:09:46 +08:00
LmeSzinc
e95a145653 Add: Hermit, another control method 
- Add: Dump hierarchy via ADB and uiautomator2
- Fix: Device screenshot saving
 2022-01-27 16:57:25 +08:00
LmeSzinc
25076cf5e5 Fix: Not enough values to unpack in app_current_adb() 2022-01-25 21:47:39 +08:00
LmeSzinc
824098b829 Fix: Topmost urgent commission not detected in fast PCs 2022-01-25 21:46:12 +08:00
LmeSzinc
a94f1a6441 Fix: Shop item de-redundancy 2022-01-25 21:43:39 +08:00
julystone
88fad11161 Add: Add WarArchives Empyreal Tragicomedy 2022-01-25 11:36:30 +08:00
julystone
1070b0944e Fix: Correct WarArchives's task delay logic 2022-01-25 10:21:15 +08:00
LmeSzinc
35f296b2eb Merge branch 'master' into dev 2022-01-25 01:04:19 +08:00
LmeSzinc
58fa9b5b78 Opt: Prioritize Exercise in SCHEDULER_PRIORITY 2022-01-25 01:02:35 +08:00
LmeSzinc
a2b48ee0c5 Fix: Add click interval in exercise combat to avoid GameTooManyClickError 2022-01-25 00:59:18 +08:00
LmeSzinc
e92579b5f9 Opt: Remove redundant converts from pillow to numpy 2022-01-24 23:43:53 +08:00
LmeSzinc
c5ed59ab26 Opt: Minor changes for log appearances 2022-01-24 23:15:50 +08:00
LmeSzinc
b37114d505 Opt: Release cached assets 2022-01-24 23:15:47 +08:00
nEEtdo0d
42a7a65b83 Fix: missing drake key in NAME_TO_SERIES 2022-01-23 21:58:57 -05:00
LmeSzinc
6d182bb620 Opt: Release OCR models to reduce memory usage 2022-01-24 01:28:47 +08:00
LmeSzinc
9ae9c63b5f Merge branch 'master' into dev 2022-01-24 00:08:43 +08:00
nEEtdo0d
433391bf3b
Merge pull request #891 from nEEtdo0d/shop_revamp_clean 
Opt: shop revamp final; shift to generic alias, no longer passing in unique strings across funcs; redirect shop filter config from old to new format
 2022-01-23 10:41:39 -05:00
LmeSzinc
ea84f2edf0 Opt: Avoid importing numpy and opencv to reduce memory usage of web server process 2022-01-23 23:03:55 +08:00
LmeSzinc
6ed78bdcd2 Opt: Memory optimization in reading assets 2022-01-23 23:03:55 +08:00
LmeSzinc
d7651559a9 Add: OpSi drop record 2022-01-23 23:03:55 +08:00
LmeSzinc
65f166ad12 Refactor: Use numpy image cache instead of pillow image 2022-01-23 23:03:55 +08:00
nEEtdo0d
f379f70213 Add: redirect_utils to comprise any redirection funcs for ConfigUpdater 
Add: redirect research blueprints for Guild/MedalShop from old to new format due to module updates
 2022-01-22 18:01:49 -05:00
LmeSzinc
6df7684a37 Opt: Show help message when having bad port 2022-01-22 23:02:06 +08:00
LmeSzinc
bb68096cfc Fix: Handle adb disconnect, add delay between retries 2022-01-22 23:02:03 +08:00
railzy
f81f76520d Fix: handle research remain 00:00:00 correctly 2022-01-22 22:07:02 +08:00
LmeSzinc
96e7e77c9a Merge branch 'master' into dev 
# Conflicts:
#	module/logger.py
 2022-01-22 18:43:40 +08:00
LmeSzinc
338e32ceb1 Opt: Faster page switching in research receive 2022-01-22 18:41:12 +08:00
Ray
2bffe43481 Fix: research reward when research finished but shows 00:00:00 remain 
#895
 2022-01-22 17:58:19 +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
18870
5b835567d5 Opt: Minor log format adjustment 2022-01-22 16:21:58 +08:00
LmeSzinc
4ae9770098 Fix: Typo in _storage_item_use() retry causing infinite retries 2022-01-22 00:03:48 +08:00
LmeSzinc
fc48b88e03 Fix: Remove non-ascii characters in zone name as a temporary fix 2022-01-21 23:38:34 +08:00
LmeSzinc
278eb91bc7
Merge pull request #893 from lonelyzerg/master 
Add: Use tuning samples option in OpsiDaily
 2022-01-21 23:37:01 +08:00
18870
84c2ecc9ea Revert "Fix: Encoding error" 
This reverts commit e1337158b7.
 2022-01-21 22:38:21 +08:00
18870
e1337158b7 Fix: Encoding error 2022-01-21 22:08:01 +08:00
18870
dd8bf55ca3 Opt: Change HR0 character 2022-01-21 18:58:31 +08:00
18870
b75d7094e0 Opt: Remove date in logging 2022-01-21 17:30:34 +08:00
18870
aea4c81b0b Opt: Limit max width of log 2022-01-21 15:14:26 +08:00
lonelyzerg
26b6b83bf4 copy cn assets to other server 2022-01-20 16:41:09 -06:00
18870
f134dae3ab Opt: Replace benchmark table with rich 2022-01-21 04:59:50 +08:00
18870
9aa383ad64 Fix: Sync changes in daemon overview 2022-01-21 04:11:51 +08:00
18870
6d7374945c Opt: Rich logging 2022-01-21 03:55:30 +08:00
LmeSzinc
f4d798e3d7 Refactor: handle_action_point, easier to understand 2022-01-21 00:40:04 +08:00
nEEtdo0d
ea0ffd89e2 Fix: apply PR/DR format change to generated config defaults 2022-01-20 07:49:32 -05:00
lonelyzerg
145f0eab4f minor fix 2022-01-20 05:27:42 -06:00
lonelyzerg
868eba53fe Move condition check to storage.py 2022-01-20 04:58:32 -06:00
lonelyzerg
d82880e1c3 Add storage_sample_use_all() to use all samples 2022-01-20 03:50:05 -06:00
lonelyzerg
8f060b8484 Add: Use tuning samples option in OpsiDaily 2022-01-20 02:49:45 -06:00
nEEtdo0d
b96113631b Fix: reduce hit area; conflict with gacha page, may enter build 2022-01-19 22:18:06 -05:00
nEEtdo0d
bd875c9e46 Fix: typo shop_medal_grid to shop_grid 2022-01-19 22:01:12 -05:00
nEEtdo0d
f5a61336e4 Fix: shop_items is callable to utilize @Config 2022-01-19 21:58:02 -05:00
nEEtdo0d
acaf89f026 Del: reference each item directly; list no longer needed 2022-01-19 21:47:20 -05:00
nEEtdo0d
ec30ad673e Fix: default shop filter strings; PRBP --> PR; DRBP --> DR, BP no longer expected 2022-01-19 21:45:23 -05:00
nEEtdo0d
2b928a7ae8 Fix: shop infrastructure update; update currency call 2022-01-19 21:43:12 -05:00
nEEtdo0d
bd4f878504 Fix: unique buy handle helper only returns True; if condition no longer needed 2022-01-19 21:38:33 -05:00
nEEtdo0d
4365ecacdc Opt: re-work shop_reward; no longer combined entity; run as individual components 2022-01-19 21:36:37 -05:00
nEEtdo0d
4c7c42cb86 Opt: shop_medal adopt base infrastructure 
Add: run definition to be run as independent component
 2022-01-19 21:35:00 -05:00
nEEtdo0d
b441b062f4 Opt: shop_core adopt base infrastructure 
Add: run definition to be run as independent component
Del: return back shop grid if failed buy handle; raise exception instead
 2022-01-19 21:33:09 -05:00
nEEtdo0d
b0ce3fa80c Opt: shop_guild adopt base infrastructure 
Add: run definition to be run as independent component
Opt: re-work buy handle mechanism; break into smaller pieces rather than consolidated to one definition; compress previous globals into dictionary
 2022-01-19 21:30:33 -05:00
nEEtdo0d
9ea9d17771 Opt: shop_general, shop_merit adopt base infrastructure 
Add: run definition to be run as independent component
 2022-01-19 21:22:41 -05:00
nEEtdo0d
26509d81f3 Opt: remove shop_type argument; shift to general alias name for functions; convert combined entity infrastructure into separate individual components run independently 
Opt: use regexp and filter to parse items in shop and user configured strings
Del: base_globals; move to base
 2022-01-19 21:19:13 -05:00
LmeSzinc
0caf4ba990 Fix: Handle popup to use 2x book (#880) 2022-01-18 22:06:38 +08:00
LmeSzinc
4bf8455ae8 Fix: Split installer to avoid importing winreg on other platforms 
- Fix: Handle a random wmic exception
 2022-01-17 21:50:40 +08:00
LmeSzinc
cbd8e6fc1c Opt: Allow Use2xBook in gems farming 2022-01-17 13:04:38 +08:00
18870
445877e43b Fix: Logging error when update failed 
When retry failed, It calls logger.exception() which use traceback.print_exception() which use print(msg, file=file) to output. In Updater.update(), we monkey patch builtin.print() to logger.info() which don't have keyword argument `file`.
Set logger=None in retry decorator to avoid calling logger.exception()
 2022-01-16 19:51:48 +08:00
18870
4d46ab45e8 Fix: Missing type check on log queue handler thread 2022-01-16 16:24:02 +08:00
18870
701d4bf955 Opt: Catch and print all exception 2022-01-16 15:58:36 +08:00
Ray
9870380e12 Upd: [JP] ESCORT_* assets 2022-01-16 15:19:02 +08:00
Ray
f36bf29640 Upd: [JP] CAMPAIGN_BONUS asset 2022-01-16 15:19:02 +08:00
Ray
50ca1adf78 Upd: [JP] SUBMARINE_MOVE_* assets 2022-01-16 15:19:02 +08:00
Zorachristine
b46d7dea19 Upd: [TW] MISSION_OVERVIEW_* assets 2022-01-16 10:11:50 +08:00
LmeSzinc
153b153899 Fix: Maritime escort assets of EN mistakenly replace the CNs 2022-01-16 01:19:20 +08:00
18870
918d06a893 Fix: Invalid isoformat string: '' 
#883
 2022-01-16 00:57:32 +08:00
18870
7c31ddc04c Opt: Get rid of my import sorter 2022-01-15 23:16:10 +08:00
LmeSzinc
96dbc2c526 Upd: [EN] Maritime escort assets 2022-01-15 22:48:55 +08:00
LmeSzinc
897d179bbd Add: Maritime escort 2022-01-15 22:17:34 +08:00
18870
6e81b91a65 Fix: Retry should raise same exception when failed 2022-01-15 21:46:30 +08:00
LmeSzinc
64f8a087a4 Fix: Uncollected zone exploration rewards prevent exit 2022-01-15 20:13:01 +08:00
LmeSzinc
cc96912996 Opt: Do OpsiDaily first when lack of action points 2022-01-15 19:52:22 +08:00
18870
d3e14e1174 Fix: Don't use join 2022-01-15 18:12:46 +08:00
18870
5954b4acef Fix: Forgot to replace 2022-01-15 18:00:26 +08:00
18870
3253d9e2fc Opt: Allow update without reload 2022-01-15 17:55:54 +08:00
18870
5d5ca5f299 Opt: Rename class, move public variables to a file 2022-01-15 17:55:44 +08:00
18870
d755d74c92 Opt: Disable updater when reload disabled 2022-01-14 22:42:33 +08:00
18870
c808a7bc9f Opt: Add an option to disable reload 2022-01-14 21:34:54 +08:00
LmeSzinc
52dca3db20 Upd: [EN] MISSION_OVERVIEW_* assets 2022-01-14 00:48:09 +08:00
Ray
b8be504cb6 Fix: accept missions with MISSION_OVERVIEW_ACCEPT 
PORT_MISSION_ACCEPT should be replaced by MISSION_OVERVIEW_ACCEPT
 2022-01-14 00:26:21 +08:00
Ray
97a73ce5b4 Upd: [JP] MISSION_OVERVIEW_* assets 2022-01-13 23:53:34 +08:00
LmeSzinc
4af820841d Add: Accept port missions in overview 
- Split OpsiDaily into OpsiDaily and OpsiShop
- Add config redirection
 2022-01-13 18:42:05 +08:00
LmeSzinc
61153482b3 Del: Deprecate port_mission_accept() 2022-01-13 17:48:24 +08:00
LmeSzinc
803e7a5813 Opt: Show exceptions under retry decorator 2022-01-13 17:47:17 +08:00
18870
762f1971c4 Opt: Change directories of reload listening 2022-01-13 17:27:05 +08:00
18870
bab134b763
Merge branch 'LmeSzinc:master' into auto-update 2022-01-12 23:46:39 +08:00
18870
c8a95970d5 Opt: Show commit info in updater 2022-01-12 22:27:56 +08:00
18870
bff8296af5 Opt: State in dev page and update toast 2022-01-11 23:28:40 +08:00
LmeSzinc
e522077277 Add: Handle U522 skill 2022-01-11 22:14:19 +08:00
LmeSzinc
abd91e9b85 Merge branch 'master' into dev 2022-01-11 21:11:31 +08:00
LmeSzinc
5dc207bb69 Del: Modifying CombatScreenshotInterval is not allowed anymore 2022-01-11 21:09:04 +08:00
LmeSzinc
9360601e8e Fix: Typo in os_map_goto_globe() 2022-01-11 20:58:16 +08:00
18870
37e9df5d69 Fix: Update cancel 2022-01-11 18:06:06 +08:00
18870
9261934751 Fix: Missing stop_event 2022-01-11 15:00:28 +08:00
18870
0014c18920 Opt: Check update event when switching task 2022-01-11 14:26:56 +08:00
LmeSzinc
1a0ca67243 Fix: Research preset series_4_blueprint_only 2022-01-11 14:18:15 +08:00
18870
d74e4b5c8c Fix: Cannot trigger reload after clearup 
In scheduled restart, update function runs in task_handler thread, clearup will stop it before it trigger reload.
 2022-01-11 13:44:33 +08:00
18870
3acdfc95f5 Fix: State not update when invisible 2022-01-11 13:40:56 +08:00
18870
d4d9bc9c34 Opt: Some message not shown 2022-01-11 02:51:00 +08:00
18870
1c460bd7a9 Add: Updater in GUI 2022-01-11 02:36:45 +08:00
LmeSzinc
2443a022f7 Fix: TooManyClickError on clicking MODE_SWITCH_1 when going to hard mode 
Loop in switch to normal mode, switch to hard mode, ensure chapter but no stage found, switch to normal mode
 2022-01-11 00:36:49 +08:00
LmeSzinc
ec4fec4f6d Opt: Remove STAGE_SHOWN_WAIT for faster 2022-01-10 23:54:02 +08:00
18870
1d716b27f1 Opt: Remake updater 2022-01-10 22:24:51 +08:00
LmeSzinc
f24390cc8a Merge branch 'master' into dev 2022-01-10 21:45:42 +08:00
LmeSzinc
84917ab4e4 Fix: 5 is not in list, if focused on a region 5 zone in find_siren_stronghold() 
- Lower hue to 285 to fix random detection issues
 2022-01-10 21:16:58 +08:00
LmeSzinc
50b5b49365 Opt: Faster Switch.set(), replace click-wait with click interval 2022-01-10 20:35:07 +08:00
18870
cd7fa9d2c6
Merge branch 'LmeSzinc:master' into auto-update 2022-01-10 19:19:17 +08:00
LmeSzinc
1abc415a03 Fix: Submarine on the upper grid is predicted as fleet arrived (#826) 2022-01-10 18:46:36 +08:00
LmeSzinc
caf476a41d Fix: Find missing submarines in find_submarine() 2022-01-10 17:49:07 +08:00
18870
8a6ca13af6 Fix: Sometime scheduler shows nothing 2022-01-10 16:03:00 +08:00
18870
a0b7dbbd5e Fix: Use config None at first run 2022-01-10 15:21:01 +08:00
18870
3055ab1536 Add: API Token 2022-01-10 15:05:34 +08:00
18870
b34f11dca4 Add: Pip updater 2022-01-10 14:04:02 +08:00
18870
a20f312424 Opt: Arrange code 2022-01-10 13:23:22 +08:00
18870
abf6e94510 Fix: Can bind same address multiple time 
Monkey patched uvicorn.config.Config.bing_socket

- Fix: task_handler in app does not stop when clearup
 2022-01-10 03:32:12 +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
27bc8b3843 Add: Detecting and moving submarines 2022-01-10 00:46:37 +08:00
18870
cb3249deb6 Add: Auto update 2022-01-10 00:42:40 +08:00
LmeSzinc
0ccdede490 Merge branch 'master' into dev 2022-01-10 00:26:18 +08:00
LmeSzinc
a7fa97c5b4 Opt: Click interval on GET_SHIP 2022-01-10 00:25:07 +08:00
LmeSzinc
57c062f542 Opt: Lower NewOperationMaxDate to 15 2022-01-10 00:14:30 +08:00
LmeSzinc
0765be5366 Fix: Disable MAP_IS_ONE_TIME_STAGE in event dailies, last fix not working 2022-01-10 00:13:00 +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
1730b9f395 Add: Configs to call submarine only at BOSS (#864) 2022-01-09 21:06:46 +08:00
18870
50e8dca574
Merge branch 'LmeSzinc:master' into auto-update 2022-01-09 20:55:04 +08:00
18870
5821ddcbbe Add: Update and auto restart 
- Opt: Enter previous page when login
- Opt: Auto refresh page when lost connection
 2022-01-09 20:49:05 +08:00
18870
171a586afd Add: Discord RPC icon 2022-01-09 19:31:40 +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
18870
fdfbfd0b9d Add: Alas stop when have update 2022-01-09 19:01:31 +08:00
18870
e0d38cfff4 Add: Check update 2022-01-09 18:59:25 +08:00
LmeSzinc
9a8f219dd0
Merge pull request #873 from MrGuoRanDuo/master 
Fix: [CN]Bilibili: user agreement extend outside image
 2022-01-09 15:35:34 +08:00
MrGuoRanDuo
24b67f402e Fix: [CN]Bilibili: extend outside image 2022-01-09 15:32:38 +08:00
LmeSzinc
b38694ab1f Fix: Handle map events in os_map_goto_globe 2022-01-09 14:52:57 +08:00
18870
538c26f265 Add: Discord presence 
Not finished yet, but i think there is nothing more i can do
 2022-01-09 12:48:37 +08:00
LmeSzinc
ed45d4895f Upd: Research preset help for pre-optimized filters 2022-01-09 00:41:24 +08:00
LmeSzinc
ec65cf918b Add: Research filter optimizer and optimized presets 2022-01-08 23:32:07 +08:00
LmeSzinc
f8eeb44057 Fix: Handle fleet died without auto search reward 2022-01-08 22:17:24 +08:00