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
4,762 Commits 9 Branches 0 Tags 274 MiB
45f7dbcc5a
Commit Graph

572 Commits

Author SHA1 Message Date
LmeSzinc
b83067e7d9 Fix: Illustrious on A5 can't be reached in Empyreal Tragicomedy A2 C2 (#313) 2021-01-21 23:22:55 +08:00
LmeSzinc
1b28451f98 Fix: 2-4 perspective parameters 2021-01-21 23:03:59 +08:00
LmeSzinc
1d20dd8827 Add: Empyreal Tragicomedy chapter B 2021-01-21 22:43:50 +08:00
LmeSzinc
9f5a1f05c1 Add: Empyreal Tragicomedy chapter C 2021-01-21 22:20:54 +08:00
LmeSzinc
20bea7a112 Add: Empyreal Tragicomedy A3 
- Fix: Disable mechanics handler if reach clear mode
 2021-01-21 20:05:10 +08:00
LmeSzinc
191274c10c Add: Empyreal Tragicomedy A2 AS2 
- Fix: map clear bar in A2
- Fix: Handle mechanics in A2, just able to run, slow
- Opt: perspective parameters
 2021-01-21 17:25:25 +08:00
LmeSzinc
4855cab4a2 Add: Empyreal Tragicomedy A1 AS1 
- Dev: Fix dock extraction. Treat dock as land, because is not accessible
- Dev: Add auto use modified campaign_base
 2021-01-21 16:06:58 +08:00
LmeSzinc
75aac75009 Add: Event entrance of Empyreal Tragicomedy 
- Dev: Add translation of siren names in Empyreal Tragicomedy
 2021-01-21 14:46:29 +08:00
nEEtdo0d
845c9d5e67 Fix: Raise exception in case name does not belong anywhere 
indicating malformed timing of screen capture for OCR
 2021-01-11 13:52:43 -05:00
LmeSzinc
298b6941f3 Opt: Inverted Orthant D1 D3 low cost farming 2021-01-01 22:38:49 +08:00
LmeSzinc
48eb29509a Add: spawn_data_loop 
- Dev: Add extraction for spawn_data in chapter_template_loop.lua
 2021-01-01 22:18:06 +08:00
LmeSzinc
fb70aa720d Fix: Enemy genre selecting in Inverted Orthant D1 D3 2021-01-01 18:45:31 +08:00
LmeSzinc
da14ae9493 Opt: Inverted Orthant D3 low cost farming 
- Add: Purple series enemy templates
 2020-12-31 22:50:06 +08:00
LmeSzinc
cc04d5f5a0 Opt: Inverted Orthant D1 low cost farming 
- Add enemy templates in Inverted Orthant
 2020-12-31 22:38:47 +08:00
LmeSzinc
90d455fb7d Opt: Inverted Orthant chapter SP 2020-12-31 22:09:04 +08:00
LmeSzinc
b2b34f3f23 Opt: Inverted Orthant chapter D 2020-12-31 21:40:50 +08:00
whoamikyo
87b3171deb Opt: Parameters in Inverted Orthant D3 2020-12-31 08:21:31 -03:00
LmeSzinc
bd0c3c9e61 Opt: Inverted Orthant chapter C 
- Opt: Reduce the size of template shoukaku and zuikaku
- Fix: spawn_data in chapter C
- Opt: Perspective parameters in chapter C
 2020-12-31 17:17:00 +08:00
LmeSzinc
feabfe31be Fix: Siren detection scaling in chapter CD 2020-12-31 14:49:44 +08:00
LmeSzinc
ef52dc0450 Opt: Parameters in chapter AB 2020-12-31 14:31:54 +08:00
whoamikyo
2771007c9c Add: Inverted Orthant D1 D2 D3 SP 2020-12-30 22:26:05 -03:00
whoamikyo
5efc08d655 Add: Inverted Orthant B3 2020-12-30 20:16:32 -03:00
LmeSzinc
8ca0205c40 Add: Inverted Orthant B1 B2 
- Fix spawn_data in chapter A
 2020-12-30 18:55:59 +08:00
MarioGilera
4b4fa5800e Improved "Inverted Orthant" Ax and Cx maps. 
Edit "MAP.weight_data" to use new mechanic.
 2020-12-29 21:50:35 +01:00
LmeSzinc
c015e2b62a Add: Inverted Orthant Chapter A 
- Fix TEMPLATE_SIREN_DD
 2020-12-29 23:25:42 +08:00
LmeSzinc
c2378cab97 Add: Event entrance of Inverted Orthant 2020-12-29 19:34:04 +08:00
LmeSzinc
4a8ae72ef3 Opt: Delete hard-coded camera swipe in 3-4 2020-12-23 16:36:22 +08:00
LmeSzinc
1f6948d121 Fix: CampaignNameError in _sos_is_appear_at_chapter() 2020-12-11 21:17:52 +08:00
LmeSzinc
f099666539 Opt: Update configs in event_20200806_cn 2020-12-11 20:52:23 +08:00
LmeSzinc
917c523714 Opt: [EN] Auto select The Enigma and the Shark event as default 2020-12-11 20:46:30 +08:00
nEEtdo0d
389b190c0b Add: EN The Enigma and the Shark Rerun event 2020-12-10 22:40:12 -05:00
whoamikyo
8ce711d62d Add: added chapter 13 maps 
- still need some optimization
 2020-12-07 16:46:33 -03:00
LmeSzinc
949999150b Fix: Perspective parameters in Vacation Lane 2020-11-27 19:55:36 +08:00
LmeSzinc
94cb3a390a Fix: SP in Vacation Lane 
- Add: siren template in SP
 2020-11-27 00:28:50 +08:00
LmeSzinc
6b01a67076 Add: Siren templates in SP4 2020-11-26 23:12:38 +08:00
LmeSzinc
15381e9dc3 Fix: Add TEMPLATE_STAGE_HALF_PERCENT to fix SP3 
In event Vacation Lane SP3, when it's 50%, a part of the '%' is out of the stage icon, so use the left side of '%' to match stage entrance
 2020-11-26 22:46:58 +08:00
