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

1382 Commits

Author SHA1 Message Date
LmeSzinc
89511847b1 Del: Remove OneClickRetire.RetireAmount since amount can no longer be limited 2023-06-08 15:36:16 +08:00
LmeSzinc
93b9bbc498 Upd: [CN] Git mirrors 2023-06-04 17:19:45 +08:00
hgjazhgj
a06837d99a Merge branch 'dev' into fpy 2023-06-03 22:22:42 +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
xzjjasper
9d5aee0c24
Upd: [TW] Event: Pledge of the Radiant Court (#2626) 
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
 2023-05-27 22:39:03 +08:00
hgjazhgj
742e34c8d0 Merge branch 'dev' into fpy 2023-05-27 19:12:05 +08:00
LmeSzinc
223b36b853 Add: Event entrance of Confluence of Nothingness (event_20230526_cn) 2023-05-26 17:33:14 +08:00
LmeSzinc
e420f4ed04 Upd: Magic map swipe multipliers 2023-05-26 03:01:09 +08:00
LmeSzinc
6487e460fa Fix: Re-fit OpSi globe swipes 2023-05-25 22:32:45 +08:00
LmeSzinc
4f761b1e6f Upd: ALAS framework updates 2023-05-16 09:11:46 +08:00
somegituser
5a717e44ad
add war_archives: Northern Overture & Aurora Noctis, (#2576) 
新增作战档案录入：北境序曲&永夜幻光
 2023-05-13 19:51:59 +08:00
LmeSzinc
128d9d27d8 Fix: read_file() may return an empty list 2023-05-12 22:03:00 +08:00
LmeSzinc
bb4f341b58 Fix: Add missing InvalidPrefixTemplate key 2023-05-07 21:17:04 +08:00
hgjazhgj
f6d52621fe Add: Submodule AlasFpyBridge (experimental) 2023-05-06 20:58:08 +08:00
hgjazhgj
b18be2ae2b
Fix: Redundant template-maa.maa.json config file (#2551) 2023-05-05 12:29:53 +08:00
xzjjasper
3b6ce54740
Upd: [TW] Vacation Lane (#2533) 2023-04-28 19:41:37 +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
81f0135b8a Gui: Rename Develop page to Home page 2023-04-28 00:52:38 +08:00
LmeSzinc
0e7b9fe8c8 Add: Event Entrance of Vacation Lane Rerun (event_20230427_cn) 2023-04-27 22:19:30 +08:00
Horizon101011
3b0cffa420
Upd: ServerChecker support for new servers (#2523) 2023-04-27 12:25:58 +08:00
LmeSzinc
c751e450f4 Fix: Disable SHOP_EXTRACT_TEMPLATE 2023-04-22 00:26:06 +08:00
LmeSzinc
7ff3e98f5f
Merge pull request #2508 from LmeSzinc/dev 
Bug fix
 2023-04-19 22:39:08 +08:00
LmeSzinc
69b01a871c Dev: CodeGenerator for nested expressions 2023-04-15 22:20:57 +08:00
LmeSzinc
d1b1b0ac7d Opt: No map clear percentage waiting in SOS maps 2023-04-15 22:16:40 +08:00
xzjjasper
9a64583c88
Upd: [TW] Microlayer Medley Rerun (#2487) 2023-04-13 21:34:52 +08:00
Zuosizhu
99c218d903
Add: Event entrance of The Flame-Touched Dagger Rerun(event 20211111 cn) (#2480) 2023-04-13 18:44:51 +08:00
LmeSzinc
37f932688e Opt: Move down task Coalition since the event is over 2023-04-11 22:21:08 +08:00
LmeSzinc
262f0e25ce Opt: ExerciseStrategy translations 2023-04-11 22:18:01 +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
bd83b765ce Upd: [CN] AzurLaneUncensored mirror 2023-03-31 22:06:04 +08:00
LmeSzinc
aeec13cd85 Upd: Set default language in CN deploy templates 2023-03-28 16:55:52 +08:00
LmeSzinc
3ca2695464 Upd: [CN] Coding repo mirror 2023-03-28 16:30:50 +08:00
LmeSzinc
b2de4b83d7 Merge branch 'master' into dev 
# Conflicts:
#	campaign/Readme.md
#	module/config/argument/args.json
#	module/config/i18n/en-US.json
#	module/config/i18n/ja-JP.json
#	module/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json
 2023-03-24 05:11:15 +08:00
LmeSzinc
4eadbe1f80 Upd: [EN] Coalition assets 2023-03-24 05:01:48 +08:00
LmeSzinc
7ecf3ac502 Add: Coalition task 2023-03-24 04:41:13 +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
6bac6bff7b Add: Event entrance of Frostfall (event_20230323_cn) 2023-03-23 21:58:07 +08:00
xzjjasper
7175b3969e Upd:[TW] Angel of Iris 2023-03-23 20:36:48 +08:00
LmeSzinc
89c36597b2 Add: Emergency module development daily 2023-03-17 00:34:02 +08:00
LmeSzinc
7823d6e7da
Merge pull request #2366 from syccxcc/master 
Update en-US.json
 2023-03-15 12:00:05 +08:00
Peter Li
482a698bd7
Update en-US.json 
Update the url for ship enhancing on the wiki.
 2023-03-14 15:35:26 -04:00
LmeSzinc
a290a742e4 Upd: Config update 2023-03-14 20:30:28 +08:00
Azusachan
0ad55c1b60
Add: [CN] War Archive Skybound Oratorio (#2363) 2023-03-14 20:21:54 +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
Alexan-ded
f230f08802
Merge branch 'LmeSzinc:bug_fix' into bug_fix 2023-03-10 00:06:45 +03:00
LmeSzinc
b08baf0739 Add: Event entrance of Daedalian Hymn Rerun (event_20230309_cn) 2023-03-09 20:26:35 +08:00
xzjjasper
5972522ebb Upd: [TW] Swirling Cherry Blossoms Rerun 2023-03-09 19:15:15 +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
Alexanded
1bceb5bfbd Add: Disable flagship and vanguard change in GemsFarming 2023-03-03 23:51:49 +03:00
LmeSzinc
d7c7a29cc7 Fix: FleetOrder in GemsFarming is default to fleet1_mob_fleet2_boss 2023-03-02 22:38:39 +08:00
SarContDeli
0b82c38f9b
Opt: Optimized hint of Serial (#2306) 2023-03-01 18:06:26 +08:00
LmeSzinc
af65f961e2 Refactor: Simplify GemsFarming settings 2023-03-01 00:12:15 +08:00
kmou424
7af367442a Fix: sync python executable with python 3.7 slim image 2023-02-27 16:10:34 +08:00
LmeSzinc
ad8b976389 Add: Event entrance of Revelations of Dust (event_20230223_cn) 2023-02-23 19:35:25 +08:00
LmeSzinc
4b848332be Add: CodeGenerator.Import 2023-02-23 12:35:13 +08:00
bookbug666
e0ab047aec Fix: wrong args.json after merging 2023-02-22 01:17:39 +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
bookbug666
bf43c9cab3 Add: Hint to avoid missing the free pack purchase 2023-02-21 21:25:19 +08:00
SarContDeli
2c2297f690
Fix: Replaced "monk battle" to "practice battle" (#2267) 2023-02-21 21:09:18 +08:00
SarContDeli
d7489ba3ad Opt: hint of OpSi story and mock battles 2023-02-21 18:18:47 +08:00
SarContDeli
32ee461937 Opt: Serial hint of MuMu X 2023-02-21 18:10:54 +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
SarContDeli
75c8a2330e Opt: Adjust help message of CL1 leveling 2023-02-19 11:11:24 +08:00
bookbug666
deca198250 Add: Option to delay buying weekly supply pack 2023-02-19 00:45:35 +08:00
bookbug666
03b699b615 Add: Option to delay buying weekly supply pack 2023-02-19 00:13:53 +08:00
LmeSzinc
2bcb828341
Merge pull request #2255 from LmeSzinc/bug_fix 
Bug fix
 2023-02-18 16:41:25 +08:00
LmeSzinc
4379cb542b Opt: Remove unnecessary settings in GemsFarming 2023-02-18 16:16:59 +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
7c9d0b5496
Merge pull request #2251 from LmeSzinc/bug_fix 
Bug fix
 2023-02-16 22:19:20 +08:00
xzjjasper
7c836edc2f
Upd [TW] Abyssal Refrain (#2247) 
* Upd [TW] Abyssal Refrain

* Fix: [TW] Abyssal Refrain
 2023-02-16 20:38:27 +08:00
永見涼花
aa2b3bd738
Update ja-JP.json 2023-02-16 18:20:14 +08:00
永見涼花
eaa5226ebd
Update ja-JP.json 2023-02-15 19:43:48 +08:00
永見涼花
97e5349cf3
Update ja-JP.json 2023-02-15 19:37:31 +08:00
LmeSzinc
b128375a22
Merge pull request #2220 from Azusachan/master 
Add support for Bluestacks 5 Pie64 instances
 2023-02-08 11:46:56 +08:00
LmeSzinc
3d174b19cb Opt: Auto-select the fastest screenshot method 2023-02-08 01:42:04 +08:00
LmeSzinc
7db4fae884 Add: [TW] The Enigma and the Shark Rerun 2023-02-06 09:20:25 +08:00
LmeSzinc
36e1f01cb7 Add: Control method MaaTouch 2023-02-02 01:47:48 +08:00
nEEtdo0d
89c2968a7f Fix: return back to page_raid to gauge accurate reading of get_remain 
Upd: [EN] raid daily help text
 2023-01-30 11:19:48 -05: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
2f6d8d0c1f Fix: Increase HOMO_EDGE_HOUGHLINES_THRESHOLD to 180 
for 3 enemies in 1 row
 2023-01-29 14:48:48 +08:00
nEEtdo0d
539ec00f09 Add: support automate raid ex mode 2023-01-28 12:19:02 -05:00
nEEtdo0d
cb2408666d Del: orphan argument group; does not exist 2023-01-22 23:30:49 -05:00
xzjjasper
8f886badbd Upd: [TW] Mystery Investigation 2023-01-18 22:02:16 +08:00
LmeSzinc
b14364f36f Add: Event entrance of Winter Pathfinder (raid_20230118) 2023-01-18 17:56:46 +08:00
SarContDeli
a5de8b3676 Fix: Keep 1000 AP only when CL1 available but not enabled 2023-01-15 11:04:22 +08:00
LmeSzinc
86c07bcd18 Add: [TW] Event entrance of The Way Home in the Night Rerun (event_20210610_tw) 2023-01-06 01:29:09 +08:00
LmeSzinc
3e1a223dc5 Opt: Auto choose event or main chapters from GemsFarming 2023-01-05 21:27:35 +08:00
LmeSzinc
56f95f52cb Add: Event entrance of Khorovod of Dawns Rime Rerun (event_20230105_cn) 2023-01-05 20:53:19 +08:00
LmeSzinc
699d8dd1c8 Opt: Keep enough startup AP for CL1 farming 2023-01-04 20:30:58 +08:00
LmeSzinc
c59de88938 Upd: Remove Hermit click test 
It's useless now
 2023-01-03 23:31:37 +08:00
LmeSzinc
815dde4a5c Dev: Add SHOP_EXTRACT_TEMPLATE to collect new item templates 2022-12-31 01:27:57 +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
811fae8ae3 Fix: Help text of ActionPointPreserve to be consistent with code 2022-12-28 00:53:35 +08:00
LmeSzinc
6552938e22 Merge branch 'master' into dev 
# Conflicts:
#	module/config/argument/argument.yaml
 2022-12-25 23:02:31 +08:00
LmeSzinc
1f8d32de06 Opt: Add reminder for submarine mode 2022-12-25 17:46:08 +08:00
LmeSzinc
de4b32f69e Opt: Set default screenshot method to ADB_nc 2022-12-24 17:48:32 +08:00
LmeSzinc
a2cef011a2 Opt: Improve log appearance in OpSi Month Boss 2022-12-23 18:29:33 +08:00
LmeSzinc
b7e8c67cab Merge branch 'master' into dev 2022-12-23 17:07:33 +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
40d1325510 Add: [TW] Tower of Transcendence (event_20211229_cn) 2022-12-22 17:48:23 +08:00
LmeSzinc
8bfd0a576d Add: Event entrance of Parallel Superimposition (event_20221222_cn) 2022-12-22 16:54:06 +08:00
YJGeng-Iriy
9499a73eeb optimize en-US.json 2022-12-21 00:35:40 +08:00
YJGeng-Iriy
67d039c188 optimize en-US.json 2022-12-21 00:22:19 +08:00
YJGeng-Iriy
49b15eafd6
Merge branch 'master' into opsi_month_boss 2022-12-21 00:09:20 +08:00
SarContDeli
6f063713df Fix: Wrong log when delay across task 2022-12-20 18:05:38 +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
nEEtdo0d
f1e01b3b69 Upd: opsi_task_delay; Opsi archive supports submarine calls 2022-12-11 23:57:14 -05:00
LmeSzinc
b1881cc5b7 Add: [CN][TW] GUI translation for OpSi Archive Zones 2022-12-11 23:44:34 +08:00
YJGeng-Iriy
97607798ed opsi month boss init 2022-12-11 22:15:26 +08:00
YJGeng-Iriy
a361d8ad0d opsi month boss init 2022-12-11 20:59:16 +08:00
nEEtdo0d
e646007345 Add: voucher shop new item asset logger unlock; not buy-able yet 2022-12-10 20:49:15 -05: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
nEEtdo0d
7bd96aad50 Upd: [EN] rework 'AddNewStudent' help info 2022-12-10 20:02:49 -05:00
YJGeng-Iriy
726dc243c3 opsi_month_boss init 2022-12-10 23:57:09 +08:00
LmeSzinc
cb2abd107f Merge branch 'master' into dev 2022-12-07 01:50:32 +08:00
LmeSzinc
82b412f773 Del: Remove OpsiHazard1Leveling.StrategicSearch 
no need since it's always true
 2022-12-05 22:41:47 +08:00
LmeSzinc
54d5874b9d Upd: [CN] Voucher shop assets and translation 2022-12-05 22:31:53 +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
LmeSzinc
b43821d162
Merge pull request #1891 from karegyudon/add_new_wararchives_20221117 
Add new wararchives 20221117
 2022-12-02 00:05:08 +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
xzjjasper
786aad90ac Upd: [TW] The Alchemist and the Archipelago of Secrets 2022-12-01 20:55:11 +08:00
SarContDeli
6a4d3b5da5 Opt: Independent option to restart emulator daily 2022-12-01 15:20:14 +08:00
bookbug666
aa313c16ef Fix minor bugs 2022-12-01 11:52:52 +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
677821960b Fix: Merge Conflict 2022-12-01 10:54:54 +08:00
SarContDeli
d9ffcf3e63 Fix: Fix several error in commission preset filter 2022-12-01 10:52:17 +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
LmeSzinc
c9d296ad76 Merge branch 'master' into dev 2022-12-01 01:08:54 +08:00
LmeSzinc
09e68e13ba Opt: Avoid mislead to special radar in OpSi help text 2022-12-01 00:39:20 +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
b625b23717 Fix: os_voucher and os_archive infinite task looping 2022-11-29 10:01:57 -05:00
bookbug666
f3297889a4 Fix: wrong and/or usage;fix wrong function;improve translation 2022-11-29 15:06:37 +08: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
186aca2ea5 Upd: rename os logger type from 'file' to 'archive' 2022-11-27 22:34:50 -05:00
LmeSzinc
90223d84e1 Merge branch 'master' into dev 2022-11-28 01:14:45 +08:00
nEEtdo0d
629addada4 Add: Opsi voucher monthly task support 2022-11-26 23:44:38 -05:00
LmeSzinc
000ba44a5c Fix: Disable MAP_MYSTERY_MAP_CLICK in chapter TH 2022-11-25 21:56:07 +08:00
LmeSzinc
1cb7ae25e6 Add: Loop stage support 2022-11-25 16:37:48 +08:00
LmeSzinc
85938744e6 Merge branch 'master' into dev 2022-11-25 02:29:03 +08:00
LmeSzinc
ca15c63e7c Add: Event entrance of The Alchemist and the Archipelago of Secrets (event_20221124_cn) 2022-11-24 17:03:17 +08:00
sevenstar
29b180c8c7 Add new wararchives 20221117 
新增作战档案：微层混合和峡湾间的星辰
 2022-11-22 11:10:17 +08:00
xzjjasper
160fee6d11
Upd: [TW] Ashen Simulacrum Rerun (#1880) 2022-11-17 12:04:26 +08:00
SarContDeli
a258ef4435
Merge pull request #1871 from SaiCateDoan/hz1 
Add: hazard 1 leveling
 2022-11-16 17:39:55 +08:00
SarContDeli
1b47e69496 Upd: Refactored part of hazard 1 leveling 2022-11-15 17:23:34 +08:00
Horizon101011
4dc17287aa
Merge pull request #1872 from Horizon101011/dev 
Add: ServerChecker support for new CN server
 2022-11-15 16:18:26 +08:00
Horizon101011
702394bb44 Add: ServerChecker support for new CN server 2022-11-15 16:12:09 +08:00
nEEtdo0d
3b37e4afa0 Add: shop module support voucher shop (os supply / exchange) 2022-11-14 12:00:13 -05:00
LmeSzinc
2ae5fba63b
Merge pull request #1865 from LmeSzinc/bug_fix 
Bug fix
 2022-11-14 18:47:15 +08:00
nEEtdo0d
1b9ee1f070 Upd: mail filter decorcoin support 2022-11-13 20:56:56 -05:00
SarContDeli
9c2847f92c Fix: Wrong campaign folder in Readme.md 2022-11-12 00:10:04 +08:00
SarContDeli
65c0699b37 Fix: merge conflict 2022-11-12 00:05:30 +08:00
SarContDeli
1f38e92e02 Add: hazard 1 leveling 2022-11-12 00:05:30 +08:00
LmeSzinc
f64f02fac7
Merge pull request #1842 from Horizon101011/dockScanner 
Opt: Re-adjust retire level threshold; Reduce ship change
 2022-11-10 23:02:42 +08:00
LmeSzinc
4bacbfe736
Merge pull request #1843 from YJGeng-Iriy/inverted_orthant_rerun_221110 
inverted orthant rerun update
 2022-11-10 23:01:18 +08:00
YJGeng-Iriy
ceb191fe4f inverted orthant rerun update 2022-11-10 20:55:16 +08:00
Horizon101011
8e41a30e1f Fix: Retire CV lv.2+ but keep one 2022-11-10 19:29:15 +08:00
Horizon101011
a8397bc25c Fix: Re-adjust retire level threshold 2022-11-10 18:28:17 +08:00
Horizon101011
719b186c31 Opt: Re-adjust retire level threshold; Reduce ship change 2022-11-10 18:13:56 +08:00
SarContDeli
870f2f2fbe Fix: InvalidChar missing in gui.yaml 2022-11-09 22:18:17 +08:00
LmeSzinc
e3fdef94bb Upd: Research preset using E2 projects and research_optimizer 2022-11-08 22:18:58 +08:00
LmeSzinc
6fbc76e6a4 Fix: Config update on overridden fields 2022-11-07 00:28:14 +08:00
LmeSzinc
57b36c4d1a
Merge pull request #1823 from SaiCateDoan/maa 
Opt: Optimized logic of MaaMaterial
 2022-11-06 00:36:49 +08:00
SarContDeli
d73336af5a Fix: Unable to override null arguments 2022-11-05 10:57:52 +08:00
hgjazhgj
df74e0a98f Fix: Verify filename when adding new config 2022-11-05 04:17:14 +08:00
LmeSzinc
fa8d84fd87
Merge pull request #1815 from xzjjasper/master 
Add: [TW] The Flame-Touched Dagger
 2022-11-04 00:06:57 +08:00
xzjjasper
94c0faaa35 Add: [TW] The Flame-Touched Dagger 2022-11-03 23:56:18 +08:00
LmeSzinc
383b8893c2 Merge branch 'master' into dev 2022-11-02 00:22:03 +08:00
LmeSzinc
a2081bed34 Revert "Opt: Reduce json writes when recording emotion" 
This reverts commit 61e62edb
 2022-11-01 23:59:13 +08:00
SarContDeli
7599275b51 Opt: Handle Stronghold at day before reset 2022-10-31 21:22:15 +08:00
LmeSzinc
61e62edb08 Opt: Reduce json writes when recording emotion 2022-10-30 14:49: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
e847f76256 Merge branch 'master' into dev 
# Conflicts:
#	module/config/i18n/en-US.json
#	module/config/i18n/ja-JP.json
#	module/config/i18n/zh-CN.json
 2022-10-28 03:09:41 +08:00
YJGeng-Iriy
8352a85088 update en&jp raid_20221027 config 2022-10-28 02:33:46 +08:00
YJGeng-Iriy
fbbdb327ac bug fix raid_20221027 2022-10-28 01:57:19 +08:00
YJGeng-Iriy
2551107e10 raid_20221027 2022-10-28 00:44:47 +08:00
Horizon101011
34e21beb1f
Merge branch 'dev' into dockScanner 2022-10-25 18:42:25 +08:00
LmeSzinc
53eb19b5cb Upd: [CN] Mail assets and i18n 2022-10-23 18:15:02 +08: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
appleapple802
4dd590c98d Add: [TW] Empyreal Tragicomedy 2022-10-21 21:45:46 +08:00
LmeSzinc
d40cfd5470 Fix: New gitee mirror address 2022-10-21 17:30:14 +08:00
nEEtdo0d
79b6293d16 Upd: config redirection old to new freebies counterpart 2022-10-21 00:07:08 -04: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
sevenstar
e74922ed50 add wararchive: Crescendo of Polaris 
新增作战档案：激奏的Polaris
 2022-10-15 12:22:10 +08:00
sevenstar
fd62233b35 fix: BuyActionPointLimit 2022-10-14 13:16:34 +08:00
sevenstar
1e5fa09646 add wararchive: Universe in Unison 
新增作战档案SP: 激唱的UNIVERSE
 2022-10-14 13:03:52 +08: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
Horizon101011
12e04ebaab
Merge branch 'dev' into dockScanner 2022-10-10 23:06:27 +08:00
nEEtdo0d
51e888266d Add: reward mail configurations 2022-10-08 16:58:18 -04:00
LmeSzinc
87bf8ec7ee
Merge pull request #1657 from SaiCateDoan/maa 
Add: Submodule AlasMaaBridge (experimental)
 2022-10-06 14:16:43 +08:00
Horizon101011
2a319c4abc Add: ServerChecker support for Server JP 2022-09-24 23:14:15 +08:00
SarContDeli
165f6a1c95 Upd: Modified location of submodule config 2022-09-19 15:45:25 +08:00
SarContDeli
3c467a51b6 Fix: Configuration missing in MAA 2022-09-17 16:03:23 +08:00
SarContDeli
4372c81fcd Upd: Revert change of config and scheduler 2022-09-17 16:03:00 +08:00
SarContDeli
4b620853fe Add: Add new config 2022-09-17 16:02:06 +08:00
SarContDeli
9ea8396bed Add: submodule management 2022-09-17 16:02:02 +08:00
LmeSzinc
0671399eae Add: Rapid training in tactical class 2022-09-16 02:00:53 +08:00
LmeSzinc
40440f95d5 Add: Event entrance of Violet Tempest Blooming Lycoris (event_20220915_cn) 2022-09-16 00:31:13 +08:00
appleapple802
3c611c1dac Add: [TW]Upon the Shimmering Blue 2022-09-15 23:35:07 +08:00
Horizon101011
e1f50c64cb
Merge branch 'dev' into dockScanner 2022-09-14 10:32:54 +08:00
LmeSzinc
9b4ba2ca21 Opt: Call meta reward if cleared a meta 2022-09-14 01:16:08 +08:00
LmeSzinc
8d4617113c Fix: Sorting tasks in waiting list (#1634) 2022-09-14 00:11:18 +08:00
Horizon101011
4b765eac5f Opt: Adjust flagship level threshold 2022-09-13 12:39:27 +08:00
LmeSzinc
b4cb6b7dba Opt: Proper recon scan CD duration and OneHitMode in dossier 2022-09-12 23:35:19 +08:00
Horizon101011
9cc1ffce6f Upd: Modify i18n 2022-09-07 09:19:48 +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
1f67a9a109 Add: Get and set config across tasks 2022-09-06 22:20:29 +08:00
LmeSzinc
d8f4986d64 Merge branch 'master' into dev 2022-09-03 14:59:36 +08:00
LmeSzinc
bb6898266f
Merge pull request #1596 from karegyudon/wararchive_sp_THE_ENIGMA_AND_THE_SHARK 
wararchive sp the enigma and the shark
 2022-09-03 14:51:00 +08:00
sevenstar
2abe7346db fix sp name 2022-09-03 11:37:50 +08:00
sevenstar
9f487a713a add wararchive: the enigma and the shark 
新增作战档案sp：最重要的宝物
 2022-09-03 11:27:08 +08:00
appleapple802
0a2be15aea Add: [TW] Stars of the Shimmering Fjord 2022-09-02 17:23:21 +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
LmeSzinc
11aea6d4d9 Fix: Cancel researches with unsatisfied requirements 
Avoid to add into queue
- Refactor: Split out ResearchSelector
 2022-08-23 02:47:44 +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
LmeSzinc
17e0c8045d Add: [TW] Virtual Tower (#1534) 2022-08-19 00:27:02 +08:00
LmeSzinc
302a7caa29 Add: Event entrance of Operation Convergence (event_20220818_cn) 2022-08-18 23:46:57 +08:00
SarContDeli
ac5466e5dc Upd: Modified some options for restart emulator 2022-08-17 20:22:11 +08:00
LmeSzinc
3eed7a0549 Upd: Research patches from azur-stats-server 
(cherry picked from commit 2e43a157aa9314bd7e0209bfdf8204ef7c0730f0)
 2022-08-16 00:31:02 +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
LmeSzinc
baae84a1a1
Merge pull request #1499 from bookbug666/gems_langfix 
Fix: minor translation fixs in gemsfarming
 2022-08-07 21:14:50 +08:00
bookbug666
df0ad0540e Fix: minor translation fixs in gemsfarming 2022-08-07 19:52:11 +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
Zorachristine
532d3b937f Upd: [TW] Skybound Oratorio Rerun 2022-08-04 19:54:49 +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
Horizon101011
79ca99eccb Opt: Remove port; Add server prefix 2022-08-01 10:41:20 +08:00
LmeSzinc
c667038f49 Add: [CN] 4399 channel server 2022-07-30 18:19:06 +08:00
LmeSzinc
431eb9f46f
Merge pull request #1452 from appleapple802/master 
fix:[TW]GET_ITEMS_3.png
 2022-07-29 22:51:34 +08:00
LmeSzinc
e234b0c2d1
Merge pull request #1441 from bookbug666/dev_useU522 
Opt: Change"UseU522Skill" into "UseOpenOceanSupport"
 2022-07-29 17:46:09 +08:00
bookbug666
24bfef47e4 Opt: Change"UseU522Skill" into "UseOpenOceanSupport" 2022-07-29 03:08:31 +08:00
bookbug666
ba769af213 Add: EnemyPriority option to WarArchives and SoS 2022-07-29 02:06:11 +08:00
bookbug666
2e22780d9f Opt: Add "Daily" to EventDaily tasks 2022-07-29 01:07:45 +08:00
bookbug666
aa69d625b4 Opt: Minor task name fix 2022-07-29 00:29:09 +08:00
LmeSzinc
85c0682773 Upd: config_updater 2022-07-28 23:20:37 +08:00
LmeSzinc
679a22c509
Merge pull request #1400 from bookbug666/dev_alt 
Add: Submarine supports in GemsFarming;EnemyFilter in SOS;Replace old EventAb and Cd with individual EventABCD
 2022-07-28 23:10:44 +08:00
LmeSzinc
7ca4b9cb5f
Merge pull request #1423 from SaiCateDoan/2_4 
Opt: Modified description of GemsFarming
 2022-07-28 23:10:07 +08:00
SarContDeli
1cd4b3ecf8 Opt: Adjusted the priority of research tasks; Modified description of GemsFarming 2022-07-28 22:41:19 +08:00
Bookbug
c16d9a2641
Merge pull request #4 from LmeSzinc/dev 
Merge origin/Dev into dev_alt
 2022-07-28 20:30:19 +08:00
LmeSzinc
49b152899d Add: Aquilifers Ballade (event_20220728_cn) chapter AC 2022-07-28 13:32:30 +08:00
bookbug666
1a16e31138 Reform config file of EventABCD 2022-07-27 14:53:05 +08:00
Bookbug
36ed599d95
Merge branch 'LmeSzinc:master' into dev_alt 2022-07-27 12:37:46 +08:00
SarContDeli
ba7639e11a Opt: Cancel the function of delaying research when reset is unavailable 2022-07-26 21:40:18 +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
5f62a53c96 Add: Delay research when reset not available 2022-07-24 10:07:32 +08:00
SarContDeli
f3ac925ece Add: GUI option of research delay when resources not enough 2022-07-24 10:07:31 +08:00
sevenstar
49cb938159 add war archive: Swirling Cherry Blossoms 
新增作战档案：浮樱影华
 2022-07-21 14:14:23 +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