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

316 Commits

Author SHA1 Message Date
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
Cola
96377e35be Fix: [JP] Ash popup check asset 2021-12-12 13:54:03 +08:00
nEEtdo0d
b99a29ecd1 Add: [EN] MISSION_MONTHLY_BOSS 'biter' 2021-12-11 17:18:49 -05:00
LmeSzinc
e714733498 Fix: Handle auto search reward after battle status C/D 2021-12-11 22:24:32 +08:00
LmeSzinc
6cce7a4e33 Fix: Handle map event in map order enter 2021-12-11 11:54:36 +08:00
Cola
8779171fcd Fix: [JP] Mission monthly boss asset 2021-12-10 20:24:28 +08:00
LmeSzinc
71dbc061bd Fix: Forget to quit os mission 2021-12-10 18:40:11 +08:00
LmeSzinc
5815ff3cb9 Fix: Handle stories in fleet switching and map order execute 2021-12-10 18:30:35 +08:00
LmeSzinc
c05c565e67 Fix: Ignore monthly boss mission 2021-12-10 18:20:38 +08:00
nEEtdo0d
4d80279545 Upd: [EN] ASH_POPUP_CHECK text change after update 2021-12-09 14:27:01 -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
de40e856f3 Upd: [EN] AUTO_SEARCH_OS_MAP_OPTION_* 2021-12-10 00:55:11 +08:00
LmeSzinc
d1767fb012 Upd: ASH_POPUP_CHECK, because it no longer shows red letters 
- TODO: [JP] Update ASH_POPUP_CHECK
 2021-12-09 23:00:14 +08:00
LmeSzinc
dc2d4c1c12 Fix: Unable to call submarine because of unknown inner shadow on button 
- Fix: Still delaying tasks if map orders haven't been executed successfully
 2021-12-09 01:08:42 +08:00
LmeSzinc
6f0e3a38d0 Add: Handle shared CD of recon scan and submarine call 
- Add entrance of OpSi abyssal and stronghold
 2021-12-08 01:25:35 +08:00
LmeSzinc
770363caf1 Fix: Trying to buy action points multiple times 2021-12-07 23:39:54 +08:00
LmeSzinc
d5735604e1 Dev: Uniform comments of generated files 2021-12-07 23:29:33 +08:00
LmeSzinc
bf4ff28c6e Add: Clear one abyssal coordinate 
- Fix: Divided by 0 in limit_walk()
- Fix: Taking drop screenshots in abyssal battles
 2021-12-07 00:00:40 +08:00
LmeSzinc
4a392407a0 Opt: Uniform the name of zone types in OpSi 
obscured to obscure
siren logger to abyssal
 2021-12-06 23:41:23 +08:00
