1
0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-09 18:39:04 +08:00
Commit Graph

567 Commits

Author SHA1 Message Date
8d5cbbd3cc Merge branch 'master' of LmeSzinc 2024-08-28 20:19:03 +08:00
8b52b94676 Fix: GemsFarming fleet_detail_check 2024-08-27 17:48:41 +08:00
98b732a1c5 Del: Event3 2024-08-16 08:51:07 +08:00
b1e80fbeb5 Merge branch 'master' of LmeSzinc 2024-07-26 06:54:28 +08:00
LmeSzinc
2454d2aa2c Opt: Use MaaTouch as default control method 2024-07-25 02:19:45 +08:00
d8f62e2884 Add: Option for GemFarming equipment change 2024-07-23 15:03:37 +08:00
5fbc779c3f Merge remote-tracking branch 'guoh064/gems_farming_gearcode' 2024-07-23 12:53:31 +08:00
9b86aa81f3 Merge branch 'master' of LmeSzinc 2024-07-19 00:46:09 +08:00
LmeSzinc
e66b2a84b0 Add: Claim mails in task freebies
- TODO: [JP][TW] Update mail assets
2024-07-18 22:48:40 +08:00
b119655c58 Merge branch 'master' of LmeSzinc 2024-07-12 03:15:15 +08:00
LmeSzinc
5ee7f9118e Add: Series 7 filter 2024-07-12 00:24:36 +08:00
5ffd84a61e Merge branch 'master' of LmeSzinc 2024-06-28 03:15:29 +08:00
LmeSzinc
a8f8432842 Add: [CN] Assets for coalition_20240627 2024-06-28 01:18:59 +08:00
938ba056e3 Merge branch 'master' of LmeSzinc 2024-06-27 17:51:35 +08:00
guoh064
aa2e985fe8 Feature: Gear code for GemsFarming 2024-06-26 19:32:28 +08:00
LmeSzinc
b9730d4cd2 Opt: Add default filter in OpsiShop 2024-06-23 18:09:19 +08:00
霞飛
62bc1ed7f7 ref: remove frequency config and not to judge coins at last day 2024-06-22 21:43:55 +08:00
霞飛
0b97b40c46
Feature: New OpsiShop. (#3086)
* feat: New OpsiShop

* fix: use AdaptiveScroll

* feat: scan counter

* perf: calculate y value
2024-06-17 11:24:40 +08:00
SevCrane
162ec3d14d AlasGG 2024-06-06 00:27:00 +08:00
SevCrane
abfbbe5064 merge alas 2024-06-05 23:57:58 +08:00
SevCrane
3cb29a9a37 Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2024-06-05 23:53:03 +08:00
SevCrane
5e482958f6 AlasGG 2024-06-05 23:20:28 +08:00
星ノ谷绫沫
2e1da397db
Upd: MAA Fight&Recruit (#3736)
* Upd: MAA Fight&Recruit

* Upd: MAA Fight&Recruit
2024-05-08 01:01:33 +08:00
Air111
c5073e5917
Upd: gui text (#3735) 2024-05-08 01:01:12 +08:00
星ノ谷绫沫
543154eb8b
Upd: MAA Roguelike (#3724)
* Fix: Wrong params in MAA infrast

* Upd: MAA Roguelike
2024-05-06 00:47:30 +08:00
星ノ谷绫沫
cf0b8d39c9
Upd: Support MAA v5.2.3-alpha.1.d011.g704145a3d (#3714)
undefined
2024-05-02 18:01:32 +08:00
ygrzxc
7d574dde8b
Add: Change the designated vanguard combination (#3520)
* Add: Change the designated vanguard combination

* Add: Change the designated vanguard combination

* Add: Change the designated vanguard combination

* Add: Change the designated vanguard combination

* Add: Change the designated vanguard combination

* Add: Change the designated vanguard combination

* Add: Translation for change the designated vanguard combination

* Add: Translation for change the designated vanguard combination

* Upd:Update dev's args.json

* Upd:Update dev's args.json

* Upd:Reduce template image size and Implement function

* Upd:Reduce template image size and Implement function

* Upd:Reduce template image size and Implement function

---------

Co-authored-by: y y <jaxvuav@163.com>
2024-04-08 22:49:30 +08:00
LmeSzinc
6987d60c96 Add: Alas.EmulatorInfo settings 2024-03-28 12:44:42 +08:00
LmeSzinc
ffb38e5d83 Add: Event entrance of Snowrealm Peregrination (event_20240229_cn) 2024-03-01 23:27:03 +08:00
RilyLC
c4e3c8966d
Upd:[TW]Event:Mirror Involution Rerun (#3449) 2024-01-25 21:32:31 +08:00
weeswelai
56fe530310 Add: Buy time-limited furniture in dorm. 2023-12-23 00:32:30 +08:00
Tipsy Fisher
c2551f5c8e
Merge branch 'LmeSzinc:master' into dev-minigame-for-pr 2023-09-15 01:07:00 +08:00
Ian Lee
5474628561
Upd:[TW] Event:Violet Tempest Blooming Lycoris (#3118) 2023-09-14 22:43:35 +08:00
yypsybs
fd9777940b Merge branch 'master' into dev-minigame-for-pr
# Conflicts:
#	module/ui/assets.py
2023-09-01 17:58:39 +08:00
guoh064
37e852aadc
Add: Crystal Fragment template/filter_string in Voucher Shop (#3068) 2023-09-01 00:46:05 +08:00
Tipsy Fisher
1e0f45e189
Merge branch 'LmeSzinc:master' into dev-minigame-for-pr 2023-08-07 09:32:50 +08:00
Ozhika
95c5df9636
Upd: [MAA] Support Sami roguelike settings (#2976)
* Upd: [MAA] Support Sami roguelike settings

* Upd: [MAA] Support Sami roguelike settings

---------

Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
2023-08-06 01:47:37 +08:00
Tipsy Fisher
6fca29e79c
Merge branch 'LmeSzinc:master' into dev-minigame-for-pr 2023-07-21 00:07:41 +08:00
SarContDeli
048268b406 Add: Consume spilled Coins 2023-07-18 23:20:50 +08:00
Tipsy Fisher
a962b13343
Merge branch 'LmeSzinc:master' into dev-minigame-for-pr 2023-07-14 10:59:13 +08:00
LmeSzinc
8ca8d81814 Add: PR6 gui settings 2023-07-13 22:59:12 +08:00
yypsybs
28cae91564 Opt: minigame
Opt: minigame multi language assets
Opt: minigame multi language i18n
Opt: minigame config
Fix: minigame-stuck when max ticket
2023-07-11 18:00:03 +08:00
yypsybs
c0b9045909 Add: minigame 2023-07-04 10:06:44 +08:00
霞飛
d73ec47031
feat: headless environment support (#2782)
* chore(linux): config template for Linux

* feat: Linux configuration template updater

* feat: headless requirements updater

* chore: Sorted by dictionary order

* chore: Remove useless dependencies.

* chore: remove cache operation.
2023-06-24 19:09:24 +08:00
LmeSzinc
44b0cad4bd
Merge pull request #2556 from hgjazhgj/fpy
Add: Submodule AlasFpyBridge (experimental)
2023-06-11 19:25:41 +08:00
hgjazhgj
c09b614040 Fix: add 'Fpy' prefix to all Fpy arguments and taskgroups if not exist
to display correct text in i18n
2023-06-10 06:45:52 +08:00
LmeSzinc
bfc020621e Del: Remove task SOS 2023-06-08 23:25:37 +08:00
Fisher Tipsy
ab0c8d0b85
Add: Allow auto attack dossier (#2579) 2023-06-08 22:28:44 +08:00
LmeSzinc
54e3675371
Merge pull request #2730 from LmeSzinc/dev
Bug fix
2023-06-08 16:55:11 +08:00
LmeSzinc
89511847b1 Del: Remove OneClickRetire.RetireAmount since amount can no longer be limited 2023-06-08 15:36:16 +08:00
LmeSzinc
82a9506214 Upd: [CN] Git mirrors 2023-06-04 18:14:28 +08:00
LmeSzinc
93b9bbc498 Upd: [CN] Git mirrors 2023-06-04 17:19:45 +08:00
LmeSzinc
90c6ddc8c7 Upd: [CN] Git mirrors 2023-06-04 17:15:43 +08:00
LmeSzinc
593698c526 Upd: [CN] Git mirrors 2023-06-04 02:44:24 +08:00
hgjazhgj
6e339a5364 Opt: realtime SpecialDrop count 2023-05-28 03:17:47 +08:00
hgjazhgj
f54c722031 Del: outdeted mining 2023-05-28 02:30:26 +08:00
hgjazhgj
b4af10b56b Opt: LaunchPath insted of CmdLine 2023-05-27 21:22:33 +08:00
hgjazhgj
742e34c8d0 Merge branch 'dev' into fpy 2023-05-27 19:12:05 +08:00
LmeSzinc
4f761b1e6f Upd: ALAS framework updates 2023-05-16 09:11:46 +08:00
hgjazhgj
8f9e48b8e5 Opt: 3 optimization listed below
+ validate Interval
+ config.multi_set to avoid frequent file write
+ merge BenchTouch and BenchScreen into once
2023-05-12 14:55:18 +08:00
hgjazhgj
0640732797 Opt: No raw command textarea in FpyBenchmark 2023-05-09 14:40:24 +08:00
hgjazhgj
59263237ab Add: TeamIndex 2023-05-07 09:17:14 +08:00
hgjazhgj
f6d52621fe Add: Submodule AlasFpyBridge (experimental) 2023-05-06 20:58:08 +08:00
guoh064
8746a0ada3
Opt: Only Delay 12 hours for Hazard1leveling (#2530) 2023-04-28 01:10:53 +08:00
LmeSzinc
391be3ce51 Gui: Move down CoalitionSp in event daily tasks 2023-04-28 00:52:38 +08:00
LmeSzinc
37f932688e Opt: Move down task Coalition since the event is over 2023-04-11 22:21:08 +08:00
LmeSzinc
f72ab22af8
Merge pull request #2423 from guoh064/dev
Opt: Clear exercise attempts after final recovery (#2184)
2023-04-11 21:51:12 +08:00
guoh064
d4724fbb99 Fix: Change Default ExersiceStrategy to aggressive 2023-04-10 08:22:25 +08:00
guoh064
814aa9a41c Opt: Refactor ExercisePreserve settings 2023-04-09 12:52:35 +08:00
guoh064
5d85535ba0 Opt: Config for exercise preserve 2023-04-05 11:31:50 +08:00
LmeSzinc
aeec13cd85 Upd: Set default language in CN deploy templates 2023-03-28 16:55:52 +08:00
LmeSzinc
80055dd3e8 Upd: [CN] Coding repo mirror 2023-03-28 16:43:21 +08:00
LmeSzinc
3ca2695464 Upd: [CN] Coding repo mirror 2023-03-28 16:30:50 +08:00
LmeSzinc
68c18d0cb5 Opt: Split Event group into Event and Event Daily 2023-03-23 23:42:42 +08:00
LmeSzinc
13bd97725a Add: Configs for task Coalition 2023-03-23 23:31:28 +08:00
LmeSzinc
89c36597b2 Add: Emergency module development daily 2023-03-17 00:34:02 +08:00
LmeSzinc
a290a742e4 Upd: Config update 2023-03-14 20:30:28 +08:00
SarContDeli
da5ab2fdb7 Opt: Adjust Blacklist of MaaMall 2023-03-09 12:39:11 +08:00
SarContDeli
cef3c87ed7 Add: Support of build-in infrast config (MAA) 2023-03-09 12:27:39 +08:00
LmeSzinc
d7c7a29cc7 Fix: FleetOrder in GemsFarming is default to fleet1_mob_fleet2_boss 2023-03-02 22:38:39 +08:00
LmeSzinc
af65f961e2 Refactor: Simplify GemsFarming settings 2023-03-01 00:12:15 +08:00
LmeSzinc
23aeeb1c58 Upd: Config generate 2023-02-28 00:38:28 +08:00
SarContDeli
9a3558bc17 Add: Roguelike support (MAA) 2023-02-22 20:23:26 +08:00
SarContDeli
40dce2d61a Add: Medicine Tactics (MAA) 2023-02-22 20:23:25 +08:00
LmeSzinc
5874e1214c Fix: Prevent repeated ShipYard runs 2023-02-21 21:43:35 +08:00
bookbug666
71f5917713 Merge branch 'bug_fix' of https://github.com/LmeSzinc/AzurLaneAutoScript into supply_pack 2023-02-21 21:34:46 +08:00
LmeSzinc
46fabf9851
Merge pull request #2258 from SaiCateDoan/hint
Opt: Adjust help message of CL1 leveling
2023-02-19 21:06:12 +08:00
LmeSzinc
2d98ef73f2 Add: Re-add RetireAmount 2023-02-19 21:04:29 +08:00
SarContDeli
d024f11bbb Opt: Adjust the option arrangement of the task 2023-02-19 20:56:13 +08:00
bookbug666
03b699b615 Add: Option to delay buying weekly supply pack 2023-02-19 00:13:53 +08:00
LmeSzinc
d191d16649 Opt: Re-organise CalculateEmotion and IgnoreLowEmotionWarn 2023-02-18 01:19:04 +08:00
LmeSzinc
b63cf43568 Opt: Re-organise retire settings 2023-02-18 00:48:40 +08:00
LmeSzinc
f5f093c67f Opt: Remove OpsiAshBeacon.AshAttack since it should always be True 2023-02-17 23:50:30 +08:00
LmeSzinc
3d174b19cb Opt: Auto-select the fastest screenshot method 2023-02-08 01:42:04 +08:00
SarContDeli
2f97a6c819
Add: Maa Reclamation Algorithm (#2210) 2023-02-04 16:47:55 +08:00
LmeSzinc
e2bdc3f059 Add: [MAA] Toggle for MaaFightWeekly (#2198) 2023-02-03 00:10:51 +08:00
LmeSzinc
518eb95c54 Add: Purchase DR blueprints in shipyard (#2149) 2023-01-30 17:34:09 +08:00
LmeSzinc
83e768f86c Opt: Remove HECombatPlan from OpsiVoucher default filter 2023-01-30 16:40:38 +08:00
LmeSzinc
1492625dba Opt: Not recommended to do major commissions 2023-01-28 18:21:24 +08:00
LmeSzinc
27ba7c1cfe Refactor: Benchmark settings based on test scenes 2023-01-25 17:07:57 +08:00
SarContDeli
62598a0b53 Add: SSSCopilot Support of MAA 2023-01-24 21:41:07 +08:00
LmeSzinc
b81a7849a2 Add: [MAA] Weekly stage fight scheduling (#2125) 2023-01-18 17:23:13 +08:00
LmeSzinc
c59de88938 Upd: Remove Hermit click test
It's useless now
2023-01-03 23:31:37 +08:00
LmeSzinc
5d7b70c9a4 Opt: Move setting OpsiMonthBoss.Mode to top 2022-12-28 18:31:11 +08:00
LmeSzinc
a820633129 Merge branch 'master' into dev 2022-12-28 18:24:53 +08:00
SarContDeli
1dc28e253d Add: Support of touch method for MAA 2022-12-27 17:48:33 +08:00
LmeSzinc
6552938e22 Merge branch 'master' into dev
# Conflicts:
#	module/config/argument/argument.yaml
2022-12-25 23:02:31 +08:00
LmeSzinc
de4b32f69e Opt: Set default screenshot method to ADB_nc 2022-12-24 17:48:32 +08:00
LmeSzinc
45cbcf56b9 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	module/config/argument/argument.yaml
2022-12-23 17:07:10 +08:00
YJGeng-Iriy
49b15eafd6
Merge branch 'master' into opsi_month_boss 2022-12-21 00:09:20 +08:00
LmeSzinc
f93473ee4d Add: Emulator data on GUI 2022-12-20 00:03:59 +08:00
YJGeng-Iriy
525ed082b3 optimize the code of opsi_month_boss 2022-12-17 17:10:35 +08:00
SarContDeli
2395a6055f Upd: Remove invalid visit task in latest MAA 2022-12-16 10:31:27 +08:00
YJGeng-Iriy
207ff9d586 Merge branch 'opsi_month_boss' of https://github.com/YJGeng-Iriy/AzurLaneAutoScript into opsi_month_boss 2022-12-13 21:39:42 +08:00
YJGeng-Iriy
9eab7f35b4 Monthly boss code optimization 2022-12-13 21:37:28 +08:00
YJGeng-Iriy
757fc88f7e
Merge branch 'master' into opsi_month_boss 2022-12-12 19:47:59 +08:00
LmeSzinc
b1881cc5b7 Add: [CN][TW] GUI translation for OpSi Archive Zones 2022-12-11 23:44:34 +08:00
YJGeng-Iriy
a361d8ad0d opsi month boss init 2022-12-11 20:59:16 +08:00
nEEtdo0d
72339a5093 Add: re-instate Opsi archive task, runs weekly as AL devs seemingly add new logger archives after a random scheduled maintenance 2022-12-10 20:26:28 -05:00
YJGeng-Iriy
726dc243c3 opsi_month_boss init 2022-12-10 23:57:09 +08:00
SarContDeli
c185da3f22 Add: Credit fight of MAA 2022-12-09 16:27:28 +08:00
SarContDeli
20896b68c3 Add: Multiple server support of MAA 2022-12-09 14:54:16 +08:00
LmeSzinc
82b412f773 Del: Remove OpsiHazard1Leveling.StrategicSearch
no need since it's always true
2022-12-05 22:41:47 +08:00
SarContDeli
2fff81ff0d
Opt: Reconstructed hazard 1 leveling (#1941) 2022-12-04 23:24:23 +08:00
LmeSzinc
af02d5e370
Merge pull request #1923 from nEEtdo0d/voucher_shop
Add: Support OS Voucher Shop
2022-12-03 16:42:05 +08:00
LmeSzinc
f577f21e8d
Merge pull request #1915 from SaiCateDoan/emu
Opt: Independent option to restart emulator daily
2022-12-02 00:10:13 +08:00
nEEtdo0d
1d433efc7b Fix: merge LmeSzinc/dev into branch, resolve conflicts 2022-12-01 10:52:40 -05:00
nEEtdo0d
c2d8fad6bb Del: Opsi archive zone monthly task support; currently not a monthly trend maybe will be in the future 2022-12-01 10:41:05 -05:00
SarContDeli
6a4d3b5da5 Opt: Independent option to restart emulator daily 2022-12-01 15:20:14 +08:00
SarContDeli
973981e145 Opt: Modify the default commission filter to cube 2022-12-01 10:56:56 +08:00
SarContDeli
677821960b Fix: Merge Conflict 2022-12-01 10:54:54 +08:00
SarContDeli
ec054446b0 Add: Diverse commission filter 2022-12-01 10:52:11 +08:00
SarContDeli
371c7e356d Opt: optimized general filter 2022-12-01 10:51:47 +08:00
SarContDeli
ca6810d569 Add: Frame of preset commission filter 2022-12-01 10:51:41 +08:00
18870
43e05c4495
Add: Task storage support 2022-11-30 21:46:12 +08:00
SarContDeli
c9d9ca6cc5 Merge branch 'bug_fix' into base
# Conflicts:
#	alas.py
#	config/template.json
#	module/config/argument/args.json
#	module/config/argument/menu.json
#	module/config/argument/task.yaml
#	module/config/i18n/en-US.json
#	module/config/i18n/ja-JP.json
#	module/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json
#	module/os/map.py
2022-11-30 20:56:52 +08:00
nEEtdo0d
bc3376e191 Fix: merge LmeSzinc/dev into branch, resolve conflicts 2022-11-29 15:04:47 -05:00
LmeSzinc
b8d06b12e5 Add: OpsiCrossMonth, not tested 2022-11-30 01:40:53 +08:00
nEEtdo0d
afc8468e0a Add: Opsi archive zone monthly task support 2022-11-28 00:21:52 -05:00
nEEtdo0d
629addada4 Add: Opsi voucher monthly task support 2022-11-26 23:44:38 -05:00
SarContDeli
6cd62430c6
Merge pull request #1870 from SaiCateDoan/ssl
Add: Option to skip SSL verify
2022-11-16 17:42:36 +08:00
SarContDeli
d2b3f867df Add: Option to skip SSL verify 2022-11-15 09:45:42 +08:00
SarContDeli
1f38e92e02 Add: hazard 1 leveling 2022-11-12 00:05:30 +08:00
SarContDeli
93e8db17d3 Add: force_shopping_if_credit_full of MAA 2022-11-11 12:44:34 +08:00
SarContDeli
fc53a45e06 Fix: Stop condition of MaaFight set incorrectly 2022-11-06 16:44:20 +08:00
SarContDeli
d73336af5a Fix: Unable to override null arguments 2022-11-05 10:57:52 +08:00
SarContDeli
ad61593350 Opt: Optimized logic of MaaMaterial 2022-11-04 20:11:15 +08:00
SarContDeli
32db4ad50f Add: Stage option of MAA 2022-11-04 11:25:51 +08:00
nEEtdo0d
337df07e69 Upd: [EN] support coolant (pre-maintenance), mail filter help text; resource already in assets/stat_basics 2022-10-28 11:23:08 -04:00
LmeSzinc
7630b492e9 Merge branch 'master' into dev 2022-10-25 20:31:20 +08:00