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,686 Commits 9 Branches 0 Tags 274 MiB
1f69e81a32
Commit Graph

422 Commits

Author SHA1 Message Date
nEEtdo0d
f1dfc402d2 Opt: Extend handle_2x_book_setting for prep and auto menu 2021-04-09 00:36:24 -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
nEEtdo0d
d29ec0c0d2 Opt: Reset iff cached as 4 to override as 2x book impossible to turn on 2021-03-27 10:26:45 -04:00
nEEtdo0d
8817b64bee Add: 2x Book assets for all servers 2021-03-26 22:48:35 -04:00
nEEtdo0d
bee16ad552 Add: Config option enable 2x book for other servers, own copy of assets 2021-03-26 22:21:24 -04:00
nEEtdo0d
f2158a3c06 Add: Capability to turn on 2x book implemented 2021-03-26 21:55:53 -04:00
nEEtdo0d
607e8b1260 Opt: Emotion refactor for enable 2x book configuration 2021-03-26 20:31:44 -04:00
LmeSzinc
51c65f062d Fix: Handle moving normal enemies 
- Add option to disable swipe predict
 2021-03-26 17:15:12 +08:00
whoamikyo
171627cf0e Opt: New toast notifications 2021-03-02 05:53:18 -03:00
LmeSzinc
16957e90bd Dev: Optimize camera_data generation, only generated on active grids 2021-02-25 17:07:59 +08:00
LmeSzinc
33620462ed Fix: Check walk result and expected in OS (#363) 2021-02-23 21:48:01 +08:00
LmeSzinc
0a1b3ae1c7 Opt: Align when showing map 2021-02-23 21:03:07 +08:00
LmeSzinc
82c70c4871 Merge branch 'master' into dev 2021-02-21 21:22:42 +08:00
noname94
78a8e0d121 Fix: fleet_switch_click() may fail when SWITCH_OVER not appeared 
If SWITCH_OVER not appeared (in most cases, connection unstable), we should wait for it instead of skipping the switch click.
 2021-02-21 15:42:33 +09: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
ddbd15b26e Add: Predict swipe to handle random game stuck 
- Fix: Urgent commission in OS
- Fix: More accurate predict_current_fleet
- Opt: Increase edge tolerance in homography detection
- Opt: Shorten swipe distance in OS, because swipe predict needs something in common
 2021-02-17 17:46:46 +08:00
noname94
5e318f90ff Fix: FLEET_m_BAR_INDEX_n area fixed 
The clickable areas of these buttons do not match their image areas exactly. If we click at the bottom of fleet_n, fleet_n+1 will be chosen.
 2021-02-15 03:31:13 +09:00
noname94
625f03ae54 Fix: [TW] assets updated to fix #348 
Copied from CN folder.
 2021-02-14 13:53:30 +09:00
LmeSzinc
36b85f40e3 Fix: Typo in _emotion_expected_reduce() 2021-02-13 23:44:42 +08:00
LmeSzinc
ae639e9409 Fix: Wrong detection of fleet_2.in_use() in fleet preparation 
if ship avatar background is loaded but ship itself is not loaded
 2021-02-13 23:16:01 +08:00
whoamikyo
e72605ba95 Fix: fixed bluestacks hyper-v multi-instance support 2021-02-13 00:53:19 -03:00
Kyo
df15fc4b57
Merge pull request #345 from noname94/patch1 
Fix: [JP] RETIRE_APPEAR_n assets fixed
 2021-02-13 00:14:25 -03:00
noname94
69124b6679 Opt: comment out unused import 2021-02-13 12:11:05 +09:00
LmeSzinc
c5ded5ad6b Fix: Dropping clicks in 12-2 I4, where has green island above and predict as current fleet 2021-02-13 02:42:50 +08:00
noname94
e654283b24 Opt: Avoid double-clicking CLEAR 
Cropping FLEET_*_IN_USE can avoid wasting time on handling the info_bar. 5113cf9d55
To avoid double-clicking on the clear button, sleep() is needed. (No side effect now.)
 2021-02-13 02:38:57 +09:00
LmeSzinc
5113cf9d55 Opt: Avoid double-clicking CLEAR, and waiting for info_bar in in_use() (#341) 2021-02-13 00:17:02 +08:00
noname94
dc25547361 Opt: ensure fleets selected correctly in preparation 
After the update of auto search, ALAS needs to clear and reselect fleets every time before entering a map. 45c50bda29
It is better to add some check to ensure that fleets are selected correctly, because emulators may drop clicks randomly.
 2021-02-12 21:21:16 +09:00
noname94
13d2a116cd Fix: GET_ITEMS_1 raises MapDetectionError 
It was a quite rare case.
The emulator sometimes treat a swipe as a click (mostly on potato pcs). If this happens while doing map_swipe(), the fleet might step on a mystery, then GET_ITEMS_1 would raise MapDetectionError.
 2021-02-11 12:27:25 +09:00
LmeSzinc
5a73c39590 Opt: Add convert from local view to global map, but haven't used 2021-02-06 17:34:09 +08:00
LmeSzinc
d8f4d4338c Merge branch 'master' into dev 2021-02-03 01:10:27 +08:00
LmeSzinc
8af17fe1f9 Fix: Wait expected emotion reduce of the whole map if auto search disabled 2021-02-02 16:34:33 +08:00
LmeSzinc
14c3dc9b0c Merge branch 'master' into dev 2021-01-28 12:29:13 +08:00
nEEtdo0d
b2f1b21e9b Add: [EN] AUTO_SEARCH_* assets, 
Verified AUTO_SEARCH_SET_* are at the same location as CN for EN,
likely other servers share this same trait
 2021-01-27 18:28:18 -05: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
cebb785e14
Merge pull request #318 from noname94/patch1 
Fix: [JP] MAP_STAR_n assets fixed.
 2021-01-24 15:53:45 +08:00
noname94
7031594850 Revert "Fix: [JP] Camera positioning after fleet switch" 
This reverts commit 5bed370443.
The camera focus point of JP server has been changed to be  the same as CN and EN server since about 2 months ago, so it should be safe to remove this check now.
 2021-01-24 16:13:37 +09:00
LmeSzinc
8e9e62bb27 Add: Entrance of auto search, but not fully supported yet 
- Add: Option ENABLE_FLEET_REVERSE_IN_HARD
 2021-01-22 23:50:44 +08:00
LmeSzinc
45c50bda29 Fix: Fleet choosing, since AL has changed its logic 
After the update of auto-search, AL no longer chooses the fleet with a smaller index to be the first fleet
 2021-01-22 18:51:15 +08:00
LmeSzinc
c2f23ab5fd Del: Delete spare fleet 
- Fix: [JP] guild boss setting in GUI
 2021-01-22 17:02:35 +08:00
LmeSzinc
453b38f15c Fix: Handle auto search, disable it currently 2021-01-21 19:54:36 +08:00
LmeSzinc
4172c2a0a2 Fix: [TW] FLEET_PREPARATION (#295) 2021-01-12 13:45: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
c2ab750f0c Del: Complex logic in STOP_IF_MAP_REACH, now it's just how people understand 2020-12-29 23:42:05 +08:00
nEEtdo0d
f911df51ea Fix: Assets for EN fleet preparation 2020-12-22 16:08:07 -05:00
noname94
cc497ce146 Fix: [JP] assets for the latest update 
4169ffb84d, 635e18e579 and 8b7a46b2c8
 2020-12-23 03:18:36 +09:00
LmeSzinc
8b7a46b2c8 Fix: Assets for campaign mode switching 
- EN and JP need to replace SWITCH_1_*.png
- FLEET_PREPARATION_HARD_*.png don't need to replace
 2020-12-22 19:21:39 +08:00
LmeSzinc
635e18e579 Fix: Assets for fleet preparation 
- EN and JP need to replace the assets
 2020-12-22 19:05:48 +08:00
LmeSzinc
d590d75160 Fix: Mis-detect in_stage as enemy_searching after clearing boss 2020-11-28 22:41:40 +08:00
LmeSzinc
4e9d46fb85 Fix: Handle Game tips 2020-11-26 17:52:24 +08:00
LmeSzinc
3fda7b32df
Merge pull request #246 from noname94/patch 
Add: [JP] meowfficer assets added
 2020-11-21 10:49:53 +08:00
noname94
390235f53c Opt: call logger.warning() when retrying fleet switch 2020-11-20 22:27:34 +09:00
nEEtdo0d
7607d50545 Fix: resolve merge conflicts 2020-11-19 11:19:41 -05:00
LmeSzinc
3772d5046f Add: Disable mechanism when reach threat save 2020-11-19 17:43:47 +08:00
nEEtdo0d
f22e5e68a8 Merge remote-tracking branch 'origin/master' into war_archives 2020-11-17 00:31:45 -05:00
LmeSzinc
a50dbd04cc Merge branch 'master' into dev 2020-11-17 12:22:10 +08:00
noname94
eeff8a0712 Fix: fleet_switch_click() may fail when connection unstable 
Added a check to ensure that current fleet is switched correctly.
 2020-11-17 11:02:51 +09:00
LmeSzinc
ace77fa1c7 Add: Handle mechanism and land_based 2020-11-16 21:16:27 +08:00
LmeSzinc
f7d8946372 Dev: Add extraction of land based 2020-11-13 22:20:31 +08: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
whoamikyo
d1dd15ceec Added: Taiwan server support 2020-10-26 15:22:13 -03:00
noname94
aaf93ee11d Add: added ship level detection in combat 2020-10-05 21:45:08 +09:00
noname94
5902c1446e Fix: handle_strategy() before perspective calculation 
to ensure submarine_view is 'off' while calculating.
 2020-09-23 02:03:03 +09:00
LmeSzinc
be3a1e6887 Fix: Movable enemy predict in one fleet 2020-09-21 19:06:38 +08:00
LmeSzinc
0d90ebdeff Add: SP in Dreamwaker's Butterfly 2020-09-21 00:40:06 +08:00
LmeSzinc
603bd1497a Fix: GridInfo attribute overwrite in clearing mode 
- Opt: change is_ambush_save to may_ambush
 2020-09-20 22:16:40 +08:00
LmeSzinc
5bed370443 Fix: [JP] Camera positioning after fleet switch 2020-09-20 20:54:29 +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
d36e5754ae Fix: Movable siren path finding 2020-09-20 17:54:43 +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
1a4bc96bf2 Fix: Redundant way node when having one-way portal 
- Add: expected story
 2020-09-20 02:51:00 +08:00
LmeSzinc
bcdb4a8ddc Fix: Missing map_data load in hard campaign 2020-09-20 02:01:50 +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
154a8408bb Fix: Path finding with portals 2020-09-19 18:27:36 +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
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
c56ef3568c Add: Handle campaign ball 
- Fix: Handle doing map detection on in_stage image
 2020-09-18 21:09:26 +08:00
LmeSzinc
b0d8ae93a8 Dev: Add camera_data_spawn_point auto generate 2020-09-18 19:35:30 +08:00
LmeSzinc
d141f4763e Opt: Move CampaignOcr, CampaignUI to CampaignBase 
- Fix: Handle story after in map enemy searching
- Fix: stage ENTRANCE in event
- Fix: in_stage check in event
- Dev: map_extractor add STAR_REQUIRE_X, fix for tutorial maps
 2020-09-18 19:01:40 +08:00
LmeSzinc
2084a994c7 Fix: Combat loading now check before ambush 2020-09-09 02:04:33 +08:00
LmeSzinc
98d4672175 Fix: Fleet switching when submarine is hunt_only 2020-09-06 00:40:20 +08:00
LmeSzinc
04ce78e5e1 Fix: Reverse swipe in ensure_edge_insight 2020-09-05 01:49:11 +08:00
LmeSzinc
2036ebc8e7 Fix: MapDetectionError after fleet switch (#166) 2020-08-26 18:39:13 +08:00
LmeSzinc
36bf3acfef Merge branch 'master' into dev 2020-08-22 01:49:37 +08:00
LmeSzinc
5a897f7031 Fix: IN_STAGE detect when map detection goes wrong 2020-08-22 01:43:04 +08:00
LmeSzinc
71c079bd0f Merge branch 'master' into dev 2020-08-21 20:27:07 +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
b47524dad9 Fix: Catch in stage in map detection 2020-08-20 23:34:31 +08:00
whoamikyo
09d3f695de Revert "Revert "Merge branch 'dev' of https://github.com/LmeSzinc/AzurLaneAutoScript into dev"" 
This reverts commit ac9303012c.
 2020-08-18 20:48:14 -03:00
whoamikyo
ac9303012c Revert "Merge branch 'dev' of https://github.com/LmeSzinc/AzurLaneAutoScript into dev" 
This reverts commit bdc5aa0720, reversing
changes made to 6ee7a62edf.
 2020-08-18 20:47:27 -03:00
LmeSzinc
3d5f57f460 Add: minitouch basic config 2020-08-17 18:31:31 +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
d648bfde66 Opt: Auto disable if_map_reach if map already reached a specific condition 2020-08-11 00:32:27 +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
LmeSzinc
3be8617847 Fix: HP bar have_ship, when there's white object on background 
- Back to something similar to hp_record
 2020-08-09 06:52:59 +08:00
LmeSzinc
b909cf5644 Fix: HP calculation 
- Now predict has_ship directly, no need to use record
- Opt: faster hp bar calculation
 2020-08-09 05:09:12 +08:00
LmeSzinc
de9dde2e99 Fix: Retreat before boss appear, but boss fleet is in full hp 
But there will be one more full_scan before real retreat
 2020-08-09 01:42:10 +08:00
LmeSzinc
14f6e51f20 Fix: Handle camera position offset in full_scan 2020-08-08 18:00:19 +08:00
LmeSzinc
39c4f62052 Fix: GridInfo properties 
- Delete old grid files, avoid confused again
 2020-08-08 15:41:22 +08:00
LmeSzinc
7e164528a8 Add: Predict missing movable enemy 
- Fix enemy detection lost in full_scan(mode='movable')
- Move basic functions to utils
 2020-08-08 14:51:05 +08:00
nEEtdo0d
f201336031 Modify equipment swipe implementation to allow exit on same ship (Only 1 card is on grid so cannot swipe). Also used bool return values to indicate whether successful. 
Modify enhanacement to use swipe bool mechanic to exit in case of infinite swipe attempts. Never reaching the 'material exhausted' conditional.

Added get_hp() to fleet switch due to possibility of fleet acquiring emergency repair. However in most cases has full HP but the current HP in program belongs to fleet before switch. Thus is parsing an incorrect HP set when deciding to use repair.
 2020-08-06 22:01:02 -04: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
Kyo
2a4d4edce7
Merge branch 'nightly' into dev 2020-08-06 03:02:13 -03:00
LmeSzinc
46d4463649 Opt: Different grid.cost for different fleet 2020-08-06 03:37:21 +08:00
LmeSzinc
ec2a6b53f4 Fix: map round reset 2020-08-05 21:19:17 +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
5d9e4b651d Opt: Handle movable enemy without POOR_MAP_DATA enabled and won't goto previous siren location 
- Fix: enemy_genre merge
- Add: counter of map walk round
- Opt: Smarter enemy moving wait
 2020-08-05 03:07:20 +08:00
LmeSzinc
d4b41aab07 Opt: Expose map.spawn_data 2020-08-04 17:46:19 +08:00
LmeSzinc
6edde3933d Opt: full scan 2020-08-04 01:24:54 +08:00
LmeSzinc
ac095b7d65 Fix: MAP_HAS_FLEET_STEP, MAP_HAS_MOVABLE_ENEMY when fast forward disabled 2020-08-03 17:31:19 +08:00
LmeSzinc
554698f583 Fix: Handle random swipe bug during full scan 2020-08-01 01:16:53 +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
LmeSzinc
7222aa3e28 Fix: Enemy templates now able to configure in map files (#122) 2020-07-27 03:12:47 +08:00
LmeSzinc
46a7676aac Fix: Additional camera_data for spawn point 2020-07-26 03:19:38 +08:00
LmeSzinc
de7d2fb58b Fix: Detect enemy_scale=1 because of map buff icons 2020-07-26 03:10:08 +08:00
LmeSzinc
c0c93b15f2 Opt: Enemy templates now able to configure in map files 
- Delete old siren templates, because of high error rate
- Change templates for event_20200521_cn and event_20200603_cn to monochrome
 2020-07-26 00:17:59 +08:00
LmeSzinc
9a07b271da Fix: Unable to find fleets 2020-07-25 22:09:54 +08:00
LmeSzinc
3b811fca9c Fix: Lots of problems 
- Fix HOMO_EDGE_HOUGHLINES_THRESHOLD not used
- Fix get stuck if kill too fast in combat_executing
- Fix wrong swipe when camera out of map
- Fix walk_out_of_step not detected
- Opt relative_record now save temp images in sub folder
 2020-07-24 19:56:24 +08:00
LmeSzinc
7059587908 Fix: Handle camera out of map 2020-07-24 09:26:49 +08:00
LmeSzinc
122f37752d Merge branch 'master' into dev 2020-07-24 06:04:17 +08:00
LmeSzinc
a3397997ff Fix: Small boss icon detection 2020-07-23 20:54:25 +08:00
LmeSzinc
44ef0f836f Del: Delete old perspective module 
- Del: Image loading in config
- Opt: Less grid predict
 2020-07-23 08:21:49 +08:00
LmeSzinc
2abab2f3f6 Add: Using new detection backend 2020-07-23 07:34:03 +08:00
whoamikyo
79ceb6106b Fix: Fixed stuck at grand capture map 2020-07-22 01:07:18 -03:00
Erik
21d280f67f
Fix: Mis-detect campaign is not 3-star cleared if too fast (#79) 
* Fix: Wrong daily executed count

* Opt: Stop swiping commission list if already reached bottom

* Fix: Config in template.ini for chapter CD

* Fix: Classroom no book chose

* Fix: Choose next research if resources not enough

* Add: Research projects save screenshot before refresh

* Fix: Commission mis-drop the last one

* Opt: pyocr requirements is now JP only

* Fix: Mis-detect campaign is not 3-star cleared if too fast

Co-authored-by: LmeSzinc
 2020-07-19 16:33:04 -03:00
LmeSzinc
ddc0032413 Fix: Siren CV detection 
- rename siren templates
 2020-07-18 22:11:00 +08:00
LmeSzinc
0a8a90cdb1 Typo: Docstring in assets.py 2020-07-15 23:33:38 +08:00
LmeSzinc
1a4d25f33a Fix: fleet_2_step_on failed if all grids were cleared 2020-07-10 14:25:17 +08:00
LmeSzinc
8158ac9be8 Opt: Re-fit _map_swipe 
- Shorten function name of perspective transform
- Delete CAMERA_SWIPE_MULTIPLY
 2020-07-01 13:39:44 +08:00
LmeSzinc
31450ea4d7 Fix: Oil limit not working in raid 
- Add wait_until_stable
- Add ensure_combat_oil_loaded
- Add grid_location_to_screen_point
 2020-06-30 07:10:10 +08:00
whoamikyo
c8bdb7c0c2 Assets: Added Assets for equipment 
- Minor changes in dev_tools.bat
 2020-06-26 19:25:06 -03:00
LmeSzinc
a461d1aee8 Fix: Clear FLEET_2 by mistake when FLEET_2_CHOOSE not detected 2020-06-27 02:07:04 +08:00
LmeSzinc
b4a72d9be7 Fix: Retry timer for potato pc 2020-06-24 10:32:49 +08:00
LmeSzinc
a606ac736b Fix: Mis-disable clearing mode 
- Handle the animation of map information loading instead of hardcoded script sleep
 2020-06-23 17:51:28 +08:00
LmeSzinc
2862d3141e Add: Support 7-3, 7-4, add RoadGrids.combine 2020-06-23 04:37:09 +08:00
LmeSzinc
4f8ba8e911 Fix: Stuck when map is just 100% clear 
- Fix timer arrive_confirm
 2020-06-23 03:17:16 +08:00
LmeSzinc
5202a0cbaa Fix: Swipes now join infinite clicking check 2020-06-23 01:09:56 +08:00
LmeSzinc
11b8c50f16 Fix: AUTO_CONFIRM in daily 
- Fix AUTO_CONFIRM in daily preparation
- Fix exercise quit
- Add additional button clicks in ui_click
- Add support to grid_info 'Me'
 2020-06-22 01:02:10 +08: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
LmeSzinc
0450cbdf80 Fix: The info_bar blocks the ammo icon when reversing fleet 2020-06-14 02:28:52 +08: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
c78d5f1371 Add: [JP] add jp assets, map module 2020-06-13 02:52:30 +09: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
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
LmeSzinc
2609b4a70d Add: Timezone aware 
- Fix mat withdraw on slow device
 2020-06-01 02:26:55 +08:00
LmeSzinc
83508b94d3 Fix: Enemy detection 
- Log shows 'E' and wrong prediction is_siren, because attributes are kept to the next detection
- Fix missing predict also
- Fix log show DEFAULT_BUTTON for the entrance of campaign
 2020-05-31 02:49:06 +08:00
LmeSzinc
c01a075554 Fix: Timeout adjustment 
- increase walk_timeout
- increase in_stage_timer
 2020-05-29 17:29:46 +08: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
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
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
10b53f80ba Localization for EN version 
- Updated assets for EN version
- Created EN dictionary
- Fix Stage OCR recognition Thanks @LmeSzinc
 2020-05-27 10:32:05 -03:00
LmeSzinc
1989ea9716 Fix: 光之壁在周回模式时仍然存在 2020-05-26 03:45:44 +08:00
LmeSzinc
2f1f999ce5 Add: multi-server support 2020-05-25 22:05:42 +08:00
LmeSzinc
d75930cda2 Add: 适配B2B3,D2D3 
- 修复超大地图时location2node出错
- 增加走路出错时, 重新定位相机
- 调整CD图的透视识别参数
- 修复开荒时每战过后重新定位相机的多余操作
 2020-05-24 00:17:53 +08:00
LmeSzinc
7f27a7a729 Add: 增加处理光墙(海域格子间的分隔) 
- 优化寻路初始化
- 修复海图log显示单字符显示'E'
 2020-05-23 18:26:41 +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
eb2a58d7f5 Add: 增加处理被精英抓住 
- 修复原地寻路报warning
- 修复到达误判
 2020-05-23 14:30:07 +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
fa0a243df1 Refactor: 合并处理消息的类 2020-05-15 14:19:34 +08:00
LmeSzinc
8077760542 Fix: 修复按舰队出生点寻找舰队的方法 2020-05-12 17:14:43 +08:00
LmeSzinc
acf73f5c17 Fix: 修复夜幕下的归途SP2的BOSS刷新点错误 
- 修复brute_clear_boss找不到BOSS时卡住的问题
 2020-05-07 21:49:39 +08:00
LmeSzinc
b255475f47 Fix: 修复跳过猫攻击的动画 2020-05-02 15:07:30 +08:00
LmeSzinc
90e07b033d Fix: 修复跳过猫攻击的动画 2020-05-01 17:54:24 +08:00
LmeSzinc
bde6f5fe58 Fix: 修复有行走步长时可能点到另一支队伍的问题 
- 微调了复刻苍红的回响D图的透视识别参数
 2020-05-01 02:15:41 +08:00
LmeSzinc
290e755432 Fix: 修复剧情跳过 
- 增加黑屏带文字剧情的跳过
- 增加战斗开始时的剧情跳过
 2020-05-01 01:02:32 +08:00
LmeSzinc
2244ca3d8d Fix: 修复额外剧情出现时报错的问题 2020-04-29 17:45:35 +08:00
LmeSzinc
61aa7d8340 Fix: 修复截图速度过慢时出现的问题 
当使用像以下结构的代码时, 需要增加触发计数
否则当截图耗时大于计时器触发时间时, 会触发错误的结果
if self.appear(MAIN_CHECK):
    if confirm_timer.reached():
        pass
    else:
        confirm_timer.reset()
 2020-04-28 14:37:13 +08:00
LmeSzinc
fc84f5e610 Fix: 修复开荒 
- 修复低级图出BOSS后报错的问题
- 修复了开荒进度0%时的章节名OCR
- 修复打完BOSS有时会卡住的问题
 2020-04-27 19:32:58 +08:00
LmeSzinc
57f578686e Fix: 修复活动图开荒模式下, 普通敌人图标被遮挡时识别为精英的问题 2020-04-26 19:16:09 +08:00
LmeSzinc
d43ff8a3f7 Fix: 修复退役后出现行走超时的问题 2020-04-25 23:08:45 +08:00
LmeSzinc
47cec0af36 Optimize: 优化log, 优化精英选择 
- 缩短log, 尽量在GUI上显示为一行
- 只有在开荒或地图信息缺失的时候, 将未检测到星级的敌人当成精英
 2020-04-25 18:04:05 +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
604cdf4005 Fix: 修复 
- 优化章节名OCR, 防止地图特效影响识别
- 修复等待精英移动
- 修复回到出击界面
 2020-04-24 17:57:40 +08:00
LmeSzinc
bea05d396e Add: 适配复刻苍红的回响AB图 
- 开荒模式移动至出击设置
- 增加开荒模式自动启用, 无脑开就完事了
- 将透视识别参数放到了config里, 这样就可以用地图config覆盖了
- 适配小地图模式, 参数抄A1就行了
- 修复了章节名OCR的识别位置
- 修复了开荒会把BOSS当作精英打问题
- 增加战斗中的剧情跳过
- 注释掉了截图和点击的retry
- 增加了捕捉目标点超出移动范围
 2020-04-24 15:26:11 +08:00
LmeSzinc
b4054b579e Add: 增加行走步长设置 
- 修复跨天重启重置队伍的问题
- 修复碰磁BOSS战斗结束卡住的问题
 2020-04-23 01:58:35 +08:00
LmeSzinc
9153ee1ee0 Fix: 修复两队之间被堵住的问题 2020-04-21 23:52:04 +08:00
LmeSzinc
468537d615 Add: 支持在更少的地图信息下运行, 开启POOR_MAP_DATA即可 
这是为未来的活动图准备的, 毕竟不可能一直手动填写地图信息.
现在仍需要填写海陆位置信息(识别这个还有点难度),
敌人刷新点, 每战刷新信息, 可以不用填写了
- 问号将被视为可以通过
- 增加了暴力找路障的功能
- 修复了拣问号被堵住的问题
- 地图7-1太小了, 识别有问题
 2020-04-21 23:21:48 +08:00
LmeSzinc
8f1d8fb363 Fix: 修复一些稀有bug 2020-04-21 13:56:05 +08:00
LmeSzinc
0e66208e1d Fix: 修复6-3出生点被堵住的问题 2020-04-19 11:53:11 +08:00
LmeSzinc
0447c6f3ab Fix: 修复一些稀有bug 
- 修复了镜头没对准导致舰队图标被UI挡住, 走路卡住的问题
- 增加了镜头重新对准至格子中心的方法
- 修复了运输船刷在BOSS点时, 以为打的是BOSS的情况
 2020-04-19 03:42:12 +08:00
LmeSzinc
580a36375c Add: 增加主线图开荒功能, 支持打三星, 打到绿海 2020-04-19 00:49:33 +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
69b868a79e Fix: 修复一些bug 
- 修复了收完菜后不重新检查潜艇的问题
- 修复了使用潜艇时, 经验结算卡住的问题
- 调整了日常委托和教材类委托的权重, 不然一天下来, 日常委托做不完
 2020-04-16 22:01:52 +08:00
LmeSzinc
129f03d5fb Fix: 修复踩问号出运输船, 可能不触发地图扫描的问题 2020-04-16 16:43:13 +08:00
LmeSzinc
49ddd8d85f Add: 增加了出错时保存log和截图的功能 
- 更改了Log的目录名称
 2020-04-16 14:05:37 +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
ad73de92dd Refactor: 抽象出处理确认弹窗的逻辑 
- 删除了一些无用的assets
- 纠正了一些拼写错误
 2020-04-13 23:00:19 +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
0c5bded2c7 Fix: 增加连续点击一个按钮时, 停止运行的功能 
- 增加靠边缘修正相机位置时的log
- 修复了频繁报Enemy searching timeout的问题
- 修复周回模式下, 已经进图时, 会按有伏击运行的问题
 2020-04-10 18:39:47 +08:00
LmeSzinc
40298c4e23 Add: 增加阵型选择 
- 修复了开关控制点击的按钮错误的问题
 2020-04-10 00:55:49 +08:00
LmeSzinc
95d84d11ac Add: 增加周回模式开关, 增加阵容锁定开关 
- 增加了开关控制的函数
 2020-04-09 21:22:01 +08:00
LmeSzinc
8eab19ab04 Refactor: 统一了模板的写法 
- 修复了没有阵容锁定选项时会卡住的问题
- 修复了非周回时频繁报Arrive with unexpected result的问题
- 清理了一些无用的asset
 2020-04-09 16:30: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
45769a49be Fix: 修复了当前舰队的绿色箭头挡住敌人图标时，不参与缺失补全的问题 2020-04-03 13:41:28 +08:00
LmeSzinc
cea79a46f1 Fix: 修复了寻找当前队伍时, 必定报warning的问题 2020-04-01 16:11:30 +08:00
LmeSzinc
d5b46ffd91 Fix: BOSS队等待道中队心情回复的问题 2020-04-01 01:41:17 +08:00
LmeSzinc
2f6fc2669a Fix: 修复敌人识别错误后, 会原地踏步的问题 2020-03-31 21:13:29 +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