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

145 Commits

Author SHA1 Message Date
LmeSzinc
b99d978935 Fix: [EN] Update retire assets (#1967) 2022-12-09 23:00:16 +08:00
bookbug666
0cdc4cfff0 Unlock server restrictions, update assets.py 2022-12-06 00:05:31 +08:00
nEEtdo0d
27fabf7b9f Add: [EN] asset support for ship scan (#1776) 2022-10-27 01:13:39 -04:00
Horizon101011
1f71f5bafb Add: Status 'battle' 2022-10-13 21:13:50 +08:00
Horizon101011
e1f50c64cb
Merge branch 'dev' into dockScanner 2022-09-14 10:32:54 +08:00
Horizon101011
bee28c5321 [Refactor] Using template matching instead of feature matching 2022-09-13 09:31:01 +08:00
LmeSzinc
e8dcdeaf65 Add: Quick retire options fallback to avoid user mistakes 2022-09-10 18:11:07 +08:00
Horizon101011
2369581794 Upd: Add support for commission status 2022-09-06 21:36:35 +08:00
nEEtdo0d
2b21309d71 Upd: re-run button_extract; detected cloned server asset 2022-08-14 12:47:21 -04:00
Horizon101011
07a14849d9 Upd: More accurate asset for enhancement 2022-08-13 19:43:27 +08:00
Horizon101011
070f280821 Upd: Retire assets for all servers 2022-07-28 16:57:09 +08:00
LmeSzinc
95d5987f1a Upd: [CN] SR_SSR_CONFIRM 2022-06-30 19:03:56 +08:00
LmeSzinc
c69de7594b Revert "Upd: [JP] DOCK_SELECTED" cause AL revert the changes 
This reverts commit 802dd160
 2022-06-19 21:27:26 +08:00
LmeSzinc
802dd16029 Upd: [JP] DOCK_SELECTED 2022-06-12 01:13:17 +08:00
nEEtdo0d
3be54837d4 Upd: [EN] *_PASS_NOTICE assets 
Fix: [EN] DOCK_AMOUNT area too wide; re-crop
Fix: [EN] MAP_ARCHIVES text intersects into area; re-crop
Upd: [EN] clarify enhance config description
 2022-05-29 15:10:45 -04:00
LmeSzinc
32f939f2bb Fix: Siren scanning tower and logging device are not detected if they are covered by other fleets 2022-05-16 19:54:51 +08:00
Horizon101011
771c9167d8 Opt: Use OCR to improve accuracy 2022-05-14 11:02:26 +08:00
Horizon101011
36ae64be9f Opt: Retire next time if material is too little 
1、Add a material counter. In attempt stage of enhancement, if available material is less than 3, counter += 1, else counter += 3. This process will run only once during an enhancement. After an enhancement process, check this counter. If it is less than 3, ALAS will retire next time when calling retirement module to avoid frequent enhancement while enhancement material is too little.
2、Moving assets to corresponding position.
 2022-05-12 03:38:29 +08:00
Egor Nats
1ebe64950a Fix: [EN] Revert to old assets 
- Tactical class and Dorm feature still broken, please disable until fix.
 2022-04-12 11:20:34 -03:00
SaarChaffee
303dd90fdc change CRLF to LF 2022-04-09 23:31:09 +08:00
nEEtdo0d
73ddcd9b7f Upd: [EN] post major app update bulk assets; WIP part 2 2022-04-08 00:57:15 -04:00
nEEtdo0d
96b39a9ea5 Upd: [EN] post major app update bulk assets; WIP part 1 2022-04-07 22:32:24 -04:00
LmeSzinc
d5735604e1 Dev: Uniform comments of generated files 2021-12-07 23:29:33 +08:00
LmeSzinc
9c3f1a2079 Upd: [TW] SR_SSR_CONFIRM in retire 2021-12-04 14:26:30 +08:00
Cola
ad32ac12da Fix: [JP]Data_Key&Dock_Filter_Confirm assets 2021-11-16 23:06:00 +08:00
nEEtdo0d
2eca1a6f85 Upd: [EN] DOCK_FILTER_CONFIRM asset 2021-11-13 13:33:12 -05:00
Cola
c76954a32a Fix: [JP] Fleet_check asset 2021-10-06 11:37:33 +08:00
Cola
1310dab61c Fix: [TW] Dock filter confirm asset 2021-09-16 20:44:26 +08:00
Cola
c816d65ce6 Fix: [TW] Equipment assets in gems farming 2021-09-07 19:50:41 +08:00
Ray
c5dc75a97c Fix:[JP] update os assets 2021-08-22 21:09:22 +08:00
nEEtdo0d
4222760fcc Upd: [EN] Gems farming assets 2021-08-21 17:07:59 -04:00
nEEtdo0d
41c3451772 Upd: [EN] Obscure finish assets 2021-08-21 16:15:22 -04:00
Cyunmi
88d2d57454 update after merge master 2021-08-13 13:00:19 +08:00
Cyunmi
c1afc6981c Merge branch 'master' into gems_farming 2021-08-13 12:58:56 +08:00
Cyunmi
e5c9ea54ea clean unuse assert 2021-08-12 08:05:10 +08:00
nEEtdo0d
1951a76d65 Fix: [EN] DOCK_SELECTED, for gems_farming module 2021-08-11 13:16:13 -04:00
Ray
54e27c21c0 Fix: [JP] DOCK_SELECTED asset 2021-08-09 19:50:31 +08:00
Cyunmi
aa4a2d8ef6 Merge branch 'master' into gems_farming 2021-08-09 17:08:25 +08:00
Cyunmi
4c4321777d prepare to merge 2021-08-09 16:50:36 +08:00
Ray
edadb6949c Fix: [JP] retire&gacha assets except DOCK_SELECTED 2021-08-08 17:01:47 +08:00
Ray
f08ce025d8 Fix: [JP] equipment assets 2021-08-08 16:42:28 +08:00
Ray
2b0c3afbe0 Fix: [JP] shipyard assets except RESEARCH_COMPLETE 2021-08-08 15:55:54 +08:00
nEEtdo0d
40e9004808 Fix: [EN] restore previous conditional only for EN, as POPUP_CONFIRM is not the same (uses lowercase and scaling). 
Other servers maintain current handle_popup_confirm methodology
 2021-08-07 19:11:23 -04:00
RuaBQ
bdd4105235 Merge remote-tracking branch 'upstream/gems_farming' into gems_farming 2021-07-06 20:24:23 +08:00
RuaBQ
c4e4c1fec2 每艘 cv 用一个单独的 template 
改变了 retirement 的写法
 2021-07-06 01:14:05 +08:00
LmeSzinc
bffc1770cd Del: Replace SR_SSR_CONFIRM with popup_confirm 
- Opt: Skip first screenshot in _retirement_confirm()
 2021-07-04 18:17:57 +08:00
RuaBQ
1bfa5be425 add retire coin assert 2021-07-04 02:21:41 +08:00
RuaBQ
bc05b4cd89 merge equipment change 
add some assert
 2021-06-30 02:15:57 +08:00
RuaBQ
79b7981ca5 add equipment change 2021-06-30 01:24:30 +08:00
LmeSzinc
48d53f6cab Add: Flagship changing 2021-06-29 23:10:13 +08:00
Ray
782868dc3a update enhance asset 2021-05-29 11:25:02 +08:00
Zorachristine
9b67bbd529 Fix: [TW] retire & combat assets 2021-04-25 20:04:52 +08:00
nEEtdo0d
a6ab994ba1 Add: Daily Skip assets 
Fix: Retire assets
 2021-04-16 09:44:22 -04: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
LmeSzinc
cb062d61d2 Fix: [CN] Enhancement assets (#388) 2021-03-23 22:30:49 +08:00
Ray
f4331a50a3 update [jp]ENHANCE_CONFIRM buttom asset 2021-03-23 15:06:14 +08:00
Ray
5d46f61c48 update [jp] ENHANCE_RECOMMEND buttom asset 2021-03-23 12:27:54 +08:00
nEEtdo0d
29a707be6b Fix: Recent update altered retire assets, re-cropped new ones 
TODO: Other servers should survey their retire assets
 2021-03-18 13:43:27 -04:00
noname94
b66475fac2 Fix: [JP] RETIRE_APPEAR_n assets fixed 
Current assets do not match the in-game buttons well and break the script sometimes.
 2021-02-13 12:07:33 +09:00
nEEtdo0d
374002eb8a Del: Filter assets all servers, effectively moved to new filter set system 
Fix: Formatting files through IDE
 2021-01-31 20:27:20 -05:00
nEEtdo0d
92caa11686 Fix: [EN] FILTER_INDEX_OTHERS_OFF incorrect asset, replaced 2021-01-14 17:44:43 -05:00
MarioGilera
5b30fc0945 New Enhancement assets 
Needed after 23/12/2020 update.
 2020-12-29 21:46:34 +01:00
ferina8-14
583598fde6 Fix: [JP] add assets for the enhancement module 2020-12-28 03:57:29 +09:00
nEEtdo0d
96d42ea2a2 Fix: [EN] Updated FILTER_INDEX_CA_ON, consistent according to error screen captures 2020-12-23 19:24:03 -05:00
nEEtdo0d
ec7658e887 Fix: [EN] Dock filter assets changed after operation siren update 
TODO: [CN, TW, JP] update FILTER_* and DOCK_FILTER_CONFIRM accordingly
 2020-12-22 22:36:11 -05:00
Ray
4c359e21ac update images 2020-12-17 21:25:40 +08:00
LmeSzinc
0e932cad1f Add: [CN] update FILTER_EXTRA_NO_LIMIT_* 2020-11-27 19:38:39 +08:00
nEEtdo0d
e9f7c615fb Fix: Asset change for filter_extra_*, renamed assets by category 
TODO: CN, JP, TW update FILTER_EXTRA_NO_LIMIT_*, JP update FILTER_INDEX_ALL_*
 2020-11-26 16:44:19 -05:00
whoamikyo
d1dd15ceec Added: Taiwan server support 2020-10-26 15:22:13 -03:00
noname94
58234e4484 Fix: [JP] add SR_SSR_CONFIRM asset 2020-09-20 10:06:10 +09:00
whoamikyo
e0a7bb5666 Fix: [EN] fix SR_SSR_CONFIRM asset 2020-09-19 15:34:30 -03:00
LmeSzinc
44c653b5d5 Fix: Handle SR/SSR retire confirm 2020-09-17 18:58:26 +08:00
nEEtdo0d
bb8931f968 Fix: CLEAR_OFF was not updated, synchronizing with similar cut as others. Tested using debug script, appear() evaluates correctly. 2020-08-13 20:47:35 -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
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
LmeSzinc
0717730274 Add: [CN] Enhancement filter assets 2020-08-07 20:47:09 +08:00
nEEtdo0d
375660710f Re-cut FILTER_INDEX_CL_ON, appear method call getting stuck during switch 2020-08-07 06:51:22 -04:00
nEEtdo0d
63f3355f75 INDEX_CL_ON had unique white area that did not always evaluated to true, re-cut image for higher chance of accuracy 2020-08-06 22:34:26 -04:00
nEEtdo0d
10678660f6 add updated assets.py forgot 2020-08-06 02:25:05 -04:00
nEEtdo0d
86f82481d4 enhancement re-work bulk commit, working assets! 2020-08-04 16:33:32 -04:00
LmeSzinc
0a8a90cdb1 Typo: Docstring in assets.py 2020-07-15 23:33:38 +08:00
whoamikyo
c8bdb7c0c2 Assets: Added Assets for equipment 
- Minor changes in dev_tools.bat
 2020-06-26 19:25:06 -03: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
10bbdd1a79 Add: [JP] add jp assets, retire module 2020-06-13 02:52:55 +09:00
kyO The NinjA
ad90d29525 Fix: [EN] Fix Retire assets and AUTOMATION_CONFIRM asset 2020-06-12 00:15:49 -03:00
kyO The NinjA
5956fb4700 Add: [EN] Enhance module assets 2020-05-31 23:06:18 -03:00
LmeSzinc
c6611f19dc Add: Enhance module 2020-06-01 08:20:13 +08:00
kyO The NinjA
5bec616659 Retirement assets 
- Fix asset for morale low
- Create a quick guide to help
 2020-05-28 22:08:21 -03:00
kyO The NinjA
37c6d08775 Localization for EN version 
- Updated assets for EN version
- Created EN dictionary
- Fix Stage OCR recognition Thanks @LmeSzinc
 2020-05-27 10:29:40 -03:00
LmeSzinc
2f1f999ce5 Add: multi-server support 2020-05-25 22:05:42 +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
2061948ff8 Fix: 修复了退役模块无船可退时进入死循环的问题 
- 退役时会关闭常用舰船的筛选
- 退役数量为0时, 将停止运行
 2020-04-03 14:09:04 +08:00
LmeSzinc
ce4887a4f5 Initial commit 2020-03-29 01:41:34 +08:00