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

920 Commits

Author SHA1 Message Date
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
LmeSzinc
ef7217a705 Fix: 修复第六章判断boss被堵住的问题 2020-04-19 13:19:50 +08:00
LmeSzinc
0e66208e1d Fix: 修复6-3出生点被堵住的问题 2020-04-19 11:53:11 +08:00
LmeSzinc
0663ee3d63 Add: 适配了第六章 
- 修复了两队进图, 只检测到一队时报错的问题
- 修复了碰磁boss刷新点报错的问题
- 修复了踩到弹药时, 下一次走路会超时的问题
- 调整了一些log
 2020-04-18 20:30:42 +08:00
LmeSzinc
a674198365 Add: 适配了第四章 
- 稍微移动了章节OCR的位置, 因为4-4会识别为14-4
- 针对第四章这种偏红的地图做了一些优化
- 稍微延长了敌人刷新时的等待时间
- 更改出错截图文件名为格式化的时间
 2020-04-18 00:19:50 +08:00
LmeSzinc
007d14c1d7 Fix: 修复和优化 
- 纠正了5-3刷新数据
- 更改出错截图文件名为毫秒时间戳
- 修复了伏击出现时, 仍会识别队伍的情况
- 修复了不开启截图时获得紧急委托时不点击的情况
 2020-04-17 17:19:09 +08:00
LmeSzinc
61d5718057 Add: 适配第五章 2020-04-17 00:02:10 +08:00
LmeSzinc
6b41f3f692 Fix: 修复3-4小概率出错的问题 
- 弹药边缘可能影响边缘识别
- 模仿1-1, 改用固定滑动
 2020-04-16 19:12:22 +08:00
LmeSzinc
8ce405f28a Add: 适配第三章 
- 增加处理踩问号是会刷物资船的情况
- 增加对物资船的缺失预测
- 收完菜后出击, 会重新检查舰队
  因为离开出击界面后, 出击舰队会重置为游戏默认的
- 修复了部分偏红的过场图, 会被认作索敌的问题
 2020-04-15 15:14:35 +08:00
LmeSzinc
70936f4f39 Add: 适配第二章 
- 修复了不开启周回模式时, 会在出击界面开启自动的问题
- 修复了多打一战后, 打完BOSS不判定当前出击结束的问题
- 增加掉落新船时锁定的功能
- 增加了地图不支持周回模式时, 跳过周回检查的功能
  周回模式的选项可以无脑开了
- 修改透视识别报warning为info
  因为低级图地图小降低了检测的阈值, 导致需要纠正错误有点多
- 减少了战斗准备页面的多余点击
- 减少了挂委托时的多余点击
 2020-04-14 17:32:26 +08:00
LmeSzinc
5b3dc4ec85 Fix: 修复一些bug 
- 修复了删除空列时, 边缘仍然存在, 导致网格定位出错的问题
- 修复了在边缘外有错误的内部线时, 会把边缘删除的问题
- 调整了一图的边缘识别参数
- 修复了紧急委托过多时, 会触发同一按钮点击过多停止的问题
  委托列表拖动方式从 拖动-点击 改为 拖拽抖动
  独立出random_rectangle_vector函数
  增加random_line_segments函数
- 更改: 索敌时默认使用地图权重
- 修复了收菜获取物品过多时会卡住的问题
- 写死了1-1的相机移动, 防止因为地图太小导致透视识别错误
 2020-04-13 18:49:28 +08:00
LmeSzinc
061077c690 Fix: 修复一些bug 
- 修复了日常结束后不收菜的问题
- 修复登录
- 增加不能使用潜艇的地图的覆盖设置
- 修复了因图片不更新导致二队不会跳过阵容检查的问题
- 修复了一些过场图导致进入战斗判断错误的问题
 2020-04-12 20:28:31 +08:00
