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
9,189 Commits 9 Branches 0 Tags 274 MiB
76eeba667f
Commit Graph

209 Commits

Author SHA1 Message Date
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
nEEtdo0d
4a5e2bf271 Fix: Revert dock filter objects back to using default appear() with no offset, actually often inaccurately determined whether button has appeared as a result more frequently 
Fix: Determined continue statement is the correct behavior as side bar buttons may have changed after swipe, so should be reflected accordingly.

Fix: Updated switch class set to break out of loop if already unknown too many times, originally caused chain of exception which can be confusing to parse

Fix: All filter assets in index category have been updated to smaller comparison area due to mixed results varying from user to user. Using a debug script, to test appear() with no offset seems to be evaluating correctly with them although it also evaluates correctly with original assets.
 2020-08-13 20:30:54 -04:00
LmeSzinc
bcb605d510 Opt: Delete low confidence result in OCR 2020-08-08 22:26:58 +08:00
LmeSzinc
a35e7daad4 Fix: Research pending and research unavailable 
- RESEARCH_PENDING change from detecting "]" to detecting the letter, because the "]" is moving up and down randomly
- Screenshot speed back to normal after research_receive
- Add a max_color checker to RESEARCH_UNAVAILABLE and RESEARCH_START, because RESEARCH_UNAVAILABLE is a translucent item and color is changing according to research rarity
 2020-08-07 19:11:53 +08:00
LmeSzinc
a0c17b4533 Add: Event SP switch 2020-07-28 14:56:17 +08:00
LmeSzinc
de7d2fb58b Fix: Detect enemy_scale=1 because of map buff icons 2020-07-26 03:10:08 +08:00
LmeSzinc
dbf8ba9857 Add: Support gif templates 2020-07-24 11:16:39 +08:00
LmeSzinc
75e64353bc Fix: Cropping image out of edge 
- Fix homography draw
 2020-07-23 00:52:46 +08:00
LmeSzinc
5bdaddc219 Fix: Ensure color_similarity_2d gets a numpy array 2020-07-22 01:55:51 +08:00
LmeSzinc
a64dbb5837 Opt: Faster color_similarity_2d 2020-07-22 00:58:48 +08:00
LmeSzinc
b34513524e Opt: Faster color similarity calculate 2020-07-21 18:25:59 +08:00
LmeSzinc
2ba57f9548 Del: Remove files for cnocr==1.0.0 2020-07-15 04:37:49 +08:00
LmeSzinc
b55abd1178 Add: OCR models for cnocr==1.2.2 2020-07-14 23:59:48 +08:00
LmeSzinc
e6e29cf5cc Fix: Homography edge cropping 2020-07-10 04:55:48 +08:00
LmeSzinc
887707dc74 Merge branch 'master' into dev 2020-07-10 00:45:36 +08:00
LmeSzinc
ed2e92b703 Fix: Detection of combat loading 
- Opt: Now use template matching instead of color_bar_percentage
 2020-07-10 00:40:01 +08:00
LmeSzinc
5c4d409b3e Opt: Log appearance of perspective detection 2020-07-08 16:56:28 +08:00
LmeSzinc
4f08f8fa2d Opt: utils.py 2020-07-07 19:54:30 +08:00
LmeSzinc
1e8bafd1d8 Add: Decorator cached_property 2020-07-06 16:24:23 +08:00
LmeSzinc
bbf78fc320 Opt: Move cnocr_models to bin/cnocr_models 2020-07-06 01:52:44 +08:00
LmeSzinc
5a582aae88 Fix: Template read error 2020-07-05 23:50:40 +08:00
LmeSzinc
e07b4632a5 Add: Function crop to utils 2020-07-05 23:43:56 +08:00
LmeSzinc
f16fda59de Add: Mask class 
- Copy module/map/ui_mask.png to assets/mask/MASK_MAP_UI.png
 2020-07-05 23:21:27 +08:00
