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,783 Commits 9 Branches 0 Tags 274 MiB
5869d09ec5
Commit Graph

340 Commits

Author SHA1 Message Date
LmeSzinc
cd628162bc Fix: Auto search is not skipping GET_SHIP (#1914) 2022-11-30 12:41:52 +08:00
LmeSzinc
59183aeff1 Fix: Oil limit too low 2022-11-29 21:15:51 +08:00
bookbug666
f3297889a4 Fix: wrong and/or usage;fix wrong function;improve translation 2022-11-29 15:06:37 +08:00
LmeSzinc
b86e244039 Upd: [EN] GET_ITEMS_1_RYZA 2022-11-25 05:01:48 +08:00
LmeSzinc
1687133d46 Upd: [EN] GET_ITEMS_1_RYZA 2022-11-25 04:27:56 +08:00
LmeSzinc
64720bb336 Upd: [CN][JP] GET_ITEMS_1_RYZA 2022-11-25 03:55:36 +08:00
LmeSzinc
6af9383cd4 Fix: Dont log empty check on LevelOcr 2022-11-09 22:58:11 +08:00
LmeSzinc
5c70364353 Refactor: Abstract CampaignStatus class and fix task balancer in Raid 2022-10-30 14:49:04 +08:00
SarContDeli
15c86379ee Opt: Raise error when emotion set wrong 2022-09-22 22:56:44 +08:00
LmeSzinc
cba8149b96 Fix: Checking the wrong assets in handle_combat_mis_click() 2022-09-20 01:27:54 +08:00
LmeSzinc
0b35815bd4 Fix: Handle buff banner covering oil numbers in event 2022-09-16 23:09:24 +08:00
LmeSzinc
b22a676f2a Fix: Handle mis-clicked to event shop 2022-09-16 22:40:31 +08:00
LmeSzinc
eb80f05ff5 Fix: Handle war archive story unlock popups in auto search 2022-09-11 20:53:18 +08:00
LmeSzinc
391ebf8b47 Opt: Detect stories first in battle_status() 
Trying to prevent missing drop records in OpSi abyssal
 2022-08-22 12:09:26 +08:00
LmeSzinc
ea28a0cb65 Upd: AUTOMATION_CONFIRM 2022-08-20 23:28:15 +08:00
LmeSzinc
3e83b855ca Fix: [TW] GET_ITEMS_2 
GET_ITEMS_2 should be 4px lower than GET_ITEMS_3

(cherry picked from commit f83faa13f4cc6ccd5e31615852e18afbc1b970c2)
 2022-08-16 00:23:53 +08:00
chpkq
8e111a24f4 Fix: [TW] OPTS_INFO_D 2022-08-06 16:29:30 +08:00
appleapple802
e50ae32e5b fix:[TW]GET_ITEMS_3.png 2022-07-29 20:37:01 +08:00
LmeSzinc
0e7374bf8e Fix: Another COMBAT_AUTO assets 2022-07-27 01:17:29 +08:00
LmeSzinc
39a18ade1f Fix: Close story unlock popups at war archives 2022-07-27 00:55:27 +08:00
LmeSzinc
f0a2d7c02d Opt: Reduce swipes when getting only 2 rows of items 2022-07-17 03:03:33 +08:00
LmeSzinc
65d964b65e Fix: map_is_2x_book is in emotion calculation before map_get_info() 2022-06-09 23:24:51 +08:00
LmeSzinc
f28d0c0c29 Fix: Clear click record on each battle and each campaign (fixed #447) 2022-06-05 08:35:21 +08:00
SarContDeli
dd66c8f289 Opt: Modified the options for all screenshots 2022-05-21 00:53:37 +08:00
LmeSzinc
7b273808bc Upd: [TW] PAUSE assets (fixed #1134) 2022-05-20 13:44:05 +08:00
LmeSzinc
f884c377fe Upd: [JP] PAUSE assets 2022-05-19 23:31:29 +08:00
LmeSzinc
1fbfe450ca Fix: Revert "Upd: Move PAUSE assets 5px left" except CN 
This reverts commit 913cc8e9
 2022-05-19 22:08:17 +08:00
LmeSzinc
913cc8e9bd Upd: Move PAUSE assets 5px left 2022-05-19 15:55:20 +08:00
LmeSzinc
49bceedf40 Fix: Avoid clicking SWITCH_OVER in EXP_INFO_* (#1066) 2022-05-13 22:58:15 +08:00
LmeSzinc
08aa64580d Add: Rondo at Rainbow's End chapter AC 
- Fix: swipe route out of target box
- Fix: Re-add handle_combat_weapon_release()
 2022-04-28 23:22:05 +08:00
SarContDeli
f1e500a8a8 Opt: AutoSearchFleetOrder is merged into FleetOrder 2022-04-23 14:11:00 +08:00
Egor Nats
6eac8ae259 Opt: Imports isorted 2022-04-14 16:37:54 -03:00
nEEtdo0d
e57309d888 Upd: [EN] additional post update assets 
Add: restore select partial commits; 1e13eab, c3c0ba4, 1cc28f5
 2022-04-12 22:55:49 -04: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
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
23cf1acd1a Fix: map_offensive_auto_search is not working with fleet lock disabled 2022-03-29 21:47:39 +08:00
LmeSzinc
f9c4939821 Fix: Trying to fix the auto search bug on AL game client (#947) 2022-03-26 23:25:46 +08:00
LmeSzinc
5951d05f90 Fix: Trying to fix the auto search bug on AL game client (#947) 2022-03-23 20:57:17 +08:00
LmeSzinc
ca2491611b Fix: Expiration detection when selected a commission 
Red background of expiration become lighter when commission is selected
 2022-03-10 21:08:00 +08:00
LmeSzinc
ff3cbbe6e5 Fix: Trying to handle auto search strike after exiting from retirement 2022-02-25 19:24:10 +08:00
LmeSzinc
e754e45edb Opt: Faster story handling in event maps 
- Del: Remove the use of handle_map_after_combat_story
- Opt: Skip checking arrive_timer when having a result
- Fix: Map detection is still working on story popup
 2022-02-10 18:25:51 +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
7b0981fd48 Add: Screenshot interval in non-combat to help reduce CPU 2022-02-02 00:46:06 +08:00
LmeSzinc
65f166ad12 Refactor: Use numpy image cache instead of pillow image 2022-01-23 23:03:55 +08:00
LmeSzinc
a7fa97c5b4 Opt: Click interval on GET_SHIP 2022-01-10 00:25:07 +08:00
LmeSzinc
62bba1b25c Fix: Story skip in auto search 2021-12-31 02:25:01 +08:00
LmeSzinc
e89d07da12 Add: Tower of Transcendence chapter BD 
- Fix: BATTLE_STATUS_B was clicked after EXP_INFO
- Fix: STORY_SKIP offset
- Fix: One-time stages in stage auto increase
 2021-12-30 17:46:30 +08:00
LmeSzinc
d5735604e1 Dev: Uniform comments of generated files 2021-12-07 23:29:33 +08:00
nEEtdo0d
5da6c05b67 Opt: compress condition; less duplication 2021-12-03 22:54:38 -05:00
LmeSzinc
ff7c875f3f Add: Collect battle pass rewards 2021-12-03 17:32:10 +08:00
Cola
cffef972b3 Fix: [TW] update assets 2021-11-25 13:34:18 +08:00
LmeSzinc
1e3cdd4c38 Opt: Faster retirement, including click interval clear and less screenshots 
- Rename dock_filter_set_faster to dock_filter_set and remove old dock_filter_set
 2021-11-21 17:16:18 +08:00
LmeSzinc
c1fc7ef614 Fix: Level gap too large when there was an OCR error 2021-11-18 12:50:00 +08:00
Ray
247420140d Fix: check expected end before combat status 2021-11-17 21:27:18 +08:00
LmeSzinc
a6571c6d79 Refactor: Stop condition, reach level 2021-11-14 21:47:01 +08:00
LmeSzinc
7f1227aabf Fix: SubmarineMode not working because handle_submarine_call() received None (#705) 
- Opt: Re-check if submarine is clear
 2021-11-06 22:43:37 +08:00
LmeSzinc
b554a39351 Refactor: Fleet switching and fleet reverse 
- Revert swipe limit of ensure_edge_insight
 2021-11-06 22:25:14 +08:00
nEEtdo0d
7a4804541f Fix: submarine settings for auto search and opsi obscure 2021-11-03 20:46:12 -04:00
LmeSzinc
41325a4258 Fix: Failed to detect dropping a new ship 2021-10-25 17:46:10 +08:00
LmeSzinc
21a865cb00
Merge pull request #676 from ddmugicha/auto_search_check_oil 
Fix: check oil in auto search
 2021-10-24 11:31:19 +08:00
LmeSzinc
32d2dbf8e6 Merge branch 'master' into app 2021-10-24 01:34:25 +08:00
LmeSzinc
80f2bc3542 Fix: Reset submarine click timer preventing TooManyClickError 2021-10-24 01:33:29 +08:00
Cola
261b938aea Fix:check oil in auto search 2021-10-23 23:40:16 +08:00
LmeSzinc
10b14dcc1e Opt: Slower screenshot speed in combat loading 2021-10-16 18:00:58 +08:00
LmeSzinc
7a53f608aa Merge branch 'master' into app 2021-10-16 17:49:53 +08:00
LmeSzinc
e272c2e664 Fix: Handle vote popup in auto search status 2021-10-16 17:16:58 +08:00
LmeSzinc
8b052e7dd3 Fix: More campaign reward popup handlers 2021-10-15 21:55:32 +08:00
LmeSzinc
1a683b02a4 Merge branch 'master' into app 2021-10-15 21:22:41 +08:00
Cola
64e69d4bbd Fix: [JP] Automation_Confirm & War_Archives/Template_* asset 2021-10-14 22:57:56 -11:00
LmeSzinc
a70bef7efa Merge branch 'master' into app 
# Conflicts:
#	module/combat/auto_search_combat.py
 2021-10-14 20:49:04 +08:00
LmeSzinc
e3b9761043 Fix: More vote handlers 2021-10-14 20:41:04 +08:00
LmeSzinc
fe99f712b2 Upd: Campaign bonus drop screenshots 2021-10-14 17:51:36 +08:00
LmeSzinc
01d49bb752 Merge branch 'master' into app 2021-10-14 17:48:12 +08:00
LmeSzinc
6e2b418ddd Fix: AUTO_SEARCH_ON/OFF assets, handle vote popup 2021-10-14 17:37:02 +08:00
LmeSzinc
495242cbc2 Refactor: Ash beacon assist 2021-09-25 00:38:53 +08:00
LmeSzinc
89bf271417 Refactor: Emotion module 
- Fix: Modifications of config will be overridden by the loading of yaml file during update
 2021-09-24 20:24:46 +08:00
LmeSzinc
c8c1cd9789 Refactor: Guild module 
- Simplify guild exchange with Filter
- Expose submarine mode
 2021-09-21 01:19:43 +08:00
LmeSzinc
9f47fb9bc2 Merge branch 'master' into app 
# Conflicts:
#	module/combat/auto_search_combat.py
 2021-09-20 18:02:52 +08:00
LmeSzinc
fb33dfb884 Fix: Handle lost connection popup when game client is sending battle results 2021-09-20 18:01:15 +08:00
LmeSzinc
57c15e6ebb Fix: Solve merge conflicts 
- Fix typo UrgentCube-1:45
- Add auto mode control in auto search
 2021-09-18 00:26:21 +08:00
LmeSzinc
5dd0459de9 Refactor: Gems farming configs 
- Opt: Avoid clicking AUTO_SEARCH_MAP_OPTION_OFF after ignore low emotion warn
- Opt: Skip map cat attack in auto search
 2021-09-16 03:53:57 +08:00
LmeSzinc
abdfbb713a Refactor: Rename auto search configs 
- Refactor device/app configs
- Fix: Research finish detection
 2021-09-15 23:50:30 +08:00
LmeSzinc
eb045242c3 Refactor: Rename retire configs 
- Fix combat drop screenshot missed because clicking too fast
- Close campaign preparation at start
 2021-09-15 23:33:06 +08:00
LmeSzinc
46d8d2fadb Refactor: Rename main configs 
- Faster chapter selection and page_campaign
- Rename some old Chinglish variables in map info
 2021-09-15 23:32:31 +08:00
LmeSzinc
8e0b689e66 Fix: Level detection init 2021-08-16 12:11:08 +08:00
Cyunmi
15e8acaa4a resolve conversation 2021-08-14 21:48:21 +08:00
Cyunmi
fda815b7d0 fix auto search combat status when low emotion 2021-08-14 16:15:08 +08:00
Cyunmi
3836824929 add low emotion confirm in auto search 2021-08-14 00:56:57 +08:00
Cyunmi
3d8e92c4f3 get flag ship lv in auto search 2021-08-13 20:54:01 +08: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
9abe459fdc Fix: Lock new ships in auto search combat 2021-07-23 16:03:52 +08:00
LmeSzinc
d750f73696 Add: Change flagship when level >= 32 2021-06-30 18:04:31 +08:00
LmeSzinc
cf5bfbc9a7 Opt: Template.match_result returns similarity and Button 
- Add Button.move() Button.crop()
 2021-06-30 13:59:24 +08:00
LmeSzinc
e6facc606a Opt: Cache ButtonGrid.buttons and add move() crop() 2021-06-29 23:04:19 +08:00
LmeSzinc
d6d56c79d6 Del: Remove GUILD_POPUP_TRIGGERED because AL can receive guild missions automatically now 2021-06-20 16:39:14 +08:00
LmeSzinc
6af769a28b Revert "Opt: Disable emotion bug handler" 
This reverts commit a34e9002
 2021-06-09 12:35:17 +08:00
LmeSzinc
a34e900251 Opt: Disable emotion bug handler 2021-06-09 09:55:03 +08:00
nEEtdo0d
5b5412ccc0 Fix: HP grid check normal vs os, straight forward, no @Config 2021-05-24 16:21:44 -04: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
9e6e0c8fae Fix: Combat automation confirm in auto search 2021-05-02 01:10:47 +08:00
LmeSzinc
470308db52 Merge branch 'master' into dev 2021-04-27 16:28:29 +08:00
tsweeneySG
f9de54b558 Fix: [JP] Switch to SP/EX asset 2021-04-25 19:27:30 -04:00
Zorachristine
9b67bbd529 Fix: [TW] retire & combat assets 2021-04-25 20:04:52 +08:00
LmeSzinc
bb63613419 Merge branch 'master' into dev 2021-04-25 15:57:13 +08:00
LmeSzinc
9e1d76b563 Upd: [JP] OPTS_INFO_D (#381) 2021-04-25 15:28:09 +08:00
LmeSzinc
4f4f296e44 Merge branch 'master' into dev 
# Conflicts:
#	module/os/assets.py
 2021-04-16 17:51:18 +08:00
noname94
f92234614d Fix: [JP] assets fix 2 after font changed 
Many assets with words need fixes after the font changed. Most functions should work now.
 2021-04-16 13:58:57 +09:00
noname94
b8e2321140 Fix: [JP] assets fix after font changed 
Many assets with words need fixes after the font changed. This commit is not complete yet.
 2021-04-16 02:47:31 +09:00
LmeSzinc
fc9fdad3ae Fix: [CN] ASH_POPUP_CHECK 2021-04-05 21:10:43 +08:00
nEEtdo0d
867bd965ea Merge remote-tracking branch 'origin/master' into emotion 2021-04-02 18:36:20 -04:00
nEEtdo0d
ec04eb7c8c Mov: 2x book check and handle setting 
Opt: Switch for enable and disable for 2x book, get_expected_reduce @property now
 2021-04-02 18:26:00 -04:00
LmeSzinc
dab2bb8933 Fix: Ring cover letter "L" in Level OCR 2021-04-01 01:29:38 +08:00
LmeSzinc
4d07925de4 Fix: Handle continuous combat in siren scanning device 2021-03-31 17:13:11 +08:00
nEEtdo0d
f724a3a61f Fix: Restrict to only to commands capable of using 2x book 2021-03-26 20:43:41 -04:00
nEEtdo0d
607e8b1260 Opt: Emotion refactor for enable 2x book configuration 2021-03-26 20:31:44 -04:00
LmeSzinc
c438e4686c Fix: Mis detection of combat status when combat executing 2021-03-08 10:59:41 +08:00
LmeSzinc
1b604e3ae5 Opt: Not raising GameStuckError if get battle status C or D 
Because the detection of battle status is color detection which may go wrong
 2021-02-28 16:40:01 +08:00
Ray
a0d118f62f update jp asset "PAUSE" 2021-02-26 11:04:55 +08:00
LmeSzinc
2d48654def Merge branch 'master' into dev 2021-02-20 17:35:56 +08:00
whoamikyo
a0f84696e1 Opt: Few changes to match with new notifications system 2021-02-19 20:01:32 -03:00
LmeSzinc
4fd33bd4f2 Merge branch 'master' into dev 2021-02-18 16:49:14 +08:00
whoamikyo
989ab1280c Opt: removed battle status S toast notification 2021-02-17 14:20:42 -03:00
LmeSzinc
4290f959b9 Fix: Detection of PAUSE during the boss appear animation 2021-02-17 18:01:26 +08:00
LmeSzinc
fd03a211a3 Opt: Delete warning log of battle status S 2021-02-16 19:31:01 +08:00
whoamikyo
f506631456 Added: added GameStuckHandler for C and D battle status 
- game will restart when get C and D battle status now
 2021-02-15 15:14:47 -03:00
nEEtdo0d
d8b051651d Fix: New ship drop can result in game stuck exception during auto-search as not handled 2021-02-15 11:04:12 -05:00
LmeSzinc
4797565148 Merge branch 'master' into dev 2021-02-01 00:14:36 +08:00
LmeSzinc
3d27c5b94d Fix: Auto search finish check 
- Fix argument of triggered_stop_condition in war archives
 2021-01-31 23:54:21 +08:00
LmeSzinc
1e5813ddb3 Merge branch 'master' into dev 2021-01-30 10:54:13 +08:00
LmeSzinc
26c484bd87 Fix: auto search in event daily AB 
- Add auto call submarine in auto search
 2021-01-28 14:11:06 +08:00
LmeSzinc
14c3dc9b0c Merge branch 'master' into dev 2021-01-28 12:29:13 +08:00
LmeSzinc
f6fdb1e5ec Fix: Auto fallback to original mode if a map don't have auto search 
- Disable auto search in daily hard currently
- Handle auto search menu sometimes disappear
 2021-01-28 02:58:25 +08:00
LmeSzinc
5ac50e6910 Add: Support auto search 2021-01-28 00:35:15 +08:00
LmeSzinc
0077eb4d9c Add: Operation siren clear full map 
- Skip clicking if already goto destination
- Skip path finding if no fleet 2
- Right align Y axis when showing map
- Fix perspective draw
- Add MAP_FOCUS_ENEMY_AFTER_BATTLE for OS
- ensure_edge_insight now focus to random corner, rather than bottom-right
- Add OSGrids
- Add view mode to detect maps in OS
- Fix OCR debug run before model init
- Add handle_map_event() to include all os handlers
- Add OS map info extractor
 2021-01-26 17:07:34 +08:00
LmeSzinc
c2f23ab5fd Del: Delete spare fleet 
- Fix: [JP] guild boss setting in GUI
 2021-01-22 17:02:35 +08:00
LmeSzinc
46d1430860 Merge branch 'master' into dev 2021-01-20 21:53:08 +08:00
noname94
5426dfc295 Fix: [JP] Location of HP bar and ship level 2021-01-20 02:36:52 +09:00
LmeSzinc
6656b097dc Merge branch 'master' into dev 2021-01-19 16:24:10 +08:00
LmeSzinc
9a1b2d8383 Fix: Location of HP bar and ship level 2021-01-19 16:15:54 +08:00
LmeSzinc
1aacce72e8 Fix: _guild_triggered not working in non-continuous campaign 
- Opt: Comments in logistics_mission to avoid mis-understandings
 2021-01-19 03:38:43 +08:00
nEEtdo0d
e5cf62069f Merge remote-tracking branch 'origin/master' into update_asset 2021-01-17 11:08:42 -05:00
LmeSzinc
d3abb53021 Opt: One less screenshot before clicking BATTLE_PREPARATION 2021-01-17 21:31:37 +08:00
nEEtdo0d
3a049c99fa Mov: *_CF references and assets to module guild from combat 
Add: GuildCombat class

Fix: GuildOperations use independent instance GuildCombat to
handle combat interfaces for guild raid boss
 2021-01-16 13:53:46 -05:00
nEEtdo0d
bbd44d3d3c Add: If popup encountered, handle guild after campaign completed 2021-01-16 10:26:10 -05:00
LmeSzinc
717420aa6a Fix: Handle guild popups 2021-01-15 22:32:06 +08:00
nEEtdo0d
d03caa87e8 Add: Handler for Guild Info, occurs after battle and also sometimes 
upon log in (TBD, add fix if needed)
Able to handle either logistics or operations by scanning the
page before determining the necessary actions

TODO: Test for when operations info appear
[CN, TW, JP] Replace GUILD_HANDLE_CONFIRM
 2021-01-14 14:55:52 -05:00
nEEtdo0d
7837707995 Add: [CN, TW, JP] Add placeholder assets and update assets.py 
TODO: Replace for respective server GUILD_BOSS_ENTER,
GUILD_DISPATCH_*, GUILD_OPERATIONS_*, GUILD_REPORT_*
 2021-01-07 11:51:23 -05:00