LmeSzinc
be00742c3c Add: 适配第一章, 修复大量bug 
- 修复处理夜间委托时, 出现递归调用的问题
- 增加红脸出击确认的功能
- 增加了透视识别错误图片保存的开关
- 修复了地图太小时, 透视识别报错的问题
- 修复了相机位于地图外时, 透视识别出错的问题
- 修复了离开退役时, 会连击的问题
- 修复了同时出现低心情和船坞已满弹窗时, 卡住的问题
- 更新了一键退役实装后的安全点击的位置
- 修复了换装滑动失败时, 卡住的问题
- 修复了关闭自动收获后, 出现委托完成的提示是, 进图卡住的问题
- 修复了, 无正在跑的委托时, 报错的问题
 2020-04-11 15:26:42 +08:00
LmeSzinc
ae94260ff8 Add: 支持App控制, 支持自动登录 
- 修复了12-4地图信息的错误
 2020-04-10 14:18:10 +08:00
LmeSzinc
97c4c5de28 Optimize: 优化相机位置初始化, 2020.04.09更新改变了相机初始位置 2020-04-10 10:40:40 +08:00
LmeSzinc
cae9762b65 Fix: 解决领完任务还会完成新的任务的问题, 修复困难图 
- 给之前修的一堆bug擦屁股
- 修复了舰队不上满的时, 会触发低血量撤退的问题
 2020-04-08 12:18:58 +08:00
LmeSzinc
b6bc70e1c6 Add: 增加了血量平衡和低血量撤退的功能 
- 修改了年久失修的血量平衡模块
- 修改了拖拽操作
- 修复了12-4练级时, boss刷新后卡住的问题
- 修复了频繁报enemy searching timeout的问题
 2020-04-07 22:08:06 +08:00
LmeSzinc
59756c4f2c Optimize: 优化7-2, 增加索敌条件筛选 
- 每个索敌函数都支持了条件筛选, 打BOSS除外
- 7-2会打更多的大型
- 去除了挂委托时多次的重置列表操作
- 修复了没有伏击时还是按照有伏击寻路的问题
- 优化了寻路距离的log显示
 2020-04-07 13:53:44 +08:00
LmeSzinc
87554793d3 Fix: 修复了一堆bug 
- 修复了上一场战斗的队伍位置信息会保留到下一场战斗的问题
- 修复了领取大量任务时, 不会等待的问题
- 修复了不计算BOSS队心情消耗的问题
- 增加了碰磁BOSS所有刷新点的方法
- 修复了没有检测到BOSS时停滞的问题
- 修复了处理夜间委托
- 修复了丢失地图信息补全不起作用的问题
- 修复了换装滑动失败后, 陷入死循环的问题
- 删除了微层混合AB图的一些多余逻辑
- 7-2现在会优先捡全部问号了, 不需要先捡附近的来减少行走距离.
 2020-04-07 11:20:38 +08:00
LmeSzinc
6272284ad5 Fix: 修复7-2拣垃圾BOSS队踩A3 选否的情况 2020-04-01 10:28:42 +08:00
LmeSzinc
a42aa00864 Add: 适配了活动微层混合D3 
- 修改了GUI的活动图入口
- 修正了UI_MASK文件
- 修改舰队识别, boss识别方式为模板匹配
- 修改当前舰队识别的色相阈值
- 增加了对boss右下角小图标的识别
- 修改了错误格子的修正方法, 若当列格子数量不足, 将被剔除
- 修复了退役后不会快速重新进入战斗的问题
 2020-03-31 14:23:44 +08:00
LmeSzinc
8366d7a258 Add: 活动AB图每日三倍基本稳定 
- 调整了微层混合透视识别的参数
- 增加了在hsv色彩空间下的识别方法
- 增加了对地面闪烁红框的识别
- 增加了已打精英的计数
- 修改精英识别, boss识别, 舰队识别方法为hsv颜色计数
- 修复了自动生成camera_data的报错
 2020-03-31 14:23:44 +08:00
LmeSzinc
ce4887a4f5 Initial commit 2020-03-29 01:41:34 +08:00