1
0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-09 18:39:04 +08:00
Commit Graph

374 Commits

Author SHA1 Message Date
LmeSzinc
d63a03ed6d Fix: Strategy search settings exited accidentally 2023-05-30 23:50:52 +08:00
LmeSzinc
ff794e6437 Fix: Handle get items in strategy_search_enter() 2023-05-26 11:59:06 +08:00
LmeSzinc
b3628b2a4a Fix: Missing B to 8 digit replacement 2023-05-22 12:10:12 +08:00
LmeSzinc
cb2b398546 Fix: Reset timeout timer in action_point_safe_get() 2023-04-19 20:54:38 +08:00
guoh064
64db1406a0
Fix: Handle 2 Infobars covering action_point ocr (#2503) 2023-04-19 20:48:20 +08:00
LmeSzinc
7bb5c15788 Fix: Recheck AP boxes when having OCR error 2023-04-14 19:08:44 +08:00
LmeSzinc
9560913ef1 Fix: Recheck AP boxes when having OCR error 2023-04-13 18:46:06 +08:00
LmeSzinc
26851c1473 Fix: Don't wait tasks of tomorrow 2023-04-11 21:47:03 +08:00
LmeSzinc
942f8f54cf Fix: Handle AUTO_SEARCH_REWARD in zone_init() 2023-04-09 00:12:54 +08:00
LmeSzinc
b7c4de3725 Fix: Handle item info in _storage_item_use() 2023-04-04 03:41:43 +08:00
LmeSzinc
9322a3f054 Fix: Skip TB guidance if user didn't have their game settings correctly set (#2449) 2023-04-04 03:41:43 +08:00
LmeSzinc
0c26b7a001 Upd: [EN] MISSION_OVERVIEW_CHECK 2023-03-17 00:49:43 +08:00
LmeSzinc
e9f6781524 Fix: Handle DST in is_in_opsi_explore() 2023-03-15 22:52:21 +08:00
LmeSzinc
3a12b9e95e Fix: Handle AUTO_SEARCH_REWARD in question_goto() 2023-03-12 01:10:35 +08:00
LmeSzinc
d5797cb153 Fix: Handle AUTO_SEARCH_REWARD when switching fleet lock 2023-03-11 23:46:47 +08:00
LmeSzinc
23eb719c78 Fix: Handle AUTO_SEARCH_REWARD in order_enter() 2023-03-03 02:48:02 +08:00
LmeSzinc
de1785ab91 Fix: Handle AUTO_SEARCH_REWARD in storage_enter() (fixed #2315) 2023-03-02 20:24:25 +08:00
nEEtdo0d
27085dbcfd Upd: [EN] DORM_FURNITURE_CONFIRM, ACTION_POINT_REMAIN_OS 2023-02-26 14:45:24 -05:00
LmeSzinc
8c7781c541 Upd: [EN] Swap STRATEGIC_SEARCH_SUBMIT ON/OFF
No idea why AL swapped them but we just follow
2023-02-19 20:41:58 +08:00
LmeSzinc
f5f093c67f Opt: Remove OpsiAshBeacon.AshAttack since it should always be True 2023-02-17 23:50:30 +08:00
LmeSzinc
6877e55d39 Opt: Don't buy purple coins when CL1 is enabled 2023-02-01 01:43:17 +08:00
LmeSzinc
9db94ec3cb Fix: Accidentally entered globe in os_mission_enter() 2023-02-01 00:48:16 +08:00
LmeSzinc
d80b261b5b Fix: Missing break in get_yellow_coins() (fixed #2190) 2023-02-01 00:04:51 +08:00
LmeSzinc
6471d219fd Refactor: Abstract OSStatus class 2023-01-29 22:46:35 +08:00
LmeSzinc
9cd81ab1ae Upd: [TW] OS_FLEET_LOCKED and OS_FLEET_UNLOCKED 2023-01-17 23:03:38 +08:00
LmeSzinc
aa52b7c753 Fix: Using template matching on MAP_GOTO_GLOBE_FOG 2023-01-16 22:15:07 +08:00
LmeSzinc
a693489cdc Opt: Faster _storage_coordinate_checkout() after _storage_item_use() 2023-01-14 20:44:30 +08:00
LmeSzinc
14e04069d9 Fix: Get action points buy remain with retries 2023-01-14 20:44:27 +08:00
LmeSzinc
c5b1d75009 Fix: Handle random OCR error in action points 2023-01-13 21:22:28 +08: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
7a7c66c714 Fix: Handle random battle status detection error 2023-01-11 20:41:07 +08:00
SarContDeli
d87b63f9de
Fix: Overconsumption of AP by meowfficer farming (#2098) 2023-01-09 20:46:53 +08:00
LmeSzinc
fa5dd91696 Upd: [EN] Assets of OpSi monthly bosses (#2032) 2023-01-06 20:46:23 +08:00
LmeSzinc
699d8dd1c8 Opt: Keep enough startup AP for CL1 farming 2023-01-04 20:30:58 +08:00
LmeSzinc
264a34683f Merge branch 'bug_fix' into dev 2023-01-03 03:19:36 +08:00
LmeSzinc
1c0425aa7b Fix: Handle AUTO_SEARCH_REWARD in action_point_enter() 2023-01-03 02:35:47 +08:00
LmeSzinc
68a4eca4e8 Refactor: Do OCR on YUV color space to handle poor image quality 2022-12-31 01:30:15 +08:00
LmeSzinc
815dde4a5c Dev: Add SHOP_EXTRACT_TEMPLATE to collect new item templates 2022-12-31 01:27:57 +08:00
LmeSzinc
89af9a60a8 Fix: More accurate action_point_safe_get() condition 2022-12-29 18:17:16 +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
Bookbug
e8c45c584f
Add:[JP] Assets upadte for OpSi monthly boss (#2034) 2022-12-23 22:25:29 +08:00
LmeSzinc
ea730f1fca Opt: Standardize difficulties to normal/hard 2022-12-23 20:59:11 +08:00
LmeSzinc
8baf402b1f Upd: OS_ADAPTABILITY_* for all servers 2022-12-23 20:24:14 +08:00
LmeSzinc
a2cef011a2 Opt: Improve log appearance in OpSi Month Boss 2022-12-23 18:29:33 +08:00
YJGeng-Iriy
49b15eafd6
Merge branch 'master' into opsi_month_boss 2022-12-21 00:09:20 +08:00
LmeSzinc
f2e016a60f Upd: [TW] STRATEGIC_SEARCH_TAB_SECURED 2022-12-20 19:25:18 +08:00
VirtualTowel
1faffbbf96 Fix: Some adjustment 2022-12-18 22:35:50 +08:00
VirtualTowel
4f2ff1a164 Fix: Reduce action points waste 2022-12-18 22:00:11 +08:00
LmeSzinc
32e065ad9c Merge branch 'master' into bug_fix
# Conflicts:
#	module/os_handler/strategic.py
2022-12-18 17:13:44 +08:00
LmeSzinc
385fff216f Fix: Missing interval on STRATEGIC_SEARCH_MAP_OPTION_OFF 2022-12-18 16:37:43 +08:00
LmeSzinc
c72f2f598a Fix: Missing interval on STRATEGIC_SEARCH_MAP_OPTION_OFF 2022-12-18 02:49:38 +08:00
LmeSzinc
cacf51784e Upd: [EN] OpSi auto search buttons 2022-12-18 02:01:38 +08:00
YJGeng-Iriy
525ed082b3 optimize the code of opsi_month_boss 2022-12-17 17:10:35 +08:00
LmeSzinc
b37666416c Fix: Empty array of action point amount in action_point_update() 2022-12-15 01:50:44 +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
nEEtdo0d
4be37e3596 Add: [EN] asset update for strategic search (#1948) 2022-12-11 23:53:52 -05:00
LmeSzinc
d621a48ebc
Merge pull request #1992 from LmeSzinc/bug_fix
Add: OpSi Archive Zones
2022-12-12 00:04:34 +08:00
SarContDeli
495915eae7
Opt: Adjusted logic of strategic search (#1986) 2022-12-11 22:31:19 +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
下面我簡單喵兩句
da7efd102c
Add: [TW] asset support for voucher shop (#1982) 2022-12-11 14:52:19 +08:00
下面我簡單喵兩句
873a6da0e2
Add: [TW]Assets update for strategic search (#1981) 2022-12-11 13:49:28 +08:00
LmeSzinc
8e71e6d274 Fix: Use action_point_safe_get in action_point_use 2022-12-10 23:05:23 +08:00
LmeSzinc
5edaab21a2
Merge pull request #1972 from bookbug666/opsi_one
Add: [JP]Assets update for strategic search
2022-12-10 20:35:37 +08:00
SarContDeli
0db8fe1bf4
Opt: Improve robustness of strategic search (#1973) 2022-12-10 20:30:13 +08:00
bookbug666
a78d1380c1 Fix: STRATEGIC_SEARCH_MERCHANT detection 2022-12-10 05:52:56 +08:00
bookbug666
310cd4a7c7 Add:[JP]Assets update for strategic search(not tested) 2022-12-09 23:20:45 +08:00
SarContDeli
d5138b4d37 Add: [CN] asset support for strategic search 2022-12-08 19:33:49 +08:00
SarContDeli
da9a5f06d1
Fix: Unable to handle option in STRATEGIC_SEARCH_POPUP_CHECK (#1958) 2022-12-08 12:14:21 +08:00
bookbug666
1208eeca2d Unlock server restrictions, update assets.py 2022-12-06 00:55:51 +08:00
LmeSzinc
3392b5a99f Opt: Add missing name of handle_popup_confirm() calls 2022-12-05 23:16:16 +08:00
LmeSzinc
54d5874b9d Upd: [CN] Voucher shop assets and translation 2022-12-05 22:31:53 +08:00
SarContDeli
2fff81ff0d
Opt: Reconstructed hazard 1 leveling (#1941) 2022-12-04 23:24:23 +08:00
nEEtdo0d
bc3376e191 Fix: merge LmeSzinc/dev into branch, resolve conflicts 2022-11-29 15:04:47 -05:00
nEEtdo0d
629addada4 Add: Opsi voucher monthly task support 2022-11-26 23:44:38 -05:00
SarContDeli
1b47e69496 Upd: Refactored part of hazard 1 leveling 2022-11-15 17:23:34 +08:00
SarContDeli
1f38e92e02 Add: hazard 1 leveling 2022-11-12 00:05:30 +08:00
LmeSzinc
f29a246a7b Fix: Trying to add prefix "1" on empty Opsi shop amount
and log empty OCR result
2022-11-09 00:52:12 +08:00
xzjjasper
ce551574b5 Upd: [TW] MISSION_MONTHLY_BOSS 2022-11-03 19:06:35 +08:00
LmeSzinc
6968e77cc7 Upd: [EN] ASH_POPUP_CHECK 2022-10-14 12:25:05 +08:00
Bookbug
9ab069d729
Add: ActionPoint limit (#1696) (#1706)
* Opt: ActionPointBuyLimit

* Add multi-lang translation

* Solve null return

* Disable but preserve old format

* Rewrite minor translation; reform buy functions

* Add attr redirection

* Update action_point.py

* Fix:missing os_handler.py

* Fix:replace str with bool

* Fix:replace str with bool

* Fix:replace str with bool

* Fix:replace str with bool
2022-10-13 22:39:34 +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
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
LmeSzinc
24ef0521b3 Refactor: Digit ocr white list 2022-10-02 18:25:07 +08:00
LmeSzinc
00ac7109f6 Fix: Prise ocr OpSi port shop 2022-10-01 00:58:28 +08:00
LmeSzinc
5a8ef0835a Opt: Faster port_enter and port_quit to meed Alas standard 2022-09-25 01:58:50 +08:00
LmeSzinc
4ba42f85c0 Fix: OpSi radar and buttons slide out from the right 2022-09-25 01:48:34 +08:00
LmeSzinc
91d4d1740d Fix: Failed to execute dock repair on slow PCs 2022-09-20 01:27:54 +08:00
nEEtdo0d
e982795216 Fix: [EN] os monthly ticket asset shifted post maintenance 2022-09-09 10:39:48 -04:00
LmeSzinc
1f67a9a109 Add: Get and set config across tasks 2022-09-06 22:20:29 +08:00
SarContDeli
82a282db09 Fix: Wrong action point value of action point box 2022-08-24 23:46:51 +08: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
ed69d7b006 Fix: Use the old ORDER_CHECK as its button (#1290) 2022-07-05 21:53:57 +08:00
LmeSzinc
e36db6d5c7 Fix: Move ORDER_CHECK to the info button (#1290) 2022-07-04 23:06:48 +08:00
LmeSzinc
da78c647ae Fix: Handle more accidental clicks in wait_until_walk_stable() 2022-07-02 15:17:38 +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
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
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
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
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
railzy
57e728455a Upd: [JP] os RESET_* & EXCHANGE_CHECK & MISSION_OVERVIEW_ACCEPT_SINGLE 2022-05-01 13:46: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
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
nEEtdo0d
1cc28f524f Upd: [EN] post major app update bulk assets; WIP part 3 2022-04-08 01:28:25 -04:00
nEEtdo0d
73ddcd9b7f Upd: [EN] post major app update bulk assets; WIP part 2 2022-04-08 00:57:15 -04:00
nEEtdo0d
96b39a9ea5 Upd: [EN] post major app update bulk assets; WIP part 1 2022-04-07 22:32:24 -04:00
LmeSzinc
32c7184bb7 Fix: info_bar_count() should be called before clicking MISSION_OVERVIEW_ACCEPT_SINGLE 2022-04-04 13:26:55 +08:00
LmeSzinc
454a07723d Fix: Some OpSi missions are missed 2022-04-03 12:11:08 +08:00
nEEtdo0d
f0cdb96cb6 Upd: [EN] monthly os reset assets 2022-03-31 22:06:16 -04: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
9720cec0c6 Fix: Exit from OpSi exchange shop 2022-04-01 00:09:18 +08:00
LmeSzinc
7979d8e7c7 Opt: handle OpSi monthly reset for quality of life 2022-03-31 21:32:34 +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
1c28482fa6 Fix: Confirm OpSi storage empty cause items are slow to load sometimes 2022-03-02 20:59:14 +08:00
LmeSzinc
573978040a Add: Run OpSi archive zone as OpSi daily 2022-02-25 13:00:55 +08:00
nEEtdo0d
a1f9b38478 Add: [EN] OS_GAME_TIPS 2022-02-15 19:33:22 -05: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
eec0e8927c Add: Save drop screenshots in OpSi abyssal 2022-02-02 16:21:28 +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
7b0981fd48 Add: Screenshot interval in non-combat to help reduce CPU 2022-02-02 00:46:06 +08:00
LmeSzinc
b54b2fe036 Merge branch 'master' into dev 2022-01-28 21:32:35 +08:00
LmeSzinc
2a09605eb6 Fix: Add another port repair check condition 2022-01-28 13:16:08 +08:00
LmeSzinc
32911bb7ff Upd: [EN] GET_ADAPTABILITY 2022-01-28 01:51:10 +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
4ae9770098 Fix: Typo in _storage_item_use() retry causing infinite retries 2022-01-22 00:03:48 +08:00
lonelyzerg
26b6b83bf4 copy cn assets to other server 2022-01-20 16:41:09 -06:00
LmeSzinc
f4d798e3d7 Refactor: handle_action_point, easier to understand 2022-01-21 00:40:04 +08: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
Zorachristine
b46d7dea19 Upd: [TW] MISSION_OVERVIEW_* assets 2022-01-16 10:11:50 +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
2b94e64fc1 Fix: Clear OS missions below monthly mission, the Arbiter (#814) 2022-01-05 20:37:37 +08:00
LmeSzinc
f71a905d7a Fix: Sometimes entered globe map after clicking AUTO_SEARCH_REWARD, but don't know why 2022-01-02 17:41:03 +08:00
LmeSzinc
a1f81a9290 Fix: [CN][JP] Handle OpSi game tips (#855) 2021-12-31 16:09:39 +08:00
LmeSzinc
9ee2ddc68f Upd: TEMPLATE_STORAGE_LOGGER for various loggers 2021-12-24 01:17:04 +08:00
Cola
1fde1fd4eb Fix: [JP] Meowfficer train start&os fleet locked unlocked assets 2021-12-18 19:58:43 +08:00