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
9,223 Commits 9 Branches 0 Tags 274 MiB
master
Commit Graph

566 Commits

Author SHA1 Message Date
guoh064
1dd263d59d upd: [JP] get_zone_name correction 2024-10-30 12:18:09 +08:00
sui-feng-cb
ddd8828d6f Opt: do scanning device in hazard1leveling 2024-10-27 18:44:52 +08:00
sui-feng-cb
afaba08930 Upd: Use DisableMeowfficerFarming as default 2024-10-19 15:14:44 +08:00
sui-feng-cb
f11a199072 Merge branch 'master' of LmeSzinc 2024-10-12 17:56:41 +08:00
guoh064
e89063bade
Jp font 20241011 (#4272) 
* tmp: [JP] commission assets

* tmp: [JP] asset RESEARCH_COST_CHECKER

* tmp: [JP] assets in mail batch

* tmp: [JP] opsi get_zone_name color

* tmp: [JP] get_coin and get_oil color

* tmp: [JP] ash_collect_status and get_yellow_coins color

* upd: [JP] resize commission assets recognize size
 2024-10-12 14:29:01 +08:00
GH Action - Upstream Sync
d6ef37e818 Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2024-09-15 18:25:12 +00:00
LmeSzinc
b0561ae468 Fix: Wrong area to get combat paused 2024-09-15 23:18:21 +08:00
sui-feng-cb
e2235d78f8 Merge branch 'master' of LmeSzinc 2024-09-15 14:05:38 +08:00
LmeSzinc
d1eeb02bd2 Add: Support Battle UI theme 2024-09-15 04:34:14 +08:00
sui-feng-cb
f0d3772d41 Opt: Delay OpsiShop 2024-09-05 15:48:15 +08:00
sui-feng-cb
6da909089b Add: keep enough AP for Hazard1Leveling 2024-09-01 20:56:36 +08:00
sui-feng-cb
8db5e31d54 Opt: more strict failure check for restart sensitive tasks 2024-09-01 02:13:03 +08:00
sui-feng-cb
da48e99824 Fix: OpsiCrossMonth settings 2024-09-01 00:39:34 +08:00
sui-feng-cb
9695bceaab Merge branch 'master' of LmeSzinc 2024-08-31 00:48:49 +08:00
Air111
78c59bb490
Fix: refresh current zone first if OpsiMeoTargetZone!=0 (#4121) 2024-08-30 18:45:21 +08:00
sui-feng-cb
461bb15155 Add Ospi Hazard1Leveling settings 2024-07-03 20:07:45 +08:00
sui-feng-cb
65761a2c8b Merge branch 'master' of LmeSzinc 2024-06-28 14:40:37 +08:00
霞飛
79edef015f
fix: handle sidebar disappear (#3930) 
* fix: handle OpsiShop disappear

* docs: add a condition to OpsiShop

* ref: remove useless loop

* fix: exception

* feat: skip to the next month if the new shop do not unlock
 2024-06-28 12:18:08 +08:00
LmeSzinc
12bd302deb Reverts test code in commit ea68f68d 2024-06-28 03:23:28 +08:00
sui-feng-cb
5ffd84a61e Merge branch 'master' of LmeSzinc 2024-06-28 03:15:29 +08:00
LmeSzinc
ea68f68dc9 Fix: Handle MEOWFFICER_TRAIN_EVALUATE in _meow_skip_lock() (#3917) 2024-06-27 22:20:09 +08:00
sui-feng-cb
938ba056e3 Merge branch 'master' of LmeSzinc 2024-06-27 17:51:35 +08:00
霞飛
54747a8055 ref: remove functon 2024-06-22 21:43:55 +08:00
霞飛
62bc1ed7f7 ref: remove frequency config and not to judge coins at last day 2024-06-22 21:43:55 +08:00
霞飛
0b97b40c46
Feature: New OpsiShop. (#3086) 
* feat: New OpsiShop

* fix: use AdaptiveScroll

* feat: scan counter

* perf: calculate y value
 2024-06-17 11:24:40 +08:00
SevCrane
2796c85486 Merge remote-tracking branch 'upstream/master' 2024-06-07 18:00:59 +08:00
LmeSzinc
e4653741dd Fix: Failed to enter boss room due to wrong is_question prediction 2024-06-07 09:56:35 +08:00
SevCrane
abfbbe5064 merge alas 2024-06-05 23:57:58 +08:00
SevCrane
3cb29a9a37 Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2024-06-05 23:53:03 +08:00
SevCrane
5e482958f6 AlasGG 2024-06-05 23:20:28 +08:00
LmeSzinc
58202c6a40 Pref: Reuse image array to improve memory performance 2024-06-05 01:15:41 +08:00
LmeSzinc
ecfd5d50bf Upd: [CN] Support UI in 2024.05.21 2024-05-23 01:16:41 +08:00
LmeSzinc
4e469098e2 Fix: Handle another PAUSE and remove direct use of PAUSE 2024-05-09 18:50:32 +08:00
LmeSzinc
91f2d9506c Opt: Improve memory performance in GlobeOperation.find_peaks 2024-05-02 17:41:12 +08:00
LmeSzinc
e2e431d3b1 Fix: Fleets not sorted if multiple current fleets found 2024-05-02 14:08:20 +08:00
LmeSzinc
04538c4b1a Fix: MAP_SWIPE_DROP should >= MAP_GRID_CENTER_TOLERANCE 2024-05-01 23:37:53 +08:00
LmeSzinc
499639f657 Fix: Predict swipe end 2024-04-30 17:42:56 +08:00
LmeSzinc
0437ae80e6 Fix: Increase MAP_GRID_CENTER_TOLERANCE since short swipes on map no longer be responded to 2024-04-26 04:06:23 +08:00
LmeSzinc
b181669c57 Fix: Handle action point popup during globe_update() 2024-04-03 23:53:24 +08:00
LmeSzinc
ceca042afc Fix: [CN][JP] Handle bugged AUTO_SEARCH_OS_MAP_OPTION_OFF button 
- TODO: [EN][TW] Update AUTO_SEARCH_OS_MAP_OPTION_OFF_DISABLED
 2024-03-21 18:35:48 +08:00
LmeSzinc
c5fb5a57c5 Revert "Fix: Handle bugged AP button before game devs get it fixed" 
This reverts commit b615ebf3
 2024-02-22 21:00:52 +08:00
LmeSzinc
b615ebf3cf Fix: Handle bugged AP button before game devs get it fixed 2024-02-22 16:36:32 +08:00
LmeSzinc
8b871e8c30 Fix: Don't click MAINTENANCE_ANNOUNCE while interrupting auto search 2024-01-11 10:50:41 +08:00
LmeSzinc
1c06c5e2b0 Fix: [EN] Missing letter "N" in NA Ocean * zones 2023-10-14 21:54:12 +08:00
LmeSzinc
f68406f990 Fix: Disable STORY_ALLOW_SKIP in OpSi 2023-09-15 21:46:57 +08:00
LmeSzinc
da02fd6066 Fix: Trying to fix story skip bug on game client 2023-09-10 16:20:39 +08:00
LmeSzinc
dd4cc0ea32 Fix: Skip stories in FleetSelector.open() (#3104) 2023-09-10 15:27:07 +08:00
LmeSzinc
b6e66b4a17 Fix: handle_fleet_emp_debuff in port (#3076) 2023-09-02 23:58:56 +08:00
LmeSzinc
2aff41a96b Fix: Use the fleet of OpsiDaily in cross month daily 2023-08-19 22:27:16 +08:00
guoh064
4c48b019bc
Add: continue cl1 if enabled after meowfficerfarming finished. (#2805) 2023-06-28 23:14:16 +08:00
guoh064
b929afeeea
Opt: print loading only once in interrupting_auto_search (#2764) 
* Opt: print loading only once in interrupting_auto_search

* Fix: status of is_loading after executed
 2023-06-15 22:08:49 +08:00
LmeSzinc
4f793e9001 Fix: Add minimum swipe distance in OpSi globe map 2023-06-11 19:09:08 +08:00
LmeSzinc
a6bb4ba7f8 Fix: Handle map order during OpSi walk 2023-05-30 23:47:05 +08:00
LmeSzinc
18cba1f9d0 Chore: Remove the use of np.int 2023-05-30 10:28:51 +08:00
SarContDeli
c5b126a3c9
Fix: ActionPointPreserve reset by error (#2665) 2023-05-30 09:19:45 +08:00
LmeSzinc
8e1a685f4b Fix: Remove nonsense multiplier 2023-05-30 09:19:13 +08:00
guoh064
9569435e58
Fix: result of map_rescan_current passed wrongly (#2657) 
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
 2023-05-28 19:54:22 +08:00
LmeSzinc
5fece23f34 Upd: Magic map swipe multipliers in OpSi 2023-05-28 18:03:17 +08:00
LmeSzinc
e420f4ed04 Upd: Magic map swipe multipliers 2023-05-26 03:01:09 +08:00
LmeSzinc
6487e460fa Fix: Re-fit OpSi globe swipes 2023-05-25 22:32:45 +08:00
guoh064
7f8769cda8
Fix: scanning tower skip should only operate in cl1 zones. (#2609) 
* Fix: scanning tower skip should only operate in cl1 zones.

* Fix: Change condition to is_in_task_cl1_leveling
 2023-05-23 23:50:01 +08:00
guoh064
8610c5492b
Fix: check rest ap condition when cl1 cannot run (#2586) 
Co-authored-by: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com>
 2023-05-21 21:36:06 +08:00
LmeSzinc
dcfcd66dc3 Fix: Random loading screen hit EXP_INFO_C (#2567) 2023-05-12 22:10:50 +08:00
LmeSzinc
0a0c0ffc20 Fix: port_goto() loops between NY City and Gibraltar 2023-05-07 21:10:36 +08:00
guoh064
5024454b42
Fix: [JP] Opsi ocr fix (#2521) 
* Opt: abspath in appdir of uiautomator2 cache

* Fix: [JP] Opsi port ocr hotfix

Fix wrong ocr of port Taranto from 'タフント' to 'タラント'.

---------

Co-authored-by: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com>
 2023-04-27 12:25:42 +08:00
LmeSzinc
ccf1464756 Fix: Handle port in os_map_goto_globe() 2023-04-22 00:16:00 +08:00
LmeSzinc
2147059858 Opt: Rescan current map first perform full scan then 2023-04-19 22:24:08 +08:00
LmeSzinc
44bd0e4e81 Fix: Treat is_question as is_port outside of OpSi ports 2023-04-11 21:48:09 +08:00
LmeSzinc
942f8f54cf Fix: Handle AUTO_SEARCH_REWARD in zone_init() 2023-04-09 00:12:54 +08:00
LmeSzinc
63633aea6b Fix: Parse OpSi zone names in Arbiter zones 2023-04-04 22:36:44 +08:00
LmeSzinc
e71fa39648 Fix: Clicked MAP_GOTO_GLOBE_FOG after swiping the globe map 2023-04-04 21:12:29 +08:00
LmeSzinc
f8d9b31386 Fix: Handle META page in globe_update() 2023-04-04 03:13:46 +08:00
LmeSzinc
5d5fdca701 Fix: MeowfficerFarming is not running at the end of month because obscure and abyssal 2023-03-31 21:13:41 +08:00
guoh064
61c6c69ea4
Fix: Ocr result of port Taranto in JP server (#2427) 2023-03-31 00:21:03 +08:00
LmeSzinc
3a12b9e95e Fix: Handle AUTO_SEARCH_REWARD in question_goto() 2023-03-12 01:10:35 +08:00
LmeSzinc
04a6ef00fc Fix: Handle AUTO_SEARCH_REWARD in wait_until_walk_stable 2023-03-03 22:30:00 +08:00
LmeSzinc
72e682add4 Fix: Accidentally entered map at globe_update() 2023-03-03 22:30:00 +08:00
LmeSzinc
25c30b2d3c Fix: Accidentally entered map at globe_update() 2023-03-03 02:51:40 +08:00
LmeSzinc
1066d1e51b Fix: Handle AUTO_SEARCH_REWARD in globe_enter 2023-02-21 23:19:54 +08:00
SarContDeli
6100999369 Fix: wrong value coding in get_action_point_limit 2023-02-21 18:04:52 +08:00
LmeSzinc
f5f093c67f Opt: Remove OpsiAshBeacon.AshAttack since it should always be True 2023-02-17 23:50:30 +08:00
LmeSzinc
9bf5010c48 Fix: Arbiter mission stuck by archive missions (#2216) 2023-02-13 21:56:24 +08:00
LmeSzinc
702297d1c2 Fix: Handle map events in interrupt_auto_search() (fixed #2219) 2023-02-08 12:34:59 +08:00
LmeSzinc
6fa94901eb Upd: Opsi map_data.py 2023-02-07 19:21:33 +08:00
Alexan-ded
3ee5f7258f
Fix: OpsiMonthBoss is running before OpsiExplore finishes (#2204) 2023-02-03 12:18:44 +08:00
LmeSzinc
c705742a74 Fix: OpsiArchive is running before OpsiExplore finishes 2023-02-01 14:00:37 +08:00
LmeSzinc
ef14eba859 Opt: CL1 Leveling optimization for more rewards 2023-02-01 02:03:50 +08:00
LmeSzinc
d4955f02d2 Opt: Disable OpsiExplore_SpecialRadar after OpsiExplore finished 
Users were having this option enabled but forgot to buy special radar in the next month
 2023-02-01 01:01:08 +08:00
LmeSzinc
6471d219fd Refactor: Abstract OSStatus class 2023-01-29 22:46:35 +08:00
LmeSzinc
c437293ab5 Fix: Handle random black screenshots in globe_update() (fixed #2169) 2023-01-28 16:08:26 +08:00
LmeSzinc
ba1996702c
Merge pull request #2120 from SaiCateDoan/fix 
Fix: Keep 1000 AP only when CL1 available but not enabled
 2023-01-16 22:33:38 +08:00
Bookbug
35971ad0fb
Fix: [JP]Ocr hotfix (#2129) 2023-01-16 20:04:52 +08:00
SarContDeli
a5de8b3676 Fix: Keep 1000 AP only when CL1 available but not enabled 2023-01-15 11:04:22 +08:00
SarContDeli
d6c6298b8b Opt: Removed outdated argument 2023-01-15 10:31:50 +08:00
nEEtdo0d
f05ebae020 Fix: AL game bug fog follows between zones/pages; func to handle recovery then resume task 2023-01-12 22:58:00 -05:00
nEEtdo0d
06cc4ab29c Fix: evaluates to true even with no fog present on screen; no offset more stable 2023-01-12 22:57:42 -05:00
LmeSzinc
bb70f20b71 Refactor: go_month_boss_room() with retrying 2023-01-11 20:51:31 +08:00
LmeSzinc
c39e308a1e Fix: Refocus current fleet in OpsiAbyssal, trying to fix #2069 2023-01-11 20:50:30 +08:00
LmeSzinc
7e384059a9 Fix: Clearing OpSi monthly boss normal+hard continuously 2023-01-11 01:28:36 +08:00
SarContDeli
d87b63f9de
Fix: Overconsumption of AP by meowfficer farming (#2098) 2023-01-09 20:46:53 +08:00
LmeSzinc
699d8dd1c8 Opt: Keep enough startup AP for CL1 farming 2023-01-04 20:30:58 +08:00
LmeSzinc
93d75ed8f9 Fix: Handle port not found in port_goto() 2023-01-04 20:30:52 +08:00
LmeSzinc
4dc37ef4ca Merge branch 'master' into dev 2023-01-03 23:27:17 +08:00
LmeSzinc
73615f5309 Fix: Double swipe at handle_zone_pinned() 2023-01-03 22:54:42 +08:00
LmeSzinc
264a34683f Merge branch 'bug_fix' into dev 2023-01-03 03:19:36 +08:00
LmeSzinc
178b679256 Fix: Recheck HP after fleet died, battle status may have false detection 2023-01-03 02:35:15 +08:00
LmeSzinc
db7199f730 Fix: [TW] MAP_NAME, it should as long as CN 2023-01-03 02:33:45 +08:00
LmeSzinc
49606b7868 Merge branch 'master' into dev 2023-01-01 02:15:13 +08:00
LmeSzinc
afd1c4c5e8 Fix: Cross month dailies may not refresh immediately 2023-01-01 02:08:20 +08:00
LmeSzinc
40f132badf Fix: CL1 farming calls meowfficer farming before OpsiExplore finished 2023-01-01 01:48:36 +08:00
LmeSzinc
40d443433b Fix: [CN] FleetSelector.get() failed to detect fleet 2 due to poor image quality 2022-12-29 21:11:03 +08:00
LmeSzinc
5d7b70c9a4 Opt: Move setting OpsiMonthBoss.Mode to top 2022-12-28 18:31:11 +08:00
LmeSzinc
a820633129 Merge branch 'master' into dev 2022-12-28 18:24:53 +08:00
LmeSzinc
6e0f53bd6d Fix: Handle get items in action_point_enter 
Remove unused argument `quit` in handle_os_auto_search_map_option
 2022-12-28 16:58:46 +08:00
LmeSzinc
ea730f1fca Opt: Standardize difficulties to normal/hard 2022-12-23 20:59:11 +08:00
LmeSzinc
a2cef011a2 Opt: Improve log appearance in OpSi Month Boss 2022-12-23 18:29:33 +08:00
LmeSzinc
b7e8c67cab Merge branch 'master' into dev 2022-12-23 17:07:33 +08:00
LmeSzinc
24121f3cbf Opt: Force enable DoRandomMapEvent in CL1 farming 2022-12-23 16:52:53 +08:00
YJGeng-Iriy
67d039c188 optimize en-US.json 2022-12-21 00:22:19 +08:00
YJGeng-Iriy
49b15eafd6
Merge branch 'master' into opsi_month_boss 2022-12-21 00:09:20 +08:00
SarContDeli
6c47514d78 Opt: Set action point limit in meowfficer farming with cl1 enabled 2022-12-20 19:53:39 +08:00
YJGeng-Iriy
525ed082b3 optimize the code of opsi_month_boss 2022-12-17 17:10:35 +08:00
LmeSzinc
12c2d4e53e Fix: [EN] Update FLEET_* in OpSi 2022-12-16 21:42:36 +08:00
LmeSzinc
f4c2138460 Fix: [EN] Wrong OCR result: Sate Zone 2022-12-15 01:58:31 +08:00
LmeSzinc
70c51ac802 Add: Auto task switching between CL1 farming and meowfficer farming 2022-12-14 00:59:52 +08:00
YJGeng-Iriy
504b66c7a5 add month_boss_goto_additional 2022-12-13 21:49:23 +08:00
YJGeng-Iriy
207ff9d586 Merge branch 'opsi_month_boss' of https://github.com/YJGeng-Iriy/AzurLaneAutoScript into opsi_month_boss 2022-12-13 21:39:42 +08:00
YJGeng-Iriy
9eab7f35b4 Monthly boss code optimization 2022-12-13 21:37:28 +08:00
YJGeng-Iriy
757fc88f7e
Merge branch 'master' into opsi_month_boss 2022-12-12 19:47:59 +08:00
LmeSzinc
9bca3ef32a Opt: Limit situations to buy AP when running CL1 2022-12-12 18:07:30 +08:00
SarContDeli
9532a9f39c
Fix: Handle in_globe in interrupt_auto_search caused by bug (#1994) 2022-12-12 17:47:40 +08:00
LmeSzinc
ab702bd6e4 Opt: Save AP for tomorrow's dailies 2022-12-11 23:25:44 +08:00
YJGeng-Iriy
97607798ed opsi month boss init 2022-12-11 22:15:26 +08:00
YJGeng-Iriy
a361d8ad0d opsi month boss init 2022-12-11 20:59:16 +08:00
nEEtdo0d
72339a5093 Add: re-instate Opsi archive task, runs weekly as AL devs seemingly add new logger archives after a random scheduled maintenance 2022-12-10 20:26:28 -05:00
YJGeng-Iriy
8ed08f17f6 opsi_month_boss init 2022-12-11 01:40:42 +08:00
YJGeng-Iriy
726dc243c3 opsi_month_boss init 2022-12-10 23:57:09 +08:00
YJGeng-Iriy
76dee34077 opsi month boss init 2022-12-09 00:18:02 +08:00
YJGeng-Iriy
dfe156fd79 opsi_moth_boss test in operation_siren.py 2022-12-09 00:09:25 +08:00
LmeSzinc
d9c737deb1 Opt: Log CL1 time cost 2022-12-07 12:26:18 +08:00
LmeSzinc
3392b5a99f Opt: Add missing name of handle_popup_confirm() calls 2022-12-05 23:16:16 +08:00
LmeSzinc
919a154c31 Opt: Disable CL1 leveling before server support 2022-12-05 22:44:58 +08:00
LmeSzinc
82b412f773 Del: Remove OpsiHazard1Leveling.StrategicSearch 
no need since it's always true
 2022-12-05 22:41:47 +08:00
SarContDeli
2fff81ff0d
Opt: Reconstructed hazard 1 leveling (#1941) 2022-12-04 23:24:23 +08:00
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