LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-19 09:59:28 +08:00
Code Activity
7,388 Commits 12 Branches 0 Tags
f93b3b3db5c94a3ee40afc59cd3ee419eef215b0
Commit Graph

267 Commits

Author SHA1 Message Date
Zuosizhu
0935b58ede Merge branch 'master_lme' 
# Conflicts:
#	module/campaign/gems_farming.py
#	module/exercise/exercise.py
#	module/ui/ui.py
 2023-07-15 20:26:12 +08:00
LmeSzinc
8ca8d81814 Add: PR6 gui settings 2023-07-13 22:59:12 +08:00
Zuosizhu
1acc700629 Merge branch 'LmeSzinc:master' into 20230309 2023-06-10 02:53:17 +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
Zuosizhu
1b2e230274 Merge branch 'LmeSzinc:master' into 20230309 2023-06-08 21:43:02 +08:00
LmeSzinc
89511847b1 Del: Remove OneClickRetire.RetireAmount since amount can no longer be limited 2023-06-08 15:36:16 +08:00
Zuosizhu
9a908c3757 Merge branch 'LmeSzinc:master' into 20230309 2023-05-16 22:08:54 +08:00
LmeSzinc
4f761b1e6f Upd: ALAS framework updates 2023-05-16 09:11:46 +08:00
Zuosizhu
53cfc78a11 Merge branch 'LmeSzinc:master' into 20230309 2023-04-28 20:50:44 +08:00
guoh064
8746a0ada3 Opt: Only Delay 12 hours for Hazard1leveling (#2530) 2023-04-28 01:10:53 +08:00
Zuosizhu
d2e395dc3a Fix: All 2023 to 2020 in datetime 2023-04-28 01:06:46 +08:00
LmeSzinc
391be3ce51 Gui: Move down CoalitionSp in event daily tasks 2023-04-28 00:52:38 +08:00
Zuosizhu
cacc828f08 Merge branch 'master_lme' 
# Conflicts:
#	config/template.json
#	module/config/argument/args.json
#	module/config/argument/argument.yaml
#	module/config/config_generated.py
#	module/config/i18n/zh-CN.json
#	module/exercise/assets.py
#	module/exercise/exercise.py
 2023-04-12 15:25:30 +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
Zuosizhu
77df52da34 Fix: use config.server instead of choose another time in GG Handler 2023-04-08 17:15:31 +08:00
guoh064
5d85535ba0 Opt: Config for exercise preserve 2023-04-05 11:31:50 +08:00
Zuosizhu
509514e8b4 Del: Remove support of screenshot. Forced restart before a task if GG is needed. 2023-03-28 17:07:48 +08:00
Zuosizhu
babac0fc00 Fix: Stop GG in coalition 2023-03-24 16:47:38 +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
Zuosizhu
aa91c7a814 Merge branch 'master_lme' 
# Conflicts:
#	campaign/Readme.md
#	module/campaign/gems_farming.py
 2023-03-17 00:44:12 +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
Zuosizhu
aad20f1572 Add: choice to empty exercise tries on the second Friday of Exercise season. Fix multi_server issues caused by ocr in exercise days by simply limit it to CN only. 2023-03-09 00:51:25 +08:00
Zuosizhu
a9ed20a3d3 Add: Delay Exercise until next update, and force empty remain at the last day 2023-03-07 19:49:28 +08:00
梦念逍遥
50e39a585a Merge branch 'LmeSzinc:master' into master 2023-03-03 10:19:15 +08:00
LmeSzinc
d7c7a29cc7 Fix: FleetOrder in GemsFarming is default to fleet1_mob_fleet2_boss 2023-03-02 22:38:39 +08:00
Zuosizhu
147c0a5214 Merge branch 'master_lme' 
# Conflicts:
#	config/template.json
#	module/campaign/gems_farming.py
#	module/config/argument/args.json
#	module/config/argument/argument.yaml
#	module/config/config_generated.py
#	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-01 14:26:11 +08:00
Zuosizhu
6ea244c1e7 Add: Configurable time for gg panel confirm 2023-03-01 10:12:10 +08:00
LmeSzinc
af65f961e2 Refactor: Simplify GemsFarming settings 2023-03-01 00:12:15 +08:00
Zuosizhu
cce684aa24 Add: Stop Alas or GemsFarming when auto search settings could not be set 2023-02-28 20:29:30 +08:00
Zuosizhu
d3bf4063f5 Fix: GemsFarming emotion limit to 20, or won't be enough for main 9-14 or event CD 2023-02-27 14:12:45 +08:00
Zuosizhu
8c07686e82 Add: User choose to restart ATX or not (which often crashes) 2023-02-25 18:31:19 +08:00
Zuosizhu
db8aede987 Feature: Change flagship and vanguard in Event hard mode when GemsFarming 2023-02-24 18:37:14 +08:00
梦念逍遥
f392d626f2 Merge branch 'LmeSzinc:master' into master 2023-02-22 10:10:52 +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
Zuosizhu
b072baa596 Merge branch 'master_lme' 
# Conflicts:
#	config/template.json
#	module/config/argument/args.json
#	module/config/argument/argument.yaml
#	module/config/config_generated.py
#	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/retire/retirement.py
 2023-02-20 12:35:43 +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
Zuosizhu
40321ee906 Revert "Merge branch 'mydev' into master" 
This reverts commit 1b615ab99c, reversing
changes made to 081eb1a6ba.
 2023-02-17 11:35:09 +08:00
MengNianxiaoyao
9a894566ee Merge branch 'master' of https://github.com/Zuosizhu/AzurLaneAutoScript into Zuosizhu-master 2023-02-16 21:21:48 +08:00