LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-22 11:51:27 +08:00
Code Activity
7,048 Commits 12 Branches 0 Tags
2d95de0dc57cbcb9fa8a0d53d635698342175a45
Commit Graph

444 Commits

Author SHA1 Message Date
Zuosizhu
4d1fd01511 Merge branch 'master_lme' 
# Conflicts:
#	assets/jp/gacha/BUILD_CUBE_COUNT.png
#	module/campaign/run.py
#	module/gacha/assets.py
 2023-05-15 17:22:33 +08:00
somegituser
5a717e44ad add war_archives: Northern Overture & Aurora Noctis, (#2576) 
新增作战档案录入：北境序曲&永夜幻光
 2023-05-13 19:51:59 +08:00
Zuosizhu
af50441528 Merge branch 'LmeSzinc:master' into 20230309 2023-05-03 21:24:06 +08:00
Zuosizhu
53cfc78a11 Merge branch 'LmeSzinc:master' into 20230309 2023-04-28 20:50:44 +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
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
LmeSzinc
0e7b9fe8c8 Add: Event Entrance of Vacation Lane Rerun (event_20230427_cn) 2023-04-27 22:19:30 +08:00
Zuosizhu
18b824d3ba Merge branch 'LmeSzinc:master' into 20230309 2023-04-27 15:24:49 +08:00
Zuosizhu
f15f0befb3 Add: Event entrance of Vacation Lane Rerun(event 20201126 cn) 2023-04-27 15:23:13 +08:00
Horizon101011
3b0cffa420 Upd: ServerChecker support for new servers (#2523) 2023-04-27 12:25:58 +08:00
Zuosizhu
d1dc2daa91 Merge branch 'LmeSzinc:master' into 20230309 2023-04-14 00:14:29 +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
Zuosizhu
d33b8d386f Add: Event entrance of The Flame-Touched Dagger Rerun(event 20211111 cn) 2023-04-13 14:26:01 +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
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
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
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
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
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
Zuosizhu
9115938300 Merge branch 'master_lme' 
# Conflicts:
#	campaign/Readme.md
 2023-03-16 12:35:13 +08: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
Zuosizhu
53f44f3ff5 Merge branch 'master_lme' 
# Conflicts:
#	module/config/argument/argument.yaml
#	module/config/config_generated.py
#	module/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json
 2023-03-11 16:21:26 +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
Zuosizhu
be8529fcbf Merge branch 'master_lme' 
# 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-09 21:09:36 +08: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
Zuosizhu
20da8c8888 Add: 复兴的赞美诗（小开偷跑版） 2023-03-09 15:04:08 +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
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
Zuosizhu
a9ed20a3d3 Add: Delay Exercise until next update, and force empty remain at the last day 2023-03-07 19:49:28 +08:00
Alexanded
1bceb5bfbd Add: Disable flagship and vanguard change in GemsFarming 2023-03-03 23:51:49 +03: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