Zorachristine
bfdc902045 Fix: [TW] guild, os assets 2021-11-24 20:48:46 +08:00
LmeSzinc
2df2c8045e Fix: Not continuing auto search if OpsiGeneral_AshAttack disabled (#760) 2021-11-22 18:39:07 +08:00
Zorachristine
ba1ae30a04 Fix: [TW] guild, os, research, ui assets 2021-11-20 22:21:06 +08:00
LmeSzinc
6a801a182a Fix: Handle submarine popup when using obscure loggers 2021-11-07 00:25:31 +08:00
nEEtdo0d
95a5d58e2f Fix: refresh zone to spawn mission objectives 2021-11-06 11:19:00 -04:00
LmeSzinc
fa8e46bee4 Refactor: Remove old OpSi functions and rename the current with old names 2021-11-06 22:25:14 +08:00
LmeSzinc
e8945eca1f Opt: Faster retry on order_enter 2021-11-01 18:55:57 +08:00
LmeSzinc
a56d204ee1 Merge branch 'master' into app 2021-10-22 01:14:39 +08:00
LmeSzinc
ae6f9ce644 Fix: Missing import for handle_map_cat_attack in OS 2021-10-22 01:14:00 +08:00
nEEtdo0d
93e2053b59 Merge'master' into app 
# Migrate override of handle_map_cat_attack for OpSi
# Migrate fix for _shipyard_buy_confirm
 2021-10-21 09:00:43 -04:00
nEEtdo0d
97e5d44e9a Fix: Override handle_map_cat_attack for OpSi, as may unintentionally click obscure exit 2021-10-21 08:45:48 -04:00
LmeSzinc
a52826594e Refactor: OS module 
- Refactor OS explore, able to run without 5000 oil item
- Fix: Screenshot interval recover
 2021-09-26 17:40:38 +08:00
LmeSzinc
fa37aa7697 Fix: Submarine popup when checkout os mission 2021-09-24 20:38:01 +08:00
LmeSzinc
0f855f001e Fix: Failed to execute map order again after buying action points 2021-09-12 16:04:32 +08:00
LmeSzinc
625602d028 Fix: Retry interval in OS storage and map_exit 2021-08-25 01:36:33 +08:00
nEEtdo0d
c6330af523 Fix: [EN] Obscure finish select assets 2021-08-22 15:30:58 -04:00
Ray
c5dc75a97c Fix:[JP] update os assets 2021-08-22 21:09:22 +08:00
nEEtdo0d
41c3451772 Upd: [EN] Obscure finish assets 2021-08-21 16:15:22 -04:00
LmeSzinc
2777f00584 Add: Obscure finish in OS fully auto 2021-08-22 00:16:40 +08:00
LmeSzinc
64f60c9713 Opt: Move shop items all together 2021-08-10 02:25:42 +08:00
Ray
f08ce025d8 Fix: [JP] equipment assets 2021-08-08 16:42:28 +08:00
nEEtdo0d
eecb957a04 Add: support to run reward loop during OS 2021-08-07 14:42:11 -04:00
LmeSzinc
e918a5db97 Merge branch 'gems_farming' into dev 
# Conflicts:
#	module/campaign/campaign_ocr.py
#	module/equipment/equipment.py
#	module/guild/base.py
 2021-07-24 17:33:58 +08:00
LmeSzinc
5564c3e88f Fix: Move AUTO_SEARCH_OS_MAP_OPTION click to the bottom 2021-07-21 18:57:45 +08:00
LmeSzinc
292c5d12be Merge branch 'master' into gems_farming 2021-07-09 14:53:14 +08:00
nEEtdo0d
a625f0b1ec Fix: after game update, 2x book auto and auto search related assets out dated 2021-07-08 20:24:16 -04:00
LmeSzinc
082b738a17 Merge branch 'master' into gems_farming 2021-07-08 23:02:37 +08:00
LmeSzinc
b8cc7c02d1 Upd: [CN] Auto search assets and 2x book assets for auto search 2021-07-08 22:00:15 +08:00
Ray
067dbf9fd0 Fix: [JP] update asset AUTO_SEARCH_REWARD 2021-07-08 21:29:00 +08:00
LmeSzinc
e6facc606a Opt: Cache ButtonGrid.buttons and add move() crop() 2021-06-29 23:04:19 +08:00
LmeSzinc
fe4c89f237 Opt: Copy the detection of MISSION_CHECKOUT to all its usages 2021-06-22 13:57:35 +08:00
LmeSzinc
8951f0c136 Fix: Detection on unfinished OS daily 2021-06-20 19:44:03 +08:00
LmeSzinc
39b36c429f Fix: Detection on unfinished OS daily (#492) 
- This reverts d989591a56, which modified an old function
 2021-06-20 17:50:05 +08:00
LmeSzinc
cec625bd39 Fix: Handle map event in OS auto search quit 2021-06-20 16:18:07 +08:00
LmeSzinc
d989591a56 Fix: Detection on unfinished OS daily (#466) 2021-06-09 10:21:45 +08:00
noname94
11170ffa64 Fix: [JP] OCR_ACTION_POINT_BUY_REMAIN not recognized 
because the color of these digits in JP is different from that in other servers.
 2021-05-24 08:34:28 +09:00
LmeSzinc
fb9aa9a52c Fix: OS mission changed after maintenance 2021-05-07 09:59:47 +08:00
LmeSzinc
f9cbdb9a5b Fix: Claiming OS mission reward when entering mission list 2021-05-06 22:53:15 +08:00
LmeSzinc
ae570058bd Fix: Detect auto search menu in every steps of auto search 
- Fix: Increase timer in mission submit
 2021-05-04 14:59:36 +08:00
LmeSzinc
98d1085f67 Fix: Button detection in OS mission handler 2021-05-03 21:41:57 +08:00