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
6,140 Commits 9 Branches 0 Tags 274 MiB
f5f093c67f
Commit Graph

294 Commits

Author SHA1 Message Date
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
LmeSzinc
5cb7cb6e8a Opt: Detection area to merge commission list 2020-08-18 03:45:15 +08:00
LmeSzinc
3d5f57f460 Add: minitouch basic config 2020-08-17 18:31:31 +08:00
LmeSzinc
7fc72b5416 Add: Buy meowfficer, disabled by default 2020-08-14 12:05:17 +08:00
LmeSzinc
afcf48f89f Add: 1-1 Affinity farming 2020-08-14 08:05:26 +08:00
LmeSzinc
bd215e0e98 Add: Combat mode hide_in_bottom_left 2020-08-14 06:52:21 +08:00
LmeSzinc
a8c47b51b1 Add: Option map_green_without_3_star to setting if_map_reach 2020-08-11 02:15:33 +08:00
LmeSzinc
7ee63cc651 Opt: Move Wasteland mode to stop condition if_map_reach 
Opt: Gather map status
 2020-08-11 00:08:29 +08:00
LmeSzinc
f97c8e1880 Add: Option to cancel tactical class if no book satisfied (#138) 2020-08-10 15:49:53 +08:00
nEEtdo0d
d7be42372b Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2020-08-06 08:30:48 -04:00
LmeSzinc
ddefbc048b Fix: Handle different MAP_ENEMY_TURN on different sirens 
- Fix merge error on movable enemies
- Fix old select arguments in 7-2
 2020-08-06 19:25:26 +08:00
nEEtdo0d
86f82481d4 enhancement re-work bulk commit, working assets! 2020-08-04 16:33:32 -04:00
LmeSzinc
5d9e4b651d Opt: Handle movable enemy without POOR_MAP_DATA enabled and won't goto previous siren location 
- Fix: enemy_genre merge
- Add: counter of map walk round
- Opt: Smarter enemy moving wait
 2020-08-05 03:07:20 +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
e8ce2d37b5 Add: Combat auto mode for different fleet 2020-07-29 00:50:49 +08:00
LmeSzinc
7ee8b497a0 Add: Event daily SP 2020-07-28 19:45:38 +08:00
LmeSzinc
c0c93b15f2 Opt: Enemy templates now able to configure in map files 
- Delete old siren templates, because of high error rate
- Change templates for event_20200521_cn and event_20200603_cn to monochrome
 2020-07-26 00:17:59 +08:00
LmeSzinc
69afef4844 Add: [CN] event_20200723_cn B1B2, D1D2 
- Fix U73 template
- Fix story skip popup confirm
- Add GRID_IMAGE_A_MULTIPLY
 2020-07-25 02:41:21 +08:00
LmeSzinc
8adb4fca8d Merge branch 'master' into dev 2020-07-24 11:41:13 +08:00
LmeSzinc
5f6567fe17 Fix: Normal event contains 'SP' map 
- [CN] Add event entrance 永夜幻光
 2020-07-24 11:36:13 +08:00
LmeSzinc
44ef0f836f Del: Delete old perspective module 
- Del: Image loading in config
- Opt: Less grid predict
 2020-07-23 08:21:49 +08:00
LmeSzinc
851000cfe4 Opt: Exercise logic in easiest_than_exp 2020-07-20 20:37:54 +08:00
nEEtdo0d
1d39dcef87 Revamped exercise to use date, configurations, and opponent_change_count. Added several helper methods to save data as needed and allow re-runs of exercise if needed. Added new mode 'easiest_else_exp' and exclusive method for mode as this performs exactly two rounds of pvp then moves onto to the next change in 4 opponents. Just as it describes, if unable to beat easiest opponent then switch to max exp opponent and accept the loss. Both _exercise_once and _excercise_easiest_else_exp have been tested and seem to be behaving correctly under the revamped exercise implementation. 2020-07-19 19:42:06 -04:00
LmeSzinc
e423fa08eb Add: Able to attack chapter CD for event daily bonus 2020-07-18 23:37:51 +08:00
LmeSzinc
6f8eba803d Del: Tactical class night 
- Fix classroom stuck when no books satisfied
 2020-07-18 23:02:44 +08:00
LmeSzinc
ddc0032413 Fix: Siren CV detection 
- rename siren templates
 2020-07-18 22:11:00 +08:00
Erik
5581de91bb
Merge branch 'nightly' into dev 2020-07-16 23:55:17 -03:00
Erik
ea440b805b
Merge pull request #70 from LmeSzinc/master 
Fix: [EN] Siren first in Ink-Stained Steel Sakura Rerun
 2020-07-16 23:35:58 -03:00
LmeSzinc
26e829712d Fix: [EN] Siren first in Ink-Stained Steel Sakura Rerun 2020-07-17 10:04:48 +08:00
LmeSzinc
567c4a790a Add: Research to GUI 
- Opt: Faster page switch in reward
 2020-07-17 09:28:11 +08:00
LmeSzinc
618ca784da Add: Research module 2020-07-17 05:32:22 +08:00
LmeSzinc
7e06765632 Add: Homography transformation, thanks @asd111333 for sharing ideas 
See asd111333's work: https://github.com/asd111333/ALAuto/blob/homg_trans_beta/util/homg_trans.py
 2020-07-08 17:47:52 +08:00
LmeSzinc
2a08c8c327 Opt: Move ascreencap to bin/ascreencap 
- Fix empty image after aScreenCap init
 2020-07-06 01:49:03 +08:00
LmeSzinc
8158ac9be8 Opt: Re-fit _map_swipe 
- Shorten function name of perspective transform
- Delete CAMERA_SWIPE_MULTIPLY
 2020-07-01 13:39:44 +08:00
LmeSzinc
878b276e7a Add: Use different fleet in different daily 2020-06-29 18:15:54 +08:00
LmeSzinc
22203ccb7b Add: Run daily as a part of reward, disabled by default 2020-06-29 00:07:06 +08:00
LmeSzinc
1150041049 Add: Raid and Raid daily 
- Increase interval of login_confirm
 2020-06-24 17:10: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
0b7e1e842f Merge branch 'master' of https://github.com/whoamikyo/AzurLaneAutoScript 2020-06-21 18:14:24 -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
LmeSzinc
37d6822999 Fix: Config file use before update 
- Add get_config as a public config loading function
 2020-06-22 04:47:19 +08: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
f5b74ada77 20200620.03 
- Update checker moved to emulator function
- Added datetime parser to update checker, now will transform strings to date and compare most recent
 2020-06-20 13:47:40 -03:00
whoamikyo
c67f954350 Add: Update check 2020-06-20 06:07:43 -03:00
whoamikyo
5efc957abb Add: Added option to enable or disable some exceptions 
-ALAS will withdraw from the map when it occurs instead of stopping
 2020-06-19 05:34:40 -03:00
Erik
56d2df66b9
Merge branch 'dev' into master 2020-06-16 13:36:05 -03:00
whoamikyo
26a321a916 initial commit 2020-06-16 00:30:50 -03:00
LmeSzinc
97b85160cd Add: aScreenCap support 
- Optimize adb command call
 2020-06-16 07:39:51 +08:00
whoamikyo
5434209893 Fix: Fix default PACKAGE_NAME 
- this was causing error when triggered app restart
 2020-06-13 20:38:35 -03:00
kyO The NinjA
ae88a57eba Fix: [EN] Fix Miss detect lines as characters in Commission module 2020-06-08 07:54:21 -03:00
kyO The NinjA
7c15659f7f Add: Added support for hard map 
- Now is possible cleared a hard map like a normal map
 2020-06-08 05:56:43 -03: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
b186382fdd Add: Boss fleet check from chapter 7 to 13 2020-06-05 20:05:53 +08:00
LmeSzinc
87127c882a Fix: Now able to use 1 or 2 fleets in chapter 2 to 6 
- If using 1 fleet in 6-4, will pick up the ammo
 2020-06-03 23:11:31 +08:00
LmeSzinc
9353ae1707 Optimize: Disable commission_time_limit by default 
- Faster ui click
 2020-06-03 04:36:05 +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
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
kyO The NinjA
b12d8f299c Add: [EN] Assets updated 
Fix: [EN] A3 and C3 of the event Iris of Light and Dark Rerun
Optimize: [EN] commission filter, expect many mistakes yet
Optimize: [EN] added some tips on GUI
Add: [EN] New assets for Tactical Class, this module should work now
 2020-05-30 01:09:51 -03:00
LmeSzinc
c402d3e047 Fix: Folder create when --enable_drop_screenshot disabled 2020-05-29 17:08:43 +08:00
LmeSzinc
2f1f999ce5 Add: multi-server support 2020-05-25 22:05:42 +08:00
LmeSzinc
7b97d3243c Add: 增加处理光墙(海域格子间的分隔) 
- 优化寻路初始化
- 修复海图log显示单字符显示'E'
 2020-05-23 17:22:51 +08:00
LmeSzinc
87608f2879 Add: 适配穹顶下的圣咏曲B1D1 
- 修复精英舰队挡住弹药图标导致无法到达的问题
- 修复丢失预测导致的log报错
- 增加载入精英模板
- 修复碰磁BOSS
 2020-05-23 04:42:31 +08:00
LmeSzinc
8ec5099b58 Add: 适配穹顶下的圣咏曲AC图 
- 修复UI导致的动态边缘识别出错
- 修复只识别出一队时的处理逻辑
- 修复处理战斗结束后跳出的剧情
- 修复辅助点击报CampaignEnd
- 修复游戏出现白屏bug时, 连续点击使用紧急维修
- 增加地图全清时, 使用二队打BOSS, 忽略FLEET_BOSS
- 增加被精英抓住的识别, 暂时还用不到
 2020-05-22 21:48:56 +08:00
LmeSzinc
db8c01431e Add: 增加使用紧急维修 2020-05-17 17:11:02 +08:00
LmeSzinc
239590b2de Add: 增加先锋血量权重 
- 修复12-4打大型练级不挑敌人时, 会开局撤退的问题
 2020-05-17 13:36:54 +08:00
LmeSzinc
ff25ff3d80 Fix: 微调透视识别参数 2020-05-07 10:41:23 +08:00
LmeSzinc
1c2db1ec26 Add: 增加战术学院收获 
- 修复委托收获时可能卡住的问题
 2020-05-05 17:27:19 +08:00
LmeSzinc
93c6293836 Add: 增加12-2打中型练级 2020-05-04 21:48:52 +08:00
LmeSzinc
ef5885767e Optimize: 战斗中放慢截图速度, 降低CPU使用 2020-04-28 12:53:24 +08:00
LmeSzinc
fc84f5e610 Fix: 修复开荒 
- 修复低级图出BOSS后报错的问题
- 修复了开荒进度0%时的章节名OCR
- 修复打完BOSS有时会卡住的问题
 2020-04-27 19:32:58 +08:00
LmeSzinc
604cdf4005 Fix: 修复 
- 优化章节名OCR, 防止地图特效影响识别
- 修复等待精英移动
- 修复回到出击界面
 2020-04-24 17:57:40 +08:00
LmeSzinc
bea05d396e Add: 适配复刻苍红的回响AB图 
- 开荒模式移动至出击设置
- 增加开荒模式自动启用, 无脑开就完事了
- 将透视识别参数放到了config里, 这样就可以用地图config覆盖了
- 适配小地图模式, 参数抄A1就行了
- 修复了章节名OCR的识别位置
- 修复了开荒会把BOSS当作精英打问题
- 增加战斗中的剧情跳过
- 注释掉了截图和点击的retry
- 增加了捕捉目标点超出移动范围
 2020-04-24 15:26:11 +08:00
LmeSzinc
b4054b579e Add: 增加行走步长设置 
- 修复跨天重启重置队伍的问题
- 修复碰磁BOSS战斗结束卡住的问题
 2020-04-23 01:58:35 +08:00
LmeSzinc
468537d615 Add: 支持在更少的地图信息下运行, 开启POOR_MAP_DATA即可 
这是为未来的活动图准备的, 毕竟不可能一直手动填写地图信息.
现在仍需要填写海陆位置信息(识别这个还有点难度),
敌人刷新点, 每战刷新信息, 可以不用填写了
- 问号将被视为可以通过
- 增加了暴力找路障的功能
- 修复了拣问号被堵住的问题
- 地图7-1太小了, 识别有问题
 2020-04-21 23:21:48 +08:00
LmeSzinc
580a36375c Add: 增加主线图开荒功能, 支持打三星, 打到绿海 2020-04-19 00:49:33 +08:00
LmeSzinc
69b868a79e Fix: 修复一些bug 
- 修复了收完菜后不重新检查潜艇的问题
- 修复了使用潜艇时, 经验结算卡住的问题
- 调整了日常委托和教材类委托的权重, 不然一天下来, 日常委托做不完
 2020-04-16 22:01:52 +08:00
LmeSzinc
49ddd8d85f Add: 增加了出错时保存log和截图的功能 
- 更改了Log的目录名称
 2020-04-16 14:05:37 +08:00
LmeSzinc
8ce405f28a Add: 适配第三章 
- 增加处理踩问号是会刷物资船的情况
- 增加对物资船的缺失预测
- 收完菜后出击, 会重新检查舰队
  因为离开出击界面后, 出击舰队会重置为游戏默认的
- 修复了部分偏红的过场图, 会被认作索敌的问题
 2020-04-15 15:14:35 +08:00
LmeSzinc
91e83271a4 Add: 增加了使用一键退役的支持 
- 增加了根据设置选择切换函数的装饰器
- 增加了ADB截图和点击的设置, 默认使用ADB截图, uiautomator2点击
- 更新了assets.py文件, 上次commit忘记了
 2020-04-14 12:26:57 +08:00
LmeSzinc
964c2b3e56 Add: 增加战斗模式选择, 自律, 手操, 中路站桩 
- 修复了透视识别错误保存选项无效的问题
 2020-04-11 21:12:54 +08:00
LmeSzinc
be00742c3c Add: 适配第一章, 修复大量bug 
- 修复处理夜间委托时, 出现递归调用的问题
- 增加红脸出击确认的功能
- 增加了透视识别错误图片保存的开关
- 修复了地图太小时, 透视识别报错的问题
- 修复了相机位于地图外时, 透视识别出错的问题
- 修复了离开退役时, 会连击的问题
- 修复了同时出现低心情和船坞已满弹窗时, 卡住的问题
- 更新了一键退役实装后的安全点击的位置
- 修复了换装滑动失败时, 卡住的问题
- 修复了关闭自动收获后, 出现委托完成的提示是, 进图卡住的问题
- 修复了, 无正在跑的委托时, 报错的问题
 2020-04-11 15:26:42 +08:00
LmeSzinc
f1c2d182db Fix: 修复使用ADB时, 疯狂弹窗口的问题 
- 中止运行时仍然会弹窗, 是gooey的锅
- 修正了拼写错误
 2020-04-10 19:11:33 +08:00
LmeSzinc
ae94260ff8 Add: 支持App控制, 支持自动登录 
- 修复了12-4地图信息的错误
 2020-04-10 14:18:10 +08:00
LmeSzinc
95d84d11ac Add: 增加周回模式开关, 增加阵容锁定开关 
- 增加了开关控制的函数
 2020-04-09 21:22:01 +08:00
LmeSzinc
d2c84878f4 Add: 增加多开支持 
- 复制一份alas.pyw就可以多开了
- 修复了找不到./log目录的问题
- 增加了报错信息打印至log
 2020-04-08 00:50:39 +08:00
LmeSzinc
b6bc70e1c6 Add: 增加了血量平衡和低血量撤退的功能 
- 修改了年久失修的血量平衡模块
- 修改了拖拽操作
- 修复了12-4练级时, boss刷新后卡住的问题
- 修复了频繁报enemy searching timeout的问题
 2020-04-07 22:08:06 +08:00
LmeSzinc
7523847fac Add: 增加了挂委托的功能 2020-04-06 19:01:22 +08:00
LmeSzinc
c2f74dda79 Add: 增加了收菜模块的设置 
- 增加了出击后定时回港收菜的功能
- 支持收食堂, 小卖部, 任务, 委托, 科研, 未支持委托派遣, 挂科研, 学技能
- 合并了收菜模块的文件
- 修正了收菜模块资源名称的拼写错误
 2020-04-01 22:40:21 +08:00
LmeSzinc
fc0e075422 Fix: 修复停止条件: 如果船坞已满无效的问题 
(其实是没写)
 2020-04-01 12:55:17 +08:00
LmeSzinc
95e67ae61b Add: 增加7-2拣垃圾踩A3的开关, 独立出模拟器设置 2020-04-01 02:53:28 +08:00
LmeSzinc
a42aa00864 Add: 适配了活动微层混合D3 
- 修改了GUI的活动图入口
- 修正了UI_MASK文件
- 修改舰队识别, boss识别方式为模板匹配
- 修改当前舰队识别的色相阈值
- 增加了对boss右下角小图标的识别
- 修改了错误格子的修正方法, 若当列格子数量不足, 将被剔除
- 修复了退役后不会快速重新进入战斗的问题
 2020-03-31 14:23:44 +08:00
LmeSzinc
8366d7a258 Add: 活动AB图每日三倍基本稳定 
- 调整了微层混合透视识别的参数
- 增加了在hsv色彩空间下的识别方法
- 增加了对地面闪烁红框的识别
- 增加了已打精英的计数
- 修改精英识别, boss识别, 舰队识别方法为hsv颜色计数
- 修复了自动生成camera_data的报错
 2020-03-31 14:23:44 +08:00
LmeSzinc
ce4887a4f5 Initial commit 2020-03-29 01:41:34 +08:00