LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-16 05:59:28 +08:00
Code Activity
9,611 Commits 12 Branches 0 Tags
bff32b75e7eb316b48ea7f05a0ee8cf00a2b3ca5
Commit Graph

77 Commits

Author SHA1 Message Date
0O0o0oOoO00
75267083c9 Merge branch 'feature/more' into dev 
# Conflicts:
#	alas.py
#	module/exception.py
 2025-05-18 22:03:42 +08:00
0O0o0oOoO00
423ce223f9 add: restart chinac cloud phone 2025-05-18 20:43:18 +08:00
LA-DI-DA
62c33f27e0 Merge the remaining functions in MoreAlas 2025-04-24 23:30:50 +08:00
ZuoSiZhu
166b49f8f0 Merge branch 'master_lme' into dev 
# Conflicts:
#	alas.py
#	module/config/config_manual.py
#	module/ui/page.py
#	module/ui/ui.py
 2025-03-28 08:34:41 +08:00
LmeSzinc
985f49279f Add: Configs for task Hospital 2025-03-28 01:05:09 +08:00
LA_DI_DA
01b24293c4 add: setting for luahook 2025-03-18 13:38:09 +08:00
ZuoSiZhu
b82b79988d Merge remote-tracking branch 'lme/master' into dev 
# Conflicts:
#	module/config/argument/override.yaml
 2025-03-14 00:57:23 +08:00
LmeSzinc
c5f1d6e18b Add: Tools to do event story 2025-03-10 23:02:16 +08:00
xhqss
2ddc7fff1c Merge branch 'master_lme' 
# Conflicts:
#	module/campaign/gems_farming.py
#	module/config/config_manual.py
#	module/handler/assets.py
#	module/retire/retirement.py
#	module/tactical/tactical_class.py
 2025-01-16 08:52:42 +08:00
LmeSzinc
da81498211 Add: Task Awaken to GUI 2025-01-04 22:19:30 +08:00
LA-DI-DA
23152493b1 Add: pick out auto research farming from more alas 2024-07-07 11:53:00 +08:00
LA-DI-DA
e3db31de2e Merge branch 'zuosizhu-alas/20230309' into smallkai-dev 2023-09-30 16:50:09 +08:00
Zuosizhu
4d4d2377dc Merge branch 'master_lme' 
# Conflicts:
#	module/device/method/droidcast.py
 2023-09-28 18:09:13 +08:00
LA-DI-DA
5711665c38 Del: useless small game 2023-08-18 20:34:54 +08:00
LA-DI-DA
f9fd4b41e4 Rewrite small game and shit 2023-07-23 16:06:49 +08:00
LA-DI-DA
b032b8e52b Add shabi small game 2023-07-23 01:39:32 +08:00
LA-DI-DA
d392dadf51 Add something special 2023-07-20 22:37:00 +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
Zuosizhu
7cea084ecb Merge branch 'master_lme' 
# Conflicts:
#	assets/gui/css/alas.css
#	module/config/argument/task.yaml
#	module/config/config_updater.py
 2023-06-22 01:06:48 +08:00
LmeSzinc
0c37354ed5 Opt: List tasks instead of collapsing them in submodules 2023-06-17 22:11:19 +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
Zuosizhu
53cfc78a11 Merge branch 'LmeSzinc:master' into 20230309 2023-04-28 20:50:44 +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
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
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
SarContDeli
d024f11bbb Opt: Adjust the option arrangement of the task 2023-02-19 20:56:13 +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
d85074fc45 Fix: config bug 2023-02-12 22:26:12 +08:00
MengNianxiaoyao
e5ed2dcbfe upd: finished config update 2023-02-12 22:02:15 +08:00
MengNianxiaoyao
efed974c24 upd: update config about Main 2023-02-12 20:12:47 +08:00
MengNianxiaoyao
0e9877ee1a upd: menu update 2023-02-10 22:03:01 +08:00
MengNianxiaoyao
7e4f4638c2 fix: debug 2023-02-08 12:02:38 +08:00
MengNianxiaoyao
6a502ac7ec Fix: GG update 2023-02-01 11:51:33 +08:00
MengNianxiaoyao
9a8e258561 第一次上传 2023-01-30 22:02:03 +08:00
YJGeng-Iriy
757fc88f7e Merge branch 'master' into opsi_month_boss 2022-12-12 19:47:59 +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
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
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