LmeSzinc
4ed424fc20 Opt: Move point2str to module/base/utils.py 2020-07-05 22:59:46 +08:00
LmeSzinc
480439ecf2 Add: Warnings when get stuck 2020-07-04 07:42:48 +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
LmeSzinc
13b8147d54 Opt: Lazy template load 2020-06-29 16:43:24 +08:00
LmeSzinc
933f1e2c9f Opt: Faster color_bar_percentage 2020-06-22 15:04:47 +08:00
LmeSzinc
3e63429824 Fix: Enhance get stuck 2020-06-20 04:50:00 +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
80646b260f Fix: Infinite click on switch when switch is unknown 
- Increase ui retry interval for potato device
 2020-06-17 01:11:24 +08:00
LmeSzinc
30e11c6caf Fix: Re-check all timeout timer 
- Fix tactical class get stuck when skill level reach to max.
 2020-06-03 05:06:51 +08:00
LmeSzinc
9353ae1707 Optimize: Disable commission_time_limit by default 
- Faster ui click
 2020-06-03 04:36:05 +08:00
LmeSzinc
125a490aca Fix: Timer for ui_click 2020-06-03 00:14:30 +08:00
LmeSzinc
c6611f19dc Add: Enhance module 2020-06-01 08:20:13 +08:00
LmeSzinc
2609b4a70d Add: Timezone aware 
- Fix mat withdraw on slow device
 2020-06-01 02:26:55 +08:00
LmeSzinc
20d6e91d41 Doc: How to support other server/language 2020-05-25 23:01:00 +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
1c2db1ec26 Add: 增加战术学院收获 
- 修复委托收获时可能卡住的问题
 2020-05-05 17:27:19 +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
ef5885767e Optimize: 战斗中放慢截图速度, 降低CPU使用 2020-04-28 12:53:24 +08:00
LmeSzinc
bea05d396e Add: 适配复刻苍红的回响AB图 
- 开荒模式移动至出击设置
- 增加开荒模式自动启用, 无脑开就完事了
- 将透视识别参数放到了config里, 这样就可以用地图config覆盖了
- 适配小地图模式, 参数抄A1就行了
- 修复了章节名OCR的识别位置
- 修复了开荒会把BOSS当作精英打问题
- 增加战斗中的剧情跳过
- 注释掉了截图和点击的retry
- 增加了捕捉目标点超出移动范围
 2020-04-24 15:26:11 +08:00
LmeSzinc
a8a243052f Add: 增加了未通关的章节名的识别 
- ocr预处理时会将图片左对齐
 2020-04-18 21:20:42 +08:00
LmeSzinc
b94baf8831 Add: 增加了掉船的截图, 修复丢失截图的问题 
- 调整了战斗模块的函数
- 修改了GUI的文字说明
- 修复有文字窗口时紧急委托截图的问题
 2020-04-15 22:42:24 +08:00
LmeSzinc
91e83271a4 Add: 增加了使用一键退役的支持 
- 增加了根据设置选择切换函数的装饰器
- 增加了ADB截图和点击的设置, 默认使用ADB截图, uiautomator2点击
- 更新了assets.py文件, 上次commit忘记了
 2020-04-14 12:26:57 +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
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
87554793d3 Fix: 修复了一堆bug 
- 修复了上一场战斗的队伍位置信息会保留到下一场战斗的问题
- 修复了领取大量任务时, 不会等待的问题
- 修复了不计算BOSS队心情消耗的问题
- 增加了碰磁BOSS所有刷新点的方法
- 修复了没有检测到BOSS时停滞的问题
- 修复了处理夜间委托
- 修复了丢失地图信息补全不起作用的问题
- 修复了换装滑动失败后, 陷入死循环的问题
- 删除了微层混合AB图的一些多余逻辑
- 7-2现在会优先捡全部问号了, 不需要先捡附近的来减少行走距离.
 2020-04-07 11:20:38 +08:00
LmeSzinc
7523847fac Add: 增加了挂委托的功能 2020-04-06 19:01:22 +08:00
LmeSzinc
ce4887a4f5 Initial commit 2020-03-29 01:41:34 +08:00