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
6,855 Commits 9 Branches 0 Tags 274 MiB
b91bf31bc3
Commit Graph

422 Commits

Author SHA1 Message Date
nEEtdo0d
1d433efc7b Fix: merge LmeSzinc/dev into branch, resolve conflicts 2022-12-01 10:52:40 -05:00
nEEtdo0d
c2d8fad6bb Del: Opsi archive zone monthly task support; currently not a monthly trend maybe will be in the future 2022-12-01 10:41:05 -05:00
LmeSzinc
c9d296ad76 Merge branch 'master' into dev 2022-12-01 01:08:54 +08:00
LmeSzinc
0f84712d6a Fix: Task switched in os_cross_month 2022-12-01 00:35:16 +08:00
SarContDeli
69d72e508b Opt: Optimized logic of delay abyssal 2022-11-30 21:10:34 +08:00
SarContDeli
c9d9ca6cc5 Merge branch 'bug_fix' into base 
# Conflicts:
#	alas.py
#	config/template.json
#	module/config/argument/args.json
#	module/config/argument/menu.json
#	module/config/argument/task.yaml
#	module/config/i18n/en-US.json
#	module/config/i18n/ja-JP.json
#	module/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json
#	module/os/map.py
 2022-11-30 20:56:52 +08:00
nEEtdo0d
bc3376e191 Fix: merge LmeSzinc/dev into branch, resolve conflicts 2022-11-29 15:04:47 -05:00
LmeSzinc
c29279420e Fix: Redundant click of MAP_GOTO_GLOBE_FOG in os_map_goto_globe() 2022-11-30 01:51:11 +08:00
LmeSzinc
b8d06b12e5 Add: OpsiCrossMonth, not tested 2022-11-30 01:40:53 +08:00
nEEtdo0d
afc8468e0a Add: Opsi archive zone monthly task support 2022-11-28 00:21:52 -05:00
nEEtdo0d
629addada4 Add: Opsi voucher monthly task support 2022-11-26 23:44:38 -05:00
SarContDeli
f4abcb4740
Fix: Wait too long in interrupt_auto_search (#1889) 2022-11-21 23:11:57 +08:00
SarContDeli
a258ef4435
Merge pull request #1871 from SaiCateDoan/hz1 
Add: hazard 1 leveling
 2022-11-16 17:39:55 +08:00
SarContDeli
1b47e69496 Upd: Refactored part of hazard 1 leveling 2022-11-15 17:23:34 +08:00
LmeSzinc
5e4ea44c68 Fix: Combat appear check should before enemy searching check 2022-11-13 02:06:08 +08:00
SarContDeli
1f38e92e02 Add: hazard 1 leveling 2022-11-12 00:05:30 +08:00
LmeSzinc
07a900381f Upd: [TW] Name of the zone 154 2022-11-02 21:53:37 +08:00
SarContDeli
7599275b51 Opt: Handle Stronghold at day before reset 2022-10-31 21:22:15 +08:00
LmeSzinc
b2533c19b2 Merge branch 'master' into dev 2022-10-07 01:23:22 +08:00
LmeSzinc
1ce70da471 Fix: Call handle_current_fleet_resolve only at os_init 
instead of every after_auto_search to avoid loop in os explore
 2022-10-06 22:37:04 +08:00
LmeSzinc
a711051b40 Fix: Handle low resolve debuff after OpSi abyssal 2022-10-06 17:55:03 +08:00
LmeSzinc
10f9d240e0 Fix: Compatible with game setting: Auto Mode in secured zones 2022-10-06 17:28:47 +08:00
LmeSzinc
769e14ef33 Opt: Save errors when zone locked in OpSi explore 2022-10-06 16:09:03 +08:00
nEEtdo0d
109e8645d9 Upd: alter commit (c153b23); reduce to single asset in conditions with minimal offset, asset cut should be server transparent (#1527) 2022-10-04 00:25:42 -04:00
LmeSzinc
436d8ab645 Opt: Call OpsiDaily and OpsiShop when OpsiExplore is finished 2022-10-03 14:50:47 +08:00
nEEtdo0d
c153b23663 Fix: is_in_map detect for stronghold visual fog (#1527) 
Fix: os_globe_goto_map handle visual fog globe button (#1527)

TODO: [CN, TW, JP] equivalent *_FOG asset; enter stronghold and step on swamp / poison-looking tile to trigger fog state
 2022-10-03 00:48:46 -04:00
nEEtdo0d
d9014b73f7 Fix: [EN] simpler whitespace trimmer; ocr misread hotfix 2022-10-02 23:49:11 -04:00
LmeSzinc
8d1b7adb84 Fix: RecursionError in os_map_goto_globe() 
when exploration rewards uncollected and fleet has EMP debuff which need to exit current zone
 2022-10-02 17:49:51 +08:00
LmeSzinc
ec3eabfd01 Fix: Auto search unlock check not working 2022-10-02 17:30:24 +08:00
LmeSzinc
b8d022ab53 Fix: Collect exploration rewards that are ignored by auto search 2022-10-02 17:10:38 +08:00
LmeSzinc
4ba42f85c0 Fix: OpSi radar and buttons slide out from the right 2022-09-25 01:48:34 +08:00
LmeSzinc
1f67a9a109 Add: Get and set config across tasks 2022-09-06 22:20:29 +08:00
LmeSzinc
de658ee797 Fix: OpSi can't swipe on the edge of buff icons 2022-09-01 22:40:11 +08:00
nEEtdo0d
d05b5cb625 Fix: [EN] adjust OCR parameters; additional string replace hot fixes (#1479) 
Upd: [EN] map name asset; font/size changes post maintenance
 2022-08-14 12:44:33 -04:00
nEEtdo0d
66e938edcb Add: zone_init new clause when mission header/tab appears down center; can block map name or mis-read OCR due to extra text 
Upd: zone_init move handle clauses before OCR attempt on map name
 2022-08-14 12:43:05 -04:00
nEEtdo0d
a042aa8615 Upd: [EN] auto search option assets; placement change post maintenance 
Upd: info output to match func parameters
 2022-08-14 12:40:59 -04:00
LmeSzinc
5239c632f2 Fix: Loop tries on 2 adjacent fleet mechanism (#1475) 2022-08-04 21:11:35 +08:00
LmeSzinc
428cf48b25 Fix: Confirm to submit items, in siren scanning devices 2022-08-04 18:54:33 +08:00
LmeSzinc
e02a15f281 Fix: Handle uncollected zone exploration rewards (#1478) 2022-08-03 00:32:16 +08:00
LmeSzinc
d25504f970 Fix: Increase threshold of wait_until_walk_stable() 2022-07-31 01:41:41 +08:00
LmeSzinc
c19290fd56 Fix: [EN] Zone name with passage 2022-07-13 23:02:11 +08:00
LmeSzinc
e1f1768779 Fix: UI haven't fully loaded after get_current_zone_from_globe() 2022-07-12 23:58:10 +08:00
LmeSzinc
dbef8fb79c Fix: [EN] Zone name with passage 2022-07-12 18:58:48 +08:00
LmeSzinc
15061059ed Fix: [EN] Zone name Gibraltar 2022-07-09 22:18:48 +08:00
LmeSzinc
4b843ed06b Fix: Use the same similarity in zone select 2022-07-05 00:26:00 +08:00
LmeSzinc
0f48589c98 Fix: Handle exchange shop popup after OpSi reset 2022-07-02 16:37:53 +08:00
LmeSzinc
da78c647ae Fix: Handle more accidental clicks in wait_until_walk_stable() 2022-07-02 15:17:38 +08:00
LmeSzinc
2bdfe60509 Fix: [EN] '-' is missing in OpSi zone name 2022-07-01 01:20:11 +08:00
hgjazhgj
e779fd7e64 Fix: Misspelling & Line-end spaces 2022-06-25 20:04:45 +08:00
LmeSzinc
52a6e44d53 Fix: Handle popups in OpSi map detection 2022-06-11 23:14:59 +08:00
LmeSzinc
3dbd38049a Fix: Handle AUTO_SEARCH_REWARD in os_map_goto_globe 2022-06-03 02:23:03 +08:00
LmeSzinc
515beddde5 Fix: Fleet Mechanism detection 
- Fix: Special whether on opsi map are detected as fleet mechanism
 2022-06-03 00:27:49 +08:00
LmeSzinc
01fd16c8bf Fix: More edge cases in OpSi detection 
Fix: Retry after handle_retirement() in OpSi
Fix: Stuck after getting OS auto search reward
Fix: Handle AUTO_SEARCH_REWARD at map detection
Set all offset of AUTO_SEARCH_REWARD to (50, 50)
Fix: Accidentally entered globe map in wait_until_walk_stable()
 2022-06-02 01:57:32 +08:00
LmeSzinc
5a91c13ad1 Fix: clear_question is called in OpsiStronghold (fixed #1149) 2022-05-26 00:08:09 +08:00
SarContDeli
dd66c8f289 Opt: Modified the options for all screenshots 2022-05-21 00:53:37 +08:00
SarContDeli
7db5af2a88 Opt: Combined save and upload options 2022-05-20 15:25:32 +08:00
LmeSzinc
7f78926e89 Del: OSMap class code cleanup 2022-05-19 20:50:13 +08:00
LmeSzinc
c89f37865b Refactor: Combine OSGlobe and OSMap 
- Fix: Fleet repair in OpsiExplore
 2022-05-18 00:51:54 +08:00
LmeSzinc
ed7c7a6fb8 Fix: Fleet repair after map rescan 2022-05-17 20:44:57 +08:00
LmeSzinc
dd879d8088 Fix: STORY_OPTION=0 to choose the first option in special OpSi zones 2022-05-17 02:24:27 +08:00
LmeSzinc
1c9a555963 Fix: Confirm story option stabled to avoid choosing the wrong option 2022-05-17 01:23:19 +08:00
LmeSzinc
15ae857212 Fix: Retry on Camera.update() to allow random MapDetectionError 2022-05-16 21:38:56 +08:00
LmeSzinc
94c2891428 Opt: Rescan only once in SAFE zones 2022-05-16 21:36:23 +08:00
LmeSzinc
ecbfb47302 Fix: HOMO_CANNY_THRESHOLD in OpSi 2022-05-16 20:00:45 +08:00
LmeSzinc
32f939f2bb Fix: Siren scanning tower and logging device are not detected if they are covered by other fleets 2022-05-16 19:54:51 +08:00
LmeSzinc
5867754de1 Fix: Edge detection in OpSi obscure and abyssal 
- Fix: Increase threshold of OCR_SHOP_YELLOW_COINS
- Fix: Akashi's shop has been checked twice
 2022-05-16 01:54:48 +08:00
LmeSzinc
ee4f85ebda Add: OpsiDaemon.SelectEnemy 
- Add archive detection on radar
 2022-05-16 01:30:05 +08:00
LmeSzinc
9094e4dcf4 Add: GUI option OpsiGeneral.DoRandomMapEvent 2022-05-15 17:52: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
LmeSzinc
2e072a4e47 Fix: Arrive port on radar but port entrance not appear 2022-05-11 20:38:54 +08:00
LmeSzinc
0bd4467ccb Fix: Lower threshold of SELECT_* assets 2022-05-03 20:57:59 +08:00
LmeSzinc
d81a86923d Fix: Port dailies are skipped 2022-05-01 21:13:06 +08:00
LmeSzinc
71885d1544 Opt: Add config_override() teaching people how to use a bot 2022-04-29 11:59:12 +08:00
LmeSzinc
7558b12b91 Fix: OpSi auto search interrupted by retirement 2022-04-26 00:21:22 +08:00
LmeSzinc
516e2d1f7e Fix: Run auto search in OpSi port but not in zone 154 2022-04-25 20:57:06 +08:00
LmeSzinc
cd49c097b6 Fix: Click on MAP_GOTO_GLOBE in os_mission_enter() 2022-04-23 12:39:05 +08:00
Egor Nats
6eac8ae259 Opt: Imports isorted 2022-04-14 16:37:54 -03: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
SaarChaffee
303dd90fdc change CRLF to LF 2022-04-09 23:31:09 +08:00
LmeSzinc
e697cd0121 Fix: Target Zone ID of Meowfficer Farming is sometimes ignored (#998) 2022-04-09 17:57:55 +08:00
nEEtdo0d
96b39a9ea5 Upd: [EN] post major app update bulk assets; WIP part 1 2022-04-07 22:32:24 -04:00
LmeSzinc
b7470e0601 Fix: Loop in mission accept when OpsiExplore is running and reached the maximum number of mission holdings 2022-04-04 14:11:23 +08:00
LmeSzinc
793fef3a77 Fix: AttributeError when failed to update os image 2022-04-03 12:23:26 +08:00
LmeSzinc
454a07723d Fix: Some OpSi missions are missed 2022-04-03 12:11:08 +08:00
LmeSzinc
b20e2b7863 Opt: Do missions at port when OpsiExplore is running 2022-04-01 21:24:53 +08:00
LmeSzinc
9b3544e1ac Fix: Handle EMP debuff in opsi that limits fleet steps 2022-04-01 18:38:12 +08:00
LmeSzinc
4f4c5d5be6 Opt: Receive mission rewards when having OpsiExplore running 
- Opt: Faster retry in storage_enter()
 2022-04-01 00:35:25 +08:00
LmeSzinc
a3799675cb Opt: Delay OpSi tasks 2.5 hours at the last day of every month 2022-03-31 22:33:47 +08:00
LmeSzinc
91328126ed Opt: Auto reduce ActionPointPreserve at the end of every month 
- Opt: Use turning samples in OpsiExplore
- Opt: Schedule OpsiExplore to next month instead of turning it off
 2022-03-31 19:53:55 +08:00
LmeSzinc
ae1d18055b Fix: Redundant globe_goto call when fleet was already repaired at port 2022-03-23 20:35:39 +08:00
railzy
523f0fe8ca Upd: [JP] SELECT_ARCHIVE & ZONE_ARCHIVE assets 2022-03-05 21:49:23 +08:00
LmeSzinc
1c28482fa6 Fix: Confirm OpSi storage empty cause items are slow to load sometimes 2022-03-02 20:59:14 +08:00
LmeSzinc
f4fcf98133 Add: Support zone name input in OpsiExplore.LastZone 2022-03-01 22:58:54 +08:00
LmeSzinc
f08fb26996 Add: Upload OpSi drop screenshots 2022-02-28 17:21:23 +08:00
nEEtdo0d
3fc5dea783 Add: [EN] OpSi archive zone assets 2022-02-25 10:41:11 -05:00
LmeSzinc
573978040a Add: Run OpSi archive zone as OpSi daily 2022-02-25 13:00:55 +08:00
nEEtdo0d
3e87ae310a Add: handle low resolve debuff after repair for stronghold task 2022-02-18 16:37:14 -05:00
nEEtdo0d
f65226d92f Fix: may result in nested call; entering port twice unnecessarily 2022-02-18 15:41:37 -05:00
LmeSzinc
50ec438da1 Add: Meowfficer farming in center zones 2022-02-17 21:36:27 +08:00
LmeSzinc
f8800d2567 Fix: Increase retry interval of buying Akashi's shop and MAP_GOTO_GLOBE for potato PCs 2022-02-12 17:14:55 +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
eec0e8927c Add: Save drop screenshots in OpSi abyssal 2022-02-02 16:21:28 +08:00
LmeSzinc
d591334c76 Fix: Handle locked zones in OpsiExplore, no need to move to NY manually now 2022-02-02 04:02:07 +08:00
LmeSzinc
1b3e44393e Refactor: Split out globe.py from operation_siren.py 2022-02-02 03:13:05 +08:00
LmeSzinc
4dc64a1602 Opt: Auto delay other OpSi tasks during OpsiExplore, no need to disable them manually now 2022-02-02 03:05:51 +08:00
LmeSzinc
791dfa1eb6 Fix: Ensure zone selection fully expanded 2022-02-02 01:43:21 +08:00
LmeSzinc
7b0981fd48 Add: Screenshot interval in non-combat to help reduce CPU 2022-02-02 00:46:06 +08:00
LmeSzinc
a758f24b70 Add: OpSi drop record 2022-01-27 17:09:46 +08:00
LmeSzinc
e92579b5f9 Opt: Remove redundant converts from pillow to numpy 2022-01-24 23:43:53 +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
LmeSzinc
96e7e77c9a Merge branch 'master' into dev 
# Conflicts:
#	module/logger.py
 2022-01-22 18:43:40 +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
fc48b88e03 Fix: Remove non-ascii characters in zone name as a temporary fix 2022-01-21 23:38:34 +08: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
LmeSzinc
64f8a087a4 Fix: Uncollected zone exploration rewards prevent exit 2022-01-15 20:13:01 +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
9360601e8e Fix: Typo in os_map_goto_globe() 2022-01-11 20:58:16 +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
b38694ab1f Fix: Handle map events in os_map_goto_globe 2022-01-09 14:52:57 +08:00
LmeSzinc
f8eeb44057 Fix: Handle fleet died without auto search reward 2022-01-08 22:17:24 +08:00
LmeSzinc
3b0bf249af Fix: Exit from a special zone before running auto search 2022-01-05 20:39:32 +08:00
LmeSzinc
d4a15449d6 Fix: Handle AUTO_SEARCH_REWARD in map_exit() 2022-01-04 01:23:29 +08:00
LmeSzinc
920039dcbf Fix: Handle walk_out_of_step in normal zones (#847) 2021-12-22 00:02:55 +08:00
LmeSzinc
6946769246 Fix: Solve random OCR error in OpSi zone init (#504) 2021-12-16 21:14:15 +08:00
LmeSzinc
60568aa492 Fix: Remove punctuations in zone ocr of JP (#832) 2021-12-16 19:56:08 +08:00
Cola
e76c734819 Fix: [TW] OS fleet assets & os zone name 2021-12-16 13:28:33 +08:00
LmeSzinc
ceb622f0d0 Fix: Not raising MapWalkError in abyssal (#829) 2021-12-14 23:11:33 +08:00
LmeSzinc
02fed26955 Fix: [JP][TW] Clean OpSi zone name suffixes (#825) 2021-12-13 23:18:15 +08:00
LmeSzinc
a1817778f5 Fix: Retry question_goto in abyssal 
- Fix: Handle index error in search_tile_rectangle
 2021-12-13 18:33:36 +08:00
LmeSzinc
e714733498 Fix: Handle auto search reward after battle status C/D 2021-12-11 22:24:32 +08:00
LmeSzinc
f895fb4938 Fix: Redundant meowfficer farming run if started at port 2021-12-11 01:43:09 +08:00
LmeSzinc
dfd334736f Add: OpSi abyssal and handle battle status C/D in auto search 2021-12-11 00:27:04 +08:00
LmeSzinc
377cf712fd
Merge pull request #809 from ddmugicha/master 
Fix: [JP] Battle pass & os fleets assets
 2021-12-10 21:22:05 +08:00
LmeSzinc
265346783c Fix: Leave button in OpSi abyssal 2021-12-10 20:24:19 +08:00
Cola
850c93d31d Fix: [JP] Battle pass & os fleets assets 2021-12-10 19:00:01 +08:00
LmeSzinc
5815ff3cb9 Fix: Handle stories in fleet switching and map order execute 2021-12-10 18:30:35 +08:00
LmeSzinc
20d96f43ff Fix: Auto search in zone 154 
- Fix: Loop in zone_init()
- Opt: Skip auto search in port
 2021-12-10 13:46:09 +08:00
LmeSzinc
e5ae34b033 Upd: [CN][EN][JP] Name of the zone 154 2021-12-10 13:28:52 +08:00
nEEtdo0d
9c25107918 Upd: [EN] ZONE_SWITCH change after game update 2021-12-09 19:38:59 -05:00
LmeSzinc
fbcb8029ee Upd: Create fleet lock assets for opsi 
- Fix: Expand search area of opsi auto search and fleet lock
 2021-12-10 00:57:55 +08:00
LmeSzinc
ed1806f354 Upd: [EN] Assets for OpSi fleet selector 2021-12-10 00:34:11 +08:00
LmeSzinc
d53ac9afad Fix: Zone names have been hidden in safe zones 2021-12-09 22:50:18 +08:00
LmeSzinc
e100b974bc Opt: Allow unknown OpSi fleet 2021-12-09 18:13:37 +08:00
LmeSzinc
45097dd408 Opt: Move ash beacon to a standalone setting group 2021-12-09 18:13:34 +08:00
LmeSzinc
82bce4d52c Fix: Add retry on getting OpSi fleet 2021-12-09 01:11:49 +08:00
LmeSzinc
c309ebcf5f Fix: confirm_timer is re-used in wait_until_walk_stable() 2021-12-09 00:35:09 +08:00