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,795 Commits 9 Branches 0 Tags 274 MiB
20fa3ff1e8
Commit Graph

154 Commits

Author SHA1 Message Date
LmeSzinc
1a7d74493d Fix: Story stages before A1 2023-08-23 12:46:05 +08:00
LmeSzinc
61aca93cfb Add: Stage increase in TSS maps 2023-07-26 19:57:14 +08:00
LmeSzinc
c13651130d Opt: Add fool-proof chapter converts 2023-07-20 23:45:42 +08:00
guoh064
ca5f565626
Add: Campaign_12_4_H (#2768) 
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
 2023-06-14 12:10:14 +08:00
LmeSzinc
e43116d3db Fix: Auto event convert should before stage covert 2023-05-27 21:37:29 +08:00
LmeSzinc
f9e9824c55 Fix: Stage entrance extraction in Confluence of Nothingness 2023-05-26 17:34:21 +08:00
Karl Whit
6a7c049f9c
Fix: Skip hard mode campaign_main when remaining number of times is 0 (#2568) 
Co-authored-by: yypsybs <yux@taizhitech.com>
 2023-05-11 23:35:00 +08:00
guoh064
929f6494e5
Fix: notify_handle AttributeError (#2438) 
* Fix #2436 : object call error
 2023-04-01 11:43:15 +08:00
guoh064
b2c58aa464
Add: Campaign finish notification via Onepush (#2431) 
Co-authored-by: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com>
 2023-03-31 20:57:16 +08:00
Bookbug
45373c52b8
Fix: TaskBalancer malfunctioning caused by ocr failure (#2295) 
* Fix: Cannot OCR coin when using auto search(#2289)

* Merge TaskBalancer into StopCondition

* Add: Avoid zero OCR in coin

* Restruct function due to operator precedence

* Merge bug_fix into coin_autocheck

* Fix: Dumb error caused by no parameter

* Fix: Minor bugs
 2023-03-03 22:19:07 +08:00
LmeSzinc
d191d16649 Opt: Re-organise CalculateEmotion and IgnoreLowEmotionWarn 2023-02-18 01:19:04 +08:00
LmeSzinc
61986a7f4c Refactor: Map names convert 2023-01-11 01:00:19 +08:00
LmeSzinc
38c694ad3b Fix: PT limit not working in GemsFarming 2023-01-09 21:08:57 +08:00
LmeSzinc
3e1a223dc5 Opt: Auto choose event or main chapters from GemsFarming 2023-01-05 21:27:35 +08:00
LmeSzinc
f309402062 Fix: Task balance is not working in loop stages (fixed #1920) 2022-11-29 21:18:11 +08:00
LmeSzinc
59183aeff1 Fix: Oil limit too low 2022-11-29 21:15:51 +08:00
LmeSzinc
1cb7ae25e6 Add: Loop stage support 2022-11-25 16:37:48 +08:00
LmeSzinc
803c3749aa Add: The Alchemist and the Archipelago of Secrets chapter TH 2022-11-25 01:58:05 +08:00
LmeSzinc
e0feea2366 Add: The Alchemist and the Archipelago of Secrets chapter T 2022-11-24 22:24:20 +08:00
LmeSzinc
5c70364353 Refactor: Abstract CampaignStatus class and fix task balancer in Raid 2022-10-30 14:49:04 +08:00
Bookbug
b26b6c97d1
Add: TaskBalancer (#1509) 
* CoinManagement added, but malfunction

* CoinManagement added, but malfunction

* CoinManagement:Translation complete

* CoinManagement:ready for testing

* CoinManagement:ready for testing

* CoinControl: Almost done, needs optimization/fix

* Add: CoinControl, done with full test.

* Add: TaskBalancer(experimental)

* Add: TaskBalancer(experimental)

* Remove legacy codes

* Upt: Reform codes(Experimental)

* Add:Task Balancer(Experimental)

* Add:Task Balancer(Experimental)

* Upt: config.py

* Fix: Default value of CheckInterval

* Upd: Minor translation adjustment

* Upd: Minor translation adjustment

* Upd: Revert the enable button and remove the CheckInterval

* Fix: minor translation

* Fix: additional trigger message caused by legacy code

* Add: User-defined delay interval

* Opt: Translation and default value of CoinLimit; Remove user-defined CheckInterval; Reform task sorting logic
 2022-08-24 23:44:49 +08:00
LmeSzinc
f3f6d19a1f Add: Event Operation Convergence (event_20220818_cn) 2022-08-18 23:51:30 +08:00
LmeSzinc
3f28d59e35 Fix: Remove spaces in stage name 2022-07-30 18:16:19 +08:00
LmeSzinc
206b546eb1 Opt: Auto convert chapter A/B/C/D to T/HT 2022-07-15 01:51:04 +08:00
LmeSzinc
3a38f803f6 Fix: Stage auto increase to SP4 but event doesn't have SP4 2022-06-20 02:17:58 +08:00
LmeSzinc
d683db6647 Fix: Close auto search menu if map achievement is set 2022-06-19 16:33:38 +08:00
LmeSzinc
a4bc79302d Fix: Cannot detect remain data key at auto search menu 2022-06-12 18:06:37 +08:00
LmeSzinc
ebd6872358 Fix: Convert stage name to string 2022-06-07 00:58:07 +08:00
LmeSzinc
f28d0c0c29 Fix: Clear click record on each battle and each campaign (fixed #447) 2022-06-05 08:35:21 +08:00
LmeSzinc
562365afe6 Opt: Lower the priority of task OpsiMeowfficerFarming 2022-05-02 16:32:04 +08:00
Egor Nats
6eac8ae259 Opt: Imports isorted 2022-04-14 16:37:54 -03:00
LmeSzinc
ea8a200fbc Opt: Faster stage detection 
Time cost reduced from 200ms to 40ms
 2022-04-06 19:29:46 +08:00
LmeSzinc
0190d4fbe1 Add: Virtual Tower (event_20220324_cn) 2022-03-24 19:20:02 +08:00
LmeSzinc
e5492da3eb Opt: Close auto search menu and retreat at campaign start to reduce user mistakes 2022-03-20 16:55:05 +08:00
LmeSzinc
dbfbd294ff Fix: Confirm unknown ui page; 5 seconds timeout (#956) 2022-03-07 22:18:10 +08:00
LmeSzinc
e47e613638 Add: Event PT and time limit 
- Fix: Auto update events in GemsFarming
 2022-02-11 22:52:36 +08:00
LmeSzinc
cd0204f455 Opt: Better tips when having wrong configs 2021-12-31 01:34:01 +08:00
LmeSzinc
e89d07da12 Add: Tower of Transcendence chapter BD 
- Fix: BATTLE_STATUS_B was clicked after EXP_INFO
- Fix: STORY_SKIP offset
- Fix: One-time stages in stage auto increase
 2021-12-30 17:46:30 +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
LmeSzinc
a6571c6d79 Refactor: Stop condition, reach level 2021-11-14 21:47:01 +08:00
LmeSzinc
f8d6848d84 Fix: Modified settings are still retained and written to file in the next update (#737) 2021-11-12 22:29:04 +08:00
LmeSzinc
a723740528 Add: The Flame-Touched Dagger (event_20211111_cn) 
- Fix: Force to use fleet2 when MAP_CLEAR_ALL_THIS_TIME is True
 2021-11-11 18:25:34 +08:00
LmeSzinc
4b7733c68e Fix: Campaign name is case sensitive 2021-10-27 17:33:30 +08:00
Cola
261b938aea Fix:check oil in auto search 2021-10-23 23:40:16 +08:00
LmeSzinc
f2791c3abb Fix: Calls commission if task disabled 2021-10-22 21:18:18 +08:00
LmeSzinc
a629981a84 Fix: Shortest commission filter 2021-09-28 22:35:13 +08:00
LmeSzinc
5b772facb8 Fix: Menu extraction 
- Delay task if reach oil limit
 2021-09-28 00:49:38 +08:00
LmeSzinc
3483ea2041 Refactor: Config generating 2021-09-26 00:04:11 +08:00
LmeSzinc
33d503465f Refactor: SOS module 
- Fix: Expected reduce when no fleet 2
 2021-09-24 21:51:44 +08:00
LmeSzinc
89bf271417 Refactor: Emotion module 
- Fix: Modifications of config will be overridden by the loading of yaml file during update
 2021-09-24 20:24:46 +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
abdfbb713a Refactor: Rename auto search configs 
- Refactor device/app configs
- Fix: Research finish detection
 2021-09-15 23:50:30 +08:00
LmeSzinc
3dc7f9d17d Add: Task switch 2021-09-15 23:32:58 +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
6d06346210 Add: Azur Anthem Event maps 
- Handle event animation after the 4th battle
- Add ensure_edge_insight configuration
 2021-07-23 18:26:24 +08:00
LmeSzinc
d6d56c79d6 Del: Remove GUILD_POPUP_TRIGGERED because AL can receive guild missions automatically now 2021-06-20 16:39:14 +08:00
whoamikyo
a0f84696e1 Opt: Few changes to match with new notifications system 2021-02-19 20:01:32 -03:00
whoamikyo
95c1008e5a Added: added toast notifications support to windows 10 2021-02-11 06:24:16 -03:00
LmeSzinc
26c484bd87 Fix: auto search in event daily AB 
- Add auto call submarine in auto search
 2021-01-28 14:11:06 +08:00
nEEtdo0d
eabede70e1 Fix: Merge latest and resolve conflict in module/campaign/run.py 2021-01-27 15:34:37 -05:00
LmeSzinc
f6fdb1e5ec Fix: Auto fallback to original mode if a map don't have auto search 
- Disable auto search in daily hard currently
- Handle auto search menu sometimes disappear
 2021-01-28 02:58:25 +08:00
nEEtdo0d
cc5972365d Opt: Add additional parameter to select ui_click calls during daily 
Transfer detection status to ensure reward_when_finished or
continuing campaign run will execute handle_guild
 2021-01-27 13:50:26 -05:00
LmeSzinc
5ac50e6910 Add: Support auto search 2021-01-28 00:35:15 +08:00
LmeSzinc
343b5b4613 Fix: Reset GUILD_POPUP_TRIGGERED in campaign object 2021-01-20 00:21:35 +08:00
LmeSzinc
b96f68289e Fix: GUILD_POPUP_TRIGGERED syncing in config 
- Opt: skip interval check if GUILD_POPUP_TRIGGERED
 2021-01-19 15:44:12 +08:00
LmeSzinc
1aacce72e8 Fix: _guild_triggered not working in non-continuous campaign 
- Opt: Comments in logistics_mission to avoid mis-understandings
 2021-01-19 03:38:43 +08:00
nEEtdo0d
bbd44d3d3c Add: If popup encountered, handle guild after campaign completed 2021-01-16 10:26:10 -05:00
LmeSzinc
5db3b5d57c Fix: Loop in reward if ENABLE_REWARD disabled and commission notice found (#260) 2020-12-15 16:22:28 +08:00
LmeSzinc
3399b64330 Fix: Skip reverting config in hard, if drop screenshot disabled 2020-12-04 22:37:18 +08:00
LmeSzinc
523f31f35e Fix: Wrong folder to save drop screenshot after running daily hard 2020-12-03 12:09:02 +08:00
LmeSzinc
94cb3a390a Fix: SP in Vacation Lane 
- Add: siren template in SP
 2020-11-27 00:28:50 +08:00
LmeSzinc
d37e9ba4b0 Opt: Code formatting 2020-11-21 11:14:43 +08:00
nEEtdo0d
e125bdaa65 Fix: Move war archive events where others are, adjust code as needed 2020-11-07 16:43:40 -05:00
noname94
aaf93ee11d Add: added ship level detection in combat 2020-10-05 21:45:08 +09:00
whoamikyo
20955d5ac8 Add: [EN] added Counterattack Within the Fjord event to EN server 
- added stop triggered if get a new ship
 2020-10-02 12:56:22 -03:00
LmeSzinc
62957d9830 Fix: Daily hard has no campaign_extract_name_image 
- Fix event switching with campaign ball
- Add MAP_IS_ONE_TIME_STAGE
- Opt description of event_stage in GUI
- Add info when map file not found
 2020-09-18 22:58:18 +08:00
LmeSzinc
d141f4763e Opt: Move CampaignOcr, CampaignUI to CampaignBase 
- Fix: Handle story after in map enemy searching
- Fix: stage ENTRANCE in event
- Fix: in_stage check in event
- Dev: map_extractor add STAR_REQUIRE_X, fix for tutorial maps
 2020-09-18 19:01:40 +08:00
LmeSzinc
3d50a3a418 Fix: Switch campaign mode in other functions except main chapter 2020-09-04 01:42:06 +08:00
LmeSzinc
f0e2767a7d Fix: Wrong drop screenshot save folder after research receive 2020-08-29 01:38:01 +08:00
whoamikyo
09d3f695de Revert "Revert "Merge branch 'dev' of https://github.com/LmeSzinc/AzurLaneAutoScript into dev"" 
This reverts commit ac9303012c.
 2020-08-18 20:48:14 -03:00
whoamikyo
ac9303012c Revert "Merge branch 'dev' of https://github.com/LmeSzinc/AzurLaneAutoScript into dev" 
This reverts commit bdc5aa0720, reversing
changes made to 6ee7a62edf.
 2020-08-18 20:47:27 -03:00
LmeSzinc
a5f611dce0 Opt: Reuse device instance 
because can't have multiple connection with minitouch
 2020-08-17 21:27:24 +08:00
LmeSzinc
0cc2fe2946 Fix: OCR in campaign, commission, daily, hard, fleet, raid, oil 
- Add Digit OCR
 2020-07-15 03:39:04 +08:00
LmeSzinc
03a78b835e Fix: Catch errors and show info 
- No attribute ui_current, if start from unsupported page
- ModuleNotFoundError, if map file not exists
- ModuleNotFoundError, if run daily_ab on SP map
 2020-06-23 00:26:05 +08:00
kyO The NinjA
ae88a57eba Fix: [EN] Fix Miss detect lines as characters in Commission module 2020-06-08 07:54:21 -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
2609b4a70d Add: Timezone aware 
- Fix mat withdraw on slow device
 2020-06-01 02:26:55 +08:00
LmeSzinc
c402d3e047 Fix: Folder create when --enable_drop_screenshot disabled 2020-05-29 17:08:43 +08:00
LmeSzinc
f32042fbd2 Fix: 修复调用错误心情对象的问题 2020-05-24 20:11:23 +08:00
LmeSzinc
9c77cdd058 Fix: 修复长时间运行时, 游戏内心情值计算bug导致的出错 
- 未开启红脸出击时, 会每隔两个半小时重启游戏
 2020-05-19 22:58:25 +08:00
LmeSzinc
6b56215d71 Fix: 修复地图特效导致的章节名识别错误和进图等待 
- 章节名识别错误时有20次重试的机会
- 进图时不再使用章节图标识别
- 更改了exception文件的位置
 2020-04-25 17:10:22 +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
b3698d7ae6 Add: 跨天运行时重启游戏 2020-04-20 18:37:10 +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
8ce405f28a Add: 适配第三章 
- 增加处理踩问号是会刷物资船的情况
- 增加对物资船的缺失预测
- 收完菜后出击, 会重新检查舰队
  因为离开出击界面后, 出击舰队会重置为游戏默认的
- 修复了部分偏红的过场图, 会被认作索敌的问题
 2020-04-15 15:14:35 +08:00
LmeSzinc
be00742c3c Add: 适配第一章, 修复大量bug 
- 修复处理夜间委托时, 出现递归调用的问题
- 增加红脸出击确认的功能
- 增加了透视识别错误图片保存的开关
- 修复了地图太小时, 透视识别报错的问题
- 修复了相机位于地图外时, 透视识别出错的问题
- 修复了离开退役时, 会连击的问题
- 修复了同时出现低心情和船坞已满弹窗时, 卡住的问题
- 更新了一键退役实装后的安全点击的位置
- 修复了换装滑动失败时, 卡住的问题
- 修复了关闭自动收获后, 出现委托完成的提示是, 进图卡住的问题
- 修复了, 无正在跑的委托时, 报错的问题
 2020-04-11 15:26:42 +08:00
LmeSzinc
012a4decbb Add: 更多收菜的触发条件 
- 在主线图时, 出现委托完成的红点, 会触发收菜
- 完成每日任务时, 会触发收菜
- 执行收菜设置时, 会触发收菜
 2020-04-10 15:19:02 +08:00