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,942 Commits 9 Branches 0 Tags 274 MiB
8927de99a4
Commit Graph

206 Commits

Author SHA1 Message Date
LmeSzinc
1d7cb02140 Del: Remove 1-1 affinity farming but map file is still preserved 
New mechanism was added i don't know when, which removes ambushes when fleets satisfy the recon value, even in non clearing mode. 1-1 affinity farming is no longer working and 9-1 is much better.
 2022-01-04 22:19:35 +08:00
LmeSzinc
1eaecf49b3 Revert "Merge pull request #838 from yanyihui/yyhbranch" 2022-01-02 00:58:25 +08:00
LmeSzinc
cd0204f455 Opt: Better tips when having wrong configs 2021-12-31 01:34:01 +08:00
LmeSzinc
8e790b3340 Opt: Add counter of possible reasons 
To prevent user reading only the last one
 2021-12-30 17:38:09 +08:00
yanyihui
fc1c7025b1 MapDetectionError 2021-12-17 23:45:11 +08:00
yanyihui
2faaa2b2ad fix: merge func TryRestart into HandleError 2021-12-17 19:15:45 +08:00
yanyihui
d82a3742bb feat: TryRestart (Debug Settings) will disable error task and try restarting 2021-12-17 17:37:26 +08:00
LmeSzinc
6f0e3a38d0 Add: Handle shared CD of recon scan and submarine call 
- Add entrance of OpSi abyssal and stronghold
 2021-12-08 01:25:35 +08:00
