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
9,224 Commits 9 Branches 0 Tags 274 MiB
dev
Commit Graph

592 Commits

Author SHA1 Message Date
nEEtdo0d
cca678903a Fix: resolve merge conflicts 2022-02-13 14:41:30 -05:00
LmeSzinc
9266f3b3fc Add: Receive META rewards (#863) 2022-02-12 23:05:23 +08:00
LmeSzinc
afa9bf1686 Add: Event PT and time limit configs 
- Opt: Generate validate info
 2022-02-11 22:26:37 +08:00
nEEtdo0d
afa0810d03 Add: config Meowfficer_EnhanceIndex 2022-02-06 19:51:06 -05:00
LmeSzinc
95d4da328b Add: Image de-dithering 2022-02-05 17:10:37 +08:00
LmeSzinc
91ff16c8f6 Dep: Add templates for deploy.yaml 2022-02-03 23:46:48 +08:00
LmeSzinc
7b0981fd48 Add: Screenshot interval in non-combat to help reduce CPU 2022-02-02 00:46:06 +08:00
LmeSzinc
b54b2fe036 Merge branch 'master' into dev 2022-01-28 21:32:35 +08:00
LmeSzinc
6d8bd73930
Merge pull request #904 from julystone/warArchives 
Add: Add WarArchives Empyreal Tragicomedy
 2022-01-28 00:20:28 +08:00
LmeSzinc
9e43da559e Merge branch 'master' into dev 2022-01-27 20:51:20 +08:00
LmeSzinc
7856c5eba5 Add: Joint Battle Mystery Investigation (raid_20220127) 2022-01-27 20:49:46 +08:00
LmeSzinc
a758f24b70 Add: OpSi drop record 2022-01-27 17:09:46 +08:00
LmeSzinc
e95a145653 Add: Hermit, another control method 
- Add: Dump hierarchy via ADB and uiautomator2
- Fix: Device screenshot saving
 2022-01-27 16:57:25 +08:00
julystone
88fad11161 Add: Add WarArchives Empyreal Tragicomedy 2022-01-25 11:36:30 +08:00
nEEtdo0d
433391bf3b
Merge pull request #891 from nEEtdo0d/shop_revamp_clean 
Opt: shop revamp final; shift to generic alias, no longer passing in unique strings across funcs; redirect shop filter config from old to new format
 2022-01-23 10:41:39 -05:00
nEEtdo0d
ea0ffd89e2 Fix: apply PR/DR format change to generated config defaults 2022-01-20 07:49:32 -05:00
lonelyzerg
8f060b8484 Add: Use tuning samples option in OpsiDaily 2022-01-20 02:49:45 -06:00
LmeSzinc
897d179bbd Add: Maritime escort 2022-01-15 22:17:34 +08:00
LmeSzinc
4af820841d Add: Accept port missions in overview 
- Split OpsiDaily into OpsiDaily and OpsiShop
- Add config redirection
 2022-01-13 18:42:05 +08:00
LmeSzinc
0ccdede490 Merge branch 'master' into dev 2022-01-10 00:26:18 +08:00
LmeSzinc
57c062f542 Opt: Lower NewOperationMaxDate to 15 2022-01-10 00:14:30 +08:00
LmeSzinc
1730b9f395 Add: Configs to call submarine only at BOSS (#864) 2022-01-09 21:06:46 +08:00
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
94c7363bde Opt: Change research consumption True/False to Always Use/Only 0.5 Hour Researches/Don't Use 2022-01-02 20:36:38 +08:00
nEEtdo0d
19c5730fc8 Fix: missing config generator output #850 2021-12-31 23:32:40 -05:00
SaigyoujiYukon
ffd2ed1e25 Add Game Manager (WIP), currently only force close and restart games are implemented. 2021-12-14 21:38:05 +08:00
SaigyoujiYukon
73b7748a07 Fix Guild scheduler time 2021-12-13 13:07:12 +08:00
LmeSzinc
f5584c21fe
Merge pull request #808 from yanyihui/yyh_branch 
EnemyPriority
 2021-12-10 20:09:59 +08:00
LmeSzinc
45097dd408 Opt: Move ash beacon to a standalone setting group 2021-12-09 18:13:34 +08:00
YYH
e250a5b629 yyh_branch 2021-12-08 22:42:35 +08:00
LmeSzinc
6e0bded8c4 Add: OpSi fleet filter 
- Fix: Showing disabled tasks in scheduler
- Fix: Fleet lock not detected in OpSi
- Fix: Filter presets are case sensitive
- Opt: Increase confirm timer in question_goto()
 2021-12-08 21:47:09 +08:00
LmeSzinc
29d963a2c0 Add: GUI settings of OpSi abyssal and stronghold 
- Opt: Expose EnsureAshCollect
 2021-12-07 23:14:19 +08:00
LmeSzinc
a8e4142cdf Opt: Split Reward menu because there are too many tasks in it 2021-12-03 18:25:39 +08:00
LmeSzinc
ff7c875f3f Add: Collect battle pass rewards 2021-12-03 17:32:10 +08:00
LmeSzinc
15a9d76fbb Merge branch 'master' into dev 2021-11-30 00:09:01 +08:00
LmeSzinc
ae2402aca2 Fix: Coastal Defense Patrol is 2:40 not 3:00, misled by CN wiki 2021-11-30 00:07:37 +08:00
LmeSzinc
e0bcea0428
Merge pull request #772 from nEEtdo0d/tactical_exp_fix 
Fix: Refactor RewardTacticalClass
 2021-11-29 23:36:18 +08:00
LmeSzinc
e8de1bcefb Merge branch 'master' into dev 2021-11-28 19:43:46 +08:00
LmeSzinc
a54a6ecc20 Add: Buy equip skin boxes in general shop 2021-11-28 19:28:21 +08:00
LmeSzinc
c0b410ec27 Add: Staring new guild missions and operations, not tested 
- Improve log appearance in guild moudule
 2021-11-27 16:52:25 +08:00
LmeSzinc
9d3917677e Add: Buy free weekly supplies pack 2021-11-27 15:23:13 +08:00
nEEtdo0d
160ec805b9 Add: setting group ControlExpOverflow to allow tactical EXP waste in trade for efficiency/minimal time usage 2021-11-25 20:39:00 -05:00
julystone
ebdcae9ed6 Add: WarArchives add Crimson Echoes 2021-11-19 14:40:30 +08:00
LmeSzinc
a6571c6d79 Refactor: Stop condition, reach level 2021-11-14 21:47:01 +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
1a1eceec41 Fix: Trying to select submarine auto search mode when not using submarines 
- Del: Remove Submarine_AutoSearchMode in stages without auto search
 2021-11-11 21:19:57 +08:00
LmeSzinc
ec03b8170d Upd: Optimized research 4 filter 2021-11-10 02:28:41 +08:00
julystone
bdf091ada3 Add:reward_weekly_mission 2021-11-09 23:35:20 +08:00
lonelyzerg
5b444b73a6 Add Submarine Auto Search Selection 2021-11-06 06:35:13 -05:00
julystone
3c78fec67e ADD：campaign_cd for different fleet prepare 2021-11-02 14:45:14 +08:00
julystone
7a2cf53a7a Add:os_explore support SpecialRadar option 2021-11-01 23:22:55 +08:00
julystone
0dae3054ae ADD：os_explore support VoyageRecorder option 2021-11-01 16:03:22 +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
LmeSzinc
0742c966f0
Merge pull request #681 from julystone/app 
ADD：os_meowfficer_farming add specificSea Explore
 2021-10-28 14:08:43 +08:00
LmeSzinc
9ec466a216 Fix: WarArchive.Campaign.Event has an initial value of campaign_main 2021-10-28 02:27:07 +08:00
julystone
0180cf2e57
Merge branch 'LmeSzinc:app' into app 2021-10-27 09:13:33 +08:00
julystone
a2edb3c133 Add:meowOffice add targetZone explore 2021-10-27 00:09:16 +08:00
LmeSzinc
649aa491c9 Add: [CN] AzurLaneUncensored support 2021-10-26 23:09:21 +08:00
julystone
fff3f59caf ADD：os_meowfficer_farming add specificSea Explore 2021-10-26 17:46:04 +08:00
LmeSzinc
dd7b389797 Add: Semi-auto, Opsi semi-auto and benchmark 
- Add: dependency prettytable
- Fix: Running an Alas module directly
- Del: Remove all assets in daemon module, because it's redundant
 2021-10-25 18:49:56 +08:00
LmeSzinc
10fc4a7ba8 Upd: Default research and commission filter 
- Allow both hakuryu and hakuryuu in research
 2021-10-25 17:48:01 +08:00
LmeSzinc
44be2b05ba Fix: Fleet switching in 7-2 mystery farming 2021-10-23 17:38:06 +08:00
LmeSzinc
aac1ad32a7 Upd: Config update 2021-10-23 14:52:08 +08:00
LmeSzinc
6bf5f9fa92 Add: TaskHoardingDuration and CloseGameDuringWait (#643) 2021-10-18 21:36:22 +08: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
4143f26145 Add: Stage Increase for exploring stages one by one (#192) 2021-10-16 19:10:45 +08:00
nEEtdo0d
ee7456023e Add: new Reward task DataKey 2021-10-15 18:29:28 -04:00
LmeSzinc
285c8d8ccc Fix: PRBP in medal shop filter (#640) 2021-10-10 22:12:54 +08:00
LmeSzinc
f87f9ec8f9 Upd: [CN] Arguments translation 
- Remove campaign_main from event list
- Fix guild shop filter PR3
 2021-10-07 03:02:42 +08:00
LmeSzinc
81d111fec6 Del: Remove old GUI using gooey 2021-10-04 01:41:35 +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
0ad1daf412 Merge branch 'master' into app 
# Conflicts:
#	module/config/config.py
#	module/reward/reward.py
 2021-10-02 18:06:22 +08:00
LmeSzinc
46e37ecb9b Fix: Add T4 books detection 
- Fix: Error in getting tactical remains when there is only one running
- Opt: Update argument value if it's an empty string
 2021-10-02 18:05:27 +08:00
LmeSzinc
86615ede92 Add: Auto updates to the latest event 
- Opt: Non-ascii characters in json
- Fix: Template.json override
 2021-10-02 17:38:25 +08:00
nEEtdo0d
14532568ab Add: EXP reward receive 2021-10-01 23:25:56 -04:00
LmeSzinc
38f55a3a26 Merge branch 'master' into app 
# Conflicts:
#	module/config/config.py
#	module/reward/reward.py
 2021-09-30 21:26:25 +08:00
LmeSzinc
8780477758 Add: Collecting EXP reward 
- Opt: Increase reward interval to 60-120
- Fix: Default medal shop filter in buying BPs
 2021-09-30 17:12:34 +08:00
LmeSzinc
2627da413d Refactor: Rest of the farming tasks 
- Load server from config
 2021-09-28 00:47:49 +08:00
nEEtdo0d
9337980daa Add: gacha reward module, config members and translation 2021-09-26 21:37:04 -04:00
LmeSzinc
cb5db9d458 Fix: OS explore scheduling 
- Add config.multi_set
- Fix exercise server update
 2021-09-26 18:47:00 +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
ea111e1f35 Fix: Missing sos configs 
- Re-add AzurStatsID
 2021-09-26 01:06:19 +08:00
LmeSzinc
3483ea2041 Refactor: Config generating 2021-09-26 00:04:11 +08:00
LmeSzinc
7565de171c Opt: Remove all s from item name to avoid typo and mis-understandings 2021-09-25 12:17:00 +08:00
LmeSzinc
2c58be0c21 Refactor: 7-2 mystery farming 2021-09-25 12:14:33 +08:00
LmeSzinc
495242cbc2 Refactor: Ash beacon assist 2021-09-25 00:38:53 +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
14bde1bb06 Refactor: Shipyard module, but not tested 2021-09-24 14:57:08 +08:00
LmeSzinc
60f7a64066 Refactor: Shop module 2021-09-24 13:40:43 +08:00
LmeSzinc
69682aad46 Opt: Position of meowfficer module in config 2021-09-23 20:08:44 +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
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
47ceb732c7 Opt: Not loading and saving argument database anymore 
Because time consumption is significantly increased
- Add: Force update template.yaml
- Opt: Choose daily commission before boxes to prevent dailies unfinished after a full day of run
- Opt: Improve multiline test in yaml
 2021-09-20 12:29:53 +08:00
LmeSzinc
f71a151678 Merge branch 'master' into app 
# Conflicts:
#	module/campaign/gems_farming.py
#	module/config/config.py
 2021-09-19 23:34:30 +08:00
nEEtdo0d
7e41560cfa Add: [EN, JP] War Archives daily option 
TODO: [CN, TW] update argparser for language
 2021-09-18 13:16:54 -04: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
266db577be Add tactical class 2021-09-14 17:09:41 +08:00
LmeSzinc
850dc1d06a Opt: Split args_db by languages 2021-09-14 15:14:53 +08:00
LmeSzinc
071eec530a Move commission to a new module, also faster 2021-09-14 14:56:28 +08:00
LmeSzinc
36e396367e Drop record save and upload 2021-09-14 14:56:15 +08:00
LmeSzinc
2210ec23e8 Research get duration remain 2021-09-14 14:53:13 +08:00
LmeSzinc
a0d823bcd0 Rename configs in device, and research 2021-09-14 14:43:14 +08:00
LmeSzinc
a067af68da Shell server 2021-09-08 12:50:10 +08:00
HayateImmelmann
f0fcacca56 Optimize sos module code 2021-08-28 23:27:15 +08:00
HayateImmelmann
93298c6eb6 updata sos module 2021-08-27 22:55:28 +08:00
LmeSzinc
2777f00584 Add: Obscure finish in OS fully auto 2021-08-22 00:16:40 +08:00
Cyunmi
c83316da5d detele if_reach_lv32 in template.ini 2021-08-14 20:27:07 +08:00
Cyunmi
0c5b747f37 add cn gui 2021-08-14 04:05:31 +08:00
Cyunmi
168942008f delete unuse assert 2021-08-14 02:36:37 +08:00
Cyunmi
298175fe61 add config gems_low_emotion_withdraw 2021-08-14 01:18:15 +08:00
Cyunmi
49cafc64c1 add optional to equipment change 2021-08-13 02:55:51 +08:00
Cyunmi
21420d7645 Transform GEMS_AUTO_SEARCH_FARMING 
to ENABLE_AUTO_SEARCH
 2021-08-13 01:01:35 +08:00
Cyunmi
a0c6028b16 fix retirement rename bug 2021-08-12 21:05:46 +08:00
Cyunmi
e61a7b618a finally, it run 2021-08-12 06:14:24 +08:00
nEEtdo0d
9970eb7818 Upd: shipyard module convert to Navbar for selection, update config interface base parameters 
Fix: Resolve merge conflict
 2021-08-07 10:52:44 -04:00
nEEtdo0d
6101af90a9 Upd: convert to Navbar for selection of target ship, increment base shipyard_index to adapt to new index range 2021-08-07 09:43:08 -04:00
nEEtdo0d
dc8a2862e3 Fix: module shop missing dict items, module build assets, and etc. 
Add: module shipyard support for daily buy of discounted bps; interface, config, integrate into reward, and etc.

Fix: Resolve merge conflict
 2021-07-31 23:28:40 -04:00
nEEtdo0d
7ef32b794a Add: [EN] gui interface for module shipyard, shipyard handling into module reward 
TODO: [CN, JP, TW] update gui interface for server
 2021-07-31 22:42:08 -04: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
2685f3ab07
Merge branch 'dev' into comf_fort 2021-07-24 17:28:15 +08:00
nEEtdo0d
e416b92f7a Fix: Resolve merge conflict ui/assets.py 2021-07-23 10:21:26 -04:00
nEEtdo0d
5bd518cbc1 Merge remote-tracking branch 'origin/master' into comf_fort 2021-07-23 10:19:27 -04:00
LmeSzinc
ecf1a7bdf9 Fix: Daily commissions in The Idol Master Event, according to DOA Event 2021-07-23 16:34:51 +08:00
nEEtdo0d
50e5ec32a6 Fix: Default value for do_fort_chores_meowfficer 2021-07-18 19:52:27 -04:00
nEEtdo0d
1a4ef49967 Add: shop module integration to ALAS 2021-07-10 23:15:35 -04:00
LmeSzinc
5931c01a49 Merge branch 'master' into gems_farming 2021-07-10 15:47:33 +08:00
LmeSzinc
c0b06ccc1d Add: Drop screenshots upload to AzurStats 2021-07-10 15:15:20 +08:00
LmeSzinc
b3f70b3cb6 Add: Gems farming config 2021-07-10 10:49:09 +08:00
nEEtdo0d
0a3224ae5e Fix: Minimized HP threshold configuration to 1 setting 2021-05-19 21:39:23 -04:00
nEEtdo0d
057911a2ee Add: [EN] Add HP check and repair support for os_fully_auto module 2021-05-14 21:57:49 -04:00
nEEtdo0d
4d1f31f4ba Add: Capability for Config decorator to replace func pointer based on options 
Add: [EN] HP check within OS map after zone clear for os_world_clear module
Retreat for repair if any one ship below configured threshold
 2021-05-14 21:15:57 -04:00
nEEtdo0d
43ee1f35fe Add: [EN] Support for OS world clearing 2021-05-14 16:19:55 -04:00
LmeSzinc
109876ff97 Add: OS daily support 2021-04-23 15:01:50 +08:00
LmeSzinc
40578204b5 Add: OS full auto and add it to GUI 2021-04-17 22:05:36 +08:00
LmeSzinc
9523b3eff8 Add: Option to enable or disable daily skip 2021-04-16 17:46:32 +08:00
LmeSzinc
55e43f7a01 Add: Support daily skip on submarine daily 2021-04-16 11:21:11 +08:00
LmeSzinc
cf0fcc9032
Merge pull request #397 from nEEtdo0d/guild_reward 
Add: Config for Operations Join
 2021-04-03 13:36:08 +08:00
nEEtdo0d
aab0150f30 Upd: Default to 1 for normal behavior, join whenever available, other server assets 2021-04-02 21:00:54 -04:00
nEEtdo0d
080d7c84a1 Add: Optional restriction before joining guild operations to maximize reward and participation 2021-04-02 20:53:53 -04:00
nEEtdo0d
607e8b1260 Opt: Emotion refactor for enable 2x book configuration 2021-03-26 20:31:44 -04:00
whoamikyo
95c1008e5a Added: added toast notifications support to windows 10 2021-02-11 06:24:16 -03:00
LmeSzinc
d521cd051a Add: enable_os_ash_attack to GUI 2021-01-31 18:28:54 +08:00
LmeSzinc
711fcf76a5 Add: Add os_clear_map to GUI 2021-01-26 17:40:14 +08: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
LmeSzinc
c2f23ab5fd Del: Delete spare fleet 
- Fix: [JP] guild boss setting in GUI
 2021-01-22 17:02:35 +08:00
LmeSzinc
281419b5f7 Opt: Guild reward class 
- Opt: rename logistics_exchange in reward record to logistics
- Del: Delete handlers for entering guild reward from popups
- Del: Delete guild_run, because logistics.py already contains a function to run without configs
- Fix: Ensure that Detect GUILD_RED_DOT in page_main
 2021-01-19 00:20:08 +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
29e17b60fd Add: Configuration option auto recommend for guild raid boss 
Opt: Guild raid boss dispatch check moved outside for new configuration
 2021-01-09 21:47:21 -05:00
nEEtdo0d
552147cd52 Opt: Limit guild exchange and guild raid boss to once a day 
Limit guild operations scanning to 4 times a day i.e. 6 hour intervals
Guild interval limited to primarily lobby and simple logistics checks
 2021-01-09 21:02:39 -05:00
nEEtdo0d
f336f19957 Add: Configuration for auto-battle guild raid boss 
Opt: while definition alterations for less clicks
 2021-01-06 15:26:10 -05:00
nEEtdo0d
6405e2563f Opt: Revamped less OCR dependency, use ItemGrid and stats_basic assets 
to scan for exchangable items

Fix: Rename assets, variables, and etc.
 2020-12-30 19:00:58 -05:00
nEEtdo0d
5f78d71e0d Add: Allow specification of resources and parts via configuration 
Add: Interval configuration for guild
 2020-12-29 19:05:51 -05:00
nEEtdo0d
fbbcff37a0 Add: [EN] Add Reward loop check for page Guild, only Logistics is supported 
TODO: [CN, TW, JP] Add equivalent argparser updates
 2020-12-29 01:19:21 -05: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
nEEtdo0d
a1d8fcea99 Opt: New category type '?' allows ALAS to choose random, configurable ship count check 2020-12-15 23:45:11 -05:00
nEEtdo0d
caeb5d8c50 Opt: Buy tab to Meowfficer tab as there are two options now 
Add: configurations to enable collect/train meowofficer, disabled by default

TODO: CN, TW, JP will need to update asset equivalents for their server
 2020-12-06 12:25:45 -05:00
LmeSzinc
b0a7f5863c Fix: Handle DOA collabration daily commission 2020-11-26 16:41:22 +08:00
nEEtdo0d
b5ad6f75a3 Merge remote-tracking branch 'origin/master' into war_archives 2020-11-16 10:24:18 -05:00
LmeSzinc
e20d5e1013 Del: Delete retire_sr and retire_ssr in GUI 
Because people complain alas has retired bulin
- Opt: add notification that when not having enough enhance material, will use one click retire
 2020-11-16 15:30:06 +08:00
nEEtdo0d
2de69c287a Add: All EN supported war archives campaigns 
TODO: CN/JP has some exclusive maps, update search logic for entrance if so
 2020-11-13 00:18:41 -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
nEEtdo0d
0b7cd86014 Opt: convert data key from daily to reward, use DigitCounter instead 
TODO: CN, JP, TW update respective argparser and DATA_KEY_COLLECTED image
 2020-11-04 10:22:57 -05:00
nEEtdo0d
f4acb8c960 Add: added daily data key collect 
- CN, JP, TW need to replace DATA_KEY_COLLECTED, can optionally replace DATA_KEY_COLLECT
 2020-10-31 22:04:00 -04:00
LmeSzinc
9c754975ee Add: SOS in gui 2020-10-24 22:50:55 +08:00
nEEtdo0d
9f39f7403e Fix: Dorm reward re-implemented as requested by LmeSzinc 2020-10-08 23:10:52 -04:00
nEEtdo0d
fa102d79e3 Update: Adjust Dorm Reward to default collect, feed configurable. Renamed dorm_interval to feed_interval for feed record, added collect_interval for collect_record 
Update: Enhance limit to 4 ship checks per category, no restart ship check number in-between method calls. Reduce trapped check handling limit from 6 to 4. Ternary for end_activate_timer based on DEVICE_CONTROL_METHOD

TODO: Adjust CN dictionary.py and argparser.py based on Dorm Reward update
 2020-10-08 23:10:51 -04: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
4ed1a79f1e Add: Dorm reward 
- Dorm reward use minitouch, ignores control method settings
- Merge oil reward and mission reward into "General"
 2020-09-27 17:28:00 +08:00
nEEtdo0d
0febfdd0f3 CN, EN, JP: Add support for Chapter T and HT (includes executing T along with HT missions just like ABCD) Daily for Dreamwaker's Butterfly. Made as new options rather than merge otherwise config load errors for first time users. Maybe merge later down the line. 2020-09-19 20:48:15 -04: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
RuaBQ
7463320087 finsih box detect 2020-09-16 05:37:41 +08:00
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
e5795d07ad Fix: Default drop_screenshot_folder (#161) 2020-08-15 16:08:23 +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
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
86f82481d4 enhancement re-work bulk commit, working assets! 2020-08-04 16:33:32 -04: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
39bfababdf Fix: Revert template.ini 2020-07-20 21:23:26 +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
whoamikyo
e16c9c8c7d Fix: fix daily locked due low commander level 
- Commanders below level 60 do not have access to all dailys, this causes ALAS to stuck, this problem has been fixed, if the commander does not have access to the dailys, ALAS will ignore and try the next daily.
- Changed index_1, index_2, index_3 for easier to understand terms, the old terms were kept so as not to cause a problem at startup.
 2020-07-19 19:19:46 -03:00
Erik
c9326db227
Fix: Config in template.ini for chapter CD (#77) 
* Fix: Wrong daily executed count

* Opt: Stop swiping commission list if already reached bottom

* Fix: Config in template.ini for chapter CD

Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
 2020-07-19 02:37:00 -03: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
d656f6f1bf Fix: Event daily ab in A4 2020-07-18 16:10:45 +08:00
LmeSzinc
567c4a790a Add: Research to GUI 
- Opt: Faster page switch in reward
 2020-07-17 09:28:11 +08:00
LmeSzinc
cf719b212f Fix: Installation problems 
- Disable update check
- Add max retry attempt to screenshot
 2020-07-07 19:58:08 +08:00
LmeSzinc
22203ccb7b Add: Run daily as a part of reward, disabled by default 2020-06-29 00:07:06 +08:00
whoamikyo
75fd7aee0d Setting ADB as default device_screenshot_method 
- To avoid initial errors
 2020-06-25 07:20:37 -03: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
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
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
Erik
22bda2970f
Merge branch 'master' into nightly 2020-06-20 06:12:19 -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
LmeSzinc
6f566e6b36 Optimize: Disable all stop conditions by default, because too many people don't know the meanings 2020-06-19 05:30:10 +08: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
97b85160cd Add: aScreenCap support 
- Optimize adb command call
 2020-06-16 07:39:51 +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
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
9353ae1707 Optimize: Disable commission_time_limit by default 
- Faster ui click
 2020-06-03 04:36:05 +08:00
LmeSzinc
c6611f19dc Add: Enhance module 2020-06-01 08:20:13 +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
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
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
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
6a9e82d468 Optimize: 修改GUI每日任务设置的选项名称 2020-04-14 17:47:26 +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
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
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
ce4887a4f5 Initial commit 2020-03-29 01:41:34 +08:00