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,982 Commits 9 Branches 0 Tags 274 MiB
4b2f494881
Commit Graph

215 Commits

Author SHA1 Message Date
LmeSzinc
3b0b3a491b
Merge branch 'master' into master 2021-07-10 10:54:58 +08:00
James
5d2a1fab05 fix: fix english handler autosearch assets 2021-07-09 19:10:28 -04:00
Cola
81fe29efab Update 2021-07-09 22:41:50 +08:00
Ray
584c1f99a3 Upd: [JP] some BOOK_* and AUTO_SEARCH_* assets 2021-07-09 21:24:16 +08:00
nEEtdo0d
a625f0b1ec Fix: after game update, 2x book auto and auto search related assets out dated 2021-07-08 20:24:16 -04:00
LmeSzinc
b8cc7c02d1 Upd: [CN] Auto search assets and 2x book assets for auto search 2021-07-08 22:00:15 +08:00
LmeSzinc
6bd8f7d1de Fix: [CN] Handle User Agreement and Privacy Policy (#446) 2021-06-29 14:42:47 +08:00
LmeSzinc
6607fe6472 Upd: [CN] BOOK_BOX_* assets 2021-06-27 22:03:42 +08:00
nEEtdo0d
786aa3ee7a Add: [EN, JP, TW] same assets across all servers for new 2x book handling 2021-06-22 22:36:21 -04:00
nEEtdo0d
8ea03b83e8 Fix: implement using image_color_count instead of Switch class due to inconsistencies in appearance on various campaign UIs 2021-06-22 21:58:49 -04:00
LmeSzinc
7ba14590a6 Fix: UI changes in fleet preparation 
EN, JP, TW need to update assets except *_IN_USE and check _fleet_sidebar
 2021-06-10 16:07:32 +08:00
noname94
8c3b433f19 Add: [JP] DAILY_NORMAL_RUN asset 
and minor fixes after font changed
 2021-04-17 11:33:20 +09:00
Zorachristine
48f1047152 Add: [TW] Daily assets 2021-04-17 09:53:19 +08:00
noname94
b8e2321140 Fix: [JP] assets fix after font changed 
Many assets with words need fixes after the font changed. This commit is not complete yet.
 2021-04-16 02:47:31 +09:00
Ray
2474df1397 fix: update [jp] asset USE_DATA_KEY 2021-04-14 18:10:48 +08:00
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
LmeSzinc
fe2b48dd52 Upd: [CN] War archives entrance assets 2021-03-15 22:36:59 +08:00
LmeSzinc
17f844fe58 Fix: [CN] LOGIN_CONFIRM 
There are 2 fonts may be used in LOGIN_CONFIRM, so change detection from letter LOGIN to color
 2021-03-12 14:40:50 +08:00
LmeSzinc
4b43011632 Del: Assets STORY_CHOOSE_* 2021-03-08 10:57:49 +08:00
Zorachristine
766df5ccea Add:[TW] auto_search assets 2021-02-15 12:23:50 +08:00
noname94
f071d10802 Fix: [JP] STORY_CHOOSE_LONG_n assets fixed 
a little bit different in CN and JP server.
 2021-02-15 03:22:55 +09:00
nEEtdo0d
4bc0788398 Fix: [EN] STORY_CHOOSE_LONG and STORY_CHOOSE_LONG_3 diff from 
other servers, updated shape and location of detection
 2021-02-06 11:23:44 -05:00
nEEtdo0d
a028c1ba43 Merge remote-tracking branch 'origin/master' into operation_siren 2021-02-06 02:29:14 -05:00
Ray
b7f4dabe9f update jp auto_search assets 2021-02-06 13:39:20 +08:00
nEEtdo0d
860789078e Add: [EN] OS Ash, Map, and various Assets 
Opt: [JP, TW] Common OS and other assets
 2021-02-06 00:08:52 -05:00
LmeSzinc
ceaa5d2545 Fix: [CN] GET_MISSION 2021-02-04 21:28:19 +08:00
LmeSzinc
bccd5650d0 Fix: Move STORY_SKIP to avoid clicking on HOME button 2021-02-03 16:59:38 +08:00
nEEtdo0d
5a33291944 Fix: Update handler assets.py, forgot in last PR 2021-01-31 19:50:55 -05: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
5ac50e6910 Add: Support auto search 2021-01-28 00:35:15 +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
27b49b736a Fix: [JP] MAP_STAR_n assets fixed 2021-01-24 15:54:08 +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
nEEtdo0d
55b7e801cb Add: [EN] AUTO_SEARCH_* assets 
Upd: [EN] FAST_FORWARD_* assets

TODO: [JP, TW] Replace placeholder assets based on CN, FAST_FORWARD_*
should be same across servers

TODO: [EN, JP, TW] Guild leaders need additional assets for module guild
 2021-01-21 12:56:00 -05:00
LmeSzinc
453b38f15c Fix: Handle auto search, disable it currently 2021-01-21 19:54:36 +08:00
noname94
e85be55bc1 Add: [JP] GUILD_POPUP_* assets added. 2021-01-20 02:33:07 +09:00
nEEtdo0d
ac6c82a496 Add: MISSION_POPUP_* assets and handling 
TODO: [CN, TW, JP] may need to replace unless POP_UP_* assets are sufficient
EN may be the only server that has altered pop up for these missions
 2021-01-17 22:23:40 -05:00
nEEtdo0d
4e3f275f4c Del: Unused .BUTTON assets for module guild 
TODO: [JP, TW] Replace GUILD_POPUP_*
 2021-01-16 19:23:37 -05:00
nEEtdo0d
918eddb740 Fix: Resolve merge conflict 2021-01-16 09:56:52 -05:00
nEEtdo0d
5c51818c6b Fix: [CN] Correct asset name, adjust code 2021-01-16 09:08:33 -05:00
nEEtdo0d
8dca110761 Add: [EN] GUILD_POPUP_* assets 2021-01-16 08:57:42 -05:00
nEEtdo0d
44442c5876 Add: [EN] GUILD_POPUP_* assets 2021-01-15 11:16:01 -05:00
LmeSzinc
717420aa6a Fix: Handle guild popups 2021-01-15 22:32:06 +08:00
LmeSzinc
58cbc8033c Add: Daily OS ash beacon assist 
- TODO: [EN][JP][TW] Replace assets
 2021-01-15 17:41:39 +08:00
nEEtdo0d
b6e3222927 Opt: [JP, TW] Clean up dev_tool.button_extract output 
Copied placeholder assets from CN to missing servers
 2021-01-01 15:43:59 -05:00
nEEtdo0d
5453c6b560 Add: Semi-auto operation siren additional assets 
TODO: [CN, JP, TW] Add equivalent GET_MEOWFFICER_ITEMS and MAP_WORLD
STORY_CHOOSE_SHORT_2 does not need to be replaced
 2020-12-27 10:32:42 -05:00
noname94
093c5e8b3e Fix: stuck in retreat confirmation on potato pcs 
and remove duplicate GET_ITEMS_1 in handler assets
 2020-12-27 11:55:52 +09:00
whoamikyo
2a471523f6 Fix: fixed STORY_CHOOSE_LONG_3 2020-12-26 11:37:27 -03:00
Zorachristine
0564665aa9 twassetsfix 2020-12-26 12:44:06 +08:00
LmeSzinc
ddd44d231d Add: STORY_CHOOSE_LONG_3 to choose the first option 2020-12-25 16:38:53 +08:00
LmeSzinc
7fba5b6cb2 Add: STORY_CHOOSE_LONG_2 2020-11-27 19:45:03 +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
nEEtdo0d
7d2547e5be Fix: Re-implemented per PR comments 2020-11-14 17:54:21 -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
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
noname94
a78a07e07f Add: [JP] sos assets 
and some other assets fixed.
 2020-11-02 20:13:59 +09:00
LmeSzinc
08e4242229 Add: Handle game tips 2020-10-30 18:08:59 +08:00
whoamikyo
d1dd15ceec Added: Taiwan server support 2020-10-26 15:22:13 -03:00
LmeSzinc
1d3fa9ed42 Fix: [CN] LOGIN_CONFIRM 
Login button has changed since the last user agreement update
 2020-10-09 17:03:27 +08:00
noname94
3932ac8e30 Fix: [JP] fix STRATEGY_OPENED asset 2020-09-23 01:47:40 +09:00
noname94
2dbd8b456e Fix: [JP] Handle maintenance announcement at login 2020-09-03 09:44:03 +09:00
noname94
6cd4541c6f Fix: [JP] assets update 2020-09-02 06:33:25 +09:00
LmeSzinc
1ed8ce8fde Fix: CN channel server login 2020-08-27 20:52:42 +08:00
whoamikyo
11c667b576 Update assets.py 2020-08-14 10:41:18 -03:00
LmeSzinc
afcf48f89f Add: 1-1 Affinity farming 2020-08-14 08:05:26 +08:00
whoamikyo
534c8979fe Revert "Merge branch 'master' of https://github.com/whoamikyo/AzurLaneAutoScript" 
This reverts commit d9f73c9ed9, reversing
changes made to 56b140d9e8.
 2020-08-13 15:35:13 -03:00
Kyo
ef96c4bd16
Revert "Opt: added update checker at startup using only batch script " 2020-08-13 14:03:59 -03:00
whoamikyo
c837a97bd0 Opt: added update checker at startup using only batch script 
- added LmeSzinc Dev branch to updater menu
- removed legacy functions
- others minors optimizations
 2020-08-13 13:46:24 -03:00
noname94
515a3e7942 Fix: Fleet lock and Login confirm for JP version. 2020-08-12 12:02:00 +09:00
LmeSzinc
414dc0f0b5 Fix: Fleet lock assets 2020-08-10 16:12:40 +08:00
whoamikyo
5879e7000c Fix: [EN] fix login assets 2020-08-02 07:09:18 -03:00
LmeSzinc
30cafe1b0e Opt: Better ambush evade detect area load 2020-07-24 06:40:06 +08:00
whoamikyo
d2f16031e1 Opt: changed the way to get area from TEMPLATE_AMBUSH 2020-07-22 04:48:48 -03:00
whoamikyo
dd41432dd5 Fix: [EN] Fix Map walk out of step 2020-07-22 03:40:56 -03:00
LmeSzinc
0a8a90cdb1 Typo: Docstring in assets.py 2020-07-15 23:33:38 +08:00
whoamikyo
689d6c7427 Fix: [EN] Fix LOGIN_RETURN_SIGN 
Button moved to another place to avoid issues.
 2020-06-29 20:50:57 -03:00
whoamikyo
c8bdb7c0c2 Assets: Added Assets for equipment 
- Minor changes in dev_tools.bat
 2020-06-26 19:25:06 -03:00
whoamikyo
b0f0999f73 Updated login asset 2020-06-24 17:17:45 -03:00
LmeSzinc
20567ceba5 Merge remote-tracking branch 'origin/master' 2020-06-16 18:34:26 +08:00
whoamikyo
23aa33ce23 Asset: [EN] Updated MAP_ENEMY_SEARCHING 2020-06-16 06:51:34 -03:00
LmeSzinc
51f39be0ff Fix: [CN] LOGIN_CONFIRM different in different device 
- Improve log appearance of login
 2020-06-16 17:26:34 +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
9657141390 Add: [JP] add jp assets, handler module 2020-06-13 02:51:55 +09:00
kyO The NinjA
f49da62dce Fix: [EN[ Fix INFO_BAR assets 2020-06-11 15:52:15 -03:00
kyO The NinjA
ab18cf38bb Fix: [EN] Fix assets 2020-06-11 15:10:20 -03:00
LmeSzinc
c37fda242c Fix: [EN] POPUP assets now in 1280x720 
- Add assets check to button_extract
 2020-06-12 00:09:58 +08:00
kyO The NinjA
6d5ac959d4 Add: [EN] Ambush assets updated 2020-06-06 15:44:58 -03:00
kyO The NinjA
524570d12c Fix: [EN] update assets.py 2020-06-03 14:27:09 -03:00
LmeSzinc
4094ab1f00 Fix: [CN] Login confirm 2020-06-03 15:21:20 +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
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
2154edefb1 Update assets.py 2020-05-28 22:20:19 -03:00
kyO The NinjA
5f55303421 FIx 3 Star Asset 2020-05-27 21:56:32 -03:00
kyO The NinjA
a3f0c0304e Fix assets for SHIP morale 2020-05-27 19:56:35 -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
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
2f1f999ce5 Add: multi-server support 2020-05-25 22:05:42 +08:00
LmeSzinc
fc7e16835f Fix: 纠正拼写错误 2020-05-05 02:54:23 +08:00
LmeSzinc
290e755432 Fix: 修复剧情跳过 
- 增加黑屏带文字剧情的跳过
- 增加战斗开始时的剧情跳过
 2020-05-01 01:02:32 +08:00
LmeSzinc
5284c1a390 Fix: 修复打完BOSS有时会卡住的问题 
- 优化了苍红的回响C2, 大型航空对低耗队杀伤力太大了
 2020-04-27 22:49:30 +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
708c972161 Add: 增加登录时更新和回归奖励的适配 
- 更改了登录时的点击位置
 2020-04-16 16:09:23 +08:00
LmeSzinc
70936f4f39 Add: 适配第二章 
- 修复了不开启周回模式时, 会在出击界面开启自动的问题
- 修复了多打一战后, 打完BOSS不判定当前出击结束的问题
- 增加掉落新船时锁定的功能
- 增加了地图不支持周回模式时, 跳过周回检查的功能
  周回模式的选项可以无脑开了
- 修改透视识别报warning为info
  因为低级图地图小降低了检测的阈值, 导致需要纠正错误有点多
- 减少了战斗准备页面的多余点击
- 减少了挂委托时的多余点击
 2020-04-14 17:32:26 +08:00
LmeSzinc
91e83271a4 Add: 增加了使用一键退役的支持 
- 增加了根据设置选择切换函数的装饰器
- 增加了ADB截图和点击的设置, 默认使用ADB截图, uiautomator2点击
- 更新了assets.py文件, 上次commit忘记了
 2020-04-14 12:26:57 +08:00
LmeSzinc
ad73de92dd Refactor: 抽象出处理确认弹窗的逻辑 
- 删除了一些无用的assets
- 纠正了一些拼写错误
 2020-04-13 23:00:19 +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
17d37d3048 Fix: 修复了切换狩猎范围显示无效的问题 
- 更换了切换潜艇狩猎范围的按钮
 2020-04-10 11:05:06 +08:00
LmeSzinc
c5c36b3475 Optimize: 优化阵型检查, 不带潜艇且阵型图标正确时会跳过 2020-04-10 10:13:32 +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
ce4887a4f5 Initial commit 2020-03-29 01:41:34 +08:00