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,793 Commits 9 Branches 0 Tags 274 MiB
68f8793c41
Commit Graph

307 Commits

Author SHA1 Message Date
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
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
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
89511847b1 Del: Remove OneClickRetire.RetireAmount since amount can no longer be limited 2023-06-08 15:36:16 +08:00
LmeSzinc
4f761b1e6f Upd: ALAS framework updates 2023-05-16 09:11:46 +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
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
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
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
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
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
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
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
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
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
LmeSzinc
d40cfd5470 Fix: New gitee mirror address 2022-10-21 17:30:14 +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
LmeSzinc
0671399eae Add: Rapid training in tactical class 2022-09-16 02:00:53 +08:00
LmeSzinc
bdf8653ee8 Upd: Config update 2022-09-12 13:28:21 +08:00
zhou525
9085ac0b8b Add: [CN]Dossier Beacon Attack Add: [CN]Ash Beacon OneHitMode 2022-09-06 23:58:37 +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
18870
a5c851869b Opt: Refactor config display 
Opt: Lock event selector
 2022-08-15 01:16:05 +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
SarContDeli
df26bc4e7a Opt: Refactored some code of emulator.py 2022-08-05 09:53:33 +08:00
SarContDeli
3d6d777413 Add: Emulator auto detect and restart(experimental) 2022-08-05 09:53:28 +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
bookbug666
ba769af213 Add: EnemyPriority option to WarArchives and SoS 2022-07-29 02:06:11 +08:00
bookbug666
1a16e31138 Reform config file of EventABCD 2022-07-27 14:53:05 +08:00
bookbug666
692e4d1300 補齊了SOS的Enemy_filter支援;更改每日活動地圖的命名;修正了部分翻譯;將國服以外緊急委託刷鑽石的等級修正 2022-07-26 16:29:03 +08:00
bookbug666
704c27cf4d Add: Several Submarine supports and EnemyFilter; add EventB, EventD 2022-07-26 16:29:03 +08:00
SarContDeli
f3ac925ece Add: GUI option of research delay when resources not enough 2022-07-24 10:07:31 +08:00
Horizon101011
aa4d7b4b08 Opt: Use common API 2022-07-21 10:09:20 +08:00
freesrz93
9faa3c9269 Add: Use build tickets for event pool 2022-07-17 16:01:59 +08:00
LmeSzinc
c84051b936 Opt: Disable Restart.Scheduler.Enable 2022-07-17 02:00:25 +08:00
LmeSzinc
69851e5718 Add: PR5 filter presets 2022-07-17 01:31:12 +08:00
cangular
53910a728c
Add: adb restart (#1167) 
* Add files via upload

* some addition on one device and muti

* Update connection.py

remove some redundant

* name change

* more name change

* no need to de serial check

* some rollback

* add adb restart gui and some minor update

* make adb gui independent from game manager

* pep 8

* add detect device

* remove ds_store

* add to alas-emulator

add to alas-emulator

* rm DS_Store

* Delete .DS_Store

* some add on
 2022-06-11 23:09:47 +08:00
LmeSzinc
af4cb88ff5 Add: Support daily Module Development 2022-06-09 23:59:03 +08:00
LmeSzinc
1ad5e9eaa8 Opt: Disallow modifying emotion record time on GUI, they can be auto updated now 2022-06-06 00:26:03 +08:00
LmeSzinc
ca4f7de2d0 Upd: Reset medal shop filter 2022-06-06 00:05:05 +08:00
nEEtdo0d
6ec480f949 Add: configurations for shop_medals buy scheme for retrofit and plate items 
Upd: shop filter regexp to identify wild plate types; unique to shop_medal
Add: shop_medal new item assets
 2022-06-04 21:06:21 -04:00
LmeSzinc
a13a0ad68a Opt: Run task Reward more frequently 2022-05-28 00:56:29 +08:00
SarContDeli
dd66c8f289 Opt: Modified the options for all screenshots 2022-05-21 00:53:37 +08:00
SarContDeli
67db84b7e0 Add: an upload API to AzurStat for CN users 2022-05-20 22:03:40 +08:00
SarContDeli
7db5af2a88 Opt: Combined save and upload options 2022-05-20 15:25:32 +08:00
LmeSzinc
7ff8205a7a
Merge pull request #1123 from MrGuoRanDuo/dev 
feat: meowfficer talent screenshot & upload
 2022-05-19 20:05:48 +08:00
MrGuoRanDuo
dc3825ee40 feat: meowfficer talent screenshot & upload 2022-05-17 22:14:30 +08:00
LmeSzinc
ee4f85ebda Add: OpsiDaemon.SelectEnemy 
- Add archive detection on radar
 2022-05-16 01:30:05 +08:00
LmeSzinc
9094e4dcf4 Add: GUI option OpsiGeneral.DoRandomMapEvent 2022-05-15 17:52:04 +08:00
LmeSzinc
dd7aaaea83 Opt: Disable Scheduler.Enable option in task Commission, Tactical, Research and Reward (#1073) 
- Add option type: hide and disable
- Increase Scheduler.FailureInterval of task Tactical
- Fix research can't be delayed to tomorrow if no projects satisfy current filter
 2022-04-30 22:39:28 +08:00
LmeSzinc
746085ca77 Add: Event entrance of Rondo at Rainbow's End (event_20220428_cn) 2022-04-28 12:45:53 +08:00
SarContDeli
a039436809 Fix: merge conflict 2022-04-23 15:45:29 +08:00
LmeSzinc
d30da01a10 Opt: Remove 7-2 mystery farming, 12-2 leveling, 12-4 leveling; add multiple Main and Event tasks 2022-04-23 14:36:52 +08:00
LmeSzinc
dc0268269d Opt: Set tasks enabled by default and use auto search by default 2022-04-19 01:00:07 +08:00
LmeSzinc
618fa52bcb Opt: Merge Emulator.PackageName and Emulator.Server into one dropdown 2022-04-19 01:00:07 +08:00
LmeSzinc
e0cb6ef1be Fix: Resolve merge conflicts 2022-04-11 17:29:56 +08:00
LmeSzinc
5ba2f5c5ac Add: Faster screenshot methods ADB_nc and aScreenCap_nc 
- Allow config names when creating Device instances
- Add "Ultra Fast" level in performance test
 2022-03-23 21:27:08 +08:00
LmeSzinc
309cedf60b Opt: Better arrangement of meowfficer settings 2022-03-07 20:27:34 +08:00
LmeSzinc
fe6e8160c8 Merge branch 'master' into dev 2022-03-03 10:49:44 +08:00
LmeSzinc
f08fb26996 Add: Upload OpSi drop screenshots 2022-02-28 17:21:23 +08:00
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
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