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

203 Commits

Author SHA1 Message Date
LmeSzinc
a72b99ac8d Fix: Cannot use xpath in appear_then_click 2022-07-27 01:11:50 +08:00
LmeSzinc
46609c5557 Fix: Better research_queue_add() 2022-07-18 00:39:23 +08:00
LmeSzinc
bc88e56897 Fix: image_left_strip() returns an empty image because cropping outside 2022-07-13 00:52:19 +08:00
hgjazhgj
e779fd7e64 Fix: Misspelling & Line-end spaces 2022-06-25 20:04:45 +08:00
LmeSzinc
37c5c6f800 Opt: Avoid importing OCR models on client when UseOcrServer is enable 2022-06-22 19:32:25 +08:00
LmeSzinc
9e6028685f Fix: Detection of beacon data collected today 2022-06-10 01:58:24 +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
ee9cffbb2f Add: Scrolling medal shop list 2022-06-05 23:54:01 +08:00
LmeSzinc
d9332a7325 Add: Hierarchy button support 2022-05-01 22:10:40 +08:00
LmeSzinc
17243e74f6 Refactor: Split update_config() and avoid importing logger 2022-05-01 21:25:06 +08:00
LmeSzinc
058f8658e4 Fix: Swipe vector generate in random_rectangle_vector_opted() 2022-04-29 01:32:00 +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
LmeSzinc
09577297c8 Fix: Button.image_binary is used before assignment 2022-04-23 22:35:30 +08:00
LmeSzinc
f9e9ea856a
Merge branch 'dev' into Iss777 2022-04-23 15:48:33 +08:00
LmeSzinc
5e078dfe01 Fix: Increase threshold of GUILD_DISPATCH_FLEET_UNFILLED and GUILD_DISPATCH_FLEET, they are transparent now (#1031) 2022-04-19 21:35:26 +08:00
LmeSzinc
618fa52bcb Opt: Merge Emulator.PackageName and Emulator.Server into one dropdown 2022-04-19 01:00:07 +08:00
LmeSzinc
beabf938fc Opt: Add auto device detection and auto package detection, should be foolproof 
- Add: Real-time server change
 2022-04-19 01:00:07 +08:00
Egor Nats
6eac8ae259 Opt: Imports isorted 2022-04-14 16:37:54 -03:00
Horizon101011
110f9974e0 Opt: Cache binary image 2022-03-12 23:53:52 +08:00
Horizon101011
6d99432802 Opt: Use DFA method 2022-03-12 23:35:01 +08:00
Horizon101011
2f5b19949e Opt: Refactor module enhancement 2022-03-12 01:22:31 +08:00
Horizon101011
ec6f20720d Add: Binary template matching 
Add match_binary() for binary template matching
 2022-03-11 20:16:32 +08:00
LmeSzinc
dbfbd294ff Fix: Confirm unknown ui page; 5 seconds timeout (#956) 2022-03-07 22:18:10 +08:00
LmeSzinc
333624e2d2 Merge branch 'master' into dev 2022-03-06 19:28:06 +08:00
LmeSzinc
022acd336a Fix: Handle BrokenPipeError in minitouch 
- Fix: Remove cached session globally when disconnecting to ADB
- Fix: Typo in del_cached_property()
 2022-03-06 15:01:57 +08:00
LmeSzinc
bf87a69c17 Fix: Deleting a cached property will calculate it 2022-03-05 09:22:45 +08:00
LmeSzinc
4bf5d21227 Opt: Faster page switching in meowfficer enhance 
- Opt: Ignore Meowfficer.EnhanceIndex temporarily to be available once user have enough boxes
- Fix: Incorrect indentation in _meow_queue_enter()
- Add: Clear interval for multiple buttons
 2022-02-26 01:23:36 +08:00
Horizon101011
6ba0a755db Opt: Refactoring logic of ship enhancement 
Using a new judgement logic similar to the state machine. Judge the state according to the appearance and disappearance of enhancement material after some operations, instead of only depending on info_bar. The new logic is more robust, even in poor equipment (simulating by delaying 5s)
 2022-02-23 00:06:11 +08:00
LmeSzinc
1415c9e8dd Fix: Wrong arguments of fit_points 2022-02-09 18:55:18 +08:00
LmeSzinc
6a9cd43dde Fix: Gray scale GIF has has multiple channels started at the 2nd frame 2022-02-07 18:10:21 +08:00
LmeSzinc
36d805fea7 Fix: Minor issues when running Alas on AidLux+VMOS 
- Rename function names in research_optimizer to avoid tests
- Remove watch_memory decorator and psutil dependency
- Fix typo of Hermit
 2022-02-04 00:47:34 +08:00
LmeSzinc
893dc62afb Opt: [CN] Handle user agreement in pure image detection 
- Add image_color_button()
- Remove unused assets in login
 2022-02-02 19:44:58 +08:00
LmeSzinc
df310b9d09 Opt: Remove unnecessary use of drags, fallback to swipe+click if drag is a must 2022-02-01 21:49:57 +08:00
LmeSzinc
d646d6b79a Dev: Fix button_extract.py 2022-01-29 23:49:15 +08:00
LmeSzinc
e95a145653 Add: Hermit, another control method 
- Add: Dump hierarchy via ADB and uiautomator2
- Fix: Device screenshot saving
 2022-01-27 16:57:25 +08:00
LmeSzinc
e92579b5f9 Opt: Remove redundant converts from pillow to numpy 2022-01-24 23:43:53 +08:00
LmeSzinc
b37114d505 Opt: Release cached assets 2022-01-24 23:15:47 +08:00
LmeSzinc
6d182bb620 Opt: Release OCR models to reduce memory usage 2022-01-24 01:28:47 +08:00
LmeSzinc
6ed78bdcd2 Opt: Memory optimization in reading assets 2022-01-23 23:03:55 +08:00
LmeSzinc
65f166ad12 Refactor: Use numpy image cache instead of pillow image 2022-01-23 23:03:55 +08:00
18870
6e81b91a65 Fix: Retry should raise same exception when failed 2022-01-15 21:46:30 +08:00
LmeSzinc
803e7a5813 Opt: Show exceptions under retry decorator 2022-01-13 17:47:17 +08:00
LmeSzinc
2b94e64fc1 Fix: Clear OS missions below monthly mission, the Arbiter (#814) 2022-01-05 20:37:37 +08:00
LmeSzinc
3c483885e1 Revert "Fix: Add counter to retry timer for slower retries on slow PCs", increase retry interval instead 
This reverts commit e0bb6123
 2021-12-24 00:25:25 +08:00
LmeSzinc
e0bb6123ee Fix: Add counter to retry timer for slower retries on slow PCs 
- Fix: Reset timer if interval is not equal to the interval of the existing timer
 2021-12-22 00:10:23 +08:00
LmeSzinc
950e772b20 Fix: shortest selection in commission filter not working 2021-12-09 18:24:52 +08:00
LmeSzinc
6e0bded8c4 Add: OpSi fleet filter 
- Fix: Showing disabled tasks in scheduler
- Fix: Fleet lock not detected in OpSi
- Fix: Filter presets are case sensitive
- Opt: Increase confirm timer in question_goto()
 2021-12-08 21:47:09 +08:00
LmeSzinc
699d504c9b Add: Find siren stronghold in globe map 2021-12-05 16:08:33 +08:00
LmeSzinc
78b276b74d Fix: [EN] Dorm food amount OCR, tested on image (#796) 
- Expose some method in RewardDorm
- Add ButtonGrid.save_mask() because it's a pain to count the pixels
 2021-12-04 15:53:40 +08:00
LmeSzinc
7b5751607b Fix: Remove empty selector in filter 2021-11-30 18:10:55 +08:00
LmeSzinc
e6ee74b654 Opt: World-spanning Arclight T4 
- Fix: Swiping out of swipe box
 2021-11-26 14:38:21 +08:00
LmeSzinc
7a0c566a9e Fix: Map swipe optimize should use local map view to generate blacklist 
- Opt: Take less screenshots during swipe, reuse local view object as possible
- Refactor: handle_boss_appear_refocus()
- Fix: Update swipe box area in map, avoid clicking auto search
 2021-11-22 18:09:38 +08:00
LmeSzinc
501467ed4c Opt: Reduce swipes become clicks when game is randomly stuck (#743) 
Optimise the swipe path so that it ends on land
 2021-11-17 22:28:19 +08:00
LmeSzinc
a17a699b10 Fix: Typo in Button.match() 2021-11-09 00:35:50 +08:00
LmeSzinc
6184d2d71e Add: Support .gif button assets 2021-11-08 23:29:19 +08:00
LmeSzinc
dd7b389797 Add: Semi-auto, Opsi semi-auto and benchmark 
- Add: dependency prettytable
- Fix: Running an Alas module directly
- Del: Remove all assets in daemon module, because it's redundant
 2021-10-25 18:49:56 +08:00
LmeSzinc
4fd1147a40 Opt: Remove ensure main after task finishes 
- Clear offset of GOTO_MAIN to avoid clicking outside of screen
 2021-09-20 17:30:29 +08:00
LmeSzinc
071eec530a Move commission to a new module, also faster 2021-09-14 14:56:28 +08:00
LmeSzinc
b19fd32cc5 Scroll next and prev page 2021-09-14 14:56:25 +08:00
LmeSzinc
a0d823bcd0 Rename configs in device, and research 2021-09-14 14:43:14 +08:00
LmeSzinc
2777f00584 Add: Obscure finish in OS fully auto 2021-08-22 00:16:40 +08:00
LmeSzinc
ec9bc7f511 Fix: Filter return redundant objects 2021-08-13 00:58:16 +08:00
LmeSzinc
772bf15f62 Merge branch 'master' into dev 
# Conflicts:
#	module/ui/assets.py
 2021-08-07 14:32:31 +08:00
LmeSzinc
59a17f59e5 Opt: Return objects instead of index in Filter.apply() 2021-08-07 14:29:34 +08:00
LmeSzinc
c459a014db Merge branch 'master' into gems_farming 2021-07-18 20:16:44 +08:00
LmeSzinc
0b1b700b99 Fix: Rework research receive to avoid unknown stuck 2021-07-17 00:40:11 +08:00
LmeSzinc
c8b0238e57 Fix: Research receive in page_reward if AzurStats enabled 2021-07-11 19:21:39 +08:00
LmeSzinc
e8862c9d15 Merge branch 'master' into gems_farming 2021-07-10 22:44:30 +08:00
LmeSzinc
54c79660aa Fix: wait_until_stable timeout timer 2021-07-10 22:27:47 +08:00
LmeSzinc
4de7fc5039 Fix: Timeout in long loop, expand azur stat request timeout 2021-07-10 22:06:16 +08:00
LmeSzinc
5931c01a49 Merge branch 'master' into gems_farming 2021-07-10 15:47:33 +08:00
LmeSzinc
c0b06ccc1d Add: Drop screenshots upload to AzurStats 2021-07-10 15:15:20 +08:00
LmeSzinc
e6c17171c8 Opt: Template.match_multi returns list of Button 2021-06-30 15:39:06 +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
nEEtdo0d
4d1f31f4ba Add: Capability for Config decorator to replace func pointer based on options 
Add: [EN] HP check within OS map after zone clear for os_world_clear module
Retreat for repair if any one ship below configured threshold
 2021-05-14 21:15:57 -04:00
LmeSzinc
098d7dfbd6 Fix: Radar prediction out of view when going to port 
Limit port in camera sight
- Opt: Increase click interval of ZONE_ENTRANCE, because it's slow to load
 2021-04-21 22:11:35 +08:00
LmeSzinc
adb8b863df Opt: Action point buy, confirm AP increase after clicking instead of bored clicking 
- Opt: Add battle count to auto search
- Fix: Add missing akashi call after auto search
 2021-04-20 22:21:59 +08:00
LmeSzinc
ad701ace7d Dev: Easier way to set image for development purpose 2021-04-17 12:09:34 +08:00
LmeSzinc
7c0d3d67ef Add: Support auto search in OS 
- Add port mission assets
- Move globe operations from map.py to operation_siren.py
- Add match_appear_on
 2021-04-13 22:17:21 +08:00
LmeSzinc
59e723dcf0 Opt: Add load_offset method to Button class 
It will be useful in the future
 2021-04-04 22:27:36 +08:00
LmeSzinc
f23e640136 Fix: Student card detection in tactical class 2021-02-26 20:48:57 +08:00
LmeSzinc
328810219a Opt: Guild operation dispatch 
- Split _guild_operations_mode_ensure()
- Delete _guild_operations_red_dot_present()
- Re-work guild operation dispatch
- [CN] Update guild operation assets
- TODO: replace GUILD_DISPATCH_FLEET_UNFILLED
 2021-01-20 00:09:35 +08:00
LmeSzinc
9de45a686f Dev: Fix code completion in ModuleBase 2021-01-19 14:36:47 +08:00
LmeSzinc
8afb0a9a0d Opt: Guild logistics 
- Add: ExchangeLimitOcr to handle exchange limit in different affiliation
- Add: Auto select guild mission for guild leader
- Opt: Move guild exchange to _guild_logistics_collect()
- Opt: Move guild_interval to guild_reward.py
- Opt: Add log when detecting buttons
- Upd: [CN] OCR_GUILD_EXCHANGE_LIMIT
 2021-01-19 00:08:22 +08:00
LmeSzinc
4d25a316b8 Opt: ModuleBase receive ini name for easier debug 2021-01-09 18:14:55 +08:00
LmeSzinc
fd4b4bd098 Dev: Add function drop 2020-12-04 22:25:04 +08:00
LmeSzinc
b9d09f3d49 Opt: Move module/base/switch.py to module/ui 2020-10-18 21:02:03 +08:00
LmeSzinc
a0558bfa69 Fix: Detection of pending commissions (#221) 
- Fix: Change COMMISSION_HAS_PENDING to a larger area, and count pixels, because it's not a static area
- Add image_color_count()
 2020-10-11 17:49:14 +08:00
LmeSzinc
66b85ced5f Fix: Using fixed value in interval, instead of time range 2020-09-29 02:27:33 +08:00
LmeSzinc
611ea364ed Fix: Filter in research 2020-09-27 17:27:42 +08:00
LmeSzinc
0e631f1c62 Add: ensure_time handles string such as '10, 40' 2020-09-27 16:08:48 +08:00
LmeSzinc
2cd4074f4c Opt: Move filter.py to module.base 
- Fix filter in integer
 2020-09-27 03:04:15 +08:00
LmeSzinc
c29b0d719f Opt: Mask.apply on both monochrome and RGB images 
- Opt: Cached mask file in sensitive info hiding
 2020-09-26 03:17:49 +08:00
LmeSzinc
d00e114387 Add: GIF template multi-match 
- Fix: IndexError when finding Hard campaign
 2020-09-26 02:59:10 +08:00
LmeSzinc
ffa36b0fc2 Opt: Move rgb2gray from to module/base/utils.py 2020-09-03 22:16:16 +08:00
LmeSzinc
a528835f5b Fix: Formation switching 2020-08-28 15:01:34 +08:00
LmeSzinc
401d2f6135 Fix: Too fast to click commission list switch 
- Fix: Switch clicking at the button of current status
 2020-08-27 01:55:21 +08:00
LmeSzinc
5a37294fcd Opt: Random reward interval 
- reward_interval now can accept time range
- Lower global random simulation factor to 3
- Add option to stop game during reward interval
 2020-08-18 05:07:45 +08:00
nEEtdo0d
8f980db42d Fix: Update warning message method return binary values no room for 3rd value, can modify but having it just warn and move onto the next set and continue is fine as well 
Fix: Timeout error shouldn't occur anymore, so nothing to raise except for specifically KeyError which happens via the globals() reference.

Fix: Reset enhanceable filter per change as some users might have others enabled. Pressing 'All' first will turn them all off and allow only enhanceable to be displayed.
 2020-08-13 21:17:41 -04:00