LmeSzinc
2a49ecaa46 Add: Siren templates in SP3 2020-11-26 22:33:18 +08:00
LmeSzinc
405569d955 Add: SP2 and MarieRoseDOA 2020-11-26 21:42:03 +08:00
LmeSzinc
efa9df85c5 Dev: DOA character name translation 2020-11-26 21:21:51 +08:00
LmeSzinc
75c958bb06 Fix: Handle Story with long choosing button 
- Opt: Campaign swipe multiply in SP1
 2020-11-26 18:10:18 +08:00
LmeSzinc
4e564cbf71 Fix: UI switching in Vacation Lane 
- Fix: Handle Animation after cleared the 4th enemy
 2020-11-26 17:39:12 +08:00
LmeSzinc
97d53a6248 Add: Vacation Lane (event_20201126_cn), DOA collaboration 2020-11-26 17:15:25 +08:00
LmeSzinc
b6c49cae11 Fix: [TW] add default raid event to avoid error (#249) 2020-11-26 15:59:58 +08:00
LmeSzinc
51c6770c3e Fix: [CN] Event directory 2020-11-24 20:06:14 +08:00
LmeSzinc
858f3ecb4a Opt: Change the way to load events 
Modify events in ./campaign/Readme.md, run dev_tools/event_extractor.py
 2020-11-23 21:11:30 +08:00
LmeSzinc
72a729faea
Merge pull request #241 from nEEtdo0d/war_archives 
Add: War Archives Automation
 2020-11-20 20:55:38 +08:00
LmeSzinc
8f496347ee Fix: [CN] SP0 in Stars of the Shimmering Fjord rerun 2020-11-20 17:10:33 +08:00
nEEtdo0d
f6b3403310 Merge remote-tracking branch 'origin/master' into war_archives 2020-11-19 21:54:44 -05:00
whoamikyo
bd09bdbe43 Fix: fixed 11-3 module error 2020-11-19 22:58:29 -03:00
nEEtdo0d
7607d50545 Fix: resolve merge conflicts 2020-11-19 11:19:41 -05:00
LmeSzinc
62de90e75d Merge branch 'dev' 2020-11-19 17:46:21 +08:00
LmeSzinc
afc96e13a3 Add: Handle land based in 「复刻峡湾间的星辰」(event_20200903_en) 2020-11-19 17:20:57 +08:00
nEEtdo0d
463c34bb67 Fix: Less screenshot, use image directly. Cover and recover configuration for run 2020-11-18 22:25:22 -05:00
nEEtdo0d
fe68989e78 Merge remote-tracking branch 'origin/master' into war_archives 2020-11-18 19:58:39 -05:00
whoamikyo
798127fc28 Opt: 11-3 changed backend to homography 2020-11-18 13:42:47 -03:00
nEEtdo0d
62e90b138f Fix: Visitors Dyed in Red re-generated maps, 3 variations exist, pick highest id number 2020-11-17 14:47:47 -05:00
nEEtdo0d
fc384b3e0a Fix: Remove 'EX' maps not available in war archives, update offset for USE_DATA_KEY 2020-11-16 13:54:23 -05:00
LmeSzinc
9bdd2299c7 Fix: land_based_data should set after map_data 
- Update maps in event_20200903_en
 2020-11-16 19:27:09 +08:00
nEEtdo0d
16af8bb94d Merge remote-tracking branch 'origin/master' into war_archives 2020-11-15 10:49:36 -05:00
LmeSzinc
8cbbade03b Opt: [EN] Remove redundant maps event_20201112_en 2020-11-15 22:21:02 +08:00
nEEtdo0d
7d2547e5be Fix: Re-implemented per PR comments 2020-11-14 17:54:21 -05:00
nEEtdo0d
dc56fa0729 Fix: Fallen Wings siren template configuration 2020-11-14 12:39:35 -05:00
nEEtdo0d
af9add1e8e Fix: Winter's Crown incorrect siren template names, map_extractor may need dictionary updates 
Fix: Detection of info window pertaining to data key usage from appear to ocr method
 2020-11-14 00:50:56 -05:00
nEEtdo0d
b9d3ce7a12 Merge remote-tracking branch 'origin/master' into war_archives 2020-11-13 11:44:26 -05:00
whoamikyo
d2694ec318 Add: [JP] added Stars of the Shimmering Fjord to JP server 
- fix Sundered Blue order in event list
 2020-11-13 12:30:17 -03:00
nEEtdo0d
2de69c287a Add: All EN supported war archives campaigns 
TODO: CN/JP has some exclusive maps, update search logic for entrance if so
 2020-11-13 00:18:41 -05:00
nEEtdo0d
a6caadd004 Fix: select campaign map's weight 2020-11-12 12:19:13 -05:00
nEEtdo0d
124521ddc0 Add: retry logic for some ui elements, override triggered_stop_condition for remaining data keys 2020-11-11 21:30:24 -05:00
nEEtdo0d
94e763b26e Add: clear_all_mystery() to applicable VDiR war archive maps 2020-11-09 20:35:14 -05:00
nEEtdo0d
e125bdaa65 Fix: Move war archive events where others are, adjust code as needed 2020-11-07 16:43:40 -05:00
nEEtdo0d
274e56529a Add: War Archives Campaign Run 
TODO: Update images as needed per server, scroll/next page implementation for page_archives, maybe rename and move war archives events back to where others are and prepend with 'war_archives' for those events
 2020-11-07 13:45:30 -05:00
LmeSzinc
877848495f Opt: Perspective parameters in SP5 2020-11-02 21:02:12 +08:00
LmeSzinc
c3760680ec Fix: Handle grids covered by map items 2020-11-01 14:44:41 +08:00
whoamikyo
190749b529 Fix: fixed live start loop 2020-11-01 00:16:41 -03:00
LmeSzinc
0e7124a4e8 Fix: Handle "Live start!" Universe in Unison 2020-10-31 20:23:03 +08:00
LmeSzinc
6fede53204 Fix: SP in Universe in Unison 2020-10-30 22:25:32 +08:00
LmeSzinc
2ba3fb7f61 Opt: Map.camera_data in SP5 
- Opt: MAP_SWIPE_MULTIPLY from SP1 to SP5
- Opt: Battle logic for low cost farming
 2020-10-30 20:59:00 +08:00
LmeSzinc
a8442cd0c5 Fix: Perspective parameters in Universe in Unison 
- Adjust MAP.camera_sight, because combo status on event maps will cover some grids
- Opt camera data from SP1 to SP4
 2020-10-30 18:23:57 +08:00
LmeSzinc
8f12cc6ee6 Fix: UI switch in Universe_in_Unison 2020-10-30 17:01:48 +08:00
LmeSzinc
078cafda87 Add: Map files in Universe_in_Unison (event_20201029_cn) 
- TODO: Add siren templates
- TODO: Handle combo status in event maps
 2020-10-29 22:42:10 +08:00
LmeSzinc
238395f095 Opt: SOS stages battle logic 2020-10-24 21:32:19 +08:00
LmeSzinc
3b08b9cc82 Fix: MAP.spawn_data in SOS maps 2020-10-18 21:16:46 +08:00
LmeSzinc
1760820cf5 Add: SOS map files 
- TODO: EN JP need to replace SIGNAL_SEARCH_GOTO
- TODO: Map logic optimization
- TODO: Fix MAP.spawn_data
 2020-10-18 18:34:59 +08:00
LmeSzinc
508c8cb2c2 Add: Entrance of SOS stages 2020-10-17 22:50:07 +08:00
LmeSzinc
6429b9c32b Opt: MAP_SWIPE_MULTIPLY in event_20201012_cn 
- Minor GUI description
 2020-10-12 18:53:35 +08:00
LmeSzinc
f26080c976 Add: [CN][JP] SP event: 划破海空之翼(event_20201012_cn) 2020-10-12 16:18:06 +08:00
whoamikyo
6da648530a Opt: removed redundant events 2020-10-05 02:02:07 -03:00
whoamikyo
3c6bdb4d67 Fix: fix latest event auto select 2020-10-05 01:52:22 -03:00
whoamikyo
c64e5bc06a Fix: fix siren names 2020-10-02 15:01:45 -03:00
whoamikyo
bf66b81964 Opt: re-imported Counterattack Within the Fjord maps 
- using latest map extractor tool
 2020-10-02 14:59:47 -03:00
LmeSzinc
b9f230badf Revert "fix that scirpt do not switch fleet to clear boss" 
- Please don't use fleet_boss when boss_spawn <= 5
- Please don't make PR for personal battle logic
 2020-09-25 19:29:53 +08:00
ashesofdream
d0c1653ca4
fix that scirpt do not switch fleet to clear boss 2020-09-25 09:05:02 +08:00
LmeSzinc
0f5cb666a6 Opt: Perspective parameter in SP, Dreamwaker's Butterfly 2020-09-23 13:17:31 +08:00
LmeSzinc
0494b9403c Opt: Revert greedy optimization 2020-09-22 02:59:58 +08:00
LmeSzinc
583cf965f4 Opt: Disable customized SWIPE_MULTIPLY in Dreamwaker's Butterfly 2020-09-21 20:40:40 +08:00
LmeSzinc
0d90ebdeff Add: SP in Dreamwaker's Butterfly 2020-09-21 00:40:06 +08:00
LmeSzinc
783fcdf6a8 Fix: perspective parameters in Dreamwaker's Butterfly 
- Doc README.md update event announcements
 2020-09-20 20:49:12 +08:00
LmeSzinc
24e5094680 Opt: Battle logic in HT4 HT5 HT6 T6 
- Add map_is_clear_mode
 2020-09-20 19:15:34 +08:00
LmeSzinc
dd32089c2a Fix: 1E on MS, SU on FL 
- Opt camera position in T6 HT6
 2020-09-20 16:48:31 +08:00
LmeSzinc
b7c578f367 Add: T5 HT5 in Dreamwaker's Butterfly 2020-09-20 03:47:41 +08:00
LmeSzinc
1a4bc96bf2 Fix: Redundant way node when having one-way portal 
- Add: expected story
 2020-09-20 02:51:00 +08:00
LmeSzinc
9e933bc1c2 Add: T4 HT4 in Dreamwaker's Butterfly 
- Fix use boss fleet as mob when push_forward and triggered enemy round
- Opt speed up minitouch
 2020-09-19 20:48:19 +08:00
LmeSzinc
5d474b2d74 Add: T3 HT2 HT3 in Dreamwaker's Butterfly 2020-09-19 17:56:37 +08:00
LmeSzinc
3a97d35beb Add: Map portal support, map_data_loop in clearing mode 
- Add T2 in Dreamwaker's Butterfly
 2020-09-19 17:26:29 +08:00
LmeSzinc
2f3001b2fe Dev: Extract portal info, chapter_template_loop 
- Extract MAP_HAS_MOVABLE_ENEMY, MAP_HAS_AMBUSH
 2020-09-19 17:26:23 +08:00
LmeSzinc
eecb4ea1bb Add: T6 HT6 in Dreamwaker's Butterfly 
- Fix prediction if movable enemy tracking lost
- Only correct camera in ensure_edge_insight
 2020-09-19 03:57:00 +08:00
LmeSzinc
b8582fe8b6 Add: Dreamwaker's Butterfly HT1 HTS1 2020-09-18 23:55:13 +08:00
LmeSzinc
62957d9830 Fix: Daily hard has no campaign_extract_name_image 
- Fix event switching with campaign ball
- Add MAP_IS_ONE_TIME_STAGE
- Opt description of event_stage in GUI
- Add info when map file not found
 2020-09-18 22:58:18 +08:00
LmeSzinc
c56ef3568c Add: Handle campaign ball 
- Fix: Handle doing map detection on in_stage image
 2020-09-18 21:09:26 +08:00
LmeSzinc
a189076da8 Add: Dreamwaker's Butterfly (event_20200917) TS1 T1 
- Dev: Fix relative_crop import
 2020-09-18 20:09:59 +08:00
LmeSzinc
3e89e59043 Fix: Stuck in hard campaign equip take off 2020-09-18 12:45:20 +08:00
LmeSzinc
776532ea7f Fix: Stuck in hard campaign equip take off 2020-09-18 12:23:57 +08:00
LmeSzinc
1f058030f6
Revert "Add: Box recycle module" 2020-09-16 22:54:49 +08:00
RuaBQ
8c6cfb0389 add template 2020-09-15 09:27:04 +08:00
LmeSzinc
b8635301b3 Opt: Fleet 2 push forward in Stars of the Shimmering Fjord 2020-09-05 02:20:43 +08:00
LmeSzinc
36cdc2d45e Opt: 8-4 roadblocks 2020-09-04 16:17:57 +08:00
LmeSzinc
1c9ee199a0 Opt: Roadblocks in Stars of the Shimmering Fjord 2020-09-04 15:25:44 +08:00
Cerz0
5b11bb7395
added I4, J4 as roadblocks 2020-09-04 04:50:28 +02:00
LmeSzinc
c584f1417d Typo: Siren template name 2020-09-04 01:08:09 +08:00
LmeSzinc
65b56d30e3 Add: Stars of the Shimmering Fjord (event_20200903_en) 2020-09-04 00:15:25 +08:00
LmeSzinc
857adacfbf Add: 8-4 leveling 2020-09-03 19:20:18 +08:00
LmeSzinc
51fd4470cb Add: Timeout leveling 2020-08-30 10:54:18 +08:00
LmeSzinc
a92d6f4fd0 Fix: Spawn data in C1 C2 2020-08-25 23:41:16 +08:00
whoamikyo
a2d2f60edc Revert "Opt: minor optimizations" 
This reverts commit 997f81782b.
 2020-08-24 12:28:47 -03:00
whoamikyo
997f81782b Opt: minor optimizations 2020-08-24 12:28:36 -03:00
LmeSzinc
b5c361c858 Opt: D2D3SP, because most enemies are scale == 3 2020-08-21 05:40:22 +08:00
LmeSzinc
7f35bd83e5 Fix: Wrong spawn data in D1 2020-08-21 04:55:48 +08:00
LmeSzinc
1895d298dd Add: SP in Scherzo of Iron and Blood Rerun 
- Opt: MAP_SWIPE_MULTIPLY in chapter BCD
- Add: map_covered setting to MapBase
- Add: Map logic fleet_2_protect
- Opt: Map logic in D1D2D3SP
 2020-08-21 04:35:50 +08:00
LmeSzinc
9a784caeeb Add: Chapter CD in Scherzo of Iron and Blood Rerun 
- Fix camera position in B3
 2020-08-21 00:13:35 +08:00
LmeSzinc
e19ca73683 Add: Chapter AB in Scherzo of Iron and Blood Rerun (event_20200820_cn) 2020-08-20 22:23:33 +08:00
Kyo
3790589c75
Fix: added homography as backend in D1 map 
- for Aurora Noctis event.
 2020-08-16 16:44:43 -03:00
LmeSzinc
e625fa5d8a Fix: 1-1 Affinity farming more than 20 times 
- Opt 8-4 push forward
 2020-08-17 02:24:12 +08:00
Kyo
410269d125
Fix: removed hardcoded boss fleet 2020-08-15 10:09:39 -03:00
whoamikyo
6f4f2d2ed7 Fix: changed detection backend to homography in SP 
- Aurora Noctis event
 2020-08-15 09:38:10 -03:00
whoamikyo
cc27a8296d Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2020-08-15 09:26:30 -03:00
Kyo
4bf15e1742
Fix: changed detection backend to homography in D3 2020-08-15 09:25:27 -03:00
whoamikyo
30c79becaf Fix: changed detection backend to homography in B1 and B2 2020-08-15 09:24:57 -03:00
LmeSzinc
afcf48f89f Add: 1-1 Affinity farming 2020-08-14 08:05:26 +08:00
LmeSzinc
224048560b Opt: Chapter 8 
- Add: clear_first_roadblocks
- Opt: mysteries now only sort by cost
- Fix: clear roadblocks in clear_potential_boss
 2020-08-14 02:34:06 +08:00
LmeSzinc
7ee63cc651 Opt: Move Wasteland mode to stop condition if_map_reach 
Opt: Gather map status
 2020-08-11 00:08:29 +08:00
Kyo
5559645eb9
Change clear_boss() to fleet_boss 2020-08-09 21:22:44 -03:00
LmeSzinc
72297a8ea4 Fix: HP get in hard campaign 2020-08-10 01:33:53 +08:00
LmeSzinc
4d502c3304 Fix: 12-4 leveling attack enemy_scale==1 2020-08-08 14:54:48 +08:00
Kyo
740e76c4fd
Change clear_boss() to fleet_boss 2020-08-08 02:55:58 -03:00
Kyo
ba23b9ac56
Change clear_boss() to fleet_boss 2020-08-06 23:44:53 -03:00
Kyo
5e0b45cb31
Merge pull request #141 from whoamikyo/nightly 
Opt: optmize 11-4 and 12-4
 2020-08-06 12:50:37 -03:00
whoamikyo
8df41b3e01 Opt: optmize 11-4 and 12-4 
Docs: added wiki link on readme
 2020-08-06 12:49:45 -03:00
LmeSzinc
edb19e8eec Add: event_20200807_cn 
- [CN][JP] Add 复刻最重要的宝物, 鉄血鮫とエニグマ（復刻）
- [EN] Add entrance of Aurora_Noctis
- Fix TEMPLATE_SIREN_CL
- Fix GameStuckError in relative record
 2020-08-06 19:37:26 +08:00
LmeSzinc
ddefbc048b Fix: Handle different MAP_ENEMY_TURN on different sirens 
- Fix merge error on movable enemies
- Fix old select arguments in 7-2
 2020-08-06 19:25:26 +08:00
LmeSzinc
46d4463649 Opt: Different grid.cost for different fleet 2020-08-06 03:37:21 +08:00
LmeSzinc
c22355ee86 Opt: Handle movable enemy in other battle condition 
- Fix walk timeout warning when ambush evade failed
- Disable POOR_MAP_DATA in event_20200723_cn
 2020-08-05 18:29:27 +08:00
LmeSzinc
1acac2faab Fix: grid merge in treasure scanning 2020-07-31 23:41:21 +08:00
LmeSzinc
c79f9e667a Opt: Simplify grid merge 2020-07-31 21:55:07 +08:00
whoamikyo
b36c760acf Merge branch 'nightly' of https://github.com/whoamikyo/AzurLaneAutoScript into nightly 2020-07-29 19:06:59 -03:00
whoamikyo
16257634fb Fix: Fix Siren CV template 2020-07-29 19:06:54 -03:00
LmeSzinc
914297f236 Fix: event_20200723_cn D1 homography edge detection 2020-07-29 01:12:21 +08:00
LmeSzinc
ebf382dd4d Merge branch 'master' into dev 2020-07-28 16:01:07 +08:00
LmeSzinc
ce499886ee Add: SP map in event_20200723_cn 2020-07-28 15:39:46 +08:00
whoamikyo
dffd2f6152 Fix ISSS A3 battle logic 2020-07-26 22:36:41 -03:00
LmeSzinc
10633686b1 Opt: event_20200723_cn SWIPE_MULTIPLY fit 2020-07-26 19:12:35 +08:00
LmeSzinc
55345df199 Fix: event_20200723_cn D2 D3 function name typo 2020-07-26 16:24:52 +08:00
LmeSzinc
41c515c9eb Fix: event_20200723_cn D1 2020-07-26 04:02:18 +08:00
LmeSzinc
612975c1c1 Fix: Incorrect siren setting in event_20200723_cn B3 2020-07-26 03:30:10 +08:00
LmeSzinc
b39c2a0984 Opt: Low oil farming logic in event_20200723_cn C2 D1 D2 D3 2020-07-26 00:44:51 +08:00
LmeSzinc
9a07b271da Fix: Unable to find fleets 2020-07-25 22:09:54 +08:00
LmeSzinc
673e8422a4 Add: [CN] event_20200723_cn B3 D3 
- Fix homography error when no edge detected
- Increase battle function try count, just for pool logic currently
 2020-07-25 03:40:40 +08:00
LmeSzinc
69afef4844 Add: [CN] event_20200723_cn B1B2, D1D2 
- Fix U73 template
- Fix story skip popup confirm
- Add GRID_IMAGE_A_MULTIPLY
 2020-07-25 02:41:21 +08:00
LmeSzinc
296a7412c1 Add: [CN] Chapter AC for 永夜幻光(event_20200723_cn) 2020-07-24 19:57:02 +08:00
whoamikyo
6931779064 Fix: Fixed stuck at grand capture map 2020-07-22 02:27:48 -03:00
whoamikyo
79ceb6106b Fix: Fixed stuck at grand capture map 2020-07-22 01:07:18 -03:00
whoamikyo
ef180bef69 Opt: fix battle logic for A maps in ISSS event 2020-07-20 13:46:33 -03:00
whoamikyo
bc7b8175db Opt: added battle logic for A maps in ISSS event 
Fix: [EN] minor fix in commission dictionary
 2020-07-20 02:15:36 -03:00
LmeSzinc
26e829712d Fix: [EN] Siren first in Ink-Stained Steel Sakura Rerun 2020-07-17 10:04:48 +08:00
LmeSzinc
7a8ab8098d Fix: [EN] event map now extract from the correct source 2020-07-17 06:14:10 +08:00
LmeSzinc
67ff6430e6 Opt: [EN] Better camera_data 2020-07-17 02:56:54 +08:00
LmeSzinc
09cf515678 Fix: [EN] Config for high camera position 2020-07-17 02:37:57 +08:00
LmeSzinc
4a2fc20006 Fix: [EN] Basic event map config for Ink-Stained Steel Sakura Rerun 2020-07-17 01:27:59 +08:00
LmeSzinc
045522fe87 Merge remote-tracking branch 'origin/master' 2020-07-17 00:11:35 +08:00
LmeSzinc
45dc0fa1f9 Add: [EN] Ink-Stained Steel Sakura Rerun support 2020-07-17 00:09:47 +08:00
LmeSzinc
94f9f66685
Merge pull request #95 from Cerz0/master 
campaign 12-3
 2020-07-16 01:10:14 +08:00
Cerz0
fd833e07b0
campaign 12-3 2020-07-15 19:08:47 +02:00
LmeSzinc
bc69db5710
Merge pull request #93 from Cerz0/master 
fix for 11-4
 2020-07-14 02:12:02 +08:00
Cerz0
2dfd7a1702
Add files via upload 
posible fix for crashes when boss spawns on bottom right:

"IndexError: index 0 is out of bounds for axis 0 with size 0"
 2020-07-13 19:59:01 +02:00
LmeSzinc
de50cd1b82 Fix: Increase interval of exercise timer 
- Fix 10-2 map logic
 2020-07-14 00:24:44 +08:00
LmeSzinc
937a251372 Fix: Chapter 2 perspective parameters 2020-07-13 01:24:19 +08:00
LmeSzinc
56cd3603ad Fix: 12-4 with 2 fleets 2020-07-10 20:12:41 +08:00
LmeSzinc
7702b0e8df Fix: Move 12-2 to ./campaign/campaign_main 2020-07-10 00:44:57 +08:00
LmeSzinc
471b7ad460 Fix: 2-1 when boss appear 2020-07-09 01:26:14 +08:00
LmeSzinc
8d7dc786e6
Merge pull request #89 from Cerz0/master 
Add: campaign_12_2
 2020-07-08 15:01:18 +08:00
Cerz0
0cf716740a
campaign_12_2 2020-07-08 01:32:50 +02:00
LmeSzinc
2d9a80080a
Merge pull request #88 from Cerz0/master 
Add: campaign_12_1
 2020-07-07 22:33:34 +08:00
Cerz0
077af8c551
campaign_12_1 2020-07-07 16:26:41 +02:00
LmeSzinc
f1d8fa4fc5
Merge pull request #84 from Cerz0/master 
Add: 11_1 and 11_3
 2020-07-05 01:22:26 +08:00
Cerz0
c8afd329a7
11_1 AND 11_3 2020-07-04 19:18:33 +02:00
LmeSzinc
a8bcb869aa Fix: 2 map files for 11-2 2020-07-04 02:16:46 +08:00
LmeSzinc
edccef1fcd
Merge pull request #83 from Cerz0/master 
campaign_11_2
 2020-07-03 09:12:11 +08:00
Cerz0
fffedd5fe1
11_2 2020-07-03 00:58:56 +02:00
Cerz0
4a75197571
11-2 2020-07-01 23:43:28 +02:00
LmeSzinc
93a36b0828
Merge pull request #82 from Cerz0/master 
Add: 8-2 and 8-3
 2020-07-02 01:52:03 +08:00
Cerz0
874519aa76
8-2 and 8-3 2020-07-01 19:49:32 +02:00
LmeSzinc
2e21ea4176 Fix: Perspective parameters in chapter 6 2020-07-01 11:26:02 +08:00
LmeSzinc
8a3d8a8ada
Merge pull request #81 from Cerz0/master 
campaign 8-4
 2020-07-01 09:05:21 +08:00
Cerz0
c6de356551
campaign 8-4 2020-07-01 02:51:02 +02:00
whoamikyo
4d5bffa28c Map: Improvements on 13-4 2020-06-28 12:00:19 -03:00
LmeSzinc
f24e82822b
Merge pull request #74 from Cerz0/master 
8-1
 2020-06-28 09:09:56 +08:00
Cerz0
2b01a9a9a2
8-1 2020-06-28 02:34:52 +02:00
whoamikyo
fde9ca88fc Merge branch 'master' of https://github.com/whoamikyo/AzurLaneAutoScript 2020-06-27 08:13:10 -03:00
Cerz0
4646fcd266
9-1 
If you get bad luck with enemy spawns it may do 1 or 2 extra battles, there is nothing worthwhile to farm there, 3 star and move on
 2020-06-26 23:39:32 +02:00
whoamikyo
e159d06cd2 Update campaign_10_2.py 2020-06-26 04:58:07 -03:00
LmeSzinc
8c08744f19 Fix: Parameters in 10-4 2020-06-26 03:31:56 +08:00
whoamikyo
bc1816eddb Update campaign_10_4.py 2020-06-22 19:49:37 -03:00
whoamikyo
c786c9d31d Map: Updated 10-4 2020-06-22 19:48:33 -03:00
LmeSzinc
2862d3141e Add: Support 7-3, 7-4, add RoadGrids.combine 2020-06-23 04:37:09 +08:00
whoamikyo
0cdbe4cf10 20200620.04 
Map: Added camera_data_spawn_point on 6-4
 2020-06-20 16:33:04 -03:00
whoamikyo
08fa859163 20200620.04 
Map: added camera_data_spawn_point on 6-4
 2020-06-20 16:23:17 -03:00
LmeSzinc
8963ba790c Merge remote-tracking branch 'origin/master' 2020-06-20 18:49:20 +08:00
whoamikyo
6af59ce3eb Reverting default config in event map 2020-06-20 06:51:26 -03:00
Erik
22bda2970f
Merge branch 'master' into nightly 2020-06-20 06:12:19 -03:00
LmeSzinc
ca64872a14 Fix: [EN] parameters for Skybound Oratorio D3 2020-06-20 04:23:53 +08:00
whoamikyo
959f75baa0 Map: added roadblocks on D3 map (event_20200611) 2020-06-19 06:55:37 -03:00
LmeSzinc
26ce4d896d Fix: Timer for potato pc 
- Timer for retreat
- Timer for equip swipe
- Fix error when already in map
- Better code appearance for B3/D3 in event_20200611_en
 2020-06-19 17:19:03 +08:00
whoamikyo
3f06c55f6c Added: 13-4 map with basic optimization 2020-06-19 05:35:26 -03:00
whoamikyo
60ee098be3 Tweak: updater.bar merged into Easy_install-V2.bat 2020-06-19 02:08:23 -03:00
LmeSzinc
e128142678 Fix: Mis-detection 
- Mis-detect BATTLE_STATUS_B when battle executing
- Mis-detect in_stage on potato device
- Optimize enemy_genre select for 12-2 leveling
 2020-06-17 17:56:10 +08:00
whoamikyo
501aaceed4 Update campaign_7_2_mystery_farming.py 2020-06-16 06:53:54 -03:00
whoamikyo
d2d64ee487 Add: Added some icons to GUI 
Assets: [EN] updated some templates assets using relative_crop.py
Campaign: Added 12-4 support
Fix: Added camera_data_spawn_point on 7-2 mystery to avoid dont detected a fleet when camera focus on H1
 2020-06-16 00:04:16 -03:00
LmeSzinc
5f0f964d5f Fix: [EN] Parameters of event Skybound Oratorio 2020-06-15 21:19:06 +08:00
MarioGilera
6a62e54a25 Revam of event_20200611_en maps 2020-06-13 21:29:31 +02:00
ferina8-14
dea0a02245 Merge remote-tracking branch 'upstream/master' 2020-06-14 02:30:12 +09:00
ferina8-14
47adffd1a0 Merge branch 'master' into try_jp 
[JP] copy assets from cn

# Conflicts:
#	module/combat/assets.py
#	module/daemon/assets.py
#	module/handler/assets.py
#	module/retire/assets.py
#	module/reward/assets.py
 2020-06-13 03:29:35 +09:00
ferina8-14
4fd1b7999a Add: [JP] add event 20200603 for jp server 2020-06-13 02:55:07 +09:00
LmeSzinc
a623e7d082 Fix: rare bugs 
- Fix roadblocks in 6-4
- Fix mis-detect BATTLE_STATUS_D when battle executing
- Add call details to popup
 2020-06-12 19:29:13 +08:00
LmeSzinc
49ae4c6361 Add: [EN] Skybound Oratorio 2020-06-11 23:13:50 +08:00
Cerz0
69a3d7e253 Create campaign_10_3.py 2020-06-08 18:35:11 +02:00
kyO The NinjA
95ca113562 Add: Map 11-4 support, Columbia farm is real 
Add: Suport to Rank B
 2020-06-08 03:16:00 -03:00
lans4r
58357483ea
Add: 10-4 (#23) 
Add: 10-4
 2020-06-07 03:50:41 +08:00
Cerz0
3f27e7de9c Update campaign_10_2.py 2020-06-06 16:03:15 +02:00
LmeSzinc
c1a5ffcb30 Fix: Parameters for 3-4 2020-06-06 14:38:09 +08:00
LmeSzinc
a3feef6f1b Format: PEP-8 for campaign maps 2020-06-05 23:25:50 +08:00
Cerz0
1e94b5d69c
Update: map 10-1 
Update campaign_10_1.py
 2020-06-05 23:19:03 +08:00
LmeSzinc
d042f926b5 Fix: Catch other error caused by info_bar 
- Increase EDGE_LINES_HOUGHLINES_THRESHOLD in chapter 3
 2020-06-05 21:52:30 +08:00
LmeSzinc
66d119e250 Add: camera_data_spawn_point 2020-06-05 20:22:27 +08:00
LmeSzinc
81f9b61ea5 Add: Logic fleet_2_rescue, Logic for chapter 3 
- Fix camera outside map caused by info bar
- Fix mis-detection of is_caught_by_siren
- Fix grid attribute is_caught_by_siren will be kept to next attack
- Fix find_current_fleet when ammo icon of another fleet is covered by the green arrow of current fleet
- Fix fleet_boss_index
- Fix can not predict when boss appear on fleet's face
 2020-06-05 04:05:09 +08:00
LmeSzinc
6548677c80
Merge pull request #19 from Cerz0/master 
Fix: Update campaign_10_1.py
 2020-06-04 20:11:36 +08:00
Cerz0
a953d5b4b2 Update campaign_10_1.py 
Corrected map_data
Set up map.weight, spawn_data and roadblocks
 2020-06-04 13:50:59 +02:00
LmeSzinc
a41805c14f
Merge pull request #18 from Cerz0/master 
Fix: improved navigation on map 9-2
 2020-06-04 15:58:51 +08:00
Cerz0
00b09b8369 Update campaign_9_2.py 2020-06-04 02:02:44 +02:00
kyO The NinjA
1756b33211 Fix: [EN] Fix SP2 of the 'Prelude under the Moon' not catching the Mystery 2020-06-03 19:32:54 -03:00
kyO The NinjA
56601b2ae2 Fix: [EN] reduced the threshold of cv2.HoughLines on SP3 of the 'Prelude under the Moon' 2020-06-03 19:17:20 -03:00
Cerz0
dded6eb752 Revert "Create sp1.py" 
This reverts commit f696d110af.
 2020-06-03 23:57:54 +02:00
kyO The NinjA
8800682b28 Add: [EN] Add 'Prelude under the Moon' SP3 support 2020-06-03 17:28:28 -03:00
kyO The NinjA
a0668712b1 Add: [EN] Add 'Prelude under the Moon' SP2 support 2020-06-03 16:35:23 -03:00
kyO The NinjA
1bebbcbf67 Add: [EN] Add 'Prelude under the Moon' SP1 support 2020-06-03 15:21:52 -03:00
Cerz0
f696d110af Create sp1.py 2020-06-03 20:12:40 +02:00
LmeSzinc
87127c882a Fix: Now able to use 1 or 2 fleets in chapter 2 to 6 
- If using 1 fleet in 6-4, will pick up the ammo
 2020-06-03 23:11:31 +08:00
LmeSzinc
caee1450e6 Add: [CN] Event「峡湾间的反击」(event_20200603_cn) 
- Lower arrive_confirm when siren is cleared
 2020-06-03 22:15:25 +08:00
lans4r
1e15a913ce
add 9-4 2020-06-02 12:02:50 -04:00
Cerz0
613eb5847f Create campaign_9_2.py 2020-06-02 01:26:52 +02:00
LmeSzinc
f22d4755c9 Merge remote-tracking branch 'origin/master' 2020-06-01 08:23:18 +08:00
Cerz0
9615c6d759 Create campaign_9_3.py 2020-06-01 00:44:06 +02:00
LmeSzinc
16cc542219 Fix: [EN] event map 2020-06-01 02:46:05 +08:00
kyO The NinjA
6eabcf6a35 Fix: [EN] Relogin is now working 
Optimize: [EN] GUI improved
 2020-05-31 04:48:22 -03:00
kyO The NinjA
0138947c24 Fix: [EN] Removed some hardcoded parameters 2020-05-30 16:25:09 -03:00
kyO The NinjA
fa652ebeab Update a3.py 2020-05-30 16:08:00 -03:00
kyO The NinjA
c491fe7ec5 Add: [EN] New B2 battle logic thanks @justtesting 
Add: [EN] New C1 battle logic
Add: [EN] New B3 battle logic
Add: [EN] New D3 battle logic
Add: [EN] New assets
 2020-05-30 05:41:06 -03:00
kyO The NinjA
b12d8f299c Add: [EN] Assets updated 
Fix: [EN] A3 and C3 of the event Iris of Light and Dark Rerun
Optimize: [EN] commission filter, expect many mistakes yet
Optimize: [EN] added some tips on GUI
Add: [EN] New assets for Tactical Class, this module should work now
 2020-05-30 01:09:51 -03:00
kyO The NinjA
fe6815d20a [EN] Localization progress 
- Some GUI optimizations
- Minor fix in Quick Guide
 2020-05-29 14:34:43 -03:00
Erik
1244f9a6f1
Merge pull request #3 from LmeSzinc/master 
Add: Map logic fleet_2_push_forward, better support 7-1
 2020-05-28 18:52:45 -03:00
kyO The NinjA
916e797b34 New assets 
- New assets
- New parameters for EN event maps
- New tips GUI
 2020-05-28 18:37:17 -03:00
LmeSzinc
e8b3e7916c Add: Map logic fleet_2_push_forward, better support 7-1 
- Predict fleets when having 2 fleet spawn_point but only 1 fleet detected
 2020-05-28 16:31:56 +08:00
kyO The NinjA
5f55303421 FIx 3 Star Asset 2020-05-27 21:56:32 -03:00
kyO The NinjA
4302a66bd7 Update d2.py 2020-05-27 20:47:48 -03:00
kyO The NinjA
a3f0c0304e Fix assets for SHIP morale 2020-05-27 19:56:35 -03:00
kyO The NinjA
ba9ae67d63 New EN assets and new maps support 
- Added new EN assets
- Added support to maps A1, A2, A3, B1, B2, B3, C1, C2, C3, D1 and D3
 2020-05-27 18:51:05 -03:00
kyO The NinjA
0645d5cb3f Added new EN assets and new maps support 
- Added suport to 10-1 and 10-2
- Added suport to EN event Iris of Light and Dark Rerun, only D2 at the moment
- New EN assets
 2020-05-27 13:49:26 -03:00
LmeSzinc
708961ca46 Fix: 优化穹顶下的圣咏曲D3 2020-05-25 01:54:54 +08:00
LmeSzinc
ec03efaa67 Fix: 优化AB图参数 2020-05-24 04:38:59 +08:00
LmeSzinc
d75930cda2 Add: 适配B2B3,D2D3 
- 修复超大地图时location2node出错
- 增加走路出错时, 重新定位相机
- 调整CD图的透视识别参数
- 修复开荒时每战过后重新定位相机的多余操作
 2020-05-24 00:17:53 +08:00
LmeSzinc
7b97d3243c Add: 增加处理光墙(海域格子间的分隔) 
- 优化寻路初始化
- 修复海图log显示单字符显示'E'
 2020-05-23 17:22:51 +08:00
LmeSzinc
aa0e38a28c Add: 增加选择敌人类型 
- 更改enemy_type为enemy_genre
 2020-05-23 15:19:56 +08:00
LmeSzinc
87608f2879 Add: 适配穹顶下的圣咏曲B1D1 
- 修复精英舰队挡住弹药图标导致无法到达的问题
- 修复丢失预测导致的log报错
- 增加载入精英模板
- 修复碰磁BOSS
 2020-05-23 04:42:31 +08:00
LmeSzinc
a2ad24048e Add: 增加敌人类型识别 2020-05-23 01:35:56 +08:00
LmeSzinc
8ec5099b58 Add: 适配穹顶下的圣咏曲AC图 
- 修复UI导致的动态边缘识别出错
- 修复只识别出一队时的处理逻辑
- 修复处理战斗结束后跳出的剧情
- 修复辅助点击报CampaignEnd
- 修复游戏出现白屏bug时, 连续点击使用紧急维修
- 增加地图全清时, 使用二队打BOSS, 忽略FLEET_BOSS
- 增加被精英抓住的识别, 暂时还用不到
 2020-05-22 21:48:56 +08:00
LmeSzinc
47c4afdaae Fix: 修复7-2三站拣垃圾 2020-05-18 17:59:38 +08:00
LmeSzinc
239590b2de Add: 增加先锋血量权重 
- 修复12-4打大型练级不挑敌人时, 会开局撤退的问题
 2020-05-17 13:36:54 +08:00
LmeSzinc
75254b6599 Fix: 修复血量平衡拖拽无效的问题 
- 修复12-2不打小型的问题
 2020-05-08 23:10:55 +08:00
LmeSzinc
acf73f5c17 Fix: 修复夜幕下的归途SP2的BOSS刷新点错误 
- 修复brute_clear_boss找不到BOSS时卡住的问题
 2020-05-07 21:49:39 +08:00
LmeSzinc
e35c193671 Add: 适配「夜幕下的归途」(event_20200507_cn) 2020-05-07 16:19:52 +08:00
LmeSzinc
93c6293836 Add: 增加12-2打中型练级 2020-05-04 21:48:52 +08:00
LmeSzinc
7d77a8f438 Fix: 修复在每日中启用血量平衡报错的问题 2020-05-02 18:48:27 +08:00
LmeSzinc
bde6f5fe58 Fix: 修复有行走步长时可能点到另一支队伍的问题 
- 微调了复刻苍红的回响D图的透视识别参数
 2020-05-01 02:15:41 +08:00
LmeSzinc
2c10f77e4d Fix: 调整了回出击界面时的判定, 修改了一些地图格子权重 2020-04-30 17:11:47 +08:00
LmeSzinc
5284c1a390 Fix: 修复打完BOSS有时会卡住的问题 
- 优化了苍红的回响C2, 大型航空对低耗队杀伤力太大了
 2020-04-27 22:49:30 +08:00
LmeSzinc
6b56215d71 Fix: 修复地图特效导致的章节名识别错误和进图等待 
- 章节名识别错误时有20次重试的机会
- 进图时不再使用章节图标识别
- 更改了exception文件的位置
 2020-04-25 17:10:22 +08:00
LmeSzinc
f5ee202934 Optimize: 优化复刻苍红的回响C2和D3 
- 修改了绿海时的地图设置覆盖
 2020-04-25 16:43:41 +08:00
LmeSzinc
f9b2a9358b Fix: 修复精英检测 
- 修复红框会越到下面一个格子的问题
- 修复BD图红框闪烁检测的问题
 2020-04-25 02:09:59 +08:00
LmeSzinc
ccc4a889ca Optimise: 优化活动开荒 
- 每打完一战再执行全图扫描, 没必要走一步扫一次, 精英抓到BOSS队无所谓
- 增加了到达格子的log, 不然还以为是卡住了
 2020-04-24 23:45:33 +08:00
LmeSzinc
516c16beae Fix: 增加复刻苍红的回响CD图, 国服热更又把地图视角改回去了 
- 修复点击时报类型错误的问题
- 修复无透视图片不被更新的问题
- 增加了灭点和距点的log
 2020-04-24 23:20:34 +08:00
LmeSzinc
bea05d396e Add: 适配复刻苍红的回响AB图 
- 开荒模式移动至出击设置
- 增加开荒模式自动启用, 无脑开就完事了
- 将透视识别参数放到了config里, 这样就可以用地图config覆盖了
- 适配小地图模式, 参数抄A1就行了
- 修复了章节名OCR的识别位置
- 修复了开荒会把BOSS当作精英打问题
- 增加战斗中的剧情跳过
- 注释掉了截图和点击的retry
- 增加了捕捉目标点超出移动范围
 2020-04-24 15:26:11 +08:00
LmeSzinc
468537d615 Add: 支持在更少的地图信息下运行, 开启POOR_MAP_DATA即可 
这是为未来的活动图准备的, 毕竟不可能一直手动填写地图信息.
现在仍需要填写海陆位置信息(识别这个还有点难度),
敌人刷新点, 每战刷新信息, 可以不用填写了
- 问号将被视为可以通过
- 增加了暴力找路障的功能
- 修复了拣问号被堵住的问题
- 地图7-1太小了, 识别有问题
 2020-04-21 23:21:48 +08:00