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

378 Commits

Author SHA1 Message Date
8516b51696 Opt: Extra emotion recover 2024-09-19 10:21:12 +08:00
ff98095679 Add: Clear mode for Chapter A,B,C,D,SP 2024-09-12 19:38:17 +08:00
f0d3772d41 Opt: Delay OpsiShop 2024-09-05 15:48:15 +08:00
f0a7e98ac8 Fix: notify when GameNotRunningError 2024-09-02 01:34:29 +08:00
83f0d9ab3a Opt: more strict failure check for restart sensitive tasks 2024-09-01 02:02:55 +08:00
8b52b94676 Fix: GemsFarming fleet_detail_check 2024-08-27 17:48:41 +08:00
d0c3fd5369 Upd: add CommonCV option 2024-08-17 13:35:03 +08:00
c9edec1895 Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2024-08-17 10:04:56 +08:00
LmeSzinc
2ad7bed1b6 Add: [CN] Server 水仙行动 (fixed #4087) 2024-08-16 22:34:38 +08:00
8f787b01a8 Merge branch 'master' of LmeSzinc 2024-07-29 00:42:14 +08:00
LmeSzinc
7d4b21b4fc Upd: [CN] New server 暴雨行动 (#4025) 2024-07-27 01:54:57 +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
LmeSzinc
733bb89b2d Add: [ALAS] Add ldopengl setting 2024-07-25 02:16:34 +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
461bb15155 Add Ospi Hazard1Leveling settings 2024-07-03 20:07:45 +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
1f5a779328 merge LmeSzinc/AzurLaneAutoScript:dev 2024-06-25 01:18:17 +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
Air111
a70d4c4675
Upd: add CommonDD option (#3786)
* Upd: add dd combination z20_or_z21

* Upd: add dd option favourite

* Opt: use fation to filter Z20 or Z21
2024-06-14 03:39:20 +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
Air111
c5073e5917
Upd: gui text (#3735) 2024-05-08 01:01:12 +08:00
LmeSzinc
c928654a36 Del: Remove nemu_ipc controls cuz bad swipes on slow PCs 2024-04-13 23:33:49 +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
78adcbbc7d Opt: No android versions selecting in benchmark 2024-04-08 04:11:50 +08:00
LmeSzinc
2e81cb7dc1 Add: Click method nemu_ipc 2024-04-08 03:14:33 +08:00
LmeSzinc
501d0e6a7f Add: ScreenshotMethod option nemu_ipc 2024-03-28 19:17:16 +08:00
LmeSzinc
6987d60c96 Add: Alas.EmulatorInfo settings 2024-03-28 12:44:42 +08:00
guoh064
e148c9f2ae Upd: Shipyard argument (PR4 and DR3) 2024-01-31 22:06:56 +08:00
weeswelai
56fe530310 Add: Buy time-limited furniture in dorm. 2023-12-23 00:32:30 +08:00
LmeSzinc
75a58f5640 Opt: [ALAS] Turn type lock to type state 2023-10-28 22:03:47 +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
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
c0b9045909 Add: minigame 2023-07-04 10:06:44 +08:00
Fisher Tipsy
ab0c8d0b85
Add: Allow auto attack dossier (#2579) 2023-06-08 22:28:44 +08:00
LmeSzinc
89511847b1 Del: Remove OneClickRetire.RetireAmount since amount can no longer be limited 2023-06-08 15:36:16 +08:00
LmeSzinc
1841dafb8f Add: [CN] channel server 'com.bilibili.blhx.lenovo' (#2642) 2023-05-30 23:44:00 +08:00
Chill Magic
49377d51eb
Add 'com.bilibili.blhx.bilibiliMove' (#2649)
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
2023-05-29 20:22:05 +08:00
LmeSzinc
8ceb15dafc Add: [CN] Channel server com.bilibili.blhx.dl 2023-05-27 22:46:30 +08:00
Horizon101011
3b0cffa420
Upd: ServerChecker support for new servers (#2523) 2023-04-27 12:25:58 +08:00
LmeSzinc
262f0e25ce Opt: ExerciseStrategy translations 2023-04-11 22:18:01 +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
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
bab97c81cf Opt: Remove disable option from ChangeFlagship
Disabling ChangeFlagship makes GemsFarming meaningless
2023-03-10 23:43:23 +08:00
18870
2f3055b8ac
Del: Remove Shanghai reverse proxy
feat: redirect util allow update the same key
2023-03-10 20:28:10 +08:00
Alexanded
9bb03a6aa7 Opt: Make disabled a default value for ChangeVanguard in GemsFarming 2023-03-08 07:31:00 +03:00
Alexanded
3797402ad1 Opt: Set EnemyPriority to S1_enemy_first in GemsFarming 2023-03-08 07:05:27 +03:00
LmeSzinc
af65f961e2 Refactor: Simplify GemsFarming settings 2023-03-01 00:12:15 +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
2d98ef73f2 Add: Re-add RetireAmount 2023-02-19 21:04:29 +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
LmeSzinc
36e1f01cb7 Add: Control method MaaTouch 2023-02-02 01:47:48 +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
nEEtdo0d
539ec00f09 Add: support automate raid ex mode 2023-01-28 12:19:02 -05:00
LmeSzinc
c59de88938 Upd: Remove Hermit click test
It's useless now
2023-01-03 23:31:37 +08:00
LmeSzinc
a3604d8100 Add: Screenshot method scrcpy
Control via scrcpy is supported but not exposed because swipes ended at the middle
2022-12-29 12:49:11 +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
LmeSzinc
ebba35b7c9 Opt: Move cube presets before the chip ones 2022-12-28 00:55:00 +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
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
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
LmeSzinc
82b412f773 Del: Remove OpsiHazard1Leveling.StrategicSearch
no need since it's always true
2022-12-05 22:41:47 +08:00
LmeSzinc
c51350caac Add: DroidCast screenshot 2022-12-04 23:53:43 +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
4755ac586e
Merge pull request #1921 from bookbug666/hunt_and_boss
Add: Submarine mode 'Hunt and boss'
2022-12-02 00:10:37 +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
bookbug666
c30f1d71e0 Merge branch 'dev' into hunt_and_boss 2022-12-01 11:49:54 +08:00
SarContDeli
973981e145 Opt: Modify the default commission filter to cube 2022-12-01 10:56:56 +08:00
SarContDeli
41ca30edad Add: 24h commission filter 2022-12-01 10:52:16 +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
nEEtdo0d
bc3376e191 Fix: merge LmeSzinc/dev into branch, resolve conflicts 2022-11-29 15:04:47 -05:00
bookbug666
6fef26f24e GUI options for hybrid sub summon 2022-11-29 11:32:16 +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
a258ef4435
Merge pull request #1871 from SaiCateDoan/hz1
Add: hazard 1 leveling
2022-11-16 17:39:55 +08:00
Horizon101011
702394bb44 Add: ServerChecker support for new CN server 2022-11-15 16:12:09 +08:00
SarContDeli
1f38e92e02 Add: hazard 1 leveling 2022-11-12 00:05:30 +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
bb61f2f9b6
Merge branch 'dev' into mail_reward 2022-10-23 17:03:32 +08:00
LmeSzinc
2960bf068f Merge branch 'master' into dev 2022-10-23 16:56:53 +08:00
nEEtdo0d
840eb4dc7f Mov: re-factor relevant modules and assets into freebies 2022-10-19 21:04:43 -04:00
nEEtdo0d
96adc8c4c7 Upd: move meta_reward execution as subtask under OpsiAshBeacon and AshBeaconAssist 2022-10-16 21:44:37 -04:00
nEEtdo0d
d14f0018fa Add: freebies module / task encompasses running BattlePass, DataKey, Mail, and SupplyPack together
Upd: BattlePass, DataKey, and SupplyPack modified to run as sub-tasks under Freebies
2022-10-16 17:15:42 -04:00
Bookbug
9ab069d729
Add: ActionPoint limit (#1696) (#1706)
* Opt: ActionPointBuyLimit

* Add multi-lang translation

* Solve null return

* Disable but preserve old format

* Rewrite minor translation; reform buy functions

* Add attr redirection

* Update action_point.py

* Fix:missing os_handler.py

* Fix:replace str with bool

* Fix:replace str with bool

* Fix:replace str with bool

* Fix:replace str with bool
2022-10-13 22:39:34 +08:00
nEEtdo0d
5b71184659 Add: reward mail delete configurations 2022-10-12 23:07:59 -04:00
nEEtdo0d
51e888266d Add: reward mail configurations 2022-10-08 16:58:18 -04:00
Horizon101011
2a319c4abc Add: ServerChecker support for Server JP 2022-09-24 23:14:15 +08:00
LmeSzinc
0671399eae Add: Rapid training in tactical class 2022-09-16 02:00:53 +08:00
LmeSzinc
d48e633f9b
Merge pull request #1574 from zhou525/dev_1375_pr
Dossier Beacon and OneHitMode
2022-09-07 00:08:32 +08:00
zhou525
9085ac0b8b Add: [CN]Dossier Beacon Attack Add: [CN]Ash Beacon OneHitMode 2022-09-06 23:58:37 +08:00
LmeSzinc
530897f3bd Add: Prevent too many urgent commissions in GemsFarming 2022-09-06 22:30:08 +08:00
LmeSzinc
f1ef87ca50 Merge branch 'master' into dev
# Conflicts:
#	module/device/emulator.py
2022-09-02 00:13:11 +08:00
LmeSzinc
ff394c4838 Fix: [CN] OPPO channel server (#1570) 2022-08-29 00:03:19 +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
18870
cece2e67d3 Opt: Use user-friendly yaml in notify 2022-08-20 12:11:05 +08:00
18870
c71838b091 Add: Error notify 2022-08-19 18:30:04 +08:00
SarContDeli
ac5466e5dc Upd: Modified some options for restart emulator 2022-08-17 20:22:11 +08:00
LmeSzinc
d1963503a7
Merge pull request #1326 from SaiCateDoan/sim
Add: Emulator auto detect and restart
2022-08-14 23:04:04 +08:00
zhou525
ade663aa83 Add: Ship study new skill. 2022-08-14 23:02:54 +08:00
89788
1447047468 Force collect data key when data key is full to eliminate red dots 2022-08-05 18:36:21 +08:00
SarContDeli
df26bc4e7a Opt: Refactored some code of emulator.py 2022-08-05 09:53:33 +08:00
SarContDeli
f1c78de429 Add: Emulator auto detect of Bluestacks 5 2022-08-05 09:53:31 +08:00
SarContDeli
3d6d777413 Add: Emulator auto detect and restart(experimental) 2022-08-05 09:53:28 +08:00
LmeSzinc
e8bfd08eba Merge branch 'bug_fix' into dev
# Conflicts:
#	module/config/config_generated.py
2022-08-04 21:18:04 +08:00
LmeSzinc
0afdf7b2e8
Merge pull request #1212 from Horizon101011/serverChecker
Add: Check server status before running a task, wait until available
2022-08-02 21:36:21 +08:00
LmeSzinc
c667038f49 Add: [CN] 4399 channel server 2022-07-30 18:19:06 +08:00
bookbug666
24bfef47e4 Opt: Change"UseU522Skill" into "UseOpenOceanSupport" 2022-07-29 03:08:31 +08:00
bookbug666
1a16e31138 Reform config file of EventABCD 2022-07-27 14:53:05 +08:00