LmeSzinc
ff7c875f3f Add: Collect battle pass rewards 2021-12-03 17:32:10 +08:00
LmeSzinc
90f756fb18 Fix: Unable to release the hoarded task after waiting a task at start (#764) 2021-12-01 23:44:59 +08:00
LmeSzinc
9d3917677e Add: Buy free weekly supplies pack 2021-11-27 15:23:13 +08:00
LmeSzinc
790515c800 Fix: Delay the wrong task after restart (#755) 2021-11-22 22:40:11 +08:00
LmeSzinc
e984859ad6 Add: Goto main page when task queue is empty 
- Refactor: Task waiting
- Fix: Saving config twice in nested multiset wrapper
 2021-11-14 01:10:36 +08:00
LmeSzinc
3098aa31aa Fix: Stop scheduler if a task failed 3 or more times 
- Add: Clear click record
- Opt: Check the type of user setting and display invalid settings
 2021-11-03 20:46:34 +08:00
julystone
609d1ef239 ADD：campaign_cd for different fleet prepare 2021-11-02 14:48:15 +08:00
julystone
3c78fec67e ADD：campaign_cd for different fleet prepare 2021-11-02 14:45:14 +08:00
nEEtdo0d
9e4550aff1 Fix: Split shop task based on check frequency; general shop changes inventory 3 times daily and other shops change inventory 1 time daily 2021-10-29 16:10:49 -04:00
18870
ddecb1ce57 Opt: Catch and show exception when load config 2021-10-28 23:18:01 +08:00
18870
5df441f5d1 Opt: Show error when device connection failed 2021-10-24 15:14:10 +08:00
LmeSzinc
6bf5f9fa92 Add: TaskHoardingDuration and CloseGameDuringWait (#643) 2021-10-18 21:36:22 +08:00
nEEtdo0d
3a89c62af2 Mov: data_key into own folder same as other reward tasks 2021-10-16 09:05:07 -04:00
nEEtdo0d
ad12992712 Merge branch 'app' of https://github.com/LmeSzinc/AzurLaneAutoScript into app_data_key 2021-10-16 08:49:37 -04:00
LmeSzinc
2ec4f0a217 Opt: Separate logs, all instances save to their own file 2021-10-16 12:59:29 +08:00
nEEtdo0d
ee7456023e Add: new Reward task DataKey 2021-10-15 18:29:28 -04:00
LmeSzinc
a0bb1f0d91 Fix: Create ./log/error folder 2021-10-12 14:15:23 +08:00
nEEtdo0d
d9cec4134e Add: war archives support for app 2021-10-10 23:38:10 -04:00
LmeSzinc
d3cb28c10f Opt: Catch KeyboardInterrupt in web server 
- Opt: Add one screen shot before task starts, which will update image after a long wait
 2021-10-06 16:49:47 +08:00
LmeSzinc
4046dd25f5 Refactor: Event daily SP and AB 
- Add Raid and WarArchives configs
 2021-10-03 22:52:28 +08:00
LmeSzinc
77ace49c2e Refactor: Gacha module 2021-10-03 00:36:14 +08:00
LmeSzinc
2627da413d Refactor: Rest of the farming tasks 
- Load server from config
 2021-09-28 00:47:49 +08:00
LmeSzinc
a52826594e Refactor: OS module 
- Refactor OS explore, able to run without 5000 oil item
- Fix: Screenshot interval recover
 2021-09-26 17:40:38 +08:00
LmeSzinc
3483ea2041 Refactor: Config generating 2021-09-26 00:04:11 +08:00
LmeSzinc
2c58be0c21 Refactor: 7-2 mystery farming 2021-09-25 12:14:33 +08:00
LmeSzinc
672f5b4608 Fix: Daily app restart 2021-09-25 00:51:51 +08:00
LmeSzinc
495242cbc2 Refactor: Ash beacon assist 2021-09-25 00:38:53 +08:00
LmeSzinc
f1695a3d4e Fix: Class properties remained from last config instance 2021-09-24 22:24:04 +08:00
LmeSzinc
33d503465f Refactor: SOS module 
- Fix: Expected reduce when no fleet 2
 2021-09-24 21:51:44 +08:00
LmeSzinc
60f7a64066 Refactor: Shop module 2021-09-24 13:40:43 +08:00
LmeSzinc
e607c920cf Refactor: Exercise module, mode easiest_else_exp might have issues 2021-09-23 02:35:22 +08:00
LmeSzinc
eb7886df61 Refactor: Hard module 
- Add config override
- Delete hard equipment change
 2021-09-23 02:35:05 +08:00
LmeSzinc
62211b2af4 Refactor: Daily module 
- Delete daily fleet equipment change
 2021-09-23 02:35:01 +08:00
LmeSzinc
b4df3f8a9d Fix: Stop if encountered unexpected errors 
- Fix: meow_additional
- Fix：Missing config
 2021-09-22 11:36:10 +08:00
LmeSzinc
b3580c427e Refactor: Separate meowfficer to a standalone module 2021-09-21 12:46:41 +08:00
LmeSzinc
c8c1cd9789 Refactor: Guild module 
- Simplify guild exchange with Filter
- Expose submarine mode
 2021-09-21 01:19:43 +08:00
LmeSzinc
ca5a14a2dd Refactor: Separate dorm to standalone module 2021-09-21 00:51:29 +08:00
LmeSzinc
121dbd694c Refactor: Reward receive, oil, coins and missions 2021-09-20 20:35:10 +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
61cbe75527 Refactor: More accurate exceptions and add friendly advices 2021-09-16 12:09:00 +08:00
LmeSzinc
5dd0459de9 Refactor: Gems farming configs 
- Opt: Avoid clicking AUTO_SEARCH_MAP_OPTION_OFF after ignore low emotion warn
- Opt: Skip map cat attack in auto search
 2021-09-16 03:53:57 +08:00
LmeSzinc
46d8d2fadb Refactor: Rename main configs 
- Faster chapter selection and page_campaign
- Rename some old Chinglish variables in map info
 2021-09-15 23:32:31 +08:00
LmeSzinc
a504e97f4c Add: Expose scheduler and server 2021-09-14 17:42:34 +08:00
LmeSzinc
e918a5db97 Merge branch 'gems_farming' into dev 
# Conflicts:
#	module/campaign/campaign_ocr.py
#	module/equipment/equipment.py
#	module/guild/base.py
 2021-07-24 17:33:58 +08:00
LmeSzinc
ceab3837f4 Opt: Protect azurstat_id in settings 2021-07-21 18:41:28 +08:00
LmeSzinc
d750f73696 Add: Change flagship when level >= 32 2021-06-30 18:04:31 +08:00
nEEtdo0d
43ee1f35fe Add: [EN] Support for OS world clearing 2021-05-14 16:19:55 -04:00
LmeSzinc
127212b204 Add: Do os in daily 2021-04-27 16:27:55 +08:00
LmeSzinc
461132bbd0 Fix: Add missing file 2021-04-17 22:20:21 +08:00
whoamikyo
52b50fa53b Fix: fixed guild logistics refresh bug 
- Now Azur Lane will be closed for 10 minutes when triggered guild logistics refresh bug
 2021-02-19 20:09:11 -03:00
LmeSzinc
711fcf76a5 Add: Add os_clear_map to GUI 2021-01-26 17:40:14 +08:00
LmeSzinc
29298e0db4 Opt: Save logs if catching GameTooManyClickError 2020-12-30 20:57:01 +08:00
LmeSzinc
57822607e1 Add: Semi-auto for operation siren 
- Fix: Clicking on HOME button when skipping story
- TODO: [EN][JP] Replace assets in os_combat and os_handler
 2020-12-23 18:50:51 +08:00
whoamikyo
ac53c79d61 Revert "Opt: Now ALAS can start the app from other functions too" 
This reverts commit 3c7f382e00.
 2020-12-02 02:59:38 -03:00
whoamikyo
3c7f382e00 Opt: Now ALAS can start the app from other functions too 2020-12-02 01:52:14 -03:00
whoamikyo
db4abf543a Fix: fix Game Stuck handler to GameTooManyClickError 2020-11-25 22:49:35 -03:00
LmeSzinc
7a85ceda34 Opt: More logs for debugging 2020-11-23 21:48:31 +08:00
nEEtdo0d
124521ddc0 Add: retry logic for some ui elements, override triggered_stop_condition for remaining data keys 2020-11-11 21:30:24 -05:00
nEEtdo0d
e125bdaa65 Fix: Move war archive events where others are, adjust code as needed 2020-11-07 16:43:40 -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
LmeSzinc
9c754975ee Add: SOS in gui 2020-10-24 22:50:55 +08:00
LmeSzinc
3c8976ddd9 Opt: Event stage and SP stage merge into one setting 2020-09-17 21:43:10 +08:00
LmeSzinc
1f058030f6
Revert "Add: Box recycle module" 2020-09-16 22:54:49 +08:00
Kyo
71627dd555
Merge pull request #183 from RuaBQ/boxRecycle 
Add: Box recycle module
 2020-09-16 11:54:04 -03:00
RuaBQ
8bff63d0dd rename file 2020-09-16 16:55:11 +08:00
noname94
519abcc2b9 Fix: Error log char encoding set to UTF-8 
82277e3d5a changed log char encoding to UTF-8 and it broke 'save_error_log'.
 2020-09-16 13:37:18 +09:00
RuaBQ
7463320087 finsih box detect 2020-09-16 05:37:41 +08:00
LmeSzinc
afcf48f89f Add: 1-1 Affinity farming 2020-08-14 08:05:26 +08:00
LmeSzinc
14c3966874 Add: Game stuck handler 
- Add ensure game running when running alas functions
 2020-08-01 17:53:00 +08:00
LmeSzinc
29106b08a0 Add: Check screenshot when running emulator settings 2020-07-07 20:45:45 +08:00
LmeSzinc
4ca076dd05 Add: Replace user filepath with "C:\fakepath" in error logs 2020-07-01 11:26:02 +08:00
LmeSzinc
5982e44dd7 Add: Delete sensitive info in log images 2020-06-30 02:42:36 +08:00
whoamikyo
d4636c5831 Opt: Hide github_token in logs 2020-06-29 15:05:29 -03:00
LmeSzinc
22203ccb7b Add: Run daily as a part of reward, disabled by default 2020-06-29 00:07:06 +08:00
LmeSzinc
a3949fb73d Fix: raid_mode not working 2020-06-25 11:58:03 +08:00
LmeSzinc
1150041049 Add: Raid and Raid daily 
- Increase interval of login_confirm
 2020-06-24 17:10:57 +08:00
LmeSzinc
e290f16790 Opt: [CN] GUI string 
- Optimize lines in dictionary.py, following the order in argparser
- Disable event_daily_ab by default
 2020-06-22 10:14:57 +08:00
LmeSzinc
e0241fa470 Add: Update check via github web page 
- Add no update check if running multiple alas
- Fix enable_update_check not working
 2020-06-22 07:23:16 +08:00
whoamikyo
99aabeef39 Fix: Fix wrong command in alas.bat 2020-06-21 18:29:26 -03:00
whoamikyo
e676f0e1b0 Enhancement: Event 3x bonus moved to Daily 
- Now Event_daily_bonus was moved to Daily function
 2020-06-21 18:14:16 -03:00
whoamikyo
c735df79b9 Add: Added new update check 
- @LmeSzinc made another update check with proxy support, I just add a github token support because github api has a limit of 60 requests per hour for unauthenticated requests.
 2020-06-21 13:17:23 -03:00
whoamikyo
c67f954350 Add: Update check 2020-06-20 06:07:43 -03:00
Erik
56d2df66b9
Merge branch 'dev' into master 2020-06-16 13:36:05 -03:00
LmeSzinc
80951f864f Fix: Wrong event run folder 2020-06-16 20:49:29 +08:00
whoamikyo
26a321a916 initial commit 2020-06-16 00:30:50 -03:00
LmeSzinc
d0867262e2 Optimize: Reuse device instance in the same function 
- Speed up retire confirm
- Set default server to CN
- Improve log appearance of aScreenCap init
 2020-06-16 08:55:44 +08:00
LmeSzinc
3c35974bbe Fix: add new day check to reward_loop 
- Fix emotion reduce when calculating recover
 2020-06-06 21:53:31 +08:00
LmeSzinc
26c4d6552d Add: Reward loop when finished, to all function 2020-06-05 10:54:29 +08:00
LmeSzinc
0206a6480d Add: Fleet settings check 
- Delete option do_not_use in fleet_2 and fleet_3
- Exit if receive wrong settings
 2020-06-03 02:39:03 +08:00
LmeSzinc
65de042dd3 Add: 增加挂机收菜模式 2020-05-06 23:53:25 +08:00
LmeSzinc
93c6293836 Add: 增加12-2打中型练级 2020-05-04 21:48:52 +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
49ddd8d85f Add: 增加了出错时保存log和截图的功能 
- 更改了Log的目录名称
 2020-04-16 14:05:37 +08:00
LmeSzinc
061077c690 Fix: 修复一些bug 
- 修复了日常结束后不收菜的问题
- 修复登录
- 增加不能使用潜艇的地图的覆盖设置
- 修复了因图片不更新导致二队不会跳过阵容检查的问题
- 修复了一些过场图导致进入战斗判断错误的问题
 2020-04-12 20:28:31 +08:00
LmeSzinc
012a4decbb Add: 更多收菜的触发条件 
- 在主线图时, 出现委托完成的红点, 会触发收菜
- 完成每日任务时, 会触发收菜
- 执行收菜设置时, 会触发收菜
 2020-04-10 15:19:02 +08:00
LmeSzinc
ae94260ff8 Add: 支持App控制, 支持自动登录 
- 修复了12-4地图信息的错误
 2020-04-10 14:18:10 +08:00
LmeSzinc
d2c84878f4 Add: 增加多开支持 
- 复制一份alas.pyw就可以多开了
- 修复了找不到./log目录的问题
- 增加了报错信息打印至log
 2020-04-08 00:50:39 +08:00